@embroider/core 3.4.20-unstable.947c6d2 → 3.4.20-unstable.b470496

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.4.20-unstable.947c6d2",
+  "version": "3.4.20-unstable.b470496",
   "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/reverse-exports": "0.1.1-unstable.947c6d2",
-    "@embroider/shared-internals": "2.8.2-unstable.947c6d2",
-    "@embroider/macros": "1.16.10-unstable.947c6d2"
+    "@embroider/reverse-exports": "0.1.1-unstable.b470496",
+    "@embroider/shared-internals": "2.8.2-unstable.b470496",
+    "@embroider/macros": "1.16.10-unstable.b470496"
   },
   "devDependencies": {
     "@glimmer/syntax": "^0.84.2",
@@ -63,15 +63,15 @@
     "@types/js-string-escape": "^1.0.0",
     "@types/jsdom": "^16.2.11",
     "@types/lodash": "^4.14.170",
-    "@types/node": "^15.12.2",
+    "@types/node": "^22.9.3",
     "@types/resolve": "^1.20.0",
     "@types/semver": "^7.3.5",
     "@types/tmp": "^0.1.0",
     "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
     "typescript": "^5.4.5",
-    "@embroider/test-support": "0.36.0",
-    "@embroider/sample-transforms": "0.0.0"
+    "@embroider/sample-transforms": "0.0.0",
+    "@embroider/test-support": "0.36.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"

package/src/index.d.ts

@@ -2,13 +2,13 @@ export { Packager, PackagerConstructor, Variant, applyVariantToBabelConfig, getA
 export { HTMLEntrypoint, BundleSummary } from './html-entrypoint';
 export { default as Stage } from './stage';
 export { default as Options, optionsWithDefaults } from './options';
-export { default as toBroccoliPlugin } from './to-broccoli-plugin';
 export { default as WaitForTrees, OutputPaths } from './wait-for-trees';
 export { compile as jsHandlebarsCompile } from './js-handlebars';
 export { todo, unsupported, warn, debug, expectWarning, throwOnWarnings } from './messages';
-export { Resolver, ModuleRequest, Resolution } from './module-resolver';
+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

@@ -17,7 +17,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.virtualContent = exports.ResolverLoader = exports.Resolver = exports.throwOnWarnings = exports.expectWarning = exports.debug = exports.warn = exports.unsupported = exports.todo = exports.jsHandlebarsCompile = exports.WaitForTrees = exports.toBroccoliPlugin = exports.optionsWithDefaults = exports.HTMLEntrypoint = exports.getPackagerCacheDir = exports.getAppMeta = exports.applyVariantToBabelConfig = void 0;
+exports.virtualContent = exports.ResolverLoader = exports.ModuleRequest = exports.Resolver = exports.throwOnWarnings = exports.expectWarning = exports.debug = exports.warn = exports.unsupported = exports.todo = exports.jsHandlebarsCompile = exports.WaitForTrees = exports.optionsWithDefaults = exports.HTMLEntrypoint = exports.getPackagerCacheDir = exports.getAppMeta = exports.applyVariantToBabelConfig = void 0;
 var packager_1 = require("./packager");
 Object.defineProperty(exports, "applyVariantToBabelConfig", { enumerable: true, get: function () { return packager_1.applyVariantToBabelConfig; } });
 Object.defineProperty(exports, "getAppMeta", { enumerable: true, get: function () { return packager_1.getAppMeta; } });
@@ -26,8 +26,6 @@ var html_entrypoint_1 = require("./html-entrypoint");
 Object.defineProperty(exports, "HTMLEntrypoint", { enumerable: true, get: function () { return html_entrypoint_1.HTMLEntrypoint; } });
 var options_1 = require("./options");
 Object.defineProperty(exports, "optionsWithDefaults", { enumerable: true, get: function () { return options_1.optionsWithDefaults; } });
-var to_broccoli_plugin_1 = require("./to-broccoli-plugin");
-Object.defineProperty(exports, "toBroccoliPlugin", { enumerable: true, get: function () { return __importDefault(to_broccoli_plugin_1).default; } });
 var wait_for_trees_1 = require("./wait-for-trees");
 Object.defineProperty(exports, "WaitForTrees", { enumerable: true, get: function () { return __importDefault(wait_for_trees_1).default; } });
 var js_handlebars_1 = require("./js-handlebars");
@@ -41,6 +39,8 @@ Object.defineProperty(exports, "expectWarning", { enumerable: true, get: functio
 Object.defineProperty(exports, "throwOnWarnings", { enumerable: true, get: function () { return messages_1.throwOnWarnings; } });
 var module_resolver_1 = require("./module-resolver");
 Object.defineProperty(exports, "Resolver", { enumerable: true, get: function () { return module_resolver_1.Resolver; } });
+var module_request_1 = require("./module-request");
+Object.defineProperty(exports, "ModuleRequest", { enumerable: true, get: function () { return module_request_1.ModuleRequest; } });
 var resolver_loader_1 = require("./resolver-loader");
 Object.defineProperty(exports, "ResolverLoader", { enumerable: true, get: function () { return resolver_loader_1.ResolverLoader; } });
 var virtual_content_1 = require("./virtual-content");

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,2DAAmE;AAA1D,uIAAA,OAAO,OAAoB;AACpC,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,qDAAwE;AAA/D,2GAAA,QAAQ,OAAA;AAEjB,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 toBroccoliPlugin } from './to-broccoli-plugin';\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, ModuleRequest, Resolution } from './module-resolver';\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

@@ -0,0 +1,43 @@
+import type { VirtualResponse } from './virtual-content';
+export type Resolution<T = unknown, E = unknown> = {
+    type: 'found';
+    filename: string;
+    virtual: VirtualResponse | false;
+    result: T;
+} | {
+    type: 'not_found';
+    err: E;
+};
+export type RequestAdapterCreate<Init, Res extends Resolution> = (params: Init) => {
+    initialState: InitialRequestState;
+    adapter: RequestAdapter<Res>;
+} | undefined;
+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;
+    readonly fromFile: string;
+    readonly meta: Record<string, unknown> | undefined;
+}
+export declare class ModuleRequest<Res extends Resolution = Resolution> implements ModuleRequest<Res> {
+    #private;
+    static create<Init, Res extends Resolution>(createAdapter: RequestAdapterCreate<Init, Res>, params: Init): ModuleRequest<Res> | undefined;
+    private constructor();
+    get specifier(): string;
+    get fromFile(): string;
+    get debugType(): string;
+    get meta(): Record<string, unknown> | undefined;
+    get resolvedTo(): Res | (() => Promise<Res>) | undefined;
+    alias(newSpecifier: string): this;
+    rehome(newFromFile: string): this;
+    virtualize(virtualResponse: VirtualResponse): this;
+    withMeta(meta: Record<string, any> | undefined): this;
+    notFound(): this;
+    resolveTo(res: Res | (() => Promise<Res>)): this;
+    defaultResolve(): Promise<Res>;
+    clone(): this;
+}

package/src/module-request.js

@@ -0,0 +1,91 @@
+"use strict";
+var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
+    if (kind === "m") throw new TypeError("Private method is not writable");
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
+    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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_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 ModuleRequest(result.adapter, result.initialState);
+        }
+    }
+    constructor(adapter, initialize) {
+        _ModuleRequest_adapter.set(this, void 0);
+        _ModuleRequest_specifier.set(this, void 0);
+        _ModuleRequest_fromFile.set(this, void 0);
+        _ModuleRequest_meta.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");
+    }
+    get specifier() {
+        return __classPrivateFieldGet(this, _ModuleRequest_specifier, "f");
+    }
+    get fromFile() {
+        return __classPrivateFieldGet(this, _ModuleRequest_fromFile, "f");
+    }
+    get debugType() {
+        return __classPrivateFieldGet(this, _ModuleRequest_adapter, "f").debugType;
+    }
+    get meta() {
+        return __classPrivateFieldGet(this, _ModuleRequest_meta, "f");
+    }
+    get resolvedTo() {
+        return __classPrivateFieldGet(this, _ModuleRequest_resolvedTo, "f");
+    }
+    alias(newSpecifier) {
+        if (__classPrivateFieldGet(this, _ModuleRequest_specifier, "f") === newSpecifier) {
+            return this;
+        }
+        let result = this.clone();
+        __classPrivateFieldSet(result, _ModuleRequest_specifier, newSpecifier, "f");
+        return result;
+    }
+    rehome(newFromFile) {
+        if (__classPrivateFieldGet(this, _ModuleRequest_fromFile, "f") === newFromFile) {
+            return this;
+        }
+        let result = this.clone();
+        __classPrivateFieldSet(result, _ModuleRequest_fromFile, newFromFile, "f");
+        return result;
+    }
+    virtualize(virtualResponse) {
+        return this.resolveTo(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f").virtualResponse(this, virtualResponse));
+    }
+    withMeta(meta) {
+        let result = this.clone();
+        __classPrivateFieldSet(result, _ModuleRequest_meta, meta, "f");
+        __classPrivateFieldSet(result, _ModuleRequest_resolvedTo, __classPrivateFieldGet(this, _ModuleRequest_resolvedTo, "f"), "f");
+        return result;
+    }
+    notFound() {
+        return this.resolveTo(__classPrivateFieldGet(this, _ModuleRequest_adapter, "f").notFoundResponse(this));
+    }
+    resolveTo(res) {
+        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;
+_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

@@ -0,0 +1 @@
+{"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.d.ts

@@ -1,34 +1,7 @@
 import type { Package } from '@embroider/shared-internals';
 import { RewrittenPackageCache } from '@embroider/shared-internals';
 import type { Options, EngineConfig } from './module-resolver-options';
-export interface ModuleRequest<Res extends Resolution = Resolution> {
-    readonly specifier: string;
-    readonly fromFile: string;
-    readonly isVirtual: boolean;
-    readonly meta: Record<string, unknown> | undefined;
-    readonly debugType: string;
-    readonly isNotFound: boolean;
-    readonly resolvedTo: Res | undefined;
-    alias(newSpecifier: string): this;
-    rehome(newFromFile: string): this;
-    virtualize(virtualFilename: string): this;
-    withMeta(meta: Record<string, any> | undefined): this;
-    notFound(): this;
-    defaultResolve(): Promise<Res>;
-    resolveTo(resolution: Res): this;
-}
-export type Resolution<T = unknown, E = unknown> = {
-    type: 'found';
-    filename: string;
-    isVirtual: boolean;
-    result: T;
-} | {
-    type: 'ignored';
-    result: T;
-} | {
-    type: 'not_found';
-    err: E;
-};
+import type { ModuleRequest, Resolution } from './module-request';
 export declare class Resolver {
     readonly options: Options;
     constructor(options: Options);