@embroider/core 3.4.20-unstable.35f48d4 → 3.4.20-unstable.4070ba7

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.20-unstable.35f48d4",
+  "version": "3.4.20-unstable.4070ba7",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -49,9 +49,9 @@
     "semver": "^7.3.5",
     "typescript-memoize": "^1.0.1",
     "walk-sync": "^3.0.0",
-    "@embroider/macros": "1.16.10-unstable.35f48d4",
-    "@embroider/reverse-exports": "0.1.1-unstable.35f48d4",
-    "@embroider/shared-internals": "2.8.2-unstable.35f48d4"
+    "@embroider/macros": "1.16.10-unstable.4070ba7",
+    "@embroider/shared-internals": "2.8.2-unstable.4070ba7",
+    "@embroider/reverse-exports": "0.1.1-unstable.4070ba7"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.2",
@@ -70,8 +70,8 @@
     "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
     "typescript": "^5.4.5",
-    "@embroider/sample-transforms": "0.0.0",
-    "@embroider/test-support": "0.36.0"
+    "@embroider/test-support": "0.36.0",
+    "@embroider/sample-transforms": "0.0.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/index.d.ts

@@ -9,6 +9,6 @@ export { Resolver } from './module-resolver';
 export { ModuleRequest, type Resolution, type RequestAdapter, type RequestAdapterCreate } from './module-request';
 export type { Options as ResolverOptions } from './module-resolver-options';
 export { ResolverLoader } from './resolver-loader';
-export { virtualContent } from './virtual-content';
+export { virtualContent, type VirtualResponse } from './virtual-content';
 export type { Engine } from './app-files';
 export * from '@embroider/shared-internals';

package/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,uCAOoB;AAHlB,qHAAA,yBAAyB,OAAA;AACzB,sGAAA,UAAU,OAAA;AACV,+GAAA,mBAAmB,OAAA;AAErB,qDAAkE;AAAzD,iHAAA,cAAc,OAAA;AAEvB,qCAAoE;AAAvC,8GAAA,mBAAmB,OAAA;AAChD,mDAAwE;AAA/D,+HAAA,OAAO,OAAgB;AAChC,iDAAiE;AAAxD,oHAAA,OAAO,OAAuB;AACvC,uCAA4F;AAAnF,gGAAA,IAAI,OAAA;AAAE,uGAAA,WAAW,OAAA;AAAE,gGAAA,IAAI,OAAA;AAAE,iGAAA,KAAK,OAAA;AAAE,yGAAA,aAAa,OAAA;AAAE,2GAAA,eAAe,OAAA;AACvE,qDAA6C;AAApC,2GAAA,QAAQ,OAAA;AACjB,mDAAkH;AAAzG,+GAAA,aAAa,OAAA;AAEtB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AAGvB,8EAA8E;AAC9E,+DAA+D;AAC/D,8DAA4C","sourcesContent":["export {\n  Packager,\n  PackagerConstructor,\n  Variant,\n  applyVariantToBabelConfig,\n  getAppMeta,\n  getPackagerCacheDir,\n} from './packager';\nexport { HTMLEntrypoint, BundleSummary } from './html-entrypoint';\nexport { default as Stage } from './stage';\nexport { default as Options, optionsWithDefaults } from './options';\nexport { default as WaitForTrees, OutputPaths } from './wait-for-trees';\nexport { compile as jsHandlebarsCompile } from './js-handlebars';\nexport { todo, unsupported, warn, debug, expectWarning, throwOnWarnings } from './messages';\nexport { Resolver } from './module-resolver';\nexport { ModuleRequest, type Resolution, type RequestAdapter, type RequestAdapterCreate } from './module-request';\nexport type { Options as ResolverOptions } from './module-resolver-options';\nexport { ResolverLoader } from './resolver-loader';\nexport { virtualContent } from './virtual-content';\nexport type { Engine } from './app-files';\n\n// this is reexported because we already make users manage a peerDep from some\n// other packages (like embroider/webpack and @embroider/compat\nexport * from '@embroider/shared-internals';\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;AAAA,uCAOoB;AAHlB,qHAAA,yBAAyB,OAAA;AACzB,sGAAA,UAAU,OAAA;AACV,+GAAA,mBAAmB,OAAA;AAErB,qDAAkE;AAAzD,iHAAA,cAAc,OAAA;AAEvB,qCAAoE;AAAvC,8GAAA,mBAAmB,OAAA;AAChD,mDAAwE;AAA/D,+HAAA,OAAO,OAAgB;AAChC,iDAAiE;AAAxD,oHAAA,OAAO,OAAuB;AACvC,uCAA4F;AAAnF,gGAAA,IAAI,OAAA;AAAE,uGAAA,WAAW,OAAA;AAAE,gGAAA,IAAI,OAAA;AAAE,iGAAA,KAAK,OAAA;AAAE,yGAAA,aAAa,OAAA;AAAE,2GAAA,eAAe,OAAA;AACvE,qDAA6C;AAApC,2GAAA,QAAQ,OAAA;AACjB,mDAAkH;AAAzG,+GAAA,aAAa,OAAA;AAEtB,qDAAmD;AAA1C,iHAAA,cAAc,OAAA;AACvB,qDAAyE;AAAhE,iHAAA,cAAc,OAAA;AAGvB,8EAA8E;AAC9E,+DAA+D;AAC/D,8DAA4C","sourcesContent":["export {\n  Packager,\n  PackagerConstructor,\n  Variant,\n  applyVariantToBabelConfig,\n  getAppMeta,\n  getPackagerCacheDir,\n} from './packager';\nexport { HTMLEntrypoint, BundleSummary } from './html-entrypoint';\nexport { default as Stage } from './stage';\nexport { default as Options, optionsWithDefaults } from './options';\nexport { default as WaitForTrees, OutputPaths } from './wait-for-trees';\nexport { compile as jsHandlebarsCompile } from './js-handlebars';\nexport { todo, unsupported, warn, debug, expectWarning, throwOnWarnings } from './messages';\nexport { Resolver } from './module-resolver';\nexport { ModuleRequest, type Resolution, type RequestAdapter, type RequestAdapterCreate } from './module-request';\nexport type { Options as ResolverOptions } from './module-resolver-options';\nexport { ResolverLoader } from './resolver-loader';\nexport { virtualContent, type VirtualResponse } from './virtual-content';\nexport type { Engine } from './app-files';\n\n// this is reexported because we already make users manage a peerDep from some\n// other packages (like embroider/webpack and @embroider/compat\nexport * from '@embroider/shared-internals';\n"]}

