@bobfrankston/importgen 0.1.20 → 0.1.23

package/index.js

@@ -67,9 +67,11 @@ function resolveEntryPoint(pkg, packageDir) {
     return './index.js';
 }
 /**
- * Recursively collect all dependencies, avoiding circular references
+ * Recursively collect all dependencies, avoiding circular references.
+ * nodeModulesPrefix tracks the import map path prefix for nested deps
+ * (e.g., './node_modules' for root, './node_modules/@scope/pkg/node_modules' for nested).
  */
-function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, warnings, depPaths) {
+function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, nodeModulesPrefix, warnings, depPaths) {
     try {
         const packageJson = JSON.parse(fs.readFileSync(packageJsonPath, 'utf-8'));
         const packageDir = path.dirname(packageJsonPath);
@@ -84,7 +86,7 @@ function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, wa
             // Check if .dependencies has an override path for this package
             const overrideVersion = dotDeps[depName];
             const versionToUse = overrideVersion || depVersion;
-            // Resolve dependency path
+            // Resolve dependency path (real filesystem location)
             let depPath = resolveDependencyPath(packageDir, depName, versionToUse);
             if (!depPath) {
                 const warning = `Could not follow path for ${depName} (${versionToUse})`;
@@ -115,17 +117,20 @@ 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)}`;
+            const entryFile = entryPoint.startsWith('./') ? entryPoint.slice(2) : entryPoint;
+            // Generate import map path through node_modules (follows symlinks)
+            // Check if hoisted to top-level node_modules first
+            const topLevelDir = path.join(htmlDir, 'node_modules', depName);
+            let depPrefix;
+            if (fs.existsSync(topLevelDir)) {
+                depPrefix = `./node_modules/${depName}`;
             }
-            dependencies.set(depName, relativePath);
+            else {
+                depPrefix = `${nodeModulesPrefix}/${depName}`;
+            }
+            dependencies.set(depName, `${depPrefix}/${entryFile}`);
             // Recursively process this dependency's dependencies
-            collectDependencies(depPackageJsonPath, visited, dependencies, htmlDir, warnings, depPaths);
+            collectDependencies(depPackageJsonPath, visited, dependencies, htmlDir, `${depPrefix}/node_modules`, warnings, depPaths);
         }
     }
     catch (e) {
@@ -141,7 +146,7 @@ function generateImportMap(packageJsonPath, htmlFilePath) {
         const depPaths = new Set();
         const warnings = [];
         // Recursively collect all dependencies
-        collectDependencies(packageJsonPath, visited, dependencies, htmlDir, warnings, depPaths);
+        collectDependencies(packageJsonPath, visited, dependencies, htmlDir, './node_modules', warnings, depPaths);
         result.depDirs = Array.from(depPaths);
         // Convert Map to plain object for JSON
         const imports = {};

package/package.json

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