@wyw-in-js/transform 1.0.6 → 1.0.7

package/types/transform/generators/resolveImports.js

@@ -40,11 +40,12 @@ function applyImportOverrides(services, entrypoint, resolvedImports) {
         };
     });
 }
-function emitDependency(emitter, entrypoint, imports) {
+function emitDependency(emitter, entrypoint, imports, phase) {
     emitter.single({
         type: 'dependency',
         file: entrypoint.name,
         only: entrypoint.only,
+        phase,
         imports: imports.map(({ resolved, only }) => ({
             from: resolved,
             what: only,
@@ -61,19 +62,32 @@ function filterUnresolved(entrypoint, resolvedImports) {
         return true;
     });
 }
+function getPreResolvedImports(preResolved) {
+    return new Map((preResolved ?? []).map((dependency) => [dependency.source, dependency]));
+}
 /**
  * Synchronously resolves specified imports with a provided resolver.
  */
 function* syncResolveImports(resolve) {
     const { data: { imports }, entrypoint, services: { eventEmitter }, } = this;
     const listOfImports = Array.from(imports?.entries() ?? []);
+    const preResolvedImports = getPreResolvedImports(this.data.preResolved);
     const { log } = entrypoint;
     if (listOfImports.length === 0) {
-        emitDependency(eventEmitter, entrypoint, []);
+        emitDependency(eventEmitter, entrypoint, [], this.data.phase);
         log('%s has no imports', entrypoint.name);
         return [];
     }
     const resolvedImports = listOfImports.map(([source, only]) => {
+        const preResolved = preResolvedImports.get(source);
+        if (preResolved) {
+            const mergedOnly = (0, Entrypoint_helpers_1.mergeOnly)(preResolved.only, only);
+            log('[sync-resolve] ♻️ %s -> %s (only: %o)', source, preResolved.resolved, mergedOnly);
+            return {
+                ...preResolved,
+                only: mergedOnly,
+            };
+        }
         let resolved = null;
         try {
             resolved = resolve(source, entrypoint.name, (0, Entrypoint_helpers_1.getStack)(entrypoint));
@@ -90,7 +104,7 @@ function* syncResolveImports(resolve) {
     });
     const overriddenImports = applyImportOverrides(this.services, entrypoint, resolvedImports);
     const filteredImports = filterUnresolved(entrypoint, overriddenImports);
-    emitDependency(eventEmitter, entrypoint, filteredImports);
+    emitDependency(eventEmitter, entrypoint, filteredImports, this.data.phase);
     return filteredImports;
 }
 /**
@@ -99,9 +113,10 @@ function* syncResolveImports(resolve) {
 async function* asyncResolveImports(resolve) {
     const { data: { imports }, entrypoint, services: { eventEmitter }, } = this;
     const listOfImports = Array.from(imports?.entries() ?? []);
+    const preResolvedImports = getPreResolvedImports(this.data.preResolved);
     const { log } = entrypoint;
     if (listOfImports.length === 0) {
-        emitDependency(eventEmitter, entrypoint, []);
+        emitDependency(eventEmitter, entrypoint, [], this.data.phase);
         log('%s has no imports', entrypoint.name);
         return [];
     }
@@ -124,6 +139,15 @@ async function* asyncResolveImports(resolve) {
         };
     };
     const resolvedImports = await Promise.all(listOfImports.map(([source, importsOnly]) => {
+        const preResolved = preResolvedImports.get(source);
+        if (preResolved) {
+            const mergedOnly = (0, Entrypoint_helpers_1.mergeOnly)(preResolved.only, importsOnly);
+            log('[async-resolve] ♻️ %s (%o) in %s -> %s', source, mergedOnly, entrypoint.name, preResolved.resolved);
+            return {
+                ...preResolved,
+                only: mergedOnly,
+            };
+        }
         const cached = entrypoint.getDependency(source);
         if (cached) {
             return {
@@ -155,6 +179,6 @@ async function* asyncResolveImports(resolve) {
     log('resolved %d imports', resolvedImports.length);
     const overriddenImports = applyImportOverrides(this.services, entrypoint, resolvedImports);
     const filteredImports = filterUnresolved(entrypoint, overriddenImports);
-    emitDependency(eventEmitter, entrypoint, filteredImports);
+    emitDependency(eventEmitter, entrypoint, filteredImports, this.data.phase);
     return filteredImports;
 }

package/types/transform/generators/rewriteBarrelImports.d.ts

@@ -0,0 +1,15 @@
+import * as t from '@babel/types';
+import type { IEntrypointDependency } from '../Entrypoint.types';
+import type { ITransformAction } from '../types';
+type RewriteResult = {
+    ast: t.File;
+    code: string;
+    fullyRewrittenSources: string[];
+    imports: Map<string, string[]> | null;
+    optimizedCount: number;
+    partialFallbackSources: string[];
+    preResolvedImports: IEntrypointDependency[];
+    skippedCount: number;
+};
+export declare function rewriteOptimizedBarrelImports(this: ITransformAction, ast: t.File, code: string, resolvedImports: IEntrypointDependency[]): Generator<any, RewriteResult, any>;
+export {};