@bobfrankston/npmglobalize 1.0.159 → 1.0.160

package/lib.d.ts

@@ -243,12 +243,26 @@ export declare function parseVersionTag(tag: string): number[] | null;
 export declare function compareVersions(a: number[], b: number[]): number;
 /** Fix version/tag mismatches */
 export declare function fixVersionTagMismatch(cwd: string, pkg: any, verbose?: boolean): boolean;
+/** Return declared deps (dependencies + devDependencies) that don't resolve from
+ *  `pkgDir`. Skips `file:`/`workspace:`/`link:` specs — those are handled elsewhere.
+ *  A declared dep that doesn't resolve means `package.json` and installed
+ *  `node_modules/` are out of sync (e.g. dep added but `npm install` not re-run). */
+export declare function missingDeps(pkgDir: string, pkg: any): string[];
 /** Walk `file:` deps transitively and run `npm install` in any target whose
- *  package.json declares deps but has no `node_modules/`. Also covers `cwd`
- *  itself on the first call, so a fresh clone with no `node_modules/` gets
- *  installed before the upcoming build/pack tries to resolve imports.
+ *  declared deps aren't all resolvable from its directory. Covers both
+ *  "fresh clone, no `node_modules/`" and "dep added but `npm install` not
+ *  re-run" (partial-sync) cases. Also covers `cwd` itself on the first call.
  *  Cycle-safe via the shared `visited` set. */
 export declare function ensureFileDepModules(cwd: string, verbose?: boolean, visited?: Set<string>): void;
+/** Ensure the workspace-root `node_modules/` is in sync with every member's
+ *  declared deps. Workspaces hoist deps to the root, so a dep added to any
+ *  member `package.json` without a follow-up `npm install` at the root leaves
+ *  the root `node_modules/` stale — the case where `member/` dirs exist but
+ *  the actual package (e.g. `marked`) is not hoisted. */
+export declare function ensureWorkspaceDepModules(rootDir: string, members: Array<{
+    dir: string;
+    pkg: any;
+}>, verbose?: boolean): void;
 /** Run a command and return success status */
 export declare function runCommand(cmd: string, args: string[], options?: {
     silent?: boolean;

package/lib.js

@@ -1322,10 +1322,51 @@ function restoreNestedDepModules(stashed, verbose) {
         }
     }
 }
