@statewalker/cellb 0.8.8 → 0.8.9

package/README.md

@@ -36,7 +36,7 @@ worker is started that way (checked with a Vite build, see `scripts/pack-check.m
 
 | Import | What it gives |
 |---|---|
-| `@statewalker/cellb` | the runtime (`createCellRuntime`, `createProjectRuntime` with `loadProjectBindings`), `DurableObject` and `WorkerEntrypoint`, the ports and `CellStorage`, `celldBucket`, the object stores (`s3ObjectStore`, `memoryObjectStore`, `filesApiObjectStore`), `filesApiLtxLog`, `filesApiChangeLog`, `filesApiBackup`, `wasmMemoryOpener` (in-memory SQLite WASM), links over ports, `CellRouter`, `createShardWorker`, the WebSocket classes, and the errors embedders catch |
+| `@statewalker/cellb` | the runtime (`createCellRuntime`, `createProjectRuntime` with `loadProjectBindings`), `DurableObject` and `WorkerEntrypoint`, the ports and `CellStorage`, `celldBucket`, the object stores (`s3ObjectStore`, `memoryObjectStore`, `filesApiObjectStore`), `filesApiLtxLog`, `filesApiChangeLog`, `filesApiBackup`, `wasmMemoryOpener` (in-memory SQLite WASM), links over ports, `CellRouter`, `createShardWorker`, the WebSocket classes (and `withUpgrade`, for an upgrade request a browser can make), and the errors embedders catch |
 | `@statewalker/cellb/node` | `loadProject` and `buildProject` (the `cellb build` command), `nodeSqliteOpener`, `sqliteObjectStore` (celld dev's local bucket), `loadNodeProject`, `applyNodeD1Migrations`, and celld's peer protocol (`startCelldPeerServer`, `celldPeers`) |
 | `@statewalker/cellb/browser` | `loadProject` (a `cellb build` folder by URL, or sources with a compiler), `browserProjectRuntime`, `startProjectShards`, `joinProjectShards` and `serveProjectShard` (shards in workers and tabs), `installProjectRouter` (the ServiceWorker side), `sahpoolOpener`, `idbObjectStore`, `serviceWorkerConnector` |
 | `@statewalker/cellb/tabs` | the tab side and the ServiceWorker side of a project shared by the tabs (`joinProjectShards`, `installProjectRouter`, `shardOwner`) without the shard runtime: what a page and its ServiceWorker import |

package/dist/bindings/cjs-module.d.ts

@@ -0,0 +1,7 @@
+/**
+ * `names`: the loaded Worker's modules. Only a specifier that names one of them is listed (a
+ * relative path the bundler links): any other `require()` falls back to the realm's own, or throws
+ * when it is called, so `try { require("optional") } catch {}` works as in CommonJS; any other
+ * `import()` goes through the realm's resolution (the loaders' module registry).
+ */
+export declare function commonJsModule(source: string, name: string, names?: ReadonlySet<string>): string;

package/dist/bindings/cjs-module.js

@@ -0,0 +1,96 @@
+/**
+ * A Worker Loader `{ cjs }` module as an ES module, run as workerd runs CommonJS: not in strict
+ * mode unless it says so, `this` is `module.exports`, and importing it gives `module.exports` as
+ * the default export.
+ *
+ * An ES module's own code is always strict, so the CommonJS code runs through `Function`. Code
+ * there is invisible to the bundler (esbuild on Node, the Blob-URL loader in a browser), and its
+ * `import()` would resolve against the wrong module. So the code is parsed first (acorn), and each
+ * `import("x")` and `require("x")` with a literal specifier is listed in the ES module itself,
+ * where the bundler sees it: `import()` calls go to `__cellbImport`, which runs the listed
+ * `import("x")`, and `require("x")` returns the listed static import (a CommonJS module's
+ * `module.exports`, an ES module's namespace). Other specifiers fall back to `import()` and the
+ * realm's own `require`.
+ */
+import { parse } from "acorn";
+import { resolveModuleName } from "./module-registry.js";
+/** Marks the namespace of a module made here: `require()` of it gives its `module.exports`. */
+const CJS_MARK = "__cellbCommonJs";
+function scan(source) {
+    let ast;
+    try {
+        ast = parse(source, {
+            ecmaVersion: "latest",
+            sourceType: "script",
+            allowReturnOutsideFunction: true,
+            allowHashBang: true,
+        });
+    }
+    catch {
+        return undefined; // `Function` reports the syntax error when the module is evaluated
+    }
+    const found = { imports: [], requires: new Set() };
+    const literal = (n) => n?.type === "Literal" && typeof n.value === "string" ? n.value : undefined;
+    const visit = (n) => {
+        if (!n || typeof n.type !== "string")
+            return;
+        if (n.type === "ImportExpression")
+            found.imports.push({ spec: literal(n.source), at: n.start });
+        if (n.type === "CallExpression" &&
+            n.callee?.type === "Identifier" &&
+            n.callee.name === "require" &&
+            n.arguments.length === 1) {
+            const spec = literal(n.arguments[0]);
+            if (spec !== undefined)
+                found.requires.add(spec);
+        }
+        for (const key of Object.keys(n)) {
+            const v = n[key];
+            if (Array.isArray(v))
+                for (const c of v)
+                    visit(c);
+            else if (v && typeof v === "object" && typeof v.type === "string")
+                visit(v);
+        }
+    };
+    visit(ast);
+    return found;
+}
+/**
+ * `names`: the loaded Worker's modules. Only a specifier that names one of them is listed (a
+ * relative path the bundler links): any other `require()` falls back to the realm's own, or throws
+ * when it is called, so `try { require("optional") } catch {}` works as in CommonJS; any other
+ * `import()` goes through the realm's resolution (the loaders' module registry).
+ */
+export function commonJsModule(source, name, names) {
+    const found = scan(source) ?? { imports: [], requires: new Set() };
+    const listed = (spec) => spec !== undefined &&
+        /^\.{1,2}\//.test(spec) &&
+        (!names || resolveModuleName(spec, name, names) !== undefined);
+    // Each `import(…)` keyword becomes `__cellbImport` (same length: positions stay valid).
+    let body = source;
+    for (const { at } of [...found.imports].sort((a, b) => b.at - a.at))
+        body = `${body.slice(0, at)}__cellbImport${body.slice(at + "import".length)}`;
+    const q = JSON.stringify;
+    const requires = [...found.requires].filter(listed);
+    const imports = [...new Set(found.imports.map((i) => i.spec).filter(listed))];
+    const lines = [
+        ...requires.map((spec, i) => `import * as __cellbDep${i} from ${q(spec)};`),
+        `const __cellbRequired = { ${requires.map((spec, i) => `${q(spec)}: __cellbDep${i}`).join(", ")} };`,
+        `const __cellbImported = { ${imports.map((spec) => `${q(spec)}: () => import(${q(spec)})`).join(", ")} };`,
+        "const __cellbImport = (spec) => (__cellbImported[spec] ?? (() => import(spec)))();",
+        "const __cellbRequire = (spec) => {",
+        "  const ns = __cellbRequired[spec];",
+        `  if (ns) return ns.${CJS_MARK} ? ns.default : ns;`,
+        '  if (typeof require === "function") return require(spec);',
+        "  throw new Error(`Cannot find module '${spec}'`);",
+        "};",
+        "const module = { exports: {} };",
+        `new Function("module", "exports", "require", "__filename", "__dirname", "__cellbImport", ${q(`${body}\n//# sourceURL=${name.replace(/\s/g, "%20")}`)})`,
+        `  .call(module.exports, module, module.exports, __cellbRequire, ${q(name)}, "/", __cellbImport);`,
+        `export const ${CJS_MARK} = true;`,
+        "export default module.exports;",
+    ];
+    return lines.join("\n");
+}
+//# sourceMappingURL=cjs-module.js.map

package/dist/bindings/cjs-module.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"cjs-module.js","sourceRoot":"","sources":["../../src/bindings/cjs-module.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * A Worker Loader `{ cjs }` module as an ES module, run as workerd runs CommonJS: not in strict\n * mode unless it says so, `this` is `module.exports`, and importing it gives `module.exports` as\n * the default export.\n *\n * An ES module's own code is always strict, so the CommonJS code runs through `Function`. Code\n * there is invisible to the bundler (esbuild on Node, the Blob-URL loader in a browser), and its\n * `import()` would resolve against the wrong module. So the code is parsed first (acorn), and each\n * `import(\"x\")` and `require(\"x\")` with a literal specifier is listed in the ES module itself,\n * where the bundler sees it: `import()` calls go to `__cellbImport`, which runs the listed\n * `import(\"x\")`, and `require(\"x\")` returns the listed static import (a CommonJS module's\n * `module.exports`, an ES module's namespace). Other specifiers fall back to `import()` and the\n * realm's own `require`.\n */\nimport { type Node, parse } from \"acorn\";\nimport { resolveModuleName } from \"./module-registry.js\";\n\n/** Marks the namespace of a module made here: `require()` of it gives its `module.exports`. */\nconst CJS_MARK = \"__cellbCommonJs\";\n\ninterface Scan {\n  /** Literal specifiers of `import()` calls, and where each call's `import` keyword starts. */\n  imports: { spec?: string; at: number }[];\n  /** Literal specifiers of `require()` calls. */\n  requires: Set<string>;\n}\n\nfunction scan(source: string): Scan | undefined {\n  let ast: Node;\n  try {\n    ast = parse(source, {\n      ecmaVersion: \"latest\",\n      sourceType: \"script\",\n      allowReturnOutsideFunction: true,\n      allowHashBang: true,\n    });\n  } catch {\n    return undefined; // `Function` reports the syntax error when the module is evaluated\n  }\n  const found: Scan = { imports: [], requires: new Set() };\n  const literal = (n: any) =>\n    n?.type === \"Literal\" && typeof n.value === \"string\" ? (n.value as string) : undefined;\n  const visit = (n: any) => {\n    if (!n || typeof n.type !== \"string\") return;\n    if (n.type === \"ImportExpression\") found.imports.push({ spec: literal(n.source), at: n.start });\n    if (\n      n.type === \"CallExpression\" &&\n      n.callee?.type === \"Identifier\" &&\n      n.callee.name === \"require\" &&\n      n.arguments.length === 1\n    ) {\n      const spec = literal(n.arguments[0]);\n      if (spec !== undefined) found.requires.add(spec);\n    }\n    for (const key of Object.keys(n)) {\n      const v = n[key];\n      if (Array.isArray(v)) for (const c of v) visit(c);\n      else if (v && typeof v === \"object\" && typeof v.type === \"string\") visit(v);\n    }\n  };\n  visit(ast);\n  return found;\n}\n\n/**\n * `names`: the loaded Worker's modules. Only a specifier that names one of them is listed (a\n * relative path the bundler links): any other `require()` falls back to the realm's own, or throws\n * when it is called, so `try { require(\"optional\") } catch {}` works as in CommonJS; any other\n * `import()` goes through the realm's resolution (the loaders' module registry).\n */\nexport function commonJsModule(source: string, name: string, names?: ReadonlySet<string>): string {\n  const found = scan(source) ?? { imports: [], requires: new Set<string>() };\n  const listed = (spec: string | undefined): spec is string =>\n    spec !== undefined &&\n    /^\\.{1,2}\\//.test(spec) &&\n    (!names || resolveModuleName(spec, name, names) !== undefined);\n  // Each `import(…)` keyword becomes `__cellbImport` (same length: positions stay valid).\n  let body = source;\n  for (const { at } of [...found.imports].sort((a, b) => b.at - a.at))\n    body = `${body.slice(0, at)}__cellbImport${body.slice(at + \"import\".length)}`;\n  const q = JSON.stringify;\n  const requires = [...found.requires].filter(listed);\n  const imports = [...new Set(found.imports.map((i) => i.spec).filter(listed))];\n  const lines = [\n    ...requires.map((spec, i) => `import * as __cellbDep${i} from ${q(spec)};`),\n    `const __cellbRequired = { ${requires.map((spec, i) => `${q(spec)}: __cellbDep${i}`).join(\", \")} };`,\n    `const __cellbImported = { ${imports.map((spec) => `${q(spec)}: () => import(${q(spec)})`).join(\", \")} };`,\n    \"const __cellbImport = (spec) => (__cellbImported[spec] ?? (() => import(spec)))();\",\n    \"const __cellbRequire = (spec) => {\",\n    \"  const ns = __cellbRequired[spec];\",\n    `  if (ns) return ns.${CJS_MARK} ? ns.default : ns;`,\n    '  if (typeof require === \"function\") return require(spec);',\n    \"  throw new Error(`Cannot find module '${spec}'`);\",\n    \"};\",\n    \"const module = { exports: {} };\",\n    `new Function(\"module\", \"exports\", \"require\", \"__filename\", \"__dirname\", \"__cellbImport\", ${q(`${body}\\n//# sourceURL=${name.replace(/\\s/g, \"%20\")}`)})`,\n    `  .call(module.exports, module, module.exports, __cellbRequire, ${q(name)}, \"/\", __cellbImport);`,\n    `export const ${CJS_MARK} = true;`,\n    \"export default module.exports;\",\n  ];\n  return lines.join(\"\\n\");\n}\n"]}