package/src/module-request.d.ts

@@ -1,10 +1,8 @@
+import type { VirtualResponse } from './virtual-content';
 export type Resolution<T = unknown, E = unknown> = {
     type: 'found';
     filename: string;
-    isVirtual: boolean;
-    result: T;
-} | {
-    type: 'ignored';
+    virtual: VirtualResponse | false;
     result: T;
 } | {
     type: 'not_found';
@@ -17,6 +15,8 @@ export type RequestAdapterCreate<Init, Res extends Resolution> = (params: Init)
 export interface RequestAdapter<Res extends Resolution> {
     readonly debugType: string;
     resolve(request: ModuleRequest<Res>): Promise<Res>;
+    notFoundResponse(request: ModuleRequest<Res>): Res | (() => Promise<Res>);
+    virtualResponse(request: ModuleRequest<Res>, response: VirtualResponse): Res | (() => Promise<Res>);
 }
 export interface InitialRequestState {
     readonly specifier: string;
@@ -29,16 +29,15 @@ export declare class ModuleRequest<Res extends Resolution = Resolution> implemen
     private constructor();
     get specifier(): string;
     get fromFile(): string;
-    get isVirtual(): boolean;
     get debugType(): string;
     get meta(): Record<string, unknown> | undefined;
-    get isNotFound(): boolean;
-    get resolvedTo(): Res | undefined;
+    get resolvedTo(): Res | (() => Promise<Res>) | undefined;
     alias(newSpecifier: string): this;
     rehome(newFromFile: string): this;
-    virtualize(virtualFileName: string): this;
+    virtualize(virtualResponse: VirtualResponse): this;
     withMeta(meta: Record<string, any> | undefined): this;
     notFound(): this;
-    resolveTo(res: Res): this;
+    resolveTo(res: Res | (() => Promise<Res>)): this;
     defaultResolve(): Promise<Res>;
+    clone(): this;
 }

package/src/module-request.js

@@ -10,33 +10,26 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _ModuleRequest_instances, _a, _ModuleRequest_adapter, _ModuleRequest_specifier, _ModuleRequest_fromFile, _ModuleRequest_isVirtual, _ModuleRequest_meta, _ModuleRequest_isNotFound, _ModuleRequest_resolvedTo, _ModuleRequest_clone;
+var _ModuleRequest_adapter, _ModuleRequest_specifier, _ModuleRequest_fromFile, _ModuleRequest_meta, _ModuleRequest_resolvedTo;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ModuleRequest = void 0;
 class ModuleRequest {
     static create(createAdapter, params) {
         let result = createAdapter(params);
         if (result) {
-            return new _a(result.adapter, result.initialState);
+            return new ModuleRequest(result.adapter, result.initialState);
         }
     }
-    constructor(adapter, initialize, propagate) {
-        var _b, _c;
-        _ModuleRequest_instances.add(this);
+    constructor(adapter, initialize) {
         _ModuleRequest_adapter.set(this, void 0);
         _ModuleRequest_specifier.set(this, void 0);
         _ModuleRequest_fromFile.set(this, void 0);
-        _ModuleRequest_isVirtual.set(this, void 0);
         _ModuleRequest_meta.set(this, void 0);
-        _ModuleRequest_isNotFound.set(this, void 0);
         _ModuleRequest_resolvedTo.set(this, void 0);
         __classPrivateFieldSet(this, _ModuleRequest_adapter, adapter, "f");
         __classPrivateFieldSet(this, _ModuleRequest_specifier, initialize.specifier, "f");
         __classPrivateFieldSet(this, _ModuleRequest_fromFile, initialize.fromFile, "f");
         __classPrivateFieldSet(this, _ModuleRequest_meta, initialize.meta, "f");
-        __classPrivateFieldSet(this, _ModuleRequest_isVirtual, (_b = propagate === null || propagate === void 0 ? void 0 : propagate.isVirtual) !== null && _b !== void 0 ? _b : false, "f");
-        __classPrivateFieldSet(this, _ModuleRequest_isNotFound, (_c = propagate === null || propagate === void 0 ? void 0 : propagate.isNotFound) !== null && _c !== void 0 ? _c : false, "f");
-        __classPrivateFieldSet(this, _ModuleRequest_resolvedTo, propagate === null || propagate === void 0 ? void 0 : propagate.resolvedTo, "f");
     }
     get specifier() {
         return __classPrivateFieldGet(this, _ModuleRequest_specifier, "f");
@@ -44,18 +37,12 @@ class ModuleRequest {
     get fromFile() {
         return __classPrivateFieldGet(this, _ModuleRequest_fromFile, "f");
     }
-    get isVirtual() {
-        return __classPrivateFieldGet(this, _ModuleRequest_isVirtual, "f");
-    }
     get debugType() {
         return __classPrivateFieldGet(this, _ModuleRequest_adapter, "f").debugType;
     }
     get meta() {
         return __classPrivateFieldGet(this, _ModuleRequest_meta, "f");
     }
-    get isNotFound() {
-        return __classPrivateFieldGet(this, _ModuleRequest_isNotFound, "f");
-    }
     get resolvedTo() {
         return __classPrivateFieldGet(this, _ModuleRequest_resolvedTo, "f");
     }
@@ -63,51 +50,42 @@ class ModuleRequest {
         if (__classPrivateFieldGet(this, _ModuleRequest_specifier, "f") === newSpecifier) {
             return this;
         }
-        let result = __classPrivateFieldGet(this, _ModuleRequest_instances, "m", _ModuleRequest_clone).call(this);
+        let result = this.clone();
         __classPrivateFieldSet(result, _ModuleRequest_specifier, newSpecifier, "f");
-        __classPrivateFieldSet(result, _ModuleRequest_isNotFound, false, "f");
-        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, undefined, "f");
         return result;
     }
     rehome(newFromFile) {
         if (__classPrivateFieldGet(this, _ModuleRequest_fromFile, "f") === newFromFile) {
             return this;
         }
-        let result = __classPrivateFieldGet(this, _ModuleRequest_instances, "m", _ModuleRequest_clone).call(this);
+        let result = this.clone();
         __classPrivateFieldSet(result, _ModuleRequest_fromFile, newFromFile, "f");
-        __classPrivateFieldSet(result, _ModuleRequest_isNotFound, false, "f");
-        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, undefined, "f");
         return result;
     }
-    virtualize(virtualFileName) {
-        let result = __classPrivateFieldGet(this, _ModuleRequest_instances, "m", _ModuleRequest_clone).call(this);
-        __classPrivateFieldSet(result, _ModuleRequest_specifier, virtualFileName, "f");
-        __classPrivateFieldSet(result, _ModuleRequest_isVirtual, true, "f");
-        __classPrivateFieldSet(result, _ModuleRequest_isNotFound, false, "f");
-        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, undefined, "f");
-        return result;
+    virtualize(virtualResponse) {
+        return this.resolveTo(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f").virtualResponse(this, virtualResponse));
     }
     withMeta(meta) {
-        let result = __classPrivateFieldGet(this, _ModuleRequest_instances, "m", _ModuleRequest_clone).call(this);
+        let result = this.clone();
         __classPrivateFieldSet(result, _ModuleRequest_meta, meta, "f");
+        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, __classPrivateFieldGet(this, _ModuleRequest_resolvedTo, "f"), "f");
         return result;
     }
     notFound() {
-        let result = __classPrivateFieldGet(this, _ModuleRequest_instances, "m", _ModuleRequest_clone).call(this);
-        __classPrivateFieldSet(result, _ModuleRequest_isNotFound, true, "f");
-        return result;
+        return this.resolveTo(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f").notFoundResponse(this));
     }
     resolveTo(res) {
-        let result = __classPrivateFieldGet(this, _ModuleRequest_instances, "m", _ModuleRequest_clone).call(this);
+        let result = this.clone();
         __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, res, "f");
         return result;
     }
     defaultResolve() {
         return __classPrivateFieldGet(this, _ModuleRequest_adapter, "f").resolve(this);
     }
+    clone() {
+        return new ModuleRequest(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f"), this);
+    }
 }
 exports.ModuleRequest = ModuleRequest;
-_a = ModuleRequest, _ModuleRequest_adapter = new WeakMap(), _ModuleRequest_specifier = new WeakMap(), _ModuleRequest_fromFile = new WeakMap(), _ModuleRequest_isVirtual = new WeakMap(), _ModuleRequest_meta = new WeakMap(), _ModuleRequest_isNotFound = new WeakMap(), _ModuleRequest_resolvedTo = new WeakMap(), _ModuleRequest_instances = new WeakSet(), _ModuleRequest_clone = function _ModuleRequest_clone() {
-    return new _a(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f"), this, this);
-};
+_ModuleRequest_adapter = new WeakMap(), _ModuleRequest_specifier = new WeakMap(), _ModuleRequest_fromFile = new WeakMap(), _ModuleRequest_meta = new WeakMap(), _ModuleRequest_resolvedTo = new WeakMap();
 //# sourceMappingURL=module-request.js.map

package/src/module-request.js.map

@@ -1 +1 @@
-{"version":3,"file":"module-request.js","sourceRoot":"","sources":["module-request.ts"],"names":[],"mappings":"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","sourcesContent":["// This is generic because different build systems have different ways of\n// representing a found module, and we just pass those values through.\nexport type Resolution<T = unknown, E = unknown> =\n  | { type: 'found'; filename: string; isVirtual: boolean; result: T }\n\n  // used for requests that are special and don't represent real files that\n  // embroider can possibly do anything custom with.\n  //\n  // the motivating use case for introducing this is Vite's depscan which marks\n  // almost everything as \"external\" as a way to tell esbuild to stop traversing\n  // once it has been seen the first time.\n  | { type: 'ignored'; result: T }\n\n  // the important thing about this Resolution is that embroider should do its\n  // fallback behaviors here.\n  | { type: 'not_found'; err: E };\n\nexport type RequestAdapterCreate<Init, Res extends Resolution> = (\n  params: Init\n) => { initialState: InitialRequestState; adapter: RequestAdapter<Res> } | undefined;\n\nexport interface RequestAdapter<Res extends Resolution> {\n  readonly debugType: string;\n  resolve(request: ModuleRequest<Res>): Promise<Res>;\n}\n\nexport interface InitialRequestState {\n  readonly specifier: string;\n  readonly fromFile: string;\n  readonly meta: Record<string, unknown> | undefined;\n}\n\nexport class ModuleRequest<Res extends Resolution = Resolution> implements ModuleRequest<Res> {\n  static create<Init, Res extends Resolution>(\n    createAdapter: RequestAdapterCreate<Init, Res>,\n    params: Init\n  ): ModuleRequest<Res> | undefined {\n    let result = createAdapter(params);\n    if (result) {\n      return new ModuleRequest(result.adapter, result.initialState);\n    }\n  }\n\n  #adapter: RequestAdapter<Res>;\n  #specifier: string;\n  #fromFile: string;\n  #isVirtual: boolean;\n  #meta: Record<string, unknown> | undefined;\n  #isNotFound: boolean;\n  #resolvedTo: Res | undefined;\n\n  private constructor(\n    adapter: RequestAdapter<Res>,\n    initialize: InitialRequestState,\n    propagate?: { isVirtual: boolean; isNotFound: boolean; resolvedTo: Res | undefined }\n  ) {\n    this.#adapter = adapter;\n    this.#specifier = initialize.specifier;\n    this.#fromFile = initialize.fromFile;\n    this.#meta = initialize.meta;\n    this.#isVirtual = propagate?.isVirtual ?? false;\n    this.#isNotFound = propagate?.isNotFound ?? false;\n    this.#resolvedTo = propagate?.resolvedTo;\n  }\n\n  get specifier(): string {\n    return this.#specifier;\n  }\n\n  get fromFile(): string {\n    return this.#fromFile;\n  }\n\n  get isVirtual(): boolean {\n    return this.#isVirtual;\n  }\n\n  get debugType(): string {\n    return this.#adapter.debugType;\n  }\n\n  get meta(): Record<string, unknown> | undefined {\n    return this.#meta;\n  }\n\n  get isNotFound(): boolean {\n    return this.#isNotFound;\n  }\n\n  get resolvedTo(): Res | undefined {\n    return this.#resolvedTo;\n  }\n\n  alias(newSpecifier: string): this {\n    if (this.#specifier === newSpecifier) {\n      return this;\n    }\n    let result = this.#clone();\n    result.#specifier = newSpecifier;\n    result.#isNotFound = false;\n    result.#resolvedTo = undefined;\n    return result;\n  }\n\n  rehome(newFromFile: string): this {\n    if (this.#fromFile === newFromFile) {\n      return this;\n    }\n    let result = this.#clone();\n    result.#fromFile = newFromFile;\n    result.#isNotFound = false;\n    result.#resolvedTo = undefined;\n    return result;\n  }\n\n  virtualize(virtualFileName: string): this {\n    let result = this.#clone();\n    result.#specifier = virtualFileName;\n    result.#isVirtual = true;\n    result.#isNotFound = false;\n    result.#resolvedTo = undefined;\n    return result;\n  }\n\n  withMeta(meta: Record<string, any> | undefined): this {\n    let result = this.#clone();\n    result.#meta = meta;\n    return result;\n  }\n\n  notFound(): this {\n    let result = this.#clone();\n    result.#isNotFound = true;\n    return result;\n  }\n\n  resolveTo(res: Res): this {\n    let result = this.#clone();\n    result.#resolvedTo = res;\n    return result;\n  }\n\n  defaultResolve(): Promise<Res> {\n    return this.#adapter.resolve(this);\n  }\n\n  #clone(): this {\n    return new ModuleRequest(this.#adapter, this, this) as this;\n  }\n}\n"]}
+{"version":3,"file":"module-request.js","sourceRoot":"","sources":["module-request.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;AAgCA,MAAa,aAAa;IACxB,MAAM,CAAC,MAAM,CACX,aAA8C,EAC9C,MAAY;QAEZ,IAAI,MAAM,GAAG,aAAa,CAAC,MAAM,CAAC,CAAC;QACnC,IAAI,MAAM,EAAE,CAAC;YACX,OAAO,IAAI,aAAa,CAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,YAAY,CAAC,CAAC;QAChE,CAAC;IACH,CAAC;IAQD,YAAoB,OAA4B,EAAE,UAA+B;QANjF,yCAA8B;QAC9B,2CAAmB;QACnB,0CAAkB;QAClB,sCAA2C;QAC3C,4CAAoD;QAGlD,uBAAA,IAAI,0BAAY,OAAO,MAAA,CAAC;QACxB,uBAAA,IAAI,4BAAc,UAAU,CAAC,SAAS,MAAA,CAAC;QACvC,uBAAA,IAAI,2BAAa,UAAU,CAAC,QAAQ,MAAA,CAAC;QACrC,uBAAA,IAAI,uBAAS,UAAU,CAAC,IAAI,MAAA,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,uBAAA,IAAI,gCAAW,CAAC;IACzB,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,uBAAA,IAAI,+BAAU,CAAC;IACxB,CAAC;IAED,IAAI,SAAS;QACX,OAAO,uBAAA,IAAI,8BAAS,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,uBAAA,IAAI,2BAAM,CAAC;IACpB,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,uBAAA,IAAI,iCAAY,CAAC;IAC1B,CAAC;IAED,KAAK,CAAC,YAAoB;QACxB,IAAI,uBAAA,IAAI,gCAAW,KAAK,YAAY,EAAE,CAAC;YACrC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,4BAAc,YAAY,MAAA,CAAC;QACjC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,MAAM,CAAC,WAAmB;QACxB,IAAI,uBAAA,IAAI,+BAAU,KAAK,WAAW,EAAE,CAAC;YACnC,OAAO,IAAI,CAAC;QACd,CAAC;QACD,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,2BAAa,WAAW,MAAA,CAAC;QAC/B,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,UAAU,CAAC,eAAgC;QACzC,OAAO,IAAI,CAAC,SAAS,CAAC,uBAAA,IAAI,8BAAS,CAAC,eAAe,CAAC,IAAI,EAAE,eAAe,CAAC,CAAC,CAAC;IAC9E,CAAC;IAED,QAAQ,CAAC,IAAqC;QAC5C,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,uBAAS,IAAI,MAAA,CAAC;QACpB,uBAAA,MAAM,6BAAe,uBAAA,IAAI,iCAAY,MAAA,CAAC;QACtC,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,QAAQ;QACN,OAAO,IAAI,CAAC,SAAS,CAAC,uBAAA,IAAI,8BAAS,CAAC,gBAAgB,CAAC,IAAI,CAAC,CAAC,CAAC;IAC9D,CAAC;IAED,SAAS,CAAC,GAA+B;QACvC,IAAI,MAAM,GAAG,IAAI,CAAC,KAAK,EAAE,CAAC;QAC1B,uBAAA,MAAM,6BAAe,GAAG,MAAA,CAAC;QACzB,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,cAAc;QACZ,OAAO,uBAAA,IAAI,8BAAS,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IACrC,CAAC;IAED,KAAK;QACH,OAAO,IAAI,aAAa,CAAC,uBAAA,IAAI,8BAAS,EAAE,IAAI,CAAS,CAAC;IACxD,CAAC;CACF;AA1FD,sCA0FC","sourcesContent":["import type { VirtualResponse } from './virtual-content';\n\n// This is generic because different build systems have different ways of\n// representing a found module, and we just pass those values through.\nexport type Resolution<T = unknown, E = unknown> =\n  | { type: 'found'; filename: string; virtual: VirtualResponse | false; result: T }\n\n  // the important thing about this Resolution is that embroider should do its\n  // fallback behaviors here.\n  | { type: 'not_found'; err: E };\n\nexport type RequestAdapterCreate<Init, Res extends Resolution> = (\n  params: Init\n) => { initialState: InitialRequestState; adapter: RequestAdapter<Res> } | undefined;\n\nexport interface RequestAdapter<Res extends Resolution> {\n  readonly debugType: string;\n  resolve(request: ModuleRequest<Res>): Promise<Res>;\n\n  // the function-returning variants of both of these are only because webpack\n  // plugins are a pain in the butt. Integrators are encouraged to use the plain\n  // Response-returning variants in all sane build environments.\n  notFoundResponse(request: ModuleRequest<Res>): Res | (() => Promise<Res>);\n  virtualResponse(request: ModuleRequest<Res>, response: VirtualResponse): Res | (() => Promise<Res>);\n}\n\nexport interface InitialRequestState {\n  readonly specifier: string;\n  readonly fromFile: string;\n  readonly meta: Record<string, unknown> | undefined;\n}\n\nexport class ModuleRequest<Res extends Resolution = Resolution> implements ModuleRequest<Res> {\n  static create<Init, Res extends Resolution>(\n    createAdapter: RequestAdapterCreate<Init, Res>,\n    params: Init\n  ): ModuleRequest<Res> | undefined {\n    let result = createAdapter(params);\n    if (result) {\n      return new ModuleRequest(result.adapter, result.initialState);\n    }\n  }\n\n  #adapter: RequestAdapter<Res>;\n  #specifier: string;\n  #fromFile: string;\n  #meta: Record<string, unknown> | undefined;\n  #resolvedTo: Res | (() => Promise<Res>) | undefined;\n\n  private constructor(adapter: RequestAdapter<Res>, initialize: InitialRequestState) {\n    this.#adapter = adapter;\n    this.#specifier = initialize.specifier;\n    this.#fromFile = initialize.fromFile;\n    this.#meta = initialize.meta;\n  }\n\n  get specifier(): string {\n    return this.#specifier;\n  }\n\n  get fromFile(): string {\n    return this.#fromFile;\n  }\n\n  get debugType(): string {\n    return this.#adapter.debugType;\n  }\n\n  get meta(): Record<string, unknown> | undefined {\n    return this.#meta;\n  }\n\n  get resolvedTo(): Res | (() => Promise<Res>) | undefined {\n    return this.#resolvedTo;\n  }\n\n  alias(newSpecifier: string): this {\n    if (this.#specifier === newSpecifier) {\n      return this;\n    }\n    let result = this.clone();\n    result.#specifier = newSpecifier;\n    return result;\n  }\n\n  rehome(newFromFile: string): this {\n    if (this.#fromFile === newFromFile) {\n      return this;\n    }\n    let result = this.clone();\n    result.#fromFile = newFromFile;\n    return result;\n  }\n\n  virtualize(virtualResponse: VirtualResponse): this {\n    return this.resolveTo(this.#adapter.virtualResponse(this, virtualResponse));\n  }\n\n  withMeta(meta: Record<string, any> | undefined): this {\n    let result = this.clone();\n    result.#meta = meta;\n    result.#resolvedTo = this.#resolvedTo;\n    return result;\n  }\n\n  notFound(): this {\n    return this.resolveTo(this.#adapter.notFoundResponse(this));\n  }\n\n  resolveTo(res: Res | (() => Promise<Res>)): this {\n    let result = this.clone();\n    result.#resolvedTo = res;\n    return result;\n  }\n\n  defaultResolve(): Promise<Res> {\n    return this.#adapter.resolve(this);\n  }\n\n  clone(): this {\n    return new ModuleRequest(this.#adapter, this) as this;\n  }\n}\n"]}

package/src/module-resolver.js

@@ -24,6 +24,7 @@ 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 virtual_entrypoint_1 = require("./virtual-entrypoint");
 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
@@ -36,10 +37,7 @@ debug_1.default.formatters.p = (s) => {
     return s;
 };
 function logTransition(reason, before, after = before) {
-    if (after.isVirtual) {
-        debug(`[%s:virtualized] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
-    }
-    else if (after.resolvedTo) {
+    if (after.resolvedTo) {
         debug(`[%s:resolvedTo] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
     }
     else if (before.specifier !== after.specifier) {
@@ -53,17 +51,11 @@ function logTransition(reason, before, after = before) {
     else if (before.fromFile !== after.fromFile) {
         debug(`[%s:rehomed] %s, because %s\n  from    %p\n  to      %p`, before.debugType, before.specifier, reason, before.fromFile, after.fromFile);
     }
-    else if (after.isNotFound) {
-        debug(`[%s:not-found] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
-    }
     else {
         debug(`[%s:unchanged] %s because %s\n  in    %p`, before.debugType, before.specifier, reason, before.fromFile);
     }
     return after;
 }
-function isTerminal(request) {
-    return request.isVirtual || request.isNotFound || Boolean(request.resolvedTo);
-}
 const compatPattern = /@embroider\/virtual\/(?<type>[^\/]+)\/(?<rest>.*)/;
 class Resolver {
     constructor(options) {
@@ -102,36 +94,43 @@ class Resolver {
     // rules.
     async resolve(request) {
         request = await this.beforeResolve(request);
+        let resolution;
         if (request.resolvedTo) {
-            return request.resolvedTo;
+            if (typeof request.resolvedTo === 'function') {
+                resolution = await request.resolvedTo();
+            }
+            else {
+                resolution = request.resolvedTo;
+            }
+        }
+        else {
+            resolution = await request.defaultResolve();
         }
-        let resolution = await request.defaultResolve();
         switch (resolution.type) {
             case 'found':
-            case 'ignored':
                 return resolution;
             case 'not_found':
                 break;
             default:
                 throw (0, assert_never_1.default)(resolution);
         }
+        request = request.clone();
         let nextRequest = await this.fallbackResolve(request);
         if (nextRequest === request) {
             // no additional fallback is available.
             return resolution;
         }
         if (nextRequest.resolvedTo) {
-            return nextRequest.resolvedTo;
+            if (typeof nextRequest.resolvedTo === 'function') {
+                return await nextRequest.resolvedTo();
+            }
+            else {
+                return 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.');
         }
-        if (nextRequest.isVirtual || nextRequest.isNotFound) {
-            // virtual and NotFound requests are terminal, there is no more
-            // beforeResolve or fallbackResolve around them. The defaultResolve is
-            // expected to know how to implement them.
-            return nextRequest.defaultResolve();
-        }
         return this.resolve(nextRequest);
     }
     // Use standard NodeJS resolving, with our required compatibility rules on
@@ -155,7 +154,7 @@ class Resolver {
         return owningPackage;
     }
     generateFastbootSwitch(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let pkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -183,7 +182,7 @@ class Resolver {
                             return logTransition('internal lookup from fastbootSwitch', request);
                         }
                         else {
-                            return logTransition('shadowed app fastboot', request, request.virtualize(switchFile));
+                            return logTransition('shadowed app fastboot', request, request.virtualize({ type: 'fastboot-switch', specifier: switchFile }));
                         }
                     }
                     else {
@@ -196,7 +195,7 @@ class Resolver {
     }
     handleFastbootSwitch(request) {
         var _a;
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let match = (0, virtual_content_1.decodeFastbootSwitch)(request.fromFile);
@@ -243,7 +242,7 @@ class Resolver {
         return logTransition('failed to match in fastboot switch', request);
     }
     handleImplicitModules(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let im = (0, virtual_content_1.decodeImplicitModules)(request.specifier);
@@ -257,51 +256,26 @@ class Resolver {
         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`)));
+            return logTransition(`dep's implicit modules`, request, request.virtualize({ type: im.type, specifier: (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`)));
+            return logTransition(`own implicit modules`, request, request.virtualize({ type: im.type, specifier: (0, path_1.resolve)(pkg.root, `-embroider-${im.type}.js`) }));
         }
     }
     handleEntrypoint(request) {
-        var _a;
-        if (isTerminal(request)) {
-            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)) {
+        if (request.resolvedTo) {
             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);
+        let virtualResponse = (0, virtual_entrypoint_1.virtualEntrypoint)(request, this.packageCache);
+        if (virtualResponse) {
+            return logTransition('entrypoint', request, request.virtualize(virtualResponse));
         }
         else {
-            pkg = requestingPkg;
+            return request;
         }
-        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')));
     }
     handleRouteEntrypoint(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let routeName = (0, virtual_route_entrypoint_1.decodePublicRouteEntrypoint)(request.specifier);
@@ -312,11 +286,7 @@ class Resolver {
         if (!(pkg === null || pkg === void 0 ? void 0 : 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', {
-            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)));
+        return logTransition('route entrypoint', request, request.virtualize({ type: 'route-entrypoint', specifier: (0, virtual_route_entrypoint_1.encodeRouteEntrypoint)(pkg, routeName) }));
     }
     handleImplicitTestScripts(request) {
         //TODO move the extra forwardslash handling out into the vite plugin
@@ -332,7 +302,7 @@ class Resolver {
         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
@@ -348,10 +318,13 @@ class Resolver {
         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 (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let match = compatPattern.exec(request.specifier);
@@ -391,7 +364,7 @@ class Resolver {
         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);
@@ -404,9 +377,7 @@ class Resolver {
         // 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;
@@ -415,12 +386,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.
@@ -433,7 +399,10 @@ 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',
+                specifier: (0, virtual_content_1.virtualPairComponent)(this.options.appRoot, hbsModule.filename, jsModule === null || jsModule === void 0 ? void 0 : jsModule.filename),
+            }));
         }
         else if (jsModule) {
             return logTransition(`resolving to resolveComponent found only JS`, request, request.resolveTo(jsModule));
@@ -447,13 +416,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
@@ -631,7 +595,7 @@ class Resolver {
         });
     }
     handleRewrittenPackages(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let requestingPkg = this.packageCache.ownerOfFile(request.fromFile);
@@ -684,7 +648,7 @@ class Resolver {
         return request;
     }
     handleRenaming(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let packageName = (0, shared_internals_1.packageName)(request.specifier);
@@ -769,7 +733,7 @@ class Resolver {
         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 = ['..'];
@@ -786,7 +750,7 @@ class Resolver {
         return newRequest.withMeta({ originalFromFile });
     }
     preHandleExternal(request) {
-        if (isTerminal(request)) {
+        if (request.resolvedTo) {
             return request;
         }
         let { specifier, fromFile } = request;
@@ -866,8 +830,8 @@ class Resolver {
         }
     }
     async fallbackResolve(request) {
-        if (request.isVirtual) {
-            throw new Error('Build tool bug detected! Fallback resolve should never see a virtual request. It is expected that the defaultResolve for your bundler has already resolved this request');
+        if (request.resolvedTo) {
+            throw new Error('Build tool bug detected! Fallback resolve should never see an already-resolved request.');
         }
         if (request.specifier === '@embroider/macros') {
             // the macros package is always handled directly within babel (not
@@ -1025,14 +989,15 @@ 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({
+                    type: 'fastboot-switch',
+                    specifier: (0, virtual_content_1.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