@glint/ember-tsc 1.6.0 → 1.6.1

package/lib/transform/template/map-template-contents.js

@@ -0,0 +1,287 @@
+import { preprocess } from '@glimmer/syntax';
+import { assert } from '../util.js';
+import { codeFeatures } from './code-features.js';
+import GlimmerASTMappingTree, { TemplateEmbedding, } from './glimmer-ast-mapping-tree.js';
+/**
+ * @glimmer/syntax parses identifiers as strings. Aside from meaning
+ * we often have to reverse engineer location information for them
+ * by hand, it also means we can't treat mappings from identifiers
+ * consistently with how we treat mappings from other AST nodes.
+ *
+ * This class just gives us a uniform way to store identifiers
+ * or other nodes as the `source` for a mapping.
+ */
+export class Identifier {
+    constructor(name) {
+        this.name = name;
+        this.type = 'Identifier';
+    }
+}
+/**
+ * Given the text of a handlebars template (either standalone .hbs file, or the contents
+ * of an embedded `<template>...</template>` within a .gts file), invokes the given callback
+ * with a set of tools to emit mapped contents corresponding to
+ * that template, tracking the text emitted in order to provide
+ * a mapping of ranges in the input to ranges in the output.
+ */
+export function mapTemplateContents(template, { embeddingSyntax }, callback) {
+    let ast = null;
+    let errors = [];
+    let lineOffsets = calculateLineOffsets(template, embeddingSyntax.prefix.length);
+    try {
+        ast = preprocess(template);
+    }
+    catch (error) {
+        let message = getErrorMessage(error);
+        let location;
+        if (isHBSSyntaxError(error)) {
+            location = {
+                start: lineOffsets[error.hash.loc.first_line] + error.hash.loc.first_column,
+                end: lineOffsets[error.hash.loc.last_line] + error.hash.loc.last_column,
+            };
+        }
+        else {
+            let match = /line (\d+) : column (\d+)/.exec(message);
+            if (match) {
+                let offset = lineOffsets[Number(match[1])] + Number(match[2]);
+                location = { start: offset, end: offset };
+            }
+        }
+        errors.push({ message, location });
+    }
+    let segmentsStack = [[]];
+    let mappingsStack = [[]];
+    let indent = '';
+    let offset = 0;
+    let directives = [];
+    // Associates all content emitted during the given callback with the
+    // given range in the template source and corresponding AST node.
+    // If an exception is thrown while executing the callback, the error
+    // will be captured and associated with the given range, and no content
+    // will be emitted.
+    let captureMapping = (hbsRange, source, allowEmpty, callback, codeFeaturesForNode) => {
+        let start = offset;
+        let mappings = [];
+        let segments = [];
+        segmentsStack.unshift(segments);
+        mappingsStack.unshift(mappings);
+        try {
+            callback();
+        }
+        catch (error) {
+            errors.push({ message: getErrorMessage(error), location: hbsRange });
+            offset = start;
+        }
+        mappingsStack.shift();
+        segmentsStack.shift();
+        // If the offset didn't change (either because nothing was emitted
+        // or because an exception was thrown), don't add a new node to the
+        // mapping tree or flush any new content.
+        if (start !== offset || allowEmpty) {
+            let end = offset;
+            let tsRange = { start, end };
+            mappingsStack[0].push(new GlimmerASTMappingTree(tsRange, hbsRange, mappings, source, 
+            // Prevent TS's semantic classifications (used for semantic highlighting, see
+            // https://code.visualstudio.com/api/language-extensions/semantic-highlight-guide) from being
+            // source-mapped back to the glimmer template. These might be useful to reinstate at some
+            // point in the future but by default tends to make the highlighting in gts files look wrong.
+            codeFeaturesForNode ??
+                augmentCodeFeaturesWithIgnoreDirectivesSupport(codeFeatures.withoutHighlight, hbsRange)));
+            segmentsStack[0].push(...segments);
+        }
+    };
+    /**
+     * This function will conditionally augment the CodeInformation object
+     * that's passed in for each mapping as a means to implement support for
+     * `@glint-expect-error` directives.
+     */
+    function augmentCodeFeaturesWithIgnoreDirectivesSupport(features, hbsRange) {
+        if (features.verification) {
+            // If this code span requests verification (e.g. TS type-checking), then
+            // we potentially need to decorate the `verification` value that we pass
+            // back to Volar, in case we have active `glint-ignore/expect-error` directives
+            // in active effect.
+            let activeDirective;
+            for (let directive of directives) {
+                if (directive.areaOfEffect.start <= hbsRange.start &&
+                    directive.areaOfEffect.end > hbsRange.start) {
+                    if (!activeDirective) {
+                        activeDirective = directive;
+                    }
+                    else {
+                        // More than one directive applies here; glint-nocheck, if present, always wins.
+                        if (directive.kind === 'nocheck') {
+                            activeDirective = directive;
+                        }
+                    }
+                }
+            }
+            if (!activeDirective) {
+                return features;
+            }
+            if (activeDirective.kind === 'ignore' || activeDirective.kind === 'nocheck') {
+                // We are currently in an ignored region of code, so don't
+                // even bother performing any type-checking: override verification (i.e. type-checking) to false
+                // for this mapping (note that the whole generated TS file will be type-checked but any
+                // diagnostics in this region will be suppressed by Volar)
+                return {
+                    ...features,
+                    verification: false,
+                };
+            }
+            else if (activeDirective.kind === 'expect-error') {
+                const expectErrorDirective = activeDirective;
+                return {
+                    ...features,
+                    verification: {
+                        shouldReport: () => {
+                            // Keep track of any errors/diagnostics reported within this region of code...
+                            expectErrorDirective.errorCount++;
+                            // ...and suppress them from bubbling up as diagnostics/errrors/warnings.
+                            return false;
+                        },
+                    },
+                };
+            }
+        }
+        return features;
+    }
+    let mapper = {
+        indent() {
+            indent += '  ';
+        },
+        dedent() {
+            indent = indent.slice(2);
+        },
+        newline() {
+            offset += 1;
+            segmentsStack[0].push('\n');
+        },
+        text(value) {
+            offset += value.length;
+            segmentsStack[0].push(value);
+        },
+        synthetic(value) {
+            if (value.length) {
+                mapper.identifier(value, 0, 0);
+            }
+        },
+        nothing(node, source = node) {
+            captureMapping(mapper.rangeForNode(node), source, true, () => { });
+        },
+        identifier(value, hbsOffset, hbsLength = value.length) {
+            let hbsRange = { start: hbsOffset, end: hbsOffset + hbsLength };
+            let source = new Identifier(value);
+            captureMapping(hbsRange, source, true, () => mapper.text(value));
+        },
+        forNode(node, callback, codeFeaturesForNode) {
+            captureMapping(mapper.rangeForNode(node), node, false, callback, codeFeaturesForNode);
+        },
+        forNodeWithSpan(node, span, callback, codeFeaturesForNode) {
+            captureMapping(mapper.rangeForNode(node, span), node, false, callback, codeFeaturesForNode);
+        },
+        error(message, location) {
+            errors.push({ message, location });
+        },
+        directive(kind, commentNode, location, areaOfEffect) {
+            const directive = {
+                kind,
+                commentNode,
+                location,
+                areaOfEffect,
+                errorCount: 0,
+            };
+            directives.push(directive);
+        },
+        emitDirectivePlaceholders() {
+            if (directives.length) {
+                mapper.text('// begin directive placeholders');
+                mapper.newline();
+            }
+            for (let directive of directives) {
+                if (directive.kind !== 'expect-error') {
+                    continue;
+                }
+                mapper.forNode(directive.commentNode, () => {
+                    mapper.text(`// @ts-expect-error ${directive.kind}`);
+                }, {
+                    ...codeFeatures.withoutHighlight,
+                    verification: {
+                        shouldReport: () => {
+                            // This determines whether we raise the placeholder "unused ts-expect-error" diagnostic.
+                            // If errors were encountered in the region covered by the directive, then we suppress
+                            // the "unused ts-expect-error" diagnostic here.
+                            return directive.errorCount === 0;
+                        },
+                    },
+                });
+                mapper.newline();
+                mapper.text(';');
+                mapper.newline();
+            }
+            if (directives.length) {
+                mapper.text('// end directive placeholders');
+                mapper.newline();
+            }
+        },
+        rangeForNode: buildRangeForNode(lineOffsets),
+        rangeForLine: (line) => ({
+            start: lineOffsets[line],
+            end: lineOffsets[line + 1] ?? template.length,
+        }),
+    };
+    callback(ast, mapper);
+    assert(segmentsStack.length === 1);
+    let code = segmentsStack[0].join('');
+    let mapping = new GlimmerASTMappingTree({ start: 0, end: code.length }, {
+        start: 0,
+        end: embeddingSyntax.prefix.length + template.length + embeddingSyntax.suffix.length,
+    }, mappingsStack[0], new TemplateEmbedding(), codeFeatures.all);
+    return { errors, result: { code, directives, mapping } };
+}
+const LEADING_WHITESPACE = /^\s+/;
+const TRAILING_WHITESPACE = /\s+$/;
+function calculateLineOffsets(template, contentOffset) {
+    let lines = template.split('\n');
+    let total = contentOffset;
+    let offsets = [contentOffset];
+    for (let [index, line] of lines.entries()) {
+        // lines from @glimmer/syntax are 1-indexed
+        offsets[index + 1] = total;
+        total += line.length + 1;
+    }
+    return offsets;
+}
+function buildRangeForNode(offsets) {
+    return (node, span) => {
+        let { loc } = node;
+        if (span) {
+            loc = span;
+        }
+        let start = offsets[loc.start.line] + loc.start.column;
+        let end = offsets[loc.end.line] + loc.end.column;
+        // This makes error reporting for illegal text nodes (e.g. alongside named blocks)
+        // a bit nicer by only highlighting the content rather than all the surrounding
+        // newlines and attendant whitespace
+        if (node.type === 'TextNode') {
+            let leading = LEADING_WHITESPACE.exec(node.chars)?.[0].length ?? 0;
+            let trailing = TRAILING_WHITESPACE.exec(node.chars)?.[0].length ?? 0;
+            if (leading !== node.chars.length) {
+                start += leading;
+                end -= trailing;
+            }
+        }
+        return { start, end };
+    };
+}
+function getErrorMessage(error) {
+    return error?.message ?? '(unknown error)';
+}
+function isHBSSyntaxError(error) {
+    if (typeof error === 'object' && !!error && 'hash' in error) {
+        let { hash } = error;
+        return typeof hash?.loc === 'object';
+    }
+    return false;
+}
+//# sourceMappingURL=map-template-contents.js.map

