Migrate tscWatchMode to vfs

Author: rbuckton

.gitignore

@@ -46,6 +46,7 @@ scripts/importDefinitelyTypedTests/importDefinitelyTypedTests.js
 scripts/generateLocalizedDiagnosticMessages.js
 scripts/*.js.map
 scripts/typings/
+scripts/typemock/dist
 coverage/
 internal/
 **/.DS_Store

.vscode/tasks.json

@@ -1,30 +1,34 @@
-// Available variables which can be used inside of strings.
-// ${workspaceRoot}: the root folder of the team
-// ${file}: the current opened file
-// ${fileBasename}: the current opened file's basename
-// ${fileDirname}: the current opened file's dirname
-// ${fileExtname}: the current opened file's extension
-// ${cwd}: the current working directory of the spawned process
 {
-    "version": "0.1.0",
-    "command": "gulp",
-    "isShellCommand": true,
-    "showOutput": "silent",
+    // See https://go.microsoft.com/fwlink/?LinkId=733558
+    // for the documentation about the tasks.json format
+    "version": "2.0.0",
     "tasks": [
         {
-            "taskName": "local",
-            "isBuildCommand": true,
-            "showOutput": "silent",
-            "problemMatcher": [
-                "$tsc"
-            ]
+            "type": "shell",
+            "identifier": "local",
+            "label": "gulp: local",
+            "command": "gulp",
+            "args": ["local"],
+            "group": { "kind": "build", "isDefault": true },
+            "problemMatcher": ["$gulp-tsc"]
         },
         {
-            "taskName": "tests",
-            "showOutput": "silent",
-            "problemMatcher": [
-                "$tsc"
-            ]
+            "type": "shell",
+            "identifier": "tsc",
+            "label": "gulp: tsc",
+            "command": "gulp",
+            "args": ["tsc"],
+            "group": "build",
+            "problemMatcher": ["$gulp-tsc"]
+        },
+        {
+            "type": "shell",
+            "identifier": "tests",
+            "label": "gulp: tests",
+            "command": "gulp",
+            "args": ["tests"],
+            "group": "build",
+            "problemMatcher": ["$gulp-tsc"]
         }
     ]
 }

Gulpfile.ts

@@ -602,10 +602,19 @@ gulp.task("LKG", "Makes a new LKG out of the built js files", ["clean", "dontUse
     return runSequence("LKGInternal", "VerifyLKG");
 });
 
+gulp.task("typemock", () => {
+    const typemock = tsc.createProject("scripts/typemock/src/tsconfig.json", getCompilerSettings({}, /*useBuiltCompiler*/ true));
+    return typemock.src()
+        .pipe(sourcemaps.init())
+        .pipe(newer("scripts/typemock/dist"))
+        .pipe(typemock())
+        .pipe(sourcemaps.write(".", <any>{ includeContent: false, destPath: "scripts/typemock/dist" }))
+        .pipe(gulp.dest("scripts/typemock/dist"));
+});
 
 // Task to build the tests infrastructure using the built compiler
 const run = path.join(builtLocalDirectory, "run.js");
