@embroider/core 4.4.7 → 4.6.0

package/dist/src/module-resolver.js

@@ -56,6 +56,7 @@ function logTransition(reason, before, after = before) {
 }
 const compatPattern = /@embroider\/virtual\/(?<type>[^\/]+)\/(?<rest>.*)/;
 class Resolver {
+    options;
     constructor(options) {
         this.options = options;
     }
@@ -211,7 +212,6 @@ class Resolver {
         return request;
     }
     handleFastbootSwitch(request) {
-        var _a;
         if (request.resolvedTo) {
             return request;
         }
@@ -251,8 +251,8 @@ class Resolver {
                     request.alias((0, shared_internals_2.explicitRelative)((0, path_1.dirname)(request.fromFile), (0, path_1.resolve)(pkg.root, targetFile))));
                 }
             }
-            let entry = (_a = this.getEntryFromMergeMap(rel, pkg.root)) === null || _a === void 0 ? void 0 : _a.entry;
-            if ((entry === null || entry === void 0 ? void 0 : entry.type) === 'both') {
+            let entry = this.getEntryFromMergeMap(rel, pkg.root)?.entry;
+            if (entry?.type === 'both') {
                 return logTransition('matched addon entry', request, request.alias(entry[section].specifier).rehome(entry[section].fromFile));
             }
         }
@@ -273,7 +273,7 @@ class Resolver {
             }
             filename = filename.slice(0, -1);
             let pkg = this.packageCache.ownerOfFile(request.fromFile);
-            if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
+            if (!pkg?.isV2Ember()) {
                 throw new Error(`bug: found implicit modules import in non-ember package at ${request.fromFile}`);
             }
             let type = `implicit-${variant}modules`;
@@ -289,7 +289,6 @@ class Resolver {
         return request;
     }
     handleEntrypoint(request) {
-        var _a;
         if (request.resolvedTo) {
             return request;
         }
@@ -299,7 +298,7 @@ class Resolver {
             return request;
         }
         const requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!(requestingPkg === null || requestingPkg === void 0 ? void 0 : requestingPkg.isV2Ember())) {
+        if (!requestingPkg?.isV2Ember()) {
             throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
         }
         let pkg;
@@ -314,7 +313,7 @@ class Resolver {
             browser: true,
             conditions: ['default', 'imports'],
         });
