@bobfrankston/npmglobalize 1.0.25 → 1.0.26

package/README.md

@@ -19,6 +19,9 @@ cd your-package
 npmglobalize              # Transform + publish (patch version)
 npmglobalize --minor      # Bump minor version
 npmglobalize --major      # Bump major version
+
+# Or run from anywhere with a path
+npmglobalize y:\path\to\your-package
 ```
 
 ## Key Features
@@ -110,6 +113,24 @@ npmglobalize -np          # --nopublish (formerly --apply)
 npmglobalize --cleanup    # Restore original file: references
 ```
 
+### 🔧 Git Integration & Error Recovery
+
+**Automatic tag conflict resolution**:
+```bash
+npmglobalize --fix-tags   # Auto-fix version/tag mismatches
+```
+
+When a previous publish fails, git tags may conflict with package.json version. The `--fix-tags` option (or automatic detection) will clean up these conflicts.
+
+**Automatic rebase** when local is behind remote:
+```bash
+npmglobalize --rebase     # Auto-rebase if behind remote
+```
+
+For single-developer projects, this safely pulls remote changes before publishing.
+
+**Note:** This tool is designed for single-developer, single-branch workflows where automatic rebase and tag cleanup are safe operations.
+
 ## Command Reference
 
 ### Release Options
@@ -160,6 +181,8 @@ npmglobalize --cleanup    # Restore original file: references
 --verbose       Show detailed output
 --conform       Update .gitignore/.npmignore to best practices
 --asis          Skip ignore file checks
