@embroider/compat 2.1.1 → 2.1.2-unstable.1ecd57e

package/src/resolver-transform.js

@@ -1,152 +1,170 @@
 "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 });
-const resolver_1 = __importDefault(require("./resolver"));
+exports.builtInKeywords = void 0;
+const dependency_rules_1 = require("./dependency-rules");
+const typescript_memoize_1 = require("typescript-memoize");
 const assert_never_1 = __importDefault(require("assert-never"));
-// This is the AST transform that resolves components, helpers and modifiers at build time
-function makeResolverTransform({ resolver, patchHelpersBug }) {
-    const resolverTransform = env => {
-        let { filename, contents, meta: { jsutils }, syntax: { builders }, strict, locals, } = env;
-        let scopeStack = new ScopeStack();
-        let emittedAMDDeps = new Set();
-        // The first time we insert a component as a lexical binding
-        //   - if there's no JS-scope collision with the name, we're going to bind the existing name
-        //     - in this case, any subsequent invocations of the same component just got automatically fixed too
-        //     - but that means we need to remember that we did this, in order to
-        //       give those other invocation sites support for features like argumentsAreComponents. That is what
-        //       emittedLexicalBindings is for.
-        //   - else there is a JS-scope collision, we're going to bind a mangled name and rewrite the callsite
-        //     - in this case, subequent callsites will get their own independent
-        //       resolution and they will get correctly aggregated by the
-        //       jsutils.bindImport logic.
-        let emittedLexicalBindings = new Map();
-        function emitAMD(dep) {
-            if (dep && !emittedAMDDeps.has(dep.runtimeName)) {
-                let parts = dep.runtimeName.split('/');
-                let { path, runtimeName } = dep;
-                jsutils.emitExpression(context => {
-                    let identifier = context.import(path, 'default', parts[parts.length - 1]);
-                    return `window.define("${runtimeName}", () => ${identifier})`;
-                });
-                emittedAMDDeps.add(dep.runtimeName);
-            }
-        }
-        function emit(parentPath, resolution, setter) {
-            switch (resolution === null || resolution === void 0 ? void 0 : resolution.type) {
-                case 'error':
-                    resolver.reportError(resolution, filename, contents);
-                    return;
-                case 'helper':
-                    if (patchHelpersBug) {
-                        // lexical invocation of helpers was not reliable before Ember 4.2 due to https://github.com/emberjs/ember.js/pull/19878
-                        emitAMD(resolution.module);
+const path_1 = require("path");
+const fs_extra_1 = require("fs-extra");
+const dasherize_component_name_1 = require("./dasherize-component-name");
+const core_1 = require("@embroider/core");
+const lodash_1 = require("lodash");
+exports.builtInKeywords = [
+    '-get-dynamic-var',
+    '-in-element',
+    '-with-dynamic-vars',
+    'action',
+    'array',
+    'component',
+    'concat',
+    'debugger',
+    'each-in',
+    'each',
+    'fn',
+    'get',
+    'has-block-params',
+    'has-block',
+    'hasBlock',
+    'hasBlockParams',
+    'hash',
+    'helper',
+    'if',
+    'in-element',
+    'input',
+    'let',
+    'link-to',
+    'loc',
+    'log',
+    'modifier',
+    'mount',
+    'mut',
+    'on',
+    'outlet',
+    'partial',
+    'query-params',
+    'readonly',
+    'textarea',
+    'unbound',
+    'unique-id',
+    'unless',
+    'with',
+    'yield',
+];
+class TemplateResolver {
+    constructor(env, config) {
+        this.env = env;
+        this.config = config;
+        this.name = 'embroider-build-time-resolver';
+        this.scopeStack = new ScopeStack();
+        this.visitor = {
+            Template: {
+                enter: () => {
+                    if (this.env.locals) {
+                        this.scopeStack.pushMustacheBlock(this.env.locals);
                     }
-                    else {
-                        let name = jsutils.bindImport(resolution.module.path, 'default', parentPath, {
-                            nameHint: resolution.nameHint,
-                        });
-                        emittedLexicalBindings.set(name, resolution);
-                        setter(parentPath.node, builders.path(name));
+                },
+                exit: () => {
+                    if (this.env.locals) {
+                        this.scopeStack.pop();
                     }
+                },
+            },
+            Block: {
+                enter: node => {
+                    this.scopeStack.pushMustacheBlock(node.blockParams);
+                },
+                exit: () => {
+                    this.scopeStack.pop();
+                },
+            },
+            BlockStatement: (node, path) => {
+                if (node.path.type !== 'PathExpression') {
                     return;
-                case 'modifier':
-                    let name = jsutils.bindImport(resolution.module.path, 'default', parentPath, {
-                        nameHint: resolution.nameHint,
-                    });
-                    emittedLexicalBindings.set(name, resolution);
-                    setter(parentPath.node, builders.path(name));
+                }
+                let rootName = node.path.parts[0];
+                if (this.scopeStack.inScope(rootName, path)) {
                     return;
-                case 'component':
-                    // When people are using octane-style template co-location or
-                    // polaris-style first-class templates, we see only JS files for their
-                    // components, because the template association is handled before
-                    // we're doing any resolving here. In that case, we can safely do
-                    // component invocation via lexical scope.
-                    //
-                    // But when people are using the older non-co-located template style,
-                    // we can't safely do that -- ember needs to discover both the
-                    // component and the template in the AMD loader to associate them. In
-                    // that case, we emit just-in-time AMD definitions for them.
-                    if (resolution.jsModule && !resolution.hbsModule) {
-                        let name = jsutils.bindImport(resolution.jsModule.path, 'default', parentPath, {
-                            nameHint: resolution.nameHint,
-                        });
-                        emittedLexicalBindings.set(name, resolution);
-                        setter(parentPath.node, builders.path(name));
-                    }
-                    else {
-                        emitAMD(resolution.hbsModule);
-                        emitAMD(resolution.jsModule);
-                    }
-                case undefined:
+                }
+                if (node.path.this === true) {
                     return;
-                default:
-                    (0, assert_never_1.default)(resolution);
-            }
-        }
-        function handleDynamicComponentArguments(componentName, argumentsAreComponents, attributes) {
-            for (let name of argumentsAreComponents) {
-                let attr = attributes.find(attr => {
-                    if (attr.node.type === 'AttrNode') {
-                        return attr.node.name === '@' + name;
-                    }
-                    else {
-                        return attr.node.key === name;
-                    }
+                }
+                if (node.path.parts.length > 1) {
+                    // paths with a dot in them (which therefore split into more than
+                    // one "part") are classically understood by ember to be contextual
+                    // components, which means there's nothing to resolve at this
+                    // location.
+                    return;
+                }
+                if (node.path.original === 'component' && node.params.length > 0) {
+                    let resolution = this.handleComponentHelper(node.params[0]);
+                    this.emit(path, resolution, (node, newIdentifier) => {
+                        node.params[0] = newIdentifier;
+                    });
+                    return;
+                }
+                let resolution = this.targetComponent(node.path.original);
+                this.emit(path, resolution, (node, newId) => {
+                    node.path = newId;
                 });
-                if (attr) {
-                    let resolution = handleComponentHelper(attr.node.value, resolver, filename, scopeStack, {
-                        componentName,
-                        argumentName: name,
+                if ((resolution === null || resolution === void 0 ? void 0 : resolution.type) === 'component') {
+                    this.scopeStack.enteringComponentBlock(resolution, ({ argumentsAreComponents }) => {
+                        this.handleDynamicComponentArguments(rootName, argumentsAreComponents, extendPath(extendPath(path, 'hash'), 'pairs'));
                     });
-                    emit(attr, resolution, (node, newId) => {
-                        if (node.type === 'AttrNode') {
-                            node.value = builders.mustache(newId);
-                        }
-                        else {
-                            node.value = newId;
-                        }
+                }
+            },
+            SubExpression: (node, path) => {
+                if (node.path.type !== 'PathExpression') {
+                    return;
+                }
+                if (node.path.this === true) {
+                    return;
+                }
+                if (this.scopeStack.inScope(node.path.parts[0], path)) {
+                    return;
+                }
+                if (node.path.original === 'component' && node.params.length > 0) {
+                    let resolution = this.handleComponentHelper(node.params[0]);
+                    this.emit(path, resolution, (node, newId) => {
+                        node.params[0] = newId;
                     });
+                    return;
                 }
-            }
-        }
-        if (strict) {
-            return {
-                name: 'embroider-build-time-resolver-strict-noop',
-                visitor: {},
-            };
-        }
-        return {
-            name: 'embroider-build-time-resolver',
-            visitor: {
-                Program: {
-                    enter(node) {
-                        if (locals) {
-                            scopeStack.push(locals);
-                        }
-                        scopeStack.push(node.blockParams);
-                    },
-                    exit() {
-                        scopeStack.pop();
-                        if (locals) {
-                            scopeStack.pop();
-                        }
-                    },
-                },
-                BlockStatement(node, path) {
+                if (node.path.original === 'helper' && node.params.length > 0) {
+                    let resolution = this.handleDynamicHelper(node.params[0]);
+                    this.emit(path, resolution, (node, newId) => {
+                        node.params[0] = newId;
+                    });
+                    return;
+                }
+                if (node.path.original === 'modifier' && node.params.length > 0) {
+                    let resolution = this.handleDynamicModifier(node.params[0]);
+                    this.emit(path, resolution, (node, newId) => {
+                        node.params[0] = newId;
+                    });
+                    return;
+                }
+                let resolution = this.targetHelper(node.path.original);
+                this.emit(path, resolution, (node, newId) => {
+                    node.path = newId;
+                });
+            },
+            MustacheStatement: {
+                enter: (node, path) => {
+                    var _a;
                     if (node.path.type !== 'PathExpression') {
                         return;
                     }
                     let rootName = node.path.parts[0];
-                    if (scopeStack.inScope(rootName)) {
-                        let resolution = emittedLexicalBindings.get(rootName);
-                        if ((resolution === null || resolution === void 0 ? void 0 : resolution.type) === 'component') {
-                            scopeStack.enteringComponentBlock(resolution, ({ argumentsAreComponents }) => {
-                                handleDynamicComponentArguments(rootName, argumentsAreComponents, extendPath(extendPath(path, 'hash'), 'pairs'));
-                            });
-                        }
+                    if (this.scopeStack.inScope(rootName, path)) {
                         return;
                     }
                     if (node.path.this === true) {
@@ -159,161 +177,556 @@ function makeResolverTransform({ resolver, patchHelpersBug }) {
                         // location.
                         return;
                     }
-                    if (node.path.original === 'component' && node.params.length > 0) {
-                        let resolution = handleComponentHelper(node.params[0], resolver, filename, scopeStack);
-                        emit(path, resolution, (node, newIdentifier) => {
-                            node.params[0] = newIdentifier;
-                        });
-                        return;
-                    }
-                    // a block counts as args from our perpsective (it's enough to prove
-                    // this thing must be a component, not content)
-                    let hasArgs = true;
-                    let resolution = resolver.resolveMustache(node.path.original, hasArgs, filename, node.path.loc);
-                    emit(path, resolution, (node, newId) => {
-                        node.path = newId;
-                    });
-                    if ((resolution === null || resolution === void 0 ? void 0 : resolution.type) === 'component') {
-                        scopeStack.enteringComponentBlock(resolution, ({ argumentsAreComponents }) => {
-                            handleDynamicComponentArguments(rootName, argumentsAreComponents, extendPath(extendPath(path, 'hash'), 'pairs'));
-                        });
-                    }
-                },
-                SubExpression(node, path) {
-                    if (node.path.type !== 'PathExpression') {
-                        return;
-                    }
-                    if (node.path.this === true) {
-                        return;
-                    }
-                    if (scopeStack.inScope(node.path.parts[0])) {
+                    if (node.path.original.startsWith('@')) {
+                        // similarly, global resolution of helpers and components never
+                        // happens with argument paths (it could still be an invocation, but
+                        // it would be a lexically-scoped invocation, not one we need to
+                        // adjust)
                         return;
                     }
                     if (node.path.original === 'component' && node.params.length > 0) {
-                        let resolution = handleComponentHelper(node.params[0], resolver, filename, scopeStack);
-                        emit(path, resolution, (node, newId) => {
+                        let resolution = this.handleComponentHelper(node.params[0]);
+                        this.emit(path, resolution, (node, newId) => {
                             node.params[0] = newId;
                         });
                         return;
                     }
                     if (node.path.original === 'helper' && node.params.length > 0) {
-                        handleDynamicHelper(node.params[0], resolver, filename);
+                        let resolution = this.handleDynamicHelper(node.params[0]);
+                        this.emit(path, resolution, (node, newIdentifier) => {
+                            node.params[0] = newIdentifier;
+                        });
                         return;
                     }
-                    if (node.path.original === 'modifier' && node.params.length > 0) {
-                        handleDynamicModifier(node.params[0], resolver, filename);
+                    if (((_a = path.parent) === null || _a === void 0 ? void 0 : _a.node.type) === 'AttrNode') {
+                        // this mustache is the value of an attribute. Components aren't
+                        // allowed here, so we're not ambiguous, so resolve a helper.
+                        let resolution = this.targetHelper(node.path.original);
+                        this.emit(path, resolution, (node, newIdentifier) => {
+                            node.path = newIdentifier;
+                        });
                         return;
                     }
-                    let resolution = resolver.resolveSubExpression(node.path.original, filename, node.path.loc);
-                    emit(path, resolution, (node, newId) => {
-                        node.path = newId;
+                    let hasArgs = node.params.length > 0 || node.hash.pairs.length > 0;
+                    let resolution = this.targetHelperOrComponent(node.path.original, node.path.loc, hasArgs);
+                    this.emit(path, resolution, (node, newIdentifier) => {
+                        node.path = newIdentifier;
                     });
+                    if ((resolution === null || resolution === void 0 ? void 0 : resolution.type) === 'component') {
+                        this.handleDynamicComponentArguments(node.path.original, resolution.argumentsAreComponents, extendPath(extendPath(path, 'hash'), 'pairs'));
+                    }
                 },
-                MustacheStatement: {
-                    enter(node, path) {
-                        if (node.path.type !== 'PathExpression') {
-                            return;
-                        }
-                        let rootName = node.path.parts[0];
-                        if (scopeStack.inScope(rootName)) {
-                            let resolution = emittedLexicalBindings.get(rootName);
-                            if (resolution && resolution.type === 'component') {
-                                handleDynamicComponentArguments(rootName, resolution.argumentsAreComponents, extendPath(extendPath(path, 'hash'), 'pairs'));
-                            }
-                            return;
-                        }
-                        if (node.path.this === true) {
-                            return;
-                        }
-                        if (node.path.parts.length > 1) {
-                            // paths with a dot in them (which therefore split into more than
-                            // one "part") are classically understood by ember to be contextual
-                            // components, which means there's nothing to resolve at this
-                            // location.
-                            return;
-                        }
-                        if (node.path.original === 'component' && node.params.length > 0) {
-                            let resolution = handleComponentHelper(node.params[0], resolver, filename, scopeStack);
-                            emit(path, resolution, (node, newId) => {
-                                node.params[0] = newId;
-                            });
-                            return;
-                        }
-                        if (node.path.original === 'helper' && node.params.length > 0) {
-                            handleDynamicHelper(node.params[0], resolver, filename);
-                            return;
+            },
+            ElementModifierStatement: (node, path) => {
+                if (node.path.type !== 'PathExpression') {
+                    return;
+                }
+                if (this.scopeStack.inScope(node.path.parts[0], path)) {
+                    return;
+                }
+                if (node.path.this === true) {
+                    return;
+                }
+                if (node.path.data === true) {
+                    return;
+                }
+                if (node.path.parts.length > 1) {
+                    // paths with a dot in them (which therefore split into more than
+                    // one "part") are classically understood by ember to be contextual
+                    // components. With the introduction of `Template strict mode` in Ember 3.25
+                    // it is also possible to pass modifiers this way which means there's nothing
+                    // to resolve at this location.
+                    return;
+                }
+                let resolution = this.targetElementModifier(node.path.original);
+                this.emit(path, resolution, (node, newId) => {
+                    node.path = newId;
+                });
+            },
+            ElementNode: {
+                enter: (node, path) => {
+                    let rootName = node.tag.split('.')[0];
+                    if (!this.scopeStack.inScope(rootName, path)) {
+                        let resolution = null;
+                        // if it starts with lower case, it can't be a component we need to
+                        // globally resolve
+                        if (node.tag[0] !== node.tag[0].toLowerCase()) {
+                            resolution = this.targetComponent((0, dasherize_component_name_1.dasherize)(node.tag));
                         }
-                        let hasArgs = node.params.length > 0 || node.hash.pairs.length > 0;
-                        let resolution = resolver.resolveMustache(node.path.original, hasArgs, filename, node.path.loc);
-                        emit(path, resolution, (node, newIdentifier) => {
-                            node.path = newIdentifier;
+                        this.emit(path, resolution, (node, newId) => {
+                            node.tag = newId.original;
                         });
                         if ((resolution === null || resolution === void 0 ? void 0 : resolution.type) === 'component') {
-                            handleDynamicComponentArguments(node.path.original, resolution.argumentsAreComponents, extendPath(extendPath(path, 'hash'), 'pairs'));
+                            this.scopeStack.enteringComponentBlock(resolution, ({ argumentsAreComponents }) => {
+                                this.handleDynamicComponentArguments(node.tag, argumentsAreComponents, extendPath(path, 'attributes'));
+                            });
                         }
-                    },
-                },
-                ElementModifierStatement(node, path) {
-                    if (node.path.type !== 'PathExpression') {
-                        return;
-                    }
-                    if (scopeStack.inScope(node.path.parts[0])) {
-                        return;
                     }
-                    if (node.path.this === true) {
-                        return;
-                    }
-                    if (node.path.data === true) {
-                        return;
+                    this.scopeStack.pushElementBlock(node.blockParams, node);
+                },
+                exit: () => {
+                    this.scopeStack.pop();
+                },
+            },
+        };
+        this.moduleResolver = new core_1.Resolver(config);
+        if (globalThis.embroider_audit) {
+            this.auditHandler = globalThis.embroider_audit;
+        }
+    }
+    emit(parentPath, resolution, setter) {
+        switch (resolution === null || resolution === void 0 ? void 0 : resolution.type) {
+            case 'error':
+                this.reportError(resolution);
+                return;
+            case 'component':
+            case 'modifier':
+            case 'helper': {
+                let name = this.env.meta.jsutils.bindImport(resolution.specifier, 'default', parentPath, {
+                    nameHint: resolution.nameHint,
+                });
+                setter(parentPath.node, this.env.syntax.builders.path(name));
+                return;
+            }
+            case undefined:
+                return;
+            default:
+                (0, assert_never_1.default)(resolution);
+        }
+    }
+    reportError(dep) {
+        if (!this.auditHandler && !this.config.options.allowUnsafeDynamicComponents) {
+            let e = new Error(`${dep.message}: ${dep.detail} in ${this.humanReadableFile(this.env.filename)}`);
+            e.isTemplateResolverError = true;
+            e.loc = dep.loc;
+            e.moduleName = this.env.filename;
+            throw e;
+        }
+        if (this.auditHandler) {
+            this.auditHandler({
+                message: dep.message,
+                filename: this.env.filename,
+                detail: dep.detail,
+                loc: dep.loc,
+                source: this.env.contents,
+            });
+        }
+    }
+    humanReadableFile(file) {
+        let { appRoot } = this.config;
+        if (!appRoot.endsWith(path_1.sep)) {
+            appRoot += path_1.sep;
+        }
+        if (file.startsWith(appRoot)) {
+            return file.slice(appRoot.length);
+        }
+        return file;
+    }
+    handleComponentHelper(param, impliedBecause) {
+        let locator;
+        switch (param.type) {
+            case 'StringLiteral':
+                locator = { type: 'literal', path: param.value };
+                break;
+            case 'PathExpression':
+                locator = { type: 'path', path: param.original };
+                break;
+            case 'MustacheStatement':
+                if (param.hash.pairs.length === 0 && param.params.length === 0) {
+                    return this.handleComponentHelper(param.path, impliedBecause);
+                }
+                else if (param.path.type === 'PathExpression' && param.path.original === 'component') {
+                    // safe because we will handle this inner `{{component ...}}` mustache on its own
+                    return null;
+                }
+                else {
+                    locator = { type: 'other' };
+                }
+                break;
+            case 'TextNode':
+                locator = { type: 'literal', path: param.chars };
+                break;
+            case 'SubExpression':
+                if (param.path.type === 'PathExpression' && param.path.original === 'component') {
+                    // safe because we will handle this inner `(component ...)` subexpression on its own
+                    return null;
+                }
+                if (param.path.type === 'PathExpression' && param.path.original === 'ensure-safe-component') {
+                    // safe because we trust ensure-safe-component
+                    return null;
+                }
+                locator = { type: 'other' };
+                break;
+            default:
+                locator = { type: 'other' };
+        }
+        if (locator.type === 'path' && this.scopeStack.safeComponentInScope(locator.path)) {
+            return null;
+        }
+        return this.targetComponentHelper(locator, param.loc, impliedBecause);
+    }
+    handleDynamicComponentArguments(componentName, argumentsAreComponents, attributes) {
+        for (let name of argumentsAreComponents) {
+            let attr = attributes.find(attr => {
+                if (attr.node.type === 'AttrNode') {
+                    return attr.node.name === '@' + name;
+                }
+                else {
+                    return attr.node.key === name;
+                }
+            });
+            if (attr) {
+                let resolution = this.handleComponentHelper(attr.node.value, {
+                    componentName,
+                    argumentName: name,
+                });
+                this.emit(attr, resolution, (node, newId) => {
+                    if (node.type === 'AttrNode') {
+                        node.value = this.env.syntax.builders.mustache(newId);
                     }
-                    if (node.path.parts.length > 1) {
-                        // paths with a dot in them (which therefore split into more than
-                        // one "part") are classically understood by ember to be contextual
-                        // components. With the introduction of `Template strict mode` in Ember 3.25
-                        // it is also possible to pass modifiers this way which means there's nothing
-                        // to resolve at this location.
-                        return;
+                    else {
+                        node.value = newId;
                     }
-                    let resolution = resolver.resolveElementModifierStatement(node.path.original, filename, node.path.loc);
-                    emit(path, resolution, (node, newId) => {
-                        node.path = newId;
-                    });
-                },
-                ElementNode: {
-                    enter(node, path) {
-                        let rootName = node.tag.split('.')[0];
-                        if (scopeStack.inScope(rootName)) {
-                            const resolution = emittedLexicalBindings.get(rootName);
-                            if ((resolution === null || resolution === void 0 ? void 0 : resolution.type) === 'component') {
-                                scopeStack.enteringComponentBlock(resolution, ({ argumentsAreComponents }) => {
-                                    handleDynamicComponentArguments(node.tag, argumentsAreComponents, extendPath(path, 'attributes'));
-                                });
+                });
+            }
+        }
+    }
+    get staticComponentsEnabled() {
+        return this.config.options.staticComponents || Boolean(this.auditHandler);
+    }
+    get staticHelpersEnabled() {
+        return this.config.options.staticHelpers || Boolean(this.auditHandler);
+    }
+    get staticModifiersEnabled() {
+        return this.config.options.staticModifiers || Boolean(this.auditHandler);
+    }
+    isIgnoredComponent(dasherizedName) {
+        var _a;
+        return (_a = this.rules.components.get(dasherizedName)) === null || _a === void 0 ? void 0 : _a.safeToIgnore;
+    }
+    get rules() {
+        // rules that are keyed by the filename they're talking about
+        let files = new Map();
+        // rules that are keyed by our dasherized interpretation of the component's name
+        let components = new Map();
+        // we're not responsible for filtering out rules for inactive packages here,
+        // that is done before getting to us. So we should assume these are all in
+        // force.
+        for (let rule of this.config.activePackageRules) {
+            if (rule.components) {
+                for (let [snippet, rules] of Object.entries(rule.components)) {
+                    let processedRules = (0, dependency_rules_1.preprocessComponentRule)(rules);
+                    let dasherizedName = this.standardDasherize(snippet, rule);
+                    components.set(dasherizedName, processedRules);
+                    if (rules.layout) {
+                        for (let root of rule.roots) {
+                            if (rules.layout.addonPath) {
+                                files.set((0, path_1.join)(root, rules.layout.addonPath), processedRules);
                             }
-                        }
-                        else {
-                            const resolution = resolver.resolveElement(node.tag, filename, node.loc);
-                            emit(path, resolution, (node, newId) => {
-                                node.tag = newId.original;
-                            });
-                            if ((resolution === null || resolution === void 0 ? void 0 : resolution.type) === 'component') {
-                                scopeStack.enteringComponentBlock(resolution, ({ argumentsAreComponents }) => {
-                                    handleDynamicComponentArguments(node.tag, argumentsAreComponents, extendPath(path, 'attributes'));
-                                });
+                            if (rules.layout.appPath) {
+                                files.set((0, path_1.join)(root, rules.layout.appPath), processedRules);
                             }
                         }
-                        scopeStack.push(node.blockParams);
-                    },
-                    exit() {
-                        scopeStack.pop();
-                    },
-                },
-            },
+                    }
+                }
+            }
+            if (rule.appTemplates) {
+                for (let [path, templateRules] of Object.entries(rule.appTemplates)) {
+                    let processedRules = (0, dependency_rules_1.preprocessComponentRule)(templateRules);
+                    for (let root of rule.roots) {
+                        files.set((0, path_1.join)((0, dependency_rules_1.appTreeRulesDir)(root, this.moduleResolver), path), processedRules);
+                    }
+                }
+            }
+            if (rule.addonTemplates) {
+                for (let [path, templateRules] of Object.entries(rule.addonTemplates)) {
+                    let processedRules = (0, dependency_rules_1.preprocessComponentRule)(templateRules);
+                    for (let root of rule.roots) {
+                        files.set((0, path_1.join)(root, path), processedRules);
+                    }
+                }
+            }
+        }
+        return { files, components };
+    }
+    findRules(absPath) {
+        let fileRules = this.rules.files.get(absPath);
+        let componentRules;
+        let componentName = this.moduleResolver.reverseComponentLookup(absPath);
+        if (componentName) {
+            componentRules = this.rules.components.get(componentName);
+        }
+        if (fileRules && componentRules) {
+            return (0, lodash_1.mergeWith)(fileRules, componentRules, appendArrays);
+        }
+        return fileRules !== null && fileRules !== void 0 ? fileRules : componentRules;
+    }
+    standardDasherize(snippet, rule) {
+        let name = (0, dasherize_component_name_1.snippetToDasherizedName)(snippet);
+        if (name == null) {
+            throw new Error(`unable to parse component snippet "${snippet}" from rule ${JSON.stringify(rule, null, 2)}`);
+        }
+        return name;
+    }
+    targetComponent(name) {
+        if (!this.staticComponentsEnabled) {
+            return null;
+        }
+        if (exports.builtInKeywords.includes(name)) {
+            return null;
+        }
+        if (this.isIgnoredComponent(name)) {
+            return null;
+        }
+        let componentRules = this.rules.components.get(name);
+        return {
+            type: 'component',
+            specifier: `#embroider_compat/components/${name}`,
+            yieldsComponents: componentRules ? componentRules.yieldsSafeComponents : [],
+            yieldsArguments: componentRules ? componentRules.yieldsArguments : [],
+            argumentsAreComponents: componentRules ? componentRules.argumentsAreComponents : [],
+            nameHint: this.nameHint(name),
         };
+    }
+    targetComponentHelper(component, loc, impliedBecause) {
+        if (!this.staticComponentsEnabled) {
+            return null;
+        }
+        let message;
+        if (impliedBecause) {
+            message = `argument "${impliedBecause.argumentName}" to component "${impliedBecause.componentName}" is treated as a component, but the value you're passing is dynamic`;
+        }
+        else {
+            message = `Unsafe dynamic component`;
+        }
+        if (component.type === 'other') {
+            return {
+                type: 'error',
+                message,
+                detail: `cannot statically analyze this expression`,
+                loc,
+            };
+        }
+        if (component.type === 'path') {
+            let ownComponentRules = this.findRules(this.env.filename);
+            if (ownComponentRules && ownComponentRules.safeInteriorPaths.includes(component.path)) {
+                return null;
+            }
+            return {
+                type: 'error',
+                message,
+                detail: component.path,
+                loc,
+            };
+        }
+        return this.targetComponent(component.path);
+    }
+    targetHelper(path) {
+        if (!this.staticHelpersEnabled) {
+            return null;
+        }
+        // people are not allowed to override the built-in helpers with their own
+        // globally-named helpers. It throws an error. So it's fine for us to
+        // prioritize the builtIns here without bothering to resolve a user helper
+        // of the same name.
+        if (exports.builtInKeywords.includes(path)) {
+            return null;
+        }
+        return {
+            type: 'helper',
+            specifier: `#embroider_compat/helpers/${path}`,
+            nameHint: this.nameHint(path),
+        };
+    }
+    targetHelperOrComponent(path, loc, hasArgs) {
+        /*
+    
+        In earlier embroider versions we would do a bunch of module resolution right
+        here inside the ast transform to try to resolve the ambiguity of this case
+        and if we didn't find anything, leave the template unchanged. But that leads
+        to both a lot of extra build-time expense (since we are attempting
+        resolution for lots of things that may in fact be just some data and not a
+        component invocation at all, and also since we are pre-resolving modules
+        that will get resolved a second time by the final stage packager).
+    
+        Now, we're going to be less forgiving, because it streamlines the build for
+        everyone who's not still using these *extremely* old patterns.
+    
+        The problematic case is:
+    
+          1. In a non-strict template (because this whole resolver-transform.ts is a
+             no-op on strict handlebars).
+    
+          2. Have a mustache statement like: `{{something}}`, where `something` is:
+    
+            a. Not a variable in scope (for example, there's no preceeding line
+               like `<Parent as |something|>`)
+            b. Does not start with `@` because that must be an argument from outside this template.
+            c. Does not contain a dot, like `some.thing` (because that case is classically
+               never a global component resolution that we would need to handle)
+            d. Does not start with `this` (this rule is mostly redundant with the previous rule,
+               but even a standalone `this` is never a component invocation).
+            e. Does not have any arguments. If there are argument like `{{something a=b}}`,
+               there is still ambiguity between helper vs component, but there is no longer
+               the possibility that this was just rendering some data.
+            f. Does not take a block, like `{{#something}}{{/something}}` (because that is
+               always a component, no ambiguity.)
+    
+        We can't tell if this problematic case is really:
+    
+          1. A helper invocation with no arguments that is being directly rendered.
+             Out-of-the-box, ember already generates [a lint
+             error](https://github.com/ember-template-lint/ember-template-lint/blob/master/docs/rule/no-curly-component-invocation.md)
+             for this, although it tells you to whitelist your helper when IMO it
+             should tell you to use an unambiguous syntax like `{{ (something) }}`
+             instead.
+    
+          2. A component invocation, which you could have written `<Something />`
+             instead. Angle-bracket invocation has been available and easy-to-adopt
+             for a very long time.
+    
+          3. Property-this-fallback for `{{this.something}}`. Property-this-fallback
+             is eliminated at Ember 4.0, so people have been heavily pushed to get
+             it out of their addons.
+        */
+        // first, bail out on all the stuff we can obviously ignore
+        if ((!this.staticHelpersEnabled && !this.staticComponentsEnabled) ||
+            exports.builtInKeywords.includes(path) ||
+            this.isIgnoredComponent(path)) {
+            return null;
+        }
+        let ownComponentRules = this.findRules(this.env.filename);
+        if (ownComponentRules === null || ownComponentRules === void 0 ? void 0 : ownComponentRules.disambiguate[path]) {
+            switch (ownComponentRules.disambiguate[path]) {
+                case 'component':
+                    return this.targetComponent(path);
+                case 'helper':
+                    return this.targetHelper(path);
+                case 'data':
+                    return null;
+            }
+        }
+        if (!hasArgs && !path.includes('/') && !path.includes('@')) {
+            // this is the case that could also be property-this-fallback. We're going
+            // to force people to disambiguate, because letting a potential component
+            // or helper invocation lurk inside every bit of data you render is not
+            // ok.
+            this.reportError({
+                type: 'error',
+                message: 'unsupported ambiguous syntax',
+                detail: `"{{${path}}}" is ambiguous and could mean "{{this.${path}}}" or component "<${capitalize((0, lodash_1.camelCase)(path))} />" or helper "{{ (${path}) }}". Change it to one of those unambigous forms, or use a "disambiguate" packageRule to work around the problem if its in third-party code you cannot easily fix.`,
+                loc,
+            });
+            return null;
+        }
+        // Above we already bailed out if both of these were disabled, so we know at
+        // least one is turned on. If both aren't turned on, we're stuck, because we
+        // can't even tell if this *is* a component vs a helper.
+        if (!this.staticHelpersEnabled || !this.staticComponentsEnabled) {
+            this.reportError({
+                type: 'error',
+                message: 'unsupported ambiguity between helper and component',
+                detail: `this use of "{{${path}}}" could be helper "{{ (${path}) }}" or component "<${capitalize((0, lodash_1.camelCase)(path))} />", and your settings for staticHelpers and staticComponents do not agree. Either switch to one of the unambiguous forms, or make staticHelpers and staticComponents agree, or use a "disambiguate" packageRule to work around the problem if its in third-party code you cannot easily fix.`,
+                loc,
+            });
+            return null;
+        }
+        let componentRules = this.rules.components.get(path);
+        return {
+            type: 'component',
+            specifier: `#embroider_compat/ambiguous/${path}`,
+            yieldsComponents: componentRules ? componentRules.yieldsSafeComponents : [],
+            yieldsArguments: componentRules ? componentRules.yieldsArguments : [],
+            argumentsAreComponents: componentRules ? componentRules.argumentsAreComponents : [],
+            nameHint: this.nameHint(path),
+        };
+    }
+    targetElementModifier(path) {
+        if (!this.staticModifiersEnabled) {
+            return null;
+        }
+        if (exports.builtInKeywords.includes(path)) {
+            return null;
+        }
+        return {
+            type: 'modifier',
+            specifier: `#embroider_compat/modifiers/${path}`,
+            nameHint: this.nameHint(path),
+        };
+    }
+    targetDynamicModifier(modifier, loc) {
+        if (!this.staticModifiersEnabled) {
+            return null;
+        }
+        if (modifier.type === 'literal') {
+            return this.targetElementModifier(modifier.path);
+        }
+        else {
+            return {
+                type: 'error',
+                message: 'Unsafe dynamic modifier',
+                detail: `cannot statically analyze this expression`,
+                loc,
+            };
+        }
+    }
+    targetDynamicHelper(helper) {
+        if (!this.staticHelpersEnabled) {
+            return null;
+        }
+        if (helper.type === 'literal') {
+            return this.targetHelper(helper.path);
+        }
+        // we don't have to manage any errors in this case because ember itself
+        // considers it an error to pass anything but a string literal to the
+        // `helper` helper.
+        return null;
+    }
+    nameHint(path) {
+        let parts = path.split('@');
+        // the extra underscore here guarantees that we will never collide with an
+        // HTML element.
+        return parts[parts.length - 1] + '_';
+    }
+    handleDynamicModifier(param) {
+        if (param.type === 'StringLiteral') {
+            return this.targetDynamicModifier({ type: 'literal', path: param.value }, param.loc);
+        }
+        // we don't have to manage any errors in this case because ember itself
+        // considers it an error to pass anything but a string literal to the
+        // modifier helper.
+        return null;
+    }
+    handleDynamicHelper(param) {
+        // We only need to handle StringLiterals since Ember already throws an error if unsupported values
+        // are passed to the helper keyword.
+        // If a helper reference is passed in we don't need to do anything since it's either the result of a previous
+        // helper keyword invocation, or a helper reference that was imported somewhere.
+        if (param.type === 'StringLiteral') {
+            return this.targetDynamicHelper({ type: 'literal', path: param.value });
+        }
+        return null;
+    }
+}
+__decorate([
+    (0, typescript_memoize_1.Memoize)()
+], TemplateResolver.prototype, "rules", null);
+// This is the AST transform that resolves components, helpers and modifiers at build time
+function makeResolverTransform({ appRoot }) {
+    let config = (0, fs_extra_1.readJSONSync)((0, path_1.join)(appRoot, '.embroider', 'resolver.json'));
+    const resolverTransform = env => {
+        if (env.strictMode) {
+            return {
+                name: 'embroider-build-time-resolver-strict-noop',
+                visitor: {},
+            };
+        }
+        return new TemplateResolver(env, config);
     };
     resolverTransform.parallelBabel = {
         requireFile: __filename,
         buildUsing: 'makeResolverTransform',
-        params: resolver_1.default,
+        params: { appRoot: appRoot },
     };
     return resolverTransform;
 }
@@ -322,10 +735,25 @@ class ScopeStack {
     constructor() {
         this.stack = [];
     }
-    // as we enter a block, we push the block params onto here to mark them as
-    // being in scope
-    push(blockParams) {
-        this.stack.unshift({ type: 'blockParams', blockParams });
+    // mustache blocks like:
+    //
+    //   {{#stuff as |some block vars|}}
+    //
+    // are relatively simple for us because there's a dedicated `Block` AST node
+    // that exactly covers the range in which the variables are in scope.
+    pushMustacheBlock(blockParams) {
+        this.stack.unshift({ type: 'mustache', blockParams });
+    }
+    // element blocks like:
+    //
+    //  <Stuff as |some block vars|>
+    //
+    // are *not* so simple for us because there's no single AST node that exactly
+    // covers the range in which the variables are in scope. For example, the
+    // *attributes* of the element do not see the variables, but the children of
+    // the element do.
+    pushElementBlock(blockParams, childrenOf) {
+        this.stack.unshift({ type: 'element', blockParams, childrenOf });
     }
     // and when we leave the block they go out of scope. If this block was tagged
     // by a safe component marker, we also clear that.
@@ -348,9 +776,14 @@ class ScopeStack {
             exit,
         });
     }
-    inScope(name) {
+    inScope(name, fromPath) {
         for (let scope of this.stack) {
-            if (scope.type === 'blockParams' && scope.blockParams.includes(name)) {
+            if (scope.type === 'mustache' && scope.blockParams.includes(name)) {
+                return true;
+            }
+            if (scope.type === 'element' &&
+                scope.blockParams.includes(name) &&
+                withinElementBlock(fromPath, scope.childrenOf)) {
                 return true;
             }
         }
@@ -367,7 +800,7 @@ class ScopeStack {
         for (let i = 0; i < this.stack.length - 1; i++) {
             let here = this.stack[i];
             let next = this.stack[i + 1];
-            if (here.type === 'blockParams' && next.type === 'componentBlockMarker') {
+            if ((here.type === 'mustache' || here.type === 'element') && next.type === 'componentBlockMarker') {
                 let positionalIndex = here.blockParams.indexOf(parts[0]);
                 if (positionalIndex === -1) {
                     continue;
@@ -404,63 +837,6 @@ class ScopeStack {
         return false;
     }
 }
-function handleComponentHelper(param, resolver, moduleName, scopeStack, impliedBecause) {
-    let locator;
-    switch (param.type) {
-        case 'StringLiteral':
-            locator = { type: 'literal', path: param.value };
-            break;
-        case 'PathExpression':
-            locator = { type: 'path', path: param.original };
-            break;
-        case 'MustacheStatement':
-            if (param.hash.pairs.length === 0 && param.params.length === 0) {
-                return handleComponentHelper(param.path, resolver, moduleName, scopeStack, impliedBecause);
-            }
-            else if (param.path.type === 'PathExpression' && param.path.original === 'component') {
-                // safe because we will handle this inner `{{component ...}}` mustache on its own
-                return null;
-            }
-            else {
-                locator = { type: 'other' };
-            }
-            break;
-        case 'TextNode':
-            locator = { type: 'literal', path: param.chars };
-            break;
-        case 'SubExpression':
-            if (param.path.type === 'PathExpression' && param.path.original === 'component') {
-                // safe because we will handle this inner `(component ...)` subexpression on its own
-                return null;
-            }
-            if (param.path.type === 'PathExpression' && param.path.original === 'ensure-safe-component') {
-                // safe because we trust ensure-safe-component
-                return null;
-            }
-            locator = { type: 'other' };
-            break;
-        default:
-            locator = { type: 'other' };
-    }
-    if (locator.type === 'path' && scopeStack.safeComponentInScope(locator.path)) {
-        return null;
-    }
-    return resolver.resolveComponentHelper(locator, moduleName, param.loc, impliedBecause);
-}
-function handleDynamicHelper(param, resolver, moduleName) {
-    // We only need to handle StringLiterals since Ember already throws an error if unsupported values
-    // are passed to the helper keyword.
-    // If a helper reference is passed in we don't need to do anything since it's either the result of a previous
-    // helper keyword invocation, or a helper reference that was imported somewhere.
-    if (param.type === 'StringLiteral') {
-        resolver.resolveDynamicHelper({ type: 'literal', path: param.value }, moduleName, param.loc);
-    }
-}
-function handleDynamicModifier(param, resolver, moduleName) {
-    if (param.type === 'StringLiteral') {
-        resolver.resolveDynamicModifier({ type: 'literal', path: param.value }, moduleName, param.loc);
-    }
-}
 function extendPath(path, key) {
     const _WalkerPath = path.constructor;
     let child = path.node[key];
@@ -471,4 +847,25 @@ function extendPath(path, key) {
         return new _WalkerPath(child, path, key);
     }
 }
+function capitalize(word) {
+    return word[0].toUpperCase() + word.slice(1);
+}
+// ElementNodes have both children and attributes and both of those are
+// "children" in the abstract syntax tree sense, but here we want to distinguish
+// between them.
+function withinElementBlock(childPath, ancestorNode) {
+    let cursor = childPath;
+    while (cursor && cursor.node !== ancestorNode) {
+        if (ancestorNode.children.includes(cursor.node)) {
+            return true;
+        }
+        cursor = cursor.parent;
+    }
+    return false;
+}
+function appendArrays(objValue, srcValue) {
+    if (Array.isArray(objValue)) {
+        return objValue.concat(srcValue);
+    }
+}
 //# sourceMappingURL=resolver-transform.js.map