@defold-typescript/cli 0.4.0 → 0.4.2

package/dist/bin.js

@@ -334,6 +334,13 @@ var BIOME_JSON_CONTENT = {
     }
   }
 };
+var VSCODE_EXTENSIONS_CONTENT = {
+  recommendations: ["sumneko.lua", "astrochili.defold"],
+  unwantedRecommendations: ["johnnymorganz.luau-lsp"]
+};
+var VSCODE_SETTINGS_CONTENT = {
+  "Lua.workspace.ignoreDir": ["src"]
+};
 var MAIN_TS_CONTENT = `export function init(): void {
   const start = vmath.vector3(0, 0, 0);
   msg.post("main:/hero", "spawn", { start });
@@ -367,9 +374,9 @@ var SCAFFOLD_DEV_DEPS = {
   "@defold-typescript/types": typesVersionSpec(),
   "@biomejs/biome": "^2.2.0"
 };
-function repairManagedDevDeps(devDeps) {
+function repairManagedDevDeps(devDeps, force = false) {
   delete devDeps["@defold-typescript/transpiler"];
-  if (devDeps["@defold-typescript/types"]?.startsWith("workspace:")) {
+  if (force || devDeps["@defold-typescript/types"]?.startsWith("workspace:")) {
     devDeps["@defold-typescript/types"] = typesVersionSpec();
   }
 }
@@ -407,7 +414,108 @@ function writeBiome(cwd, written) {
   writeJson(biomePath, BIOME_JSON_CONTENT);
   written.push("biome.json");
 }
-function writeTsSurface(cwd, written) {
+function parseJsonc(text) {
+  let out = "";
+  let inString = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+  for (let i = 0;i < text.length; i++) {
+    const ch = text[i];
+    const next = text[i + 1];
+    if (inLineComment) {
+      if (ch === `
+`) {
+        inLineComment = false;
+        out += ch;
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (ch === "*" && next === "/") {
+        inBlockComment = false;
+        i++;
+      }
+      continue;
+    }
+    if (inString) {
+      out += ch;
+      if (ch === "\\") {
+        out += next ?? "";
+        i++;
+      } else if (ch === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      out += ch;
+    } else if (ch === "/" && next === "/") {
+      inLineComment = true;
+      i++;
+    } else if (ch === "/" && next === "*") {
+      inBlockComment = true;
+      i++;
+    } else {
+      out += ch;
+    }
+  }
+  return JSON.parse(out.replace(/,(\s*[}\]])/g, "$1"));
+}
+function isJsonObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function unionStrings(existing, additions) {
+  const out = Array.isArray(existing) ? existing.filter((v) => typeof v === "string") : [];
+  for (const value of additions) {
+    if (!out.includes(value)) {
+      out.push(value);
+    }
+  }
+  return out;
+}
+function readVscodeJson(filePath) {
+  try {
+    const parsed = parseJsonc(readFileSync5(filePath, "utf8"));
+    return isJsonObject(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function writeVscodeExtensions(cwd, written) {
+  const dir = path6.join(cwd, ".vscode");
+  const filePath = path6.join(dir, "extensions.json");
+  if (existsSync2(filePath)) {
+    const existing = readVscodeJson(filePath);
+    if (existing === null) {
+      return;
+    }
+    existing.recommendations = unionStrings(existing.recommendations, VSCODE_EXTENSIONS_CONTENT.recommendations);
+    existing.unwantedRecommendations = unionStrings(existing.unwantedRecommendations, VSCODE_EXTENSIONS_CONTENT.unwantedRecommendations);
+    writeJson(filePath, existing);
+    return;
+  }
+  mkdirSync2(dir, { recursive: true });
+  writeJson(filePath, VSCODE_EXTENSIONS_CONTENT);
+  written.push(".vscode/extensions.json");
+}
+function writeVscodeSettings(cwd, written) {
+  const dir = path6.join(cwd, ".vscode");
+  const filePath = path6.join(dir, "settings.json");
+  if (existsSync2(filePath)) {
+    const existing = readVscodeJson(filePath);
+    if (existing === null) {
+      return;
+    }
+    existing["Lua.workspace.ignoreDir"] = unionStrings(existing["Lua.workspace.ignoreDir"], VSCODE_SETTINGS_CONTENT["Lua.workspace.ignoreDir"]);
+    writeJson(filePath, existing);
+    return;
+  }
+  mkdirSync2(dir, { recursive: true });
+  writeJson(filePath, VSCODE_SETTINGS_CONTENT);
+  written.push(".vscode/settings.json");
+}
+function writeTsSurface(cwd, written, force = false) {
   mkdirSync2(path6.join(cwd, "src"), { recursive: true });
   writeFileSync2(path6.join(cwd, "src", "main.ts"), MAIN_TS_CONTENT);
   written.push("src/main.ts");
@@ -430,7 +538,7 @@ function writeTsSurface(cwd, written) {
         devDeps[name] = version;
       }
     }
-    repairManagedDevDeps(devDeps);
+    repairManagedDevDeps(devDeps, force);
     existing.devDependencies = devDeps;
     existing["defold-typescript"] ??= { "defold-version": CURRENT_STABLE_DEFOLD_VERSION };
     writeJson(pkgPath, existing);
@@ -448,6 +556,8 @@ function writeTsSurface(cwd, written) {
   writeGitignore(cwd);
   written.push(".gitignore");
   writeBiome(cwd, written);
+  writeVscodeExtensions(cwd, written);
+  writeVscodeSettings(cwd, written);
   return selectScriptKind(kinds);
 }
 function runNewProjectInit(cwd, force = false) {
@@ -467,7 +577,7 @@ main_collection = /main/main.collectionc
   written.push("main/main.collection");
   writeFileSync2(path6.join(cwd, "main", "main.script"), MAIN_SCRIPT_CONTENT);
   written.push("main/main.script");
-  const scriptKind = writeTsSurface(cwd, written);
+  const scriptKind = writeTsSurface(cwd, written, force);
   return { written, scriptKind };
 }
 function runInit(opts) {
@@ -483,7 +593,7 @@ function runInit(opts) {
     }
   }
   const written = [];
-  const scriptKind = writeTsSurface(cwd, written);
+  const scriptKind = writeTsSurface(cwd, written, force);
   return { written, scriptKind };
 }
 

package/dist/index.js

@@ -398,6 +398,13 @@ var BIOME_JSON_CONTENT = {
     }
   }
 };
+var VSCODE_EXTENSIONS_CONTENT = {
+  recommendations: ["sumneko.lua", "astrochili.defold"],
+  unwantedRecommendations: ["johnnymorganz.luau-lsp"]
+};
+var VSCODE_SETTINGS_CONTENT = {
+  "Lua.workspace.ignoreDir": ["src"]
+};
 var MAIN_TS_CONTENT = `export function init(): void {
   const start = vmath.vector3(0, 0, 0);
   msg.post("main:/hero", "spawn", { start });
@@ -431,9 +438,9 @@ var SCAFFOLD_DEV_DEPS = {
   "@defold-typescript/types": typesVersionSpec(),
   "@biomejs/biome": "^2.2.0"
 };
-function repairManagedDevDeps(devDeps) {
+function repairManagedDevDeps(devDeps, force = false) {
   delete devDeps["@defold-typescript/transpiler"];
-  if (devDeps["@defold-typescript/types"]?.startsWith("workspace:")) {
+  if (force || devDeps["@defold-typescript/types"]?.startsWith("workspace:")) {
     devDeps["@defold-typescript/types"] = typesVersionSpec();
   }
 }
@@ -471,7 +478,108 @@ function writeBiome(cwd, written) {
   writeJson(biomePath, BIOME_JSON_CONTENT);
   written.push("biome.json");
 }
-function writeTsSurface(cwd, written) {
+function parseJsonc(text) {
+  let out = "";
+  let inString = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+  for (let i = 0;i < text.length; i++) {
+    const ch = text[i];
+    const next = text[i + 1];
+    if (inLineComment) {
+      if (ch === `
+`) {
+        inLineComment = false;
+        out += ch;
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (ch === "*" && next === "/") {
+        inBlockComment = false;
+        i++;
+      }
+      continue;
+    }
+    if (inString) {
+      out += ch;
+      if (ch === "\\") {
+        out += next ?? "";
+        i++;
+      } else if (ch === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      out += ch;
+    } else if (ch === "/" && next === "/") {
+      inLineComment = true;
+      i++;
+    } else if (ch === "/" && next === "*") {
+      inBlockComment = true;
+      i++;
+    } else {
+      out += ch;
+    }
+  }
+  return JSON.parse(out.replace(/,(\s*[}\]])/g, "$1"));
+}
+function isJsonObject(value) {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function unionStrings(existing, additions) {
+  const out = Array.isArray(existing) ? existing.filter((v) => typeof v === "string") : [];
+  for (const value of additions) {
+    if (!out.includes(value)) {
+      out.push(value);
+    }
+  }
+  return out;
+}
+function readVscodeJson(filePath) {
+  try {
+    const parsed = parseJsonc(readFileSync6(filePath, "utf8"));
+    return isJsonObject(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+function writeVscodeExtensions(cwd, written) {
+  const dir = path7.join(cwd, ".vscode");
+  const filePath = path7.join(dir, "extensions.json");
+  if (existsSync2(filePath)) {
+    const existing = readVscodeJson(filePath);
+    if (existing === null) {
+      return;
+    }
+    existing.recommendations = unionStrings(existing.recommendations, VSCODE_EXTENSIONS_CONTENT.recommendations);
+    existing.unwantedRecommendations = unionStrings(existing.unwantedRecommendations, VSCODE_EXTENSIONS_CONTENT.unwantedRecommendations);
+    writeJson(filePath, existing);
+    return;
+  }
+  mkdirSync2(dir, { recursive: true });
+  writeJson(filePath, VSCODE_EXTENSIONS_CONTENT);
+  written.push(".vscode/extensions.json");
+}
+function writeVscodeSettings(cwd, written) {
+  const dir = path7.join(cwd, ".vscode");
+  const filePath = path7.join(dir, "settings.json");
+  if (existsSync2(filePath)) {
+    const existing = readVscodeJson(filePath);
+    if (existing === null) {
+      return;
+    }
+    existing["Lua.workspace.ignoreDir"] = unionStrings(existing["Lua.workspace.ignoreDir"], VSCODE_SETTINGS_CONTENT["Lua.workspace.ignoreDir"]);
+    writeJson(filePath, existing);
+    return;
+  }
+  mkdirSync2(dir, { recursive: true });
+  writeJson(filePath, VSCODE_SETTINGS_CONTENT);
+  written.push(".vscode/settings.json");
+}
+function writeTsSurface(cwd, written, force = false) {
   mkdirSync2(path7.join(cwd, "src"), { recursive: true });
   writeFileSync2(path7.join(cwd, "src", "main.ts"), MAIN_TS_CONTENT);
   written.push("src/main.ts");
@@ -494,7 +602,7 @@ function writeTsSurface(cwd, written) {
         devDeps[name] = version;
       }
     }
-    repairManagedDevDeps(devDeps);
+    repairManagedDevDeps(devDeps, force);
     existing.devDependencies = devDeps;
     existing["defold-typescript"] ??= { "defold-version": CURRENT_STABLE_DEFOLD_VERSION };
     writeJson(pkgPath, existing);
@@ -512,6 +620,8 @@ function writeTsSurface(cwd, written) {
   writeGitignore(cwd);
   written.push(".gitignore");
   writeBiome(cwd, written);
+  writeVscodeExtensions(cwd, written);
+  writeVscodeSettings(cwd, written);
   return selectScriptKind(kinds);
 }
 function runNewProjectInit(cwd, force = false) {
@@ -531,7 +641,7 @@ main_collection = /main/main.collectionc
   written.push("main/main.collection");
   writeFileSync2(path7.join(cwd, "main", "main.script"), MAIN_SCRIPT_CONTENT);
   written.push("main/main.script");
-  const scriptKind = writeTsSurface(cwd, written);
+  const scriptKind = writeTsSurface(cwd, written, force);
   return { written, scriptKind };
 }
 function runInit(opts) {
@@ -547,7 +657,7 @@ function runInit(opts) {
     }
   }
   const written = [];
-  const scriptKind = writeTsSurface(cwd, written);
+  const scriptKind = writeTsSurface(cwd, written, force);
   return { written, scriptKind };
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defold-typescript/cli",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "End-user CLI for scaffolding and building Defold projects written in TypeScript.",
   "license": "MIT",
   "type": "module",
@@ -31,7 +31,7 @@
     "test": "bun test"
   },
   "dependencies": {
-    "@defold-typescript/transpiler": "0.4.0",
-    "@defold-typescript/types": "0.4.0"
+    "@defold-typescript/transpiler": "0.4.2",
+    "@defold-typescript/types": "0.4.2"
   }
 }

package/src/init.ts

@@ -72,6 +72,15 @@ const BIOME_JSON_CONTENT = {
   },
 };
 
+const VSCODE_EXTENSIONS_CONTENT = {
+  recommendations: ["sumneko.lua", "astrochili.defold"],
+  unwantedRecommendations: ["johnnymorganz.luau-lsp"],
+};
+
+const VSCODE_SETTINGS_CONTENT = {
+  "Lua.workspace.ignoreDir": ["src"],
+};
+
 const MAIN_TS_CONTENT = `export function init(): void {
   const start = vmath.vector3(0, 0, 0);
   msg.post("main:/hero", "spawn", { start });
@@ -134,10 +143,11 @@ const SCAFFOLD_DEV_DEPS: Record<string, string> = {
 // repairs an entry it didn't itself create, so repair them explicitly: the
 // transpiler is CLI-internal and must not be a consumer dep at all, and a
 // `workspace:` types pin must become a concrete published version. A concrete
-// user-chosen types pin is left alone.
-function repairManagedDevDeps(devDeps: Record<string, string>): void {
+// user-chosen types pin is left alone unless `force` is set, the explicit
+// opt-in to refresh the managed pin (and only that pin) to the CLI's version.
+function repairManagedDevDeps(devDeps: Record<string, string>, force = false): void {
   delete devDeps["@defold-typescript/transpiler"];
-  if (devDeps["@defold-typescript/types"]?.startsWith("workspace:")) {
+  if (force || devDeps["@defold-typescript/types"]?.startsWith("workspace:")) {
     devDeps["@defold-typescript/types"] = typesVersionSpec();
   }
 }
@@ -171,7 +181,127 @@ function writeBiome(cwd: string, written: string[]): void {
   written.push("biome.json");
 }
 
-function writeTsSurface(cwd: string, written: string[]): ScriptKind | null {
+// Strip `//` line comments, `/* */` block comments, and trailing commas so a
+// hand-edited JSONC `.vscode` file parses with `JSON.parse`. The walk tracks
+// string state so a `//` or comma inside a value (e.g. a URL) is preserved.
+function parseJsonc(text: string): unknown {
+  let out = "";
+  let inString = false;
+  let inLineComment = false;
+  let inBlockComment = false;
+  for (let i = 0; i < text.length; i++) {
+    const ch = text[i];
+    const next = text[i + 1];
+    if (inLineComment) {
+      if (ch === "\n") {
+        inLineComment = false;
+        out += ch;
+      }
+      continue;
+    }
+    if (inBlockComment) {
+      if (ch === "*" && next === "/") {
+        inBlockComment = false;
+        i++;
+      }
+      continue;
+    }
+    if (inString) {
+      out += ch;
+      if (ch === "\\") {
+        out += next ?? "";
+        i++;
+      } else if (ch === '"') {
+        inString = false;
+      }
+      continue;
+    }
+    if (ch === '"') {
+      inString = true;
+      out += ch;
+    } else if (ch === "/" && next === "/") {
+      inLineComment = true;
+      i++;
+    } else if (ch === "/" && next === "*") {
+      inBlockComment = true;
+      i++;
+    } else {
+      out += ch;
+    }
+  }
+  return JSON.parse(out.replace(/,(\s*[}\]])/g, "$1"));
+}
+
+function isJsonObject(value: unknown): value is Record<string, unknown> {
+  return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+
+function unionStrings(existing: unknown, additions: readonly string[]): string[] {
+  const out = Array.isArray(existing)
+    ? existing.filter((v): v is string => typeof v === "string")
+    : [];
+  for (const value of additions) {
+    if (!out.includes(value)) {
+      out.push(value);
+    }
+  }
+  return out;
+}
+
+function readVscodeJson(filePath: string): Record<string, unknown> | null {
+  try {
+    const parsed = parseJsonc(readFileSync(filePath, "utf8"));
+    return isJsonObject(parsed) ? parsed : null;
+  } catch {
+    return null;
+  }
+}
+
+function writeVscodeExtensions(cwd: string, written: string[]): void {
+  const dir = path.join(cwd, ".vscode");
+  const filePath = path.join(dir, "extensions.json");
+  if (existsSync(filePath)) {
+    const existing = readVscodeJson(filePath);
+    if (existing === null) {
+      return;
+    }
+    existing.recommendations = unionStrings(
+      existing.recommendations,
+      VSCODE_EXTENSIONS_CONTENT.recommendations,
+    );
+    existing.unwantedRecommendations = unionStrings(
+      existing.unwantedRecommendations,
+      VSCODE_EXTENSIONS_CONTENT.unwantedRecommendations,
+    );
+    writeJson(filePath, existing);
+    return;
+  }
+  mkdirSync(dir, { recursive: true });
+  writeJson(filePath, VSCODE_EXTENSIONS_CONTENT);
+  written.push(".vscode/extensions.json");
+}
+
+function writeVscodeSettings(cwd: string, written: string[]): void {
+  const dir = path.join(cwd, ".vscode");
+  const filePath = path.join(dir, "settings.json");
+  if (existsSync(filePath)) {
+    const existing = readVscodeJson(filePath);
+    if (existing === null) {
+      return;
+    }
+    existing["Lua.workspace.ignoreDir"] = unionStrings(
+      existing["Lua.workspace.ignoreDir"],
+      VSCODE_SETTINGS_CONTENT["Lua.workspace.ignoreDir"],
+    );
+    writeJson(filePath, existing);
+    return;
+  }
+  mkdirSync(dir, { recursive: true });
+  writeJson(filePath, VSCODE_SETTINGS_CONTENT);
+  written.push(".vscode/settings.json");
+}
+
+function writeTsSurface(cwd: string, written: string[], force = false): ScriptKind | null {
   mkdirSync(path.join(cwd, "src"), { recursive: true });
   writeFileSync(path.join(cwd, "src", "main.ts"), MAIN_TS_CONTENT);
   written.push("src/main.ts");
@@ -196,7 +326,7 @@ function writeTsSurface(cwd: string, written: string[]): ScriptKind | null {
         devDeps[name] = version;
       }
     }
-    repairManagedDevDeps(devDeps);
+    repairManagedDevDeps(devDeps, force);
     existing.devDependencies = devDeps;
     existing["defold-typescript"] ??= { "defold-version": CURRENT_STABLE_DEFOLD_VERSION };
     writeJson(pkgPath, existing);
@@ -217,6 +347,9 @@ function writeTsSurface(cwd: string, written: string[]): ScriptKind | null {
 
   writeBiome(cwd, written);
 
+  writeVscodeExtensions(cwd, written);
+  writeVscodeSettings(cwd, written);
+
   return selectScriptKind(kinds);
 }
 
@@ -243,7 +376,7 @@ export function runNewProjectInit(cwd: string, force = false): RunInitResult {
   writeFileSync(path.join(cwd, "main", "main.script"), MAIN_SCRIPT_CONTENT);
   written.push("main/main.script");
 
-  const scriptKind = writeTsSurface(cwd, written);
+  const scriptKind = writeTsSurface(cwd, written, force);
 
   return { written, scriptKind };
 }
@@ -266,6 +399,6 @@ export function runInit(opts: RunInitOptions): RunInitResult {
   }
 
   const written: string[] = [];
-  const scriptKind = writeTsSurface(cwd, written);
+  const scriptKind = writeTsSurface(cwd, written, force);
   return { written, scriptKind };
 }