+--fix-tags      Automatically fix version/tag mismatches
+--rebase        Automatically rebase if local is behind remote
 --help, -h      Show help
 --version, -v   Show version
 ```
@@ -244,6 +267,12 @@ When publishing file: dependencies, checks if each version exists on npm:
 # Basic release
 npmglobalize
 
+# Run on a different project
+npmglobalize y:\dev\myproject
+
+# Auto-fix tag conflicts and rebase
+npmglobalize --fix-tags --rebase
+
 # Release with updates and security fixes
 npmglobalize --update-deps --fix
 

package/cli.js

@@ -52,6 +52,7 @@ Other Options:
   --conform       Update .gitignore/.npmignore to best practices
   --asis          Skip ignore file checks (or set "asis": true in .globalize.json5)
   --fix-tags      Automatically fix version/tag mismatches
+  --rebase        Automatically rebase if local is behind remote
   --help, -h      Show this help
   --version, -v   Show version number
 
@@ -60,6 +61,7 @@ Examples:
   npmglobalize y:\\path\\to\\project  Run on a different project directory
   npmglobalize --minor               Release with minor version bump
   npmglobalize --fix-tags            Fix version/tag mismatches before running
+  npmglobalize --rebase              Auto-rebase if behind remote
   npmglobalize --update-deps         Safe updates (minor/patch only)
   npmglobalize --update-major        Allow breaking changes (major updates)
   npmglobalize -npd                  Skip auto-publishing file: deps (use with caution)
@@ -181,6 +183,9 @@ function parseArgs(args) {
             case '--fix-tags':
                 options.fixTags = true;
                 break;
+            case '--rebase':
+                options.rebase = true;
+                break;
             case '--update-deps':
                 options.updateDeps = true;
                 break;

package/lib.d.ts

@@ -47,6 +47,8 @@ export interface GlobalizeOptions {
     fix?: boolean;
     /** Automatically fix version/tag mismatches */
     fixTags?: boolean;
+    /** Automatically rebase if local is behind remote */
+    rebase?: boolean;
 }
 /** Read and parse package.json from a directory */
 export declare function readPackageJson(dir: string): any;
@@ -132,6 +134,7 @@ export interface GitStatus {
     isDetachedHead: boolean;
     currentBranch: string;
     remoteBranch: string;
+    isBehindRemote: boolean;
 }
 export declare function getGitStatus(cwd: string): GitStatus;
 /** Validate package.json for release */
@@ -147,6 +150,8 @@ export declare function runNpmAudit(cwd: string, fix?: boolean, verbose?: boolea
     report: string;
     hasVulnerabilities: boolean;
 };
+/** Get the version of npmglobalize itself */
+export declare function getToolVersion(): string;
 export declare function globalize(cwd: string, options?: GlobalizeOptions): Promise<boolean>;
 declare const _default: {
     globalize: typeof globalize;

package/lib.js

@@ -7,6 +7,7 @@ import { execSync, spawnSync } from 'child_process';
 import readline from 'readline';
 import libversion from 'libnpmversion';
 import JSON5 from 'json5';
+import { fileURLToPath } from 'url';
 /** ANSI color codes */
 const colors = {
     red: (text) => `\x1b[31m${text}\x1b[0m`,
@@ -529,7 +530,8 @@ export function getGitStatus(cwd) {
         hasMergeConflict: false,
         isDetachedHead: false,
         currentBranch: '',
-        remoteBranch: ''
+        remoteBranch: '',
+        isBehindRemote: false
     };
     // Check if git repo
     const gitDir = path.join(cwd, '.git');
@@ -578,6 +580,18 @@ export function getGitStatus(cwd) {
         catch (error) {
             // Ignore - might not have tracking branch
         }
+        // Check if local is behind remote
+        try {
+            const behind = execSync(`git log HEAD..origin/${status.currentBranch} --oneline 2>nul`, {
+                cwd,
+                encoding: 'utf-8',
+                stdio: ['pipe', 'pipe', 'ignore']
+            }).trim();
+            status.isBehindRemote = behind.length > 0;
+        }
+        catch (error) {
+            // Ignore - might not have tracking branch
+        }
     }
     return status;
 }
@@ -1038,9 +1052,25 @@ export function runNpmAudit(cwd, fix = false, verbose = false) {
         hasVulnerabilities
     };
 }
+/** Get the version of npmglobalize itself */
+export function getToolVersion() {
+    try {
+        const __dirname = path.dirname(fileURLToPath(import.meta.url));
+        const pkgPath = path.join(__dirname, 'package.json');
+        const pkg = JSON.parse(fs.readFileSync(pkgPath, 'utf-8'));
+        return pkg.version || 'unknown';
+    }
+    catch (error) {
+        return 'unknown';
+    }
+}
 export async function globalize(cwd, options = {}) {
     const { bump = 'patch', noPublish = false, cleanup = false, install = false, wsl = false, force = false, files = true, dryRun = false, quiet = true, verbose = false, init = false, gitVisibility = 'private', npmVisibility = 'public', message, conform = false, asis = false, updateDeps = false, updateMajor = false, publishDeps = true, // Default to publishing deps for safety
-    forcePublish = false, fix = false, fixTags = false } = options;
+    forcePublish = false, fix = false, fixTags = false, rebase = false } = options;
+    // Show tool version
+    const toolVersion = getToolVersion();
+    console.log(colors.italic(`npmglobalize v${toolVersion}`));
+    console.log('');
     // Check ignore files first (unless cleanup mode)
     if (!cleanup && !asis) {
         const checkResult = checkIgnoreFiles(cwd, { conform, asis, verbose });
@@ -1163,6 +1193,38 @@ export async function globalize(cwd, options = {}) {
     if (currentGitStatus.isDetachedHead && force) {
         console.log(colors.yellow('Warning: Detached HEAD state - continuing with --force'));
     }
+    // Check if local branch is behind remote
+    if (currentGitStatus.isBehindRemote && !dryRun) {
+        console.log(colors.yellow('Local branch is behind remote.'));
+        if (rebase) {
+            console.log('Rebasing local changes (--rebase)...');
+            const rebaseResult = runCommand('git', ['pull', '--rebase'], { cwd, silent: false });
+            if (!rebaseResult.success) {
+                console.error(colors.red('ERROR: Rebase failed.'));
+                console.error('You may need to resolve conflicts manually.');
+                if (!force) {
+                    return false;
+                }
+                console.log(colors.yellow('Continuing with --force...'));
+            }
+            else {
+                console.log(colors.green('✓ Successfully rebased'));
+            }
+        }
+        else {
+            console.error(colors.red('ERROR: Local branch is behind remote.'));
+            console.error(colors.yellow('Your local repository needs to be updated before publishing.'));
+            console.error('');
+            console.error('To fix this:');
+            console.error(colors.yellow('  1. Run: npmglobalize --rebase (automatic)'));
+            console.error(colors.yellow('  2. Or manually: git pull --rebase'));
+            console.error('');
+            if (!force) {
+                return false;
+            }
+            console.log(colors.yellow('Continuing with --force (git push may fail)...'));
+        }
+    }
     // Read package.json
     const pkg = readPackageJson(cwd);
     // Pre-flight check: fix version/tag mismatches if requested or if we detect issues
@@ -1451,7 +1513,21 @@ export async function globalize(cwd, options = {}) {
             }
             // Check for specific error conditions
             const stderrLower = (error.stderr || '').toLowerCase();
-            if (stderrLower.includes('tag') && stderrLower.includes('already exists')) {
+            const stdoutLower = (error.stdout || '').toLowerCase();
+            const combinedOutput = stderrLower + ' ' + stdoutLower;
+            if (combinedOutput.includes('non-fast-forward') || combinedOutput.includes('rejected') && combinedOutput.includes('behind')) {
+                console.error(colors.yellow('\nYour local branch is behind the remote.'));
+                console.error(colors.yellow('This usually means changes were pushed from another location.'));
+                console.error(colors.yellow('\nTo fix this:'));
+                console.error('  1. Pull remote changes: git pull --rebase');
+                console.error('  2. Then run npmglobalize again');
+                console.error(colors.yellow('\nOr to force push (use with caution):'));
+                console.error('  git push --force-with-lease');
+                if (!force) {
+                    return false;
+                }
+            }
+            else if (stderrLower.includes('tag') && stderrLower.includes('already exists')) {
                 // Extract tag name if possible
                 const tagMatch = error.stderr?.match(/tag '([^']+)' already exists/);
                 const tagName = tagMatch ? tagMatch[1] : null;

package/package.json

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