@forgecart/cli 2.202609292044.0 → 2.202609301225.0

package/dist/src/commands/package-manifest.d.ts

@@ -0,0 +1,25 @@
+/**
+ * The storefront's package manifest under `forgecart refresh --adopt` (#2666).
+ *
+ * `package.json` is the one platform file a storefront extends in place: the
+ * merchant's own blocks declare the packages they import in it (`recharts`,
+ * `motion`, …). Adopting it therefore cannot replace it wholesale — that
+ * dropped those packages, and the workspace's next compile gate failed on
+ * `Cannot find module` for every block importing one.
+ *
+ * Ownership is by package NAME. The template owns every field it declares and
+ * every package its dependency fields name; the workspace owns every other
+ * package it declares. The adopted manifest is the template's, with each
+ * workspace-owned package kept in the dependency field the workspace declared
+ * it in. A package both declare takes the template's field and range — which is
+ * how a workspace's stale `@forgecart/sdk` range reaches the template's floor.
+ */
+/** Workspace-relative path of the package manifest. */
+export declare const PACKAGE_MANIFEST_RELPATH = "package.json";
+/**
+ * The bytes an adopted package manifest lands as. When the workspace declares
+ * no package the template does not own, the template's bytes land unchanged;
+ * otherwise the template's manifest lands with those packages merged into their
+ * fields, each merged field in package-name order.
+ */
+export declare function adoptPackageManifest(templateBytes: Buffer, workspaceBytes: Buffer): Buffer;

package/dist/src/commands/package-manifest.js

@@ -0,0 +1,94 @@
+/**
+ * The storefront's package manifest under `forgecart refresh --adopt` (#2666).
+ *
+ * `package.json` is the one platform file a storefront extends in place: the
+ * merchant's own blocks declare the packages they import in it (`recharts`,
+ * `motion`, …). Adopting it therefore cannot replace it wholesale — that
+ * dropped those packages, and the workspace's next compile gate failed on
+ * `Cannot find module` for every block importing one.
+ *
+ * Ownership is by package NAME. The template owns every field it declares and
+ * every package its dependency fields name; the workspace owns every other
+ * package it declares. The adopted manifest is the template's, with each
+ * workspace-owned package kept in the dependency field the workspace declared
+ * it in. A package both declare takes the template's field and range — which is
+ * how a workspace's stale `@forgecart/sdk` range reaches the template's floor.
+ */
+/** Workspace-relative path of the package manifest. */
+export const PACKAGE_MANIFEST_RELPATH = 'package.json';
+/** The package manifest fields that declare dependencies. */
+const DEPENDENCY_FIELDS = [
+    'dependencies',
+    'devDependencies',
+    'peerDependencies',
+    'optionalDependencies',
+];
+/**
+ * The bytes an adopted package manifest lands as. When the workspace declares
+ * no package the template does not own, the template's bytes land unchanged;
+ * otherwise the template's manifest lands with those packages merged into their
+ * fields, each merged field in package-name order.
+ */
+export function adoptPackageManifest(templateBytes, workspaceBytes) {
+    const template = parseManifest(templateBytes, "the template's copy");
+    const workspace = parseManifest(workspaceBytes, "the workspace's copy");
+    const templateOwned = new Set(DEPENDENCY_FIELDS.flatMap((field) => Object.keys(dependenciesOf(template, field))));
+    const kept = DEPENDENCY_FIELDS.map((field) => ({
+        field,
+        packages: workspaceOwned(dependenciesOf(workspace, field), templateOwned),
+    })).filter(({ packages }) => Object.keys(packages).length > 0);
+    if (kept.length === 0)
+        return templateBytes;
+    const adopted = { ...template };
+    for (const { field, packages } of kept) {
+        adopted[field] = inNameOrder({ ...dependenciesOf(template, field), ...packages });
+    }
+    return Buffer.from(`${JSON.stringify(adopted, null, 2)}\n`, 'utf8');
+}
+/** The declarations whose package the template does not own. */
+function workspaceOwned(dependencies, templateOwned) {
+    return Object.fromEntries(Object.entries(dependencies).filter(([name]) => !templateOwned.has(name)));
+}
+/**
+ * A manifest's declarations in one dependency field. Only a JSON object's
+ * string-valued entries declare packages; an absent field, or one of any other
+ * shape, declares none.
+ */
+function dependenciesOf(manifest, field) {
+    const declared = manifest[field];
+    if (!isJsonObject(declared))
+        return {};
+    return Object.fromEntries(Object.entries(declared).filter((entry) => typeof entry[1] === 'string'));
+}
+/** A dependency field in package-name order — the order npm writes one in. */
+function inNameOrder(dependencies) {
+    return Object.fromEntries(Object.entries(dependencies).sort(([a], [b]) => a.localeCompare(b, 'en')));
+}
+/**
+ * Parse one copy of the manifest. A copy that is not a JSON object cannot say
+ * which packages it declares, so the adopt refuses it instead of dropping them
+ * unread.
+ */
+function parseManifest(bytes, copy) {
+    const manifest = parseJson(bytes, copy);
+    if (!isJsonObject(manifest))
+        throw new Error(unmergeableMessage(copy));
+    return manifest;
+}
+function parseJson(bytes, copy) {
+    try {
+        const parsed = JSON.parse(bytes.toString('utf8'));
+        return parsed;
+    }
+    catch (error) {
+        throw new Error(unmergeableMessage(copy), { cause: error });
+    }
+}
+function unmergeableMessage(copy) {
+    return `Cannot adopt ${PACKAGE_MANIFEST_RELPATH}: ${copy} is not a JSON object, so the packages the workspace declares cannot be merged into the template's.`;
+}
+/** A JSON object — neither null nor an array. */
+function isJsonObject(value) {
+    return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+//# sourceMappingURL=package-manifest.js.map

package/dist/src/commands/package-manifest.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"package-manifest.js","sourceRoot":"","sources":["../../../src/commands/package-manifest.ts"],"names":[],"mappings":"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"}

