@bobfrankston/importgen 0.1.26 → 0.1.28

package/index.js

@@ -5,9 +5,12 @@
  */
 import fs from 'node:fs';
 import path from 'node:path';
-import { execSync } from 'node:child_process';
 import chokidar from 'chokidar';
 import packageJson from './package.json' with { type: 'json' };
+/** Timestamp prefix for log messages */
+function ts() {
+    return `[${new Date().toLocaleTimeString()}]`;
+}
 /**
  * Resolve dependency path based on version specifier
  */
@@ -91,7 +94,7 @@ function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, no
             let depPath = resolveDependencyPath(packageDir, depName, versionToUse);
             if (!depPath) {
                 const warning = `Could not follow path for ${depName} (${versionToUse})`;
-                console.warn(`[generate-importmap] Warning: ${warning}`);
+                console.warn(`${ts()} [generate-importmap] Warning: ${warning}`);
                 warnings.push(warning);
                 continue;
             }
@@ -99,7 +102,7 @@ function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, no
             const dependencyBackupPath = depPath + '.dependency';
             if (fs.existsSync(dependencyBackupPath)) {
                 const warning = `Using backup path ${dependencyBackupPath}`;
-                console.warn(`[generate-importmap] Warning: ${warning}`);
+                console.warn(`${ts()} [generate-importmap] Warning: ${warning}`);
                 warnings.push(warning);
                 depPath = dependencyBackupPath;
             }
