@embroider/core 3.0.1 → 3.0.2-unstable.3936fdb

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@embroider/core",
-  "version": "3.0.1",
+  "version": "3.0.2-unstable.3936fdb",
   "private": false,
   "description": "A build system for EmberJS applications.",
   "repository": {
@@ -16,6 +16,9 @@
     "src/**/*.d.ts",
     "src/**/*.js.map"
   ],
+  "scripts": {
+    "test": "jest"
+  },
   "dependencies": {
     "@babel/core": "^7.14.5",
     "@babel/parser": "^7.14.5",
@@ -23,6 +26,8 @@
     "@babel/plugin-transform-runtime": "^7.14.5",
     "@babel/runtime": "^7.14.5",
     "@babel/traverse": "^7.14.5",
+    "@embroider/macros": "1.11.1-unstable.3936fdb",
+    "@embroider/shared-internals": "2.1.1-unstable.3936fdb",
     "assert-never": "^1.2.1",
     "babel-plugin-ember-template-compilation": "^2.0.0",
     "broccoli-node-api": "^1.7.0",
@@ -42,11 +47,11 @@
     "resolve": "^1.20.0",
     "resolve-package-path": "^4.0.1",
     "typescript-memoize": "^1.0.1",
-    "walk-sync": "^3.0.0",
-    "@embroider/macros": "1.11.0",
-    "@embroider/shared-internals": "2.1.0"
+    "walk-sync": "^3.0.0"
   },
   "devDependencies": {
+    "@embroider/sample-transforms": "workspace:*",
+    "@embroider/test-support": "workspace:*",
     "@glimmer/syntax": "^0.84.2",
     "@glint/template": "^1.0.0",
     "@types/babel__core": "^7.1.14",
@@ -61,17 +66,12 @@
     "@types/tmp": "^0.1.0",
     "fixturify": "^2.1.1",
     "tmp": "^0.1.0",
-    "typescript": "^4.9.0",
-    "@embroider/test-support": "0.36.0",
-    "@embroider/sample-transforms": "0.0.0"
+    "typescript": "^4.9.0"
   },
   "engines": {
     "node": "12.* || 14.* || >= 16"
   },
   "volta": {
     "extends": "../../package.json"
-  },
-  "scripts": {
-    "test": "jest"
   }
-}
+}

package/LICENSE

@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2018 Edward Faulkner
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.

package/src/rewritten-package-cache.d.ts

@@ -1,23 +0,0 @@
-import { PackageCache, Package } from '@embroider/shared-internals';
-export interface RewrittenPackageIndex {
-    packages: Record<string, string>;
-    extraResolutions: Record<string, string[]>;
-}
-type PublicAPI<T> = {
-    [K in keyof T]: T[K];
-};
-type PackageCacheTheGoodParts = Omit<PublicAPI<PackageCache>, 'basedir' | 'seed' | 'shareAs'>;
-export declare class RewrittenPackageCache implements PackageCacheTheGoodParts {
-    private plainCache;
-    constructor(plainCache: PackageCache);
-    get appRoot(): string;
-    resolve(packageName: string, fromPackage: Package): Package;
-    private maybeMoved;
-    get(packageRoot: string): Package;
-    original(pkg: Package): Package | undefined;
-    ownerOfFile(filename: string): Package | undefined;
-    private get index();
-    private maybeWrap;
-    static shared(identifier: string, appRoot: string): RewrittenPackageCache;
-}
-export {};

package/src/rewritten-package-cache.js

