terse-cli 0.6.2 → 0.6.4

package/dist/localActors.js

@@ -1,12 +1,13 @@
-import { startLocalActors } from "durable-actors/dev";
+import { loadProjectActorTools } from "./projectActorTools.js";
 import { readProjectConfigOrBail } from "./projectConfig.js";
-import { ACTOR_ENTRY_FILE, loadActorTypes } from "./providers/typescript/actorSources.js";
+import { loadActorTypes, resolveActorEntryFile } from "./providers/typescript/actorSources.js";
 let runtime;
 export async function ensureLocalActors() {
     if ((await loadActorTypes(process.cwd())).length === 0)
         return;
     const projectId = readProjectConfigOrBail().projectId;
-    const options = { projectId, entrypoint: ACTOR_ENTRY_FILE, dataDir: ".terse/test-actors", quiet: true };
+    const { startLocalActors } = await loadProjectActorTools(process.cwd());
+    const options = { project: process.cwd(), projectId, entrypoint: resolveActorEntryFile(process.cwd()), dataDir: ".terse/test-actors", quiet: true };
     const { connection } = await (runtime ??= startLocalActors(options).catch(error => {
         runtime = undefined;
         throw error;

package/dist/localActors.js.map

@@ -1 +1 @@
-{"version":3,"file":"localActors.js","sourceRoot":"","sources":["../src/localActors.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,gBAAgB,EAAE,MAAM,oBAAoB,CAAA;AAE7E,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,wCAAwC,CAAA;AAEzF,IAAI,OAA+C,CAAA;AAEnD,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACnC,IAAI,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAM;IAC9D,MAAM,SAAS,GAAG,uBAAuB,EAAE,CAAC,SAAS,CAAA;IACrD,MAAM,OAAO,GAAG,EAAE,SAAS,EAAE,UAAU,EAAE,gBAAgB,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IACvG,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,OAAO,KAAK,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QAC9E,OAAO,GAAG,SAAS,CAAA;QACnB,MAAM,KAAK,CAAA;IACf,CAAC,CAAC,CAAC,CAAA;IACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;QACvB,yBAAyB,EAAE,SAAS;QACpC,wBAAwB,EAAE,GAAG;QAC7B,gCAAgC,EAAE,UAAU,CAAC,eAAe;QAC5D,qBAAqB,EAAE,UAAU,CAAC,MAAM;KAC3C,CAAC,CAAA;IACF,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAA;IACvC,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAA;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe;IACjC,MAAM,CAAC,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,CAAA;AACjC,CAAC"}
+{"version":3,"file":"localActors.js","sourceRoot":"","sources":["../src/localActors.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,qBAAqB,EAAE,MAAM,wBAAwB,CAAA;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAA;AAC5D,OAAO,EAAE,cAAc,EAAE,qBAAqB,EAAE,MAAM,wCAAwC,CAAA;AAE9F,IAAI,OAA+C,CAAA;AAEnD,MAAM,CAAC,KAAK,UAAU,iBAAiB;IACnC,IAAI,CAAC,MAAM,cAAc,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,MAAM,KAAK,CAAC;QAAE,OAAM;IAC9D,MAAM,SAAS,GAAG,uBAAuB,EAAE,CAAC,SAAS,CAAA;IACrD,MAAM,EAAE,gBAAgB,EAAE,GAAG,MAAM,qBAAqB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,CAAA;IACvE,MAAM,OAAO,GAAG,EAAE,OAAO,EAAE,OAAO,CAAC,GAAG,EAAE,EAAE,SAAS,EAAE,UAAU,EAAE,qBAAqB,CAAC,OAAO,CAAC,GAAG,EAAE,CAAE,EAAE,OAAO,EAAE,oBAAoB,EAAE,KAAK,EAAE,IAAI,EAAE,CAAA;IACpJ,MAAM,EAAE,UAAU,EAAE,GAAG,MAAM,CAAC,OAAO,KAAK,gBAAgB,CAAC,OAAO,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,EAAE;QAC9E,OAAO,GAAG,SAAS,CAAA;QACnB,MAAM,KAAK,CAAA;IACf,CAAC,CAAC,CAAC,CAAA;IACH,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE;QACvB,yBAAyB,EAAE,SAAS;QACpC,wBAAwB,EAAE,GAAG;QAC7B,gCAAgC,EAAE,UAAU,CAAC,eAAe;QAC5D,qBAAqB,EAAE,UAAU,CAAC,MAAM;KAC3C,CAAC,CAAA;IACF,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAA;IACvC,OAAO,OAAO,CAAC,GAAG,CAAC,oBAAoB,CAAA;AAC3C,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,eAAe;IACjC,MAAM,CAAC,MAAM,OAAO,CAAC,EAAE,IAAI,EAAE,CAAA;AACjC,CAAC"}

package/dist/productFeatures.d.ts

@@ -0,0 +1,5 @@
+/** New actor projects have one source file and only the supporting project files. */
+export declare function actorScaffoldFiles<T extends {
+    output: string;
+}>(files: T[]): T[];
+//# sourceMappingURL=productFeatures.d.ts.map

package/dist/productFeatures.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"productFeatures.d.ts","sourceRoot":"","sources":["../src/productFeatures.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,wBAAgB,kBAAkB,CAAC,CAAC,SAAS;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE,EAAE,KAAK,EAAE,CAAC,EAAE,GAAG,CAAC,EAAE,CAGhF"}

package/dist/productFeatures.js

@@ -0,0 +1,6 @@
+/** New actor projects have one source file and only the supporting project files. */
+export function actorScaffoldFiles(files) {
+    const outputs = new Set(["package.json", "tsconfig.json", "src/actors.ts", ".env.example", ".gitignore"]);
+    return files.filter(file => outputs.has(file.output)).map(file => (file.output === "src/actors.ts" ? { ...file, output: "src/actor.ts" } : file));
+}
+//# sourceMappingURL=productFeatures.js.map

package/dist/productFeatures.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"productFeatures.js","sourceRoot":"","sources":["../src/productFeatures.ts"],"names":[],"mappings":"AAAA,qFAAqF;AACrF,MAAM,UAAU,kBAAkB,CAA+B,KAAU;IACvE,MAAM,OAAO,GAAG,IAAI,GAAG,CAAC,CAAC,cAAc,EAAE,eAAe,EAAE,eAAe,EAAE,cAAc,EAAE,YAAY,CAAC,CAAC,CAAA;IACzG,OAAO,KAAK,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,IAAI,CAAC,MAAM,KAAK,eAAe,CAAC,CAAC,CAAC,EAAE,GAAG,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAA;AACrJ,CAAC"}

package/dist/projectActorTools.d.ts

@@ -0,0 +1,5 @@
+type ActorTools = typeof import("terse-sdk/dev");
+export declare function loadProjectActorTools(project: string): Promise<ActorTools>;
+export declare function resolveProjectActorTools(project: string): string;
+export {};
+//# sourceMappingURL=projectActorTools.d.ts.map

package/dist/projectActorTools.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectActorTools.d.ts","sourceRoot":"","sources":["../src/projectActorTools.ts"],"names":[],"mappings":"AAOA,KAAK,UAAU,GAAG,cAAc,eAAe,CAAC,CAAA;AAEhD,wBAAsB,qBAAqB,CAAC,OAAO,EAAE,MAAM,GAAG,OAAO,CAAC,UAAU,CAAC,CAMhF;AAED,wBAAgB,wBAAwB,CAAC,OAAO,EAAE,MAAM,GAAG,MAAM,CAYhE"}

package/dist/projectActorTools.js

@@ -0,0 +1,34 @@
+import { resolve } from "import-meta-resolve";
+import { existsSync } from "node:fs";
+import path from "node:path";
+import { fileURLToPath, pathToFileURL } from "node:url";
+import { CliError } from "./cliError.js";
+export async function loadProjectActorTools(project) {
+    const module = await import(resolveProjectActorTools(project));
+    for (const name of ["ActorCompiler", "generateClientArtifacts", "runActorDev", "startLocalActors"]) {
+        if (typeof module[name] !== "function")
+            throw outdatedSdk(project);
+    }
+    return module;
+}
+export function resolveProjectActorTools(project) {
+    try {
+        const entry = resolve("terse-sdk/dev", pathToFileURL(path.resolve(project, "package.json")).href);
+        if (!existsSync(fileURLToPath(entry)))
+            throw outdatedSdk(project);
+        return entry;
+    }
+    catch (error) {
+        if (error instanceof CliError)
+            throw error;
+        if (error.code === "ERR_PACKAGE_PATH_NOT_EXPORTED")
+            throw outdatedSdk(project);
+        throw new CliError("project_sdk_unavailable", `Cannot resolve terse-sdk/dev in ${project}. Install terse-sdk in this project and run your package manager's install command.`, {
+            detail: error instanceof Error ? error.message : String(error)
+        });
+    }
+}
+function outdatedSdk(project) {
+    return new CliError("project_sdk_outdated", `The terse-sdk installed in ${project} does not support this CLI's actor tooling. Update terse-sdk in this project.`);
+}
+//# sourceMappingURL=projectActorTools.js.map

package/dist/projectActorTools.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"projectActorTools.js","sourceRoot":"","sources":["../src/projectActorTools.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,qBAAqB,CAAA;AAC7C,OAAO,EAAE,UAAU,EAAE,MAAM,SAAS,CAAA;AACpC,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,UAAU,CAAA;AAEvD,OAAO,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAA;AAIxC,MAAM,CAAC,KAAK,UAAU,qBAAqB,CAAC,OAAe;IACvD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,wBAAwB,CAAC,OAAO,CAAC,CAAC,CAAA;IAC9D,KAAK,MAAM,IAAI,IAAI,CAAC,eAAe,EAAE,yBAAyB,EAAE,aAAa,EAAE,kBAAkB,CAAC,EAAE,CAAC;QACjG,IAAI,OAAO,MAAM,CAAC,IAAI,CAAC,KAAK,UAAU;YAAE,MAAM,WAAW,CAAC,OAAO,CAAC,CAAA;IACtE,CAAC;IACD,OAAO,MAAM,CAAA;AACjB,CAAC;AAED,MAAM,UAAU,wBAAwB,CAAC,OAAe;IACpD,IAAI,CAAC;QACD,MAAM,KAAK,GAAG,OAAO,CAAC,eAAe,EAAE,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC,CAAC,IAAI,CAAC,CAAA;QACjG,IAAI,CAAC,UAAU,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC;YAAE,MAAM,WAAW,CAAC,OAAO,CAAC,CAAA;QACjE,OAAO,KAAK,CAAA;IAChB,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,QAAQ;YAAE,MAAM,KAAK,CAAA;QAC1C,IAAK,KAA+B,CAAC,IAAI,KAAK,+BAA+B;YAAE,MAAM,WAAW,CAAC,OAAO,CAAC,CAAA;QACzG,MAAM,IAAI,QAAQ,CAAC,yBAAyB,EAAE,mCAAmC,OAAO,qFAAqF,EAAE;YAC3K,MAAM,EAAE,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC;SACjE,CAAC,CAAA;IACN,CAAC;AACL,CAAC;AAED,SAAS,WAAW,CAAC,OAAe;IAChC,OAAO,IAAI,QAAQ,CAAC,sBAAsB,EAAE,8BAA8B,OAAO,+EAA+E,CAAC,CAAA;AACrK,CAAC"}

package/dist/providers/typescript/actorCodegen.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actorCodegen.d.ts","sourceRoot":"","sources":["../../../src/providers/typescript/actorCodegen.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAI3D,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CA+C5E"}
+{"version":3,"file":"actorCodegen.d.ts","sourceRoot":"","sources":["../../../src/providers/typescript/actorCodegen.ts"],"names":[],"mappings":"AAOA,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,wBAAwB,CAAA;AAI3D,wBAAsB,gBAAgB,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,aAAa,EAAE,CAAC,CAqD5E"}

package/dist/providers/typescript/actorCodegen.js

@@ -1,23 +1,23 @@
-import { generateTypeScript } from "durable-actors/codegen";
-import { ActorCompiler } from "durable-actors/compiler";
-import fs from "node:fs/promises";
 import path from "node:path";
 import { formatActorDiagnostic } from "terse-types/ActorDiagnostics";
 import ts from "typescript";
 import { CliError } from "../../cliError.js";
+import { loadProjectActorTools } from "../../projectActorTools.js";
 import { readProjectConfigOrBail } from "../../projectConfig.js";
-import { ACTOR_ENTRY_FILE } from "./actorSources.js";
+import { resolveActorEntryFile } from "./actorSources.js";
 export async function renderActorFiles(cwd) {
-    if (!(await fs.stat(path.join(cwd, ACTOR_ENTRY_FILE)).catch(() => null)))
+    const entryFile = resolveActorEntryFile(cwd);
+    if (!entryFile)
         return [];
     try {
-        const compiled = new ActorCompiler().compile(path.join(cwd, ACTOR_ENTRY_FILE));
-        const actors = compiled.map(actor => actor.actorName).sort();
+        const { ActorCompiler, generateClientArtifacts } = await loadProjectActorTools(cwd);
+        const contract = new ActorCompiler().compileContract(path.join(cwd, entryFile));
+        const actors = contract.actors.map(actor => actor.actorName).sort();
         if (!actors.length)
             return [];
-        const generated = await generateTypeScript(compiled.map(actor => actor.contract));
+        const generated = await generateClientArtifacts(contract);
         const { projectId } = readProjectConfigOrBail(cwd);
-        const source = ts.createSourceFile("index.ts", generated.get("index.ts"), ts.ScriptTarget.Latest, true);
+        const source = ts.createSourceFile("index.ts", generated.get("index.d.ts"), ts.ScriptTarget.Latest, true);
         // Keep upstream's type declarations; authorization uses Terse's project-aware proxy below.
         const declarations = source.statements
             .filter(statement => ts.isModuleDeclaration(statement) && statement.name.text === "actors")
@@ -27,7 +27,11 @@ export async function renderActorFiles(cwd) {
         return [
             {
                 fileName: "terse.generated/actors/types.ts",
-                code: `// Generated by terse generate. Safe to import as types from browser or server code.\n${declarations}\n`
+                code: `// Generated by terse generate. Safe to import as types from browser or server code.\nimport type { ActorTypes as $ActorTypes } from "./declarations.js"\n${declarations}\n`
+            },
+            {
+                fileName: "terse.generated/actors/declarations.d.ts",
+                code: contract.typescript.declarations
             },
             {
                 fileName: "terse.generated/server.ts",

package/dist/providers/typescript/actorCodegen.js.map

@@ -1 +1 @@
-{"version":3,"file":"actorCodegen.js","sourceRoot":"","sources":["../../../src/providers/typescript/actorCodegen.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"actorCodegen.js","sourceRoot":"","sources":["../../../src/providers/typescript/actorCodegen.ts"],"names":[],"mappings":"AAAA,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,MAAM,YAAY,CAAA;AAE3B,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAClE,OAAO,EAAE,uBAAuB,EAAE,MAAM,wBAAwB,CAAA;AAGhE,OAAO,EAAE,qBAAqB,EAAE,MAAM,mBAAmB,CAAA;AAEzD,MAAM,CAAC,KAAK,UAAU,gBAAgB,CAAC,GAAW;IAC9C,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAA;IAC5C,IAAI,CAAC,SAAS;QAAE,OAAO,EAAE,CAAA;IACzB,IAAI,CAAC;QACD,MAAM,EAAE,aAAa,EAAE,uBAAuB,EAAE,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,CAAA;QACnF,MAAM,QAAQ,GAAG,IAAI,aAAa,EAAE,CAAC,eAAe,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAC,CAAA;QAC/E,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,CAAA;QACnE,IAAI,CAAC,MAAM,CAAC,MAAM;YAAE,OAAO,EAAE,CAAA;QAC7B,MAAM,SAAS,GAAG,MAAM,uBAAuB,CAAC,QAAQ,CAAC,CAAA;QACzD,MAAM,EAAE,SAAS,EAAE,GAAG,uBAAuB,CAAC,GAAG,CAAC,CAAA;QAClD,MAAM,MAAM,GAAG,EAAE,CAAC,gBAAgB,CAAC,UAAU,EAAE,SAAS,CAAC,GAAG,CAAC,YAAY,CAAE,EAAE,EAAE,CAAC,YAAY,CAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1G,2FAA2F;QAC3F,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU;aACjC,MAAM,CAAC,SAAS,CAAC,EAAE,CAAC,EAAE,CAAC,mBAAmB,CAAC,SAAS,CAAC,IAAI,SAAS,CAAC,IAAI,CAAC,IAAI,KAAK,QAAQ,CAAC;aAC1F,GAAG,CAAC,SAAS,CAAC,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC;aAC3C,IAAI,CAAC,MAAM,CAAC,CAAA;QACjB,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,IAAI,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,kCAAkC,IAAI,YAAY,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;QAC7H,OAAO;YACH;gBACI,QAAQ,EAAE,iCAAiC;gBAC3C,IAAI,EAAE,6JAA6J,YAAY,IAAI;aACtL;YACD;gBACI,QAAQ,EAAE,0CAA0C;gBACpD,IAAI,EAAE,QAAQ,CAAC,UAAU,CAAC,YAAY;aACzC;YACD;gBACI,QAAQ,EAAE,2BAA2B;gBACrC,IAAI,EAAE;;;;mBAIH,WAAW;;;;;;iDAMmB,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC;;;;;;;CAOzE;aACY;SACJ,CAAA;IACL,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,QAAQ;YAAE,MAAM,KAAK,CAAA;QAC1C,MAAM,MAAM,GAAG,qBAAqB,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,CAAA;QAC5F,MAAM,IAAI,QAAQ,CAAC,yBAAyB,EAAE,MAAM,CAAC,CAAA;IACzD,CAAC;AACL,CAAC"}

package/dist/providers/typescript/actorSources.d.ts

@@ -1,4 +1,6 @@
-export declare const ACTOR_ENTRY_FILE = "src/actors.ts";
+import { ACTOR_ENTRY_FILE } from "terse-types/ActorSource";
+export { ACTOR_ENTRY_FILE };
+export declare function resolveActorEntryFile(cwd: string): string | undefined;
 export declare function loadActorTypes(cwd: string): Promise<string[]>;
-export declare function loadActorContract(cwd: string): Promise<import("durable-actors/codegen").PublicActorContract | undefined>;
+export declare function loadActorContract(cwd: string): Promise<import("durable-actors/compiler").PublicActorContract | undefined>;
 //# sourceMappingURL=actorSources.d.ts.map

package/dist/providers/typescript/actorSources.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"actorSources.d.ts","sourceRoot":"","sources":["../../../src/providers/typescript/actorSources.ts"],"names":[],"mappings":"AAOA,eAAO,MAAM,gBAAgB,kBAAkB,CAAA;AAE/C,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAGnE;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,6EASlD"}
+{"version":3,"file":"actorSources.d.ts","sourceRoot":"","sources":["../../../src/providers/typescript/actorSources.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAsB,MAAM,yBAAyB,CAAA;AAK9E,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAE3B,wBAAgB,qBAAqB,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,GAAG,SAAS,CAErE;AAED,wBAAsB,cAAc,CAAC,GAAG,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,EAAE,CAAC,CAGnE;AAED,wBAAsB,iBAAiB,CAAC,GAAG,EAAE,MAAM,8EAWlD"}

package/dist/providers/typescript/actorSources.js

@@ -1,22 +1,29 @@
-import { ActorCompiler } from "durable-actors/compiler";
 import fs from "node:fs";
 import path from "node:path";
 import { formatActorDiagnostic } from "terse-types/ActorDiagnostics";
+import { ACTOR_ENTRY_FILE, findActorEntryFile } from "terse-types/ActorSource";
 import { CliError } from "../../cliError.js";
-export const ACTOR_ENTRY_FILE = "src/actors.ts";
+import { loadProjectActorTools } from "../../projectActorTools.js";
+export { ACTOR_ENTRY_FILE };
+export function resolveActorEntryFile(cwd) {
+    return findActorEntryFile(file => fs.existsSync(path.join(cwd, file)));
+}
 export async function loadActorTypes(cwd) {
     const contract = await loadActorContract(cwd);
     return contract?.actors.map(actor => actor.actorName).sort() ?? [];
 }
 export async function loadActorContract(cwd) {
-    const entryFile = ACTOR_ENTRY_FILE;
-    const entry = path.join(cwd, entryFile);
-    if (!fs.existsSync(entry))
+    const entryFile = resolveActorEntryFile(cwd);
+    if (!entryFile)
         return undefined;
+    const entry = path.join(cwd, entryFile);
     try {
+        const { ActorCompiler } = await loadProjectActorTools(cwd);
         return new ActorCompiler().compileContract(entry);
     }
     catch (error) {
+        if (error instanceof CliError)
+            throw error;
         throw new CliError("invalid_actor_definition", `${entryFile}: ${formatActorDiagnostic(error instanceof Error ? error.message : String(error))}`);
     }
 }

package/dist/providers/typescript/actorSources.js.map

@@ -1 +1 @@
-{"version":3,"file":"actorSources.js","sourceRoot":"","sources":["../../../src/providers/typescript/actorSources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,yBAAyB,CAAA;AACvD,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AAEpE,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAE5C,MAAM,CAAC,MAAM,gBAAgB,GAAG,eAAe,CAAA;AAE/C,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW;IAC5C,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAC7C,OAAO,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAA;AACtE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAW;IAC/C,MAAM,SAAS,GAAG,gBAAgB,CAAA;IAClC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACvC,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,KAAK,CAAC;QAAE,OAAO,SAAS,CAAA;IAC3C,IAAI,CAAC;QACD,OAAO,IAAI,aAAa,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,MAAM,IAAI,QAAQ,CAAC,0BAA0B,EAAE,GAAG,SAAS,KAAK,qBAAqB,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAA;IACpJ,CAAC;AACL,CAAC"}
+{"version":3,"file":"actorSources.js","sourceRoot":"","sources":["../../../src/providers/typescript/actorSources.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,SAAS,CAAA;AACxB,OAAO,IAAI,MAAM,WAAW,CAAA;AAC5B,OAAO,EAAE,qBAAqB,EAAE,MAAM,8BAA8B,CAAA;AACpE,OAAO,EAAE,gBAAgB,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAA;AAE9E,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAC5C,OAAO,EAAE,qBAAqB,EAAE,MAAM,4BAA4B,CAAA;AAElE,OAAO,EAAE,gBAAgB,EAAE,CAAA;AAE3B,MAAM,UAAU,qBAAqB,CAAC,GAAW;IAC7C,OAAO,kBAAkB,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,IAAI,CAAC,CAAC,CAAC,CAAA;AAC1E,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,cAAc,CAAC,GAAW;IAC5C,MAAM,QAAQ,GAAG,MAAM,iBAAiB,CAAC,GAAG,CAAC,CAAA;IAC7C,OAAO,QAAQ,EAAE,MAAM,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,IAAI,EAAE,IAAI,EAAE,CAAA;AACtE,CAAC;AAED,MAAM,CAAC,KAAK,UAAU,iBAAiB,CAAC,GAAW;IAC/C,MAAM,SAAS,GAAG,qBAAqB,CAAC,GAAG,CAAC,CAAA;IAC5C,IAAI,CAAC,SAAS;QAAE,OAAO,SAAS,CAAA;IAChC,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,EAAE,SAAS,CAAC,CAAA;IACvC,IAAI,CAAC;QACD,MAAM,EAAE,aAAa,EAAE,GAAG,MAAM,qBAAqB,CAAC,GAAG,CAAC,CAAA;QAC1D,OAAO,IAAI,aAAa,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,CAAA;IACrD,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACb,IAAI,KAAK,YAAY,QAAQ;YAAE,MAAM,KAAK,CAAA;QAC1C,MAAM,IAAI,QAAQ,CAAC,0BAA0B,EAAE,GAAG,SAAS,KAAK,qBAAqB,CAAC,KAAK,YAAY,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAA;IACpJ,CAAC;AACL,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "terse-cli",
-  "version": "0.6.2",
+  "version": "0.6.4",
   "type": "module",
   "license": "SEE LICENSE IN LICENSE.md",
   "repository": {
@@ -30,16 +30,17 @@
     "dotenv": "^17.4.2",
     "fflate": "^0.8.0",
     "handlebars": "^4.7.9",
+    "import-meta-resolve": "^4.2.0",
     "json-schema-to-typescript": "^15.0.4",
-    "durable-actors": "0.3.1",
+    "durable-actors": "0.4.5",
     "little-durable": "0.1.3",
     "luxon": "^3.7.2",
     "ora": "^8.0.0",
     "tsx": "^4.0.0",
     "typescript": "^5.0.0",
     "zod": "^4.3.6",
-    "terse-sdk": "0.6.2",
-    "terse-types": "0.6.2"
+    "terse-sdk": "0.6.4",
+    "terse-types": "0.6.4"
   },
   "devDependencies": {
     "@types/luxon": "^3.7.1",