@genroc/eval-node 0.16.0 → 0.17.0

package/README.md

@@ -2,7 +2,7 @@
 
 TypeScript script tasks for [genroc](https://genroc.org). The package provides two binaries:
 
-* **`genroc-import`**: the bundler. `genctl` runs it on every `apply` and `types` to turn
+* **`genroc-import`**: the bundler. `genctl` runs it on every `apply` and `generate` to turn
   `$import: ./script.ts` into one typechecked, self-contained module string.
 * **`genroc-eval-node`**: the worker. It claims script tasks from genroc's queue and runs each
   one in a fresh worker thread.
@@ -27,7 +27,7 @@ Register the resolver in the `.genroc` beside your definitions:
 ```yaml
 resolvers:
   - name: import
-    phase: code
+    phase: typed
     ext: [.ts]
     command: [npx, genroc-import]
     types:
@@ -65,7 +65,7 @@ export default function (input: Input): Output {
 }
 ```
 
-* `genctl types` writes `greet.genroc.d.ts` beside the script. `Input` and `Output` come from
+* `genctl generate` writes `greet.genroc.d.ts` beside the script. `Input` and `Output` come from
   the definition, so a mismatch fails the typecheck.
 * `genctl apply` typechecks and bundles. **A type error or a missing default export fails the
   apply.**

package/dist/import.js

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-// The code-phase resolver: manifest on stdin, `{"code": [...]}` on stdout, diagnostic on stderr
-// with a non-zero exit (specs/source-resolution.md). Two modes share one `tsc` pass: "types"
-// writes declarations only, "build" typechecks and bundles.
+// The typed-phase resolver: manifest on stdin, `{"values": [...]}` on stdout, diagnostic on stderr
+// with a non-zero exit (specs/source-resolution.md). Two modes share one `tsc` pass: "generate"
+// writes declarations only, "resolve" typechecks and bundles.
 import { existsSync } from "node:fs";
 import { access, writeFile } from "node:fs/promises";
 import { builtinModules } from "node:module";
@@ -116,7 +116,7 @@ function declarations(at) {
         emitted.push(`export type ${identifier(next)} = ${body};`);
     }
     return [
-        "// Generated by genroc. Do not edit - regenerate with `genctl types`.",
+        "// Generated by genroc. Do not edit - regenerate with `genctl generate`.",
         `// ${where.name}  (${address(site.pointer)})`,
         "",
         ...emitted,
@@ -307,11 +307,14 @@ function address(pointer) {
         .join("")
         .replace(/^\./, "");
 }
-const located = manifest.processes.flatMap((where) => where.sites.map((site) => ({
-    site,
-    where,
-    file: resolve(where.dir, site.argument),
-})));
+const located = manifest.processes.flatMap((where) => where.sites.map((site) => {
+    const [script, ...rest] = site.args;
+    if (script === undefined || rest.length > 0) {
+        die(`${join(where.dir, where.file)}: ${address(site.pointer)}: $import takes one script, ` +
+            `and is given ${site.args.length} arguments`);
+    }
+    return { site, where, file: resolve(where.dir, script) };
+}));
 // The `code`-field contract is this resolver's, not genctl's, so it checks the directive landed
 // there: in a child call (the scaffold's shape) or an external task's input.
 for (const at of located) {
@@ -328,7 +331,7 @@ for (const at of located) {
 for (const at of located) {
     if (!existsSync(at.file)) {
         die(`${join(at.where.dir, at.where.file)}: ${address(at.site.pointer)}: ` +
-            `"$import: ${at.site.argument}" names no file (looked at ${at.file})`);
+            `"$import: ${at.site.args[0]}" names no file (looked at ${at.file})`);
     }
 }
 // One script at two sites with different input types is a refusal, not a union: the union
@@ -347,13 +350,12 @@ for (const at of located) {
 for (const at of byPath.values()) {
     await writeFile(typesPathFor(at.file), declarations(at));
 }
-if (manifest.mode === "types") {
-    console.log(JSON.stringify(manifest, null, 2));
+if (manifest.mode === "generate") {
     process.exit(0);
 }
 await typecheck([...byPath.values()]);
-const code = [];
+const values = [];
 for (const at of located) {
-    code.push(await bundle(at));
+    values.push(await bundle(at));
 }
-process.stdout.write(JSON.stringify({ code }));
+process.stdout.write(JSON.stringify({ values }));

package/import.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env node
-// The code-phase resolver: manifest on stdin, `{"code": [...]}` on stdout, diagnostic on stderr
-// with a non-zero exit (specs/source-resolution.md). Two modes share one `tsc` pass: "types"
-// writes declarations only, "build" typechecks and bundles.
+// The typed-phase resolver: manifest on stdin, `{"values": [...]}` on stdout, diagnostic on stderr
+// with a non-zero exit (specs/source-resolution.md). Two modes share one `tsc` pass: "generate"
+// writes declarations only, "resolve" typechecks and bundles.
 
 import { existsSync } from "node:fs";
 import { access, writeFile } from "node:fs/promises";
@@ -25,9 +25,9 @@ type Site = {
   child?: string;
   // The slot as a path of keys and indices, so nothing has to unescape a JSON Pointer.
   pointer: (string | number)[];
-  // Everything after `$<resolver>:`, verbatim. genctl does not read it as a path — that is
-  // this resolver's reading of it.
-  argument: string;
+  // The argument's words, split as sh splits single quotes. genctl does not read them as paths —
+  // that is this resolver's reading of them.
+  args: string[];
   // What .genroc asked genctl to type, keyed by the name it chose. This resolver reads Input
   // and Output; which ADDRESS each came from is the config's business, not ours.
   types?: Record<string, Schema>;
@@ -45,8 +45,7 @@ type ManifestProcess = {
 };
 
 type Manifest = {
-  mode: "types" | "build";
-  root: string;
+  mode: "generate" | "resolve";
   processes: ManifestProcess[];
 };
 
@@ -170,7 +169,7 @@ function declarations(at: Located): string {
   }
 
   return [
-    "// Generated by genroc. Do not edit - regenerate with `genctl types`.",
+    "// Generated by genroc. Do not edit - regenerate with `genctl generate`.",
     `// ${where.name}  (${address(site.pointer)})`,
     "",
     ...emitted,
@@ -401,11 +400,16 @@ function address(pointer: (string | number)[]): string {
     .replace(/^\./, "");
 }
 const located: Located[] = manifest.processes.flatMap((where) =>
-  where.sites.map((site) => ({
-    site,
-    where,
-    file: resolve(where.dir, site.argument),
-  })),
+  where.sites.map((site) => {
+    const [script, ...rest] = site.args;
+    if (script === undefined || rest.length > 0) {
+      die(
+        `${join(where.dir, where.file)}: ${address(site.pointer)}: $import takes one script, ` +
+          `and is given ${site.args.length} arguments`,
+      );
+    }
+    return { site, where, file: resolve(where.dir, script) };
+  }),
 );
 
 // The `code`-field contract is this resolver's, not genctl's, so it checks the directive landed
@@ -428,7 +432,7 @@ for (const at of located) {
   if (!existsSync(at.file)) {
     die(
       `${join(at.where.dir, at.where.file)}: ${address(at.site.pointer)}: ` +
-        `"$import: ${at.site.argument}" names no file (looked at ${at.file})`,
+        `"$import: ${at.site.args[0]}" names no file (looked at ${at.file})`,
     );
   }
 }
@@ -455,15 +459,14 @@ for (const at of byPath.values()) {
   await writeFile(typesPathFor(at.file), declarations(at));
 }
 
-if (manifest.mode === "types") {
-  console.log(JSON.stringify(manifest, null, 2));
+if (manifest.mode === "generate") {
   process.exit(0);
 }
 
 await typecheck([...byPath.values()]);
 
-const code: string[] = [];
+const values: string[] = [];
 for (const at of located) {
-  code.push(await bundle(at));
+  values.push(await bundle(at));
 }
-process.stdout.write(JSON.stringify({ code }));
+process.stdout.write(JSON.stringify({ values }));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@genroc/eval-node",
-  "version": "0.16.0",
+  "version": "0.17.0",
   "type": "module",
   "engines": {
     "node": ">=24"