Fix asinit tsconfig.json generation

dcodeIO · dcodeIO · commit fe9d53329d3e · 2018-04-25T22:54:55.000+02:00
This used to extend the .d.ts file instead of the base .json, which was wrong
diff --git a/bin/asinit b/bin/asinit
@@ -30,7 +30,7 @@ const compilerDir = path.join(__dirname, "..");
 const compilerVersion = require(path.join(compilerDir, "package.json")).version;
 const assemblyDir = path.join(projectDir, "assembly");
 const tsconfigFile = path.join(assemblyDir, "tsconfig.json");
-const definitionsFile = path.relative(assemblyDir, path.join(compilerDir, "std", "assembly.d.ts"));
+const tsconfigBase = path.relative(assemblyDir, path.join(compilerDir, "std", "assembly.json"));
 const entryFile = path.join(assemblyDir, "index.ts");
 const buildDir = path.join(projectDir, "build");
 const gitignoreFile = path.join(buildDir, ".gitignore");
@@ -145,10 +145,10 @@ function ensureAssemblyDirectory() {
 
 function ensureTsconfigJson() {
   console.log("- Making sure that 'assembly/tsconfig.json' is set up...");
-  const definitionsPath = definitionsFile.replace(/\\/g, "/");
+  const base = tsconfigBase.replace(/\\/g, "/");
   if (!fs.existsSync(tsconfigFile)) {
     fs.writeFileSync(tsconfigFile, JSON.stringify({
-      "extends": definitionsPath,
+      "extends": base,
       "include": [
         "./**/*.ts"
       ]
@@ -157,7 +157,7 @@ function ensureTsconfigJson() {
 
   } else {
     let tsconfig = JSON.parse(fs.readFileSync(tsconfigFile, "utf8"));
-    tsconfig["extends"] = definitionsPath;
+    tsconfig["extends"] = base;
     fs.writeFileSync(tsconfigFile, JSON.stringify(tsconfig, null, 2));
     console.log(chalk.green("  Updated: ") + tsconfigFile);
   }
diff --git a/examples/mandelbrot/assembly/tsconfig.json b/examples/mandelbrot/assembly/tsconfig.json
@@ -1,5 +1,5 @@
 {
-  "extends": "../../../std/assembly.d.ts",
+  "extends": "../../../std/assembly.json",
   "include": [
     "./**/*.ts"
   ]

Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,5 @@`
`1`	`1`	`{`
`2`		`- "extends": "../../../std/assembly.d.ts",`
	`2`	`+ "extends": "../../../std/assembly.json",`
`3`	`3`	`"include": [`
`4`	`4`	`"./*/.ts"`
`5`	`5`	`]`