package/dist/bindings/module-registry.d.ts

@@ -0,0 +1,33 @@
+/** The name of the loaded module `spec` names from module `importer`, or `undefined`. */
+export declare function resolveModuleName(spec: string, importer: string, names: ReadonlySet<string>): string | undefined;
+/** The same function as source text, for a registry module generated into a bundle. */
+export declare const RESOLVE_MODULE_NAME_SOURCE = "(spec, importer, names) => {\n  if (names.has(spec)) return spec;\n  if (!/^\\.{0,2}\\//.test(spec)) return undefined;\n  const name = new URL(spec, \"file:///\" + importer).pathname.slice(1);\n  return names.has(name) ? name : undefined;\n}";
+/** The identifier rewritten calls use. */
+export declare const IMPORT_FROM = "__cellbImportFrom";
+/**
+ * `source` (an ES module named `name`) with each `import(spec)` that the bundler cannot link (a
+ * computed specifier, or a literal that is not a relative path) calling `__cellbImportFrom(spec,
+ * name)`. Returns `undefined` when there is none (or the module does not parse: the loader then
+ * reports its syntax error).
+ */
+export declare function routeDynamicImports(source: string, name: string): string | undefined;
+/** `prelude` put in front of `source` on its first line (after a hashbang), so lines keep their numbers. */
+export declare function prefixModule(source: string, prelude: string): string;
+/** What an ES module exports by name, and the specifiers it re-exports everything from. */
+export interface ModuleExports {
+    names: string[];
+    stars: string[];
+}
+/** The exports of ES module `source` (`undefined` if it does not parse). */
+export declare function moduleExports(source: string): ModuleExports | undefined;
+/**
+ * Each module's export names, `export *` followed within the modules (as far as they resolve).
+ * A module that does not parse, or a star from outside them, adds nothing.
+ */
+export declare function exportNamesByModule(modules: Record<string, string>): Record<string, string[]>;
+/**
+ * An ES module that stands for loaded module `name` where code imports it by a specifier no
+ * bundler saw (an `import()` in code built with `Function`): it takes the bundled module's
+ * namespace from the realm's registry (`globalThis.__cellbLoadedModules`) and re-exports it.
+ */
+export declare function loadedModuleShim(name: string, exportNames: string[]): string;

