@defold-typescript/cli 0.4.3 → 0.5.0

package/dist/bin.js

@@ -120,14 +120,14 @@ function stripIncludeBase(pattern) {
   const lastSlash = upToWildcard.lastIndexOf("/");
   return lastSlash === -1 ? "" : upToWildcard.slice(0, lastSlash + 1);
 }
-function computeLuaRel(rel, config) {
+function computeScriptRel(rel, config) {
   const { outDir, include } = config;
   if (outDir === undefined || outDir === "" || outDir === ".") {
-    return rel.replace(/\.ts$/, ".lua");
+    return rel.replace(/\.ts$/, ".ts.script");
   }
   const includeBase = include.map(stripIncludeBase).filter((base) => rel.startsWith(base)).sort((a, b) => b.length - a.length)[0] ?? "";
   const relUnderBase = rel.slice(includeBase.length);
-  return path2.posix.join(outDir, relUnderBase.replace(/\.ts$/, ".lua"));
+  return path2.posix.join(outDir, relUnderBase.replace(/\.ts$/, ".ts.script"));
 }
 function collectFailures(diagnostics) {
   const failures = new Map;
@@ -151,17 +151,17 @@ function throwIfFailures(failures) {
   throw new Error(`defold-typescript build: ${failures.size} file(s) failed:
 ${formatted}`);
 }
-function writeLuaFile(cwd, luaRel, lua, map) {
-  const luaAbs = path2.join(cwd, luaRel);
-  mkdirSync(path2.dirname(luaAbs), { recursive: true });
+function writeScriptFile(cwd, scriptRel, lua, map) {
+  const scriptAbs = path2.join(cwd, scriptRel);
+  mkdirSync(path2.dirname(scriptAbs), { recursive: true });
   if (map) {
-    const mapBasename = `${path2.posix.basename(luaRel)}.map`;
-    writeFileSync(`${luaAbs}.map`, map);
-    writeFileSync(luaAbs, `${lua}
+    const mapBasename = `${path2.posix.basename(scriptRel)}.map`;
+    writeFileSync(`${scriptAbs}.map`, map);
+    writeFileSync(scriptAbs, `${lua}
 --# sourceMappingURL=${mapBasename}
 `);
   } else {
-    writeFileSync(luaAbs, lua);
+    writeFileSync(scriptAbs, lua);
   }
 }
 
@@ -201,9 +201,9 @@ function runBuild(opts) {
     if (!lua) {
       continue;
     }
-    const luaRel = computeLuaRel(rel, config);
-    writeLuaFile(cwd, luaRel, lua, result.sourceMaps[rel]);
-    written.push(luaRel);
+    const scriptRel = computeScriptRel(rel, config);
+    writeScriptFile(cwd, scriptRel, lua, result.sourceMaps[rel]);
+    written.push(scriptRel);
   }
   throwIfFailures(failures);
   return { written };
@@ -242,14 +242,21 @@ var SKIP_SEGMENTS = new Set(["node_modules", ".defold-types", "build"]);
 function isSkipped(relPath) {
   return relPath.split(/[/\\]/).some((segment) => SKIP_SEGMENTS.has(segment));
 }
+var GENERATED_SCRIPT_SUFFIX = ".ts.script";
+function isGeneratedScript(relPath) {
+  return relPath.endsWith(GENERATED_SCRIPT_SUFFIX);
+}
 function isComponentPath(relPath) {
+  if (isGeneratedScript(relPath)) {
+    return false;
+  }
   return Object.keys(KIND_BY_EXT).some((ext) => relPath.endsWith(ext));
 }
 function detectScriptKinds(cwd) {
   const kinds = new Set;
   for (const [ext, kind] of Object.entries(KIND_BY_EXT)) {
     for (const match of scanFilesSync(cwd, `**/*${ext}`)) {
-      if (!isSkipped(match)) {
+      if (!isSkipped(match) && !isGeneratedScript(match)) {
         kinds.add(kind);
         break;
       }
@@ -299,11 +306,11 @@ var TSCONFIG_COMPILER_OPTIONS = {
   strict: true,
   skipLibCheck: true
 };
-var GITIGNORE_LINES = ["src/**/*.lua", "src/**/*.lua.map"];
+var GITIGNORE_LINES = ["src/**/*.ts.script", "src/**/*.ts.script.map"];
 var BIOME_JSON_CONTENT = {
   $schema: "https://biomejs.dev/schemas/2.4.15/schema.json",
   files: {
-    includes: ["src/**/*.ts", "!**/dist", "!**/node_modules", "!**/*.lua"]
+    includes: ["src/**/*.ts", "!**/dist", "!**/node_modules", "!**/*.ts.script"]
   },
   formatter: {
     enabled: true,
@@ -772,9 +779,9 @@ function createBuildSession(opts) {
       if (lua === undefined) {
         continue;
       }
-      const luaRel = computeLuaRel(rel, config);
-      writeLuaFile(cwd, luaRel, lua, result.sourceMaps[rel]);
-      written.push(luaRel);
+      const scriptRel = computeScriptRel(rel, config);
+      writeScriptFile(cwd, scriptRel, lua, result.sourceMaps[rel]);
+      written.push(scriptRel);
     }
     throwIfFailures(failures);
     return { written };
@@ -809,9 +816,9 @@ function createBuildSession(opts) {
     }
     const result = session.update(changes);
     for (const rel of sourceRemoved) {
-      const luaAbs = path8.join(cwd, computeLuaRel(rel, config));
-      rmSync2(luaAbs, { force: true });
-      rmSync2(`${luaAbs}.map`, { force: true });
+      const scriptAbs = path8.join(cwd, computeScriptRel(rel, config));
+      rmSync2(scriptAbs, { force: true });
+      rmSync2(`${scriptAbs}.map`, { force: true });
     }
     return writeOutputs(result, sourceChanged);
   }

package/dist/build-output.d.ts

@@ -6,7 +6,7 @@ export interface BuildConfig {
 export declare function toPosix(p: string, sep?: string): string;
 export declare function isTranspilerSource(rel: string): boolean;
 export declare function readBuildConfig(cwd: string): BuildConfig;
-export declare function computeLuaRel(rel: string, config: BuildConfig): string;
+export declare function computeScriptRel(rel: string, config: BuildConfig): string;
 export declare function collectFailures(diagnostics: readonly TranspileDiagnostic[]): Map<string, string[]>;
 export declare function throwIfFailures(failures: ReadonlyMap<string, string[]>): void;
-export declare function writeLuaFile(cwd: string, luaRel: string, lua: string, map: string | undefined): void;
+export declare function writeScriptFile(cwd: string, scriptRel: string, lua: string, map: string | undefined): void;

package/dist/index.js

@@ -39,14 +39,14 @@ function stripIncludeBase(pattern) {
   const lastSlash = upToWildcard.lastIndexOf("/");
   return lastSlash === -1 ? "" : upToWildcard.slice(0, lastSlash + 1);
 }
-function computeLuaRel(rel, config) {
+function computeScriptRel(rel, config) {
   const { outDir, include } = config;
   if (outDir === undefined || outDir === "" || outDir === ".") {
-    return rel.replace(/\.ts$/, ".lua");
+    return rel.replace(/\.ts$/, ".ts.script");
   }
   const includeBase = include.map(stripIncludeBase).filter((base) => rel.startsWith(base)).sort((a, b) => b.length - a.length)[0] ?? "";
   const relUnderBase = rel.slice(includeBase.length);
-  return path.posix.join(outDir, relUnderBase.replace(/\.ts$/, ".lua"));
+  return path.posix.join(outDir, relUnderBase.replace(/\.ts$/, ".ts.script"));
 }
 function collectFailures(diagnostics) {
   const failures = new Map;
@@ -70,17 +70,17 @@ function throwIfFailures(failures) {
   throw new Error(`defold-typescript build: ${failures.size} file(s) failed:
 ${formatted}`);
 }
-function writeLuaFile(cwd, luaRel, lua, map) {
-  const luaAbs = path.join(cwd, luaRel);
-  mkdirSync(path.dirname(luaAbs), { recursive: true });
+function writeScriptFile(cwd, scriptRel, lua, map) {
+  const scriptAbs = path.join(cwd, scriptRel);
+  mkdirSync(path.dirname(scriptAbs), { recursive: true });
   if (map) {
-    const mapBasename = `${path.posix.basename(luaRel)}.map`;
-    writeFileSync(`${luaAbs}.map`, map);
-    writeFileSync(luaAbs, `${lua}
+    const mapBasename = `${path.posix.basename(scriptRel)}.map`;
+    writeFileSync(`${scriptAbs}.map`, map);
+    writeFileSync(scriptAbs, `${lua}
 --# sourceMappingURL=${mapBasename}
 `);
   } else {
-    writeFileSync(luaAbs, lua);
+    writeFileSync(scriptAbs, lua);
   }
 }
 
@@ -107,9 +107,9 @@ function createBuildSession(opts) {
       if (lua === undefined) {
         continue;
       }
-      const luaRel = computeLuaRel(rel, config);
-      writeLuaFile(cwd, luaRel, lua, result.sourceMaps[rel]);
-      written.push(luaRel);
+      const scriptRel = computeScriptRel(rel, config);
+      writeScriptFile(cwd, scriptRel, lua, result.sourceMaps[rel]);
+      written.push(scriptRel);
     }
     throwIfFailures(failures);
     return { written };
@@ -144,9 +144,9 @@ function createBuildSession(opts) {
     }
     const result = session.update(changes);
     for (const rel of sourceRemoved) {
-      const luaAbs = path3.join(cwd, computeLuaRel(rel, config));
-      rmSync(luaAbs, { force: true });
-      rmSync(`${luaAbs}.map`, { force: true });
+      const scriptAbs = path3.join(cwd, computeScriptRel(rel, config));
+      rmSync(scriptAbs, { force: true });
+      rmSync(`${scriptAbs}.map`, { force: true });
     }
     return writeOutputs(result, sourceChanged);
   }
@@ -265,9 +265,9 @@ function runBuild(opts) {
     if (!lua) {
       continue;
     }
-    const luaRel = computeLuaRel(rel, config);
-    writeLuaFile(cwd, luaRel, lua, result.sourceMaps[rel]);
-    written.push(luaRel);
+    const scriptRel = computeScriptRel(rel, config);
+    writeScriptFile(cwd, scriptRel, lua, result.sourceMaps[rel]);
+    written.push(scriptRel);
   }
   throwIfFailures(failures);
   return { written };
@@ -306,14 +306,21 @@ var SKIP_SEGMENTS = new Set(["node_modules", ".defold-types", "build"]);
 function isSkipped(relPath) {
   return relPath.split(/[/\\]/).some((segment) => SKIP_SEGMENTS.has(segment));
 }
+var GENERATED_SCRIPT_SUFFIX = ".ts.script";
+function isGeneratedScript(relPath) {
+  return relPath.endsWith(GENERATED_SCRIPT_SUFFIX);
+}
 function isComponentPath(relPath) {
+  if (isGeneratedScript(relPath)) {
+    return false;
+  }
   return Object.keys(KIND_BY_EXT).some((ext) => relPath.endsWith(ext));
 }
 function detectScriptKinds(cwd) {
   const kinds = new Set;
   for (const [ext, kind] of Object.entries(KIND_BY_EXT)) {
     for (const match of scanFilesSync(cwd, `**/*${ext}`)) {
-      if (!isSkipped(match)) {
+      if (!isSkipped(match) && !isGeneratedScript(match)) {
         kinds.add(kind);
         break;
       }
@@ -363,11 +370,11 @@ var TSCONFIG_COMPILER_OPTIONS = {
   strict: true,
   skipLibCheck: true
 };
-var GITIGNORE_LINES = ["src/**/*.lua", "src/**/*.lua.map"];
+var GITIGNORE_LINES = ["src/**/*.ts.script", "src/**/*.ts.script.map"];
 var BIOME_JSON_CONTENT = {
   $schema: "https://biomejs.dev/schemas/2.4.15/schema.json",
   files: {
-    includes: ["src/**/*.ts", "!**/dist", "!**/node_modules", "!**/*.lua"]
+    includes: ["src/**/*.ts", "!**/dist", "!**/node_modules", "!**/*.ts.script"]
   },
   formatter: {
     enabled: true,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@defold-typescript/cli",
-  "version": "0.4.3",
+  "version": "0.5.0",
   "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.3",
-    "@defold-typescript/types": "0.4.3"
+    "@defold-typescript/transpiler": "0.5.0",
+    "@defold-typescript/types": "0.5.0"
   }
 }

package/src/build-output.ts

@@ -54,10 +54,10 @@ function stripIncludeBase(pattern: string): string {
   return lastSlash === -1 ? "" : upToWildcard.slice(0, lastSlash + 1);
 }
 
-export function computeLuaRel(rel: string, config: BuildConfig): string {
+export function computeScriptRel(rel: string, config: BuildConfig): string {
   const { outDir, include } = config;
   if (outDir === undefined || outDir === "" || outDir === ".") {
-    return rel.replace(/\.ts$/, ".lua");
+    return rel.replace(/\.ts$/, ".ts.script");
   }
   const includeBase =
     include
@@ -65,7 +65,7 @@ export function computeLuaRel(rel: string, config: BuildConfig): string {
       .filter((base) => rel.startsWith(base))
       .sort((a, b) => b.length - a.length)[0] ?? "";
   const relUnderBase = rel.slice(includeBase.length);
-  return path.posix.join(outDir, relUnderBase.replace(/\.ts$/, ".lua"));
+  return path.posix.join(outDir, relUnderBase.replace(/\.ts$/, ".ts.script"));
 }
 
 export function collectFailures(
@@ -94,19 +94,19 @@ export function throwIfFailures(failures: ReadonlyMap<string, string[]>): void {
   throw new Error(`defold-typescript build: ${failures.size} file(s) failed:\n${formatted}`);
 }
 
-export function writeLuaFile(
+export function writeScriptFile(
   cwd: string,
-  luaRel: string,
+  scriptRel: string,
   lua: string,
   map: string | undefined,
 ): void {
-  const luaAbs = path.join(cwd, luaRel);
-  mkdirSync(path.dirname(luaAbs), { recursive: true });
+  const scriptAbs = path.join(cwd, scriptRel);
+  mkdirSync(path.dirname(scriptAbs), { recursive: true });
   if (map) {
-    const mapBasename = `${path.posix.basename(luaRel)}.map`;
-    writeFileSync(`${luaAbs}.map`, map);
-    writeFileSync(luaAbs, `${lua}\n--# sourceMappingURL=${mapBasename}\n`);
+    const mapBasename = `${path.posix.basename(scriptRel)}.map`;
+    writeFileSync(`${scriptAbs}.map`, map);
+    writeFileSync(scriptAbs, `${lua}\n--# sourceMappingURL=${mapBasename}\n`);
   } else {
-    writeFileSync(luaAbs, lua);
+    writeFileSync(scriptAbs, lua);
   }
 }

package/src/build-session.ts

@@ -8,12 +8,12 @@ import {
 import {
   type BuildConfig,
   collectFailures,
-  computeLuaRel,
+  computeScriptRel,
   isTranspilerSource,
   readBuildConfig,
   throwIfFailures,
   toPosix,
-  writeLuaFile,
+  writeScriptFile,
 } from "./build-output";
 import { scanFilesSync } from "./scan";
 
@@ -46,9 +46,9 @@ export function createBuildSession(opts: CreateBuildSessionOptions): BuildSessio
       if (lua === undefined) {
         continue;
       }
-      const luaRel = computeLuaRel(rel, config);
-      writeLuaFile(cwd, luaRel, lua, result.sourceMaps[rel]);
-      written.push(luaRel);
+      const scriptRel = computeScriptRel(rel, config);
+      writeScriptFile(cwd, scriptRel, lua, result.sourceMaps[rel]);
+      written.push(scriptRel);
     }
     throwIfFailures(failures);
     return { written };
@@ -89,9 +89,9 @@ export function createBuildSession(opts: CreateBuildSessionOptions): BuildSessio
     const result = session.update(changes);
 
     for (const rel of sourceRemoved) {
-      const luaAbs = path.join(cwd, computeLuaRel(rel, config));
-      rmSync(luaAbs, { force: true });
-      rmSync(`${luaAbs}.map`, { force: true });
+      const scriptAbs = path.join(cwd, computeScriptRel(rel, config));
+      rmSync(scriptAbs, { force: true });
+      rmSync(`${scriptAbs}.map`, { force: true });
     }
 
     return writeOutputs(result, sourceChanged);

package/src/build.ts

@@ -3,11 +3,11 @@ import * as path from "node:path";
 import { transpileProject } from "@defold-typescript/transpiler";
 import {
   collectFailures,
-  computeLuaRel,
+  computeScriptRel,
   readBuildConfig,
   throwIfFailures,
   toPosix,
-  writeLuaFile,
+  writeScriptFile,
 } from "./build-output";
 import { scanFilesSync } from "./scan";
 
@@ -52,9 +52,9 @@ export function runBuild(opts: RunBuildOptions): RunBuildResult {
     if (!lua) {
       continue;
     }
-    const luaRel = computeLuaRel(rel, config);
-    writeLuaFile(cwd, luaRel, lua, result.sourceMaps[rel]);
-    written.push(luaRel);
+    const scriptRel = computeScriptRel(rel, config);
+    writeScriptFile(cwd, scriptRel, lua, result.sourceMaps[rel]);
+    written.push(scriptRel);
   }
 
   throwIfFailures(failures);

package/src/init.ts

@@ -35,12 +35,12 @@ const TSCONFIG_COMPILER_OPTIONS = {
   skipLibCheck: true,
 };
 
-const GITIGNORE_LINES = ["src/**/*.lua", "src/**/*.lua.map"];
+const GITIGNORE_LINES = ["src/**/*.ts.script", "src/**/*.ts.script.map"];
 
 const BIOME_JSON_CONTENT = {
   $schema: "https://biomejs.dev/schemas/2.4.15/schema.json",
   files: {
-    includes: ["src/**/*.ts", "!**/dist", "!**/node_modules", "!**/*.lua"],
+    includes: ["src/**/*.ts", "!**/dist", "!**/node_modules", "!**/*.ts.script"],
   },
   formatter: {
     enabled: true,

package/src/script-kind.ts

@@ -16,7 +16,19 @@ export function isSkipped(relPath: string): boolean {
   return relPath.split(/[/\\]/).some((segment) => SKIP_SEGMENTS.has(segment));
 }
 
+// Emitted transpiler output is `<name>.ts.script`, which ends in `.script`;
+// without this guard the kind detector would read our own build artifacts as
+// real Defold `.script` components and break the per-kind API wall.
+const GENERATED_SCRIPT_SUFFIX = ".ts.script";
+
+function isGeneratedScript(relPath: string): boolean {
+  return relPath.endsWith(GENERATED_SCRIPT_SUFFIX);
+}
+
 export function isComponentPath(relPath: string): boolean {
+  if (isGeneratedScript(relPath)) {
+    return false;
+  }
   return Object.keys(KIND_BY_EXT).some((ext) => relPath.endsWith(ext));
 }
 
@@ -24,7 +36,7 @@ export function detectScriptKinds(cwd: string): Set<ScriptKind> {
   const kinds = new Set<ScriptKind>();
   for (const [ext, kind] of Object.entries(KIND_BY_EXT)) {
     for (const match of scanFilesSync(cwd, `**/*${ext}`)) {
-      if (!isSkipped(match)) {
+      if (!isSkipped(match) && !isGeneratedScript(match)) {
         kinds.add(kind);
         break;
       }