@bobfrankston/importgen 0.1.19 → 0.1.22

package/.claude/settings.local.json

@@ -4,7 +4,9 @@
       "Bash(npm run build:*)",
       "Bash(npmglobalize)",
       "Bash(npx tsc)",
-      "Bash(node index.js:*)"
+      "Bash(node index.js:*)",
+      "Bash(dir:*)",
+      "Bash(ls:*)"
     ]
   }
 }

package/index.js

@@ -69,7 +69,7 @@ function resolveEntryPoint(pkg, packageDir) {
 /**
  * Recursively collect all dependencies, avoiding circular references
  */
-function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, warnings) {
+function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, warnings, depPaths) {
     try {
         const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
         const packageDir = path.dirname(packageJsonPath);
@@ -100,6 +100,10 @@ function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, wa
                 warnings.push(warning);
                 depPath = dependencyBackupPath;
             }
+            // Track resolved dependency directory for watch mode
+            if (depPaths) {
+                depPaths.add(depPath);
+            }
             const depPackageJsonPath = path.join(depPath, 'package.json');
             if (!fs.existsSync(depPackageJsonPath)) {
                 const warning = `Could not follow path for ${depName} - no package.json found at ${depPath}`;
@@ -111,17 +115,13 @@ function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, wa
             const depPackageJson = JSON.parse(fs.readFileSync(depPackageJsonPath, 'utf-8'));
             // Resolve entry point
             const entryPoint = resolveEntryPoint(depPackageJson, depPath);
-            // Generate path relative to node_modules (peer to index.html)
-            let relativePath = `./node_modules/${depName}/${entryPoint}`;
-            // Normalize path separators and clean up
-            relativePath = relativePath.replace(/\\/g, '/');
-            // Remove any leading ./ from entryPoint that might cause double slashes
-            if (entryPoint.startsWith('./')) {
-                relativePath = `./node_modules/${depName}/${entryPoint.slice(2)}`;
-            }
+            // Generate path relative to HTML dir using actual resolved location
+            const entryFile = entryPoint.startsWith('./') ? entryPoint.slice(2) : entryPoint;
+            const absoluteEntryPath = path.join(depPath, entryFile);
+            let relativePath = './' + path.relative(htmlDir, absoluteEntryPath).replace(/\\/g, '/');
             dependencies.set(depName, relativePath);
             // Recursively process this dependency's dependencies
-            collectDependencies(depPackageJsonPath, visited, dependencies, htmlDir, warnings);
+            collectDependencies(depPackageJsonPath, visited, dependencies, htmlDir, warnings, depPaths);
         }
     }
     catch (e) {
@@ -129,13 +129,16 @@ function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, wa
     }
 }
 function generateImportMap(packageJsonPath, htmlFilePath) {
+    const result = { depDirs: [] };
     try {
         const htmlDir = path.dirname(htmlFilePath);
         const visited = new Set();
         const dependencies = new Map();
+        const depPaths = new Set();
         const warnings = [];
         // Recursively collect all dependencies
-        collectDependencies(packageJsonPath, visited, dependencies, htmlDir, warnings);
+        collectDependencies(packageJsonPath, visited, dependencies, htmlDir, warnings, depPaths);
+        result.depDirs = Array.from(depPaths);
         // Convert Map to plain object for JSON
         const imports = {};
         for (const [name, importPath] of dependencies) {
@@ -174,6 +177,7 @@ function generateImportMap(packageJsonPath, htmlFilePath) {
         console.error('[generate-importmap] Error:', e.message);
         process.exit(1);
     }
+    return result;
 }
 // Parse CLI arguments
 const args = process.argv.slice(2);
@@ -203,15 +207,45 @@ if (!htmlFilePath || !fs.existsSync(htmlFilePath)) {
     process.exit(1);
 }
 if (watchMode) {
-    generateImportMap(packageJsonPath, htmlFilePath);
-    console.log('[generate-importmap] Watching for changes...');
+    let result = generateImportMap(packageJsonPath, htmlFilePath);
+    let watchedDepDirs = new Set();
     const watcher = chokidar.watch([packageJsonPath], {
         persistent: true,
         ignoreInitial: true
     });
-    watcher.on('change', () => generateImportMap(packageJsonPath, htmlFilePath));
+    /** Update watcher to include/remove dependency directories */
+    function syncWatchedDeps(depDirs) {
+        const newDirs = new Set(depDirs);
+        // Remove dirs no longer in dependency list
+        for (const dir of watchedDepDirs) {
+            if (!newDirs.has(dir)) {
+                watcher.unwatch(dir);
+            }
+        }
+        // Add new dirs
+        for (const dir of newDirs) {
+            if (!watchedDepDirs.has(dir)) {
+                watcher.add(dir);
+            }
+        }
+        watchedDepDirs = newDirs;
+    }
+    syncWatchedDeps(result.depDirs);
+    const onChange = () => {
+        result = generateImportMap(packageJsonPath, htmlFilePath);
+        syncWatchedDeps(result.depDirs);
+    };
+    watcher.on('change', onChange);
+    watcher.on('add', onChange);
+    watcher.on('unlink', onChange);
     watcher.on('ready', () => {
-        console.log('[generate-importmap] Watcher is ready and running.');
+        const total = 1 + watchedDepDirs.size;
+        console.log(`[generate-importmap] Watching ${total} directories for changes...`);
+        if (watchedDepDirs.size > 0) {
+            for (const dir of watchedDepDirs) {
+                console.log(`  ${dir}`);
+            }
+        }
     });
     watcher.on('error', (error) => {
         console.error('[generate-importmap] Watcher error:', error.message);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/importgen",
-  "version": "0.1.19",
+  "version": "0.1.22",
   "description": "Generate ES Module import maps from package.json dependencies for native browser module loading",
   "main": "index.js",
   "bin": {