package/dist/bindings/module-registry.js

@@ -0,0 +1,180 @@
+/**
+ * `import()` in a loaded Worker resolves against its own modules, as on workerd: the specifier
+ * names a module of the `WorkerCode` exactly (Kitesurf names page modules by their URL), or is
+ * a path relative to the importing module. The loaders bundle (esbuild on Node) or link (Blob URLs
+ * in a browser) the modules, which handles a literal relative `import("./x.js")`; a computed
+ * specifier, or one that is a module's whole name, is resolved at run time instead.
+ *
+ * `routeDynamicImports` rewrites those `import(spec)` calls of a module to
+ * `__cellbImportFrom(spec, "<module name>")`; each loader defines `__cellbImportFrom` with
+ * `resolveModuleName` over its own modules, falling back to the realm's `import()`.
+ */
+import { parse } from "acorn";
+/** The name of the loaded module `spec` names from module `importer`, or `undefined`. */
+export function resolveModuleName(spec, importer, names) {
+    if (names.has(spec))
+        return spec;
+    if (!/^\.{0,2}\//.test(spec))
+        return undefined;
+    const name = new URL(spec, `file:///${importer}`).pathname.slice(1);
+    return names.has(name) ? name : undefined;
+}
+/** The same function as source text, for a registry module generated into a bundle. */
+export const RESOLVE_MODULE_NAME_SOURCE = `(spec, importer, names) => {
+  if (names.has(spec)) return spec;
+  if (!/^\\.{0,2}\\//.test(spec)) return undefined;
+  const name = new URL(spec, "file:///" + importer).pathname.slice(1);
+  return names.has(name) ? name : undefined;
+}`;
+/** The identifier rewritten calls use. */
+export const IMPORT_FROM = "__cellbImportFrom";
+/**
+ * `source` (an ES module named `name`) with each `import(spec)` that the bundler cannot link (a
+ * computed specifier, or a literal that is not a relative path) calling `__cellbImportFrom(spec,
+ * name)`. Returns `undefined` when there is none (or the module does not parse: the loader then
+ * reports its syntax error).
+ */
+export function routeDynamicImports(source, name) {
+    if (!source.includes("import"))
+        return undefined;
+    let ast;
+    try {
+        ast = parse(source, { ecmaVersion: "latest", sourceType: "module", allowHashBang: true });
+    }
+    catch {
+        return undefined;
+    }
+    const calls = [];
+    const visit = (n) => {
+        if (!n || typeof n.type !== "string")
+            return;
+        if (n.type === "ImportExpression") {
+            const literal = n.source.type === "Literal" && typeof n.source.value === "string"
+                ? n.source.value
+                : undefined;
+            if (literal === undefined || !/^\.{1,2}\//.test(literal))
+                calls.push({ start: n.start, sourceEnd: n.source.end });
+        }
+        for (const key of Object.keys(n)) {
+            const v = n[key];
+            if (Array.isArray(v))
+                for (const c of v)
+                    visit(c);
+            else if (v && typeof v === "object" && typeof v.type === "string")
+                visit(v);
+        }
+    };
+    visit(ast);
+    if (!calls.length)
+        return undefined;
+    let out = source;
+    // From the end, so earlier positions stay valid: `import(spec` → `__cellbImportFrom(spec, name`.
+    for (const { start, sourceEnd } of calls.sort((a, b) => b.start - a.start))
+        out =
+            out.slice(0, start) +
+                IMPORT_FROM +
+                out.slice(start + "import".length, sourceEnd) +
+                `, ${JSON.stringify(name)}` +
+                out.slice(sourceEnd);
+    return out;
+}
+/** `prelude` put in front of `source` on its first line (after a hashbang), so lines keep their numbers. */
+export function prefixModule(source, prelude) {
+    if (!source.startsWith("#!"))
+        return prelude + source;
+    const nl = source.indexOf("\n");
+    return nl < 0
+        ? `${source}\n${prelude}`
+        : `${source.slice(0, nl + 1)}${prelude}${source.slice(nl + 1)}`;
+}
+/** The exports of ES module `source` (`undefined` if it does not parse). */
+export function moduleExports(source) {
+    let ast;
+    try {
+        ast = parse(source, { ecmaVersion: "latest", sourceType: "module", allowHashBang: true });
+    }
+    catch {
+        return undefined;
+    }
+    const names = new Set();
+    const stars = [];
+    const nameOf = (n) => (n.type === "Identifier" ? n.name : String(n.value));
+    const bound = (p) => {
+        if (!p)
+            return;
+        if (p.type === "Identifier")
+            names.add(p.name);
+        else if (p.type === "ObjectPattern")
+            for (const q of p.properties)
+                bound(q.type === "RestElement" ? q.argument : q.value);
+        else if (p.type === "ArrayPattern")
+            for (const q of p.elements)
+                bound(q);
+        else if (p.type === "RestElement")
+            bound(p.argument);
+        else if (p.type === "AssignmentPattern")
+            bound(p.left);
+    };
+    for (const node of ast.body) {
+        if (node.type === "ExportDefaultDeclaration")
+            names.add("default");
+        else if (node.type === "ExportAllDeclaration") {
+            if (node.exported)
+                names.add(nameOf(node.exported));
+            else
+                stars.push(String(node.source.value));
+        }
+        else if (node.type === "ExportNamedDeclaration") {
+            const d = node.declaration;
+            if (d?.type === "VariableDeclaration")
+                for (const v of d.declarations)
+                    bound(v.id);
+            else if (d?.id)
+                names.add(d.id.name);
+            for (const s of node.specifiers ?? [])
+                names.add(nameOf(s.exported));
+        }
+    }
+    return { names: [...names], stars };
+}
+/**
+ * Each module's export names, `export *` followed within the modules (as far as they resolve).
+ * A module that does not parse, or a star from outside them, adds nothing.
+ */
+export function exportNamesByModule(modules) {
+    const own = new Map();
+    for (const [name, text] of Object.entries(modules))
+        own.set(name, moduleExports(text) ?? { names: [], stars: [] });
+    const names = new Set(own.keys());
+    const all = (name, seen) => {
+        const out = new Set(own.get(name)?.names ?? []);
+        if (seen.has(name))
+            return out;
+        seen.add(name);
+        for (const spec of own.get(name)?.stars ?? []) {
+            const target = resolveModuleName(spec, name, names);
+            if (target === undefined)
+                continue;
+            for (const n of all(target, seen))
+                if (n !== "default")
+                    out.add(n);
+        }
+        return out;
+    };
+    return Object.fromEntries([...names].map((n) => [n, [...all(n, new Set())]]));
+}
+/**
+ * An ES module that stands for loaded module `name` where code imports it by a specifier no
+ * bundler saw (an `import()` in code built with `Function`): it takes the bundled module's
+ * namespace from the realm's registry (`globalThis.__cellbLoadedModules`) and re-exports it.
+ */
+export function loadedModuleShim(name, exportNames) {
+    const ident = /^[A-Za-z_$][\w$]*$/;
+    const named = exportNames.filter((n) => n !== "default" && ident.test(n));
+    return [
+        `const ns = await globalThis.__cellbLoadedModules.load(${JSON.stringify(name)});`,
+        ...(exportNames.includes("default") ? ["export default ns.default;"] : []),
+        ...(named.length ? [`export const { ${named.join(", ")} } = ns;`] : []),
+    ].join("\n");
+}
+//# sourceMappingURL=module-registry.js.map

package/dist/bindings/module-registry.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"module-registry.js","sourceRoot":"","sources":["../../src/bindings/module-registry.ts"],"names":[],"mappings":"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","sourcesContent":["/**\n * `import()` in a loaded Worker resolves against its own modules, as on workerd: the specifier\n * names a module of the `WorkerCode` exactly (Kitesurf names page modules by their URL), or is\n * a path relative to the importing module. The loaders bundle (esbuild on Node) or link (Blob URLs\n * in a browser) the modules, which handles a literal relative `import(\"./x.js\")`; a computed\n * specifier, or one that is a module's whole name, is resolved at run time instead.\n *\n * `routeDynamicImports` rewrites those `import(spec)` calls of a module to\n * `__cellbImportFrom(spec, \"<module name>\")`; each loader defines `__cellbImportFrom` with\n * `resolveModuleName` over its own modules, falling back to the realm's `import()`.\n */\nimport { parse } from \"acorn\";\n\n/** The name of the loaded module `spec` names from module `importer`, or `undefined`. */\nexport function resolveModuleName(\n  spec: string,\n  importer: string,\n  names: ReadonlySet<string>,\n): string | undefined {\n  if (names.has(spec)) return spec;\n  if (!/^\\.{0,2}\\//.test(spec)) return undefined;\n  const name = new URL(spec, `file:///${importer}`).pathname.slice(1);\n  return names.has(name) ? name : undefined;\n}\n\n/** The same function as source text, for a registry module generated into a bundle. */\nexport const RESOLVE_MODULE_NAME_SOURCE = `(spec, importer, names) => {\n  if (names.has(spec)) return spec;\n  if (!/^\\\\.{0,2}\\\\//.test(spec)) return undefined;\n  const name = new URL(spec, \"file:///\" + importer).pathname.slice(1);\n  return names.has(name) ? name : undefined;\n}`;\n\n/** The identifier rewritten calls use. */\nexport const IMPORT_FROM = \"__cellbImportFrom\";\n\n/**\n * `source` (an ES module named `name`) with each `import(spec)` that the bundler cannot link (a\n * computed specifier, or a literal that is not a relative path) calling `__cellbImportFrom(spec,\n * name)`. Returns `undefined` when there is none (or the module does not parse: the loader then\n * reports its syntax error).\n */\nexport function routeDynamicImports(source: string, name: string): string | undefined {\n  if (!source.includes(\"import\")) return undefined;\n  let ast: any;\n  try {\n    ast = parse(source, { ecmaVersion: \"latest\", sourceType: \"module\", allowHashBang: true });\n  } catch {\n    return undefined;\n  }\n  const calls: { start: number; sourceEnd: number }[] = [];\n  const visit = (n: any) => {\n    if (!n || typeof n.type !== \"string\") return;\n    if (n.type === \"ImportExpression\") {\n      const literal =\n        n.source.type === \"Literal\" && typeof n.source.value === \"string\"\n          ? (n.source.value as string)\n          : undefined;\n      if (literal === undefined || !/^\\.{1,2}\\//.test(literal))\n        calls.push({ start: n.start, sourceEnd: n.source.end });\n    }\n    for (const key of Object.keys(n)) {\n      const v = n[key];\n      if (Array.isArray(v)) for (const c of v) visit(c);\n      else if (v && typeof v === \"object\" && typeof v.type === \"string\") visit(v);\n    }\n  };\n  visit(ast);\n  if (!calls.length) return undefined;\n  let out = source;\n  // From the end, so earlier positions stay valid: `import(spec` → `__cellbImportFrom(spec, name`.\n  for (const { start, sourceEnd } of calls.sort((a, b) => b.start - a.start))\n    out =\n      out.slice(0, start) +\n      IMPORT_FROM +\n      out.slice(start + \"import\".length, sourceEnd) +\n      `, ${JSON.stringify(name)}` +\n      out.slice(sourceEnd);\n  return out;\n}\n\n/** `prelude` put in front of `source` on its first line (after a hashbang), so lines keep their numbers. */\nexport function prefixModule(source: string, prelude: string): string {\n  if (!source.startsWith(\"#!\")) return prelude + source;\n  const nl = source.indexOf(\"\\n\");\n  return nl < 0\n    ? `${source}\\n${prelude}`\n    : `${source.slice(0, nl + 1)}${prelude}${source.slice(nl + 1)}`;\n}\n\n/** What an ES module exports by name, and the specifiers it re-exports everything from. */\nexport interface ModuleExports {\n  names: string[];\n  stars: string[];\n}\n\n/** The exports of ES module `source` (`undefined` if it does not parse). */\nexport function moduleExports(source: string): ModuleExports | undefined {\n  let ast: any;\n  try {\n    ast = parse(source, { ecmaVersion: \"latest\", sourceType: \"module\", allowHashBang: true });\n  } catch {\n    return undefined;\n  }\n  const names = new Set<string>();\n  const stars: string[] = [];\n  const nameOf = (n: any) => (n.type === \"Identifier\" ? n.name : String(n.value));\n  const bound = (p: any) => {\n    if (!p) return;\n    if (p.type === \"Identifier\") names.add(p.name);\n    else if (p.type === \"ObjectPattern\")\n      for (const q of p.properties) bound(q.type === \"RestElement\" ? q.argument : q.value);\n    else if (p.type === \"ArrayPattern\") for (const q of p.elements) bound(q);\n    else if (p.type === \"RestElement\") bound(p.argument);\n    else if (p.type === \"AssignmentPattern\") bound(p.left);\n  };\n  for (const node of ast.body) {\n    if (node.type === \"ExportDefaultDeclaration\") names.add(\"default\");\n    else if (node.type === \"ExportAllDeclaration\") {\n      if (node.exported) names.add(nameOf(node.exported));\n      else stars.push(String(node.source.value));\n    } else if (node.type === \"ExportNamedDeclaration\") {\n      const d = node.declaration;\n      if (d?.type === \"VariableDeclaration\") for (const v of d.declarations) bound(v.id);\n      else if (d?.id) names.add(d.id.name);\n      for (const s of node.specifiers ?? []) names.add(nameOf(s.exported));\n    }\n  }\n  return { names: [...names], stars };\n}\n\n/**\n * Each module's export names, `export *` followed within the modules (as far as they resolve).\n * A module that does not parse, or a star from outside them, adds nothing.\n */\nexport function exportNamesByModule(modules: Record<string, string>): Record<string, string[]> {\n  const own = new Map<string, ModuleExports>();\n  for (const [name, text] of Object.entries(modules))\n    own.set(name, moduleExports(text) ?? { names: [], stars: [] });\n  const names = new Set(own.keys());\n  const all = (name: string, seen: Set<string>): Set<string> => {\n    const out = new Set(own.get(name)?.names ?? []);\n    if (seen.has(name)) return out;\n    seen.add(name);\n    for (const spec of own.get(name)?.stars ?? []) {\n      const target = resolveModuleName(spec, name, names);\n      if (target === undefined) continue;\n      for (const n of all(target, seen)) if (n !== \"default\") out.add(n);\n    }\n    return out;\n  };\n  return Object.fromEntries([...names].map((n) => [n, [...all(n, new Set())]]));\n}\n\n/**\n * An ES module that stands for loaded module `name` where code imports it by a specifier no\n * bundler saw (an `import()` in code built with `Function`): it takes the bundled module's\n * namespace from the realm's registry (`globalThis.__cellbLoadedModules`) and re-exports it.\n */\nexport function loadedModuleShim(name: string, exportNames: string[]): string {\n  const ident = /^[A-Za-z_$][\\w$]*$/;\n  const named = exportNames.filter((n) => n !== \"default\" && ident.test(n));\n  return [\n    `const ns = await globalThis.__cellbLoadedModules.load(${JSON.stringify(name)});`,\n    ...(exportNames.includes(\"default\") ? [\"export default ns.default;\"] : []),\n    ...(named.length ? [`export const { ${named.join(\", \")} } = ns;`] : []),\n  ].join(\"\\n\");\n}\n"]}

package/dist/bindings/worker-loader.d.ts

@@ -6,9 +6,11 @@ export interface WorkerCode {
     modules: Record<string, string | {
         js?: string;
         esModule?: string;
+        cjs?: string;
         text?: string;
         json?: unknown;
-        wasm?: BufferSource;
+        /** The bytes, or (from `compileWasmModules`) the compiled module. */
+        wasm?: BufferSource | WebAssembly.Module;
     } | {
         data: BufferSource;
     }>;
@@ -44,9 +46,25 @@ export interface TailEvent {
 }
 /**
  * One `WorkerCode.modules` entry as ES module source; text and JSON become a default export,
- * wasm bytes a compiled `WebAssembly.Module`.
+ * wasm bytes a compiled `WebAssembly.Module`, and a CommonJS module's `module.exports` the
+ * default export. `name` names a CommonJS module in stack traces.
  */
-export declare function moduleText(entry: WorkerCode["modules"][string]): string;
+export declare function moduleText(entry: WorkerCode["modules"][string], name?: string, names?: ReadonlySet<string>): string;
+/** The realm's table of compiled wasm modules of loaded code, by key. */
+export declare const WASM_TABLE = "__cellsWasmModules";
+/** The key of `mod` in this realm's wasm table (registered on first use). */
+export declare function wasmModuleKey(mod: WebAssembly.Module): string;
+/** Puts compiled modules in this realm's wasm table (an isolate receives its loader's). */
+export declare function registerWasmModules(modules: Record<string, WebAssembly.Module>): void;
+/** The table entries the wasm modules of `code` use (what an isolate needs of this realm's table). */
+export declare function wasmModulesOf(code: WorkerCode): Record<string, WebAssembly.Module>;
+/**
+ * `code` with each `wasm` module compiled (asynchronously, once per bytes object: Kitesurf hands
+ * the same ArrayBuffer to every page's Worker), so loaders put a compiled module in the realm's
+ * table instead of the bytes as base64 text, which a large module makes slow to build, parse,
+ * decode and compile synchronously on every load.
+ */
+export declare function compileWasmModules(code: WorkerCode): Promise<WorkerCode>;
 /**
  * The `fetch` loaded code sees, from `WorkerCode.globalOutbound`: omitted → the loader's own
  * (undefined: no override); `null` → every fetch throws; a Fetcher → each fetch goes through it.
@@ -70,7 +88,7 @@ export declare function workerLoader(load: ModuleLoader, opts?: {
         dispose(): void;
         getEntrypoint(name?: string, options?: {
             props?: unknown;
-        }): {};
+        }): Record<string, unknown>;
     };
     get(id: string, getCode: () => WorkerCode | Promise<WorkerCode>, cached?: boolean): {
         getDurableObjectClass(name: string): import("../core/handles.js").ClassHandle;
@@ -78,6 +96,6 @@ export declare function workerLoader(load: ModuleLoader, opts?: {
         dispose(): void;
         getEntrypoint(name?: string, options?: {
             props?: unknown;
-        }): {};
+        }): Record<string, unknown>;
     };
 };

package/dist/bindings/worker-loader.js

@@ -1,14 +1,20 @@
-import { classHandle, cross, ctxExports, entrypointStub, ISOLATED, pipeTo, REFUSE, rpcPromise, } from "../core/handles.js";
+import { classHandle, cross, ctxExports, entrypointStub, ISOLATED, ON_ABORT, pipeTo, REFUSE, rpcPromise, } from "../core/handles.js";
+import { commonJsModule } from "./cjs-module.js";
 /** workerd's refusal of a loaded Worker's entrypoint passed on to another Worker. */
 const DYNAMIC_ENTRYPOINT = "Entrypoints to dynamically-loaded workers cannot be transferred to other Workers, because the system does not know how to reload this Worker from scratch. Instead, have the parent Worker expose an entrypoint which constructs the dynamic worker and forwards to it.";
 /**
  * One `WorkerCode.modules` entry as ES module source; text and JSON become a default export,
- * wasm bytes a compiled `WebAssembly.Module`.
+ * wasm bytes a compiled `WebAssembly.Module`, and a CommonJS module's `module.exports` the
+ * default export. `name` names a CommonJS module in stack traces.
  */
-export function moduleText(entry) {
+export function moduleText(entry, name = "module.cjs", names) {
     if (typeof entry === "string")
         return entry;
     const m = entry; // workerLoader refuses data
+    if (typeof m.cjs === "string")
+        return commonJsModule(m.cjs, name, names);
+    if (m.wasm instanceof WebAssembly.Module)
+        return `export default globalThis.${WASM_TABLE}[${JSON.stringify(wasmModuleKey(m.wasm))}];`;
     if (m.wasm) {
         const bytes = ArrayBuffer.isView(m.wasm)
             ? new Uint8Array(m.wasm.buffer, m.wasm.byteOffset, m.wasm.byteLength)
@@ -20,6 +26,60 @@ export function moduleText(entry) {
     }
     return m.js ?? m.esModule ?? `export default ${JSON.stringify(m.text ?? m.json)};`;
 }
+/** The realm's table of compiled wasm modules of loaded code, by key. */
+export const WASM_TABLE = "__cellsWasmModules";
+const keys = new WeakMap();
+let lastKey = 0;
+/** The key of `mod` in this realm's wasm table (registered on first use). */
+export function wasmModuleKey(mod) {
+    let key = keys.get(mod);
+    if (!key) {
+        key = `w${++lastKey}`;
+        keys.set(mod, key);
+        registerWasmModules({ [key]: mod });
+    }
+    return key;
+}
+/** Puts compiled modules in this realm's wasm table (an isolate receives its loader's). */
+export function registerWasmModules(modules) {
+    const g = globalThis;
+    g[WASM_TABLE] ??= {};
+    Object.assign(g[WASM_TABLE], modules);
+}
+/** The table entries the wasm modules of `code` use (what an isolate needs of this realm's table). */
+export function wasmModulesOf(code) {
+    const out = {};
+    for (const m of Object.values(code.modules))
+        if (typeof m === "object" && "wasm" in m && m.wasm instanceof WebAssembly.Module)
+            out[wasmModuleKey(m.wasm)] = m.wasm;
+    return out;
+}
+const compiled = new WeakMap();
+/**
+ * `code` with each `wasm` module compiled (asynchronously, once per bytes object: Kitesurf hands
+ * the same ArrayBuffer to every page's Worker), so loaders put a compiled module in the realm's
+ * table instead of the bytes as base64 text, which a large module makes slow to build, parse,
+ * decode and compile synchronously on every load.
+ */
+export async function compileWasmModules(code) {
+    let modules;
+    for (const [name, m] of Object.entries(code.modules)) {
+        if (typeof m !== "object" || !("wasm" in m) || !m.wasm)
+            continue;
+        if (m.wasm instanceof WebAssembly.Module)
+            continue;
+        const bytes = m.wasm;
+        let p = compiled.get(bytes);
+        if (!p) {
+            p = WebAssembly.compile(bytes);
+            compiled.set(bytes, p);
+            p.catch(() => compiled.delete(bytes));
+        }
+        modules ??= { ...code.modules };
+        modules[name] = { ...m, wasm: await p };
+    }
+    return modules ? { ...code, modules } : code;
+}
 /**
  * The `fetch` loaded code sees, from `WorkerCode.globalOutbound`: omitted → the loader's own
  * (undefined: no override); `null` → every fetch throws; a Fetcher → each fetch goes through it.
@@ -64,6 +124,13 @@ export function workerLoader(load, opts = {}) {
                         const logs = [];
                         const sink = (level, message) => logs.push({ level, message, timestamp: Date.now() });
                         const module = await load(id, code, sink);
+                        // Its isolate ended (`abortIsolate()`): the next get() of this id loads it again.
+                        module[ON_ABORT]?.(() => {
+                            if (cache.get(id) === p)
+                                cache.delete(id);
+                            if (own === p)
+                                own = undefined;
+                        });
                         const env = code.env ?? {};
                         return { module, env, exports: ctxExports(module, env), code, logs };
                     })();
@@ -152,12 +219,15 @@ export function workerLoader(load, opts = {}) {
                         refused.catch(() => { });
                         return refused;
                     }
-                    return new Proxy({}, {
+                    const entrypoint = new Proxy({}, {
                         get(_t, prop) {
                             if (prop === REFUSE)
                                 return DYNAMIC_ENTRYPOINT;
                             if (prop === "then" || typeof prop === "symbol")
                                 return undefined;
+                            // workerd's `dup()`: this entrypoint holds nothing to release, so it is itself.
+                            if (prop === "dup")
+                                return () => entrypoint;
                             return (...args) => {
                                 // Boxed, so awaiting the load does not await the call: calls on its
                                 // RpcPromise are pipelined.
@@ -174,6 +244,7 @@ export function workerLoader(load, opts = {}) {
                             };
                         },
                     });
+                    return entrypoint;
                 },
             };
         },