@webjsdev/cli 0.10.26 → 0.10.27

package/bin/webjs.js

@@ -6,6 +6,7 @@ import { resolveBin } from '../lib/resolve-bin.js';
 import { checkNodeInline, nodeInlineMessage } from '../lib/node-preflight.js';
 import { loadAppEnv, resolvePort } from '../lib/port.js';
 import { planDevSupervisor } from '../lib/dev-supervisor.js';
+import { importWebjsdev } from '../lib/import-webjsdev.js';
 
 const __dirname = dirname(fileURLToPath(import.meta.url));
 const [cmd, ...rest] = process.argv.slice(2);
@@ -121,7 +122,7 @@ async function main() {
   // instead of crashing cryptically later. `help` is exempt so a user on an
   // old Node can still read usage.
   if (cmd !== 'help' && cmd !== undefined) {
-    const { assertNodeVersion } = await import('@webjsdev/server');
+    const { assertNodeVersion } = await importWebjsdev('@webjsdev/server');
     assertNodeVersion({ onFail: 'exit' });
   }
   switch (cmd) {
@@ -129,7 +130,7 @@ async function main() {
       // If we're already inside the reload child (node --watch or bun --hot),
       // start the server directly.
       if (process.env.__WEBJS_DEV_CHILD === '1') {
-        const { startServer } = await import('@webjsdev/server');
+        const { startServer } = await importWebjsdev('@webjsdev/server');
         // Load `.env` BEFORE resolving the port so a `PORT` set there is in
         // process.env at resolution time (#447). The server loads `.env`
         // too, but that runs too late to affect the port the CLI computes.
@@ -165,7 +166,7 @@ async function main() {
       });
 
       if (plan.mode === 'inline') {
-        const { startServer } = await import('@webjsdev/server');
+        const { startServer } = await importWebjsdev('@webjsdev/server');
         loadAppEnv(process.cwd());
         const port = resolvePort(flag(rest, '--port'));
         await startServer({ appDir: process.cwd(), port, dev: true });
@@ -182,7 +183,7 @@ async function main() {
       break;
     }
     case 'start': {
-      const { startServer } = await import('@webjsdev/server');
+      const { startServer } = await importWebjsdev('@webjsdev/server');
       // Load `.env` BEFORE resolving the port so a `PORT` set there wins over
       // the 8080 default (#447), same as for `dev`.
       loadAppEnv(process.cwd());
@@ -364,7 +365,7 @@ async function main() {
       break;
     }
     case 'check': {
-      const { checkConventions, RULES } = await import('@webjsdev/server/check');
+      const { checkConventions, RULES } = await importWebjsdev('@webjsdev/server/check');
 
       if (rest.includes('--rules')) {
         console.log('webjs check, correctness rules:');
@@ -390,7 +391,7 @@ async function main() {
       if (rest.includes('--json')) {
         // The projector lives in @webjsdev/mcp (the MCP `check` tool's home),
         // so `check --json` and the MCP tool stay byte-identical (#415).
-        const { projectCheck } = await import('@webjsdev/mcp/check-report');
+        const { projectCheck } = await importWebjsdev('@webjsdev/mcp/check-report');
         console.log(JSON.stringify(projectCheck(violations)));
         if (violations.length > 0) process.exit(1);
         break;
@@ -447,7 +448,7 @@ async function main() {
       // narrowing the @webjsdev/core `Route` href union + per-route `params`.
       // Opt-in codegen: the static types in @webjsdev/core work without it
       // (un-generated apps see `Route = string`).
-      const { generateRouteTypes } = await import('@webjsdev/server');
+      const { generateRouteTypes } = await importWebjsdev('@webjsdev/server');
       const { mkdir, writeFile } = await import('node:fs/promises');
       const appDir = process.cwd();
       const text = await generateRouteTypes(appDir);
@@ -545,7 +546,7 @@ Full docs: https://docs.webjs.com`);
       const sub = rest[0];
       const args = rest.slice(1);
       const appDir = process.cwd();
-      const { pinAll, unpinPackage, listPinned, auditPinned, findOutdated, updatePinned, readPinFile, ensureVendorCommittable, SUPPORTED_PROVIDERS } = await import('@webjsdev/server');
+      const { pinAll, unpinPackage, listPinned, auditPinned, findOutdated, updatePinned, readPinFile, ensureVendorCommittable, SUPPORTED_PROVIDERS } = await importWebjsdev('@webjsdev/server');
 
       // Parse `--from <provider>` once at the top so subcommands share it.
       // Mirrors importmap-rails's `bin/importmap pin foo --from jsdelivr`.
@@ -808,7 +809,7 @@ Full docs: https://docs.webjs.com`);
       // runnable directly as `npx @webjsdev/mcp`); `webjs mcp` delegates to it
       // for back-compat. The version advertised in the initialize handshake is
       // @webjsdev/mcp's own, resolved by its bin, so this passes none.
-      const { runMcpServer } = await import('@webjsdev/mcp');
+      const { runMcpServer } = await importWebjsdev('@webjsdev/mcp');
       const { createRequire } = await import('node:module');
       const require = createRequire(import.meta.url);
       let version = '0.0.0';

package/lib/import-webjsdev.js

@@ -0,0 +1,99 @@
+// Pin `@webjsdev/*` imports under Bun zero-install (#709).
+//
+// Under Bun zero-install a bare `import('@webjsdev/server')` from the cli (run
+// out of the global cache) ENOENTs: Bun's runtime auto-install ignores the cli's
+// declared range and flakily fetches latest, which fails. An INLINE-versioned
+// specifier (`@webjsdev/server@^0.8.0`) resolves reliably. So we read the version
+// the APP declares (the scaffold adds `@webjsdev/*` to its deps) and retry inline
+// only when the bare import fails, so Node and installed apps are unaffected.
+
+import { readFileSync } from 'node:fs';
+import { join, dirname } from 'node:path';
+import { fileURLToPath } from 'node:url';
+
+// The cli's OWN package.json (one level up from this lib), used as the fallback
+// pin source for `@webjsdev/*` packages the app does not declare (mcp, ui).
+const CLI_PKG = join(dirname(fileURLToPath(import.meta.url)), '..', 'package.json');
+
+/**
+ * Whether a declared version is a Bun inline-safe specifier: an exact version or
+ * a single caret / tilde / comparator range, but NOT a range over a prerelease
+ * (`^1.0.0-rc.3`, which Bun ENOENTs on, #703), a wildcard, a multi-token range,
+ * or a protocol range (`workspace:` / `file:`).
+ * @param {unknown} v
+ * @returns {boolean}
+ */
+export function inlineSafeVersion(v) {
+  if (typeof v !== 'string') return false;
+  const m = /^(>=|<=|>|<|=|\^|~)?(\d+(?:\.\d+){0,2})([-+][0-9A-Za-z.-]+)?$/.exec(v);
+  return !!m && !(m[1] && m[3]);
+}
+
+/**
+ * The version a `package.json` at `pkgPath` declares for `name`, when it is
+ * inline-safe; else null.
+ * @param {string} name
+ * @param {string} pkgPath  absolute path to a package.json
+ * @returns {string | null}
+ */
+function declaredIn(name, pkgPath) {
+  try {
+    const pkg = JSON.parse(readFileSync(pkgPath, 'utf8'));
+    const v = { ...pkg.dependencies, ...pkg.devDependencies }[name];
+    if (inlineSafeVersion(v)) return v;
+  } catch { /* no readable package.json */ }
+  return null;
+}
+
+/**
+ * The inline-safe version to pin `name` to: the app's `package.json` (in `cwd`)
+ * first (it declares `@webjsdev/server` etc.), else the cli's OWN package.json
+ * (for `@webjsdev/*` the app does not declare, like `mcp` / `ui`). Null if
+ * neither has an inline-safe declaration.
+ * @param {string} name
+ * @param {string} [cwd]
+ * @returns {string | null}
+ */
+export function appDeclaredVersion(name, cwd = process.cwd()) {
+  return declaredIn(name, join(cwd, 'package.json')) || declaredIn(name, CLI_PKG);
+}
+
+/**
+ * Whether an import error is a resolution / not-found failure (so a version
+ * retry is warranted), vs a genuine load-time throw from the module's own code
+ * (which we must NOT retry, to avoid masking it and re-running side effects).
+ * @param {unknown} err
+ * @returns {boolean}
+ */
+function isResolutionError(err) {
+  if (err && /** @type {any} */ (err).code === 'ERR_MODULE_NOT_FOUND') return true;
+  const msg = err && String(/** @type {any} */ (err).message || err);
+  // Narrow on purpose: Node sets the code above; Bun's auto-install miss is
+  // `ENOENT while resolving package '...'`. A broad "cannot find" would match
+  // ordinary runtime errors ("Cannot find user") and wrongly trigger a retry.
+  return !!msg && /ENOENT|resolving package|module not found/i.test(msg);
+}
+
+/**
+ * Import an `@webjsdev/*` module, pinning the version under Bun zero-install. On
+ * Node or an installed app the bare specifier resolves from `node_modules` (no
+ * retry). On a RESOLUTION failure (Bun zero-install), retry with the app's (else
+ * the cli's own) declared version inline. A real load-time throw is rethrown,
+ * not retried. A subpath (`/check`) is preserved across the rewrite.
+ * @param {string} spec  e.g. `@webjsdev/server` or `@webjsdev/server/check`
+ * @param {(s: string) => Promise<any>} [importer]  injectable for tests
+ * @returns {Promise<any>}
+ */
+export async function importWebjsdev(spec, importer = (s) => import(s)) {
+  try {
+    return await importer(spec);
+  } catch (err) {
+    if (!isResolutionError(err)) throw err;
+    const m = /^(@webjsdev\/[^/]+)(\/.*)?$/.exec(spec);
+    const pkg = m && m[1];
+    const sub = (m && m[2]) || '';
+    const v = pkg && appDeclaredVersion(pkg);
+    if (v) return await importer(pkg + '@' + v + sub);
+    throw err;
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@webjsdev/cli",
-  "version": "0.10.26",
+  "version": "0.10.27",
   "type": "module",
   "description": "webjs CLI - dev, start, create, db",
   "bin": {