@bobfrankston/npmglobalize 1.0.100 → 1.0.102

package/lib.js

@@ -1301,6 +1301,37 @@ const RECOMMENDED_GITIGNORE = [
     '*.ldf',
     '*.ndf'
 ];
+/** Extensions only recommended for .gitignore when matching files exist in the project */
+const PRESENCE_ONLY_EXTENSIONS = new Set(['.mdf', '.ldf', '.ndf']);
+/** Check if any files with the given extension exist in dir (skips node_modules, .git, prev) */
+function hasFilesWithExtension(dir, ext) {
+    const skip = new Set(['node_modules', '.git', 'prev']);
+    function check(d) {
+        try {
+            for (const entry of fs.readdirSync(d, { withFileTypes: true })) {
+                if (skip.has(entry.name))
+                    continue;
+                if (entry.isFile() && entry.name.endsWith(ext))
+                    return true;
+                if (entry.isDirectory() && check(path.join(d, entry.name)))
+                    return true;
+            }
+        }
+        catch { }
+        return false;
+    }
+    return check(dir);
+}
+/** Filter RECOMMENDED_GITIGNORE to skip presence-only patterns when no matching files exist */
+function getApplicableGitignorePatterns(cwd) {
+    return RECOMMENDED_GITIGNORE.filter(pattern => {
+        const extMatch = pattern.match(/^\*(\.\w+)$/);
+        if (extMatch && PRESENCE_ONLY_EXTENSIONS.has(extMatch[1])) {
+            return hasFilesWithExtension(cwd, extMatch[1]);
+        }
+        return true;
+    });
+}
 /** Recommended .npmignore patterns */
 const RECOMMENDED_NPMIGNORE = [
     '.git/',
@@ -1341,7 +1372,7 @@ function checkIgnoreFiles(cwd, options) {
     if (fs.existsSync(gitignorePath)) {
         const content = fs.readFileSync(gitignorePath, 'utf-8');
         const lines = content.split('\n').map(l => l.trim());
-        for (const pattern of RECOMMENDED_GITIGNORE) {
+        for (const pattern of getApplicableGitignorePatterns(cwd)) {
             if (!lines.some(line => line === pattern || line === pattern.replace('/', ''))) {
                 changes.push(`  .gitignore missing: ${pattern}`);
             }
@@ -1395,7 +1426,7 @@ function conformIgnoreFiles(cwd) {
         const content = fs.readFileSync(gitignorePath, 'utf-8');
         const lines = new Set(content.split('\n').map(l => l.trim()).filter(l => l && !l.startsWith('#')));
         let updated = false;
-        for (const pattern of RECOMMENDED_GITIGNORE) {
+        for (const pattern of getApplicableGitignorePatterns(cwd)) {
             const normalized = pattern.replace('/', '');
             if (!lines.has(pattern) && !lines.has(normalized)) {
                 lines.add(pattern);
@@ -1468,9 +1499,9 @@ function ensureGitignore(cwd) {
     // Update .gitignore if needed
     if (needsUpdate) {
         if (!content || content.trim() === '') {
-            // Create new .gitignore from RECOMMENDED_GITIGNORE plus extras
+            // Create new .gitignore from applicable patterns plus extras
             const extras = ['*certs*/', 'configuration.json', 'cruft/', 'prev/', 'tests/'];
-            content = [...RECOMMENDED_GITIGNORE, ...extras].join('\n') + '\n';
+            content = [...getApplicableGitignorePatterns(cwd), ...extras].join('\n') + '\n';
         }
         else {
             // Add node_modules to existing .gitignore
@@ -1567,15 +1598,72 @@ export async function initGit(cwd, visibility, dryRun) {
     runCommandOrThrow('git', ['config', 'core.autocrlf', 'false'], { cwd });
     runCommandOrThrow('git', ['config', 'core.eol', 'lf'], { cwd });
     console.log('  ✓ Configured git for LF line endings');
-    runCommandOrThrow('git', ['add', '-A'], { cwd });
+    let initAddResult = runCommand('git', ['add', '-A'], { cwd, silent: true });
+    if (!initAddResult.success) {
+        const errText = initAddResult.stderr + initAddResult.output;
+        const deniedFiles = parseDeniedFiles(errText);
+        if (deniedFiles.length > 0) {
+            console.error(colors.red(`  git add failed — ${deniedFiles.length} file(s) locked/permission denied:`));
+            for (const f of deniedFiles) {
+                console.error(colors.red(`    ${f}`));
+            }
+            const ok = await confirm('Add these files to .gitignore and retry?', true);
+            if (ok) {
+                const gitignorePath = path.join(cwd, '.gitignore');
+                let gitignoreContent = fs.existsSync(gitignorePath) ? fs.readFileSync(gitignorePath, 'utf-8') : '';
+                if (gitignoreContent && !gitignoreContent.endsWith('\n'))
+                    gitignoreContent += '\n';
+                for (const f of deniedFiles) {
+                    gitignoreContent += f + '\n';
+                }
+                fs.writeFileSync(gitignorePath, gitignoreContent);
+                console.log(colors.green('  ✓ Updated .gitignore'));
+                initAddResult = runCommand('git', ['add', '-A'], { cwd, silent: true });
+            }
+            if (!initAddResult.success) {
+                console.error(colors.red('  git add still failing. Fix manually and retry.'));
+                return false;
+            }
+        }
+        else {
+            console.error(colors.red(`  git add failed: ${errText}`));
+            return false;
+        }
+    }
     // Only commit if there are staged changes (repo may already have commits)
     const staged = spawnSafe('git', ['diff', '--cached', '--quiet'], { cwd });
     if (staged.status !== 0) {
         runCommandOrThrow('git', ['commit', '-m', 'Initial commit'], { cwd });
     }
-    // Create GitHub repo
+    // Create GitHub repo (or link to existing one)
     const visFlag = visibility === 'private' ? '--private' : '--public';
-    runCommandOrThrow('gh', ['repo', 'create', repoName, visFlag, '--source=.', '--push'], { cwd });
+    const createResult = runCommand('gh', ['repo', 'create', repoName, visFlag, '--source=.', '--push'], { cwd, silent: true });
+    if (!createResult.success) {
+        const errText = createResult.stderr + createResult.output;
+        if (errText.includes('Name already exists')) {
+            // Repo exists on GitHub — look up the owner and add as remote
+            console.log(colors.yellow(`  GitHub repo '${repoName}' already exists — linking as remote...`));
+            const whoResult = runCommand('gh', ['api', 'user', '--jq', '.login'], { cwd, silent: true });
+            const ghUser = (whoResult.output || '').trim();
+            if (!ghUser) {
+                console.error(colors.red('  Could not determine GitHub username. Run: gh auth status'));
+                return false;
+            }
+            const remoteUrl = `https://github.com/${ghUser}/${repoName}.git`;
+            const addRemote = runCommand('git', ['remote', 'add', 'origin', remoteUrl], { cwd, silent: true });
+            if (!addRemote.success) {
+                // Remote might already exist with wrong URL
+                runCommand('git', ['remote', 'set-url', 'origin', remoteUrl], { cwd, silent: true });
+            }
+            // Push existing commits
+            runCommand('git', ['push', '-u', 'origin', 'master'], { cwd, silent: true });
+            console.log(colors.green(`  ✓ Linked to existing repo: ${remoteUrl}`));
+        }
+        else {
+            console.error(colors.red(`Failed to create GitHub repo: ${errText}`));
+            return false;
+        }
+    }
     // Update package.json with repository field
     try {
         const remoteUrl = execSync('git remote get-url origin', { cwd, encoding: 'utf-8' }).trim();

package/package.json

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