@bobfrankston/npmglobalize 1.0.118 → 1.0.120

package/lib.js

@@ -1015,6 +1015,21 @@ export function runCommand(cmd, args, options = {}) {
         return { success: false, output: '', stderr: error.message };
     }
 }
+/** Run git commit silently and print a compact summary (no per-file create/delete mode lines). */
+function gitCommit(msg, cwd) {
+    const result = runCommand('git', ['commit', '-m', msg], { cwd, silent: true });
+    if (result.success) {
+        // Print the summary lines, skip "create mode" / "delete mode" / "rename" noise
+        const lines = result.output.split('\n');
+        for (const line of lines) {
+            const trimmed = line.trim();
+            if (trimmed && !/^ *(create|delete|rename) mode /.test(trimmed)) {
+                console.log(trimmed);
+            }
+        }
+    }
+    return result;
+}
 /** Extract GitHub repo identifier from repository field */
 function getGitHubRepo(pkg) {
     if (!pkg.repository)
@@ -2982,6 +2997,98 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
     else if (!alreadyTransformed && verbose) {
         console.log('  No file: dependencies found.');
     }
+    // Hoist workspace sub-package deps into root for publishing/global install.
+    // npm install -g only installs root-level dependencies, so sub-package deps
+    // like express must be present in the root package.json.
+    // These are added temporarily — restoreDeps removes them via .dependencies backup.
+    if (pkg.workspaces) {
+        const wsPatterns = Array.isArray(pkg.workspaces) ? pkg.workspaces : pkg.workspaces.packages || [];
+        // Collect all workspace sub-package dirs
+        const wsDirs = [];
+        for (const pattern of wsPatterns) {
+            if (pattern.includes('*')) {
+                // Glob pattern like "packages/*" — enumerate subdirectories
+                const baseDir = path.resolve(cwd, pattern.replace(/\/?\*$/, ''));
+                if (!fs.existsSync(baseDir))
+                    continue;
+                for (const entry of fs.readdirSync(baseDir, { withFileTypes: true })) {
+                    if (entry.isDirectory())
+                        wsDirs.push(path.join(baseDir, entry.name));
+                }
+            }
+            else {
+                // Direct directory like "client"
+                const dir = path.resolve(cwd, pattern);
+                if (fs.existsSync(dir))
+                    wsDirs.push(dir);
+            }
+        }
+        // Collect all workspace package names (siblings to skip)
+        const wsNames = new Set();
+        for (const dir of wsDirs) {
+            const pkgJsonPath = path.join(dir, 'package.json');
+            if (!fs.existsSync(pkgJsonPath))
+                continue;
+            try {
+                const subPkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
+                if (subPkg.name)
+                    wsNames.add(subPkg.name);
+            }
+            catch { /* skip */ }
+        }
+        // Find deps in sub-packages not present in root
+        const rootDeps = { ...pkg.dependencies, ...pkg.devDependencies };
+        const hoisted = [];
+        for (const dir of wsDirs) {
+            const pkgJsonPath = path.join(dir, 'package.json');
+            if (!fs.existsSync(pkgJsonPath))
+                continue;
+            let subPkg;
+            try {
+                subPkg = JSON.parse(fs.readFileSync(pkgJsonPath, 'utf-8'));
+            }
+            catch {
+                continue;
+            }
+            const deps = subPkg.dependencies || {};
+            for (const [dep, ver] of Object.entries(deps)) {
+                if (wsNames.has(dep))
+                    continue; // sibling workspace — bundled
+                if (dep in rootDeps)
+                    continue; // already in root
+                if (hoisted.some(m => m.dep === dep))
+                    continue;
+                hoisted.push({ dep, version: ver, from: subPkg.name || path.basename(dir) });
+            }
+        }
+        if (hoisted.length > 0) {
+            // Ensure .dependencies backup exists so restoreDeps will remove hoisted deps
+            if (!pkg['.dependencies']) {
+                pkg['.dependencies'] = { ...(pkg.dependencies || {}) };
+                transformResult.transformed = true;
+            }
+            if (!pkg.dependencies)
+                pkg.dependencies = {};
+            for (const m of hoisted) {
+                let version = m.version;
+                if (typeof version === 'string' && version.startsWith('file:')) {
+                    const depDir = path.resolve(cwd, version.replace('file:', ''));
+                    try {
+                        const depPkg = readPackageJson(depDir);
+                        version = '^' + depPkg.version;
+                    }
+                    catch {
+                        // keep original if unresolvable
+                    }
+                }
+                pkg.dependencies[m.dep] = version;
+                console.log(colors.green(`  + hoisted ${m.dep}: ${version} (from ${m.from})`));
+            }
+            if (!dryRun) {
+                writePackageJson(cwd, pkg);
+            }
+        }
+    }
     // Run npm audit if requested or if dependencies were transformed
     if ((fix || updateDeps) && (transformResult.transformed || alreadyTransformed || updateDeps)) {
         if (!dryRun) {
@@ -3014,7 +3121,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             if (!dryRun) {
                 writePackageJson(cwd, finalPkg);
                 runCommand('git', ['add', 'package.json'], { cwd });
-                runCommand('git', ['commit', '-m', 'Restore file: dependencies'], { cwd });
+                gitCommit('Restore file: dependencies', cwd);
                 if (currentGitStatus.hasRemote) {
                     pushWithProtection(cwd, verbose);
                 }
@@ -3042,7 +3149,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             if (!dryRun) {
                 writePackageJson(cwd, finalPkg);
                 runCommand('git', ['add', 'package.json'], { cwd });
-                runCommand('git', ['commit', '-m', 'Restore file: dependencies'], { cwd });
+                gitCommit('Restore file: dependencies', cwd);
                 if (currentGitStatus.hasRemote) {
                     pushWithProtection(cwd, verbose);
                 }
@@ -3228,16 +3335,14 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                     console.log(colors.yellow('Continuing with --force...'));
                 }
             }
-            let commitResult = runCommand('git', ['commit', '-m', commitMsg], { cwd });
+            let commitResult = gitCommit(commitMsg, cwd);
             if (!commitResult.success) {
                 // Check for corrupted git index ("invalid object" / "Error building trees")
-                // Run silently to capture stderr for detection
-                const probe = runCommand('git', ['commit', '-m', commitMsg], { cwd, silent: true });
-                const errText = probe.stderr + probe.output;
+                const errText = commitResult.stderr + commitResult.output;
                 if (errText.includes('invalid object') || errText.includes('Error building trees')) {
                     if (repairGitIndex(cwd)) {
                         // Retry commit after repair
-                        commitResult = runCommand('git', ['commit', '-m', commitMsg], { cwd });
+                        commitResult = gitCommit(commitMsg, cwd);
                     }
                 }
                 if (!commitResult.success) {
@@ -3792,7 +3897,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             writePackageJson(cwd, finalPkg);
             // Commit the restore
             runCommand('git', ['add', 'package.json'], { cwd });
-            runCommand('git', ['commit', '-m', 'Restore file: dependencies'], { cwd });
+            gitCommit('Restore file: dependencies', cwd);
             if (currentGitStatus.hasRemote) {
                 pushWithProtection(cwd, verbose);
             }
@@ -3866,49 +3971,7 @@ export async function globalizeWorkspace(rootDir, options = {}, configOptions =
     console.log(`Packages (${packages.length}): ${packages.map(p => p.name).join(', ')}`);
     console.log(`Publish order: ${publishOrder.join(' → ')}`);
     console.log('');
-    // Check that workspace packages' deps are hoisted to root (needed for global install)
     const rootPkg = readPackageJson(rootDir);
-    if (rootPkg.bin) {
-        const wsNames = new Set(packages.map(p => p.name));
-        const rootDeps = { ...rootPkg.dependencies, ...rootPkg.devDependencies };
-        const missing = [];
-        for (const pkgInfo of packages) {
-            const deps = pkgInfo.pkg.dependencies || {};
-            for (const [dep, ver] of Object.entries(deps)) {
-                if (wsNames.has(dep))
-                    continue; // sibling workspace package — bundled
-                if (dep in rootDeps)
-                    continue; // already in root
-                if (missing.some(m => m.dep === dep))
-                    continue; // already flagged
-                missing.push({ dep, version: ver, from: pkgInfo.name });
-            }
-        }
-        if (missing.length > 0) {
-            console.log(colors.yellow('⚠ Workspace packages have dependencies not in root package.json:'));
-            for (const m of missing) {
-                console.log(colors.yellow(`  ${m.dep} (${m.version}) — from ${m.from}`));
-            }
-            console.log(colors.dim('  Global install (npm install -g) only installs root deps.'));
-            if (!options.dryRun) {
-                const hoist = await confirm('Add missing deps to root package.json?', true);
-                if (hoist) {
-                    if (!rootPkg.dependencies)
-                        rootPkg.dependencies = {};
-                    for (const m of missing) {
-                        rootPkg.dependencies[m.dep] = m.version;
-                        console.log(colors.green(`  + ${m.dep}: ${m.version}`));
-                    }
-                    writePackageJson(rootDir, rootPkg);
-                    console.log(colors.green('✓ Hoisted workspace deps to root package.json'));
-                }
-            }
-            else {
-                console.log(colors.dim('  [dry-run] Would offer to hoist missing deps'));
-            }
-            console.log('');
-        }
-    }
     // Handle --cleanup: restore deps for all packages and return
     if (options.cleanup) {
         console.log('Restoring workspace dependencies...');
@@ -4062,6 +4125,46 @@ export async function globalizeWorkspace(rootDir, options = {}, configOptions =
         console.log(colors.green('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
         console.log(`  Installing workspace root: ${colors.green(pkgName)}`);
         console.log(colors.green('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
+        // Auto-hoist workspace sub-package deps to root for global install,
+        // then restore original root deps afterward.
+        const wsNames = new Set(packages.map(p => p.name));
+        const rootDeps = { ...rootPkgFinal.dependencies, ...rootPkgFinal.devDependencies };
+        const hoisted = [];
+        for (const pkgInfo of packages) {
+            const deps = pkgInfo.pkg.dependencies || {};
+            for (const [dep, ver] of Object.entries(deps)) {
+                if (wsNames.has(dep))
+                    continue; // sibling workspace — bundled
+                if (dep in rootDeps)
+                    continue; // already in root
+                if (hoisted.some(m => m.dep === dep))
+                    continue;
+                hoisted.push({ dep, version: ver, from: pkgInfo.name });
+            }
+        }
+        // Save original deps and add hoisted ones
+        const savedDeps = rootPkgFinal.dependencies ? { ...rootPkgFinal.dependencies } : undefined;
+        if (hoisted.length > 0 && !dryRun) {
+            if (!rootPkgFinal.dependencies)
+                rootPkgFinal.dependencies = {};
+            for (const m of hoisted) {
+                // Convert file: refs to npm versions (the sub-package was just published)
+                let version = m.version;
+                if (typeof version === 'string' && version.startsWith('file:')) {
+                    const depDir = path.resolve(rootDir, version.replace('file:', ''));
+                    try {
+                        const depPkg = readPackageJson(depDir);
+                        version = `^${depPkg.version}`;
+                    }
+                    catch {
+                        // keep original if we can't resolve
+                    }
+                }
+                rootPkgFinal.dependencies[m.dep] = version;
+                console.log(colors.green(`  + hoisted ${m.dep}: ${version} (from ${m.from})`));
+            }
+            writePackageJson(rootDir, rootPkgFinal);
+        }
         if (link || install) {
             // Workspace root is private — always install from local directory
             console.log(`Installing ${pkgName}@${pkgVersion} globally from local directory...`);
@@ -4094,6 +4197,17 @@ export async function globalizeWorkspace(rootDir, options = {}, configOptions =
                 console.log(`  [dry-run] Would run: wsl npm install -g .`);
             }
         }
+        // Restore original root deps after install
+        if (hoisted.length > 0 && !dryRun) {
+            if (savedDeps === undefined) {
+                delete rootPkgFinal.dependencies;
+            }
+            else {
+                rootPkgFinal.dependencies = savedDeps;
+            }
+            writePackageJson(rootDir, rootPkgFinal);
+            console.log(colors.green('✓ Restored root package.json dependencies'));
+        }
         console.log('');
     }
     return { success: allSuccess, packages: results, publishOrder };

package/package.json

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