Attempt to rewrite the jakefile and fail

Author: SeaRyanC

Jakefile.js

@@ -75,6 +75,7 @@
         "mocha": "latest",
         "mocha-fivemat-progress-reporter": "latest",
         "q": "latest",
+        "remove-internal": "^2.9.2",
         "run-sequence": "latest",
         "sorcery": "latest",
         "source-map-support": "latest",

package.json

@@ -1,36 +1,43 @@
+import path = require("path");
+import fs = require("fs");
+
 interface DiagnosticDetails {
     category: string;
     code: number;
     reportsUnnecessary?: {};
     isEarly?: boolean;
 }
 
-type InputDiagnosticMessageTable = ts.Map<DiagnosticDetails>;
+type InputDiagnosticMessageTable = Map<string, DiagnosticDetails>;
 
 function main(): void {
-    const sys = ts.sys;
-    if (sys.args.length < 1) {
-        sys.write("Usage:" + sys.newLine);
-        sys.write("\tnode processDiagnosticMessages.js <diagnostic-json-input-file>" + sys.newLine);
+    if (process.argv.length < 3) {
+        console.log("Usage:");
+        console.log("\tnode processDiagnosticMessages.js <diagnostic-json-input-file>");
         return;
     }
 
     function writeFile(fileName: string, contents: string) {
-        const inputDirectory = ts.getDirectoryPath(inputFilePath);
-        const fileOutputPath = ts.combinePaths(inputDirectory, fileName);
-        sys.writeFile(fileOutputPath, contents);
+        fs.writeFile(path.join(path.dirname(inputFilePath), fileName), contents, { encoding: "utf-8" }, err => {
+            if (err) throw err;
+        })
     }
 
-    const inputFilePath = sys.args[0].replace(/\\/g, "/");
-    const inputStr = sys.readFile(inputFilePath)!;
+    const inputFilePath = process.argv[2].replace(/\\/g, "/");
+    console.log(`Reading diagnostics from ${inputFilePath}`);
+    const inputStr = fs.readFileSync(inputFilePath, { encoding: "utf-8" });
 
     const diagnosticMessagesJson: { [key: string]: DiagnosticDetails } = JSON.parse(inputStr);
 
-    const diagnosticMessages: InputDiagnosticMessageTable = ts.createMapFromTemplate(diagnosticMessagesJson);
+    const diagnosticMessages: InputDiagnosticMessageTable = new Map();
+    for (const key in diagnosticMessagesJson) {
+        if (Object.hasOwnProperty.call(diagnosticMessagesJson, key)) {
+            diagnosticMessages.set(key, diagnosticMessagesJson[key]);
+        }
+    }
 
-    const outputFilesDir = ts.getDirectoryPath(inputFilePath);
-    const thisFilePathRel = ts.getRelativePathToDirectoryOrUrl(outputFilesDir, sys.getExecutingFilePath(),
-        sys.getCurrentDirectory(), ts.createGetCanonicalFileName(sys.useCaseSensitiveFileNames), /* isAbsolutePathAnUrl */ false);
+    const outputFilesDir = path.dirname(inputFilePath);
+    const thisFilePathRel = path.relative(process.cwd(), outputFilesDir);
 
     const infoFileOutput = buildInfoFileOutput(diagnosticMessages, "./diagnosticInformationMap.generated.ts", thisFilePathRel);
     checkForUniqueCodes(diagnosticMessages);

scripts/processDiagnosticMessages.ts

@@ -1,20 +1,15 @@
 {
     "compilerOptions": {
         "removeComments": false,
-        "outFile": "processDiagnosticMessages.js",
         "target": "es5",
         "declaration": false,
         "lib": [
             "es6",
             "scripthost"
-        ]
+        ],
+        "types": ["node"]
     },
     "files": [
-        "../src/compiler/types.ts",
-        "../src/compiler/performance.ts",
-        "../src/compiler/core.ts",
-        "../src/compiler/sys.ts",
-
         "processDiagnosticMessages.ts"
     ]
 }

scripts/processDiagnosticMessages.tsconfig.json

@@ -10,6 +10,10 @@
 		"noUnusedParameters": true,
 		"strictNullChecks": true,
 		"module": "commonjs",
-		"outDir": "../../built/local/tslint"
+		"outDir": "../../built/local/tslint",
+		"baseUrl": "../..",
+		"paths": {
+			"typescript": ["lib/typescript.d.ts"]
+		}
 	}
 }

scripts/tslint/tsconfig.json

@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outDir": "../built/local/",
+        "outDir": "../../built/local/",
         "composite": false,
         "declaration": false,
         "removeComments": true,

src/cancellationToken/tsconfig.json

@@ -1,7 +1,7 @@
 {
     "extends": "../tsconfig-base",
     "compilerOptions": {
-        "outFile": "../built/local/harness.js",
+        "outFile": "../../built/local/harness.js",
         "types": [
             "node", "mocha", "chai"
         ],
@@ -16,7 +16,7 @@
         { "path": "../compiler" },
         { "path": "../services" },
         { "path": "../server" },
-        { "path": "../typingsInstallerCore" },
+        { "path": "../typingsInstallerCore" }
     ],
 
     "files": [

src/harness/tsconfig.json

@@ -1,5 +1,5 @@
 // <auto-generated />
-// generated from './diagnosticInformationMap.generated.ts' by '../../scripts/processDiagnosticMessages.js'
+// generated from './diagnosticInformationMap.generated.ts' by 'src\parser'
 /* @internal */
 namespace ts {
     function diag(code: number, category: DiagnosticCategory, key: string, message: string, reportsUnnecessary?: {}): DiagnosticMessage {

src/parser/diagnosticInformationMap.generated.ts

@@ -8,6 +8,7 @@
     ],
     "references": [
         { "path": "../core", "prepend": true },
+        { "path": "../parser", "prepend": true },
         { "path": "../compiler", "prepend": true }
     ]
 }

src/tsc/tsconfig.json

@@ -2,6 +2,11 @@
     "files": [],
     "include": [],
     "references": [
-        { "path": "./tsc" }
+        { "path": "./tsc" },
+        { "path": "./tsserver" },
+        { "path": "./typingsInstaller" },
+        { "path": "./watchGuard" },
+        { "path": "./cancellationToken" },
+        { "path": "./testRunner" }
     ]
 }

src/tsconfig.json

@@ -12,6 +12,7 @@
     ],
     "references": [
         { "path": "../core", "prepend": true },
+        { "path": "../parser", "prepend": true },
         { "path": "../compiler", "prepend": true },
         { "path": "../services", "prepend": true },
         { "path": "../server", "prepend": true }

src/tsserver/tsconfig.json

@@ -2,7 +2,7 @@
     "extends": "../tsconfig-base",
     "compilerOptions": {
         "removeComments": true,
-        "outFile": "../built/local/typingsInstaller.js",
+        "outFile": "../../built/local/typingsInstaller.js",
         "types": [
             "node"
         ],

src/typingsInstaller/tsconfig.json

@@ -2,7 +2,7 @@
     "extends": "../tsconfig-base",
     "compilerOptions": {
         "removeComments": true,
-        "outFile": "../built/local/watchGuard.js",
+        "outFile": "../../built/local/watchGuard.js",
         "types": [
             "node"
         ],