@warlock.js/core 4.0.135 → 4.0.137

package/esm/dev-server/import-deduplicator.js

@@ -0,0 +1,288 @@
+/**
+ * Import Deduplicator
+ *
+ * A pure function module for deduplicating and transforming ES6 imports.
+ * This module is framework-agnostic and can be tested in isolation.
+ *
+ * The transformer:
+ * 1. Groups imports by resolved module path
+ * 2. Consolidates bindings for duplicate imports
+ * 3. Creates alias assignments for duplicate bindings
+ * 4. Generates optimized __import() calls
+ */
+// ============================================================================
+// Regex Patterns
+// ============================================================================
+/**
+ * Pattern to match ES6 import statements
+ * Handles:
+ *   - import { a, b } from "module" (named imports, can span multiple lines)
+ *   - import * as Foo from "module" (namespace imports)
+ *   - import Foo from "module" (default imports)
+ *   - import Foo, { a, b } from "module" (mixed imports)
+ */
+const IMPORT_REGEX = /import\s+(\{[\s\S]*?\}|\*\s+as\s+\w+|\w+(?:\s*,\s*\{[\s\S]*?\})?)\s+from\s+["']([^"']+)["'];?/gm;
+/**
+ * Pattern to match side-effect imports: import "module";
+ */
+const SIDE_EFFECT_IMPORT_REGEX = /import\s+["']([^"']+)["'];?/g;
+// ============================================================================
+// Pure Functions
+// ============================================================================
+/**
+ * Check if an import path is a relative or absolute path
+ */
+function isLocalImport(importPath) {
+    return importPath.startsWith(".") || importPath.startsWith("/");
+}
+/**
+ * Parse import specifier into bindings
+ *
+ * @param specifier The import specifier string (e.g., "{ a, b as c }", "* as Foo", "Default")
+ * @returns Parsed binding information
+ */
+function parseImportSpecifier(specifier) {
+    const trimmed = specifier.trim();
+    const result = { bindings: [] };
+    if (trimmed.startsWith("* as ")) {
+        // Namespace import: import * as Foo
+        result.namespaceImport = trimmed.replace("* as ", "").trim();
+    }
+    else if (trimmed.startsWith("{")) {
+        // Named imports: import { a, b as c }
+        const content = trimmed.match(/\{([\s\S]*?)\}/)?.[1] || "";
+        result.bindings = parseNamedImports(content);
+    }
+    else if (trimmed.match(/^(\w+)\s*,\s*\{/)) {
+        // Mixed import: import Foo, { a, b }
+        const mixedMatch = trimmed.match(/^(\w+)\s*,\s*\{([\s\S]*?)\}/);
+        if (mixedMatch) {
+            result.defaultImport = mixedMatch[1];
+            result.bindings = parseNamedImports(mixedMatch[2]);
+        }
+    }
+    else {
+        // Default import: import Foo
+        result.defaultImport = trimmed;
+    }
+    return result;
+}
+/**
+ * Parse named imports content (the part inside braces)
+ */
+function parseNamedImports(content) {
+    const bindings = [];
+    const parts = content
+        .split(",")
+        .map((s) => s.trim())
+        .filter(Boolean);
+    for (const part of parts) {
+        const asMatch = part.match(/^(\w+)\s+as\s+(\w+)$/);
+        if (asMatch) {
+            bindings.push({ originalName: asMatch[1], localName: asMatch[2] });
+        }
+        else {
+            bindings.push({ originalName: part, localName: part });
+        }
+    }
+    return bindings;
+}
+/**
+ * Merge bindings from a new import into an existing group
+ * Returns aliases that need to be created for duplicate bindings
+ */
+function mergeBindings(group, newBindings) {
+    const aliases = [];
+    for (const binding of newBindings) {
+        const existing = group.bindings.find((b) => b.originalName === binding.originalName);
+        if (existing) {
+            // Same original name - check if local names differ
+            if (existing.localName !== binding.localName) {
+                // Need to create an alias: const newLocal = existingLocal;
+                aliases.push(`const ${binding.localName} = ${existing.localName};`);
+            }
+            // If local names are the same, no action needed (deduplicated)
+        }
+        else {
+            // New binding
+            group.bindings.push(binding);
+        }
+    }
+    return aliases;
+}
+/**
+ * Build an __import statement for a group of imports
+ */
+function buildGroupImportStatement(group) {
+    const { cachePath, bindings, namespaceImport, defaultImport } = group;
+    if (namespaceImport) {
+        return `const ${namespaceImport} = await __import("./${cachePath}")`;
+    }
+    if (defaultImport && bindings.length > 0) {
+        const moduleVar = generateModuleVar();
+        const namedDestructure = formatBindings(bindings);
+        return `const ${moduleVar} = await __import("./${cachePath}");
+const ${defaultImport} = ${moduleVar}?.default ?? ${moduleVar};
+const { ${namedDestructure} } = ${moduleVar};`;
+    }
+    if (defaultImport) {
+        const moduleVar = generateModuleVar();
+        return `const ${moduleVar} = await __import("./${cachePath}");
+const ${defaultImport} = ${moduleVar}?.default ?? ${moduleVar};`;
+    }
+    if (bindings.length > 0) {
+        const namedDestructure = formatBindings(bindings);
+        return `const { ${namedDestructure} } = await __import("./${cachePath}")`;
+    }
+    return `await __import("./${cachePath}")`;
+}
+/**
+ * Format bindings for destructuring
+ */
+function formatBindings(bindings) {
+    return bindings
+        .map((b) => b.originalName === b.localName ? b.localName : `${b.originalName}: ${b.localName}`)
+        .join(", ");
+}
+/**
+ * Generate a unique module variable name
+ */
+function generateModuleVar() {
+    return `__module_${Math.random().toString(36).slice(2, 8)}`;
+}
+// ============================================================================
+// Main Transform Function
+// ============================================================================
+/**
+ * Transform and deduplicate imports in code
+ *
+ * This is the main pure function that can be tested independently.
+ *
+ * @param code The transpiled JavaScript code containing ES6 imports
+ * @param resolveCachePath Function to resolve an import path to a cache path
+ * @param options Additional transform options
+ * @returns Transform result with deduplicated code
+ */
+function deduplicateImports(code, resolveCachePath, options = {}) {
+    const { isAlias = () => false } = options;
+    let transformedCode = code;
+    const unresolvedImports = [];
+    const importGroups = new Map();
+    const allAliasAssignments = [];
+    // -------------------------------------------------------------------------
+    // Phase 1: Collect and group all imports by cache path
+    // -------------------------------------------------------------------------
+    const importMatches = Array.from(code.matchAll(IMPORT_REGEX));
+    for (const match of importMatches) {
+        const fullImport = match[0];
+        const importSpecifier = match[1];
+        const importPath = match[2];
+        // Only transform local imports and alias imports
+        if (!isLocalImport(importPath) && !isAlias(importPath)) {
+            continue;
+        }
+        const cachePath = resolveCachePath(importPath);
+        if (!cachePath) {
+            unresolvedImports.push(importPath);
+            continue;
+        }
+        // Get or create the import group for this cache path
+        if (!importGroups.has(cachePath)) {
+            importGroups.set(cachePath, {
+                cachePath,
+                bindings: [],
+                matches: [],
+            });
+        }
+        const group = importGroups.get(cachePath);
+        group.matches.push({ fullImport, index: match.index });
+        // Parse and merge bindings
+        const parsed = parseImportSpecifier(importSpecifier);
+        if (parsed.namespaceImport && !group.namespaceImport) {
+            group.namespaceImport = parsed.namespaceImport;
+        }
+        if (parsed.defaultImport && !group.defaultImport) {
+            group.defaultImport = parsed.defaultImport;
+        }
+        // Merge bindings and collect aliases
+        const aliases = mergeBindings(group, parsed.bindings);
+        allAliasAssignments.push(...aliases);
+    }
+    // -------------------------------------------------------------------------
+    // Phase 2: Generate deduplicated imports
+    // -------------------------------------------------------------------------
+    const replacements = [];
+    for (const [, group] of importGroups) {
+        const sortedMatches = [...group.matches].sort((a, b) => a.index - b.index);
+        const primaryMatch = sortedMatches[0];
+        // Build consolidated import statement
+        const importStatement = buildGroupImportStatement(group);
+        // Add the primary replacement
+        replacements.push({
+            index: primaryMatch.index,
+            length: primaryMatch.fullImport.length,
+            replacement: importStatement,
+        });
+        // Remove all duplicate imports
+        for (let i = 1; i < sortedMatches.length; i++) {
+            const duplicateMatch = sortedMatches[i];
+            replacements.push({
+                index: duplicateMatch.index,
+                length: duplicateMatch.fullImport.length,
+                replacement: "",
+            });
+        }
+    }
+    // Sort replacements by index descending (to avoid index shifts)
+    replacements.sort((a, b) => b.index - a.index);
+    // Apply replacements
+    for (const r of replacements) {
+        transformedCode =
+            transformedCode.slice(0, r.index) + r.replacement + transformedCode.slice(r.index + r.length);
+    }
+    // -------------------------------------------------------------------------
+    // Phase 3: Insert alias assignments
+    // -------------------------------------------------------------------------
+    if (allAliasAssignments.length > 0) {
+        // Find the last __import call and insert aliases after it
+        const lastImportMatch = transformedCode.match(/.*await __import\([^)]+\)[^\n]*/g);
+        if (lastImportMatch) {
+            const lastImport = lastImportMatch[lastImportMatch.length - 1];
+            const lastImportIndex = transformedCode.lastIndexOf(lastImport);
+            const insertPosition = lastImportIndex + lastImport.length;
+            transformedCode =
+                transformedCode.slice(0, insertPosition) +
+                    "\n" +
+                    allAliasAssignments.join("\n") +
+                    transformedCode.slice(insertPosition);
+        }
+    }
+    // -------------------------------------------------------------------------
+    // Phase 4: Transform side-effect imports
+    // -------------------------------------------------------------------------
+    const sideEffectMatches = Array.from(transformedCode.matchAll(SIDE_EFFECT_IMPORT_REGEX));
+    for (let i = sideEffectMatches.length - 1; i >= 0; i--) {
+        const match = sideEffectMatches[i];
+        const fullImport = match[0];
+        const importPath = match[1];
+        if (!isLocalImport(importPath) && !isAlias(importPath)) {
+            continue;
+        }
+        const cachePath = resolveCachePath(importPath);
+        if (!cachePath) {
+            unresolvedImports.push(importPath);
+            continue;
+        }
+        const newImport = `await __import("./${cachePath}")`;
+        const startIndex = match.index;
+        const endIndex = startIndex + fullImport.length;
+        transformedCode =
+            transformedCode.slice(0, startIndex) + newImport + transformedCode.slice(endIndex);
+    }
+    return {
+        code: transformedCode,
+        unresolvedImports,
+        groups: importGroups,
+        aliasAssignments: allAliasAssignments,
+    };
+}export{buildGroupImportStatement,deduplicateImports,isLocalImport,mergeBindings,parseImportSpecifier};//# sourceMappingURL=import-deduplicator.js.map

