@bobfrankston/npmglobalize 1.0.53 → 1.0.62

package/cli.js

@@ -10,19 +10,28 @@ import { styleText } from 'util';
 import JSON5 from 'json5';
 // Check if JS files are up-to-date with TS files
 const __dirname = path.dirname(fileURLToPath(import.meta.url));
-const libTsPath = path.join(__dirname, 'lib.ts');
-const libJsPath = path.join(__dirname, 'lib.js');
-if (fs.existsSync(libTsPath) && fs.existsSync(libJsPath)) {
-    const tsStat = fs.statSync(libTsPath);
-    const jsStat = fs.statSync(libJsPath);
-    if (jsStat.mtime < tsStat.mtime && !process.argv.includes('--force')) {
-        console.error('\n' + styleText('red', '❌ Build check failed:'));
-        console.error(styleText('red', '   lib.js is outdated (older than lib.ts)'));
-        console.error('\n' + styleText('yellow', '   Please run: tsc'));
-        console.error(styleText('yellow', '   Or use --force to skip this check') + '\n');
-        process.exit(1);
+// Check all .ts files in the directory
+const tsFiles = ['lib.ts', 'cli.ts', 'index.ts'];
+const outOfSync = [];
+for (const tsFile of tsFiles) {
+    const tsPath = path.join(__dirname, tsFile);
+    const jsPath = path.join(__dirname, tsFile.replace('.ts', '.js'));
+    if (fs.existsSync(tsPath) && fs.existsSync(jsPath)) {
+        const tsStat = fs.statSync(tsPath);
+        const jsStat = fs.statSync(jsPath);
+        if (jsStat.mtime < tsStat.mtime) {
+            outOfSync.push(tsFile);
+        }
     }
 }
+if (outOfSync.length > 0 && !process.argv.includes('--force')) {
+    console.error('\n' + styleText('red', '❌ Build check failed:'));
+    console.error(styleText('red', `   ${outOfSync.length} file(s) need compilation:`));
+    outOfSync.forEach(f => console.error(styleText('red', `     - ${f}`)));
+    console.error('\n' + styleText('yellow', '   Please run: tsc'));
+    console.error(styleText('yellow', '   Or use --force to skip this check') + '\n');
+    process.exit(1);
+}
 function printHelp() {
     console.log(`
 npmglobalize - Transform file: dependencies to npm versions for publishing

package/lib.d.ts

@@ -1,5 +1,13 @@
 /**
  * npmglobalize - Transform file: dependencies to npm versions for publishing
+ *
+ * NOTE: Libraries for future refactoring (currently installed but not used):
+ * - simple-git: For git operations instead of execSync
+ * - pacote: For npm registry operations instead of spawnSync('npm', ['view', ...])
+ * - @types/pacote, @types/npm-package-arg: Type definitions
+ *
+ * Current approach uses synchronous child_process calls for stability and simplicity.
+ * Consider library-based approach if async operations or cross-platform issues arise.
  */
 /** Options for the globalize operation */
 export interface GlobalizeOptions {
@@ -119,7 +127,6 @@ export declare function fixVersionTagMismatch(cwd: string, pkg: any, verbose?: b
 export declare function runCommand(cmd: string, args: string[], options?: {
     silent?: boolean;
     cwd?: string;
-    shell?: boolean;
 }): {
     success: boolean;
     output: string;

package/lib.js

@@ -1,5 +1,13 @@
 /**
  * npmglobalize - Transform file: dependencies to npm versions for publishing
+ *
+ * NOTE: Libraries for future refactoring (currently installed but not used):
+ * - simple-git: For git operations instead of execSync
+ * - pacote: For npm registry operations instead of spawnSync('npm', ['view', ...])
+ * - @types/pacote, @types/npm-package-arg: Type definitions
+ *
+ * Current approach uses synchronous child_process calls for stability and simplicity.
+ * Consider library-based approach if async operations or cross-platform issues arise.
  */
 import fs from 'fs';
 import path from 'path';
@@ -17,6 +25,10 @@ const colors = {
     italic: (text) => styleText('italic', text),
     dim: (text) => styleText('dim', text),
 };
+/** Get npm command for current platform (npm.cmd on Windows, npm elsewhere) */
+function getNpmCommand() {
+    return process.platform === 'win32' ? 'npm.cmd' : 'npm';
+}
 const DEP_KEYS = ['dependencies', 'devDependencies', 'peerDependencies', 'optionalDependencies'];
 /** Read and parse package.json from a directory */
 export function readPackageJson(dir) {
@@ -145,8 +157,7 @@ export function getLatestVersion(packageName) {
     try {
         const result = spawnSync('npm', ['view', packageName, 'version'], {
             encoding: 'utf-8',
-            stdio: 'pipe',
-            shell: true
+            stdio: 'pipe'
         });
         if (result.status === 0 && result.stdout) {
             return result.stdout.trim();
@@ -162,8 +173,7 @@ export function checkVersionExists(packageName, version) {
     try {
         const result = spawnSync('npm', ['view', `${packageName}@${version}`, 'version'], {
             encoding: 'utf-8',
-            stdio: 'pipe',
-            shell: true
+            stdio: 'pipe'
         });
         return result.status === 0 && result.stdout.trim() === version;
     }
@@ -176,8 +186,7 @@ export function checkPackageExists(packageName) {
     try {
         const result = spawnSync('npm', ['view', packageName, 'version'], {
             encoding: 'utf-8',
-            stdio: 'pipe',
-            shell: true
+            stdio: 'pipe'
         });
         return result.status === 0 && result.stdout.trim().length > 0;
     }
@@ -190,8 +199,7 @@ export function checkNpmAccess(packageName) {
     try {
         const result = spawnSync('npm', ['view', packageName, '--json'], {
             encoding: 'utf-8',
-            stdio: 'pipe',
-            shell: true
+            stdio: 'pipe'
         });
         if (result.status === 0 && result.stdout) {
             const data = JSON.parse(result.stdout);
@@ -526,13 +534,21 @@ export function fixVersionTagMismatch(cwd, pkg, verbose = false) {
 }
 /** Run a command and return success status */
 export function runCommand(cmd, args, options = {}) {
-    const { silent = false, cwd, shell = false } = options;
+    const { silent = false, cwd } = options;
     try {
+        // Only use shell:true for npm commands which need it on Windows
+        // Git and other commands work fine without shell
+        const needsShell = cmd === 'npm' || cmd === 'npm.cmd';
+        // Debug: log the command being executed
+        if (!silent) {
+            console.log(colors.dim(`[DEBUG] Running: ${cmd} ${args.join(' ')}`));
+        }
         const result = spawnSync(cmd, args, {
             encoding: 'utf-8',
             stdio: silent ? 'pipe' : 'inherit',
             cwd,
-            shell // Use shell when explicitly requested (e.g., for npm publish on Windows)
+            env: process.env, // Always inherit environment variables
+            shell: needsShell // Only use shell for npm commands
         });
         // For non-silent commands, we can't capture output when using 'inherit'
         // So we return empty string for output, but the user sees it in the terminal
@@ -625,7 +641,7 @@ export function getGitStatus(cwd) {
     status.hasMergeConflict = fs.existsSync(mergeHead);
     // Get branch info
     try {
-        const branch = execSync('git rev-parse --abbrev-ref HEAD 2>nul', { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
+        const branch = execSync('git rev-parse --abbrev-ref HEAD', { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
         status.currentBranch = branch;
         status.isDetachedHead = branch === 'HEAD';
     }
@@ -634,7 +650,7 @@ export function getGitStatus(cwd) {
     }
     // Check for remote
     try {
-        const remote = execSync('git remote 2>nul', { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
+        const remote = execSync('git remote', { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] }).trim();
         status.hasRemote = remote.length > 0;
     }
     catch (error) {
@@ -642,7 +658,7 @@ export function getGitStatus(cwd) {
     }
     // Check for uncommitted changes
     try {
-        const statusOutput = execSync('git status --porcelain 2>nul', { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] });
+        const statusOutput = execSync('git status --porcelain', { cwd, encoding: 'utf-8', stdio: ['pipe', 'pipe', 'ignore'] });
         status.hasUncommitted = statusOutput.trim().length > 0;
     }
     catch (error) {
@@ -651,7 +667,7 @@ export function getGitStatus(cwd) {
     // Check for unpushed commits
     if (status.hasRemote && !status.isDetachedHead && status.currentBranch) {
         try {
-            const unpushed = execSync(`git log origin/${status.currentBranch}..HEAD --oneline 2>nul`, {
+            const unpushed = execSync(`git log origin/${status.currentBranch}..HEAD --oneline`, {
                 cwd,
                 encoding: 'utf-8',
                 stdio: ['pipe', 'pipe', 'ignore']
@@ -663,7 +679,7 @@ export function getGitStatus(cwd) {
         }
         // Check if local is behind remote
         try {
-            const behind = execSync(`git log HEAD..origin/${status.currentBranch} --oneline 2>nul`, {
+            const behind = execSync(`git log HEAD..origin/${status.currentBranch} --oneline`, {
                 cwd,
                 encoding: 'utf-8',
                 stdio: ['pipe', 'pipe', 'ignore']
@@ -740,11 +756,13 @@ export async function promptChoice(message, choices) {
 /** Check npm authentication status */
 function checkNpmAuth() {
     try {
-        // Use shell:true on Windows for better compatibility
+        // Must use shell:true on Windows to find npm.cmd in PATH
+        // Must pass env: process.env to inherit NPM_TOKEN environment variable
         const result = spawnSync('npm', ['whoami'], {
             encoding: 'utf-8',
-            shell: true,
-            stdio: ['ignore', 'pipe', 'pipe']
+            stdio: ['ignore', 'pipe', 'pipe'],
+            env: process.env,
+            shell: true
         });
         if (result.status === 0 && result.stdout && result.stdout.trim()) {
             return { authenticated: true, username: result.stdout.trim() };
@@ -1108,7 +1126,7 @@ export function runNpmAudit(cwd, fix = false, verbose = false) {
     console.log(colors.yellow('━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━'));
     if (fix) {
         console.log('Running npm audit fix...');
-        const fixResult = runCommand('npm', ['audit', 'fix'], { cwd, silent: false, shell: true });
+        const fixResult = runCommand('npm', ['audit', 'fix'], { cwd, silent: false });
         if (!fixResult.success) {
             console.log(colors.yellow('⚠ Some vulnerabilities could not be automatically fixed'));
         }
@@ -1120,8 +1138,7 @@ export function runNpmAudit(cwd, fix = false, verbose = false) {
     const auditResult = spawnSync('npm', ['audit', '--json'], {
         cwd,
         encoding: 'utf-8',
-        stdio: 'pipe',
-        shell: true
+        stdio: 'pipe'
     });
     let hasVulnerabilities = false;
     let report = '';
@@ -1175,7 +1192,7 @@ export function runNpmAudit(cwd, fix = false, verbose = false) {
         catch (e) {
             // Fallback to text output if JSON parsing fails
             console.log('Running text audit...');
-            const textResult = runCommand('npm', ['audit'], { cwd, silent: false, shell: true });
+            const textResult = runCommand('npm', ['audit'], { cwd, silent: false });
             report = 'Audit completed (see output above)';
         }
     }
@@ -1332,39 +1349,6 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         }
         return true;
     }
-    // Check npm authentication early (unless dry-run or no-publish)
-    if (!dryRun && !noPublish) {
-        const authStatus = checkNpmAuth();
-        if (!authStatus.authenticated) {
-            console.error(colors.red('\n✗ npm authentication required'));
-            console.error('');
-            if (authStatus.error === 'token expired') {
-                console.error('Your npm access token has expired or been revoked.');
-                console.error('');
-                console.error('To fix this, run:');
-                console.error(colors.yellow('  npm logout'));
-                console.error(colors.yellow('  npm login'));
-            }
-            else if (authStatus.error === 'not logged in') {
-                console.error('You are not logged in to npm.');
-                console.error('');
-                console.error('To fix this, run:');
-                console.error(colors.yellow('  npm login'));
-            }
-            else {
-                console.error(`Authentication error: ${authStatus.error}`);
-                console.error('');
-                console.error('Try running:');
-                console.error(colors.yellow('  npm whoami'));
-            }
-            console.error('');
-            console.error('After logging in, try running this command again.');
-            return false;
-        }
-        if (verbose) {
-            console.log(colors.green(`✓ Authenticated as ${authStatus.username}`));
-        }
-    }
     // Check git status
     const gitStatus = getGitStatus(cwd);
     // Handle init mode
@@ -1396,7 +1380,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
             return false;
     }
     // Re-check git status after potential init
-    const currentGitStatus = getGitStatus(cwd);
+    let currentGitStatus = getGitStatus(cwd);
     // Validate git state
     if (currentGitStatus.hasMergeConflict) {
         console.error(colors.red('ERROR: Merge conflict detected. Resolve before releasing.'));
@@ -1743,89 +1727,44 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         console.log('Package is private - skipping npm publish.');
         return true;
     }
+    // Re-check git status after all transformations and potential commits
+    currentGitStatus = getGitStatus(cwd);
     // Check if there are changes to commit or a custom message
     if (!currentGitStatus.hasUncommitted && !message) {
         console.log('');
         console.log('No changes to commit and no custom message specified.');
-        // If install flag is set, verify/install even without publishing
+        // If install flag is set, install from local directory
         if (install || wsl) {
             if (verbose) {
                 console.log('');
-                console.log('Checking global installation...');
+                console.log('Installing from local directory...');
             }
             const pkgName = pkg.name;
             if (install) {
-                const verifyResult = runCommand('npm', ['list', '-g', '--depth=0', pkgName], { cwd, silent: true });
-                if (verifyResult.success) {
-                    console.log(colors.green(`✓ Already installed globally: ${pkgName}`));
+                console.log(`Installing ${pkgName} globally from local directory...`);
+                const localInstallResult = runCommand('npm', ['install', '-g', '.'], { cwd, silent: false });
+                if (localInstallResult.success) {
+                    const version = pkg.version;
+                    console.log(colors.green(`✓ Installed globally: ${pkgName}@${version}`));
                 }
                 else {
-                    console.log(colors.yellow(`Package not installed globally. Installing latest version...`));
-                    // First try installing from npm registry
-                    const installResult = runCommand('npm', ['install', '-g', `${pkgName}@latest`], { cwd, silent: false });
-                    if (installResult.success) {
-                        const reVerify = runCommand('npm', ['list', '-g', '--depth=0', pkgName], { cwd, silent: true });
-                        if (reVerify.success) {
-                            const version = pkg.version;
-                            console.log(colors.green(`✓ Installed and verified globally: ${pkgName}@${version}`));
-                        }
-                        else {
-                            console.log(colors.yellow(`⚠ Install appeared successful but verification failed`));
-                        }
-                    }
-                    else {
-                        // If npm install fails, try installing from local directory
-                        console.log(colors.yellow(`Could not install from npm. Trying local installation...`));
-                        const localInstallResult = runCommand('npm', ['install', '-g', '.'], { cwd, silent: false, shell: true });
-                        if (localInstallResult.success) {
-                            const version = pkg.version;
-                            console.log(colors.green(`✓ Installed globally from local: ${pkgName}@${version}`));
-                        }
-                        else {
-                            console.error(colors.red(`✗ Global install failed`));
-                            console.error(colors.yellow('  Try running manually: npm install -g .'));
-                        }
-                    }
+                    console.error(colors.red(`✗ Global install failed`));
+                    console.error(colors.yellow('  Try running manually: npm install -g .'));
                 }
             }
             if (wsl) {
-                const verifyResult = runCommand('wsl', ['npm', 'list', '-g', '--depth=0', pkgName], { cwd, silent: true });
-                if (verifyResult.success) {
-                    console.log(colors.green(`✓ Already installed in WSL: ${pkgName}`));
+                console.log(`Installing ${pkgName} in WSL from local directory...`);
+                const wslInstallResult = runCommand('wsl', ['npm', 'install', '-g', '.'], { cwd, silent: false });
+                if (wslInstallResult.success) {
+                    const version = pkg.version;
+                    console.log(colors.green(`✓ Installed in WSL: ${pkgName}@${version}`));
                 }
                 else {
-                    console.log(colors.yellow(`Package not installed in WSL. Installing latest version...`));
-                    // First try installing from npm registry
-                    const wslInstallResult = runCommand('wsl', ['npm', 'install', '-g', `${pkgName}@latest`], { cwd, silent: false });
-                    if (wslInstallResult.success) {
-                        const reVerify = runCommand('wsl', ['npm', 'list', '-g', '--depth=0', pkgName], { cwd, silent: true });
-                        if (reVerify.success) {
-                            const version = pkg.version;
-                            console.log(colors.green(`✓ Installed and verified in WSL: ${pkgName}@${version}`));
-                        }
-                        else {
-                            console.log(colors.yellow(`⚠ WSL install appeared successful but verification failed`));
-                        }
-                    }
-                    else {
-                        // If npm install fails, try installing from local directory
-                        console.log(colors.yellow(`Could not install from npm. Trying local installation in WSL...`));
-                        const localWslInstallResult = runCommand('wsl', ['npm', 'install', '-g', '.'], { cwd, silent: false });
-                        if (localWslInstallResult.success) {
-                            const version = pkg.version;
-                            console.log(colors.green(`✓ Installed in WSL from local: ${pkgName}@${version}`));
-                        }
-                        else {
-                            console.error(colors.yellow('✗ WSL install failed (is npm installed in WSL?)'));
-                            console.error(colors.yellow('  Try running manually: wsl npm install -g .'));
-                        }
-                    }
+                    console.error(colors.red(`✗ WSL install failed`));
+                    console.error(colors.yellow('  Try running manually in WSL: npm install -g .'));
                 }
             }
-            console.log('');
-            return true;
         }
-        console.log('Nothing to release. Use -m "message" to force a release.');
         return true;
     }
     // Ensure node_modules is in .gitignore before any git operations
@@ -2018,18 +1957,50 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
     // Publish
     console.log('Publishing to npm...');
     if (!dryRun) {
+        // Check npm authentication right before publishing
+        const authStatus = checkNpmAuth();
+        if (!authStatus.authenticated) {
+            console.error(colors.red('ERROR: npm authentication required'));
+            console.error('');
+            if (authStatus.error === 'token expired') {
+                console.error('Your npm access token has expired or been revoked.');
+                console.error('');
+                console.error('To fix this, run:');
+                console.error(colors.yellow('  npm logout'));
+                console.error(colors.yellow('  npm login'));
+            }
+            else if (authStatus.error === 'not logged in') {
+                console.error('You are not logged in to npm.');
+                console.error('');
+                console.error('To fix this, run:');
+                console.error(colors.yellow('  npm login'));
+            }
+            else {
+                console.error(`Authentication error: ${authStatus.error}`);
+                console.error('');
+                console.error('Try running:');
+                console.error(colors.yellow('  npm whoami'));
+            }
+            console.error('');
+            console.error('After logging in, try running this command again.');
+            return false;
+        }
+        if (verbose) {
+            console.log(colors.green(`✓ Authenticated as ${authStatus.username}`));
+        }
         // Create tarball first
-        const packResult = runCommand('npm', ['pack'], { cwd, silent: true, shell: true });
+        const packResult = runCommand('npm', ['pack'], { cwd, silent: true });
         if (!packResult.success) {
             console.error(colors.red('ERROR: Failed to create package tarball'));
-            if (packResult.stderr)
-                console.error(packResult.stderr);
+            console.error(colors.yellow('Output:'), packResult.output);
+            console.error(colors.yellow('Error:'), packResult.stderr);
             return false;
         }
         // Get the tarball filename from npm pack output
         const tarballName = packResult.output.trim().split('\n').pop()?.trim();
         if (!tarballName) {
             console.error(colors.red('ERROR: Could not determine tarball filename'));
+            console.error(colors.yellow('npm pack output:'), packResult.output);
             return false;
         }
         const tarballPath = path.join(cwd, tarballName);
@@ -2068,7 +2039,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
                 console.log(colors.yellow(`⏱ Waiting ${retryDelay} seconds before retry (attempt ${attempt + 1}/${maxRetries})...`));
                 await new Promise(resolve => setTimeout(resolve, retryDelay * 1000));
             }
-            publishResult = runCommand('npm', npmArgs, { cwd, silent: true, shell: true });
+            publishResult = runCommand('npm', npmArgs, { cwd, silent: true });
             if (publishResult.success) {
                 break; // Success!
             }
@@ -2213,7 +2184,7 @@ export async function globalize(cwd, options = {}, configOptions = {}) {
         console.log(`Installing globally: ${pkgName}@${pkgVersion}...`);
         if (!dryRun) {
             // Install from local directory (faster and works immediately after publish)
-            const installResult = runCommand('npm', ['install', '-g', '.'], { cwd, silent: false, shell: true });
+            const installResult = runCommand('npm', ['install', '-g', '.'], { cwd, silent: false });
             if (installResult.success) {
                 console.log(colors.green(`✓ Installed globally: ${pkgName}@${pkgVersion}`));
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/npmglobalize",
-  "version": "1.0.53",
+  "version": "1.0.62",
   "description": "Transform file: dependencies to npm versions for publishing",
   "main": "index.js",
   "type": "module",
@@ -22,14 +22,20 @@
   "author": "Bob Frankston",
   "license": "MIT",
   "devDependencies": {
-    "@types/node": "^25.0.9"
+    "@types/node": "^25.0.9",
+    "@types/npm-package-arg": "^6.1.4",
+    "@types/pacote": "^11.1.8"
   },
   "repository": {
     "type": "git",
     "url": "https://github.com/BobFrankston/npmglobalize.git"
   },
   "dependencies": {
+    "@npmcli/package-json": "^7.0.4",
     "json5": "^2.2.3",
-    "libnpmversion": "^8.0.3"
+    "libnpmversion": "^8.0.3",
+    "npm-registry-fetch": "^19.1.1",
+    "pacote": "^21.0.4",
+    "simple-git": "^3.30.0"
   }
 }