ember-eslint-parser 0.7.0 → 0.9.0

package/src/parser/ts-patch.js

@@ -1,6 +1,8 @@
-const fs = require('node:fs');
-const { transformForLint } = require('./transforms');
-const { replaceRange } = require('./transforms');
+import fs from 'node:fs';
+import { createRequire } from 'node:module';
+import { transformForLint, replaceRange } from './transforms.js';
+
+const require = createRequire(import.meta.url);
 
 let patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser, isPatched, allowGjs;
 
@@ -80,12 +82,32 @@ try {
     let jsCode = code;
     const sourceFile = ts.createSourceFile('__x__.ts', code, ts.ScriptTarget.Latest);
     const length = jsCode.length;
-    for (const b of sourceFile.statements) {
-      if (b.kind === ts.SyntaxKind.ImportDeclaration && b.moduleSpecifier.text.endsWith('.gts')) {
-        const value = b.moduleSpecifier.text.replace(/\.gts$/, '.mts');
-        jsCode = replaceRange(jsCode, b.moduleSpecifier.pos + 2, b.moduleSpecifier.end - 1, value);
+    function visit(node) {
+      if (
+        node.kind === ts.SyntaxKind.ImportDeclaration &&
+        node.moduleSpecifier.text.endsWith('.gts')
+      ) {
+        const value = node.moduleSpecifier.text.replace(/\.gts$/, '.mts');
+        jsCode = replaceRange(
+          jsCode,
+          node.moduleSpecifier.pos + 2,
+          node.moduleSpecifier.end - 1,
+          value
+        );
+      }
+      if (
+        node.kind === ts.SyntaxKind.CallExpression &&
+        node.expression.kind === ts.SyntaxKind.ImportKeyword
+      ) {
+        const arg = node.arguments[0];
+        if (arg && arg.kind === ts.SyntaxKind.StringLiteral && arg.text.endsWith('.gts')) {
+          const value = arg.text.replace(/\.gts$/, '.mts');
+          jsCode = replaceRange(jsCode, arg.getStart(sourceFile) + 1, arg.end - 1, value); // +1/-1 to skip surrounding quotes
+        }
       }
+      ts.forEachChild(node, visit);
     }
+    visit(sourceFile);
     if (length !== jsCode.length) {
       throw new Error('bad replacement');
     }
@@ -142,9 +164,4 @@ try {
   syncMtsGtsSourceFiles = () => null;
 }
 
-module.exports = {
-  patchTs,
-  replaceExtensions,
-  syncMtsGtsSourceFiles,
-  typescriptParser,
-};
+export { patchTs, replaceExtensions, syncMtsGtsSourceFiles, typescriptParser };

package/src/preprocessor/noop.js

@@ -9,24 +9,27 @@
 
 const parsedFiles = new Set();
 
-module.exports = {
-  registerParsedFile(f) {
-    parsedFiles.add(f);
-  },
-  preprocess: undefined,
-  postprocess: (messages, fileName) => {
-    const msgs = messages.flat();
-    if (!parsedFiles.has(fileName)) {
-      msgs[0] = msgs[0] || {
-        message: '',
-      };
-      msgs[0].message += '\n';
-      msgs[0].message +=
-        'To lint Gjs/Gts files please follow the setup guide at https://github.com/ember-cli/eslint-plugin-ember#gtsgjs' +
-        '\nNote that this error can also happen if you have multiple versions of eslint-plugin-ember in your node_modules';
-    }
-    parsedFiles.delete(fileName); // required for tests
-    return msgs;
-  },
-  supportsAutofix: true,
+export function registerParsedFile(f) {
+  parsedFiles.add(f);
+}
+
+export const preprocess = undefined;
+
+export const postprocess = (messages, fileName) => {
+  const msgs = messages.flat();
+  if (!parsedFiles.has(fileName)) {
+    msgs[0] = msgs[0] || {
+      message: '',
+    };
+    msgs[0].message += '\n';
+    msgs[0].message +=
+      'To lint Gjs/Gts files please follow the setup guide at https://github.com/ember-cli/eslint-plugin-ember#gtsgjs' +
+      '\nNote that this error can also happen if you have multiple versions of eslint-plugin-ember in your node_modules';
+  }
+  parsedFiles.delete(fileName); // required for tests
+  return msgs;
 };
+
+export const supportsAutofix = true;
+
+export default { registerParsedFile, preprocess, postprocess, supportsAutofix };

package/src/utils/document.js

@@ -1,101 +0,0 @@
-/**
- * @typedef {{ line: number; column: number }} Position
- */
-
-// Helper class to convert line/column from and to offset
-// taken and adapt from https://github.com/typed-ember/glint/blob/main/packages/core/src/language-server/util/position.ts
-class DocumentLines {
-  /**
-   * @param {string} contents
-   */
-  constructor(contents) {
-    this.lineStarts = computeLineStarts(contents);
-  }
-
-  /**
-   * @param {Position} position
-   * @return {number}
-   */
-  positionToOffset(position) {
-    const { line, column } = position;
-    return this.lineStarts[line - 1] + column;
-  }
-
-  /**
-   *
-   * @param {number} position
-   * @return {Position}
-   */
-  offsetToPosition(position) {
-    const lineStarts = this.lineStarts;
-    let line = 0;
-    while (line + 1 < lineStarts.length && lineStarts[line + 1] <= position) {
-      line++;
-    }
-    const column = position - lineStarts[line];
-    return { line: line + 1, column };
-  }
-}
-
-/**
- * @returns {number[]}
- * @param {string} text
- */
-function computeLineStarts(text) {
-  const result = [];
-  let pos = 0;
-  let lineStart = 0;
-  while (pos < text.length) {
-    const ch = text.codePointAt(pos);
-    pos++;
-    switch (ch) {
-      case 13 /* carriageReturn */: {
-        if (text.codePointAt(pos) === 10 /* lineFeed */) {
-          pos++;
-        }
-      }
-      // falls through
-      case 10 /* lineFeed */: {
-        result.push(lineStart);
-        lineStart = pos;
-        break;
-      }
-      default: {
-        if (ch > 127 /* maxAsciiCharacter */ && isLineBreak(ch)) {
-          result.push(lineStart);
-          lineStart = pos;
-        }
-        break;
-      }
-    }
-  }
-  result.push(lineStart);
-  return result;
-}
-
-/* istanbul ignore next */
-/**
- * @param {number} ch
- * @return {boolean}
- */
-function isLineBreak(ch) {
-  // ES5 7.3:
-  // The ECMAScript line terminator characters are listed in Table 3.
-  //     Table 3: Line Terminator Characters
-  //     Code Unit Value     Name                    Formal Name
-  //     \u000A              Line Feed               <LF>
-  //     \u000D              Carriage Return         <CR>
-  //     \u2028              Line separator          <LS>
-  //     \u2029              Paragraph separator     <PS>
-  // Only the characters in Table 3 are treated as line terminators. Other new line or line
-  // breaking characters are treated as white space but not as line terminators.
-  return (
-    ch === 10 /* lineFeed */ ||
-    ch === 13 /* carriageReturn */ ||
-    ch === 8232 /* lineSeparator */ ||
-    ch === 8233 /* paragraphSeparator */
-  );
-}
-
-module.exports = DocumentLines;
-module.exports.isLineBreak = isLineBreak;