@embroider/core 0.29.0 → 0.33.0

package/src/portable-babel-config.js

@@ -3,11 +3,17 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const portable_plugin_config_1 = require("./portable-plugin-config");
+exports.makePortable = void 0;
+const path_1 = require("path");
 const resolve_1 = __importDefault(require("resolve"));
-class PortableBabelConfig extends portable_plugin_config_1.PortablePluginConfig {
-    constructor(config, resolveOptions) {
-        super(config);
+const portable_1 = require("./portable");
+function makePortable(config, resolveOptions, hints) {
+    return new PortableBabelConfig(resolveOptions, hints).convert(config);
+}
+exports.makePortable = makePortable;
+class PortableBabelConfig {
+    constructor(resolveOptions, hints) {
+        this.hints = hints;
         if ('resolve' in resolveOptions) {
             this.resolve = resolveOptions.resolve;
         }
@@ -16,23 +22,67 @@ class PortableBabelConfig extends portable_plugin_config_1.PortablePluginConfig
             this.resolve = (name) => resolve_1.default.sync(name, { basedir: resolveOptions.basedir });
         }
     }
-    makePortable(value, accessPath = []) {
-        if (accessPath.length === 2 && (accessPath[0] === 'plugins' || accessPath[0] === 'presets')) {
-            if (typeof value === 'string') {
-                return this.resolveBabelPlugin(value);
-            }
-            if (Array.isArray(value) && typeof value[0] === 'string') {
-                let result = [this.resolveBabelPlugin(value[0])];
-                if (value.length > 1) {
-                    result.push(this.makePortable(value[1], accessPath.concat('1')));
+    convert(config) {
+        let portable = new portable_1.Portable({
+            hints: this.hints,
+            dehydrate: (value, accessPath) => {
+                // this custom dehydrate hook handles babel plugins & presets. If we're
+                // not looking at plugins or presets, continue with stock Portable
+                // behavior
+                if (accessPath.length !== 2 || (accessPath[0] !== 'plugins' && accessPath[0] !== 'presets')) {
+                    return undefined;
                 }
-                if (value.length > 2) {
-                    result.push(value[2]);
+                // standardize to always handle an array
+                if (!Array.isArray(value)) {
+                    value = [value];
                 }
-                return result;
-            }
+                let [plugin, argument, asName] = value;
+                // string plugins need to get resolved correctly into absolute paths,
+                // so they will really be portable
+                if (typeof plugin === 'string') {
+                    plugin = this.resolveBabelPlugin(plugin);
+                }
+                // next we deal with serializability. Our Portable system already
+                // understands the protocol used by ember-cli-babel to identify plugin
+                // classes and get back to their serializable forms, so this will
+                // handle that case.
+                let dehydrated = portable.dehydrate([plugin, argument, asName], accessPath.concat('_internal'));
+                if (dehydrated.needsHydrate) {
+                    // we can eliminate the need for rehydration by going through our own
+                    // portable babel launcher
+                    return {
+                        value: [
+                            path_1.join(__dirname, 'portable-babel-launcher.js'),
+                            { module: dehydrated.value[0], arg: dehydrated.value[1], hints: this.hints },
+                            dehydrated.value[2] || `portable-babel-launcher-${accessPath[1]}`,
+                        ],
+                        needsHydrate: false,
+                        isParallelSafe: dehydrated.isParallelSafe,
+                    };
+                }
+                else {
+                    // trim back down our array, because trailing undefined will get
+                    // converted into null via json.stringify, and babel will complain
+                    // about that.
+                    while (dehydrated.value[dehydrated.value.length - 1] == null) {
+                        dehydrated.value.pop();
+                    }
+                    if (dehydrated.value.length === 1) {
+                        dehydrated.value = dehydrated.value[0];
+                    }
+                    return {
+                        value: dehydrated.value,
+                        needsHydrate: dehydrated.needsHydrate,
+                        isParallelSafe: dehydrated.isParallelSafe,
+                    };
+                }
+            },
+        });
+        let result = portable.dehydrate(config);
+        if (result.needsHydrate) {
+            throw new Error(`bug: portable babel configs aren't supposed to need hydration`);
         }
-        return super.makePortable(value, accessPath);
+        return { config: result.value, isParallelSafe: result.isParallelSafe };
     }
     // babel lets you use relative paths, absolute paths, package names, and
     // package name shorthands.
@@ -80,5 +130,4 @@ class PortableBabelConfig extends portable_plugin_config_1.PortablePluginConfig
         }
     }
 }
-exports.default = PortableBabelConfig;
 //# sourceMappingURL=portable-babel-config.js.map

package/src/portable-babel-config.js.map

@@ -1 +1 @@
-{"version":3,"file":"portable-babel-config.js","sourceRoot":"","sources":["portable-babel-config.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"portable-babel-config.js","sourceRoot":"","sources":["portable-babel-config.ts"],"names":[],"mappings":"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"}

package/src/portable-babel-launcher.d.ts

@@ -0,0 +1,6 @@
+import { PortableHint } from './portable';
+export default function babelLauncher(this: any, babel: any, launch: {
+    module: any;
+    arg: any;
+    hints: PortableHint[];
+}, key: string): any;

package/src/portable-babel-launcher.js

@@ -0,0 +1,75 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const portable_1 = require("./portable");
+function babelLauncher(babel, launch, key) {
+    let p = new portable_1.Portable({ hints: launch.hints });
+    let hydrated = p.hydrate(launch);
+    let module;
+    if (typeof hydrated.module === 'string') {
+        // eslint-disable-next-line @typescript-eslint/no-require-imports
+        module = require(hydrated.module);
+        if (module.__esModule) {
+            module = module.default;
+        }
+    }
+    else {
+        module = hydrated.module;
+    }
+    let plugin = module.call(this, babel, hydrated.arg, key);
+    let innerStates = new WeakMap();
+    function convertState(state) {
+        let innerState = innerStates.get(state);
+        if (!innerState) {
+            innerState = Object.assign({}, state, { opts: hydrated.arg });
+            innerStates.set(state, innerState);
+        }
+        return innerState;
+    }
+    function wrap1(original) {
+        if (typeof original === 'function') {
+            return function (state) {
+                return original.call(this, convertState(state));
+            };
+        }
+    }
+    function wrap2(original) {
+        return function (path, state) {
+            return original.call(this, path, convertState(state));
+        };
+    }
+    let visitorProxy = {
+        get(target, prop) {
+            let original = target[prop];
+            if (typeof original === 'function') {
+                return wrap2(original);
+            }
+            if (original && typeof original === 'object') {
+                let wrapped = {};
+                if (typeof original.exit === 'function') {
+                    wrapped.exit = wrap2(original.exit);
+                }
+                if (typeof original.enter === 'function') {
+                    wrapped.enter = wrap2(original.enter);
+                }
+                return wrapped;
+            }
+            return original;
+        },
+    };
+    return new Proxy(plugin, {
+        get(target, prop) {
+            let original = target[prop];
+            switch (prop) {
+                case 'pre':
+                case 'post':
+                    return wrap1(original);
+                case 'visitor':
+                    return new Proxy(original, visitorProxy);
+                default:
+                    return original;
+            }
+        },
+    });
+}
+exports.default = babelLauncher;
+//# sourceMappingURL=portable-babel-launcher.js.map

package/src/portable-babel-launcher.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"portable-babel-launcher.js","sourceRoot":"","sources":["portable-babel-launcher.ts"],"names":[],"mappings":"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"}

package/src/portable.d.ts

@@ -0,0 +1,23 @@
+export declare const protocol = "__embroider_portable_values__";
+export interface PortableResult {
+    value: any;
+    isParallelSafe: boolean;
+    needsHydrate: boolean;
+}
+export interface PortableHint {
+    requireFile: string;
+    useMethod?: string;
+}
+export declare class Portable {
+    private opts;
+    constructor(opts?: {
+        dehydrate?: (value: any, accessPath: string[]) => PortableResult | undefined;
+        hydrate?: (value: any, accessPath: string[]) => {
+            value: any;
+        } | undefined;
+        hints?: PortableHint[];
+    });
+    dehydrate(value: any, accessPath?: string[]): PortableResult;
+    hydrate(input: any, accessPath?: string[]): any;
+    get foundHints(): Map<any, PortableHint>;
+}

package/src/{portable-plugin-config.js → portable.js}

@@ -1,96 +1,93 @@
 "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;
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.PortablePluginConfig = exports.protocol = void 0;
-const js_handlebars_1 = require("./js-handlebars");
+exports.Portable = exports.protocol = void 0;
 const mapValues_1 = __importDefault(require("lodash/mapValues"));
 const assert_never_1 = __importDefault(require("assert-never"));
-exports.protocol = '__embroider_portable_plugin_values__';
+const typescript_memoize_1 = require("typescript-memoize");
+exports.protocol = '__embroider_portable_values__';
 const { globalValues, nonce } = setupGlobals();
-const template = js_handlebars_1.compile(`
-const { PortablePluginConfig } = require('{{{js-string-escape here}}}');
-module.exports = PortablePluginConfig.load({{{json-stringify portable 2}}});
-`);
-class PortablePluginConfig {
-    constructor(config) {
-        // these properties defined this way because we want getters that are
-        // enumerable own properties, such that they will run even when people do
-        // things like Object.assign us onto another object or json stringify us.
-        this.config = config;
-        this.here = __filename;
-        this.parallelSafeFlag = true;
-        this.portable = {}; // this just makes typescript happy, we overwrite it with the defineProperty below
-        Object.defineProperty(this, 'portable', {
-            enumerable: true,
-            get() {
-                return this.ensurePortable().portable;
-            },
-        });
-        this.isParallelSafe = true; // this just makes typescript happy, we overwrite it with the defineProperty below
-        Object.defineProperty(this, 'isParallelSafe', {
-            enumerable: true,
-            get() {
-                return this.ensurePortable().isParallelSafe;
-            },
-        });
+class Portable {
+    constructor(opts = {}) {
+        this.opts = opts;
     }
-    ensurePortable() {
-        if (!this.cachedPortable) {
-            this.cachedPortable = this.makePortable(this.config);
+    dehydrate(value, accessPath = []) {
+        if (this.opts.dehydrate) {
+            let result = this.opts.dehydrate.call(this, value, accessPath);
+            if (result) {
+                return result;
+            }
         }
-        return { portable: this.cachedPortable, isParallelSafe: this.parallelSafeFlag };
-    }
-    serialize() {
-        // this call to ensurePortable is not strictly needed, but it's cheap
-        // because of the cache and it keeps typescript happy since typescript can't
-        // see into our defineProperties.
-        this.ensurePortable();
-        return template({ portable: this.portable, here: this.here });
-    }
-    makePortable(value, accessPath = []) {
         if (value === null) {
-            return value;
+            return { value, isParallelSafe: true, needsHydrate: false };
         }
         let broccoli = maybeBroccoli(value);
         if (broccoli) {
-            return broccoli;
+            return { value: broccoli, isParallelSafe: true, needsHydrate: true };
         }
         let htmlbars = maybeHTMLBars(value);
         if (htmlbars) {
-            return htmlbars;
+            return { value: htmlbars, isParallelSafe: true, needsHydrate: true };
         }
         if (Array.isArray(value)) {
-            return value.map((element, index) => this.makePortable(element, accessPath.concat(String(index))));
+            let results = value.map((element, index) => this.dehydrate(element, accessPath.concat(String(index))));
+            return {
+                value: results.map(r => r.value),
+                isParallelSafe: results.every(r => r.isParallelSafe),
+                needsHydrate: results.some(r => r.needsHydrate),
+            };
         }
         switch (typeof value) {
             case 'string':
             case 'number':
             case 'boolean':
             case 'undefined':
-                return value;
+                return { value, isParallelSafe: true, needsHydrate: false };
             case 'object':
                 if (Object.getPrototypeOf(value) === Object.prototype) {
-                    return mapValues_1.default(value, (propertyValue, key) => this.makePortable(propertyValue, accessPath.concat(key)));
+                    let isParallelSafe = true;
+                    let needsHydrate = false;
+                    let result = mapValues_1.default(value, (propertyValue, key) => {
+                        let result = this.dehydrate(propertyValue, accessPath.concat(key));
+                        isParallelSafe = isParallelSafe && result.isParallelSafe;
+                        needsHydrate = needsHydrate || result.needsHydrate;
+                        return result.value;
+                    });
+                    return { value: result, isParallelSafe, needsHydrate };
                 }
         }
-        return this.globalPlaceholder(value);
-    }
-    globalPlaceholder(value) {
-        let index = globalValues.length;
-        globalValues.push(value);
-        this.parallelSafeFlag = false;
-        return {
-            embroiderPlaceholder: true,
-            type: 'global',
-            nonce,
-            index,
-        };
+        let found = this.foundHints.get(value);
+        if (found) {
+            return {
+                value: {
+                    embroiderPlaceholder: true,
+                    type: 'broccoli-parallel',
+                    requireFile: found.requireFile,
+                    useMethod: found.useMethod,
+                },
+                isParallelSafe: true,
+                needsHydrate: true,
+            };
+        }
+        return globalPlaceholder(value);
     }
-    static load(input) {
+    hydrate(input, accessPath = []) {
+        if (this.opts.hydrate) {
+            let result = this.opts.hydrate.call(this, input, accessPath);
+            if (result) {
+                return result;
+            }
+        }
         if (Array.isArray(input)) {
-            return input.map(element => this.load(element));
+            return input.map((element, index) => this.hydrate(element, accessPath.concat(String(index))));
         }
         if (input && typeof input === 'object') {
             if (input.embroiderPlaceholder) {
@@ -110,13 +107,30 @@ class PortablePluginConfig {
                 }
             }
             else {
-                return mapValues_1.default(input, value => this.load(value));
+                return mapValues_1.default(input, (value, key) => this.hydrate(value, accessPath.concat(key)));
             }
         }
         return input;
     }
+    get foundHints() {
+        let found = new Map();
+        if (this.opts.hints) {
+            for (let hint of this.opts.hints) {
+                // eslint-disable-next-line @typescript-eslint/no-require-imports
+                let mod = require(hint.requireFile);
+                if (hint.useMethod) {
+                    mod = mod[hint.useMethod];
+                }
+                found.set(mod, hint);
+            }
+        }
+        return found;
+    }
 }
-exports.PortablePluginConfig = PortablePluginConfig;
+__decorate([
+    typescript_memoize_1.Memoize()
+], Portable.prototype, "foundHints", null);
+exports.Portable = Portable;
 function setupGlobals() {
     let G = global;
     if (!G[exports.protocol]) {
@@ -184,4 +198,18 @@ function buildHTMLBars(parallelApiInfo) {
     }
     return requiredStuff[parallelApiInfo.buildUsing](parallelApiInfo.params);
 }
-//# sourceMappingURL=portable-plugin-config.js.map
+function globalPlaceholder(value) {
+    let index = globalValues.length;
+    globalValues.push(value);
+    return {
+        value: {
+            embroiderPlaceholder: true,
+            type: 'global',
+            nonce,
+            index,
+        },
+        isParallelSafe: false,
+        needsHydrate: true,
+    };
+}
+//# sourceMappingURL=portable.js.map

package/src/portable.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"portable.js","sourceRoot":"","sources":["portable.ts"],"names":[],"mappings":"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"}

package/src/resolver.d.ts

@@ -1,4 +1,4 @@
-import TemplateCompiler from './template-compiler';
+import { TemplateCompiler } from './template-compiler';
 export interface ResolvedDep {
     runtimeName: string;
     path: string;
@@ -7,5 +7,6 @@ export interface ResolvedDep {
 export interface Resolver {
     astTransformer(templateCompiler: TemplateCompiler): unknown;
     dependenciesOf(moduleName: string): ResolvedDep[];
-    absPathToRuntimeName(absPath: string): string | undefined;
+    absPathToRuntimePath(absPath: string): string;
+    absPathToRuntimeName(absPath: string): string;
 }

package/src/stage.d.ts

@@ -1,7 +1,7 @@
-import { Tree } from 'broccoli-plugin';
+import { Node } from 'broccoli-node-api';
 import PackageCache from './package-cache';
 export default interface Stage {
-    readonly tree: Tree;
+    readonly tree: Node;
     readonly inputPath: string;
     ready(): Promise<{
         readonly outputPath: string;

package/src/template-compiler.d.ts

@@ -1,33 +1,26 @@
 import { Resolver, ResolvedDep } from './resolver';
-import { Tree } from 'broccoli-plugin';
+import { Node } from 'broccoli-node-api';
 import { PluginItem } from '@babel/core';
+import { PortableHint } from './portable';
 export interface Plugins {
     ast?: unknown[];
 }
 interface AST {
     _deliberatelyOpaque: 'AST';
 }
-interface SetupCompilerParams {
+export declare function templateCompilerModule(params: TemplateCompilerParams, hints: PortableHint[]): {
+    src: string;
+    isParallelSafe: boolean;
+};
+export interface TemplateCompilerParams {
     compilerPath: string;
     resolver?: Resolver;
     EmberENV: unknown;
     plugins: Plugins;
 }
-export declare function rehydrate(state: unknown): TemplateCompiler;
-export default class TemplateCompiler {
-    private portableParams;
-    private params;
-    isParallelSafe: boolean;
-    constructor(params: SetupCompilerParams);
-    private get portableConfig();
-    get _parallelBabel(): {
-        requireFile: string;
-        buildUsing: string;
-        params: {
-            portableParams: object;
-        };
-    } | undefined;
-    serialize(): string;
+export declare class TemplateCompiler {
+    params: TemplateCompilerParams;
+    constructor(params: TemplateCompilerParams);
     private get syntax();
     get cacheKey(): string;
     private setup;
@@ -39,7 +32,7 @@ export default class TemplateCompiler {
     compile(moduleName: string, contents: string): string;
     applyTransforms(moduleName: string, contents: string): string;
     parse(moduleName: string, contents: string): AST;
-    applyTransformsToTree(tree: Tree): Tree;
+    applyTransformsToTree(tree: Node): Node;
     inlineTransformsBabelPlugin(): PluginItem;
     baseDir(): string;
     static isInlinePrecompilePlugin(item: PluginItem): boolean;