package/lib/transform/template/map-template-contents.js.map

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

package/lib/transform/template/rewrite-module.d.ts

@@ -0,0 +1,22 @@
+import { GlintEnvironment } from '../../config/index.js';
+import { TSLib } from '../util.js';
+import TransformedModule, { SourceFile } from './transformed-module.js';
+/**
+ * Input to the process of rewriting a template, containing:
+ *   script: the backing JS/TS module for a component, which may contain
+ *           embedded templates depending on the environment
+ */
+export type RewriteInput = {
+    script: SourceFile;
+};
+/**
+ * Given the script and/or template that together comprise a component module,
+ * returns a `TransformedModule` representing the combined result, with the
+ * template(s), either alongside or inline, rewritten into equivalent TypeScript
+ * in terms of the active glint environment's exported types.
+ *
+ * May return `null` if an unrecoverable parse error occurs or if there is
+ * no transformation to be done.
+ */
+export declare function rewriteModule(ts: TSLib, { script }: RewriteInput, environment: GlintEnvironment, clientId?: string): TransformedModule | null;
+//# sourceMappingURL=rewrite-module.d.ts.map

package/lib/transform/template/rewrite-module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"rewrite-module.d.ts","sourceRoot":"","sources":["../../../src/transform/template/rewrite-module.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAU,KAAK,EAAE,MAAM,YAAY,CAAC;AAI3C,OAAO,iBAAiB,EAAE,EAGxB,UAAU,EAEX,MAAM,yBAAyB,CAAC;AAEjC;;;;GAIG;AACH,MAAM,MAAM,YAAY,GAAG;IAAE,MAAM,EAAE,UAAU,CAAA;CAAE,CAAC;AAElD;;;;;;;;GAQG;AACH,wBAAgB,aAAa,CAC3B,EAAE,EAAE,KAAK,EACT,EAAE,MAAM,EAAE,EAAE,YAAY,EACxB,WAAW,EAAE,gBAAgB,EAC7B,QAAQ,CAAC,EAAE,MAAM,GAChB,iBAAiB,GAAG,IAAI,CAgB1B"}