package/esm/dev-server/import-deduplicator.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-deduplicator.js","sources":["../../src/dev-server/import-deduplicator.ts"],"sourcesContent":[null],"names":[],"mappings":"AAAA;;;;;;;;;;;AAWG;AAmCH;AACA;AACA;AAEA;;;;;;;AAOG;AACH,MAAM,YAAY,GAChB,iGAAiG,CAAC;AAEpG;;AAEG;AACH,MAAM,wBAAwB,GAAG,8BAA8B,CAAC;AAEhE;AACA;AACA;AAEA;;AAEG;AACG,SAAU,aAAa,CAAC,UAAkB,EAAA;AAC9C,IAAA,OAAO,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,IAAI,UAAU,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC;AAClE,CAAC;AAED;;;;;AAKG;AACG,SAAU,oBAAoB,CAAC,SAAiB,EAAA;AAKpD,IAAA,MAAM,OAAO,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC;AACjC,IAAA,MAAM,MAAM,GAIR,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC;AAErB,IAAA,IAAI,OAAO,CAAC,UAAU,CAAC,OAAO,CAAC,EAAE;;AAE/B,QAAA,MAAM,CAAC,eAAe,GAAG,OAAO,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC;AAC9D,KAAA;AAAM,SAAA,IAAI,OAAO,CAAC,UAAU,CAAC,GAAG,CAAC,EAAE;;AAElC,QAAA,MAAM,OAAO,GAAG,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,CAAC;AAC3D,QAAA,MAAM,CAAC,QAAQ,GAAG,iBAAiB,CAAC,OAAO,CAAC,CAAC;AAC9C,KAAA;AAAM,SAAA,IAAI,OAAO,CAAC,KAAK,CAAC,iBAAiB,CAAC,EAAE;;QAE3C,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,6BAA6B,CAAC,CAAC;AAChE,QAAA,IAAI,UAAU,EAAE;AACd,YAAA,MAAM,CAAC,aAAa,GAAG,UAAU,CAAC,CAAC,CAAC,CAAC;YACrC,MAAM,CAAC,QAAQ,GAAG,iBAAiB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,CAAC;AACpD,SAAA;AACF,KAAA;AAAM,SAAA;;AAEL,QAAA,MAAM,CAAC,aAAa,GAAG,OAAO,CAAC;AAChC,KAAA;AAED,IAAA,OAAO,MAAM,CAAC;AAChB,CAAC;AAED;;AAEG;AACH,SAAS,iBAAiB,CAAC,OAAe,EAAA;IACxC,MAAM,QAAQ,GAAoB,EAAE,CAAC;IACrC,MAAM,KAAK,GAAG,OAAO;SAClB,KAAK,CAAC,GAAG,CAAC;SACV,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,IAAI,EAAE,CAAC;SACpB,MAAM,CAAC,OAAO,CAAC,CAAC;AAEnB,IAAA,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE;QACxB,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,sBAAsB,CAAC,CAAC;AACnD,QAAA,IAAI,OAAO,EAAE;AACX,YAAA,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,SAAS,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;AACpE,SAAA;AAAM,aAAA;AACL,YAAA,QAAQ,CAAC,IAAI,CAAC,EAAE,YAAY,EAAE,IAAI,EAAE,SAAS,EAAE,IAAI,EAAE,CAAC,CAAC;AACxD,SAAA;AACF,KAAA;AAED,IAAA,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED;;;AAGG;AACa,SAAA,aAAa,CAAC,KAAkB,EAAE,WAA4B,EAAA;IAC5E,MAAM,OAAO,GAAa,EAAE,CAAC;AAE7B,IAAA,KAAK,MAAM,OAAO,IAAI,WAAW,EAAE;QACjC,MAAM,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,YAAY,KAAK,OAAO,CAAC,YAAY,CAAC,CAAC;AACrF,QAAA,IAAI,QAAQ,EAAE;;AAEZ,YAAA,IAAI,QAAQ,CAAC,SAAS,KAAK,OAAO,CAAC,SAAS,EAAE;;AAE5C,gBAAA,OAAO,CAAC,IAAI,CAAC,CAAA,MAAA,EAAS,OAAO,CAAC,SAAS,CAAA,GAAA,EAAM,QAAQ,CAAC,SAAS,CAAA,CAAA,CAAG,CAAC,CAAC;AACrE,aAAA;;AAEF,SAAA;AAAM,aAAA;;AAEL,YAAA,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;AAC9B,SAAA;AACF,KAAA;AAED,IAAA,OAAO,OAAO,CAAC;AACjB,CAAC;AAED;;AAEG;AACG,SAAU,yBAAyB,CAAC,KAAkB,EAAA;IAC1D,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,eAAe,EAAE,aAAa,EAAE,GAAG,KAAK,CAAC;AAEtE,IAAA,IAAI,eAAe,EAAE;AACnB,QAAA,OAAO,CAAS,MAAA,EAAA,eAAe,CAAwB,qBAAA,EAAA,SAAS,IAAI,CAAC;AACtE,KAAA;AAED,IAAA,IAAI,aAAa,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;AACxC,QAAA,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAC;AACtC,QAAA,MAAM,gBAAgB,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClD,OAAO,CAAA,MAAA,EAAS,SAAS,CAAA,qBAAA,EAAwB,SAAS,CAAA;QACtD,aAAa,CAAA,GAAA,EAAM,SAAS,CAAA,aAAA,EAAgB,SAAS,CAAA;UACnD,gBAAgB,CAAA,KAAA,EAAQ,SAAS,CAAA,CAAA,CAAG,CAAC;AAC5C,KAAA;AAED,IAAA,IAAI,aAAa,EAAE;AACjB,QAAA,MAAM,SAAS,GAAG,iBAAiB,EAAE,CAAC;QACtC,OAAO,CAAA,MAAA,EAAS,SAAS,CAAA,qBAAA,EAAwB,SAAS,CAAA;AACtD,MAAA,EAAA,aAAa,CAAM,GAAA,EAAA,SAAS,CAAgB,aAAA,EAAA,SAAS,GAAG,CAAC;AAC9D,KAAA;AAED,IAAA,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE;AACvB,QAAA,MAAM,gBAAgB,GAAG,cAAc,CAAC,QAAQ,CAAC,CAAC;AAClD,QAAA,OAAO,CAAW,QAAA,EAAA,gBAAgB,CAA0B,uBAAA,EAAA,SAAS,IAAI,CAAC;AAC3E,KAAA;IAED,OAAO,CAAA,kBAAA,EAAqB,SAAS,CAAA,EAAA,CAAI,CAAC;AAC5C,CAAC;AAED;;AAEG;AACH,SAAS,cAAc,CAAC,QAAyB,EAAA;AAC/C,IAAA,OAAO,QAAQ;AACZ,SAAA,GAAG,CAAC,CAAC,CAAC,KACL,CAAC,CAAC,YAAY,KAAK,CAAC,CAAC,SAAS,GAAG,CAAC,CAAC,SAAS,GAAG,CAAG,EAAA,CAAC,CAAC,YAAY,CAAK,EAAA,EAAA,CAAC,CAAC,SAAS,EAAE,CACnF;SACA,IAAI,CAAC,IAAI,CAAC,CAAC;AAChB,CAAC;AAED;;AAEG;AACH,SAAS,iBAAiB,GAAA;AACxB,IAAA,OAAO,YAAY,IAAI,CAAC,MAAM,EAAE,CAAC,QAAQ,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;AAC9D,CAAC;AAED;AACA;AACA;AAEA;;;;;;;;;AASG;AACG,SAAU,kBAAkB,CAChC,IAAY,EACZ,gBAA8B,EAC9B,UAA4B,EAAE,EAAA;IAE9B,MAAM,EAAE,OAAO,GAAG,MAAM,KAAK,EAAE,GAAG,OAAO,CAAC;IAE1C,IAAI,eAAe,GAAG,IAAI,CAAC;IAC3B,MAAM,iBAAiB,GAAa,EAAE,CAAC;AACvC,IAAA,MAAM,YAAY,GAAG,IAAI,GAAG,EAAuB,CAAC;IACpD,MAAM,mBAAmB,GAAa,EAAE,CAAC;;;;AAMzC,IAAA,MAAM,aAAa,GAAG,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC,CAAC,CAAC;AAE9D,IAAA,KAAK,MAAM,KAAK,IAAI,aAAa,EAAE;AACjC,QAAA,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AAC5B,QAAA,MAAM,eAAe,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AACjC,QAAA,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;;QAG5B,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACtD,SAAS;AACV,SAAA;AAED,QAAA,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,CAAC,SAAS,EAAE;AACd,YAAA,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACnC,SAAS;AACV,SAAA;;AAGD,QAAA,IAAI,CAAC,YAAY,CAAC,GAAG,CAAC,SAAS,CAAC,EAAE;AAChC,YAAA,YAAY,CAAC,GAAG,CAAC,SAAS,EAAE;gBAC1B,SAAS;AACT,gBAAA,QAAQ,EAAE,EAAE;AACZ,gBAAA,OAAO,EAAE,EAAE;AACZ,aAAA,CAAC,CAAC;AACJ,SAAA;QAED,MAAM,KAAK,GAAG,YAAY,CAAC,GAAG,CAAC,SAAS,CAAE,CAAC;AAC3C,QAAA,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,UAAU,EAAE,KAAK,EAAE,KAAK,CAAC,KAAM,EAAE,CAAC,CAAC;;AAGxD,QAAA,MAAM,MAAM,GAAG,oBAAoB,CAAC,eAAe,CAAC,CAAC;QAErD,IAAI,MAAM,CAAC,eAAe,IAAI,CAAC,KAAK,CAAC,eAAe,EAAE;AACpD,YAAA,KAAK,CAAC,eAAe,GAAG,MAAM,CAAC,eAAe,CAAC;AAChD,SAAA;QAED,IAAI,MAAM,CAAC,aAAa,IAAI,CAAC,KAAK,CAAC,aAAa,EAAE;AAChD,YAAA,KAAK,CAAC,aAAa,GAAG,MAAM,CAAC,aAAa,CAAC;AAC5C,SAAA;;QAGD,MAAM,OAAO,GAAG,aAAa,CAAC,KAAK,EAAE,MAAM,CAAC,QAAQ,CAAC,CAAC;AACtD,QAAA,mBAAmB,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,CAAC;AACtC,KAAA;;;;IAMD,MAAM,YAAY,GAA6D,EAAE,CAAC;AAElF,IAAA,KAAK,MAAM,GAAG,KAAK,CAAC,IAAI,YAAY,EAAE;QACpC,MAAM,aAAa,GAAG,CAAC,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;AAC3E,QAAA,MAAM,YAAY,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;;AAGtC,QAAA,MAAM,eAAe,GAAG,yBAAyB,CAAC,KAAK,CAAC,CAAC;;QAGzD,YAAY,CAAC,IAAI,CAAC;YAChB,KAAK,EAAE,YAAY,CAAC,KAAK;AACzB,YAAA,MAAM,EAAE,YAAY,CAAC,UAAU,CAAC,MAAM;AACtC,YAAA,WAAW,EAAE,eAAe;AAC7B,SAAA,CAAC,CAAC;;AAGH,QAAA,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,aAAa,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;AAC7C,YAAA,MAAM,cAAc,GAAG,aAAa,CAAC,CAAC,CAAC,CAAC;YACxC,YAAY,CAAC,IAAI,CAAC;gBAChB,KAAK,EAAE,cAAc,CAAC,KAAK;AAC3B,gBAAA,MAAM,EAAE,cAAc,CAAC,UAAU,CAAC,MAAM;AACxC,gBAAA,WAAW,EAAE,EAAE;AAChB,aAAA,CAAC,CAAC;AACJ,SAAA;AACF,KAAA;;AAGD,IAAA,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;;AAG/C,IAAA,KAAK,MAAM,CAAC,IAAI,YAAY,EAAE;QAC5B,eAAe;YACb,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC;AACjG,KAAA;;;;AAMD,IAAA,IAAI,mBAAmB,CAAC,MAAM,GAAG,CAAC,EAAE;;QAElC,MAAM,eAAe,GAAG,eAAe,CAAC,KAAK,CAAC,kCAAkC,CAAC,CAAC;AAClF,QAAA,IAAI,eAAe,EAAE;YACnB,MAAM,UAAU,GAAG,eAAe,CAAC,eAAe,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;YAC/D,MAAM,eAAe,GAAG,eAAe,CAAC,WAAW,CAAC,UAAU,CAAC,CAAC;AAChE,YAAA,MAAM,cAAc,GAAG,eAAe,GAAG,UAAU,CAAC,MAAM,CAAC;YAC3D,eAAe;AACb,gBAAA,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,cAAc,CAAC;oBACxC,IAAI;AACJ,oBAAA,mBAAmB,CAAC,IAAI,CAAC,IAAI,CAAC;AAC9B,oBAAA,eAAe,CAAC,KAAK,CAAC,cAAc,CAAC,CAAC;AACzC,SAAA;AACF,KAAA;;;;AAMD,IAAA,MAAM,iBAAiB,GAAG,KAAK,CAAC,IAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,wBAAwB,CAAC,CAAC,CAAC;AAEzF,IAAA,KAAK,IAAI,CAAC,GAAG,iBAAiB,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,EAAE;AACtD,QAAA,MAAM,KAAK,GAAG,iBAAiB,CAAC,CAAC,CAAC,CAAC;AACnC,QAAA,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;AAC5B,QAAA,MAAM,UAAU,GAAG,KAAK,CAAC,CAAC,CAAC,CAAC;QAE5B,IAAI,CAAC,aAAa,CAAC,UAAU,CAAC,IAAI,CAAC,OAAO,CAAC,UAAU,CAAC,EAAE;YACtD,SAAS;AACV,SAAA;AAED,QAAA,MAAM,SAAS,GAAG,gBAAgB,CAAC,UAAU,CAAC,CAAC;QAE/C,IAAI,CAAC,SAAS,EAAE;AACd,YAAA,iBAAiB,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;YACnC,SAAS;AACV,SAAA;AAED,QAAA,MAAM,SAAS,GAAG,CAAqB,kBAAA,EAAA,SAAS,IAAI,CAAC;AAErD,QAAA,MAAM,UAAU,GAAG,KAAK,CAAC,KAAM,CAAC;AAChC,QAAA,MAAM,QAAQ,GAAG,UAAU,GAAG,UAAU,CAAC,MAAM,CAAC;QAChD,eAAe;AACb,YAAA,eAAe,CAAC,KAAK,CAAC,CAAC,EAAE,UAAU,CAAC,GAAG,SAAS,GAAG,eAAe,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC;AACtF,KAAA;IAED,OAAO;AACL,QAAA,IAAI,EAAE,eAAe;QACrB,iBAAiB;AACjB,QAAA,MAAM,EAAE,YAAY;AACpB,QAAA,gBAAgB,EAAE,mBAAmB;KACtC,CAAC;AACJ"}

