@frockbot/applet-sdk 0.7.126 → 0.7.127

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@frockbot/applet-sdk",
-  "version": "0.7.126",
+  "version": "0.7.127",
   "private": false,
   "type": "module",
   "description": "Authoring SDK for FrockBot Applets: schema-first Durable Object server, TanStack DB client, component kit, linter, and the build pipeline.",

package/src/build/artifacts.ts

@@ -21,13 +21,12 @@
  */
 
 import { createHash, randomUUID } from "node:crypto";
-import { realpathSync } from "node:fs";
-import { relative, resolve } from "node:path";
 
-import { build as esbuild, type Metafile } from "esbuild";
+import { build as esbuild } from "esbuild";
 
 import type { AppletDescriptionV1 } from "../server/applet.js";
 import { readDescriptor, type AppletBuildManifestV1 } from "./manifest.js";
+import { stableModulePaths } from "./module-paths.js";
 import { bundlerNodePaths, SDK_ENTRIES, SDK_ROOT } from "./paths.js";
 import { withOneMoreBoot } from "./boot.js";
 import { startAppletRuntime } from "./runtime.js";
@@ -42,66 +41,6 @@ function sha256(text: string): string {
   return createHash("sha256").update(text, "utf8").digest("hex");
 }
 
-/** esbuild reports real paths; a temp directory is often a symlink to one. */
-function real(path: string): string {
-  try {
-    return realpathSync(resolve(path));
-  } catch {
-    return resolve(path);
-  }
-}
-
-/**
- * Where a bundled module came from, said the same way everywhere.
- *
- * An Applet's directory, the SDK's directory and the working directory are all
- * different on an author's machine and in the build container — and esbuild
- * writes each module's path into the unminified output as a comment. Left
- * alone, identical source bundled in two places produces two different files
- * and therefore two different content hashes, which would give R2 a new object
- * on every publish of unchanged code.
- */
-function moduleLabel(absolute: string, appletRoot: string): string {
-  for (const [root, prefix] of [
-    [appletRoot, ""],
-    [real(SDK_ROOT), "applet-sdk/"],
-  ] as const) {
-    const inside = relative(root, absolute);
-    if (!inside.startsWith("..") && inside !== "") return prefix + inside;
-  }
-  const dependency = absolute.lastIndexOf("node_modules/");
-  return dependency === -1 ? absolute : absolute.slice(dependency);
-}
-
-/**
- * Rewrites esbuild's module comments to those stable labels.
- *
- * The paths come from the metafile rather than from a pattern over the output,
- * so only lines esbuild actually wrote are touched and a comment in someone's
- * own source is left alone.
- */
-function stableModulePaths(
-  text: string,
-  metafile: Metafile,
-  appletRoot: string,
-): string {
-  const root = real(appletRoot);
-  const labels = new Map(
-    Object.keys(metafile.inputs).map((input) => [
-      input,
-      moduleLabel(real(input), root),
-    ]),
-  );
-  return text
-    .split("\n")
-    .map((line) => {
-      if (!line.startsWith("// ")) return line;
-      const label = labels.get(line.slice(3));
-      return label === undefined ? line : `// ${label}`;
-    })
-    .join("\n");
-}
-
 async function bundle(options: {
   stdin: string;
   resolveDir: string;
@@ -136,7 +75,9 @@ async function bundle(options: {
   });
   const file = result.outputFiles?.[0];
   if (!file) throw new Error("The bundler produced no output");
-  return stableModulePaths(file.text, result.metafile, options.resolveDir);
+  return stableModulePaths(file.text, result.metafile, options.resolveDir, [
+    { directory: SDK_ROOT, prefix: "applet-sdk/" },
+  ]);
 }
 
 function page(title: string, script: string): string {

package/src/build/module-paths.ts

@@ -0,0 +1,72 @@
+import { realpathSync } from "node:fs";
+import { isAbsolute, relative, resolve, sep } from "node:path";
+
+import type { Metafile } from "esbuild";
+
+export interface StableModuleRoot {
+  directory: string;
+  prefix: string;
+}
+
+/** esbuild reports real paths; a temp directory is often a symlink to one. */
+function real(path: string): string {
+  try {
+    return realpathSync(resolve(path));
+  } catch {
+    return resolve(path);
+  }
+}
+
+function portable(path: string): string {
+  return path.split(sep).join("/").replaceAll("\\", "/");
+}
+
+function moduleLabel(absolute: string, roots: readonly StableModuleRoot[]) {
+  for (const { directory, prefix } of roots) {
+    const inside = relative(directory, absolute);
+    const outside =
+      inside === ".." || inside.startsWith(`..${sep}`) || isAbsolute(inside);
+    if (!outside && inside !== "") return prefix + portable(inside);
+  }
+  const path = portable(absolute);
+  const dependency = path.lastIndexOf("node_modules/");
+  return dependency === -1 ? path : path.slice(dependency);
+}
+
+/**
+ * Rewrites esbuild's module comments to location-independent labels.
+ *
+ * The paths come from the metafile rather than from a pattern over the output,
+ * so only lines esbuild actually wrote are touched and a comment in authored
+ * source is left alone. Callers name any additional source roots that belong
+ * to their artifact; dependencies under `node_modules` are stable by package
+ * path automatically.
+ */
+export function stableModulePaths(
+  text: string,
+  metafile: Metafile,
+  sourceRoot: string,
+  additionalRoots: readonly StableModuleRoot[] = [],
+): string {
+  const roots = [
+    { directory: real(sourceRoot), prefix: "" },
+    ...additionalRoots.map(({ directory, prefix }) => ({
+      directory: real(directory),
+      prefix,
+    })),
+  ];
+  const labels = new Map(
+    Object.keys(metafile.inputs).map((input) => [
+      input,
+      moduleLabel(real(input), roots),
+    ]),
+  );
+  return text
+    .split("\n")
+    .map((line) => {
+      if (!line.startsWith("// ")) return line;
+      const label = labels.get(line.slice(3));
+      return label === undefined ? line : `// ${label}`;
+    })
+    .join("\n");
+}

package/src/build/plugin.ts

@@ -30,6 +30,7 @@ import ts from "typescript";
 
 import type { AppletDiagnostic } from "../lint/index.js";
 import { bootedWithin, withOneMoreBoot } from "./boot.js";
+import { stableModulePaths } from "./module-paths.js";
 import { APPLET_COMPATIBILITY_DATE } from "./runtime.js";
 import { SDK_PLUGIN_TYPES } from "./paths.js";
 
@@ -241,20 +242,12 @@ export async function bundlePlugin(directory: string): Promise<string> {
       },
     ],
     define: { "process.env.NODE_ENV": '"production"' },
+    metafile: true,
     logLevel: "silent",
   });
   const file = result.outputFiles?.[0];
   if (!file) throw new Error("The bundler produced no output");
-  // The bundle's module comments carry the temp directory; keep the artifact a
-  // function of the source alone, as the Applet build does.
-  return file.text
-    .split("\n")
-    .map((line) =>
-      line.startsWith("// ") && line.includes(directory)
-        ? `// ${relative(directory, line.slice(3))}`
-        : line,
-    )
-    .join("\n");
+  return stableModulePaths(file.text, result.metafile, directory);
 }
 
 /**