package/dist/src/commands/refresh.d.ts

@@ -15,10 +15,14 @@ import { Command } from 'commander';
  *
  * Workspaces generated before the manifest existed cannot prove pristineness,
  * so every divergent file refuses by default; `--adopt <relpath>` takes the
- * template version for explicitly reviewed paths. The refresh always (re)writes
- * the manifest, so a pre-manifest workspace becomes precise after its first
- * refresh. The JSON report (`--json`) is the machine seam the provisioning
- * orchestrator parses.
+ * template version for explicitly reviewed paths — for `package.json`, the
+ * template's manifest with every package the workspace declared beyond it kept
+ * (`package-manifest.ts`, #2666). Every file is decided before any is written,
+ * so a refresh that stops on a file it cannot decide — an adopted
+ * `package.json` whose packages cannot be read — leaves the workspace as it
+ * found it. The refresh always (re)writes the manifest, so a pre-manifest
+ * workspace becomes precise after its first refresh. The JSON report
+ * (`--json`) is the machine seam the provisioning orchestrator parses.
  */
 interface RefreshOptions {
     json?: boolean;

package/dist/src/commands/refresh.js

@@ -4,6 +4,7 @@ import { Command } from 'commander';
 import { print } from '../output.js';
 import { readPackageVersion } from '../version.js';
 import { getStorefrontTemplateDir } from './init.js';
+import { PACKAGE_MANIFEST_RELPATH, adoptPackageManifest } from './package-manifest.js';
 import { TEMPLATE_MANIFEST_RELPATH, TEMPLATE_MANIFEST_SCHEMA_VERSION, hashContent, listTemplateFiles, readTemplateManifest, } from './template-manifest.js';
 /** True if the path exists and is a regular file. */
 async function isFile(path) {
@@ -41,29 +42,59 @@ function decideFile(workspaceHash, templateHash, recordedHash, adopt) {
     return 'conflict';
 }
 /**
- * Judge one template file against the workspace and apply the write when the
- * verdict says so. Returns the verdict plus the template hash the manifest
- * update needs.
+ * Decide every template file against the workspace. Reads only: a file the
+ * refresh cannot decide stops it before anything is written.
  */
-async function refreshTemplateFile(targetDir, templateDir, relpath, recordedHash, adopt) {
+async function decideTemplateFiles(targetDir, templateDir, manifest, adopt) {
+    const decisions = [];
+    for (const relpath of await listTemplateFiles(templateDir)) {
+        decisions.push(await decideTemplateFile(targetDir, templateDir, relpath, manifest?.files[relpath], adopt.has(relpath)));
+    }
+    return decisions;
+}
+/** Judge one template file against the workspace, and settle the bytes its write lands. */
+async function decideTemplateFile(targetDir, templateDir, relpath, recordedHash, adopt) {
     const templateBytes = await readFile(join(templateDir, ...relpath.split('/')));
     const templateHash = hashContent(templateBytes);
-    const workspacePath = join(targetDir, ...relpath.split('/'));
-    const workspaceBytes = await readBytesIfPresent(workspacePath);
+    const workspaceBytes = await readBytesIfPresent(join(targetDir, ...relpath.split('/')));
     const verdict = decideFile(workspaceBytes === null ? null : hashContent(workspaceBytes), templateHash, recordedHash, adopt);
-    if (verdict === 'rendered' || verdict === 'adopted') {
-        await mkdir(dirname(workspacePath), { recursive: true });
-        await writeFile(workspacePath, templateBytes);
+    return {
+        relpath,
+        verdict,
+        templateHash,
+        recordedHash,
+        landed: landedBytes(relpath, verdict, templateBytes, workspaceBytes),
+    };
+}
+/**
+ * The bytes a verdict lands in the workspace, or null when it writes nothing.
+ * A written file lands as the template's bytes — except an ADOPTED
+ * `package.json`, which keeps every package the workspace declared beyond the
+ * template (#2666).
+ */
+function landedBytes(relpath, verdict, templateBytes, workspaceBytes) {
+    if (verdict === 'conflict' || verdict === 'upToDate')
+        return null;
+    if (verdict === 'adopted' && relpath === PACKAGE_MANIFEST_RELPATH && workspaceBytes !== null) {
+        return adoptPackageManifest(templateBytes, workspaceBytes);
     }
-    return { verdict, templateHash };
+    return templateBytes;
+}
+/** Apply one decision: write the bytes it lands, creating their directory. */
+async function writeDecision(targetDir, { relpath, landed }) {
+    if (landed === null)
+        return;
+    const workspacePath = join(targetDir, ...relpath.split('/'));
+    await mkdir(dirname(workspacePath), { recursive: true });
+    await writeFile(workspacePath, landed);
 }
 /**
- * Fold one file's verdict into the report and the next manifest: bucket the
+ * Fold one file's decision into the report and the next manifest: bucket the
  * relpath, flip the install flag when package.json was (re)written, and
  * record the inventory entry.
  */
-function recordVerdict(report, nextFiles, relpath, verdict, templateHash, recordedHash) {
-    if (relpath === 'package.json' && (verdict === 'rendered' || verdict === 'adopted')) {
+function recordVerdict(report, nextFiles, { relpath, verdict, templateHash, recordedHash }) {
+    if (relpath === PACKAGE_MANIFEST_RELPATH && (verdict === 'rendered' || verdict === 'adopted')) {
         report.dependenciesChanged = true;
     }
     report[verdict === 'conflict' ? 'conflicts' : verdict].push(relpath);
@@ -75,7 +106,10 @@ function recordVerdict(report, nextFiles, relpath, verdict, templateHash, record
 /**
  * The next manifest entry for a file: written/current files record the
  * template hash; a conflict keeps its previous inventory (or stays
- * uninventoried), so it keeps conflicting until adopted.
+ * uninventoried), so it keeps conflicting until adopted. An adopted
+ * `package.json` that kept workspace packages records the template hash too:
+ * it differs from that hash, so a later refresh reports it as a conflict and
+ * never re-renders the template's bytes over the packages it kept.
  */
 function nextManifestHash(verdict, templateHash, recordedHash) {
     if (verdict === 'conflict')
@@ -85,12 +119,10 @@ function nextManifestHash(verdict, templateHash, recordedHash) {
 /** Run `forgecart refresh`. */
 export async function runRefresh(name, options) {
     const targetDir = name ? resolve(process.cwd(), name) : process.cwd();
-    if (!(await isFile(join(targetDir, 'package.json')))) {
+    if (!(await isFile(join(targetDir, PACKAGE_MANIFEST_RELPATH)))) {
         throw new Error(`refresh requires an existing storefront at ${targetDir} (no package.json found).`);
     }
-    const templateDir = getStorefrontTemplateDir();
-    const manifest = await readTemplateManifest(targetDir);
-    const adoptSet = new Set(options.adopt ?? []);
+    const decisions = await decideTemplateFiles(targetDir, getStorefrontTemplateDir(), await readTemplateManifest(targetDir), new Set(options.adopt ?? []));
     const report = {
         rendered: [],
         conflicts: [],
@@ -99,10 +131,9 @@ export async function runRefresh(name, options) {
         dependenciesChanged: false,
     };
     const nextFiles = {};
-    for (const relpath of await listTemplateFiles(templateDir)) {
-        const recordedHash = manifest?.files[relpath];
-        const { verdict, templateHash } = await refreshTemplateFile(targetDir, templateDir, relpath, recordedHash, adoptSet.has(relpath));
-        recordVerdict(report, nextFiles, relpath, verdict, templateHash, recordedHash);
+    for (const decision of decisions) {
+        await writeDecision(targetDir, decision);
+        recordVerdict(report, nextFiles, decision);
     }
     const nextManifest = {
         schemaVersion: TEMPLATE_MANIFEST_SCHEMA_VERSION,

package/dist/src/commands/refresh.js.map

@@ -1 +1 @@
-{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/commands/refresh.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"refresh.js","sourceRoot":"","sources":["../../../src/commands/refresh.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@forgecart/cli",
-  "version": "2.202609292044.0",
+  "version": "2.202609301225.0",
   "type": "module",
   "description": "CLI for scaffolding and operating ForgeCart channel storefronts",
   "bin": {

package/templates/storefront/SEO-MIGRATION.md

@@ -402,8 +402,11 @@ Typical ones: `src/app/page.tsx`, `src/app/products/page.tsx`, `src/components/H
 
 - links as `LocaleLink`; route metadata through `routeMetadata` with
   `staticPathsByLocale(languageCodes, '<route>')`; images with `alt={getAssetAlt(asset)}`;
-- `package.json`: adopt it, then declare every package the merchant's code still imports with
-  `EnsureDeps`. Leave out the packages the deletion list removed, such as `next-sitemap`.
+- `package.json`: adopt it. Adopting keeps every package the storefront declares that the platform
+  version does not, and takes the platform's range for a package both declare. Then delete the
+  packages the deletion list removed, such as `next-sitemap`, from it; the promote reinstalls the
+  dependencies. A `package.json` that still declares a package of the storefront's is Merged, with
+  those packages as its customizations.
 
 ### Routes the platform does not ship
 

package/templates/storefront/package.json

@@ -9,7 +9,7 @@
   },
   "dependencies": {
     "@forgecart/designer-runtime": "^1.202607161748.0",
-    "@forgecart/sdk": "^1.2.6",
+    "@forgecart/sdk": "^1.202609282317.0",
     "@nestjs/common": "^11.1.14",
     "@nestjs/core": "^11.1.14",
     "class-transformer": "^0.5.1",