Move to npm run test in vscode launch config (#1013)

* Move to npm run test in vscode launch config

* Fix dialog build for non-ES friendly packages

AJV v7 beta has better support for ES style import but is not a trivial
upgrade to make.

This commit also upgrades `tslib` across all packages to maintain
consistency with latest typescript version.

Author: joshgummersall

.vscode/launch.json

@@ -21,7 +21,7 @@
     "node-fetch": "~2.6.0",
     "please-upgrade-node": "^3.0.1",
     "semver": "^5.5.1",
-    "tslib": "^1.9.3",
+    "tslib": "^2.0.3",
     "window-size": "^1.1.0"
   },
   "devDependencies": {

common/config/rush/pnpm-lock.yaml

@@ -72,7 +72,7 @@
     "is-ci":"2.0.0",
     "latest-version": "^4.0.0",
     "semver": "^5.5.1",
-    "tslib": "^1.9.3"
+    "tslib": "^2.0.3"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.0",

packages/chatdown/package.json

@@ -36,7 +36,7 @@
     "cli-ux": "~4.9.3",
     "debug": "^4.1.1",
     "fs-extra": "^7.0.1",
-    "tslib": "~1.10.0"
+    "tslib": "^2.0.3"
   },
   "devDependencies": {
     "@oclif/plugin-help": "^2.1.6",

packages/cli/package.json

@@ -43,7 +43,7 @@
     "@oclif/errors": "~1.2.2",
     "cli-ux": "^5.3.0",
     "fs-extra": "^7.0.1",
-    "tslib": "^1.10.0"
+    "tslib": "^2.0.3"
   },
   "devDependencies": {
     "@oclif/dev-cli": "^1.22.0",

packages/command/package.json

@@ -53,7 +53,7 @@
     "os": "~0.1.1",
     "path": "^0.12.7",
     "seedrandom": "~3.0.5",
-    "tslib": "^1.10.0",
+    "tslib": "^2.0.3",
     "xml2js": "^0.4.19",
     "json-ptr": "~1.3.0",
     "json-schema-merge-allof": "~0.7.0",

packages/config/package.json

@@ -7,10 +7,10 @@ export * from './schemaTracker';
 import * as fs from 'fs-extra';
 import * as path from 'path';
 import * as st from './schemaTracker';
-import glob from 'globby';
 import parser from '@apidevtools/json-schema-ref-parser'
 
-let clone = require('clone')
+const clone = require('clone')
+const glob = require('globby');
 
 // Top-level dialog definition that would be found in a file.
 export class Dialog {

packages/dialog/package.json

@@ -9,16 +9,17 @@ import * as nuget from '@snyk/nuget-semver'
 import * as os from 'os'
 import * as ppath from 'path'
 import * as xp from 'xml2js'
-import Validator from 'ajv'
-import glob from 'globby'
+import Ajv = require('ajv');
 import parser from '@apidevtools/json-schema-ref-parser'
 import {JsonPointer as ptr} from 'json-ptr'
 
-let allof: any = require('json-schema-merge-allof')
-let clone: any = require('clone')
-let getUri: any = require('get-uri')
-let util: any = require('util')
-let exec: any = util.promisify(require('child_process').exec)
+const allof = require('json-schema-merge-allof')
+const clone = require('clone')
+const getUri = require('get-uri')
+const glob = require('globby')
+const util = require('util')
+
+const exec = util.promisify(require('child_process').exec)
 
 // Walk over JSON object, stopping if true from walker.
 // Walker gets the current value, the parent object and full path to that object
@@ -280,7 +281,7 @@ export class SchemaMerger {
     private readonly files: Map<string, Map<string, PathComponent[]>> = new Map<string, Map<string, PathComponent[]>>()
 
     // Validator for checking schema
-    private readonly validator = new Validator()
+    private readonly validator = new Ajv()
 
     // $schema that defines allowed component .schema
     private metaSchemaId = ''
@@ -784,7 +785,7 @@ export class SchemaMerger {
     // Validate against component schema
     private validateSchema(schema: any): void {
         if (!this.validator.validate('componentSchema', schema)) {
-            for (let error of this.validator.errors as Validator.ErrorObject[]) {
+            for (let error of this.validator.errors as Ajv.ErrorObject[]) {
                 this.schemaError(error)
             }
             this.validator.errors = undefined
@@ -794,7 +795,7 @@ export class SchemaMerger {
     // Validate against UI schema
     private validateUISchema(schema: any): void {
         if (!this.validator.validate('UISchema', schema)) {
-            for (let error of this.validator.errors as Validator.ErrorObject[]) {
+            for (let error of this.validator.errors as Ajv.ErrorObject[]) {
                 this.schemaError(error)
             }
             this.validator.errors = undefined
@@ -1717,7 +1718,7 @@ export class SchemaMerger {
     }
 
     // Error in schema validity
-    private schemaError(err: Validator.ErrorObject): void {
+    private schemaError(err: Ajv.ErrorObject): void {
         this.error(`${this.currentFile}: ${err.dataPath} error: ${err.message}`)
         this.failed = true
     }

packages/dialog/src/library/dialogTracker.ts

@@ -3,7 +3,7 @@
  * Licensed under the MIT License.
  */
 
-import ajv from 'ajv';
+import Ajv = require('ajv')
 import parser from '@apidevtools/json-schema-ref-parser'
 
 let getUri: any = require('get-uri')
@@ -28,16 +28,15 @@ export class SchemaTracker {
     // Map from dialog path to kind.
     pathToKind: Map<string, string>
 
-    private readonly validator: ajv.Ajv
+    private readonly validator = new Ajv({logger: false});
 
     constructor() {
         this.kindToKind = new Map<string, Kind>()
         this.pathToKind = new Map<string, string>()
         // NOTE: This is so that ajv doesn't complain about extra keywords around $ref
-        this.validator = new ajv({logger: false})
     }
 
-    async getValidator(schemaPath: string): Promise<[ajv.ValidateFunction, boolean]> {
+    async getValidator(schemaPath: string): Promise<[Ajv.ValidateFunction, boolean]> {
         let validator = this.validator.getSchema(schemaPath)
         let added = false
         if (!validator) {
@@ -82,11 +81,15 @@ export class SchemaTracker {
                     this.validator.addSchema(metaSchema, metaSchemaName)
                 }
                 this.validator.addSchema(fullSchema, schemaPath)
-                validator = this.validator.getSchema(schemaPath) as ajv.ValidateFunction
+                validator = this.validator.getSchema(schemaPath)
+                if (!validator) {
+                    throw new Error(`Could not get validator for schema ${schemaPath}`)
+                }
             } catch (err) {
                 throw new Error(`Could not use schema ${schemaPath}\n${err.message}`)
             }
         }
+
         return [validator, added]
     }