Migrate core.ts

Author: rbuckton

Gulpfile.ts

@@ -611,57 +611,23 @@ gulp.task("LKG", "Makes a new LKG out of the built js files", ["clean", "dontUse
     return runSequence("LKGInternal", "VerifyLKG");
 });
 
-gulp.task("typemock", () => {
-    const project = tsc.createProject("scripts/typemock/tsconfig.json", getCompilerSettings({}, /*useBuiltCompiler*/ false));
+function compilePrivatePackage(packageName) {
+    const project = tsc.createProject(`scripts/${packageName}/tsconfig.json`, getCompilerSettings({}, /*useBuiltCompiler*/ false));
     return project.src()
         .pipe(sourcemaps.init())
-        .pipe(newer("scripts/typemock/dist/index.js"))
+        .pipe(newer(`scripts/${packageName}/dist/index.js`))
         .pipe(project())
-        .pipe(sourcemaps.write(".", <any>{ sourceRoot: "../src", includeContent: false, destPath: "scripts/typemock/dist" }))
-        .pipe(gulp.dest("scripts/typemock/dist"));
-});
-
-gulp.task("vfs-core", () => {
-    const project = tsc.createProject("scripts/vfs-core/tsconfig.json", getCompilerSettings({}, /*useBuiltCompiler*/ false));
-    return project.src()
-        .pipe(sourcemaps.init())
-        .pipe(newer("scripts/vfs-core/dist/index.js"))
-        .pipe(project())
-        .pipe(sourcemaps.write(".", <any>{ sourceRoot: "../src", includeContent: false, destPath: "scripts/vfs-core/dist" }))
-        .pipe(gulp.dest("scripts/vfs-core/dist"));
-});
-
-gulp.task("vfs-errors", () => {
-    const project = tsc.createProject("scripts/vfs-errors/tsconfig.json", getCompilerSettings({}, /*useBuiltCompiler*/ false));
-    return project.src()
-        .pipe(sourcemaps.init())
-        .pipe(newer("scripts/vfs-errors/dist/index.js"))
-        .pipe(project())
-        .pipe(sourcemaps.write(".", <any>{ sourceRoot: "../src", includeContent: false, destPath: "scripts/vfs-errors/dist" }))
-        .pipe(gulp.dest("scripts/vfs-errors/dist"));
-});
-
-gulp.task("vfs-path", ["vfs-core", "vfs-errors"], () => {
-    const project = tsc.createProject("scripts/vfs-path/tsconfig.json", getCompilerSettings({}, /*useBuiltCompiler*/ false));
-    return project.src()
-        .pipe(sourcemaps.init())
-        .pipe(newer("scripts/vfs-path/dist/index.js"))
-        .pipe(project())
-        .pipe(sourcemaps.write(".", <any>{ sourceRoot: "../src", includeContent: false, destPath: "scripts/vfs-path/dist" }))
-        .pipe(gulp.dest("scripts/vfs-path/dist"));
-});
-
-gulp.task("vfs", ["vfs-core", "vfs-errors", "vfs-path"], () => {
-    const project = tsc.createProject("scripts/vfs/tsconfig.json", getCompilerSettings({}, /*useBuiltCompiler*/ false));
-    return project.src()
-        .pipe(sourcemaps.init())
-        .pipe(newer("scripts/vfs/dist/index.js"))
-        .pipe(project())
-        .pipe(sourcemaps.write(".", <any>{ sourceRoot: "../src", includeContent: false, destPath: "scripts/vfs/dist" }))
-        .pipe(gulp.dest("scripts/vfs/dist"));
-});
+        .pipe(sourcemaps.write(".", <any>{ sourceRoot: "../src", includeContent: false, destPath: `scripts/${packageName}/dist` }))
+        .pipe(gulp.dest(`scripts/${packageName}/dist`));
+}
 
-gulp.task("private-packages", ["typemock", "vfs"]);
+gulp.task("typemock", () => compilePrivatePackage("typemock"));
+gulp.task("vfs-core", () => compilePrivatePackage("vfs-core"));
+gulp.task("vfs-errors", () => compilePrivatePackage("vfs-errors"));
+gulp.task("vfs-path", ["vfs-core", "vfs-errors"], () => compilePrivatePackage("vfs-path"));
+gulp.task("vfs", ["vfs-core", "vfs-errors", "vfs-path", "typemock"], () => compilePrivatePackage("vfs"));
+gulp.task("harness-core", ["vfs-core"], () => compilePrivatePackage("harness-core"));
+gulp.task("private-packages", ["typemock", "vfs", "harness-core"]);
 
 // Task to build the tests infrastructure using the built compiler
 const run = path.join(builtLocalDirectory, "run.js");