@@ -110,7 +113,7 @@ function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, no
             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}`;
-                console.warn(`[generate-importmap] Warning: ${warning}`);
+                console.warn(`${ts()} [generate-importmap] Warning: ${warning}`);
                 warnings.push(warning);
                 continue;
             }
@@ -135,7 +138,7 @@ function collectDependencies(packageJsonPath, visited, dependencies, htmlDir, no
         }
     }
     catch (e) {
-        console.error(`[generate-importmap] Error processing ${packageJsonPath}:`, e.message);
+        console.error(`${ts()} [generate-importmap] Error processing ${packageJsonPath}:`, e.message);
         throw e; // Propagate so callers can avoid overwriting HTML with empty map
     }
 }
@@ -184,158 +187,37 @@ function generateImportMap(packageJsonPath, htmlFilePath) {
         }
         // Write back to HTML file
         fs.writeFileSync(htmlFilePath, html, 'utf-8');
-        console.log('[generate-importmap] Updated import map');
+        console.log(`${ts()} [generate-importmap] Updated import map`);
         console.log(`  Scanned ${visited.size} dependencies, generated ${dependencies.size} entries`);
         if (dependencies.size > 0) {
             console.log('  Packages:', Array.from(dependencies.keys()).join(', '));
         }
     }
     catch (e) {
-        console.error('[generate-importmap] Error:', e.message);
+        console.error(`${ts()} [generate-importmap] Error:`, e.message);
         process.exit(1);
     }
     return result;
 }
-/**
- * Freeze dependencies: replace junctions/symlinks in node_modules with real copies.
- * Also adds a preinstall guard to package.json to prevent npm install from undoing the freeze.
- */
-function freezeDependencies(packageJsonPath) {
-    const nodeModulesDir = path.join(process.cwd(), 'node_modules');
-    if (!fs.existsSync(nodeModulesDir)) {
-        console.error('[importgen] Error: node_modules not found');
-        process.exit(1);
-    }
-    /** Check if a directory entry is a junction or symlink by comparing realpath to its path */
-    function isLinked(entryPath) {
-        try {
-            const stat = fs.lstatSync(entryPath);
-            // Symlink check (works on Linux/Mac symlinks)
-            if (stat.isSymbolicLink())
-                return true;
-            // Junction check (Windows): realpath differs from the entry path
-            if (stat.isDirectory()) {
-                const real = fs.realpathSync(entryPath);
-                return path.resolve(real) !== path.resolve(entryPath);
-            }
-        }
-        catch (e) {
-            console.error(`[importgen] Error checking ${entryPath}: ${e.message}`);
-        }
-        return false;
-    }
-    /** Freeze a single entry if it's a junction/symlink */
-    function freezeEntry(entryPath, displayName) {
-        if (!isLinked(entryPath))
-            return;
-        const target = fs.realpathSync(entryPath);
-        console.log(`  Freezing ${displayName} (${target})`);
-        fs.rmSync(entryPath, { recursive: true });
-        fs.cpSync(target, entryPath, { recursive: true });
-    }
-    console.log('[importgen] Freezing dependencies...');
-    let frozenCount = 0;
-    const entries = fs.readdirSync(nodeModulesDir);
-    for (const entry of entries) {
-        const entryPath = path.join(nodeModulesDir, entry);
-        if (entry.startsWith('@')) {
-            // Scoped package — walk one level deeper
-            if (!fs.statSync(entryPath).isDirectory())
-                continue;
-            const scopedEntries = fs.readdirSync(entryPath);
-            for (const scoped of scopedEntries) {
-                const scopedPath = path.join(entryPath, scoped);
-                const before = isLinked(scopedPath);
-                freezeEntry(scopedPath, `${entry}/${scoped}`);
-                if (before)
-                    frozenCount++;
-            }
-        }
-        else {
-            const before = isLinked(entryPath);
-            freezeEntry(entryPath, entry);
-            if (before)
-                frozenCount++;
-        }
-    }
-    console.log(`[importgen] Frozen ${frozenCount} linked packages`);
-    // Add preinstall guard to package.json
-    try {
-        const pkgRaw = fs.readFileSync(packageJsonPath, 'utf-8');
-        const pkg = JSON.parse(pkgRaw);
-        if (!pkg.scripts)
-            pkg.scripts = {};
-        if (pkg.scripts.preinstall) {
-            // Rename existing preinstall so unfreeze can restore it
-            pkg.scripts['frozen-preinstall'] = pkg.scripts.preinstall;
-            console.log(`[importgen] Saved existing preinstall script as "frozen-preinstall"`);
-        }
-        pkg.scripts.preinstall = 'echo FROZEN: dependencies were frozen by importgen. Use importgen --unfreeze to restore. && exit 1';
-        fs.writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n', 'utf-8');
-        console.log('[importgen] Added preinstall guard to package.json');
-    }
-    catch (e) {
-        console.error(`[importgen] Error updating package.json: ${e.message}`);
-    }
-}
-/**
- * Unfreeze: remove preinstall guard, restore original preinstall if saved, then run npm install.
- */
-function unfreezeDependencies(packageJsonPath) {
-    try {
-        const pkgRaw = fs.readFileSync(packageJsonPath, 'utf-8');
-        const pkg = JSON.parse(pkgRaw);
-        if (!pkg.scripts?.preinstall) {
-            console.log('[importgen] No preinstall guard found — nothing to unfreeze');
-            return;
-        }
-        if (pkg.scripts['frozen-preinstall']) {
-            pkg.scripts.preinstall = pkg.scripts['frozen-preinstall'];
-            delete pkg.scripts['frozen-preinstall'];
-            console.log('[importgen] Restored original preinstall script');
-        }
-        else {
-            delete pkg.scripts.preinstall;
-            console.log('[importgen] Removed preinstall guard');
-        }
-        fs.writeFileSync(packageJsonPath, JSON.stringify(pkg, null, 2) + '\n', 'utf-8');
-    }
-    catch (e) {
-        console.error(`[importgen] Error updating package.json: ${e.message}`);
-        process.exit(1);
-    }
-    // Run npm install to restore proper dependencies
-    console.log('[importgen] Running npm install...');
-    try {
-        execSync('npm install', { stdio: 'inherit', cwd: process.cwd() });
-        console.log('[importgen] Unfreeze complete');
-    }
-    catch (e) {
-        console.error(`[importgen] npm install failed: ${e.message}`);
-        process.exit(1);
-    }
-}
 // Parse CLI arguments
 const args = process.argv.slice(2);
 if (args.includes('-v') || args.includes('--version')) {
     console.log(`importgen ${packageJson.version}`);
     process.exit(0);
 }
-const knownFlags = new Set(['-w', '--watch', '--freeze', '-freeze', '--unfreeze', '-unfreeze', '-v', '--version']);
+const knownFlags = new Set(['-w', '--watch', '-v', '--version']);
 // Report unrecognized flags as errors
 const unknownArgs = args.filter(a => a.startsWith('-') && !knownFlags.has(a));
 if (unknownArgs.length > 0) {
-    console.error(`[importgen] Error: unrecognized argument(s): ${unknownArgs.join(', ')}`);
-    console.error(`  Usage: importgen [htmlfile] [-w|--watch] [--freeze] [--unfreeze] [-v|--version]`);
+    console.error(`${ts()} [importgen] Error: unrecognized argument(s): ${unknownArgs.join(', ')}`);
+    console.error(`  Usage: importgen [htmlfile] [-w|--watch] [-v|--version]`);
     process.exit(1);
 }
 const watchMode = args.includes('-w') || args.includes('--watch');
-const freezeMode = args.includes('--freeze') || args.includes('-freeze');
-const unfreezeMode = args.includes('--unfreeze') || args.includes('-unfreeze');
 const positionalArgs = args.filter(a => !a.startsWith('-'));
 if (positionalArgs.length > 1) {
-    console.error(`[importgen] Error: too many arguments: ${positionalArgs.join(', ')}`);
-    console.error(`  Usage: importgen [htmlfile] [-w|--watch] [--freeze] [--unfreeze] [-v|--version]`);
+    console.error(`${ts()} [importgen] Error: too many arguments: ${positionalArgs.join(', ')}`);
+    console.error(`  Usage: importgen [htmlfile] [-w|--watch] [-v|--version]`);
     process.exit(1);
 }
 const htmlArg = positionalArgs[0];
@@ -346,23 +228,15 @@ const htmlFileName = htmlArg || possibleHtmlFiles.find(f => fs.existsSync(path.j
 const htmlFilePath = htmlFileName ? path.join(process.cwd(), htmlFileName) : null;
 // Check if files exist
 if (!fs.existsSync(packageJsonPath)) {
-    console.error('[generate-importmap] Error: package.json not found in current directory');
+    console.error(`${ts()} [generate-importmap] Error: package.json not found in current directory`);
     process.exit(1);
 }
-if (freezeMode) {
-    freezeDependencies(packageJsonPath);
-    process.exit(0);
-}
-if (unfreezeMode) {
-    unfreezeDependencies(packageJsonPath);
-    process.exit(0);
-}
 if (!htmlFilePath || !fs.existsSync(htmlFilePath)) {
     if (htmlArg) {
-        console.error(`[generate-importmap] Error: ${htmlArg} not found in current directory`);
+        console.error(`${ts()} [generate-importmap] Error: ${htmlArg} not found in current directory`);
     }
     else {
-        console.error(`[generate-importmap] Error: No HTML file found. Looking for: ${possibleHtmlFiles.join(', ')}`);
+        console.error(`${ts()} [generate-importmap] Error: No HTML file found. Looking for: ${possibleHtmlFiles.join(', ')}`);
     }
     process.exit(1);
 }
@@ -405,7 +279,7 @@ if (watchMode) {
     watcher.on('unlink', onChange);
     watcher.on('ready', () => {
         const total = 1 + watchedDepDirs.size;
-        console.log(`[generate-importmap] Watching ${total} directories for changes...`);
+        console.log(`${ts()} [generate-importmap] Watching ${total} directories for changes...`);
         if (watchedDepDirs.size > 0) {
             for (const dir of watchedDepDirs) {
                 console.log(`  ${dir}`);
@@ -413,7 +287,7 @@ if (watchMode) {
         }
     });
     watcher.on('error', (error) => {
-        console.error('[generate-importmap] Watcher error:', error.message);
+        console.error(`${ts()} [generate-importmap] Watcher error:`, error.message);
     });
 }
 else {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bobfrankston/importgen",
-  "version": "0.1.26",
+  "version": "0.1.28",
   "description": "Generate ES Module import maps from package.json dependencies for native browser module loading",
   "main": "index.js",
   "bin": {
@@ -34,7 +34,7 @@
     "chokidar": "^4.0.3"
   },
   "devDependencies": {
-    "@types/node": "^25.2.1"
+    "@types/node": "^25.3.0"
   },
   "publishConfig": {
     "access": "public"