@decohere/create 0.0.1-dev.46 → 0.0.1-dev.47

package/pack-builder-tgz.mjs

@@ -1,8 +1,10 @@
 #!/usr/bin/env node
 /**
  * Pack `@decohere/create` for the builder image with production deps bundled
- * from dist/release (local `file:` for `@decohere/*`) so `npm install -g --offline`
- * does not hit the registry.
+ * from dist/release. Direct `@decohere/*` dependencies are rewritten to `file:`
+ * (not `overrides` — npm EOVERRIDE rejects overriding a direct dep). Nested
+ * workspace packages get the same rewrite so `npm install` never hits the
+ * private registry. The image then `npm install -g --offline`.
  */
 import { spawnSync } from "node:child_process";
 import { readdirSync, readFileSync, renameSync, writeFileSync } from "node:fs";
@@ -46,22 +48,43 @@ export function collectWorkspacePackages(rootDir) {
 }
 
 /**
+ * @param {string} fromDir
+ * @param {string} pkgDir
+ */
+export function fileSpec(fromDir, pkgDir) {
+	let rel = relative(fromDir, pkgDir) || ".";
+	rel = rel.replaceAll("\\", "/");
+	if (!rel.startsWith(".")) rel = `./${rel}`;
+	return `file:${rel}`;
+}
+
+/**
+ * Rewrite `@decohere/*` dependency specs to local `file:` paths.
+ * Must mutate `dependencies` (not `overrides`) — npm throws EOVERRIDE when an
+ * override conflicts with a direct dependency.
+ *
+ * @param {Record<string, unknown>} pkg
  * @param {string} fromDir
  * @param {WorkspacePackage[]} packages
- * @returns {Record<string, string>}
  */
-export function decohereFileOverrides(fromDir, packages) {
-	/** @type {Record<string, string>} */
-	const overrides = {};
+export function rewriteDecohereDepsToFile(pkg, fromDir, packages) {
+	const byName = new Map(packages.map((item) => [item.name, item.dir]));
 	const from = resolve(fromDir);
-	for (const pkg of packages) {
-		if (resolve(pkg.dir) === from) continue;
-		let rel = relative(fromDir, pkg.dir) || ".";
-		rel = rel.replaceAll("\\", "/");
-		if (!rel.startsWith(".")) rel = `./${rel}`;
-		overrides[pkg.name] = `file:${rel}`;
-	}
-	return overrides;
+	const rewrite = (deps) => {
+		if (deps == null || typeof deps !== "object" || Array.isArray(deps)) return deps;
+		const next = { .../** @type {Record<string, unknown>} */ (deps) };
+		for (const name of Object.keys(next)) {
+			const dir = byName.get(name);
+			if (dir == null || resolve(dir) === from) continue;
+			next[name] = fileSpec(fromDir, dir);
+		}
+		return next;
+	};
+	return {
+		...pkg,
+		dependencies: rewrite(pkg.dependencies),
+		optionalDependencies: rewrite(pkg.optionalDependencies),
+	};
 }
 
 /**
@@ -74,25 +97,11 @@ export function productionDepNames(pkg) {
 	return Object.keys(deps);
 }
 
-/**
- * @param {Record<string, unknown>} pkg
- * @param {Record<string, string>} overrides
- */
-export function withInstallOverrides(pkg, overrides) {
-	const existing = pkg.overrides;
-	const previous =
-		existing != null && typeof existing === "object" && !Array.isArray(existing)
-			? /** @type {Record<string, unknown>} */ (existing)
-			: {};
-	return { ...pkg, overrides: { ...previous, ...overrides } };
-}
-
 /**
  * @param {Record<string, unknown>} pkg
  */
 export function withBundleDependencies(pkg) {
-	const { overrides: _overrides, ...rest } = pkg;
-	return { ...rest, bundleDependencies: productionDepNames(pkg) };
+	return { ...pkg, bundleDependencies: productionDepNames(pkg) };
 }
 
 function writeJson(path, value) {
@@ -114,17 +123,38 @@ export function packBuilderTgz(options) {
 	const workspaceOut = resolve(options.workspaceOut);
 	const dest = resolve(options.dest);
 	const packageJsonPath = join(outDir, "package.json");
-	const original = JSON.parse(readFileSync(packageJsonPath, "utf8"));
-	const overrides = decohereFileOverrides(outDir, collectWorkspacePackages(workspaceOut));
-	writeJson(packageJsonPath, withInstallOverrides(original, overrides));
-	runNpm(outDir, ["install", "--omit=dev", "--ignore-scripts"]);
-	writeJson(packageJsonPath, withBundleDependencies(original));
-	const packed = runNpm(outDir, ["pack", "--pack-destination", dirname(dest)]);
-	const tgzName = packed.split(/\r?\n/).at(-1)?.replace(/^.*\//, "");
-	if (tgzName == null || tgzName === "") {
-		throw new Error(`npm pack did not print a tarball name:\n${packed}`);
+	const packages = collectWorkspacePackages(workspaceOut);
+	const originals = packages.map((pkg) => {
+		const path = join(pkg.dir, "package.json");
+		return { path, original: JSON.parse(readFileSync(path, "utf8")) };
+	});
+	const createOriginal = originals.find((entry) => entry.path === packageJsonPath)?.original;
+	if (createOriginal == null) {
+		throw new Error(`No @decohere package.json at ${packageJsonPath}`);
+	}
+
+	try {
+		for (const { path, original } of originals) {
+			writeJson(path, rewriteDecohereDepsToFile(original, dirname(path), packages));
+		}
+		runNpm(outDir, ["install", "--omit=dev", "--ignore-scripts"]);
+	} finally {
+		for (const { path, original } of originals) {
+			writeJson(path, original);
+		}
+	}
+
+	writeJson(packageJsonPath, withBundleDependencies(createOriginal));
+	try {
+		const packed = runNpm(outDir, ["pack", "--pack-destination", dirname(dest)]);
+		const tgzName = packed.split(/\r?\n/).at(-1)?.replace(/^.*\//, "");
+		if (tgzName == null || tgzName === "") {
+			throw new Error(`npm pack did not print a tarball name:\n${packed}`);
+		}
+		renameSync(join(dirname(dest), tgzName), dest);
+	} finally {
+		writeJson(packageJsonPath, createOriginal);
 	}
-	renameSync(join(dirname(dest), tgzName), dest);
 	return dest;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@decohere/create",
-  "version": "0.0.1-dev.46",
+  "version": "0.0.1-dev.47",
   "description": "Scaffold a new Decohere project — build with Forge, serve with Flux",
   "keywords": [
     "decohere",
@@ -21,7 +21,7 @@
     "test": "echo \"Error: no test specified\" && exit 1"
   },
   "dependencies": {
-    "@decohere/nexus": "0.0.1-dev.46",
+    "@decohere/nexus": "0.0.1-dev.47",
     "commander": "^13.1.0",
     "openapi-to-postmanv2": "^5.0.0"
   },