@bobfrankston/npmglobalize 1.0.153 → 1.0.154

package/cli.js

@@ -2,7 +2,7 @@
 /**
  * npmglobalize CLI - Transform file: dependencies to npm versions for publishing
  */
-import { globalize, globalizeWorkspace, installCleanupHandlers, readConfig, readPackageJson, readUserNpmConfig, writeConfig, writePackageJson, confirm, getBuildIssues, clearBuildIssues, recordBuildIssue, extractFirstTscError } from './lib.js';
+import { globalize, globalizeWorkspace, installCleanupHandlers, readConfig, readPackageJson, readUserNpmConfig, writeConfig, writePackageJson, confirm, getBuildIssues, clearBuildIssues, recordBuildIssue, extractFirstTscError, ensureFileDepModules } from './lib.js';
 import fs from 'fs';
 import path from 'path';
 import { styleText } from 'util';
@@ -423,6 +423,7 @@ export async function main() {
                 }
             }
             if (pkg.scripts?.build) {
+                ensureFileDepModules(cwd, !!cliOptions.verbose);
                 const { spawnSync } = await import('child_process');
                 console.log(`Building ${cwd}...`);
                 const buildResult = spawnSync('npm', ['run', 'build'], {

package/lib.d.ts

@@ -234,6 +234,12 @@ 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;
+/** Walk `file:` deps transitively and run `npm install` in any target whose
+ *  package.json declares deps but has no `node_modules/`. Recovers from prior
+ *  aborted runs (or pre-1.0.153 `--clean-nested-modules` damage) so the
+ *  upcoming build/pack can resolve transitive package imports.
+ *  Cycle-safe via the shared `visited` set. */
+export declare function ensureFileDepModules(cwd: string, verbose?: boolean, visited?: Set<string>): void;
 /** Run a command and return success status */
 export declare function runCommand(cmd: string, args: string[], options?: {
     silent?: boolean;

package/lib.js

@@ -1315,6 +1315,56 @@ function restoreNestedDepModules(stashed, verbose) {
         }
     }
 }
+/** Walk `file:` deps transitively and run `npm install` in any target whose
+ *  package.json declares deps but has no `node_modules/`. Recovers from prior
+ *  aborted runs (or pre-1.0.153 `--clean-nested-modules` damage) so the
+ *  upcoming build/pack can resolve transitive package imports.
+ *  Cycle-safe via the shared `visited` set. */
+export function ensureFileDepModules(cwd, verbose = false, visited = new Set()) {
+    const abs = path.resolve(cwd);
+    if (visited.has(abs))
+        return;
+    visited.add(abs);
+    let pkg;
+    try {
+        pkg = readPackageJson(cwd);
+    }
+    catch {
+        return;
+    }
+    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' || !spec.startsWith('file:'))
+                continue;
+            const target = path.resolve(cwd, spec.slice('file:'.length));
+            if (!fs.existsSync(path.join(target, 'package.json')))
+                continue;
+            let targetPkg;
+            try {
+                targetPkg = readPackageJson(target);
+            }
+            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)) {
+                console.log(colors.yellow(`↻ restoring node_modules in ${name} (${target})`));
+                const r = runCommand('npm', ['install'], { cwd: target, silent: !verbose });
+                if (!r.success) {
+                    console.error(colors.red(`  ✗ npm install failed in ${target}`));
+                    if (r.stderr)
+                        console.error(colors.dim(r.stderr.split('\n').slice(0, 5).join('\n')));
+                }
+            }
+            ensureFileDepModules(target, verbose, visited);
+        }
+    }
+}
 /** 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 });
@@ -3061,6 +3111,8 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
     const pkg = readPackageJson(cwd);
     // Run build step if package.json has a build script (skip if CLI already built)
     if (pkg.scripts?.build && !options._fromCli) {
+        if (!dryRun)
+            ensureFileDepModules(cwd, verbose);
         console.log(`${timestamp()} Running build...`);
         if (!dryRun) {
             // Always capture output so we can extract tsc errors for the summary

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.153",
+  "version": "1.0.154",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",
@@ -33,6 +33,7 @@
   "dependencies": {
     "@bobfrankston/freezepak": "^0.1.7",
     "@bobfrankston/importgen": "^0.1.34",
+    "@bobfrankston/npmglobalize": "^1.0.153",
     "@bobfrankston/themecolors": "^0.1.5",
     "@bobfrankston/userconfig": "^1.0.7",
     "@npmcli/package-json": "^7.0.4",
@@ -48,6 +49,7 @@
   ".dependencies": {
     "@bobfrankston/freezepak": "file:../freezepak",
     "@bobfrankston/importgen": "file:../importgen",
+    "@bobfrankston/npmglobalize": "^1.0.153",
     "@bobfrankston/themecolors": "file:../themecolors",
     "@bobfrankston/userconfig": "file:../userconfig",
     "@npmcli/package-json": "^7.0.4",
@@ -61,6 +63,7 @@
     "dependencies": {
       "@bobfrankston/freezepak": "^0.1.7",
       "@bobfrankston/importgen": "^0.1.34",
+      "@bobfrankston/npmglobalize": "^1.0.153",
       "@bobfrankston/themecolors": "^0.1.5",
       "@bobfrankston/userconfig": "^1.0.7",
       "@npmcli/package-json": "^7.0.4",