@arcote.tech/arc-cli 0.7.1 → 0.7.2

package/dist/index.js

@@ -26942,7 +26942,9 @@ async function buildContextClient(pkg, rootDir, client, cache, noCache) {
   console.log(`  building: ${pkg.name} (${client.name})`);
   const peerDeps = Object.keys(pkg.packageJson.peerDependencies ?? {});
   const allDeps = pkg.packageJson.dependencies ?? {};
-  const externals = [...peerDeps, ...Object.keys(allDeps)];
+  const isBrowser2 = client.name === "browser";
+  const workspaceDeps = isBrowser2 ? Object.keys(allDeps) : Object.entries(allDeps).filter(([, spec]) => !spec.startsWith("workspace:")).map(([name]) => name);
+  const externals = [...peerDeps, ...workspaceDeps];
   const result = await Bun.build({
     entrypoints: [pkg.entrypoint],
     outdir: join8(outDir, "main"),
@@ -26971,9 +26973,39 @@ async function buildContextPackages(rootDir, packages, cache, noCache) {
   const contexts = packages.filter((p) => isContextPackage(p.packageJson));
   if (contexts.length === 0)
     return { declarationErrors: [] };
-  const tasks = contexts.flatMap((pkg) => CONTEXT_CLIENTS.map((client) => () => buildContextClient(pkg, rootDir, client, cache, noCache)));
-  const results = await pAll(tasks);
-  const declarationErrors = results.flatMap((r) => r.declarationErrors);
+  const byName = new Map(contexts.map((p) => [p.name, p]));
+  const remaining = new Set(contexts.map((p) => p.name));
+  const done = new Set;
+  const ordered = [];
+  const workspaceDepsOf = (pkg) => {
+    const deps = pkg.packageJson.dependencies ?? {};
+    return Object.entries(deps).filter(([name, spec]) => spec.startsWith("workspace:") && byName.has(name)).map(([name]) => name);
+  };
+  while (remaining.size > 0) {
+    const layer = [];
+    for (const name of remaining) {
+      const pkg = byName.get(name);
+      const unmetDeps = workspaceDepsOf(pkg).filter((d) => !done.has(d));
+      if (unmetDeps.length === 0)
+        layer.push(pkg);
+    }
+    if (layer.length === 0) {
+      const cycle = [...remaining].join(", ");
+      throw new Error(`Workspace dependency cycle detected: ${cycle}`);
+    }
+    ordered.push(layer);
+    for (const pkg of layer) {
+      done.add(pkg.name);
+      remaining.delete(pkg.name);
+    }
+  }
+  const declarationErrors = [];
+  for (const layer of ordered) {
+    const tasks = layer.flatMap((pkg) => CONTEXT_CLIENTS.map((client) => () => buildContextClient(pkg, rootDir, client, cache, noCache)));
+    const results = await pAll(tasks);
+    for (const r of results)
+      declarationErrors.push(...r.declarationErrors);
+  }
   if (declarationErrors.length > 0) {
     console.warn(`
 \x1B[33mType declaration errors:\x1B[0m`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@arcote.tech/arc-cli",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "CLI tool for Arc framework",
   "module": "index.ts",
   "main": "dist/index.js",
@@ -12,12 +12,12 @@
     "build": "bun build --target=bun ./src/index.ts --outdir=dist --external @arcote.tech/arc --external @arcote.tech/arc-ds --external @arcote.tech/arc-react --external @arcote.tech/platform && chmod +x dist/index.js"
   },
   "dependencies": {
-    "@arcote.tech/arc": "^0.7.1",
-    "@arcote.tech/arc-ds": "^0.7.1",
-    "@arcote.tech/arc-react": "^0.7.1",
-    "@arcote.tech/arc-host": "^0.7.1",
-    "@arcote.tech/arc-adapter-db-sqlite": "^0.7.1",
-    "@arcote.tech/platform": "^0.7.1",
+    "@arcote.tech/arc": "^0.7.2",
+    "@arcote.tech/arc-ds": "^0.7.2",
+    "@arcote.tech/arc-react": "^0.7.2",
+    "@arcote.tech/arc-host": "^0.7.2",
+    "@arcote.tech/arc-adapter-db-sqlite": "^0.7.2",
+    "@arcote.tech/platform": "^0.7.2",
     "@clack/prompts": "^0.9.0",
     "commander": "^11.1.0",
     "chokidar": "^3.5.3",

package/src/builder/module-builder.ts

@@ -277,26 +277,32 @@ async function buildContextClient(
 
   console.log(`  building: ${pkg.name} (${client.name})`);
 
-  // Externals: framework peers + npm dependencies + workspace deps.
+  // Externals depend on the target client:
   //
-  // Workspace deps used to be bundled inline (because the deploy image has
-  // no workspace symlinks). The consequence: every context package's dist
-  // carried its own copy of every workspace dep — `@ndt/strategy/dist`
-  // shipped `@ndt/workspace` inlined, `@ndt/content/dist` shipped another
-  // copy, etc. At deploy-build time the top-level Bun.build saw N
-  // pre-inlined copies and could no longer dedupe them — context-package
-  // singletons (e.g. `WorkspaceContext = createContext`) duplicated per
-  // entry, breaking `useWorkspace()` provider lookup.
+  // - BROWSER client: workspace deps MUST be external. Inlining them per
+  //   package would make every context package's dist ship its own copy
+  //   of every workspace dep — the top-level browser Bun.build would see
+  //   N pre-inlined copies of context singletons (`WorkspaceContext =
+  //   createContext`) and could not dedupe them, breaking provider lookup.
   //
-  // Treating workspace deps as `external` makes per-package dist emit bare
-  // specifiers (`import { workspace } from "@ndt/workspace"`), which the
-  // browser-side Bun.build then resolves ONCE across all entries → single
-  // module instance, splitting hoists into a shared chunk. The deploy
-  // image is unaffected: the browser bundle is self-contained at that
-  // layer (we only ship the final chunks, not per-package dist/browser).
+  // - SERVER client: workspace deps MUST be bundled inline. The deploy
+  //   image flattens each package's server bundle to
+  //   `.arc/platform/server/<pkg>.js` and runs them via a single
+  //   `loadServerContext()` import loop. There is no `node_modules/@ndt/*`
+  //   tree inside the image, so bare `@ndt/workspace` specifiers would
+  //   fail to resolve at startup. Inline duplication is harmless on the
+  //   server: it's a single Node/Bun process and Arc modules register via
+  //   a shared platform registry singleton (registry.ts), so two physical
+  //   copies of the workspace module still merge into one context.
   const peerDeps = Object.keys(pkg.packageJson.peerDependencies ?? {});
   const allDeps = (pkg.packageJson.dependencies ?? {}) as Record<string, string>;
-  const externals = [...peerDeps, ...Object.keys(allDeps)];
+  const isBrowser = client.name === "browser";
+  const workspaceDeps = isBrowser
+    ? Object.keys(allDeps)
+    : Object.entries(allDeps)
+        .filter(([, spec]) => !spec.startsWith("workspace:"))
+        .map(([name]) => name);
+  const externals = [...peerDeps, ...workspaceDeps];
 
   const result = await Bun.build({
     entrypoints: [pkg.entrypoint],
@@ -349,14 +355,51 @@ export async function buildContextPackages(
   const contexts = packages.filter((p) => isContextPackage(p.packageJson));
   if (contexts.length === 0) return { declarationErrors: [] };
 
-  const tasks = contexts.flatMap((pkg) =>
-    CONTEXT_CLIENTS.map((client) => () =>
-      buildContextClient(pkg, rootDir, client, cache, noCache),
-    ),
-  );
+  // Topological order — each package's server bundle inlines its workspace
+  // deps, so those deps must have their `dist/` ready before Bun.build tries
+  // to resolve them. Without this, a fresh checkout (no dist/ yet) fails the
+  // first build because content's resolve of @ndt/strategy hits a missing
+  // file. Inside a topological level, packages are built in parallel.
+  const byName = new Map(contexts.map((p) => [p.name, p]));
+  const remaining = new Set(contexts.map((p) => p.name));
+  const done = new Set<string>();
+  const ordered: WorkspacePackage[][] = [];
+
+  const workspaceDepsOf = (pkg: WorkspacePackage): string[] => {
+    const deps = (pkg.packageJson.dependencies ?? {}) as Record<string, string>;
+    return Object.entries(deps)
+      .filter(([name, spec]) => spec.startsWith("workspace:") && byName.has(name))
+      .map(([name]) => name);
+  };
+
+  while (remaining.size > 0) {
+    const layer: WorkspacePackage[] = [];
+    for (const name of remaining) {
+      const pkg = byName.get(name)!;
+      const unmetDeps = workspaceDepsOf(pkg).filter((d) => !done.has(d));
+      if (unmetDeps.length === 0) layer.push(pkg);
+    }
+    if (layer.length === 0) {
+      const cycle = [...remaining].join(", ");
+      throw new Error(`Workspace dependency cycle detected: ${cycle}`);
+    }
+    ordered.push(layer);
+    for (const pkg of layer) {
+      done.add(pkg.name);
+      remaining.delete(pkg.name);
+    }
+  }
 
-  const results = await pAll(tasks);
-  const declarationErrors = results.flatMap((r) => r.declarationErrors);
+  const declarationErrors: string[] = [];
+  for (const layer of ordered) {
+    const tasks = layer.flatMap((pkg) =>
+      CONTEXT_CLIENTS.map((client) => () =>
+        buildContextClient(pkg, rootDir, client, cache, noCache),
+      ),
+    );
+    const results = await pAll(tasks);
+    for (const r of results) declarationErrors.push(...r.declarationErrors);
+  }
 
   if (declarationErrors.length > 0) {
     console.warn("\n\x1b[33mType declaration errors:\x1b[0m");