@@ -1,231 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RewrittenPackageCache = void 0;
-const shared_internals_1 = require("@embroider/shared-internals");
-const fs_extra_1 = require("fs-extra");
-const path_1 = require("path");
-const typescript_memoize_1 = require("typescript-memoize");
-class RewrittenPackageCache {
-    constructor(plainCache) {
-        this.plainCache = plainCache;
-    }
-    get appRoot() {
-        return this.plainCache.appRoot;
-    }
-    resolve(packageName, fromPackage) {
-        let oldRoot = this.index.newToOld.get(fromPackage.root);
-        if (!oldRoot) {
-            // the fromPackage has not been moved, so we're just providing the plain
-            // behavior.
-            return this.plainCache.resolve(packageName, fromPackage);
-        }
-        // check for any extraResolutions
-        let extraResolutions = this.index.extraResolutions.get(fromPackage.root);
-        if (extraResolutions) {
-            for (let depRoot of extraResolutions) {
-                let depPkg = this.plainCache.get(depRoot);
-                if (depPkg.name === packageName) {
-                    return this.maybeMoved(depPkg);
-                }
-            }
-        }
-        // do the real resolving from the old location
-        let oldSrc = this.plainCache.get(oldRoot);
-        let oldDest = this.plainCache.resolve(packageName, oldSrc);
-        // and if the package we found was itself moved return the moved one.
-        return this.maybeMoved(oldDest);
-    }
-    // ensure we have the moved version of the package
-    maybeMoved(pkg) {
-        let newRoot = this.index.oldToNew.get(pkg.root);
-        if (newRoot) {
-            return this.get(newRoot);
-        }
-        else {
-            return pkg;
-        }
-    }
-    get(packageRoot) {
-        return this.maybeWrap(this.plainCache.get(packageRoot));
-    }
-    original(pkg) {
-        let oldRoot = this.index.newToOld.get(pkg.root);
-        if (oldRoot) {
-            return this.plainCache.get(oldRoot);
-        }
-    }
-    ownerOfFile(filename) {
-        let owner = this.plainCache.ownerOfFile(filename);
-        if (owner) {
-            return this.maybeWrap(owner);
-        }
-    }
-    get index() {
-        let addonsDir = (0, path_1.resolve)(this.appRoot, 'node_modules', '.embroider', 'rewritten-packages');
-        let indexFile = (0, path_1.resolve)(addonsDir, 'index.json');
-        if ((0, fs_extra_1.existsSync)(indexFile)) {
-            // I should probably make the else case throw here soon.
-            let { packages, extraResolutions } = (0, fs_extra_1.readJSONSync)(indexFile);
-            return {
-                oldToNew: new Map(Object.entries(packages).map(([oldRoot, newRoot]) => [
-                    (0, path_1.resolve)(addonsDir, oldRoot),
-                    (0, path_1.resolve)(addonsDir, newRoot),
-                ])),
-                newToOld: new Map(Object.entries(packages).map(([oldRoot, newRoot]) => [
-                    (0, path_1.resolve)(addonsDir, newRoot),
-                    (0, path_1.resolve)(addonsDir, oldRoot),
-                ])),
-                extraResolutions: new Map(Object.entries(extraResolutions).map(([fromRoot, toRoots]) => [
-                    (0, path_1.resolve)(addonsDir, fromRoot),
-                    toRoots.map(r => (0, path_1.resolve)(addonsDir, r)),
-                ])),
-            };
-        }
-        return { oldToNew: new Map(), newToOld: new Map(), extraResolutions: new Map() };
-    }
-    // put a WrappedPackage around Packages that do in fact represent ones that we
-    // have moved, leaving other Packages alone.
-    maybeWrap(pkg) {
-        let oldRoot = this.index.newToOld.get(pkg.root);
-        if (oldRoot) {
-            let found = wrapped.get(pkg);
-            if (!found) {
-                found = new MovedPackage(this, pkg);
-                wrapped.set(pkg, found);
-            }
-            return castToPackage(found);
-        }
-        else {
-            return pkg;
-        }
-    }
-    static shared(identifier, appRoot) {
-        let pk = (0, shared_internals_1.getOrCreate)(shared, identifier + appRoot, () => new RewrittenPackageCache(shared_internals_1.PackageCache.shared(identifier, appRoot)));
-        if (pk.appRoot !== appRoot) {
-            throw new Error(`bug: PackageCache appRoot disagreement ${appRoot}!=${pk.appRoot}`);
-        }
-        return pk;
-    }
-}
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], RewrittenPackageCache.prototype, "index", null);
-exports.RewrittenPackageCache = RewrittenPackageCache;
-const shared = new Map();
-const wrapped = new WeakMap();
-// TODO: this goes with the above TODO and can get deleted when it does.
-function castToPackage(m) {
-    return m;
-}
-class MovedPackage {
-    // plainPkg is not the Package in the original un-moved location, it's the
-    // plain representation of the moved location. That is, when you grab
-    // plainPkg.root it will show the new location, and plainPkg.packageJSON shows
-    // the rewritten package.json contained there.
-    //
-    // The point of MovedPackage is to finesse the parts of plainPkg that wouldn't
-    // be correct if you used them directly. For example, plainPkg.dependencies
-    // won't necessarily even work, because if you try to resolve them from the
-    // moved location they might not be there.
-    constructor(packageCache, plainPkg) {
-        this.packageCache = packageCache;
-        this.plainPkg = plainPkg;
-    }
-    get root() {
-        return this.plainPkg.root;
-    }
-    get name() {
-        return this.plainPkg.name;
-    }
-    get version() {
-        return this.plainPkg.version;
-    }
-    get packageJSON() {
-        return this.plainPkg.packageJSON;
-    }
-    get meta() {
-        return this.plainPkg.meta;
-    }
-    get isEmberPackage() {
-        return this.plainPkg.isEmberPackage;
-    }
-    get isEngine() {
-        return this.plainPkg.isEngine;
-    }
-    get isLazyEngine() {
-        return this.plainPkg.isLazyEngine;
-    }
-    get isV2Ember() {
-        return this.plainPkg.isV2Ember;
-    }
-    get isV2App() {
-        return this.plainPkg.isV2App;
-    }
-    get isV2Addon() {
-        return this.plainPkg.isV2Addon;
-    }
-    // it's important that we're calling this.dependencies here at this level, not
-    // plainPkg.dependencies, which wouldn't be correct
-    findDescendants(filter) {
-        let pkgs = new Set();
-        let queue = [castToPackage(this)];
-        while (true) {
-            let pkg = queue.shift();
-            if (!pkg) {
-                break;
-            }
-            if (!pkgs.has(pkg)) {
-                pkgs.add(pkg);
-                let nextLevel;
-                if (filter) {
-                    nextLevel = pkg.dependencies.filter(filter);
-                }
-                else {
-                    nextLevel = pkg.dependencies;
-                }
-                nextLevel.forEach(d => queue.push(d));
-            }
-        }
-        pkgs.delete(castToPackage(this));
-        return [...pkgs.values()];
-    }
-    get mayRebuild() {
-        return this.plainPkg.mayRebuild;
-    }
-    get dependencyNames() {
-        return this.plainPkg.dependencyNames;
-    }
-    get dependencies() {
-        return this.plainPkg.dependencyNames
-            .map(name => {
-            try {
-                return this.packageCache.resolve(name, castToPackage(this));
-            }
-            catch (error) {
-                // if the package was not found do not error out here. this is relevant
-                // for the case where a package might be an optional peerDependency and we dont
-                // want to error if it was not found. Additionally, erroring here is "far" away
-                // from the actual logical failure point and so not failing here will provide a better
-                // error message down the line
-                if (error.code === 'MODULE_NOT_FOUND') {
-                    return false;
-                }
-                throw error;
-            }
-        })
-            .filter(Boolean);
-    }
-    hasDependency(name) {
-        // this is *not* extended because it's understood that the rewritten package
-        // should explictly list the things that need extraResolutions in its own
-        // package.json.ß
-        return this.plainPkg.hasDependency(name);
-    }
-}
-//# sourceMappingURL=rewritten-package-cache.js.map