Jakefile.js

@@ -803,72 +803,28 @@ task("LKG", ["clean", "release", "local"].concat(libraryTargets), function () {
 // Test directory
 directory(builtLocalDirectory);
 
-task("typemock", function () {
-    var startCompileTime = mark();
-    execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/typemock/tsconfig.json"], function (error) {
-        if (error) {
-            fail("Compilation unsuccessful.");
-        }
-        else {
-            complete();
-        }
-        measure(startCompileTime);
-    });
-}, { async: true });
-
-task("vfs-core", function () {
-    var startCompileTime = mark();
-    execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs-core/tsconfig.json"], function (error) {
-        if (error) {
-            fail("Compilation unsuccessful.");
-        }
-        else {
-            complete();
-        }
-        measure(startCompileTime);
-    });
-}, { async: true });
-
-task("vfs-errors", function () {
-    var startCompileTime = mark();
-    execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs-errors/tsconfig.json"], function (error) {
-        if (error) {
-            fail("Compilation unsuccessful.");
-        }
-        else {
-            complete();
-        }
-        measure(startCompileTime);
-    });
-}, { async: true });
-
-task("vfs-path", ["vfs-core", "vfs-errors"], function () {
-    var startCompileTime = mark();
-    execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs-path/tsconfig.json"], function (error) {
-        if (error) {
-            fail("Compilation unsuccessful.");
-        }
-        else {
-            complete();
-        }
-        measure(startCompileTime);
-    });
-}, { async: true });
-
-task("vfs", ["vfs-core", "vfs-errors", "vfs-path", "typemock"], function () {
-    var startCompileTime = mark();
-    execCompiler(/*useBuiltCompiler*/ false, ["-p", "scripts/vfs/tsconfig.json"], function (error) {
-        if (error) {
-            fail("Compilation unsuccessful.");
-        }
-        else {
-            complete();
-        }
-        measure(startCompileTime);
-    });
-}, { async: true });
+function privatePackage(packageName, prereqs) {
+    task(packageName, prereqs, function () {
+        var startCompileTime = mark();
+        execCompiler(/*useBuiltCompiler*/ false, ["-p", `scripts/${packageName}/tsconfig.json`], function (error) {
+            if (error) {
+                fail("Compilation unsuccessful.");
+            }
+            else {
+                complete();
+            }
+            measure(startCompileTime);
+        });    
+    }, { async: true });
+}
 
-task("private-packages", ["typemock", "vfs"]);
+privatePackage("typemock");
+privatePackage("vfs-core");
+privatePackage("vfs-errors");
+privatePackage("vfs-path", ["vfs-core", "vfs-errors"]);
+privatePackage("vfs", ["vfs-path", "typemock"]);
+privatePackage("harness-core", ["vfs-core"]);
+task("private-packages", ["typemock", "vfs", "harness-core"]);
 
 // Task to build the tests infrastructure using the built compiler
 var run = path.join(builtLocalDirectory, "run.js");

jenkins.sh

@@ -1,9 +1,14 @@
 #!/usr/bin/env bash