+/** Walk up the directory tree looking for `node_modules/<depName>/package.json`.
+ *  Matches Node's module resolution so hoisted workspace deps are found. */
+function depResolves(startDir, depName) {
+    let dir = path.resolve(startDir);
+    const segs = depName.split('/');
+    while (true) {
+        const candidate = path.join(dir, 'node_modules', ...segs, 'package.json');
+        if (fs.existsSync(candidate))
+            return true;
+        const parent = path.dirname(dir);
+        if (parent === dir)
+            return false;
+        dir = parent;
+    }
+}
+/** Return declared deps (dependencies + devDependencies) that don't resolve from
+ *  `pkgDir`. Skips `file:`/`workspace:`/`link:` specs — those are handled elsewhere.
+ *  A declared dep that doesn't resolve means `package.json` and installed
+ *  `node_modules/` are out of sync (e.g. dep added but `npm install` not re-run). */
+export function missingDeps(pkgDir, pkg) {
+    const missing = [];
+    for (const key of ['dependencies', 'devDependencies']) {
+        const deps = pkg?.[key];
+        if (!deps || typeof deps !== 'object')
+            continue;
+        for (const [name, spec] of Object.entries(deps)) {
+            if (typeof spec !== 'string')
+                continue;
+            if (spec.startsWith('file:') || spec.startsWith('workspace:') || spec.startsWith('link:'))
+                continue;
+            if (!depResolves(pkgDir, name))
+                missing.push(name);
+        }
+    }
+    return missing;
+}
+function formatMissingReason(missing) {
+    if (missing.length === 1)
+        return `missing dep: ${missing[0]}`;
+    return `${missing.length} missing deps: ${missing.slice(0, 3).join(', ')}${missing.length > 3 ? ', …' : ''}`;
+}
 /** Walk `file:` deps transitively and run `npm install` in any target whose
- *  package.json declares deps but has no `node_modules/`. Also covers `cwd`
- *  itself on the first call, so a fresh clone with no `node_modules/` gets
- *  installed before the upcoming build/pack tries to resolve imports.
+ *  declared deps aren't all resolvable from its directory. Covers both
+ *  "fresh clone, no `node_modules/`" and "dep added but `npm install` not
+ *  re-run" (partial-sync) cases. Also covers `cwd` itself on the first call.
  *  Cycle-safe via the shared `visited` set. */
 export function ensureFileDepModules(cwd, verbose = false, visited = new Set()) {
     const abs = path.resolve(cwd);
@@ -1339,11 +1380,13 @@ export function ensureFileDepModules(cwd, verbose = false, visited = new Set())
     catch {
         return;
     }
-    const cwdHasDeps = (pkg?.dependencies && Object.keys(pkg.dependencies).length > 0) ||
-        (pkg?.devDependencies && Object.keys(pkg.devDependencies).length > 0);
-    if (cwdHasDeps && !fs.existsSync(path.join(abs, 'node_modules'))) {
+    const cwdMissing = missingDeps(abs, pkg);
+    if (cwdMissing.length > 0) {
+        // Only clear a stale lockfile if node_modules is entirely absent (fresh clone).
+        // For partial-sync cases, keep the lockfile so pinned versions stay honored.
+        const nm = path.join(abs, 'node_modules');
         const lock = path.join(abs, 'package-lock.json');
-        if (fs.existsSync(lock)) {
+        if (!fs.existsSync(nm) && fs.existsSync(lock)) {
             if (verbose)
                 console.log(colors.dim(`  removing stale ${lock}`));
             try {
@@ -1351,7 +1394,7 @@ export function ensureFileDepModules(cwd, verbose = false, visited = new Set())
             }
             catch { /* best-effort */ }
         }
-        console.log(colors.yellow(`↻ installing node_modules in ${pkg?.name || abs}`));
+        console.log(colors.yellow(`↻ installing node_modules in ${pkg?.name || abs} (${formatMissingReason(cwdMissing)})`));
         const r = runCommand('npm', ['install'], { cwd: abs, silent: !verbose });
         if (!r.success) {
             console.error(colors.red(`  ✗ npm install failed in ${abs}`));
@@ -1376,12 +1419,11 @@ export function ensureFileDepModules(cwd, verbose = false, visited = new Set())
             catch {
                 continue;
             }
-            const hasDeps = (targetPkg?.dependencies && Object.keys(targetPkg.dependencies).length > 0) ||
-                (targetPkg?.devDependencies && Object.keys(targetPkg.devDependencies).length > 0);
-            const nm = path.join(target, 'node_modules');
-            if (hasDeps && !fs.existsSync(nm)) {
+            const targetMissing = missingDeps(target, targetPkg);
+            if (targetMissing.length > 0) {
+                const nm = path.join(target, 'node_modules');
                 const lock = path.join(target, 'package-lock.json');
-                if (fs.existsSync(lock)) {
+                if (!fs.existsSync(nm) && fs.existsSync(lock)) {
                     if (verbose)
                         console.log(colors.dim(`  removing stale ${lock}`));
                     try {
@@ -1389,7 +1431,7 @@ export function ensureFileDepModules(cwd, verbose = false, visited = new Set())
                     }
                     catch { /* best-effort */ }
                 }
-                console.log(colors.yellow(`↻ restoring node_modules in ${name} (${target})`));
+                console.log(colors.yellow(`↻ restoring node_modules in ${name} (${target}) (${formatMissingReason(targetMissing)})`));
                 const r = runCommand('npm', ['install'], { cwd: target, silent: !verbose });
                 if (!r.success) {
                     console.error(colors.red(`  ✗ npm install failed in ${target}`));
@@ -1401,6 +1443,38 @@ export function ensureFileDepModules(cwd, verbose = false, visited = new Set())
         }
     }
 }
+/** Ensure the workspace-root `node_modules/` is in sync with every member's
+ *  declared deps. Workspaces hoist deps to the root, so a dep added to any
+ *  member `package.json` without a follow-up `npm install` at the root leaves
+ *  the root `node_modules/` stale — the case where `member/` dirs exist but
+ *  the actual package (e.g. `marked`) is not hoisted. */
+export function ensureWorkspaceDepModules(rootDir, members, verbose = false) {
+    const root = path.resolve(rootDir);
+    let rootPkg;
+    try {
+        rootPkg = readPackageJson(root);
+    }
+    catch {
+        return;
+    }
+    const allMissing = new Set();
+    for (const name of missingDeps(root, rootPkg))
+        allMissing.add(name);
+    for (const m of members) {
+        for (const name of missingDeps(m.dir, m.pkg))
+            allMissing.add(name);
+    }
+    if (allMissing.size === 0)
+        return;
+    const list = [...allMissing];
+    console.log(colors.yellow(`↻ installing workspace node_modules in ${rootPkg?.name || path.basename(root)} (${formatMissingReason(list)})`));
+    const r = runCommand('npm', ['install'], { cwd: root, silent: !verbose });
+    if (!r.success) {
+        console.error(colors.red(`  ✗ npm install failed in ${root}`));
+        if (r.stderr)
+            console.error(colors.dim(r.stderr.split('\n').slice(0, 5).join('\n')));
+    }
+}
 /** Run npm install -g with retries for registry propagation delay */
 function installGlobalWithRetry(pkgSpec, cwd, maxRetries = 3) {
     let result = runCommand('npm', ['install', '-g', pkgSpec], { cwd, silent: false, showCommand: true });
@@ -4931,6 +5005,12 @@ export async function globalizeWorkspace(rootDir, options = {}, configOptions =
             }
         }
     }
+    // Sync workspace-root node_modules with member package.json files. Catches
+    // the case where a dep was added to a member package.json but `npm install`
+    // wasn't re-run — the builds would otherwise fail resolving the new dep.
+    if (!options.dryRun) {
+        ensureWorkspaceDepModules(rootDir, packages.map(p => ({ dir: p.dir, pkg: p.pkg })), !!options.verbose);
+    }
     // Prescan: decide which packages actually need processing so we don't waste
     // time rebuilding+republishing ones with no relevant changes.
     // A package is SKIPPED only if ALL of:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.159",
+  "version": "1.0.160",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",