@embroider/core 3.4.20-unstable.b89b741 → 3.4.20-unstable.c3af848

package/src/module-resolver.js

@@ -17,13 +17,12 @@ const debug_1 = __importDefault(require("debug"));
 const assert_never_1 = __importDefault(require("assert-never"));
 const reverse_exports_1 = require("@embroider/reverse-exports");
 const resolve_exports_1 = require("resolve.exports");
-const virtual_content_1 = require("./virtual-content");
 const typescript_memoize_1 = require("typescript-memoize");
 const describe_exports_1 = require("./describe-exports");
 const fs_1 = require("fs");
 const node_resolve_1 = require("./node-resolve");
-const virtual_route_entrypoint_1 = require("./virtual-route-entrypoint");
 const semver_1 = require("semver");
+const module_request_1 = require("./module-request");
 const debug = (0, debug_1.default)('embroider:resolver');
 // Using a formatter makes this work lazy so nothing happens when we aren't
 // logging. It is unfortunate that formatters are a globally mutable config and
@@ -95,19 +94,14 @@ class Resolver {
         request = await this.beforeResolve(request);
         let resolution;
         if (request.resolvedTo) {
-            if (typeof request.resolvedTo === 'function') {
-                resolution = await request.resolvedTo();
-            }
-            else {
-                resolution = request.resolvedTo;
-            }
+            resolution = await (0, module_request_1.extractResolution)(request.resolvedTo);
         }
         else {
             resolution = await request.defaultResolve();
         }
+        resolution = await this.afterResolve(request, resolution);
         switch (resolution.type) {
             case 'found':
-            case 'ignored':
                 return resolution;
             case 'not_found':
                 break;
@@ -121,12 +115,7 @@ class Resolver {
             return resolution;
         }
         if (nextRequest.resolvedTo) {
-            if (typeof nextRequest.resolvedTo === 'function') {
-                return await nextRequest.resolvedTo();
-            }
-            else {
-                return nextRequest.resolvedTo;
-            }
+            return await (0, module_request_1.extractResolution)(nextRequest.resolvedTo);
         }
         if (nextRequest.fromFile === request.fromFile && nextRequest.specifier === request.specifier) {
             throw new Error('Bug Discovered! New request is not === original request but has the same fromFile and specifier. This will likely create a loop.');
@@ -142,6 +131,34 @@ class Resolver {
     get packageCache() {
         return shared_internals_2.RewrittenPackageCache.shared('embroider', this.options.appRoot);
     }
+    async afterResolve(request, resolution) {
+        resolution = await this.handleSyntheticComponents(request, resolution);
+        return resolution;
+    }
+    async handleSyntheticComponents(request, resolution) {
+        // Key assumption: the system's defaultResolve performs extension search for
+        // extensionless requests, with JS at a higher priority than HBS.
+        // When the request had an explicit ".js" extension, the system default
+        // extension search doesn't help us locate an HBS, so we need to check for
+        // it ourselves here.
+        if (resolution.type === 'not_found') {
+            let hbsSpecifier = (0, shared_internals_1.syntheticJStoHBS)(request.specifier);
+            if (hbsSpecifier) {
+                resolution = await this.resolve(request.alias(hbsSpecifier));
+            }
+        }
+        // At this point, we might have resolved an HBS file (either because the
+        // request was extensionless and the default search found it, or because of
+        // our own code above) when the request was for a JS file.
+        if (resolution.type === 'found') {
+            let syntheticId = (0, shared_internals_1.needsSyntheticComponentJS)(request.specifier, resolution.filename);
+            if (syntheticId && (0, shared_internals_1.isInComponents)(resolution.filename, this.packageCache)) {
+                let newRequest = logTransition(`synthetic component JS`, request, request.virtualize({ type: 'template-only-component-js', specifier: syntheticId }));
+                return await (0, module_request_1.extractResolution)(newRequest.resolvedTo);
+            }
+        }
+        return resolution;
+    }
     logicalPackage(owningPackage, file) {
         let logicalLocation = this.reverseSearchAppTree(owningPackage, file);
         if (logicalLocation) {
@@ -177,8 +194,8 @@ class Resolver {
                         let { names } = (0, describe_exports_1.describeExports)((0, fs_1.readFileSync)((0, path_1.resolve)(pkg.root, fastbootFile.shadowedFilename), 'utf8'), {
                             configFile: false,
                         });
-                        let switchFile = (0, virtual_content_1.fastbootSwitch)(candidate, (0, path_1.resolve)(pkg.root, 'package.json'), names);
-                        if (switchFile === request.fromFile) {
+                        let switchFile = fastbootSwitch(candidate, (0, path_1.resolve)(pkg.root, 'package.json'), names);
+                        if (switchFile.specifier === request.fromFile) {
                             return logTransition('internal lookup from fastbootSwitch', request);
                         }
                         else {
@@ -198,7 +215,7 @@ class Resolver {
         if (request.resolvedTo) {
             return request;
         }
-        let match = (0, virtual_content_1.decodeFastbootSwitch)(request.fromFile);
+        let match = decodeFastbootSwitch(request.fromFile);
         if (!match) {
             return request;
         }
@@ -245,68 +262,74 @@ class Resolver {
         if (request.resolvedTo) {
             return request;
         }
-        let im = (0, virtual_content_1.decodeImplicitModules)(request.specifier);
-        if (!im) {
-            return request;
-        }
-        let pkg = this.packageCache.ownerOfFile(request.fromFile);
-        if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
-            throw new Error(`bug: found implicit modules import in non-ember package at ${request.fromFile}`);
-        }
-        let packageName = (0, shared_internals_1.packageName)(im.fromFile);
-        if (packageName) {
-            let dep = this.packageCache.resolve(packageName, pkg);
-            return logTransition(`dep's implicit modules`, request, request.virtualize((0, path_1.resolve)(dep.root, `-embroider-${im.type}.js`)));
-        }
-        else {
-            return logTransition(`own implicit modules`, request, request.virtualize((0, path_1.resolve)(pkg.root, `-embroider-${im.type}.js`)));
+        for (let variant of ['', 'test-']) {
+            let suffix = `-embroider-implicit-${variant}modules.js`;
+            if (!request.specifier.endsWith(suffix)) {
+                continue;
+            }
+            let filename = request.specifier.slice(0, -1 * suffix.length);
+            if (!filename.endsWith('/') && filename.endsWith('\\')) {
+                continue;
+            }
+            filename = filename.slice(0, -1);
+            let pkg = this.packageCache.ownerOfFile(request.fromFile);
+            if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
+                throw new Error(`bug: found implicit modules import in non-ember package at ${request.fromFile}`);
+            }
+            let type = `implicit-${variant}modules`;
+            let packageName = (0, shared_internals_1.packageName)(filename);
+            if (packageName) {
+                let dep = this.packageCache.resolve(packageName, pkg);
+                return logTransition(`dep's implicit modules`, request, request.virtualize({ type, specifier: (0, path_1.resolve)(dep.root, `-embroider-${type}.js`), fromFile: dep.root }));
+            }
+            else {
+                return logTransition(`own implicit modules`, request, request.virtualize({ type, specifier: (0, path_1.resolve)(pkg.root, `-embroider-${type}.js`), fromFile: pkg.root }));
+            }
         }
+        return request;
     }
     handleEntrypoint(request) {
         var _a;
         if (request.resolvedTo) {
             return request;
         }
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/compat-modules',
-            '/@embroider/virtual/compat-modules',
-            './@embroider/virtual/compat-modules',
-        ];
-        if (!candidates.some(c => request.specifier.startsWith(c + '/') || request.specifier === c)) {
+        const compatModulesSpecifier = '@embroider/virtual/compat-modules';
+        let isCompatModules = request.specifier === compatModulesSpecifier || request.specifier.startsWith(compatModulesSpecifier + '/');
+        if (!isCompatModules) {
             return request;
         }
-        const result = /\.?\/?@embroider\/virtual\/compat-modules(?:\/(?<packageName>.*))?/.exec(request.specifier);
-        if (!result) {
-            // TODO make a better error
-            throw new Error('entrypoint does not match pattern' + request.specifier);
-        }
-        const { packageName } = result.groups;
         const requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!(requestingPkg === null || requestingPkg === void 0 ? void 0 : requestingPkg.isV2Ember())) {
             throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
         }
         let pkg;
-        if (packageName) {
-            pkg = this.packageCache.resolve(packageName, requestingPkg);
+        if (request.specifier === compatModulesSpecifier) {
+            pkg = requestingPkg;
         }
         else {
-            pkg = requestingPkg;
+            let packageName = request.specifier.slice(compatModulesSpecifier.length + 1);
+            pkg = this.packageCache.resolve(packageName, requestingPkg);
         }
         let matched = (0, resolve_exports_1.exports)(pkg.packageJSON, '-embroider-entrypoint.js', {
             browser: true,
             conditions: ['default', 'imports'],
         });
-        return logTransition('entrypoint', request, request.virtualize((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, (_a = matched === null || matched === void 0 ? void 0 : matched[0]) !== null && _a !== void 0 ? _a : '-embroider-entrypoint.js');
+        return logTransition('entrypoint', request, request.virtualize({
+            type: 'entrypoint',
+            specifier,
+            fromDir: (0, path_1.dirname)(specifier),
+        }));
     }
     handleRouteEntrypoint(request) {
         if (request.resolvedTo) {
             return request;
         }
-        let routeName = (0, virtual_route_entrypoint_1.decodePublicRouteEntrypoint)(request.specifier);
-        if (!routeName) {
+        const publicPrefix = '@embroider/core/route/';
+        if (!request.specifier.startsWith(publicPrefix)) {
             return request;
         }
+        let routeName = request.specifier.slice(publicPrefix.length);
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if (!(pkg === null || pkg === void 0 ? void 0 : pkg.isV2Ember())) {
             throw new Error(`bug: found entrypoint import in non-ember package at ${request.fromFile}`);
@@ -315,39 +338,32 @@ class Resolver {
             browser: true,
             conditions: ['default', 'imports'],
         });
-        return logTransition('route entrypoint', request, request.virtualize((0, virtual_route_entrypoint_1.encodeRouteEntrypoint)(pkg.root, matched === null || matched === void 0 ? void 0 : matched[0], routeName)));
+        let target = matched ? `${matched}:route=${routeName}` : `-embroider-route-entrypoint.js:route=${routeName}`;
+        let specifier = (0, path_1.resolve)(pkg.root, target);
+        return logTransition('route entrypoint', request, request.virtualize({ type: 'route-entrypoint', specifier, route: routeName, fromDir: (0, path_1.dirname)(specifier) }));
     }
     handleImplicitTestScripts(request) {
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/test-support.js',
-            '/@embroider/virtual/test-support.js',
-            './@embroider/virtual/test-support.js',
-        ];
-        if (!candidates.includes(request.specifier)) {
+        if (request.specifier !== '@embroider/virtual/test-support.js') {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if ((pkg === null || pkg === void 0 ? void 0 : 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((0, path_1.resolve)(pkg.root, '-embroider-test-support.js')));
+        return logTransition('test-support', request, request.virtualize({ type: 'test-support-js', specifier: (0, path_1.resolve)(pkg.root, '-embroider-test-support.js') }));
     }
     handleTestSupportStyles(request) {
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/test-support.css',
-            '/@embroider/virtual/test-support.css',
-            './@embroider/virtual/test-support.css',
-        ];
-        if (!candidates.includes(request.specifier)) {
+        if (request.specifier !== '@embroider/virtual/test-support.css') {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if ((pkg === null || pkg === void 0 ? void 0 : 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((0, path_1.resolve)(pkg.root, '-embroider-test-support-styles.css')));
+        return logTransition('test-support-styles', request, request.virtualize({
+            type: 'test-support-css',
+            specifier: (0, path_1.resolve)(pkg.root, '-embroider-test-support-styles.css'),
+        }));
     }
     async handleGlobalsCompat(request) {
         if (request.resolvedTo) {
@@ -377,35 +393,28 @@ class Resolver {
         }
     }
     handleVendorStyles(request) {
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/vendor.css',
-            '/@embroider/virtual/vendor.css',
-            './@embroider/virtual/vendor.css',
-        ];
-        if (!candidates.includes(request.specifier)) {
+        if (request.specifier !== '@embroider/virtual/vendor.css') {
             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))) {
             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((0, path_1.resolve)(pkg.root, '-embroider-vendor-styles.css')));
+        return logTransition('vendor-styles', request, request.virtualize({ type: 'vendor-css', specifier: (0, path_1.resolve)(pkg.root, '-embroider-vendor-styles.css') }));
     }
     resolveHelper(path, inEngine, request) {
         let target = this.parseGlobalPath(path, inEngine);
         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;
         // first, the various places our template might be.
         for (let candidate of this.componentTemplateCandidates(target.packageName)) {
             let candidateSpecifier = `${target.packageName}${candidate.prefix}${target.memberName}${candidate.suffix}`;
-            let resolution = await this.resolve(request.alias(candidateSpecifier).rehome(target.from).withMeta({
-                runtimeFallback: false,
-            }));
+            let resolution = await this.resolve(request.alias(candidateSpecifier).rehome(target.from));
             if (resolution.type === 'found') {
                 hbsModule = resolution;
                 break;
@@ -414,12 +423,7 @@ class Resolver {
         // then the various places our javascript might be.
         for (let candidate of this.componentJSCandidates(target.packageName)) {
             let candidateSpecifier = `${target.packageName}${candidate.prefix}${target.memberName}${candidate.suffix}`;
-            let resolution = await this.resolve(request.alias(candidateSpecifier).rehome(target.from).withMeta({
-                runtimeFallback: false,
-            }));
-            if (resolution.type === 'ignored') {
-                return logTransition(`resolving to ignored component`, request, request.resolveTo(resolution));
-            }
+            let resolution = await this.resolve(request.alias(candidateSpecifier).rehome(target.from));
             // .hbs is a resolvable extension for us, so we need to exclude it here.
             // It matches as a priority lower than .js, so finding an .hbs means
             // there's definitely not a .js.
@@ -432,7 +436,13 @@ class Resolver {
             if (!this.emberVersionSupportsSeparateTemplates) {
                 throw new Error(`Components with separately resolved templates were removed at Ember 6.0. Migrate to either co-located js/ts + hbs files or to gjs/gts. https://deprecations.emberjs.com/id/component-template-resolving/. Bad template was: ${hbsModule.filename}.`);
             }
-            return logTransition(`resolveComponent found legacy HBS`, request, request.virtualize((0, virtual_content_1.virtualPairComponent)(hbsModule.filename, jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename)));
+            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,
+                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 : '')}`,
+            }));
         }
         else if (jsModule) {
             return logTransition(`resolving to resolveComponent found only JS`, request, request.resolveTo(jsModule));
@@ -446,13 +456,8 @@ class Resolver {
         // component, so here to resolve the ambiguity we need to actually resolve
         // that candidate to see if it works.
         let helperCandidate = this.resolveHelper(path, inEngine, request);
-        let helperMatch = await this.resolve(request.alias(helperCandidate.specifier).rehome(helperCandidate.fromFile).withMeta({
-            runtimeFallback: false,
-        }));
-        // for the case of 'ignored' that means that esbuild found this helper in an external
-        // package so it should be considered found in this case and we should not look for a
-        // component with this name
-        if (helperMatch.type === 'found' || helperMatch.type === 'ignored') {
+        let helperMatch = await this.resolve(request.alias(helperCandidate.specifier).rehome(helperCandidate.fromFile));
+        if (helperMatch.type === 'found') {
             return logTransition('resolve to ambiguous case matched a helper', request, request.resolveTo(helperMatch));
         }
         // unlike resolveHelper, resolveComponent already does pre-resolution in
@@ -683,6 +688,7 @@ class Resolver {
         return request;
     }
     handleRenaming(request) {
+        var _a;
         if (request.resolvedTo) {
             return request;
         }
@@ -718,7 +724,7 @@ class Resolver {
         }
         if (pkg.name === packageName) {
             // we found a self-import
-            if (pkg.meta['auto-upgraded']) {
+            if ((_a = pkg.meta) === null || _a === void 0 ? void 0 : _a['auto-upgraded']) {
                 // 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.
@@ -755,20 +761,14 @@ class Resolver {
         return request;
     }
     handleVendor(request) {
-        //TODO move the extra forwardslash handling out into the vite plugin
-        const candidates = [
-            '@embroider/virtual/vendor.js',
-            '/@embroider/virtual/vendor.js',
-            './@embroider/virtual/vendor.js',
-        ];
-        if (!candidates.includes(request.specifier)) {
+        if (request.specifier !== '@embroider/virtual/vendor.js') {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
         if ((pkg === null || pkg === void 0 ? void 0 : 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((0, path_1.resolve)(pkg.root, '-embroider-vendor.js')));
+        return logTransition('vendor', request, request.virtualize({ type: 'vendor-js', specifier: (0, path_1.resolve)(pkg.root, '-embroider-vendor.js') }));
     }
     resolveWithinMovedPackage(request, pkg) {
         let levels = ['..'];
@@ -785,6 +785,7 @@ class Resolver {
         return newRequest.withMeta({ originalFromFile });
     }
     preHandleExternal(request) {
+        var _a;
         if (request.resolvedTo) {
             return request;
         }
@@ -825,7 +826,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 (logicalPackage.meta['auto-upgraded'] && !logicalPackage.hasDependency('ember-auto-import')) {
+        if (((_a = logicalPackage.meta) === null || _a === void 0 ? void 0 : _a['auto-upgraded']) && !logicalPackage.hasDependency('ember-auto-import')) {
             try {
                 let dep = this.packageCache.resolve(packageName, logicalPackage);
                 if (!dep.isEmberAddon()) {
@@ -1024,14 +1025,12 @@ class Resolver {
             case 'fastboot-only':
                 return request.alias(matched.entry['fastboot-js'].specifier).rehome(matched.entry['fastboot-js'].fromFile);
             case 'both':
-                let foundAppJS = await this.resolve(request.alias(matched.entry['app-js'].specifier).rehome(matched.entry['app-js'].fromFile).withMeta({
-                    runtimeFallback: false,
-                }));
+                let foundAppJS = await this.resolve(request.alias(matched.entry['app-js'].specifier).rehome(matched.entry['app-js'].fromFile));
                 if (foundAppJS.type !== 'found') {
                     throw new Error(`${matched.entry['app-js'].fromPackageName} declared ${inEngineSpecifier} in packageJSON.ember-addon.app-js, but that module does not exist`);
                 }
                 let { names } = (0, describe_exports_1.describeExports)((0, fs_1.readFileSync)(foundAppJS.filename, 'utf8'), { configFile: false });
-                return request.virtualize((0, virtual_content_1.fastbootSwitch)(matched.matched, (0, path_1.resolve)(engine.root, 'package.json'), names));
+                return request.virtualize(fastbootSwitch(matched.matched, (0, path_1.resolve)(engine.root, 'package.json'), names));
         }
     }
     // check whether the given file with the given owningPackage is an addon's
@@ -1122,4 +1121,27 @@ function engineRelativeName(pkg, filename) {
         return '.' + outsideName.slice(pkg.name.length);
     }
 }
+const fastbootSwitchSuffix = '/embroider_fastboot_switch';
+function fastbootSwitch(specifier, fromFile, names) {
+    let filename = `${(0, path_1.resolve)((0, path_1.dirname)(fromFile), specifier)}${fastbootSwitchSuffix}`;
+    let virtualSpecifier;
+    if (names.size > 0) {
+        virtualSpecifier = `${filename}?names=${[...names].join(',')}`;
+    }
+    else {
+        virtualSpecifier = filename;
+    }
+    return {
+        type: 'fastboot-switch',
+        specifier: virtualSpecifier,
+        names,
+        hasDefaultExport: 'x',
+    };
+}
+function decodeFastbootSwitch(filename) {
+    let index = filename.indexOf(fastbootSwitchSuffix);
+    if (index >= 0) {
+        return { filename: filename.slice(0, index) };
+    }
+}
 //# sourceMappingURL=module-resolver.js.map