+if [ "$1" = "6" ]; then
+    echo "NodeJS v6 is no longer supported, build skipped.";
+    exit;
+fi;
 
 # Set up NVM
 export NVM_DIR="/home/dotnet-bot/.nvm"
 [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"
 
+
 nvm install $1
 
 npm uninstall typescript --no-save

package.json

@@ -53,6 +53,7 @@
         "@types/xml2js": "^0.4.0",
         "@typescript/vfs-path": "file:scripts/vfs-path",
         "@typescript/vfs": "file:scripts/vfs",
+        "@typescript/harness-core": "file:scripts/harness-core",
         "browser-resolve": "^1.11.2",
         "browserify": "latest",
         "chai": "latest",

scripts/harness-core/gulpfile.js

@@ -0,0 +1,18 @@
+const gulp = require("gulp");
+const sourcemaps = require("gulp-sourcemaps");
+const tsb = require("gulp-tsb");
+const del = require("del");
+
+const project = tsb.create("tsconfig.json")
+
+gulp.task("clean", () => del(["dist/**/*"]));
+
+gulp.task("build", () => gulp.src(["src/**/*.ts"])
+    .pipe(sourcemaps.init())
+    .pipe(project())
+    .pipe(sourcemaps.write(".", { sourceRoot: "../src", includeContent: false, destPath: "dist" }))
+    .pipe(gulp.dest("dist")));
+
+gulp.task("watch", () => gulp.watch(["src/**/*", "tsconfig.json"], ["build"]));
+
+gulp.task("default", ["build"]);

scripts/harness-core/package.json

@@ -0,0 +1,23 @@
+{
+  "private": true,
+  "name": "@typescript/harness-core",
+  "version": "0.0.0",
+  "description": "TypeScript test harness core",
+  "main": "dist/index.js",
+  "types": "dist/index.d.ts",
+  "author": "Ron Buckton (ron.buckton@microsoft.com)",
+  "license": "Apache-2.0",
+  "dependencies": {
+    "@typescript/vfs-core": "file:../vfs-core"
+  },
+  "devDependencies": {
+    "@types/node": "^8.0.20",
+    "@types/source-map-support": "^0.4.0",
+    "del": "^2.0.2",
+    "gulp": "^3.9.1",
+    "gulp-sourcemaps": "^2.6.1",
+    "gulp-tsb": "^2.0.5",
+    "source-map-support": "^0.5.0",
+    "typescript": "^2.6.1"
+  }
+}

scripts/harness-core/src/crypto.ts

@@ -0,0 +1,67 @@
+const H = new Uint32Array(5);
+const W = new Uint8Array(80);
+const B = new Uint8Array(64);
+const BLOCK_SIZE = 64;
+
+export function sha1(message: string): string {
+    let buffer = B;
+    const textSize = message.length;
+    const messageSize = textSize * 2;
+    const finalBlockSize = messageSize % BLOCK_SIZE;
+    const padSize = (finalBlockSize < BLOCK_SIZE - 8 - 1 ? BLOCK_SIZE : BLOCK_SIZE * 2) - finalBlockSize;
+    const byteLength = messageSize + padSize;
+    if (byteLength > BLOCK_SIZE) {
+        buffer = new Uint8Array(byteLength);
+    }
+
+    const bufferView = new DataView(buffer.buffer);
+    for (let i = 0; i < textSize; ++i) {
+        bufferView.setUint16(i * 2, message.charCodeAt(i));
+    }
+
+    buffer[messageSize] = 0x80;
+    bufferView.setUint32(byteLength - 4, messageSize * 8);
+    H[0] = 0x67452301, H[1] = 0xefcdab89, H[2] = 0x98badcfe, H[3] = 0x10325476, H[4] = 0xc3d2e1f0;
+    for (let offset = 0; offset < byteLength; offset += BLOCK_SIZE) {
+        let a = H[0], b = H[1], c = H[2], d = H[3], e = H[4];
+        for (let i = 0; i < 80; ++i) {
+            if (i < 16) {
+                const x = offset + i * 4;
+                W[i] = buffer[x] << 24 | buffer[x + 1] << 16 | buffer[x + 2] << 8 | buffer[x + 3];
+            }
+            else {
+                const x = W[i - 3] ^ W[i - 8] ^ W[i - 14] ^ W[i - 16];
+                W[i] = (x << 1 | x >>> 31) >>> 0;
+            }
+
+            let t = (a << 5 | a >>> 27) >>> 0 + e + W[i];
+            if (i < 20) {
+                t += ((b & c) | (~b & d)) + 0x5A827999;
+            }
+            else if (i < 40) {
+                t += (b ^ c ^ d) + 0x6ED9EBA1;
+            }
+            else if (i < 60) {
+                t += ((b & c) | (b & d) | (c & d)) + 0x8F1BBCDC;
+            }
+            else {
+                t += (b ^ c ^ d) + 0xCA62C1D6;
+            }
+
+            e = d, d = c, c = (b << 30 | b >>> 2) >>> 0, b = a, a = t;
+        }
+
+        H[0] += a, H[1] += b, H[2] += c, H[3] += d, H[4] += e;
+    }
+
+    for (let i = 0; i < 5; ++i) {
+        bufferView.setUint32(i * 4, H[i]);
+    }
+
+    let result = "";
+    for (let i = 0; i < 20; ++i) {
+        result += (buffer[i] < 16 ? "0" : "") + buffer[i].toString(16);
+    }
+
+    return result;
+}

scripts/harness-core/src/index.ts

@@ -0,0 +1,3 @@
+export * from "@typescript/vfs-core";
+export * from "./strings";
+export * from "./crypto";