-gulp.task(run, /*help*/ false, [servicesFile, tsserverLibraryFile], () => {
+gulp.task(run, /*help*/ false, [servicesFile, tsserverLibraryFile, "typemock"], () => {
     const testProject = tsc.createProject("src/harness/tsconfig.json", getCompilerSettings({}, /*useBuiltCompiler*/ true));
     return testProject.src()
         .pipe(newer(run))
@@ -644,7 +653,7 @@ function restoreSavedNodeEnv() {
     process.env.NODE_ENV = savedNodeEnv;
 }
 
-function runConsoleTests(defaultReporter: string, runInParallel: boolean, done: (e?: any) => void) {
+function runConsoleTests(defaultReporter: string, runInParallel: boolean, done: (e?: any) => void, noExit?: boolean) {
     const lintFlag = cmdLineOptions.lint;
     cleanTestDirs((err) => {
         if (err) { console.error(err); failWithStatus(err, 1); }
@@ -720,8 +729,10 @@ function runConsoleTests(defaultReporter: string, runInParallel: boolean, done:
     });
 
     function failWithStatus(err?: any, status?: number) {
-        if (err || status) {
-            process.exit(typeof status === "number" ? status : 2);
+        if (!noExit) {
+            if (err || status) {
+                process.exit(typeof status === "number" ? status : 2);
+            }
         }
         done();
     }
@@ -762,6 +773,10 @@ gulp.task("runtests",
         runConsoleTests("mocha-fivemat-progress-reporter", /*runInParallel*/ false, done);
     });
 
+gulp.task("runtests-in-watch", ["build-rules", "tests"], done => {
+    runConsoleTests("min", /*runInParallel*/ false, done, /*noExit*/ true);
+});
+
 const nodeServerOutFile = "tests/webTestServer.js";
 const nodeServerInFile = "tests/webTestServer.ts";
 gulp.task(nodeServerOutFile, /*help*/ false, [servicesFile], () => {
@@ -1110,3 +1125,7 @@ gulp.task("default", "Runs 'local'", ["local"]);
 gulp.task("watch", "Watches the src/ directory for changes and executes runtests-parallel.", [], () => {
     gulp.watch("src/**/*.*", ["runtests-parallel"]);
 });
+
+gulp.task("watch-no-parallel", "Watches the src/ directory for changes and executes runtests.", [], () => {
+    gulp.watch(["src/**/*.*", "scripts/typemock/src/**/*.*"], ["runtests-in-watch"]);
+});

package.json

@@ -48,12 +48,13 @@
         "@types/node": "latest",
         "@types/q": "latest",
         "@types/run-sequence": "latest",
+        "@types/source-map-support": "^0.4.0",
         "@types/through2": "latest",
         "@types/xml2js": "^0.4.0",
-        "xml2js": "^0.4.19",
         "browser-resolve": "^1.11.2",
         "browserify": "latest",
         "chai": "latest",
+        "colors": "latest",
         "convert-source-map": "latest",
         "del": "latest",
         "gulp": "3.X",
@@ -79,9 +80,9 @@
         "travis-fold": "latest",
         "ts-node": "latest",
         "tslint": "latest",
+        "typescript": "next",
         "vinyl": "latest",
-        "colors": "latest",
-        "typescript": "next"
+        "xml2js": "^0.4.19"
     },
     "scripts": {
         "pretest": "jake tests",

scripts/typemock/gulpfile.js

@@ -0,0 +1,29 @@
+const gulp = require("gulp");
+const gutil = require("gulp-util");
+const sourcemaps = require("gulp-sourcemaps");
+const tsb = require("gulp-tsb");
+const mocha = require("gulp-mocha");
+const del = require("del");
+
+const src = {
+    compile: tsb.create("src/tsconfig.json"),
+    src: () => gulp.src(["src/**/*.ts"]),
+    dest: () => gulp.dest("dist")
+};
+
+gulp.task("clean", () => del(["dist/**/*"]));
+
+gulp.task("build", () => src.src()
+    .pipe(sourcemaps.init())
+    .pipe(src.compile())
+    .pipe(sourcemaps.write(".", { includeContent: false, destPath: "dist" }))
+    .pipe(gulp.dest("dist")));
+
+gulp.task("test", ["build"], () => gulp
+    .src(["dist/tests/index.js"], { read: false })
+    .pipe(mocha({ reporter: "dot" })));
+
+
+gulp.task("watch", ["test"], () => gulp.watch(["src/**/*"], ["test"]));
+
+gulp.task("default", ["test"]);

scripts/typemock/package.json

@@ -0,0 +1,35 @@
+{
+  "private": true,
+  "name": "typemock",
+  "version": "0.0.0",
+  "description": "JavaScript Mock object framework",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "scripts": {
+    "test": "gulp test"
+  },
+  "keywords": [
+    "javascript",
+    "mock",
+    "type",
+    "typescript"
+  ],
+  "author": "Ron Buckton ([email protected])",
+  "license": "Apache-2.0",
+  "devDependencies": {
+    "@types/chai": "^4.0.4",
+    "@types/mocha": "^2.2.27",
+    "@types/node": "^8.0.20",
+    "@types/source-map-support": "^0.4.0",
+    "chai": "^4.1.2",
+    "del": "^2.0.2",
+    "gulp": "^3.9.1",
+    "gulp-mocha": "^4.3.1",
+    "gulp-sourcemaps": "^2.6.1",
+    "gulp-tsb": "^2.0.5",
+    "merge2": "^0.3.6",
+    "mocha": "^2.2.5",
+    "source-map-support": "^0.5.0",
+    "typescript": "^2.6.1"
+  }
+}