-        let specifier = (0, path_1.resolve)(pkg.root, (_a = matched === null || matched === void 0 ? void 0 : matched[0]) !== null && _a !== void 0 ? _a : '-embroider-entrypoint.js');
+        let specifier = (0, path_1.resolve)(pkg.root, matched?.[0] ?? '-embroider-entrypoint.js');
         return logTransition('entrypoint', request, request.virtualize({
             type: 'entrypoint',
             specifier,
@@ -331,7 +330,7 @@ class Resolver {
         }
         let routeName = request.specifier.slice(publicPrefix.length);
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
+        if (!pkg?.isV2Ember()) {
             throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
         }
         let matched = (0, resolve_exports_1.exports)(pkg.packageJSON, '-embroider-route-entrypoint.js', {
@@ -347,7 +346,7 @@ class Resolver {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) !== this.options.engines[0].root) {
+        if (pkg?.root !== this.options.engines[0].root) {
             throw new Error(`bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app. The top-level Ember app is the only one that has support for @embroider/virtual/test-support.js. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`);
         }
         return logTransition('test-support', request, request.virtualize({ type: 'test-support-js', specifier: (0, path_1.resolve)(pkg.root, '-embroider-test-support.js') }));
@@ -357,7 +356,7 @@ class Resolver {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) !== this.options.engines[0].root) {
+        if (pkg?.root !== this.options.engines[0].root) {
             throw new Error(`bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app. The top-level Ember app is the only one that has support for @embroider/virtual/test-support.css. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`);
         }
         return logTransition('test-support-styles', request, request.virtualize({
@@ -375,7 +374,7 @@ class Resolver {
         }
         let { type, rest } = match.groups;
         let fromPkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!(fromPkg === null || fromPkg === void 0 ? void 0 : fromPkg.isV2Ember())) {
+        if (!fromPkg?.isV2Ember()) {
             return request;
         }
         let engine = this.owningEngine(fromPkg);
@@ -399,7 +398,7 @@ class Resolver {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!pkg || !this.options.engines.some(e => e.root === (pkg === null || pkg === void 0 ? void 0 : pkg.root))) {
+        if (!pkg || !this.options.engines.some(e => e.root === pkg?.root)) {
             throw new Error(`bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app or Engine. The top-level Ember app is the only one that has support for @embroider/virtual/vendor.css. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`);
         }
         return logTransition('vendor-styles', request, request.virtualize({ type: 'vendor-css', specifier: (0, path_1.resolve)(pkg.root, '-embroider-vendor-styles.css') }));
@@ -409,7 +408,6 @@ class Resolver {
         return logTransition('resolveHelper', request, request.alias(`${target.packageName}/helpers/${target.memberName}`).rehome((0, path_1.resolve)(inEngine.root, 'package.json')));
     }
     async resolveComponent(path, inEngine, request) {
-        var _a, _b;
         let target = this.parseGlobalPath(path, inEngine);
         let hbsModule = null;
         let jsModule = null;
@@ -441,9 +439,9 @@ class Resolver {
             return logTransition(`resolveComponent found legacy HBS`, request, request.virtualize({
                 type: 'component-pair',
                 hbsModule: hbsModule.filename,
-                jsModule: (_a = jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename) !== null && _a !== void 0 ? _a : null,
+                jsModule: jsModule?.filename ?? null,
                 debugName: (0, path_1.basename)(hbsModule.filename).replace(/\.(js|hbs)$/, ''),
-                specifier: `${this.options.appRoot}/embroider-pair-component/${encodeURIComponent(hbsModule.filename)}/__vpc__/${encodeURIComponent((_b = jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename) !== null && _b !== void 0 ? _b : '')}`,
+                specifier: `${this.options.appRoot}/embroider-pair-component/${encodeURIComponent(hbsModule.filename)}/__vpc__/${encodeURIComponent(jsModule?.filename ?? '')}`,
             }));
         }
         else if (jsModule) {
@@ -551,7 +549,7 @@ class Resolver {
                         }
                         reverse.set((0, path_1.resolve)(addon.root, inAddonName), { inEngineName, owningPackageRoot: addon.root });
                         let prevEntry = engineModules.get(inEngineName);
-                        switch (prevEntry === null || prevEntry === void 0 ? void 0 : prevEntry.type) {
+                        switch (prevEntry?.type) {
                             case undefined:
                                 engineModules.set(inEngineName, {
                                     type: 'app-only',
@@ -595,7 +593,7 @@ class Resolver {
                         }
                         reverse.set((0, path_1.resolve)(addon.root, inAddonName), { inEngineName, owningPackageRoot: addon.root });
                         let prevEntry = engineModules.get(inEngineName);
-                        switch (prevEntry === null || prevEntry === void 0 ? void 0 : prevEntry.type) {
+                        switch (prevEntry?.type) {
                             case undefined:
                                 engineModules.set(inEngineName, {
                                     type: 'fastboot-only',
@@ -698,8 +696,23 @@ class Resolver {
         }
         return request;
     }
+    get renameModulesMap() {
+        let extensionPattern = (0, shared_internals_1.extensionsPattern)(this.options.resolvableExtensions);
+        let map = new Map();
+        for (let [candidate, replacement] of Object.entries(this.options.renameModules)) {
+            map.set(candidate, replacement);
+            let withoutExtension = candidate.replace(extensionPattern, '');
+            if (withoutExtension !== candidate) {
+                map.set(withoutExtension, replacement);
+                let withoutIndex = withoutExtension.replace(/\/index$/, '');
+                if (withoutIndex !== withoutExtension) {
+                    map.set(withoutIndex, replacement);
+                }
+            }
+        }
+        return map;
+    }
     handleRenaming(request) {
-        var _a;
         if (request.resolvedTo) {
             return request;
         }
@@ -712,19 +725,10 @@ class Resolver {
         // ember-source might provide backburner via module renaming, but if you
         // have an explicit dependency on backburner you should still get that real
         // copy.
-        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.hasDependency(packageName))) {
-            for (let [candidate, replacement] of Object.entries(this.options.renameModules)) {
-                if (candidate === request.specifier) {
-                    return logTransition(`renameModules`, request, request.alias(replacement));
-                }
-                for (let extension of this.options.resolvableExtensions) {
-                    if (candidate === request.specifier + '/index' + extension) {
-                        return logTransition(`renameModules`, request, request.alias(replacement));
-                    }
-                    if (candidate === request.specifier + extension) {
-                        return logTransition(`renameModules`, request, request.alias(replacement));
-                    }
-                }
+        if (!pkg?.hasDependency(packageName)) {
+            let replacement = this.renameModulesMap.get(request.specifier);
+            if (replacement !== undefined) {
+                return logTransition(`renameModules`, request, request.alias(replacement));
             }
             if (this.options.renamePackages[packageName]) {
                 return logTransition(`renamePackages`, request, request.alias(request.specifier.replace(packageName, this.options.renamePackages[packageName])));
@@ -735,7 +739,7 @@ class Resolver {
         }
         if (pkg.name === packageName) {
             // we found a self-import
-            if (((_a = pkg.meta) === null || _a === void 0 ? void 0 : _a['auto-upgraded']) && !pkg.isEngine()) {
+            if (pkg.meta?.['auto-upgraded'] && !pkg.isEngine()) {
                 // auto-upgraded packages always get automatically adjusted. They never
                 // supported fancy package.json exports features so this direct mapping
                 // to the root is always right.
@@ -773,8 +777,8 @@ class Resolver {
                     browser: true,
                     conditions: ['default', 'imports'],
                 });
-                if (found === null || found === void 0 ? void 0 : found[0]) {
-                    return logTransition(`v2 self-import with package.json exports`, request, request.alias(found === null || found === void 0 ? void 0 : found[0]).rehome((0, path_1.resolve)(pkg.root, 'package.json')));
+                if (found?.[0]) {
+                    return logTransition(`v2 self-import with package.json exports`, request, request.alias(found?.[0]).rehome((0, path_1.resolve)(pkg.root, 'package.json')));
                 }
             }
         }
@@ -785,7 +789,7 @@ class Resolver {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if ((pkg === null || pkg === void 0 ? void 0 : pkg.root) !== this.options.engines[0].root) {
+        if (pkg?.root !== this.options.engines[0].root) {
             throw new Error(`bug: found an import of ${request.specifier} in ${request.fromFile}, but this is not the top-level Ember app. The top-level Ember app is the only one that has support for @embroider/virtual/vendor.js. If you think something should be fixed in Embroider, please open an issue on https://github.com/embroider-build/embroider/issues.`);
         }
         return logTransition('vendor', request, request.virtualize({ type: 'vendor-js', specifier: (0, path_1.resolve)(pkg.root, '-embroider-vendor.js') }));
@@ -805,7 +809,6 @@ class Resolver {
         return newRequest.withMeta({ originalFromFile });
     }
     preHandleExternal(request) {
-        var _a;
         if (request.resolvedTo) {
             return request;
         }
@@ -846,7 +849,7 @@ class Resolver {
         // package to which it belongs (normally the app) that affects some policy
         // choices about what it can import
         let logicalPackage = this.logicalPackage(pkg, fromFile);
-        if (((_a = logicalPackage.meta) === null || _a === void 0 ? void 0 : _a['auto-upgraded']) && !logicalPackage.hasDependency('ember-auto-import')) {
+        if (logicalPackage.meta?.['auto-upgraded'] && !logicalPackage.hasDependency('ember-auto-import')) {
             try {
                 let dep = this.packageCache.resolve(packageName, logicalPackage);
                 if (!dep.isEmberAddon()) {
@@ -922,7 +925,7 @@ class Resolver {
         })();
         request = this.restoreRehomedRequest(request);
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
+        if (!pkg?.isV2Ember()) {
             // this request is coming from a file that appears to be owned by no ember
             // package. We offer one fallback behavior for such files. They're allowed
             // to resolve from the app's namespace.
@@ -974,11 +977,10 @@ class Resolver {
         return abortFallback('fallbackResolve final exit');
     }
     restoreRehomedRequest(request) {
-        var _a;
         // meta.originalFromFile gets set when we want to try to rehome a request
         // but then come back to the original location here in the fallback when the
         // rehomed request fails
-        let originalFromFile = (_a = request.meta) === null || _a === void 0 ? void 0 : _a.originalFromFile;
+        let originalFromFile = request.meta?.originalFromFile;
         if (typeof originalFromFile === 'string') {
             return request.rehome(originalFromFile);
         }
@@ -1017,10 +1019,9 @@ class Resolver {
         }
     }
     getEntryFromMergeMap(inEngineSpecifier, root) {
-        var _a;
         let entry;
         for (let candidate of this.withResolvableExtensions(inEngineSpecifier)) {
-            entry = (_a = this.mergeMap.get(root)) === null || _a === void 0 ? void 0 : _a.get(candidate);
+            entry = this.mergeMap.get(root)?.get(candidate);
             if (entry) {
                 return { entry, matched: candidate };
             }
@@ -1038,7 +1039,7 @@ class Resolver {
     }
     async searchAppTree(request, engine, inEngineSpecifier) {
         let matched = this.getEntryFromMergeMap(inEngineSpecifier, engine.root);
-        switch (matched === null || matched === void 0 ? void 0 : matched.entry.type) {
+        switch (matched?.entry.type) {
             case undefined:
                 return undefined;
             case 'app-only':
@@ -1070,7 +1071,7 @@ class Resolver {
     // its dasherized name
     reverseComponentLookup(filename) {
         const owningPackage = this.packageCache.ownerOfFile(filename);
-        if (!(owningPackage === null || owningPackage === void 0 ? void 0 : owningPackage.isV2Ember())) {
+        if (!owningPackage?.isV2Ember()) {
             return;
         }
         let engineConfig = this.options.engines.find(e => e.root === owningPackage.root);
@@ -1107,6 +1108,9 @@ __decorate([
 __decorate([
     (0, typescript_memoize_1.Memoize)()
 ], Resolver.prototype, "emberVersionSupportsSeparateTemplates", null);
+__decorate([
+    (0, typescript_memoize_1.Memoize)()
+], Resolver.prototype, "renameModulesMap", null);
 // we don't want to allow things that resolve only by accident that are likely
 // to break in other setups. For example: import your dependencies'
 // dependencies, or importing your own name from within a monorepo (which will