@bobfrankston/npmglobalize 1.0.155 → 1.0.157

package/lib.d.ts

@@ -244,9 +244,9 @@ 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.
+ *  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.
  *  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 */
@@ -260,6 +260,15 @@ export declare function runCommand(cmd: string, args: string[], options?: {
     output: string;
     stderr: string;
 };
+/** Install a package globally in WSL, auto-fixing the root-owned /usr/local/lib/node_modules
+ *  EACCES case by switching npm to a user prefix (~/.npm-global) and retrying once.
+ *  Output is captured (so we can scan for the error) and then mirrored to the terminal. */
+export declare function installInWsl(wslArgs: string[], opts?: {
+    cwd?: string;
+}): {
+    success: boolean;
+    fixed: boolean;
+};
 /** Run a command and throw on failure */
 export declare function runCommandOrThrow(cmd: string, args: string[], options?: {
     silent?: boolean;

package/lib.js

@@ -1323,9 +1323,9 @@ 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.
+ *  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.
  *  Cycle-safe via the shared `visited` set. */
 export function ensureFileDepModules(cwd, verbose = false, visited = new Set()) {
     const abs = path.resolve(cwd);
@@ -1339,6 +1339,26 @@ 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 lock = path.join(abs, 'package-lock.json');
+        if (fs.existsSync(lock)) {
+            if (verbose)
+                console.log(colors.dim(`  removing stale ${lock}`));
+            try {
+                fs.rmSync(lock, { force: true });
+            }
+            catch { /* best-effort */ }
+        }
+        console.log(colors.yellow(`↻ installing node_modules in ${pkg?.name || abs}`));
+        const r = runCommand('npm', ['install'], { cwd: abs, silent: !verbose });
+        if (!r.success) {
+            console.error(colors.red(`  ✗ npm install failed in ${abs}`));
+            if (r.stderr)
+                console.error(colors.dim(r.stderr.split('\n').slice(0, 5).join('\n')));
+        }
+    }
     for (const key of ['dependencies', 'devDependencies']) {
         const deps = pkg?.[key];
         if (!deps || typeof deps !== 'object')
@@ -1360,6 +1380,15 @@ export function ensureFileDepModules(cwd, verbose = false, visited = new Set())
                 (targetPkg?.devDependencies && Object.keys(targetPkg.devDependencies).length > 0);
             const nm = path.join(target, 'node_modules');
             if (hasDeps && !fs.existsSync(nm)) {
+                const lock = path.join(target, 'package-lock.json');
+                if (fs.existsSync(lock)) {
+                    if (verbose)
+                        console.log(colors.dim(`  removing stale ${lock}`));
+                    try {
+                        fs.rmSync(lock, { force: true });
+                    }
+                    catch { /* best-effort */ }
+                }
                 console.log(colors.yellow(`↻ restoring node_modules in ${name} (${target})`));
                 const r = runCommand('npm', ['install'], { cwd: target, silent: !verbose });
                 if (!r.success) {
@@ -1420,6 +1449,40 @@ export function runCommand(cmd, args, options = {}) {
         return { success: false, output: '', stderr: error.message };
     }
 }
+/** Install a package globally in WSL, auto-fixing the root-owned /usr/local/lib/node_modules
+ *  EACCES case by switching npm to a user prefix (~/.npm-global) and retrying once.
+ *  Output is captured (so we can scan for the error) and then mirrored to the terminal. */
+export function installInWsl(wslArgs, opts = {}) {
+    console.log(colors.cyan(`> wsl ${wslArgs.join(' ')}`));
+    let result = runCommand('wsl', wslArgs, { cwd: opts.cwd, silent: true });
+    if (result.output)
+        process.stdout.write(result.output);
+    if (result.stderr)
+        process.stderr.write(result.stderr);
+    if (result.success)
+        return { success: true, fixed: false };
+    const combined = (result.output || '') + '\n' + (result.stderr || '');
+    const permIssue = /EACCES/.test(combined) && /\/usr\/(?:local\/)?lib\/node_modules/.test(combined);
+    if (!permIssue)
+        return { success: false, fixed: false };
+    console.log(colors.yellow('Detected root-owned npm prefix in WSL — switching to ~/.npm-global and retrying...'));
+    const fix = `set -e; npm config set prefix "$HOME/.npm-global"; mkdir -p "$HOME/.npm-global/bin"; if ! grep -q '\\.npm-global/bin' "$HOME/.bashrc" 2>/dev/null; then printf '\\n# npm user-prefix bin (added by npmglobalize)\\nexport PATH="$HOME/.npm-global/bin:$PATH"\\n' >> "$HOME/.bashrc"; fi`;
+    const fixResult = runCommand('wsl', ['bash', '-lc', fix], { silent: true });
+    if (!fixResult.success) {
+        console.error(colors.red('Failed to apply WSL npm prefix fix:'));
+        if (fixResult.stderr)
+            process.stderr.write(fixResult.stderr);
+        return { success: false, fixed: false };
+    }
+    console.log(colors.green('✓ WSL npm prefix set to ~/.npm-global; PATH appended to ~/.bashrc'));
+    console.log(colors.cyan(`> wsl ${wslArgs.join(' ')}`));
+    result = runCommand('wsl', wslArgs, { cwd: opts.cwd, silent: true });
+    if (result.output)
+        process.stdout.write(result.output);
+    if (result.stderr)
+        process.stderr.write(result.stderr);
+    return { success: result.success, fixed: result.success };
+}
 /** Diagnose common build/version failure patterns and print actionable hints.
  *  Returns true if a diagnosis was printed. */
 function diagnoseBuildFailure(errorText, cwd) {
@@ -4672,10 +4735,10 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 waitForNpmVersion(pkgName, pkgVersion);
             console.log(`Installing in WSL${useLocalWsl ? ' (local)' : ' from registry'}: ${pkgName}@${pkgVersion}...`);
             if (!dryRun) {
-                const wslResult = runCommand('wsl', wslArgs, { cwd, silent: false, showCommand: true });
+                const wslResult = installInWsl(wslArgs, { cwd });
                 if (wslResult.success) {
                     wslInstallOk = true;
-                    console.log(colors.green(`✓ Installed in WSL: ${pkgName}@${pkgVersion}`));
+                    console.log(colors.green(`✓ Installed in WSL: ${pkgName}@${pkgVersion}${wslResult.fixed ? ' (after prefix fix)' : ''}`));
                 }
                 else {
                     console.error(colors.yellow('✗ WSL install failed (is npm installed in WSL?)'));
@@ -5076,9 +5139,9 @@ export async function globalizeWorkspace(rootDir, options = {}, configOptions =
         if (wsl) {
             console.log(`Installing ${pkgName} in WSL (local)...`);
             if (!dryRun) {
-                const wslResult = runCommand('wsl', ['npm', 'install', '-g', '.'], { cwd: rootDir, silent: false, showCommand: true });
+                const wslResult = installInWsl(['npm', 'install', '-g', '.'], { cwd: rootDir });
                 if (wslResult.success) {
-                    console.log(colors.green(`✓ Installed in WSL: ${pkgName}@${pkgVersion}`));
+                    console.log(colors.green(`✓ Installed in WSL: ${pkgName}@${pkgVersion}${wslResult.fixed ? ' (after prefix fix)' : ''}`));
                 }
                 else {
                     console.error(colors.yellow('✗ WSL install failed (is npm installed in WSL?)'));

package/package.json

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