From 82daf7db2fdab6db548e5fd87cc7bbf76f345d9e Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Fri, 12 Apr 2019 16:29:24 -0700
Subject: [PATCH 01/14] Update.

---
 package.json | 38 ++++++++++++++++++--------------------
 1 file changed, 18 insertions(+), 20 deletions(-)

diff --git a/package.json b/package.json
index 264465a762ea..d124c0313178 100644
--- a/package.json
+++ b/package.json
@@ -10,28 +10,26 @@
   "description": "Tests for Azure REST API Specifications",
   "license": "MIT",
   "devDependencies": {
-    "@azure/avocado": "^0.3.0",
-    "@azure/oad": "^0.4.3",
-    "@microsoft.azure/async-io": "^1.0.21",
-    "@microsoft.azure/literate": "^1.0.21",
-    "@microsoft.azure/polyfill": "^1.0.17",
-    "@ts-common/commonmark-to-markdown": "^1.1.10",
-    "@ts-common/fs": "0.1.1",
-    "@types/js-yaml": "^3.12.0",
-    "fs-extra": "^3.0.1",
-    "glob": "^5.0.14",
-    "js-yaml": "^3.13.0",
-    "json-schema-ref-parser": "^3.1.2",
+    "@azure/avocado": "^0.3.3",
+    "@azure/oad": "^0.5.1",
+    "@microsoft.azure/async-io": "^2.0.21",
+    "@microsoft.azure/literate": "^1.0.25",
+    "@microsoft.azure/polyfill": "^1.0.19",
+    "@ts-common/commonmark-to-markdown": "^1.2.0",
+    "@ts-common/fs": "0.2.0",
+    "@types/js-yaml": "^3.12.1",
+    "fs-extra": "^7.0.1",
+    "glob": "^7.1.3",
+    "js-yaml": "^3.13.1",
+    "json-schema-ref-parser": "^6.1.0",
     "mocha": "*",
-    "oav": "^0.16.1",
-    "request": "^2.61.0",
-    "request-promise-native": "^1.0.5",
+    "oav": "^0.18.1",
+    "request": "^2.88.0",
+    "request-promise-native": "^1.0.7",
     "ts-node": "^8.0.3",
-    "typescript": "^3.2.4",
-    "z-schema": "^3.25.1"
-  },
-  "dependencies": {
-    "@octokit/rest": "^15.2.6"
+    "typescript": "^3.4.3",
+    "z-schema": "^4.0.2",
+    "@octokit/rest": "^16.23.4"
   },
   "homepage": "https://github.com/azure/azure-rest-api-specs",
   "repository": {

From c5f919dfb508a92f6db7d7ac79b2dd555f4a723c Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Fri, 12 Apr 2019 16:54:36 -0700
Subject: [PATCH 02/14] breaking-change.ts

---
 .gitignore                                    |  2 +
 .travis.yml                                   |  2 +-
 azure-pipelines.yml                           |  2 +-
 ...{breaking-change.js => breaking-change.ts} | 43 ++++++++++++-------
 4 files changed, 31 insertions(+), 18 deletions(-)
 rename scripts/{breaking-change.js => breaking-change.ts} (87%)

diff --git a/.gitignore b/.gitignore
index 75d0a52fa21e..876a7a990953 100644
--- a/.gitignore
+++ b/.gitignore
@@ -110,3 +110,5 @@ warnings.txt
 !.vscode/tasks.json
 !.vscode/launch.json
 !.vscode/extensions.json
+
+dist/
\ No newline at end of file
diff --git a/.travis.yml b/.travis.yml
index ef3625f33d6b..00ba924e9bb8 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -47,7 +47,7 @@ script:
     if [[ $MODE == 'BreakingChange' ]]; then
       scripts/install-dotnet.sh
       npm install
-      node -- scripts/breaking-change.js
+      ./node_modules/.bin/ts-node scripts/breaking-change.ts
     fi
   - >-
     if [[ $MODE == 'lintdiff' ]]; then
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 003bf46bbc9e..57fae8cf9c78 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -78,7 +78,7 @@ jobs:
     displayName: 'npm install'
     inputs:
       verbose: false
-  - script: 'node scripts/breaking-change.js'
+  - script: './node_modules/.bin/ts_node scripts/breaking-change.ts'
     displayName: 'Breaking Changes'
 
 - job: "LintDiff"
diff --git a/scripts/breaking-change.js b/scripts/breaking-change.ts
similarity index 87%
rename from scripts/breaking-change.js
rename to scripts/breaking-change.ts
index 08fea52dfa30..5e1bc0ef960c 100644
--- a/scripts/breaking-change.js
+++ b/scripts/breaking-change.ts
@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License in the project root for license information.
 
-'use strict';
+import * as stringMap from '@ts-common/string-map'
+
 const utils = require('../test/util/utils'),
   path = require('path'),
   fs = require('fs-extra'),
@@ -9,8 +10,10 @@ const utils = require('../test/util/utils'),
   exec = require('util').promisify(require('child_process').exec),
   oad = require('@azure/oad');
 
+const asNonUndefined = <T>(v: T|undefined) => v as T
+
 // This map is used to store the mapping between files resolved and stored location
-var resolvedMapForNewSpecs = {};
+var resolvedMapForNewSpecs: stringMap.MutableStringMap<string> = {};
 let outputFolder = path.join(os.tmpdir(), "resolved");
 // Used to enable running script outside TravisCI for debugging
 let isRunningInTravisCI = process.env.TRAVIS === 'true';
@@ -20,7 +23,7 @@ const headerText = `
 |-|------|----------|---------|
 `;
 
-function iconFor(type) {
+function iconFor(type: unknown) {
   if (type === 'Error') {
     return ':x:';
   } else if (type === 'Warning') {
@@ -32,26 +35,33 @@ function iconFor(type) {
   }
 }
 
-function shortName(filePath) {
+function shortName(filePath: unknown) {
   return `${path.basename(path.dirname(filePath))}/&#8203;<strong>${path.basename(filePath)}</strong>`;
 }
 
-function tableLine(filePath, diff) {
+type Diff = {
+  readonly type: unknown
+  readonly id: string
+  readonly code: unknown
+  readonly message: unknown
+}
+
+function tableLine(filePath: unknown, diff: Diff) {
   return `|${iconFor(diff['type'])}|[${diff['type']} ${diff['id']} - ${diff['code']}](https://github.com/Azure/openapi-diff/blob/master/docs/rules/${diff['id']}.md)|[${shortName(filePath)}](${blobHref(filePath)} "${filePath}")|${diff['message']}|\n`;
 }
 
-function blobHref(file) {
+function blobHref(file: unknown) {
   return `https://github.com/${process.env.TRAVIS_PULL_REQUEST_SLUG}/blob/${process.env.TRAVIS_PULL_REQUEST_SHA}/${file}`;
 }
 
 /**
  * Compares old and new specifications for breaking change detection.
  *
- * @param {string} oldSpec Path to the old swagger specification file.
+ * @param oldSpec Path to the old swagger specification file.
  *
- * @param {string} newSpec Path to the new swagger specification file.
+ * @param newSpec Path to the new swagger specification file.
  */
-async function runOad(oldSpec, newSpec) {
+async function runOad(oldSpec: string, newSpec: string) {
   if (oldSpec === null || oldSpec === undefined || typeof oldSpec.valueOf() !== 'string' || !oldSpec.trim().length) {
     throw new Error('oldSpec is a required parameter of type "string" and it cannot be an empty string.');
   }
@@ -81,9 +91,9 @@ async function runOad(oldSpec, newSpec) {
 /**
  * Processes the given swagger and stores the resolved swagger on to disk
  *
- * @param {string} swaggerPath Path to the swagger specification file.
+ * @param swaggerPath Path to the swagger specification file.
  */
-async function processViaAutoRest(swaggerPath) {
+async function processViaAutoRest(swaggerPath: string) {
   if (swaggerPath === null || swaggerPath === undefined || typeof swaggerPath.valueOf() !== 'string' || !swaggerPath.trim().length) {
     throw new Error('swaggerPath is a required parameter of type "string" and it cannot be an empty string.');
   }
@@ -118,7 +128,7 @@ async function runScript() {
   let newSwaggers = [];
   if (isRunningInTravisCI && swaggersToProcess.length > 0) {
     newSwaggers = await utils.doOnBranch(utils.getTargetBranch(), async () => {
-      return swaggersToProcess.filter(s => !fs.existsSync(s))
+      return swaggersToProcess.filter((s: unknown) => !fs.existsSync(s))
     });
   }
 
@@ -133,7 +143,7 @@ async function runScript() {
   console.dir(resolvedMapForNewSpecs);
 
   let errors = 0, warnings = 0;
-  const diffFiles = {};
+  const diffFiles: stringMap.MutableStringMap<Diff[]> = {};
   const newFiles = [];
 
   for (const swagger of swaggersToProcess) {
@@ -144,8 +154,9 @@ async function runScript() {
       continue;
     }
 
-    if (resolvedMapForNewSpecs[swagger]) {
-      const diffs = await runOad(swagger, resolvedMapForNewSpecs[swagger]);
+    const resolved = resolvedMapForNewSpecs[swagger]
+    if (resolved) {
+      const diffs = await runOad(swagger, resolved);
       if (diffs) {
         diffFiles[swagger] = diffs;
         for (const diff of diffs) {
@@ -189,7 +200,7 @@ async function runScript() {
 
       diffFileNames.sort();
       for (const swagger of diffFileNames) {
-        const diffs = diffFiles[swagger];
+        const diffs = asNonUndefined(diffFiles[swagger]);
         diffs.sort((a, b) => {
           if (a.type === b.type) {
             return a.id.localeCompare(b.id);

From 3cf12effa95d00ad6c04f44885341822f14b1068 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Fri, 12 Apr 2019 16:57:52 -0700
Subject: [PATCH 03/14] minor

---
 scripts/breaking-change.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/scripts/breaking-change.ts b/scripts/breaking-change.ts
index 5e1bc0ef960c..702cec1c3b63 100644
--- a/scripts/breaking-change.ts
+++ b/scripts/breaking-change.ts
@@ -238,7 +238,7 @@ async function runScript() {
 }
 
 // magic starts here
-runScript().then(success => {
+runScript().then(() => {
   console.log(`Thanks for using breaking change tool to review.`);
   console.log(`If you encounter any issue(s), please open issue(s) at https://github.com/Azure/openapi-diff/issues .`);
 }).catch(err => {

From 33e7c347c4cdd854cc44a5aba1771a33c8fbbf7b Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Fri, 12 Apr 2019 17:01:52 -0700
Subject: [PATCH 04/14] call tsc

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 57fae8cf9c78..996fe9870989 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -78,7 +78,7 @@ jobs:
     displayName: 'npm install'
     inputs:
       verbose: false
-  - script: './node_modules/.bin/ts_node scripts/breaking-change.ts'
+  - script: 'tsc && node dist/breaking-change.ts'
     displayName: 'Breaking Changes'
 
 - job: "LintDiff"

From ded71ffc6b9c1898d00273ab2dfa2468438c9c91 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Fri, 12 Apr 2019 17:02:11 -0700
Subject: [PATCH 05/14] ts-node

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 996fe9870989..0b163370eeef 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -78,7 +78,7 @@ jobs:
     displayName: 'npm install'
     inputs:
       verbose: false
-  - script: 'tsc && node dist/breaking-change.ts'
+  - script: './node_modules/.bin/ts-node scripts/breaking-change.ts'
     displayName: 'Breaking Changes'
 
 - job: "LintDiff"

From 127a260188fe9c6574f0f33903a99bbc329032b2 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 10:58:23 -0700
Subject: [PATCH 06/14] momentOfTruth

---
 .travis.yml                                   |  2 +-
 azure-pipelines.yml                           |  2 +-
 scripts/breaking-change.ts                    |  5 +--
 .../{momentOfTruth.js => momentOfTruth.ts}    | 41 ++++++++++++-------
 scripts/ts-utils.ts                           |  4 ++
 5 files changed, 34 insertions(+), 20 deletions(-)
 rename scripts/{momentOfTruth.js => momentOfTruth.ts} (79%)
 create mode 100644 scripts/ts-utils.ts

diff --git a/.travis.yml b/.travis.yml
index 00ba924e9bb8..02b0178d2447 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -53,5 +53,5 @@ script:
     if [[ $MODE == 'lintdiff' ]]; then
       scripts/install-dotnet.sh
       npm install
-      node scripts/momentOfTruth.js && node scripts/momentOfTruthPostProcessing.js
+      ./node_modules/.bin/ts-node scripts/momentOfTruth.ts && node scripts/momentOfTruthPostProcessing.js
     fi
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 0b163370eeef..bf3a1db087d9 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -94,7 +94,7 @@ jobs:
       verbose: false
   - script: 'scripts/install-dotnet.sh'
     displayName: 'install .Net'
-  - script: 'node scripts/momentOfTruth.js && node scripts/momentOfTruthPostProcessing.js'
+  - script: './node_modules/.bin/ts-node scripts/momentOfTruth.ts && node scripts/momentOfTruthPostProcessing.js'
     displayName: 'LintDiff'
 
 - job: "SDK"
diff --git a/scripts/breaking-change.ts b/scripts/breaking-change.ts
index 702cec1c3b63..364f400dc3ae 100644
--- a/scripts/breaking-change.ts
+++ b/scripts/breaking-change.ts
@@ -2,6 +2,7 @@
 // Licensed under the MIT License. See License in the project root for license information.
 
 import * as stringMap from '@ts-common/string-map'
+import * as tsUtils from './ts-utils'
 
 const utils = require('../test/util/utils'),
   path = require('path'),
@@ -10,8 +11,6 @@ const utils = require('../test/util/utils'),
   exec = require('util').promisify(require('child_process').exec),
   oad = require('@azure/oad');
 
-const asNonUndefined = <T>(v: T|undefined) => v as T
-
 // This map is used to store the mapping between files resolved and stored location
 var resolvedMapForNewSpecs: stringMap.MutableStringMap<string> = {};
 let outputFolder = path.join(os.tmpdir(), "resolved");
@@ -200,7 +199,7 @@ async function runScript() {
 
       diffFileNames.sort();
       for (const swagger of diffFileNames) {
-        const diffs = asNonUndefined(diffFiles[swagger]);
+        const diffs = tsUtils.asNonUndefined(diffFiles[swagger]);
         diffs.sort((a, b) => {
           if (a.type === b.type) {
             return a.id.localeCompare(b.id);
diff --git a/scripts/momentOfTruth.js b/scripts/momentOfTruth.ts
similarity index 79%
rename from scripts/momentOfTruth.js
rename to scripts/momentOfTruth.ts
index 754e26a9e38e..7015fb122ede 100644
--- a/scripts/momentOfTruth.js
+++ b/scripts/momentOfTruth.ts
@@ -1,7 +1,8 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License.txt in the project root for license information.
 
-'use strict';
+import * as stringMap from '@ts-common/string-map'
+import * as tsUtils from './ts-utils'
 
 const exec = require('child_process').exec,
     path = require('path'),
@@ -13,10 +14,18 @@ let pullRequestNumber = utils.getPullRequestNumber();
 let linterCmd = `npx autorest --validation --azure-validator --message-format=json `;
 var filename = `${pullRequestNumber}.json`;
 var logFilepath = path.join(getLogDir(), filename);
-var finalResult = {};
-finalResult["pullRequest"] = pullRequestNumber;
-finalResult["repositoryUrl"] = utils.getRepoUrl();
-finalResult["files"] = {};
+
+type FinalResult = {
+    readonly pullRequest: unknown,
+    readonly repositoryUrl: unknown,
+    readonly files: stringMap.MutableStringMap<stringMap.MutableStringMap<unknown>>
+}
+
+var finalResult: FinalResult = {
+    pullRequest: pullRequestNumber,
+    repositoryUrl: utils.getRepoUrl(),
+    files: {}
+}
 
 // Creates and returns path to the logging directory
 function getLogDir() {
@@ -39,12 +48,12 @@ function createLogFile() {
 }
 
 //appends the content to the log file
-function writeContent(content) {
+function writeContent(content: unknown) {
     fs.writeFileSync(logFilepath, content);
 }
 
 // Executes linter on given swagger path and returns structured JSON of linter output
-async function getLinterResult(swaggerPath) {
+async function getLinterResult(swaggerPath: string|null|undefined) {
     if (swaggerPath === null || swaggerPath === undefined || typeof swaggerPath.valueOf() !== 'string' || !swaggerPath.trim().length) {
         throw new Error('swaggerPath is a required parameter of type "string" and it cannot be an empty string.');
     }
@@ -56,7 +65,7 @@ async function getLinterResult(swaggerPath) {
     let cmd = "npx autorest --reset && " + linterCmd + swaggerPath;
     console.log(`Executing: ${cmd}`);
     const { err, stdout, stderr } = await new Promise(res => exec(cmd, { encoding: 'utf8', maxBuffer: 1024 * 1024 * 64 },
-        (err, stdout, stderr) => res({ err: err, stdout: stdout, stderr: stderr })));
+        (err: unknown, stdout: unknown, stderr: unknown) => res({ err: err, stdout: stdout, stderr: stderr })));
 
     if (err && stderr.indexOf("Process() cancelled due to exception") !== -1) {
         console.error(`AutoRest exited with code ${err.code}`);
@@ -86,7 +95,7 @@ async function getLinterResult(swaggerPath) {
 };
 
 // Run linter tool
-async function runTools(swagger, beforeOrAfter) {
+async function runTools(swagger: string, beforeOrAfter: string) {
     console.log(`Processing "${swagger}":`);
     const linterErrors = await getLinterResult(swagger);
     console.log(linterErrors);
@@ -94,14 +103,16 @@ async function runTools(swagger, beforeOrAfter) {
 };
 
 // Updates final result json to be written to the output file
-async function updateResult(spec, errors, beforeOrAfter) {
-    if (!finalResult['files'][spec]) {
-        finalResult['files'][spec] = {};
+async function updateResult(spec: string, errors: unknown, beforeOrAfter: string) {
+    const files = finalResult['files']
+    if (!files[spec]) {
+        files[spec] = {};
     }
-    if (!finalResult['files'][spec][beforeOrAfter]) {
-        finalResult['files'][spec][beforeOrAfter] = {};
+    const filesSpec = tsUtils.asNonUndefined(files[spec])
+    if (!filesSpec[beforeOrAfter]) {
+        filesSpec[beforeOrAfter] = {};
     }
-    finalResult['files'][spec][beforeOrAfter] = errors;
+    filesSpec[beforeOrAfter] = errors;
 }
 
 //main function
diff --git a/scripts/ts-utils.ts b/scripts/ts-utils.ts
new file mode 100644
index 000000000000..9b9dbb94a898
--- /dev/null
+++ b/scripts/ts-utils.ts
@@ -0,0 +1,4 @@
+// Copyright (c) Microsoft Corporation. All rights reserved.
+// Licensed under the MIT License. See License in the project root for license information.
+
+export const asNonUndefined = <T>(v: T|undefined) => v as T
\ No newline at end of file

From a7c562941c17d3ce8869df43a48a1bffc01cd612 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 11:10:06 -0700
Subject: [PATCH 07/14] package.json update

---
 package.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index d124c0313178..ffdc7b9f8b94 100644
--- a/package.json
+++ b/package.json
@@ -26,10 +26,10 @@
     "oav": "^0.18.1",
     "request": "^2.88.0",
     "request-promise-native": "^1.0.7",
-    "ts-node": "^8.0.3",
+    "ts-node": "^8.1.0",
     "typescript": "^3.4.3",
     "z-schema": "^4.0.2",
-    "@octokit/rest": "^16.23.4"
+    "@octokit/rest": "^16.24.1"
   },
   "homepage": "https://github.com/azure/azure-rest-api-specs",
   "repository": {

From bb61bda19e14f32fa99841961c92f38eebf728a4 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 11:37:29 -0700
Subject: [PATCH 08/14] no `dist` for now

---
 .gitignore    | 5 ++++-
 tsconfig.json | 2 +-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/.gitignore b/.gitignore
index 876a7a990953..1f995a5b6470 100644
--- a/.gitignore
+++ b/.gitignore
@@ -111,4 +111,7 @@ warnings.txt
 !.vscode/launch.json
 !.vscode/extensions.json
 
-dist/
\ No newline at end of file
+*.js
+*.d.ts
+*.js.map
+*.d.ts.map
\ No newline at end of file
diff --git a/tsconfig.json b/tsconfig.json
index dbfdac46ba4a..e05dca6c434d 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,7 +11,7 @@
     "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
     "sourceMap": true,                     /* Generates corresponding '.map' file. */
     // "outFile": "./",                       /* Concatenate and emit output to single file. */
-    "outDir": "./dist",                        /* Redirect output structure to the directory. */
+    // "outDir": "./dist",                        /* Redirect output structure to the directory. */
     // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
     // "composite": true,                     /* Enable project compilation */
     // "removeComments": true,                /* Do not emit comments to output. */

From 17e2447e190b44cb73373e33b2cca55e1fc9ee2b Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 11:53:52 -0700
Subject: [PATCH 09/14] utils.js => utils.ts

---
 package.json                     |  2 +-
 test/util/{utils.js => utils.ts} | 32 +++++++++++++++++++-------------
 2 files changed, 20 insertions(+), 14 deletions(-)
 rename test/util/{utils.js => utils.ts} (92%)

diff --git a/package.json b/package.json
index ffdc7b9f8b94..be846cf04f4a 100644
--- a/package.json
+++ b/package.json
@@ -40,7 +40,7 @@
     "url": "http://github.com/azure/azure-rest-api-specs/issues"
   },
   "scripts": {
-    "test": "mocha -t 500000 --reporter min",
+    "test": "tsc && mocha -t 500000 --reporter min",
     "oav": "oav",
     "tsc": "tsc",
     "multiapi": "ts-node ./scripts/multiapi.ts"
diff --git a/test/util/utils.js b/test/util/utils.ts
similarity index 92%
rename from test/util/utils.js
rename to test/util/utils.ts
index 8b10865e470c..af4685e7727f 100644
--- a/test/util/utils.js
+++ b/test/util/utils.ts
@@ -1,6 +1,9 @@
 // Copyright (c) Microsoft Corporation. All rights reserved.
 // Licensed under the MIT License. See License in the project root for license information.
 
+import * as tsUtils from '../../scripts/ts-utils'
+import * as stringMap from '@ts-common/string-map'
+
 'use strict';
 var assert = require("assert"),
   os = require('os'),
@@ -13,7 +16,10 @@ var assert = require("assert"),
   util = require('util'),
   execSync = require('child_process').execSync;
 
-const asyncJsonRequest = url => new Promise((res, rej) => request({ url: url, json: true }, (error, _, body) => error ? rej(error) : res(body)));
+const asyncJsonRequest = (url: unknown) => new Promise<unknown>((res, rej) => request(
+  { url: url, json: true },
+  (error: unknown, _: unknown, body: unknown) => error ? rej(error) : res(body)
+));
 
 exports = module.exports;
 
@@ -36,7 +42,7 @@ exports.readmes = glob.sync(path.join(__dirname, '../', '../', '/specification/*
 // Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
 // because the buffer-to-string conversion in `fs.readFile()`
 // translates it to FEFF, the UTF-16 BOM.
-exports.stripBOM = function stripBOM(content) {
+exports.stripBOM = function stripBOM(content: Buffer|string) {
   if (Buffer.isBuffer(content)) {
     content = content.toString();
   }
@@ -50,7 +56,7 @@ exports.stripBOM = function stripBOM(content) {
  * Parses the json from the given filepath
  * @returns {string} clr command
  */
-exports.parseJsonFromFile = async function parseJsonFromFile(filepath) {
+exports.parseJsonFromFile = async function parseJsonFromFile(filepath: unknown) {
   const data = await fs.readFile(filepath, { encoding: 'utf8' });
   try {
     return YAML.safeLoad(exports.stripBOM(data));
@@ -77,7 +83,7 @@ exports.getTargetBranch = function getTargetBranch() {
 /**
  * Check out a copy of a branch to a temporary location, execute a function, and then restore the previous state
  */
-exports.doOnBranch = async function doOnBranch(branch, func) {
+exports.doOnBranch = async function doOnBranch(branch: unknown, func: () => Promise<unknown>) {
   exports.fetchBranch(branch);
   const branchSha = exports.resolveRef(`origin/${branch}`);
   const tmpDir = path.join(os.tmpdir(), branchSha);
@@ -99,7 +105,7 @@ exports.doOnBranch = async function doOnBranch(branch, func) {
 /**
  * Resolve a ref to its commit hash
  */
-exports.resolveRef = function resolveRef(ref) {
+exports.resolveRef = function resolveRef(ref: unknown) {
   let cmd = `git rev-parse ${ref}`;
   console.log(`> ${cmd}`);
   return execSync(cmd, { encoding: 'utf8' }).trim();
@@ -108,7 +114,7 @@ exports.resolveRef = function resolveRef(ref) {
 /**
  * Fetch ref for a branch from the origin
  */
-exports.fetchBranch = function fetchBranch(branch) {
+exports.fetchBranch = function fetchBranch(branch: unknown) {
   let cmds = [
     `git remote -vv`,
     `git branch --all`,
@@ -126,7 +132,7 @@ exports.fetchBranch = function fetchBranch(branch) {
 /**
  * Checkout a copy of branch to location
  */
-exports.checkoutBranch = function checkoutBranch(ref, location) {
+exports.checkoutBranch = function checkoutBranch(ref: unknown, location: unknown) {
   let cmd = `git worktree add -f ${location} origin/${ref}`;
   console.log(`Checking out a copy of branch ${ref} to ${location}...`);
   console.log(`> ${cmd}`);
@@ -148,7 +154,7 @@ exports.getSourceBranch = function getSourceBranch() {
       console.log(`An error occurred while getting the current branch ${util.inspect(err, { depth: null })}.`);
     }
   }
-  result = result.trim();
+  result = tsUtils.asNonUndefined(result).trim();
   console.log(`>>>>> The source branch is: "${result}".`);
   return result;
 };
@@ -218,7 +224,7 @@ exports.getSourceRepoUrl = function getSourceRepoUrl() {
 
 exports.getTimeStamp = function getTimeStamp() {
   // We pad each value so that sorted directory listings show the files in chronological order
-  function pad(number) {
+  function pad(number: any): any {
     if (number < 10) {
       return '0' + number;
     }
@@ -296,7 +302,7 @@ exports.getFilesChangedInPR = function getFilesChangedInPR() {
       filesChanged = execSync(cmd, { encoding: 'utf8' });
       console.log('>>>>> Files changed in this PR are as follows:')
       console.log(filesChanged);
-      swaggerFilesInPR = filesChanged.split('\n').filter(function (item) {
+      swaggerFilesInPR = filesChanged.split('\n').filter(function (item: string) {
         if (item.match(/.*(json|yaml)$/ig) == null || item.match(/.*specification.*/ig) == null) {
           return false;
         }
@@ -310,13 +316,13 @@ exports.getFilesChangedInPR = function getFilesChangedInPR() {
       });
       console.log(`>>>> Number of swaggers found in this PR: ${swaggerFilesInPR.length}`);
 
-      var deletedFiles = swaggerFilesInPR.filter(function (swaggerFile) {
+      var deletedFiles = swaggerFilesInPR.filter(function (swaggerFile: unknown) {
         return !fs.existsSync(swaggerFile);
       });
       console.log('>>>>> Files deleted in this PR are as follows:')
       console.log(deletedFiles);
       // Remove files that have been deleted in the PR
-      swaggerFilesInPR = swaggerFilesInPR.filter(function (x) { return deletedFiles.indexOf(x) < 0 });
+      swaggerFilesInPR = swaggerFilesInPR.filter(function (x: unknown) { return deletedFiles.indexOf(x) < 0 });
 
       result = swaggerFilesInPR;
     } catch (err) {
@@ -331,7 +337,7 @@ exports.getFilesChangedInPR = function getFilesChangedInPR() {
  * @returns {Object} context Provides the schemas in json format and the validator.
  */
 exports.initializeValidator = async function initializeValidator() {
-  const context = {
+  const context: stringMap.MutableStringMap<unknown> = {
     extensionSwaggerSchema: await asyncJsonRequest(exports.extensionSwaggerSchemaUrl),
     swaggerSchema: await asyncJsonRequest(exports.swaggerSchemaAltUrl),
     exampleSchema: await asyncJsonRequest(exports.exampleSchemaUrl),

From 953c157153e9ed5cdc6d37a3d34b6f4094332f39 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 13:15:35 -0700
Subject: [PATCH 10/14] utils.ts

---
 test/util/utils.ts | 105 ++++++++++++++++++++++-----------------------
 1 file changed, 51 insertions(+), 54 deletions(-)

diff --git a/test/util/utils.ts b/test/util/utils.ts
index af4685e7727f..d02aaee565e9 100644
--- a/test/util/utils.ts
+++ b/test/util/utils.ts
@@ -4,8 +4,7 @@
 import * as tsUtils from '../../scripts/ts-utils'
 import * as stringMap from '@ts-common/string-map'
 
-'use strict';
-var assert = require("assert"),
+var
   os = require('os'),
   fs = require('fs-extra'),
   glob = require('glob'),
@@ -21,28 +20,26 @@ const asyncJsonRequest = (url: unknown) => new Promise<unknown>((res, rej) => re
   (error: unknown, _: unknown, body: unknown) => error ? rej(error) : res(body)
 ));
 
-exports = module.exports;
+export const extensionSwaggerSchemaUrl = "https://raw.githubusercontent.com/Azure/autorest/master/schema/swagger-extensions.json";
+export const swaggerSchemaUrl = "http://json.schemastore.org/swagger-2.0";
+export const swaggerSchemaAltUrl = "http://swagger.io/v2/schema.json";
+export const schemaUrl = "http://json-schema.org/draft-04/schema";
+export const exampleSchemaUrl = "https://raw.githubusercontent.com/Azure/autorest/master/schema/example-schema.json";
+export const compositeSchemaUrl = "https://raw.githubusercontent.com/Azure/autorest/master/schema/composite-swagger.json";
 
-exports.extensionSwaggerSchemaUrl = "https://raw.githubusercontent.com/Azure/autorest/master/schema/swagger-extensions.json";
-exports.swaggerSchemaUrl = "http://json.schemastore.org/swagger-2.0";
-exports.swaggerSchemaAltUrl = "http://swagger.io/v2/schema.json";
-exports.schemaUrl = "http://json-schema.org/draft-04/schema";
-exports.exampleSchemaUrl = "https://raw.githubusercontent.com/Azure/autorest/master/schema/example-schema.json";
-exports.compositeSchemaUrl = "https://raw.githubusercontent.com/Azure/autorest/master/schema/composite-swagger.json";
+export const isWindows = (process.platform.lastIndexOf('win') === 0);
+export const prOnly = undefined !== process.env['PR_ONLY'] ? process.env['PR_ONLY'] : 'false';
 
-exports.isWindows = (process.platform.lastIndexOf('win') === 0);
-exports.prOnly = undefined !== process.env['PR_ONLY'] ? process.env['PR_ONLY'] : 'false';
-
-exports.globPath = path.join(__dirname, '../', '../', '/specification/**/*.json');
-exports.swaggers = glob.sync(exports.globPath, { ignore: ['**/examples/**/*.json', '**/quickstart-templates/*.json', '**/schema/*.json'] });
-exports.exampleGlobPath = path.join(__dirname, '../', '../', '/specification/**/examples/**/*.json');
-exports.examples = glob.sync(exports.exampleGlobPath);
-exports.readmes = glob.sync(path.join(__dirname, '../', '../', '/specification/**/readme.md'));
+export const globPath = path.join(__dirname, '../', '../', '/specification/**/*.json');
+export const swaggers = glob.sync(globPath, { ignore: ['**/examples/**/*.json', '**/quickstart-templates/*.json', '**/schema/*.json'] });
+export const exampleGlobPath = path.join(__dirname, '../', '../', '/specification/**/examples/**/*.json');
+export const examples = glob.sync(exampleGlobPath);
+export const readmes = glob.sync(path.join(__dirname, '../', '../', '/specification/**/readme.md'));
 
 // Remove byte order marker. This catches EF BB BF (the UTF-8 BOM)
 // because the buffer-to-string conversion in `fs.readFile()`
 // translates it to FEFF, the UTF-16 BOM.
-exports.stripBOM = function stripBOM(content: Buffer|string) {
+export const stripBOM = function(content: Buffer|string) {
   if (Buffer.isBuffer(content)) {
     content = content.toString();
   }
@@ -56,10 +53,10 @@ exports.stripBOM = function stripBOM(content: Buffer|string) {
  * Parses the json from the given filepath
  * @returns {string} clr command
  */
-exports.parseJsonFromFile = async function parseJsonFromFile(filepath: unknown) {
+export const parseJsonFromFile = async function(filepath: unknown) {
   const data = await fs.readFile(filepath, { encoding: 'utf8' });
   try {
-    return YAML.safeLoad(exports.stripBOM(data));
+    return YAML.safeLoad(stripBOM(data));
   } catch (error) {
     throw new Error(`swagger "${filepath}" is an invalid JSON.\n${util.inspect(error, { depth: null })}`);
   }
@@ -72,7 +69,7 @@ exports.parseJsonFromFile = async function parseJsonFromFile(filepath: unknown)
  * If the environment variable is undefined then the method returns 'master' as the default value.
  * @returns {string} branchName The target branch name.
  */
-exports.getTargetBranch = function getTargetBranch() {
+export const getTargetBranch = function() {
   console.log(`@@@@@ process.env['TRAVIS_BRANCH'] - ${process.env['TRAVIS_BRANCH']}`);
   let result = process.env['TRAVIS_BRANCH'] || 'master';
   result = result.trim();
@@ -83,13 +80,13 @@ exports.getTargetBranch = function getTargetBranch() {
 /**
  * Check out a copy of a branch to a temporary location, execute a function, and then restore the previous state
  */
-exports.doOnBranch = async function doOnBranch(branch: unknown, func: () => Promise<unknown>) {
-  exports.fetchBranch(branch);
-  const branchSha = exports.resolveRef(`origin/${branch}`);
+export const doOnBranch = async function(branch: unknown, func: () => Promise<unknown>) {
+  fetchBranch(branch);
+  const branchSha = resolveRef(`origin/${branch}`);
   const tmpDir = path.join(os.tmpdir(), branchSha);
 
   const currentDir = process.cwd();
-  exports.checkoutBranch(branch, tmpDir);
+  checkoutBranch(branch, tmpDir);
 
   console.log(`Changing directory and executing the function...`);
   process.chdir(tmpDir);
@@ -105,7 +102,7 @@ exports.doOnBranch = async function doOnBranch(branch: unknown, func: () => Prom
 /**
  * Resolve a ref to its commit hash
  */
-exports.resolveRef = function resolveRef(ref: unknown) {
+export const resolveRef = function(ref: unknown) {
   let cmd = `git rev-parse ${ref}`;
   console.log(`> ${cmd}`);
   return execSync(cmd, { encoding: 'utf8' }).trim();
@@ -114,7 +111,7 @@ exports.resolveRef = function resolveRef(ref: unknown) {
 /**
  * Fetch ref for a branch from the origin
  */
-exports.fetchBranch = function fetchBranch(branch: unknown) {
+export const fetchBranch = function(branch: unknown) {
   let cmds = [
     `git remote -vv`,
     `git branch --all`,
@@ -132,7 +129,7 @@ exports.fetchBranch = function fetchBranch(branch: unknown) {
 /**
  * Checkout a copy of branch to location
  */
-exports.checkoutBranch = function checkoutBranch(ref: unknown, location: unknown) {
+export const checkoutBranch = function(ref: unknown, location: unknown) {
   let cmd = `git worktree add -f ${location} origin/${ref}`;
   console.log(`Checking out a copy of branch ${ref} to ${location}...`);
   console.log(`> ${cmd}`);
@@ -143,7 +140,7 @@ exports.checkoutBranch = function checkoutBranch(ref: unknown, location: unknown
  * Gets the name of the source branch from which the PR is sent.
  * @returns {string} branchName The source branch name.
  */
-exports.getSourceBranch = function getSourceBranch() {
+export const getSourceBranch = function() {
   let cmd = 'git rev-parse --abbrev-ref HEAD';
   let result = process.env['TRAVIS_PULL_REQUEST_BRANCH'];
   console.log(`@@@@@ process.env['TRAVIS_PULL_REQUEST_BRANCH'] - ${process.env['TRAVIS_PULL_REQUEST_BRANCH']}`);
@@ -165,7 +162,7 @@ exports.getSourceBranch = function getSourceBranch() {
  * https://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
  * @returns {string} PR number or 'undefined'.
  */
-exports.getPullRequestNumber = function getPullRequestNumber() {
+export const getPullRequestNumber = function() {
   let result = process.env['TRAVIS_PULL_REQUEST'];
   console.log(`@@@@@ process.env['TRAVIS_PULL_REQUEST'] - ${process.env['TRAVIS_PULL_REQUEST']}`);
 
@@ -182,7 +179,7 @@ exports.getPullRequestNumber = function getPullRequestNumber() {
  * https://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
  * @returns {string} repo name or 'undefined'.
  */
-exports.getRepoName = function getRepoName() {
+export const getRepoName = function() {
   let result = process.env['TRAVIS_REPO_SLUG'];
   console.log(`@@@@@ process.env['TRAVIS_REPO_SLUG'] - ${result}`);
 
@@ -195,7 +192,7 @@ exports.getRepoName = function getRepoName() {
  * https://docs.travis-ci.com/user/environment-variables/#Convenience-Variables
  * @returns {string} repo name or 'undefined'.
  */
-exports.getSourceRepoName = function getSourceRepoName() {
+export const getSourceRepoName = function() {
   let result = process.env['TRAVIS_PULL_REQUEST_SLUG'];
   console.log(`@@@@@ process.env['TRAVIS_PULL_REQUEST_SLUG'] - ${result}`);
 
@@ -207,8 +204,8 @@ exports.getSourceRepoName = function getSourceRepoName() {
  * Gets the repo URL
  * @returns {string} repo URL or 'undefined'
  */
-exports.getRepoUrl = function getRepoUrl() {
-  let repoName = exports.getRepoName();
+export const getRepoUrl = function() {
+  let repoName = getRepoName();
   return `https://github.com/${repoName}`;
 };
 
@@ -217,12 +214,12 @@ exports.getRepoUrl = function getRepoUrl() {
  * Gets the repo URL from where the PR originated
  * @returns {string} repo URL or 'undefined'
  */
-exports.getSourceRepoUrl = function getSourceRepoUrl() {
-  let repoName = exports.getSourceRepoName();
+export const getSourceRepoUrl = function() {
+  let repoName = getSourceRepoName();
   return `https://github.com/${repoName}`;
 };
 
-exports.getTimeStamp = function getTimeStamp() {
+export const getTimeStamp = function() {
   // We pad each value so that sorted directory listings show the files in chronological order
   function pad(number: any): any {
     if (number < 10) {
@@ -246,11 +243,11 @@ exports.getTimeStamp = function getTimeStamp() {
  * Retrieves list of swagger files to be processed for linting
  * @returns {Array} list of files to be processed for linting
  */
-exports.getConfigFilesChangedInPR = function getConfigFilesChangedInPR() {
-  if (exports.prOnly === 'true') {
-    let targetBranch, cmd, filesChanged, swaggerFilesInPR;
+export const getConfigFilesChangedInPR = function() {
+  if (prOnly === 'true') {
+    let targetBranch, cmd, filesChanged;
     try {
-      targetBranch = exports.getTargetBranch();
+      targetBranch = getTargetBranch();
       execSync(`git fetch origin ${targetBranch}`);
       cmd = `git diff --name-only HEAD $(git merge-base HEAD FETCH_HEAD)`;
       filesChanged = execSync(cmd, { encoding: 'utf8' }).split('\n');
@@ -283,7 +280,7 @@ exports.getConfigFilesChangedInPR = function getConfigFilesChangedInPR() {
       throw err;
     }
   } else {
-    return exports.swaggers;
+    return swaggers;
   }
 };
 
@@ -291,12 +288,12 @@ exports.getConfigFilesChangedInPR = function getConfigFilesChangedInPR() {
  * Retrieves list of swagger files to be processed for linting
  * @returns {Array} list of files to be processed for linting
  */
-exports.getFilesChangedInPR = function getFilesChangedInPR() {
-  let result = exports.swaggers;
-  if (exports.prOnly === 'true') {
+export const getFilesChangedInPR = function() {
+  let result = swaggers;
+  if (prOnly === 'true') {
     let targetBranch, cmd, filesChanged, swaggerFilesInPR;
     try {
-      targetBranch = exports.getTargetBranch();
+      targetBranch = getTargetBranch();
       execSync(`git fetch origin ${targetBranch}`);
       cmd = `git diff --name-only HEAD $(git merge-base HEAD FETCH_HEAD)`;
       filesChanged = execSync(cmd, { encoding: 'utf8' });
@@ -336,17 +333,17 @@ exports.getFilesChangedInPR = function getFilesChangedInPR() {
  * Downloads the remote schemas and initializes the validator with remote references.
  * @returns {Object} context Provides the schemas in json format and the validator.
  */
-exports.initializeValidator = async function initializeValidator() {
+export const initializeValidator = async function() {
   const context: stringMap.MutableStringMap<unknown> = {
-    extensionSwaggerSchema: await asyncJsonRequest(exports.extensionSwaggerSchemaUrl),
-    swaggerSchema: await asyncJsonRequest(exports.swaggerSchemaAltUrl),
-    exampleSchema: await asyncJsonRequest(exports.exampleSchemaUrl),
-    compositeSchema: await asyncJsonRequest(exports.compositeSchemaUrl)
+    extensionSwaggerSchema: await asyncJsonRequest(extensionSwaggerSchemaUrl),
+    swaggerSchema: await asyncJsonRequest(swaggerSchemaAltUrl),
+    exampleSchema: await asyncJsonRequest(exampleSchemaUrl),
+    compositeSchema: await asyncJsonRequest(compositeSchemaUrl)
   };
   let validator = new z({ breakOnFirstError: false });
-  validator.setRemoteReference(exports.swaggerSchemaUrl, context.swaggerSchema);
-  validator.setRemoteReference(exports.exampleSchemaUrl, context.exampleSchema);
-  validator.setRemoteReference(exports.compositeSchemaUrl, context.compositeSchema);
+  validator.setRemoteReference(swaggerSchemaUrl, context.swaggerSchema);
+  validator.setRemoteReference(exampleSchemaUrl, context.exampleSchema);
+  validator.setRemoteReference(compositeSchemaUrl, context.compositeSchema);
   context.validator = validator;
   return context;
 };

From 1f8ec387140919c9df2813e8597d08ad9c536584 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 13:46:50 -0700
Subject: [PATCH 11/14] imports

---
 package.json               |  6 ++++--
 scripts/breaking-change.ts | 24 +++++++++++++-----------
 scripts/momentOfTruth.ts   |  9 ++++-----
 test/util/utils.ts         | 34 ++++++++++++++++------------------
 4 files changed, 37 insertions(+), 36 deletions(-)

diff --git a/package.json b/package.json
index be846cf04f4a..f76623b5e517 100644
--- a/package.json
+++ b/package.json
@@ -15,9 +15,12 @@
     "@microsoft.azure/async-io": "^2.0.21",
     "@microsoft.azure/literate": "^1.0.25",
     "@microsoft.azure/polyfill": "^1.0.19",
+    "@octokit/rest": "^16.24.1",
     "@ts-common/commonmark-to-markdown": "^1.2.0",
     "@ts-common/fs": "0.2.0",
+    "@types/fs-extra": "^5.0.5",
     "@types/js-yaml": "^3.12.1",
+    "@types/request": "^2.48.1",
     "fs-extra": "^7.0.1",
     "glob": "^7.1.3",
     "js-yaml": "^3.13.1",
@@ -28,8 +31,7 @@
     "request-promise-native": "^1.0.7",
     "ts-node": "^8.1.0",
     "typescript": "^3.4.3",
-    "z-schema": "^4.0.2",
-    "@octokit/rest": "^16.24.1"
+    "z-schema": "^4.0.2"
   },
   "homepage": "https://github.com/azure/azure-rest-api-specs",
   "repository": {
diff --git a/scripts/breaking-change.ts b/scripts/breaking-change.ts
index 364f400dc3ae..70825c3d42da 100644
--- a/scripts/breaking-change.ts
+++ b/scripts/breaking-change.ts
@@ -3,13 +3,15 @@
 
 import * as stringMap from '@ts-common/string-map'
 import * as tsUtils from './ts-utils'
+import * as utils from '../test/util/utils'
+import * as path from 'path'
+import * as fs from 'fs-extra'
+import * as os from 'os'
+import * as childProcess from 'child_process'
+import * as oad from '@azure/oad'
+import * as util from 'util'
 
-const utils = require('../test/util/utils'),
-  path = require('path'),
-  fs = require('fs-extra'),
-  os = require('os'),
-  exec = require('util').promisify(require('child_process').exec),
-  oad = require('@azure/oad');
+const exec = util.promisify(childProcess.exec)
 
 // This map is used to store the mapping between files resolved and stored location
 var resolvedMapForNewSpecs: stringMap.MutableStringMap<string> = {};
@@ -34,7 +36,7 @@ function iconFor(type: unknown) {
   }
 }
 
-function shortName(filePath: unknown) {
+function shortName(filePath: string) {
   return `${path.basename(path.dirname(filePath))}/&#8203;<strong>${path.basename(filePath)}</strong>`;
 }
 
@@ -45,7 +47,7 @@ type Diff = {
   readonly message: unknown
 }
 
-function tableLine(filePath: unknown, diff: Diff) {
+function tableLine(filePath: string, diff: Diff) {
   return `|${iconFor(diff['type'])}|[${diff['type']} ${diff['id']} - ${diff['code']}](https://github.com/Azure/openapi-diff/blob/master/docs/rules/${diff['id']}.md)|[${shortName(filePath)}](${blobHref(filePath)} "${filePath}")|${diff['message']}|\n`;
 }
 
@@ -74,7 +76,7 @@ async function runOad(oldSpec: string, newSpec: string) {
   console.log(`New Spec: "${newSpec}"`);
   console.log(`>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>`);
 
-  let result = await oad.compare(oldSpec, newSpec, { consoleLogLevel: 'warn', json: true });
+  let result = await oad.compare(oldSpec, newSpec, { consoleLogLevel: 'warn' });
   console.log(result);
 
   if (!result) {
@@ -124,10 +126,10 @@ async function runScript() {
   console.log(swaggersToProcess);
 
   console.log('Finding new swaggers...')
-  let newSwaggers = [];
+  let newSwaggers: unknown[] = [];
   if (isRunningInTravisCI && swaggersToProcess.length > 0) {
     newSwaggers = await utils.doOnBranch(utils.getTargetBranch(), async () => {
-      return swaggersToProcess.filter((s: unknown) => !fs.existsSync(s))
+      return swaggersToProcess.filter((s: string) => !fs.existsSync(s))
     });
   }
 
diff --git a/scripts/momentOfTruth.ts b/scripts/momentOfTruth.ts
index 7015fb122ede..70f89f16f2d3 100644
--- a/scripts/momentOfTruth.ts
+++ b/scripts/momentOfTruth.ts
@@ -3,11 +3,10 @@
 
 import * as stringMap from '@ts-common/string-map'
 import * as tsUtils from './ts-utils'
-
-const exec = require('child_process').exec,
-    path = require('path'),
-    utils = require('../test/util/utils'),
-    fs = require('fs');
+import { exec } from 'child_process'
+import * as path from 'path'
+import * as utils from '../test/util/utils'
+import * as fs from 'fs'
 
 let configsToProcess = utils.getConfigFilesChangedInPR();
 let pullRequestNumber = utils.getPullRequestNumber();
diff --git a/test/util/utils.ts b/test/util/utils.ts
index d02aaee565e9..0b854382c084 100644
--- a/test/util/utils.ts
+++ b/test/util/utils.ts
@@ -3,20 +3,18 @@
 
 import * as tsUtils from '../../scripts/ts-utils'
 import * as stringMap from '@ts-common/string-map'
-
-var
-  os = require('os'),
-  fs = require('fs-extra'),
-  glob = require('glob'),
-  path = require('path'),
-  z = require('z-schema'),
-  YAML = require('js-yaml'),
-  request = require('request'),
-  util = require('util'),
-  execSync = require('child_process').execSync;
-
-const asyncJsonRequest = (url: unknown) => new Promise<unknown>((res, rej) => request(
-  { url: url, json: true },
+import * as os from 'os'
+import * as fs from 'fs-extra'
+import * as glob from 'glob'
+import * as path from 'path'
+const z = require('z-schema')
+import * as YAML from 'js-yaml'
+import request = require('request')
+import * as util from 'util'
+import { execSync } from 'child_process'
+
+const asyncJsonRequest = (url: string) => new Promise<unknown>((res, rej) => request(
+  { url, json: true },
   (error: unknown, _: unknown, body: unknown) => error ? rej(error) : res(body)
 ));
 
@@ -53,7 +51,7 @@ export const stripBOM = function(content: Buffer|string) {
  * Parses the json from the given filepath
  * @returns {string} clr command
  */
-export const parseJsonFromFile = async function(filepath: unknown) {
+export const parseJsonFromFile = async function(filepath: string) {
   const data = await fs.readFile(filepath, { encoding: 'utf8' });
   try {
     return YAML.safeLoad(stripBOM(data));
@@ -80,7 +78,7 @@ export const getTargetBranch = function() {
 /**
  * Check out a copy of a branch to a temporary location, execute a function, and then restore the previous state
  */
-export const doOnBranch = async function(branch: unknown, func: () => Promise<unknown>) {
+export const doOnBranch = async function<T>(branch: unknown, func: () => Promise<T>) {
   fetchBranch(branch);
   const branchSha = resolveRef(`origin/${branch}`);
   const tmpDir = path.join(os.tmpdir(), branchSha);
@@ -313,13 +311,13 @@ export const getFilesChangedInPR = function() {
       });
       console.log(`>>>> Number of swaggers found in this PR: ${swaggerFilesInPR.length}`);
 
-      var deletedFiles = swaggerFilesInPR.filter(function (swaggerFile: unknown) {
+      var deletedFiles = swaggerFilesInPR.filter(function (swaggerFile: string) {
         return !fs.existsSync(swaggerFile);
       });
       console.log('>>>>> Files deleted in this PR are as follows:')
       console.log(deletedFiles);
       // Remove files that have been deleted in the PR
-      swaggerFilesInPR = swaggerFilesInPR.filter(function (x: unknown) { return deletedFiles.indexOf(x) < 0 });
+      swaggerFilesInPR = swaggerFilesInPR.filter(function (x: string) { return deletedFiles.indexOf(x) < 0 });
 
       result = swaggerFilesInPR;
     } catch (err) {

From bf3096307a3ba9645f6bbb3eb13068b0a92d1cd9 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 14:01:48 -0700
Subject: [PATCH 12/14] pipelines.

---
 azure-pipelines.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index bf3a1db087d9..dfb2fe3b8983 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -41,7 +41,7 @@ jobs:
     displayName: 'npm install'
     inputs:
       verbose: false
-  - script: 'node scripts/semanticValidation.js'
+  - script: 'tsc && node scripts/semanticValidation.js'
     displayName: 'Semantic Validation'
 
 - job: "ModelValidation"
@@ -52,7 +52,7 @@ jobs:
     displayName: 'npm install'
     inputs:
       verbose: false
-  - script: 'node scripts/modelValidation.js'
+  - script: 'tsc && node scripts/modelValidation.js'
     displayName: 'Model Validation'
 
 - job: "Avocado"
@@ -94,7 +94,7 @@ jobs:
       verbose: false
   - script: 'scripts/install-dotnet.sh'
     displayName: 'install .Net'
-  - script: './node_modules/.bin/ts-node scripts/momentOfTruth.ts && node scripts/momentOfTruthPostProcessing.js'
+  - script: 'tsc && ./node_modules/.bin/ts-node scripts/momentOfTruth.ts && node scripts/momentOfTruthPostProcessing.js'
     displayName: 'LintDiff'
 
 - job: "SDK"

From 82c9c4812685ba67ee7f9658ac22dae2a3f5f4c1 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 14:08:58 -0700
Subject: [PATCH 13/14] tsc

---
 .travis.yml         | 8 ++++++--
 azure-pipelines.yml | 6 +++---
 2 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 02b0178d2447..d5c723118a43 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -36,22 +36,26 @@ script:
   - >-
     if [[ $MODE == 'semantic' ]]; then
       npm install
+      npm run tsc
       node scripts/semanticValidation.js
     fi
   - >-
     if [[ $MODE == 'model' ]]; then
       npm install
+      npm run tsc
       node scripts/modelValidation.js
     fi
   - >-
     if [[ $MODE == 'BreakingChange' ]]; then
       scripts/install-dotnet.sh
       npm install
-      ./node_modules/.bin/ts-node scripts/breaking-change.ts
+      npm run tsc
+      node scripts/breaking-change.ts
     fi
   - >-
     if [[ $MODE == 'lintdiff' ]]; then
       scripts/install-dotnet.sh
       npm install
-      ./node_modules/.bin/ts-node scripts/momentOfTruth.ts && node scripts/momentOfTruthPostProcessing.js
+      npm run tsc
+      node scripts/momentOfTruth.js && node scripts/momentOfTruthPostProcessing.js
     fi
diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index dfb2fe3b8983..7fa4e12420f5 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -41,7 +41,7 @@ jobs:
     displayName: 'npm install'
     inputs:
       verbose: false
-  - script: 'tsc && node scripts/semanticValidation.js'
+  - script: 'npm run tsc && node scripts/semanticValidation.js'
     displayName: 'Semantic Validation'
 
 - job: "ModelValidation"
@@ -52,7 +52,7 @@ jobs:
     displayName: 'npm install'
     inputs:
       verbose: false
-  - script: 'tsc && node scripts/modelValidation.js'
+  - script: 'npm run tsc && node scripts/modelValidation.js'
     displayName: 'Model Validation'
 
 - job: "Avocado"
@@ -94,7 +94,7 @@ jobs:
       verbose: false
   - script: 'scripts/install-dotnet.sh'
     displayName: 'install .Net'
-  - script: 'tsc && ./node_modules/.bin/ts-node scripts/momentOfTruth.ts && node scripts/momentOfTruthPostProcessing.js'
+  - script: 'npm run tsc && node scripts/momentOfTruth.js && node scripts/momentOfTruthPostProcessing.js'
     displayName: 'LintDiff'
 
 - job: "SDK"

From c7a5e1bfd8a99ae637ceddd98b3056f93c163ce5 Mon Sep 17 00:00:00 2001
From: Sergey Shandar <sergey.shandar@gmail.com>
Date: Mon, 15 Apr 2019 14:15:17 -0700
Subject: [PATCH 14/14] tsc

---
 azure-pipelines.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
index 7fa4e12420f5..17c93f53b932 100644
--- a/azure-pipelines.yml
+++ b/azure-pipelines.yml
@@ -78,7 +78,7 @@ jobs:
     displayName: 'npm install'
     inputs:
       verbose: false
-  - script: './node_modules/.bin/ts-node scripts/breaking-change.ts'
+  - script: 'npm run tsc && node scripts/breaking-change.js'
     displayName: 'Breaking Changes'
 
 - job: "LintDiff"