package/lib/transform/template/rewrite-module.js

@@ -0,0 +1,265 @@
+import * as path from 'node:path';
+import { assert } from '../util.js';
+import { calculateTaggedTemplateSpans } from './inlining/tagged-strings.js';
+import TransformedModule from './transformed-module.js';
+/**
+ * Given the script and/or template that together comprise a component module,
+ * returns a `TransformedModule` representing the combined result, with the
+ * template(s), either alongside or inline, rewritten into equivalent TypeScript
+ * in terms of the active glint environment's exported types.
+ *
+ * May return `null` if an unrecoverable parse error occurs or if there is
+ * no transformation to be done.
+ */
+export function rewriteModule(ts, { script }, environment, clientId) {
+    let { errors, directives, partialSpans } = calculateCorrelatedSpans(ts, script, environment, clientId);
+    if (!partialSpans.length && !errors.length) {
+        return null;
+    }
+    let sparseSpans = completeCorrelatedSpans(partialSpans);
+    let { contents, correlatedSpans } = calculateTransformedSource(script, sparseSpans, directives);
+    return new TransformedModule(contents, errors, directives, correlatedSpans, script.filename);
+}
+/**
+ * Locates any embedded templates in the given AST and returns a corresponding
+ * `PartialCorrelatedSpan` for each, as well as any errors encountered. These
+ * spans are then used in `rewriteModule` above to calculate the full set of
+ * source-to-source location information as well as the final transformed source
+ * string.
+ */
+function calculateCorrelatedSpans(ts, script, environment, clientId) {
+    let directives = [];
+    let errors = [];
+    let partialSpans = [];
+    if (clientId === 'tsserver-plugin') {
+        partialSpans.push(generateAutoImportAnchor(script));
+    }
+    let { ast, emitMetadata, error } = parseScript(ts, script, environment);
+    if (error) {
+        if (typeof error === 'string') {
+            errors.push({
+                message: error,
+                location: { start: 0, end: script.contents.length - 1 },
+                source: script,
+            });
+        }
+        else if ('isContentTagError' in error && error.isContentTagError) {
+            // these lines exclude the line with the error, because
+            // adding the column offset will get us on to the line with the error
+            let lines = script.contents.split('\n').slice(0, error.line);
+            let start = lines.reduce((sum, line) => sum + line.length, 0) + error.column - 1;
+            let end = start + 1;
+            errors.push({
+                isContentTagError: true,
+                // we have to show the "help" because content-tag has different line numbers
+                // than we are able to discern ourselves.
+                message: error.message + '\n\n' + error.help,
+                source: script,
+                location: {
+                    start,
+                    end,
+                },
+            });
+        }
+        // We've hit a parsing error, so we need to immediately return as the parsed
+        // document must be correct before we can continue.
+        return { errors, directives, partialSpans };
+    }
+    ts.transform(ast, [
+        (context) => function visit(node) {
+            // Here we look for ```hbs``` tagged template expressions, originally introduced
+            // in the now-removed GlimmerX environment. We can consider getting rid of this, but
+            // then again there are still some use cases in the wild (e.g. Glimmer Next / GXT)
+            // where have tagged templates closing over outer scope is desirable:
+            // https://github.com/lifeart/glimmer-next/tree/master/glint-environment-gxt
+            // https://discord.com/channels/480462759797063690/717767358743183412/1259061848632721480
+            if (ts.isTaggedTemplateExpression(node)) {
+                let meta = emitMetadata.get(node);
+                let result = calculateTaggedTemplateSpans(ts, node, meta, script, environment);
+                directives.push(...result.directives);
+                errors.push(...result.errors);
+                partialSpans.push(...result.partialSpans);
+            }
+            else if (ts.isModuleDeclaration(node)) {
+                // don't traverse into declare module
+                return node;
+            }
+            return ts.visitEachChild(node, visit, context);
+        },
+    ]);
+    return { errors, directives, partialSpans };
+}
+function parseScript(ts, script, environment) {
+    let { filename, contents } = script;
+    let extension = path.extname(filename);
+    let emitMetadata = new WeakMap();
+    let setEmitMetadata = (node, data) => void emitMetadata.set(node, Object.assign(emitMetadata.get(node) ?? {}, data));
+    let { preprocess, transform } = environment.getConfigForExtension(extension) ?? {};
+    let original = { contents, data: { templateLocations: [] } };
+    let preprocessed = original;
+    let error;
+    try {
+        preprocessed = preprocess?.(contents, filename) ?? original;
+    }
+    catch (e) {
+        error = parseError(e, filename);
+    }
+    let ast = ts.createSourceFile(filename, 
+    // contents will be transformed and placeholder'd content
+    // or, in the event of a parse error, the original content
+    // in which case, TS will report a ton of errors about some goofy syntax.
+    // We'll want to ignore all of that and only display our parsing error from content-tag.
+    preprocessed.contents, ts.ScriptTarget.Latest, true);
+    // Only transform if we don't have a parse error
+    if (!error && transform) {
+        let { transformed } = ts.transform(ast, [
+            (context) => transform(preprocessed.data, { ts, context, setEmitMetadata }),
+        ]);
+        assert(transformed.length === 1 && ts.isSourceFile(transformed[0]));
+        ast = transformed[0];
+    }
+    return { ast, emitMetadata, error };
+}
+function parseError(e, filename) {
+    if (typeof e === 'object' && e !== null) {
+        // Parse Errors from the rust parser
+        if ('source_code' in e) {
+            // We remove the blank links in the error because swc
+            // pads errors with a leading and trailing blank line.
+            // the error is typically meant for the terminal, so making it
+            // stand out a bit more is a good, but that's more a presentation
+            // concern than just pure error information (which is what we need).
+            // @ts-expect-error object / property narrowing isn't available until TS 5.1
+            let lines = e.source_code.split('\n').filter(Boolean);
+            // Example:
+            // '  × Unexpected eof'
+            // '   ╭─[/home/nullvoxpopuli/Development/OpenSource/glint/test-packages/ts-template-imports-app/src/index.gts:6:1]'
+            // ' 6 │ '
+            // ' 7 │ export const X = <tem'
+            // '   ╰────'
+            let raw = lines.join('\n');
+            let message = lines[0].replace('×', '').trim();
+            let info = lines[1];
+            // a filename may have numbers in it, so we want to remove the filename
+            // before regex searching for numbers at the end of this line
+            let strippedInfo = info.replace(filename, '');
+            let matches = [...strippedInfo.matchAll(/\d+/g)];
+            let line = parseInt(matches[0][0], 10);
+            let column = parseInt(matches[1][0], 10);
+            // The help omits the original file name, because TS will provide that.
+            let help = lines.slice(2).join('\n');
+            return {
+                isContentTagError: true,
+                raw,
+                message,
+                line,
+                column,
+                file: filename,
+                help,
+            };
+        }
+    }
+    return `${e}`;
+}
+/**
+ * Given a sparse `CorrelatedSpan` array and the original source for a module,
+ * returns the resulting full transformed source string for that module, as
+ * well as a filled-in array of correlated spans that includes chunks of the
+ * original source that were not transformed.
+ */
+function calculateTransformedSource(originalFile, sparseSpans, directives) {
+    let correlatedSpans = [];
+    let originalOffset = 0;
+    let transformedOffset = 0;
+    for (let span of sparseSpans) {
+        let interstitial = originalFile.contents.slice(originalOffset, span.insertionPoint);
+        if (interstitial.length) {
+            correlatedSpans.push({
+                originalFile,
+                originalStart: originalOffset,
+                originalLength: interstitial.length,
+                insertionPoint: originalOffset,
+                transformedStart: transformedOffset,
+                transformedLength: interstitial.length,
+                transformedSource: interstitial,
+            });
+        }
+        correlatedSpans.push(span);
+        transformedOffset += interstitial.length + span.transformedLength;
+        originalOffset +=
+            interstitial.length + (span.originalFile === originalFile ? span.originalLength : 0);
+    }
+    let trailingContent = originalFile.contents.slice(originalOffset);
+    const trailingSpan = {
+        originalFile,
+        originalStart: originalOffset,
+        originalLength: trailingContent.length + 1,
+        insertionPoint: originalOffset,
+        transformedStart: transformedOffset,
+        transformedLength: trailingContent.length + 1,
+        transformedSource: trailingContent,
+    };
+    correlatedSpans.push(trailingSpan);
+    const placeholderContent = '\n\n// @ts-expect-error placeholder for glint-expect-error\n;\n';
+    for (let directive of directives) {
+        if (directive.kind === 'expect-error') {
+            correlatedSpans.push({
+                originalFile,
+                originalStart: directive.location.start,
+                originalLength: directive.location.end - directive.location.start,
+                insertionPoint: originalOffset + trailingContent.length,
+                transformedSource: placeholderContent,
+                transformedStart: transformedOffset + trailingContent.length,
+                transformedLength: placeholderContent.length,
+            });
+        }
+    }
+    return {
+        contents: correlatedSpans.map((span) => span.transformedSource).join(''),
+        correlatedSpans,
+    };
+}
+/**
+ * Given an array of `PartialCorrelatedSpan`s for a file, calculates
+ * their `transformedLength` and `transformedStart` values, resulting
+ * in full `CorrelatedSpan`s.
+ */
+function completeCorrelatedSpans(partialSpans) {
+    let correlatedSpans = [];
+    for (let i = 0; i < partialSpans.length; i++) {
+        let current = partialSpans[i];
+        let transformedLength = current.transformedSource.length;
+        let transformedStart = current.insertionPoint;
+        if (i > 0) {
+            let previous = correlatedSpans[i - 1];
+            transformedStart =
+                previous.transformedStart +
+                    previous.transformedSource.length +
+                    (current.insertionPoint - previous.insertionPoint - previous.originalLength);
+        }
+        correlatedSpans.push({ ...current, transformedStart, transformedLength });
+    }
+    return correlatedSpans;
+}
+/**
+ * Insert a triple-slash reference directive to the top of the transformed file which provides
+ * an anchor/insertion point for auto-imports. This fixes an issue where auto-imports
+ * don't work for the first import in a file.
+ *
+ * Because we don't provide any mapping information to Volar, the internal error that
+ * this generates is quietly swallowed when Volar reverse source-maps the error back to
+ * .gts/.gjs. This is hacky but I don't know of any other (non-upstream) fix for this.
+ *
+ * Potential upstream Volar fix for this:
+ * https://github.com/volarjs/volar.js/pull/281
+ */
+function generateAutoImportAnchor(script) {
+    return {
+        originalFile: script,
+        originalStart: 0,
+        originalLength: 0,
+        insertionPoint: 0,
+        transformedSource: '/// <reference types="__GLINT_AUTO_IMPORT_ANCHOR__" />\n',
+    };
+}
+//# sourceMappingURL=rewrite-module.js.map