package/esm/dev-server/import-deduplicator.test.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Tests for Import Deduplicator
+ *
+ * Run with: npx tsx @warlock.js/core/src/dev-server/import-deduplicator.test.ts
+ */
+export {};
+//# sourceMappingURL=import-deduplicator.test.d.ts.map

package/esm/dev-server/import-deduplicator.test.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-deduplicator.test.d.ts","sourceRoot":"","sources":["../../src/dev-server/import-deduplicator.test.ts"],"names":[],"mappings":"AAAA;;;;GAIG"}

package/esm/dev-server/import-transformer.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-transformer.d.ts","sourceRoot":"","sources":["../../src/dev-server/import-transformer.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAiBlD;;;;;;;;;;;;;GAaG;AACH,wBAAgB,gBAAgB,CAAC,WAAW,EAAE,WAAW,GAAG,MAAM,CAqNjE"}

package/esm/{dev2-server → dev-server}/import-transformer.js

@@ -1,4 +1,4 @@
-import {devLogError}from'./dev-logger.js';import {exportAnalyzer}from'./export-analyzer.js';import {Path}from'./path.js';import {tsconfigManager}from'./tsconfig-manager.js';let filesOrchestrator;
+import {devLogError}from'./dev-logger.js';import {exportAnalyzer}from'./export-analyzer.js';import {deduplicateImports}from'./import-deduplicator.js';import {Path}from'./path.js';import {tsconfigManager}from'./tsconfig-manager.js';let filesOrchestrator;
 loadFilesOrchestrator();
 async function loadFilesOrchestrator() {
     try {
@@ -23,86 +23,22 @@ async function loadFilesOrchestrator() {
  */
 function transformImports(fileManager) {
     const code = fileManager.transpiled;
-    // Pattern to match ES6 import statements
-    // Matches: import ... from "..."
-    // Handles:
-    //   - import { a, b } from "module" (named imports, can span multiple lines)
-    //   - import * as Foo from "module" (namespace imports)
-    //   - import Foo from "module" (default imports)
-    //   - import Foo, { a, b } from "module" (mixed imports)
-    const importRegex = /import\s+(\{[\s\S]*?\}|\*\s+as\s+\w+|\w+(?:\s*,\s*\{[\s\S]*?\})?)\s+from\s+["']([^"']+)["'];?/gm;
-    // Pattern to match side-effect imports: import "module";
-    const sideEffectImportRegex = /import\s+["']([^"']+)["'];?/g;
+    // Create a path resolver that uses the fileManager's importMap
+    const resolveCachePath = (importPath) => {
+        if (!fileManager.importMap.has(importPath)) {
+            return null;
+        }
+        return findCachePathForImport(importPath, fileManager);
+    };
+    // Use the pure deduplicator for import transformation
+    const result = deduplicateImports(code, resolveCachePath, {
+        isAlias: (path) => tsconfigManager.isAlias(path),
+    });
+    let transformedCode = result.code;
+    const unresolvedImports = [...result.unresolvedImports];
     // Pattern to match ES6 export statements
     // Matches: export * from "..." and export { ... } from "..."
     const exportRegex = /export\s+((?:\*|\{[^}]*\}))\s+from\s+["']([^"']+)["'];?/g;
-    let transformedCode = code;
-    const unresolvedImports = [];
-    // Process imports first
-    const importMatches = Array.from(code.matchAll(importRegex));
-    for (let i = importMatches.length - 1; i >= 0; i--) {
-        const match = importMatches[i];
-        const fullImport = match[0];
-        const importSpecifier = match[1]; // What's being imported (e.g., "{ foo }", "* as bar", "default")
-        const importPath = match[2]; // The module path
-        // Only transform relative imports and alias imports
-        // Skip external packages (node_modules, node built-ins)
-        const isRelativeImport = importPath.startsWith(".") || importPath.startsWith("/");
-        const isAliasImport = tsconfigManager.isAlias(importPath);
-        if (!isRelativeImport && !isAliasImport) {
-            // This is an external package - keep as-is
-            continue;
-        }
-        // Check if this import was resolved by parseImports (exists in importMap)
-        // If not in importMap, it means parseImports skipped it (external package), so we skip it too
-        if (!fileManager.importMap.has(importPath)) {
-            // Not in importMap = external package, skip transformation
-            continue;
-        }
-        // Find the cache path for this import
-        const cachePath = findCachePathForImport(importPath, fileManager);
-        if (!cachePath) {
-            // Could not resolve - track it (this is a local file that should exist but doesn't)
-            unresolvedImports.push(importPath);
-            continue;
-        }
-        // Build the correct replacement depending on the import shape
-        const newImport = buildImportReplacement(importSpecifier, cachePath);
-        // Replace in code
-        const startIndex = match.index;
-        const endIndex = startIndex + fullImport.length;
-        transformedCode =
-            transformedCode.slice(0, startIndex) + newImport + transformedCode.slice(endIndex);
-    }
-    // Process side-effect imports: import "module";
-    const sideEffectMatches = Array.from(transformedCode.matchAll(sideEffectImportRegex));
-    for (let i = sideEffectMatches.length - 1; i >= 0; i--) {
-        const match = sideEffectMatches[i];
-        const fullImport = match[0];
-        const importPath = match[1];
-        // Only transform relative imports and alias imports
-        // Skip external packages (node_modules, node built-ins)
-        const isRelativeImport = importPath.startsWith(".") || importPath.startsWith("/");
-        const isAliasImport = tsconfigManager.isAlias(importPath);
-        if (!isRelativeImport && !isAliasImport) {
-            continue;
-        }
-        if (!fileManager.importMap.has(importPath)) {
-            continue;
-        }
-        const cachePath = findCachePathForImport(importPath, fileManager);
-        if (!cachePath) {
-            unresolvedImports.push(importPath);
-            continue;
-        }
-        // FROM: import "./themes";
-        // TO:   await __import("./src-app-mail-themes.js");
-        const newImport = `await __import("./${cachePath}")`;
-        const startIndex = match.index;
-        const endIndex = startIndex + fullImport.length;
-        transformedCode =
-            transformedCode.slice(0, startIndex) + newImport + transformedCode.slice(endIndex);
-    }
     // Process exports (need to re-process after imports to get updated string positions)
     const exportMatches = Array.from(transformedCode.matchAll(exportRegex));
     for (let i = exportMatches.length - 1; i >= 0; i--) {
@@ -118,14 +54,20 @@ function transformImports(fileManager) {
             // This is an external package - keep as-is
             continue;
         }
-        // Check if this import was resolved by parseImports (exists in importMap)
-        // If not in importMap, it means parseImports skipped it (external package), so we skip it too
-        if (!fileManager.importMap.has(importPath)) {
-            // Not in importMap = external package, skip transformation
-            continue;
-        }
         // Find the cache path for this import
-        const cachePath = findCachePathForImport(importPath, fileManager);
+        let cachePath = findCachePathForImport(importPath, fileManager);
+        // If not in importMap but is a relative import, compute the cache path directly
+        if (!cachePath && isRelativeImport) {
+            // Resolve the relative import path from the current file's directory
+            const currentDir = Path.dirname(fileManager.relativePath);
+            let resolvedPath = Path.join(currentDir, importPath);
+            // Normalize the path and ensure it has the correct extension
+            if (!resolvedPath.endsWith(".ts") && !resolvedPath.endsWith(".tsx")) {
+                resolvedPath += ".ts";
+            }
+            // Compute cache path using the same formula as FileManager.cachePath
+            cachePath = resolvedPath.replace(/\//g, "-").replace(/\.(ts|tsx)$/, ".js");
+        }
         if (!cachePath) {
             // Could not resolve - track it (this is a local file that should exist but doesn't)
             unresolvedImports.push(importPath);
@@ -211,6 +153,40 @@ function transformImports(fileManager) {
                 transformedCode.slice(0, startIndex) + newExport + transformedCode.slice(endIndex);
         }
     }
+    // Transform dynamic imports: import("./path") → __import("cache-path")
+    // This handles dynamic imports in function bodies that weren't caught by static import transformation
+    const dynamicImportRegex = /\bimport\s*\(\s*["']([^"']+)["']\s*\)/g;
+    const dynamicMatches = Array.from(transformedCode.matchAll(dynamicImportRegex));
+    for (let i = dynamicMatches.length - 1; i >= 0; i--) {
+        const match = dynamicMatches[i];
+        const fullImport = match[0];
+        const importPath = match[1];
+        // Only transform relative imports and alias imports
+        const isRelativeImport = importPath.startsWith(".") || importPath.startsWith("/");
+        const isAliasImport = tsconfigManager.isAlias(importPath);
+        if (!isRelativeImport && !isAliasImport) {
+            // External package - keep as-is
+            continue;
+        }
+        // Check if this import was resolved by parseImports
+        if (!fileManager.importMap.has(importPath)) {
+            // Not in importMap = external package or untracked, skip
+            continue;
+        }
+        // Find the cache path for this import
+        const cachePath = findCachePathForImport(importPath, fileManager);
+        if (!cachePath) {
+            unresolvedImports.push(importPath);
+            continue;
+        }
+        // Transform to __import with cache path
+        const newImport = `__import("./${cachePath}")`;
+        // Replace in code (reverse order so indices stay valid)
+        const startIndex = match.index;
+        const endIndex = startIndex + fullImport.length;
+        transformedCode =
+            transformedCode.slice(0, startIndex) + newImport + transformedCode.slice(endIndex);
+    }
     // If there are unresolved imports, throw an error
     if (unresolvedImports.length > 0) {
         devLogError(`Failed to transform imports in ${fileManager.relativePath}:\n` +
@@ -220,50 +196,6 @@ function transformImports(fileManager) {
     }
     return transformedCode;
 }
-/**
- * Build a replacement statement for different import syntaxes
- * @param importSpecifier The import specifier (e.g., "Foo", "{ a, b }", "Foo, { a, b }", "* as Bar")
- * @param cachePath The path to the cached file
- */
-function buildImportReplacement(importSpecifier, cachePath) {
-    const trimmed = importSpecifier.trim();
-    // Namespace import: import * as Foo from "module";
-    if (trimmed.startsWith("* as ")) {
-        const identifier = trimmed.replace("* as ", "").trim();
-        return `const ${identifier} = await __import("./${cachePath}")`;
-    }
-    // Mixed import: import Foo, { a, b } from "module";
-    // Transform to: const __module = await __import(...); const Foo = __module?.default ?? __module; const { a, b } = __module;
-    // Handle multiline: import Foo, {\n  a,\n  b\n} from "module";
-    if (trimmed.match(/^(\w+)\s*,\s*\{/)) {
-        const match = trimmed.match(/^(\w+)\s*,\s*(\{[\s\S]*?\})/);
-        if (match) {
-            const defaultImport = match[1];
-            let namedImports = match[2];
-            const moduleVar = `__module_${Math.random().toString(36).slice(2, 8)}`;
-            // Clean up whitespace and normalize
-            namedImports = namedImports.replace(/\s+/g, " ").trim();
-            // Normalize `{ default as X }` to `{ default: X }` for valid destructuring
-            const normalized = namedImports.replace(/default\s+as\s+/g, "default: ");
-            // Generate correct syntax with proper separators
-            return `const ${moduleVar} = await __import("./${cachePath}");
-const ${defaultImport} = ${moduleVar}?.default ?? ${moduleVar};
-const ${normalized} = ${moduleVar};`;
-        }
-    }
-    // Destructured / named imports (including default alias): import { a, default as X } from "module";
-    if (trimmed.startsWith("{")) {
-        // Clean up multiline formatting
-        let cleanedImports = trimmed.replace(/\s+/g, " ").trim();
-        // Normalize `{ default as X }` to `{ default: X }` for valid destructuring
-        const normalized = cleanedImports.replace(/default\s+as\s+/g, "default: ");
-        return `const ${normalized} = await __import("./${cachePath}")`;
-    }
-    // Default import: import Foo from "module";
-    // Use default with fallback to module object
-    const moduleVar = `__module_${Math.random().toString(36).slice(2, 8)}`;
-    return `const ${moduleVar} = await __import("./${cachePath}");\nconst ${trimmed} = ${moduleVar}?.default ?? ${moduleVar};`;
-}
 /**
  * Find the cache path for an import
  *

package/esm/dev-server/import-transformer.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"import-transformer.js","sources":["../../src/dev-server/import-transformer.ts"],"sourcesContent":[null],"names":[],"mappings":"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"}

package/esm/{dev2-server → dev-server}/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dev2-server/index.ts"],"names":[],"mappings":""}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/dev-server/index.ts"],"names":[],"mappings":""}

package/esm/{dev2-server → dev-server}/layer-executor.d.ts

@@ -17,10 +17,12 @@ export declare class LayerExecutor {
     constructor(dependencyGraph: DependencyGraph, specialFilesCollector: SpecialFilesCollector, moduleLoader: ModuleLoader);
     /**
      * Execute batch reload for multiple changed files
-     * @param changedPaths Array of relative paths that changed
+     * @param changedPaths Array of relative paths that changed (code files only)
      * @param filesMap Map of all FileManager instances
+     * @param deletedFiles Array of deleted file paths
+     * @param allChangedPaths Optional array of all changed paths including env files (for config reload)
      */
-    executeBatchReload(changedPaths: string[], filesMap: Map<string, FileManager>, deletedFiles: string[]): Promise<void>;
+    executeBatchReload(changedPaths: string[], filesMap: Map<string, FileManager>, deletedFiles: string[], allChangedPaths?: string[]): Promise<void>;
     /**
      * Determine if we need FSR or HMR
      * FSR is needed if ANY file in the invalidation chain is FSR layer
@@ -55,6 +57,7 @@ export declare class LayerExecutor {
      * Reload affected modules (for HMR)
      * Special files (main, routes, events, locales) need to be actively reloaded
      * Other files will be loaded on next import
+     * @returns Array of affected config file paths (for connector restart logic)
      */
     private reloadAffectedModules;
 }

package/esm/dev-server/layer-executor.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"layer-executor.d.ts","sourceRoot":"","sources":["../../src/dev-server/layer-executor.ts"],"names":[],"mappings":"AAGA,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAC;AAG1D,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAC7C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAC;AACpD,OAAO,KAAK,EAAE,qBAAqB,EAAE,MAAM,2BAA2B,CAAC;AACvE;;;;;;;GAOG;AACH,qBAAa,aAAa;IAEtB,OAAO,CAAC,QAAQ,CAAC,eAAe;IAChC,OAAO,CAAC,QAAQ,CAAC,qBAAqB;IACtC,OAAO,CAAC,QAAQ,CAAC,YAAY;gBAFZ,eAAe,EAAE,eAAe,EAChC,qBAAqB,EAAE,qBAAqB,EAC5C,YAAY,EAAE,YAAY;IAG7C;;;;;;OAMG;IACU,kBAAkB,CAC7B,YAAY,EAAE,MAAM,EAAE,EACtB,QAAQ,EAAE,GAAG,CAAC,MAAM,EAAE,WAAW,CAAC,EAClC,YAAY,EAAE,MAAM,EAAE,EACtB,eAAe,CAAC,EAAE,MAAM,EAAE,GACzB,OAAO,CAAC,IAAI,CAAC;IAiGhB;;;OAGG;IACH,OAAO,CAAC,uBAAuB;IAa/B;;;OAGG;YACW,wBAAwB;IAqCtC;;;OAGG;YACW,2BAA2B;IAiBzC;;OAEG;YACW,yBAAyB;IAevC;;;OAGG;YACW,wBAAwB;IAwBtC;;;;OAIG;YACW,0BAA0B;IAmDxC;;;;;OAKG;YACW,qBAAqB;CAyGpC"}