castle-web-cli 0.4.88 → 0.4.89

package/dist/get-deck.js

@@ -4,6 +4,7 @@ import * as path from 'path';
 import { spawn } from 'child_process';
 import { nanoid } from 'nanoid';
 import * as api from './api.js';
+import { normalizeDeckPackageJson } from './normalize.js';
 function readCastleJson(dir) {
     const p = path.join(dir, 'castle.json');
     if (!fs.existsSync(p))
@@ -60,5 +61,8 @@ export async function getDeck(dir, options = {}) {
         }
         catch { /* nothing to clean */ }
     }
+    if (normalizeDeckPackageJson(targetDir)) {
+        console.log(`Repointed package.json at this machine's sdk/cli`);
+    }
     console.log(`Extracted to ${targetDir}`);
 }

package/dist/init.d.ts

@@ -1,3 +1,10 @@
+export declare function resolveScaffoldRefs(): {
+    workspaceMode: boolean;
+    sdkRef: string;
+    cliCommand: string;
+    cliDistAbs: string | null;
+    sdkPathPosix: string | null;
+};
 export declare function init(dir: string, opts?: {
     kit?: string;
     serve?: boolean;

package/dist/init.js

@@ -88,7 +88,7 @@ function stripCastleJsonIdentity(projectDir) {
 //     sdk -> file: absolute path to sdk/, scripts -> `node <abs cli dist>/index.js`
 //   published mode (globally-installed castle-web, no sibling sdk/):
 //     sdk -> registry `^${PUBLISHED_SDK_VERSION}`, scripts -> the `castle-web` binary
-function resolveScaffoldRefs() {
+export function resolveScaffoldRefs() {
     const sdkPath = getSdkPackagePath();
     // "Workspace mode" = the cli is running from a castle-experimental-web
     // checkout (sdk/ exists next to cli/). Otherwise we're a globally-installed

package/dist/normalize.d.ts

@@ -0,0 +1 @@
+export declare function normalizeDeckPackageJson(projectDir: string): boolean;

package/dist/normalize.js

@@ -0,0 +1,66 @@
+import * as fs from 'fs';
+import * as path from 'path';
+import { resolveScaffoldRefs } from './init.js';
+// `<path>/cli/dist/<entry>.js` -- a path into a castle-experimental-web checkout,
+// as `init` writes into a deck scaffolded in workspace mode.
+//
+// The lookbehind stops a match from starting mid-token, which is what makes this
+// idempotent: without it, the published `castle-web-cli/dist/bundle.js` specifier
+// this very function writes contains a literal `cli/dist/bundle.js`, so a second
+// pass would rewrite that tail again into `castle-web-castle-web-cli/dist/...`.
+function cliPathPattern(lead, entry) {
+    return new RegExp(`(?<![^\\s'"(])${lead}(?:[^\\s'"]+/)?cli/dist/${entry}\\.js`, 'g');
+}
+function resolvesHere(projectDir, ref) {
+    return fs.existsSync(path.resolve(projectDir, ref));
+}
+// Point a deck's `castle-web-sdk` dependency and its script commands at whatever
+// this machine actually has. `save-deck` archives the deck's package.json verbatim,
+// so a deck saved from a castle-experimental-web checkout carries that checkout's
+// absolute paths (`file:/Users/.../sdk`, `node /Users/.../cli/dist/index.js`);
+// fetched anywhere else -- a cloud sandbox, another laptop -- those paths don't
+// exist and the install fails outright.
+//
+// Only refs that DON'T resolve here are rewritten, so fetching your own deck back
+// into the checkout it came from leaves its local wiring alone.
+export function normalizeDeckPackageJson(projectDir) {
+    const pkgPath = path.join(projectDir, 'package.json');
+    if (!fs.existsSync(pkgPath))
+        return false;
+    let pkg;
+    try {
+        pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+    }
+    catch {
+        return false; // unparseable package.json -- leave it for the user to fix
+    }
+    const refs = resolveScaffoldRefs();
+    let changed = false;
+    const sdk = pkg.dependencies?.['castle-web-sdk'];
+    if (typeof sdk === 'string' &&
+        sdk.startsWith('file:') &&
+        !resolvesHere(projectDir, sdk.slice('file:'.length))) {
+        pkg.dependencies['castle-web-sdk'] = refs.sdkRef;
+        changed = true;
+    }
+    const bundleRef = refs.workspaceMode
+        ? `${refs.cliDistAbs}/bundle.js`
+        : 'castle-web-cli/dist/bundle.js';
+    for (const [name, command] of Object.entries(pkg.scripts ?? {})) {
+        if (typeof command !== 'string')
+            continue;
+        const rewritten = command
+            // The whole `node <path>` goes, not just the path: published mode runs the
+            // `castle-web` binary directly, with no `node` in front of it.
+            .replace(cliPathPattern('node\\s+', 'index'), (match) => resolvesHere(projectDir, match.replace(/^node\s+/, '')) ? match : refs.cliCommand)
+            .replace(cliPathPattern('', 'bundle'), (match) => resolvesHere(projectDir, match) ? match : bundleRef);
+        if (rewritten !== command) {
+            pkg.scripts[name] = rewritten;
+            changed = true;
+        }
+    }
+    if (changed) {
+        fs.writeFileSync(pkgPath, JSON.stringify(pkg, null, 2) + '\n', 'utf-8');
+    }
+    return changed;
+}

package/dist/pull.js

@@ -5,6 +5,7 @@ import { nanoid } from 'nanoid';
 import * as api from './api.js';
 import { extractTarball } from './get-deck.js';
 import { installDeps } from './install.js';
+import { normalizeDeckPackageJson } from './normalize.js';
 import { archiveSource } from './save-deck.js';
 // Everything else in the deck dir is source and gets replaced wholesale, so that a
 // file deleted upstream actually disappears here -- untarring over the old tree
@@ -109,6 +110,9 @@ export async function pull(dir, options = {}) {
             /* nothing to clean */
         }
     }
+    if (normalizeDeckPackageJson(projectDir)) {
+        console.log(`Repointed package.json at this machine's sdk/cli`);
+    }
     console.log(`Updated ${projectDir}`);
     // The pulled tree can want different deps than the one just deleted.
     installDeps(projectDir, fs.existsSync(path.join(projectDir, 'pnpm-lock.yaml')));

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "castle-web-cli",
-  "version": "0.4.88",
+  "version": "0.4.89",
   "type": "module",
   "bin": {
     "castle-web": "./dist/index.js"