package/lib/transform/template/rewrite-module.js.map

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

package/lib/transform/template/scope-stack.d.ts

@@ -0,0 +1,13 @@
+/**
+ * A `ScopeStack` is used while traversing a template
+ * to track what identifiers are currently in scope.
+ */
+export default class ScopeStack {
+    private stack;
+    constructor(identifiers: string[]);
+    push(identifiers: Array<string>): void;
+    pop(): void;
+    hasBinding(identifier: string): boolean;
+    private get top();
+}
+//# sourceMappingURL=scope-stack.d.ts.map

package/lib/transform/template/scope-stack.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope-stack.d.ts","sourceRoot":"","sources":["../../../src/transform/template/scope-stack.ts"],"names":[],"mappings":"AAEA;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAC7B,OAAO,CAAC,KAAK,CAAqB;gBAEf,WAAW,EAAE,MAAM,EAAE;IAIjC,IAAI,CAAC,WAAW,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,IAAI;IAQtC,GAAG,IAAI,IAAI;IAKX,UAAU,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO;IAI9C,OAAO,KAAK,GAAG,GAEd;CACF"}

package/lib/transform/template/scope-stack.js

@@ -0,0 +1,28 @@
+import { assert } from '../util.js';
+/**
+ * A `ScopeStack` is used while traversing a template
+ * to track what identifiers are currently in scope.
+ */
+export default class ScopeStack {
+    constructor(identifiers) {
+        this.stack = [new Set(identifiers)];
+    }
+    push(identifiers) {
+        let scope = new Set(this.top);
+        for (let identifier of identifiers) {
+            scope.add(identifier);
+        }
+        this.stack.unshift(scope);
+    }
+    pop() {
+        assert(this.stack.length > 1);
+        this.stack.shift();
+    }
+    hasBinding(identifier) {
+        return this.top.has(identifier);
+    }
+    get top() {
+        return this.stack[0];
+    }
+}
+//# sourceMappingURL=scope-stack.js.map

package/lib/transform/template/scope-stack.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"scope-stack.js","sourceRoot":"","sources":["../../../src/transform/template/scope-stack.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,YAAY,CAAC;AAEpC;;;GAGG;AACH,MAAM,CAAC,OAAO,OAAO,UAAU;IAG7B,YAAmB,WAAqB;QACtC,IAAI,CAAC,KAAK,GAAG,CAAC,IAAI,GAAG,CAAC,WAAW,CAAC,CAAC,CAAC;IACtC,CAAC;IAEM,IAAI,CAAC,WAA0B;QACpC,IAAI,KAAK,GAAG,IAAI,GAAG,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;QAC9B,KAAK,IAAI,UAAU,IAAI,WAAW,EAAE,CAAC;YACnC,KAAK,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;QACxB,CAAC;QACD,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;IAC5B,CAAC;IAEM,GAAG;QACR,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,KAAK,CAAC,KAAK,EAAE,CAAC;IACrB,CAAC;IAEM,UAAU,CAAC,UAAkB;QAClC,OAAO,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC;IAClC,CAAC;IAED,IAAY,GAAG;QACb,OAAO,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;IACvB,CAAC;CACF"}