package/src/rewritten-package-cache.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rewritten-package-cache.js","sourceRoot":"","sources":["rewritten-package-cache.ts"],"names":[],"mappings":";;;;;;;;;AAAA,kEAAiF;AACjF,uCAAoD;AACpD,+BAA+B;AAC/B,2DAA6C;AA8B7C,MAAa,qBAAqB;IAChC,YAAoB,UAAwB;QAAxB,eAAU,GAAV,UAAU,CAAc;IAAG,CAAC;IAEhD,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC;IACjC,CAAC;IAED,OAAO,CAAC,WAAmB,EAAE,WAAoB;QAC/C,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACxD,IAAI,CAAC,OAAO,EAAE;YACZ,wEAAwE;YACxE,YAAY;YACZ,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,WAAW,CAAC,CAAC;SAC1D;QAED,iCAAiC;QACjC,IAAI,gBAAgB,GAAG,IAAI,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QACzE,IAAI,gBAAgB,EAAE;YACpB,KAAK,IAAI,OAAO,IAAI,gBAAgB,EAAE;gBACpC,IAAI,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;gBAC1C,IAAI,MAAM,CAAC,IAAI,KAAK,WAAW,EAAE;oBAC/B,OAAO,IAAI,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC;iBAChC;aACF;SACF;QAED,8CAA8C;QAC9C,IAAI,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;QAC1C,IAAI,OAAO,GAAG,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,WAAW,EAAE,MAAM,CAAC,CAAC;QAE3D,qEAAqE;QACrE,OAAO,IAAI,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC;IAClC,CAAC;IAED,kDAAkD;IAC1C,UAAU,CAAC,GAAY;QAC7B,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,OAAO,EAAE;YACX,OAAO,IAAI,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAC1B;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC;IAED,GAAG,CAAC,WAAmB;QACrB,OAAO,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IAC1D,CAAC;IAED,QAAQ,CAAC,GAAY;QACnB,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,OAAO,EAAE;YACX,OAAO,IAAI,CAAC,UAAU,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SACrC;IACH,CAAC;IAED,WAAW,CAAC,QAAgB;QAC1B,IAAI,KAAK,GAAG,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC;QAClD,IAAI,KAAK,EAAE;YACT,OAAO,IAAI,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC;SAC9B;IACH,CAAC;IAGD,IAAY,KAAK;QAKf,IAAI,SAAS,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,oBAAoB,CAAC,CAAC;QAC1F,IAAI,SAAS,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,YAAY,CAAC,CAAC;QACjD,IAAI,IAAA,qBAAU,EAAC,SAAS,CAAC,EAAE;YACzB,wDAAwD;YACxD,IAAI,EAAE,QAAQ,EAAE,gBAAgB,EAAE,GAAG,IAAA,uBAAY,EAAC,SAAS,CAA0B,CAAC;YACtF,OAAO;gBACL,QAAQ,EAAE,IAAI,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;oBACnD,IAAA,cAAO,EAAC,SAAS,EAAE,OAAO,CAAC;oBAC3B,IAAA,cAAO,EAAC,SAAS,EAAE,OAAO,CAAC;iBAC5B,CAAC,CACH;gBACD,QAAQ,EAAE,IAAI,GAAG,CACf,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;oBACnD,IAAA,cAAO,EAAC,SAAS,EAAE,OAAO,CAAC;oBAC3B,IAAA,cAAO,EAAC,SAAS,EAAE,OAAO,CAAC;iBAC5B,CAAC,CACH;gBACD,gBAAgB,EAAE,IAAI,GAAG,CACvB,MAAM,CAAC,OAAO,CAAC,gBAAgB,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,QAAQ,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC;oBAC5D,IAAA,cAAO,EAAC,SAAS,EAAE,QAAQ,CAAC;oBAC5B,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,IAAA,cAAO,EAAC,SAAS,EAAE,CAAC,CAAC,CAAC;iBACxC,CAAC,CACH;aACF,CAAC;SACH;QACD,OAAO,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,QAAQ,EAAE,IAAI,GAAG,EAAE,EAAE,gBAAgB,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IACnF,CAAC;IAED,8EAA8E;IAC9E,4CAA4C;IACpC,SAAS,CAAC,GAAY;QAC5B,IAAI,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAChD,IAAI,OAAO,EAAE;YACX,IAAI,KAAK,GAAG,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;YAC7B,IAAI,CAAC,KAAK,EAAE;gBACV,KAAK,GAAG,IAAI,YAAY,CAAC,IAAI,EAAE,GAAG,CAAC,CAAC;gBACpC,OAAO,CAAC,GAAG,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC;aACzB;YACD,OAAO,aAAa,CAAC,KAAK,CAAC,CAAC;SAC7B;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC;IACD,MAAM,CAAC,MAAM,CAAC,UAAkB,EAAE,OAAe;QAC/C,IAAI,EAAE,GAAG,IAAA,8BAAW,EAClB,MAAM,EACN,UAAU,GAAG,OAAO,EACpB,GAAG,EAAE,CAAC,IAAI,qBAAqB,CAAC,+BAAY,CAAC,MAAM,CAAC,UAAU,EAAE,OAAO,CAAC,CAAC,CAC1E,CAAC;QACF,IAAI,EAAE,CAAC,OAAO,KAAK,OAAO,EAAE;YAC1B,MAAM,IAAI,KAAK,CAAC,0CAA0C,OAAO,KAAK,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC;SACrF;QACD,OAAO,EAAE,CAAC;IACZ,CAAC;CACF;AA5DC;IADC,IAAA,4BAAO,GAAE;kDAiCT;AA/FH,sDA2HC;AAED,MAAM,MAAM,GAAuC,IAAI,GAAG,EAAE,CAAC;AAC7D,MAAM,OAAO,GAAG,IAAI,OAAO,EAAyB,CAAC;AAMrD,wEAAwE;AACxE,SAAS,aAAa,CAAC,CAAe;IACpC,OAAO,CAAuB,CAAC;AACjC,CAAC;AAED,MAAM,YAAY;IAChB,0EAA0E;IAC1E,qEAAqE;IACrE,8EAA8E;IAC9E,8CAA8C;IAC9C,EAAE;IACF,8EAA8E;IAC9E,2EAA2E;IAC3E,2EAA2E;IAC3E,0CAA0C;IAC1C,YAAoB,YAAmC,EAAU,QAAiB;QAA9D,iBAAY,GAAZ,YAAY,CAAuB;QAAU,aAAQ,GAAR,QAAQ,CAAS;IAAG,CAAC;IAEtF,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,IAAI,WAAW;QACb,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC;IACnC,CAAC;IAED,IAAI,IAAI;QACN,OAAO,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;IAC5B,CAAC;IAED,IAAI,cAAc;QAChB,OAAO,IAAI,CAAC,QAAQ,CAAC,cAAc,CAAC;IACtC,CAAC;IAED,IAAI,QAAQ;QACV,OAAO,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC;IAChC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,YAAY,CAAC;IACpC,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,IAAI,OAAO;QACT,OAAO,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC;IAC/B,CAAC;IAED,IAAI,SAAS;QACX,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC;IACjC,CAAC;IAED,8EAA8E;IAC9E,mDAAmD;IACnD,eAAe,CAAC,MAAkC;QAChD,IAAI,IAAI,GAAG,IAAI,GAAG,EAAW,CAAC;QAC9B,IAAI,KAAK,GAAc,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QAC7C,OAAO,IAAI,EAAE;YACX,IAAI,GAAG,GAAG,KAAK,CAAC,KAAK,EAAE,CAAC;YACxB,IAAI,CAAC,GAAG,EAAE;gBACR,MAAM;aACP;YACD,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;gBAClB,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;gBACd,IAAI,SAAS,CAAC;gBACd,IAAI,MAAM,EAAE;oBACV,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iBAC7C;qBAAM;oBACL,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC;iBAC9B;gBACD,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;aACvC;SACF;QACD,IAAI,CAAC,MAAM,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;QACjC,OAAO,CAAC,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;IAC5B,CAAC;IAED,IAAI,UAAU;QACZ,OAAO,IAAI,CAAC,QAAQ,CAAC,UAAU,CAAC;IAClC,CAAC;IAED,IAAI,eAAe;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC;IACvC,CAAC;IAED,IAAI,YAAY;QACd,OAAO,IAAI,CAAC,QAAQ,CAAC,eAAe;aACjC,GAAG,CAAC,IAAI,CAAC,EAAE;YACV,IAAI;gBACF,OAAO,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,IAAI,EAAE,aAAa,CAAC,IAAI,CAAC,CAAC,CAAC;aAC7D;YAAC,OAAO,KAAK,EAAE;gBACd,uEAAuE;gBACvE,+EAA+E;gBAC/E,+EAA+E;gBAC/E,sFAAsF;gBACtF,8BAA8B;gBAC9B,IAAI,KAAK,CAAC,IAAI,KAAK,kBAAkB,EAAE;oBACrC,OAAO,KAAK,CAAC;iBACd;gBAED,MAAM,KAAK,CAAC;aACb;QACH,CAAC,CAAC;aACD,MAAM,CAAC,OAAO,CAAc,CAAC;IAClC,CAAC;IAED,aAAa,CAAC,IAAY;QACxB,4EAA4E;QAC5E,yEAAyE;QACzE,iBAAiB;QACjB,OAAO,IAAI,CAAC,QAAQ,CAAC,aAAa,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;CACF","sourcesContent":["import { PackageCache, Package, getOrCreate } from '@embroider/shared-internals';\nimport { existsSync, readJSONSync } from 'fs-extra';\nimport { resolve } from 'path';\nimport { Memoize } from 'typescript-memoize';\n\nexport interface RewrittenPackageIndex {\n  // keys are paths to original package root directories.\n  //\n  // values are paths to rewritten directories.\n  //\n  // all paths are interpreted relative to the rewritten package index file\n  // itself.\n  packages: Record<string, string>;\n\n  // key is path to the rewritten package that needs to resolve an extra\n  // dependency\n  //\n  // value is list of paths to packages that it should be able to resolve.\n  //\n  // while the key is always one of our rewritten packages, the values can be\n  // rewritten ones or not.\n  extraResolutions: Record<string, string[]>;\n}\n\n// without this, using a class as an interface forces you to have the same\n// private and protected methods too (since people trying to extend from you\n// could see all of those)\ntype PublicAPI<T> = { [K in keyof T]: T[K] };\n\n// TODO: as our refactor lands we should be able to remove these things from\n// PackageCache itself.\ntype PackageCacheTheGoodParts = Omit<PublicAPI<PackageCache>, 'basedir' | 'seed' | 'shareAs'>;\n\nexport class RewrittenPackageCache implements PackageCacheTheGoodParts {\n  constructor(private plainCache: PackageCache) {}\n\n  get appRoot(): string {\n    return this.plainCache.appRoot;\n  }\n\n  resolve(packageName: string, fromPackage: Package): Package {\n    let oldRoot = this.index.newToOld.get(fromPackage.root);\n    if (!oldRoot) {\n      // the fromPackage has not been moved, so we're just providing the plain\n      // behavior.\n      return this.plainCache.resolve(packageName, fromPackage);\n    }\n\n    // check for any extraResolutions\n    let extraResolutions = this.index.extraResolutions.get(fromPackage.root);\n    if (extraResolutions) {\n      for (let depRoot of extraResolutions) {\n        let depPkg = this.plainCache.get(depRoot);\n        if (depPkg.name === packageName) {\n          return this.maybeMoved(depPkg);\n        }\n      }\n    }\n\n    // do the real resolving from the old location\n    let oldSrc = this.plainCache.get(oldRoot);\n    let oldDest = this.plainCache.resolve(packageName, oldSrc);\n\n    // and if the package we found was itself moved return the moved one.\n    return this.maybeMoved(oldDest);\n  }\n\n  // ensure we have the moved version of the package\n  private maybeMoved(pkg: Package): Package {\n    let newRoot = this.index.oldToNew.get(pkg.root);\n    if (newRoot) {\n      return this.get(newRoot);\n    } else {\n      return pkg;\n    }\n  }\n\n  get(packageRoot: string): Package {\n    return this.maybeWrap(this.plainCache.get(packageRoot));\n  }\n\n  original(pkg: Package): Package | undefined {\n    let oldRoot = this.index.newToOld.get(pkg.root);\n    if (oldRoot) {\n      return this.plainCache.get(oldRoot);\n    }\n  }\n\n  ownerOfFile(filename: string): Package | undefined {\n    let owner = this.plainCache.ownerOfFile(filename);\n    if (owner) {\n      return this.maybeWrap(owner);\n    }\n  }\n\n  @Memoize()\n  private get index(): {\n    oldToNew: Map<string, string>;\n    newToOld: Map<string, string>;\n    extraResolutions: Map<string, string[]>;\n  } {\n    let addonsDir = resolve(this.appRoot, 'node_modules', '.embroider', 'rewritten-packages');\n    let indexFile = resolve(addonsDir, 'index.json');\n    if (existsSync(indexFile)) {\n      // I should probably make the else case throw here soon.\n      let { packages, extraResolutions } = readJSONSync(indexFile) as RewrittenPackageIndex;\n      return {\n        oldToNew: new Map(\n          Object.entries(packages).map(([oldRoot, newRoot]) => [\n            resolve(addonsDir, oldRoot),\n            resolve(addonsDir, newRoot),\n          ])\n        ),\n        newToOld: new Map(\n          Object.entries(packages).map(([oldRoot, newRoot]) => [\n            resolve(addonsDir, newRoot),\n            resolve(addonsDir, oldRoot),\n          ])\n        ),\n        extraResolutions: new Map(\n          Object.entries(extraResolutions).map(([fromRoot, toRoots]) => [\n            resolve(addonsDir, fromRoot),\n            toRoots.map(r => resolve(addonsDir, r)),\n          ])\n        ),\n      };\n    }\n    return { oldToNew: new Map(), newToOld: new Map(), extraResolutions: new Map() };\n  }\n\n  // put a WrappedPackage around Packages that do in fact represent ones that we\n  // have moved, leaving other Packages alone.\n  private maybeWrap(pkg: Package) {\n    let oldRoot = this.index.newToOld.get(pkg.root);\n    if (oldRoot) {\n      let found = wrapped.get(pkg);\n      if (!found) {\n        found = new MovedPackage(this, pkg);\n        wrapped.set(pkg, found);\n      }\n      return castToPackage(found);\n    } else {\n      return pkg;\n    }\n  }\n  static shared(identifier: string, appRoot: string) {\n    let pk = getOrCreate(\n      shared,\n      identifier + appRoot,\n      () => new RewrittenPackageCache(PackageCache.shared(identifier, appRoot))\n    );\n    if (pk.appRoot !== appRoot) {\n      throw new Error(`bug: PackageCache appRoot disagreement ${appRoot}!=${pk.appRoot}`);\n    }\n    return pk;\n  }\n}\n\nconst shared: Map<string, RewrittenPackageCache> = new Map();\nconst wrapped = new WeakMap<Package, MovedPackage>();\n\n// TODO: as our refactor lands we should be able to remove this from Package\n// itself.\ntype PackageTheGoodParts = Omit<PublicAPI<Package>, 'nonResolvableDeps'>;\n\n// TODO: this goes with the above TODO and can get deleted when it does.\nfunction castToPackage(m: MovedPackage): Package {\n  return m as unknown as Package;\n}\n\nclass MovedPackage implements PackageTheGoodParts {\n  // plainPkg is not the Package in the original un-moved location, it's the\n  // plain representation of the moved location. That is, when you grab\n  // plainPkg.root it will show the new location, and plainPkg.packageJSON shows\n  // the rewritten package.json contained there.\n  //\n  // The point of MovedPackage is to finesse the parts of plainPkg that wouldn't\n  // be correct if you used them directly. For example, plainPkg.dependencies\n  // won't necessarily even work, because if you try to resolve them from the\n  // moved location they might not be there.\n  constructor(private packageCache: RewrittenPackageCache, private plainPkg: Package) {}\n\n  get root() {\n    return this.plainPkg.root;\n  }\n\n  get name() {\n    return this.plainPkg.name;\n  }\n\n  get version() {\n    return this.plainPkg.version;\n  }\n\n  get packageJSON() {\n    return this.plainPkg.packageJSON;\n  }\n\n  get meta() {\n    return this.plainPkg.meta;\n  }\n\n  get isEmberPackage() {\n    return this.plainPkg.isEmberPackage;\n  }\n\n  get isEngine() {\n    return this.plainPkg.isEngine;\n  }\n\n  get isLazyEngine() {\n    return this.plainPkg.isLazyEngine;\n  }\n\n  get isV2Ember() {\n    return this.plainPkg.isV2Ember;\n  }\n\n  get isV2App() {\n    return this.plainPkg.isV2App;\n  }\n\n  get isV2Addon() {\n    return this.plainPkg.isV2Addon;\n  }\n\n  // it's important that we're calling this.dependencies here at this level, not\n  // plainPkg.dependencies, which wouldn't be correct\n  findDescendants(filter?: (pkg: Package) => boolean): Package[] {\n    let pkgs = new Set<Package>();\n    let queue: Package[] = [castToPackage(this)];\n    while (true) {\n      let pkg = queue.shift();\n      if (!pkg) {\n        break;\n      }\n      if (!pkgs.has(pkg)) {\n        pkgs.add(pkg);\n        let nextLevel;\n        if (filter) {\n          nextLevel = pkg.dependencies.filter(filter);\n        } else {\n          nextLevel = pkg.dependencies;\n        }\n        nextLevel.forEach(d => queue.push(d));\n      }\n    }\n    pkgs.delete(castToPackage(this));\n    return [...pkgs.values()];\n  }\n\n  get mayRebuild() {\n    return this.plainPkg.mayRebuild;\n  }\n\n  get dependencyNames() {\n    return this.plainPkg.dependencyNames;\n  }\n\n  get dependencies() {\n    return this.plainPkg.dependencyNames\n      .map(name => {\n        try {\n          return this.packageCache.resolve(name, castToPackage(this));\n        } catch (error) {\n          // if the package was not found do not error out here. this is relevant\n          // for the case where a package might be an optional peerDependency and we dont\n          // want to error if it was not found. Additionally, erroring here is \"far\" away\n          // from the actual logical failure point and so not failing here will provide a better\n          // error message down the line\n          if (error.code === 'MODULE_NOT_FOUND') {\n            return false;\n          }\n\n          throw error;\n        }\n      })\n      .filter(Boolean) as Package[];\n  }\n\n  hasDependency(name: string): boolean {\n    // this is *not* extended because it's understood that the rewritten package\n    // should explictly list the things that need extraResolutions in its own\n    // package.json.ß\n    return this.plainPkg.hasDependency(name);\n  }\n}\n"]}

package/src/rewritten-packages.d.ts

@@ -1,9 +0,0 @@
-import { Package } from '@embroider/shared-internals';
-export declare class RewrittenPackages {
-    private appRoot;
-    constructor(appRoot: string);
-    rewrittenTo(packageRoot: string): string | undefined;
-    rewrittenFrom(packageRoot: string): string | undefined;
-    map(pkg: Package): Package;
-    private get rewrittenPackagesIndex();
-}

package/src/rewritten-packages.js

@@ -1,50 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.RewrittenPackages = void 0;
-const typescript_memoize_1 = require("typescript-memoize");
-const fs_extra_1 = require("fs-extra");
-const path_1 = require("path");
-const shared_internals_1 = require("@embroider/shared-internals");
-class RewrittenPackages {
-    constructor(appRoot) {
-        this.appRoot = appRoot;
-    }
-    rewrittenTo(packageRoot) {
-        return this.rewrittenPackagesIndex.v1ToV2.get(packageRoot);
-    }
-    rewrittenFrom(packageRoot) {
-        return this.rewrittenPackagesIndex.v2ToV1.get(packageRoot);
-    }
-    map(pkg) {
-        let newRoot = this.rewrittenTo(pkg.root);
-        if (newRoot) {
-            return shared_internals_1.PackageCache.shared('embroider-stage3', this.appRoot).get(newRoot);
-        }
-        else {
-            return pkg;
-        }
-    }
-    get rewrittenPackagesIndex() {
-        let addonsDir = (0, path_1.resolve)(this.appRoot, 'node_modules', '.embroider', 'addons');
-        let indexFile = (0, path_1.resolve)(addonsDir, 'v1-addon-index.json');
-        if ((0, fs_extra_1.existsSync)(indexFile)) {
-            let { v1Addons } = (0, fs_extra_1.readJSONSync)(indexFile);
-            return {
-                v1ToV2: new Map(Object.entries(v1Addons).map(([oldRoot, relativeNewRoot]) => [oldRoot, (0, path_1.resolve)(addonsDir, relativeNewRoot)])),
-                v2ToV1: new Map(Object.entries(v1Addons).map(([oldRoot, relativeNewRoot]) => [(0, path_1.resolve)(addonsDir, relativeNewRoot), oldRoot])),
-            };
-        }
-        return { v1ToV2: new Map(), v2ToV1: new Map() };
-    }
-}
-__decorate([
-    (0, typescript_memoize_1.Memoize)()
-], RewrittenPackages.prototype, "rewrittenPackagesIndex", null);
-exports.RewrittenPackages = RewrittenPackages;
-//# sourceMappingURL=rewritten-packages.js.map

package/src/rewritten-packages.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"rewritten-packages.js","sourceRoot":"","sources":["rewritten-packages.ts"],"names":[],"mappings":";;;;;;;;;AAAA,2DAA6C;AAC7C,uCAAoD;AACpD,+BAA+B;AAC/B,kEAAoE;AAEpE,MAAa,iBAAiB;IAC5B,YAAoB,OAAe;QAAf,YAAO,GAAP,OAAO,CAAQ;IAAG,CAAC;IAEvC,WAAW,CAAC,WAAmB;QAC7B,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,aAAa,CAAC,WAAmB;QAC/B,OAAO,IAAI,CAAC,sBAAsB,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;IAC7D,CAAC;IAED,GAAG,CAAC,GAAY;QACd,IAAI,OAAO,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QACzC,IAAI,OAAO,EAAE;YACX,OAAO,+BAAY,CAAC,MAAM,CAAC,kBAAkB,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC;SAC3E;aAAM;YACL,OAAO,GAAG,CAAC;SACZ;IACH,CAAC;IAGD,IAAY,sBAAsB;QAChC,IAAI,SAAS,GAAG,IAAA,cAAO,EAAC,IAAI,CAAC,OAAO,EAAE,cAAc,EAAE,YAAY,EAAE,QAAQ,CAAC,CAAC;QAC9E,IAAI,SAAS,GAAG,IAAA,cAAO,EAAC,SAAS,EAAE,qBAAqB,CAAC,CAAC;QAC1D,IAAI,IAAA,qBAAU,EAAC,SAAS,CAAC,EAAE;YACzB,IAAI,EAAE,QAAQ,EAAE,GAAG,IAAA,uBAAY,EAAC,SAAS,CAAyC,CAAC;YACnF,OAAO;gBACL,MAAM,EAAE,IAAI,GAAG,CACb,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC,OAAO,EAAE,IAAA,cAAO,EAAC,SAAS,EAAE,eAAe,CAAC,CAAC,CAAC,CAC7G;gBACD,MAAM,EAAE,IAAI,GAAG,CACb,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,OAAO,EAAE,eAAe,CAAC,EAAE,EAAE,CAAC,CAAC,IAAA,cAAO,EAAC,SAAS,EAAE,eAAe,CAAC,EAAE,OAAO,CAAC,CAAC,CAC7G;aACF,CAAC;SACH;QACD,OAAO,EAAE,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,MAAM,EAAE,IAAI,GAAG,EAAE,EAAE,CAAC;IAClD,CAAC;CACF;AAhBC;IADC,IAAA,4BAAO,GAAE;+DAgBT;AApCH,8CAqCC","sourcesContent":["import { Memoize } from 'typescript-memoize';\nimport { readJSONSync, existsSync } from 'fs-extra';\nimport { resolve } from 'path';\nimport { Package, PackageCache } from '@embroider/shared-internals';\n\nexport class RewrittenPackages {\n  constructor(private appRoot: string) {}\n\n  rewrittenTo(packageRoot: string): string | undefined {\n    return this.rewrittenPackagesIndex.v1ToV2.get(packageRoot);\n  }\n\n  rewrittenFrom(packageRoot: string): string | undefined {\n    return this.rewrittenPackagesIndex.v2ToV1.get(packageRoot);\n  }\n\n  map(pkg: Package): Package {\n    let newRoot = this.rewrittenTo(pkg.root);\n    if (newRoot) {\n      return PackageCache.shared('embroider-stage3', this.appRoot).get(newRoot);\n    } else {\n      return pkg;\n    }\n  }\n\n  @Memoize()\n  private get rewrittenPackagesIndex(): { v1ToV2: Map<string, string>; v2ToV1: Map<string, string> } {\n    let addonsDir = resolve(this.appRoot, 'node_modules', '.embroider', 'addons');\n    let indexFile = resolve(addonsDir, 'v1-addon-index.json');\n    if (existsSync(indexFile)) {\n      let { v1Addons } = readJSONSync(indexFile) as { v1Addons: Record<string, string> };\n      return {\n        v1ToV2: new Map(\n          Object.entries(v1Addons).map(([oldRoot, relativeNewRoot]) => [oldRoot, resolve(addonsDir, relativeNewRoot)])\n        ),\n        v2ToV1: new Map(\n          Object.entries(v1Addons).map(([oldRoot, relativeNewRoot]) => [resolve(addonsDir, relativeNewRoot), oldRoot])\n        ),\n      };\n    }\n    return { v1ToV2: new Map(), v2ToV1: new Map() };\n  }\n}\n"]}