ember-repl 3.0.0-beta.6 → 3.0.0-beta.8

package/src/browser/eti/parse-templates.ts

@@ -1,284 +0,0 @@
-import { expect } from './debug.ts';
-import { TEMPLATE_TAG_NAME } from './util.ts';
-
-export type TemplateMatch = TemplateTagMatch;
-
-export interface TemplateTagMatch {
-  type: 'template-tag';
-  tagName: string;
-  start: RegExpMatchArray;
-  end: RegExpMatchArray;
-  contents: string;
-}
-
-/**
- * Represents a static import of a template literal.
- */
-export interface StaticImportConfig {
-  /**
-   * The path to the package from which we want to import the template literal
-   * (e.g.: 'ember-cli-htmlbars')
-   */
-  importPath: string;
-  /**
-   * The name of the template literal (e.g.: 'hbs') or 'default' if this package
-   * exports a default function
-   */
-  importIdentifier: string;
-}
-
-/**
- * The input options to instruct parseTemplates on how to parse the input.
- *
- * @param templateTag
- */
-export interface ParseTemplatesOptions {
-  /** Tag to use, if parsing template tags is enabled. */
-  templateTag?: string;
-}
-
-const escapeChar = '\\';
-const stringDelimiter = /['"]/;
-
-const singleLineCommentStart = /\/\//;
-const newLine = /\n/;
-const multiLineCommentStart = /\/\*/;
-const multiLineCommentEnd = /\*\//;
-
-const templateLiteralStart = /([$a-zA-Z_][0-9a-zA-Z_$]*)?`/;
-const templateLiteralEnd = /`/;
-
-const dynamicSegmentStart = /\${/;
-const blockStart = /{/;
-const dynamicSegmentEnd = /}/;
-
-function isEscaped(template: string, _offset: number | undefined) {
-  let offset = expect(_offset, 'Expected an index to check escaping');
-
-  let count = 0;
-
-  while (template[offset - 1] === escapeChar) {
-    count++;
-    offset--;
-  }
-
-  return count % 2 === 1;
-}
-
-export const DEFAULT_PARSE_TEMPLATES_OPTIONS = {
-  templateTag: TEMPLATE_TAG_NAME,
-};
-
-/**
- * Parses a template to find all possible valid matches for an embedded template.
- * Supported syntaxes are template literals:
- *
- *   hbs`Hello, world!`
- *
- * And template tags
- *
- *   <template></template>
- *
- * The parser excludes any values found within strings recursively, and also
- * excludes any string literals with dynamic segments (e.g `${}`) since these
- * cannot be valid templates.
- *
- * @param template The template to parse
- * @param relativePath Relative file path for the template (for errors)
- * @param options optional configuration options for how to parse templates
- * @returns
- */
-export function parseTemplates(
-  template: string,
-  relativePath: string,
-  options: ParseTemplatesOptions = DEFAULT_PARSE_TEMPLATES_OPTIONS
-): TemplateMatch[] {
-  const results: TemplateMatch[] = [];
-  const templateTag = options?.templateTag;
-
-  const templateTagStart = new RegExp(`<${templateTag}[^<]*>`);
-  const templateTagEnd = new RegExp(`</${templateTag}>`);
-  const argumentsMatchRegex = new RegExp(`<${templateTag}[^<]*\\S[^<]*>`);
-
-  const allTokens = new RegExp(
-    [
-      singleLineCommentStart.source,
-      newLine.source,
-      multiLineCommentStart.source,
-      multiLineCommentEnd.source,
-      stringDelimiter.source,
-      templateLiteralStart.source,
-      templateLiteralEnd.source,
-      dynamicSegmentStart.source,
-      dynamicSegmentEnd.source,
-      blockStart.source,
-      templateTagStart.source,
-      templateTagEnd.source,
-    ].join('|'),
-    'g'
-  );
-
-  const tokens = Array.from(template.matchAll(allTokens));
-
-  while (tokens.length > 0) {
-    const currentToken = tokens.shift()!; // eslint-disable-line @typescript-eslint/no-non-null-assertion
-
-    parseToken(results, template, currentToken, tokens, true);
-  }
-
-  /**
-   * Parse the current token. If top level, then template tags can be parsed.
-   * Else, we are nested within a dynamic segment, which is currently unsupported.
-   */
-  function parseToken(
-    results: TemplateMatch[],
-    template: string,
-    token: RegExpMatchArray,
-    tokens: RegExpMatchArray[],
-    isTopLevel = false
-  ) {
-    if (token[0].match(multiLineCommentStart)) {
-      parseMultiLineComment(results, template, token, tokens);
-    } else if (token[0].match(singleLineCommentStart)) {
-      parseSingleLineComment(results, template, token, tokens);
-    } else if (token[0].match(templateLiteralStart)) {
-      parseTemplateLiteral(template, tokens);
-    } else if (
-      isTopLevel &&
-      templateTag !== undefined &&
-      templateTagStart &&
-      token[0].match(templateTagStart)
-    ) {
-      parseTemplateTag(results, template, token, tokens, templateTag);
-    } else if (token[0].match(stringDelimiter)) {
-      parseString(results, template, token, tokens);
-    }
-  }
-
-  /**
-   * Parse a template literal. If a dynamic segment is found, enters the dynamic
-   * segment and parses it recursively. If no dynamic segments are found and the
-   * literal is top level (e.g. not nested within a dynamic segment) and has a
-   * tag, pushes it into the list of results.
-   */
-  function parseTemplateLiteral(template: string, tokens: RegExpMatchArray[]) {
-    while (tokens.length > 0) {
-      let currentToken = expect(tokens.shift(), 'expected token');
-
-      if (isEscaped(template, currentToken.index)) continue;
-
-      if (currentToken[0].match(templateLiteralEnd)) {
-        return;
-      }
-    }
-  }
-
-  /**
-   * Parse a string. All tokens within a string are ignored
-   * since there are no dynamic segments within these.
-   */
-  function parseString(
-    _results: TemplateMatch[],
-    template: string,
-    startToken: RegExpMatchArray,
-    tokens: RegExpMatchArray[]
-  ) {
-    while (tokens.length > 0) {
-      const currentToken = expect(tokens.shift(), 'expected token');
-
-      if (currentToken[0] === startToken[0] && !isEscaped(template, currentToken.index)) {
-        return;
-      }
-    }
-  }
-
-  /**
-   * Parse a single-line comment. All tokens within a single-line comment are ignored
-   * since there are no dynamic segments within them.
-   */
-  function parseSingleLineComment(
-    _results: TemplateMatch[],
-    _template: string,
-    _startToken: RegExpMatchArray,
-    tokens: RegExpMatchArray[]
-  ) {
-    while (tokens.length > 0) {
-      const currentToken = expect(tokens.shift(), 'expected token');
-
-      if (currentToken[0] === '\n') {
-        return;
-      }
-    }
-  }
-
-  /**
-   * Parse a multi-line comment. All tokens within a multi-line comment are ignored
-   * since there are no dynamic segments within them.
-   */
-  function parseMultiLineComment(
-    _results: TemplateMatch[],
-    _template: string,
-    _startToken: RegExpMatchArray,
-    tokens: RegExpMatchArray[]
-  ) {
-    while (tokens.length > 0) {
-      const currentToken = expect(tokens.shift(), 'expected token');
-
-      if (currentToken[0] === '*/') {
-        return;
-      }
-    }
-  }
-
-  /**
-   * Parses a template tag. Continues parsing until the template tag has closed,
-   * accounting for nested template tags.
-   */
-  function parseTemplateTag(
-    results: TemplateMatch[],
-    _template: string,
-    startToken: RegExpMatchArray,
-    tokens: RegExpMatchArray[],
-    templateTag: string
-  ) {
-    let stack = 1;
-
-    if (argumentsMatchRegex && startToken[0].match(argumentsMatchRegex)) {
-      throw new Error(
-        `embedded template preprocessing currently does not support passing arguments, found args in: ${relativePath}`
-      );
-    }
-
-    while (tokens.length > 0) {
-      const currentToken = expect(tokens.shift(), 'expected token');
-
-      if (currentToken[0].match(templateTagStart)) {
-        stack++;
-      } else if (currentToken[0].match(templateTagEnd)) {
-        stack--;
-      }
-
-      if (stack === 0) {
-        let contents = '';
-
-        if (startToken.index !== undefined) {
-          const templateStart = startToken.index + startToken[0].length;
-
-          contents = template.slice(templateStart, currentToken.index);
-        }
-
-        results.push({
-          type: 'template-tag',
-          tagName: templateTag,
-          contents: contents,
-          start: startToken,
-          end: currentToken,
-        });
-
-        return;
-      }
-    }
-  }
-
-  return results;
-}

package/src/browser/eti/preprocess.ts

@@ -1,187 +0,0 @@
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import { getTemplateLocals } from '@glimmer/syntax';
-
-// eslint-disable-next-line @typescript-eslint/ban-ts-comment
-// @ts-ignore
-import lineColumn from 'line-column';
-import MagicString from 'magic-string';
-
-import { expect } from './debug.ts';
-import { parseTemplates } from './parse-templates.ts';
-
-import type { ParseTemplatesOptions, TemplateMatch } from './parse-templates.ts';
-
-interface PreprocessOptionsEager {
-  importIdentifier?: string;
-  importPath?: string;
-  templateTag?: string;
-  templateTagReplacement?: string;
-
-  relativePath: string;
-  includeSourceMaps: boolean;
-  includeTemplateTokens: boolean;
-}
-
-interface PreprocessOptionsLazy {
-  importIdentifier?: string;
-  importPath?: string;
-  templateTag?: string;
-  templateTagReplacement?: string;
-
-  relativePath: string;
-  includeSourceMaps: boolean;
-  includeTemplateTokens: boolean;
-}
-
-type PreprocessOptions = PreprocessOptionsLazy | PreprocessOptionsEager;
-
-interface PreprocessedOutput {
-  output: string;
-  replacements: Replacement[];
-}
-
-interface Replacement {
-  type: 'start' | 'end';
-  index: number;
-  oldLength: number;
-  newLength: number;
-  originalLine: number;
-  originalCol: number;
-}
-
-function getMatchStartAndEnd(match: RegExpMatchArray) {
-  return {
-    start: expect(match.index, 'Expected regular expression match to have an index'),
-    end:
-      expect(match.index, 'Expected regular expression match to have an index') + match[0].length,
-  };
-}
-
-function replacementFrom(
-  template: string,
-  index: number,
-  oldLength: number,
-  newLength: number,
-  type: 'start' | 'end'
-): Replacement {
-  const loc = expect(
-    lineColumn(template).fromIndex(index),
-    'BUG: expected to find a line/column based on index'
-  );
-
-  return {
-    type,
-    index,
-    oldLength,
-    newLength,
-    originalCol: loc.col,
-    originalLine: loc.line,
-  };
-}
-
-function replaceMatch(
-  s: MagicString,
-  match: TemplateMatch,
-  startReplacement: string,
-  endReplacement: string,
-  template: string,
-  includeTemplateTokens: boolean
-): Replacement[] {
-  const { start: openStart, end: openEnd } = getMatchStartAndEnd(match.start);
-  const { start: closeStart, end: closeEnd } = getMatchStartAndEnd(match.end);
-
-  let options = '';
-
-  if (includeTemplateTokens) {
-    const tokensString = getTemplateLocals(template.slice(openEnd, closeStart))
-      .filter((local: string) => local.match(/^[$A-Z_][0-9A-Z_$]*$/i))
-      .join(',');
-
-    if (tokensString.length > 0) {
-      options = `, scope: () => ({${tokensString}})`;
-    }
-  }
-
-  const newStart = `${startReplacement}\``;
-  const newEnd = `\`, { strictMode: true${options} }${endReplacement}`;
-
-  s.overwrite(openStart, openEnd, newStart);
-  s.overwrite(closeStart, closeEnd, newEnd);
-  ensureBackticksEscaped(s, openEnd + 1, closeStart - 1);
-
-  return [
-    replacementFrom(template, openStart, openEnd - openStart, newStart.length, 'start'),
-    replacementFrom(template, closeStart, closeEnd - closeStart, newEnd.length, 'end'),
-  ];
-}
-
-/**
- * Preprocesses all embedded templates within a JavaScript or TypeScript file.
- * This function replaces all embedded templates that match our template syntax
- * with valid, parseable JS. Optionally, it can also include a source map, and
- * it can also include all possible values used within the template.
- *
- * Input:
- *
- *   <template><MyComponent/><template>
- *
- * Output:
- *
- *   [GLIMMER_TEMPLATE(`<MyComponent/>`, { scope() { return {MyComponent}; } })];
- *
- * It can also be used with template literals to provide the in scope values:
- *
- * Input:
- *
- *   hbs`<MyComponent/>`;
- *
- * Output
- *
- *   hbs(`<MyComponent/>`, { scope() { return {MyComponent}; } });
- */
-export function preprocessEmbeddedTemplates(
-  template: string,
-  options: PreprocessOptions
-): PreprocessedOutput {
-  const { templateTag, templateTagReplacement, includeTemplateTokens, relativePath } = options;
-
-  const parseTemplatesOptions: ParseTemplatesOptions = {
-    templateTag,
-  };
-
-  const matches = parseTemplates(template, relativePath, parseTemplatesOptions);
-  const replacements: Replacement[] = [];
-  const s = new MagicString(template);
-
-  for (const match of matches) {
-    if (match.type === 'template-tag') {
-      replacements.push(
-        ...replaceMatch(
-          s,
-          match,
-          `[${templateTagReplacement}(`,
-          ')]',
-          template,
-          includeTemplateTokens
-        )
-      );
-    }
-  }
-
-  let output = s.toString();
-
-  return {
-    output,
-    replacements,
-  };
-}
-
-function ensureBackticksEscaped(s: MagicString, start: number, end: number) {
-  if (start >= end) return;
-
-  let content = s.slice(start, end);
-
-  content = content.replace(/(?<!\\)`/g, '\\`');
-  s.overwrite(start, end, content, false);
-}

package/src/browser/eti/template-tag-transform.ts

@@ -1,100 +0,0 @@
-import { buildPrecompileTemplateCall, registerRefs, TEMPLATE_TAG_NAME } from './util.ts';
-
-/**
- * Supports the following syntaxes:
- *
- * const Foo = [GLIMMER_TEMPLATE('hello')];
- *
- * export const Foo = [GLIMMER_TEMPLATE('hello')];
- *
- * export default [GLIMMER_TEMPLATE('hello')];
- *
- * class Foo {
- *   [GLIMMER_TEMPLATE('hello')];
- * }
- */
-export const transformTemplateTag = function (t: any, templatePath: any, state: any) {
-  let compiled = buildPrecompileTemplateCall(t, templatePath, state);
-  let path = templatePath.parentPath;
-
-  if (path.type === 'ArrayExpression') {
-    let arrayParentPath = path.parentPath;
-    let varId = arrayParentPath.node.id || path.scope.generateUidIdentifier(templatePath);
-
-    const templateOnlyComponentExpression = t.callExpression(
-      buildSetComponentTemplate(path, state),
-      [
-        compiled,
-        t.callExpression(
-          state.importUtil.import(
-            templatePath,
-            '@ember/component/template-only',
-            'default',
-            'templateOnly'
-          ),
-          [t.stringLiteral('dynamic-runtime-file.js'), t.stringLiteral(varId.name)]
-        ),
-      ]
-    );
-
-    if (
-      arrayParentPath.type === 'ExpressionStatement' &&
-      arrayParentPath.parentPath.type === 'Program'
-    ) {
-      registerRefs(
-        arrayParentPath.replaceWith(t.exportDefaultDeclaration(templateOnlyComponentExpression)),
-        (newPath: any) => [
-          newPath.get('declaration.callee'),
-          newPath.get('declaration.arguments.0.callee'),
-          newPath.get('declaration.arguments.1.callee'),
-        ]
-      );
-    } else {
-      registerRefs(path.replaceWith(templateOnlyComponentExpression), (newPath: any) => [
-        newPath.get('callee'),
-        newPath.get('arguments.0.callee'),
-        newPath.get('arguments.1.callee'),
-      ]);
-    }
-  } else if (path.type === 'ClassProperty') {
-    let classPath = path.parentPath.parentPath;
-
-    if (classPath.node.type === 'ClassDeclaration') {
-      registerRefs(
-        classPath.insertAfter(
-          t.expressionStatement(
-            t.callExpression(buildSetComponentTemplate(path, state), [compiled, classPath.node.id])
-          )
-        ),
-        (newPath: any) => [
-          newPath.get('expression.callee'),
-          newPath.get('expression.arguments.0.callee'),
-        ]
-      );
-    } else {
-      registerRefs(
-        classPath.replaceWith(
-          t.expressionStatement(
-            t.callExpression(buildSetComponentTemplate(path, state), [compiled, classPath.node])
-          )
-        ),
-        (newPath: any) => [
-          newPath.parentPath.get('callee'),
-          newPath.parentPath.get('arguments.0.callee'),
-        ]
-      );
-    }
-
-    path.remove();
-
-    return;
-  } else {
-    throw path.buildCodeFrameError(
-      `Attempted to use \`<${TEMPLATE_TAG_NAME}>\` to define a template in an unsupported way. Templates defined using this syntax must be:\n\n1. Assigned to a variable declaration OR\n2. The default export of a file OR\n2. In the top level of the file on their own (sugar for \`export default\`) OR\n4. Used directly within a named class body`
-    );
-  }
-};
-
-function buildSetComponentTemplate(path: any, state: any) {
-  return state.importUtil.import(path, '@ember/component', 'setComponentTemplate');
-}

package/src/browser/eti/util.ts

@@ -1,72 +0,0 @@
-import type { TemplateMatch } from './parse-templates.ts';
-import type { NodePath } from '@babel/traverse';
-import type { CallExpression } from '@babel/types';
-import type { ImportUtil } from 'babel-import-util';
-
-// const Greeting = <template>Hello</template>
-export const TEMPLATE_TAG_NAME = 'template';
-export const TEMPLATE_TAG_PLACEHOLDER = '__GLIMMER_TEMPLATE';
-
-export function isTemplateTag(callExpressionPath: NodePath<CallExpression>) {
-  const callee = callExpressionPath.get('callee');
-
-  return (
-    !Array.isArray(callee) && callee.isIdentifier() && callee.node.name === TEMPLATE_TAG_PLACEHOLDER
-  );
-}
-
-export function buildPrecompileTemplateCall(
-  t: any,
-  callExpressionPath: NodePath<CallExpression>,
-  state: {
-    importUtil: ImportUtil;
-  }
-): CallExpression {
-  const callee = callExpressionPath.get('callee');
-
-  return t.callExpression(
-    state.importUtil.import(callee, '@ember/template-compilation', 'precompileTemplate'),
-    callExpressionPath.node.arguments
-  );
-}
-
-export function registerRefs(
-  newPath: string | string[],
-  getRefPaths: (path: string) => NodePath[]
-) {
-  if (Array.isArray(newPath)) {
-    if (newPath.length > 1) {
-      throw new Error(
-        'registerRefs is only meant to handle single node transformations. Received more than one path node.'
-      );
-    }
-
-    newPath = newPath[0] as string;
-  }
-
-  const refPaths = getRefPaths(newPath);
-
-  for (const ref of refPaths) {
-    if (!ref.isIdentifier()) {
-      throw new Error(
-        'ember-template-imports internal assumption that refPath should of type identifier. Please open an issue.'
-      );
-    }
-
-    const binding = ref.scope.getBinding(ref.node.name);
-
-    if (binding !== undefined) {
-      binding.reference(ref);
-    }
-  }
-}
-
-const SUPPORTED_EXTENSIONS = ['.js', '.ts', '.gjs', '.gts'];
-
-export function isSupportedScriptFileExtension(filePath: string) {
-  return SUPPORTED_EXTENSIONS.some((ext) => filePath.endsWith(ext));
-}
-
-export function isStrictMode(templateInfo: TemplateMatch): boolean {
-  return templateInfo.type === 'template-tag';
-}