astro-eslint-parser 0.9.0 → 0.9.1

package/lib/index.d.ts

@@ -5,7 +5,7 @@ import { ParseResult } from '@astrojs/compiler';
 import { Node, AttributeNode, ParentNode } from '@astrojs/compiler/types';
 import { VisitorKeys as VisitorKeys$1 } from '@typescript-eslint/visitor-keys';
 
-declare type RangeAndLoc = {
+type RangeAndLoc = {
     range: TSESTree.Range;
     loc: TSESTree.SourceLocation;
 };
@@ -70,9 +70,9 @@ interface BaseNode {
     type: string;
 }
 
-declare type JSXNode = JSXAttribute | JSXClosingElement | JSXClosingFragment | JSXElement | JSXEmptyExpression | JSXExpressionContainer | JSXFragment | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXOpeningFragment | JSXSpreadAttribute | JSXSpreadChild | JSXText;
-declare type JSXChild = JSXElement | JSXFragment | JSXExpression | JSXText | AstroHTMLComment | AstroRawText;
-declare type JSXParentNode = JSXElement | JSXFragment | AstroFragment;
+type JSXNode = JSXAttribute | JSXClosingElement | JSXClosingFragment | JSXElement | JSXEmptyExpression | JSXExpressionContainer | JSXFragment | JSXIdentifier | JSXMemberExpression | JSXNamespacedName | JSXOpeningElement | JSXOpeningFragment | JSXSpreadAttribute | JSXSpreadChild | JSXText;
+type JSXChild = JSXElement | JSXFragment | JSXExpression | JSXText | AstroHTMLComment | AstroRawText;
+type JSXParentNode = JSXElement | JSXFragment | AstroFragment;
 interface JSXElement extends BaseNode {
     type: "JSXElement";
     openingElement: JSXOpeningElement;
@@ -119,7 +119,7 @@ interface JSXSpreadAttribute extends BaseNode {
     argument: TSESTree.Expression;
     parent?: JSXOpeningElement;
 }
-declare type JSXTagNameExpression = JSXIdentifier | JSXMemberExpression | JSXNamespacedName;
+type JSXTagNameExpression = JSXIdentifier | JSXMemberExpression | JSXNamespacedName;
 interface JSXIdentifier extends BaseNode {
     type: "JSXIdentifier";
     name: string;
@@ -137,7 +137,7 @@ interface JSXNamespacedName extends BaseNode {
     name: JSXIdentifier;
     parent?: JSXAttribute | AstroShorthandAttribute | AstroTemplateLiteralAttribute | JSXMemberExpression | JSXOpeningElement | JSXClosingElement;
 }
-declare type JSXExpression = JSXExpressionContainer | JSXSpreadChild;
+type JSXExpression = JSXExpressionContainer | JSXSpreadChild;
 interface JSXExpressionContainer extends BaseNode {
     type: "JSXExpressionContainer";
     expression: TSESTree.Expression | JSXEmptyExpression;
@@ -159,9 +159,9 @@ interface JSXText extends BaseNode {
     parent?: JSXParentNode;
 }
 
-declare type AstroNode = AstroProgram | AstroFragment | AstroHTMLComment | AstroDoctype | AstroShorthandAttribute | AstroTemplateLiteralAttribute | AstroRawText;
-declare type AstroChild = JSXElement | JSXFragment | JSXExpression | JSXText | AstroHTMLComment | AstroRawText;
-declare type AstroParentNode = JSXElement | JSXFragment | AstroFragment;
+type AstroNode = AstroProgram | AstroFragment | AstroHTMLComment | AstroDoctype | AstroShorthandAttribute | AstroTemplateLiteralAttribute | AstroRawText;
+type AstroChild = JSXElement | JSXFragment | JSXExpression | JSXText | AstroHTMLComment | AstroRawText;
+type AstroParentNode = JSXElement | JSXFragment | AstroFragment;
 /** Node of Astro program root */
 interface AstroProgram extends Omit<TSESTree.Program, "type" | "body"> {
     type: "Program";
@@ -206,11 +206,11 @@ interface AstroRawText extends Omit<JSXText, "type"> {
     parent?: JSXElement;
 }
 
-declare type Comment = TSESTree.Comment;
-declare type Token = TSESTree.Token;
-declare type SourceLocation = TSESTree.SourceLocation;
-declare type Range = TSESTree.Range;
-declare type Position = TSESTree.Position;
+type Comment = TSESTree.Comment;
+type Token = TSESTree.Token;
+type SourceLocation = TSESTree.SourceLocation;
+type Range = TSESTree.Range;
+type Position = TSESTree.Position;
 
 type index_Comment = Comment;
 type index_Token = Token;

package/lib/index.js

@@ -166,7 +166,7 @@ ${code}`
     );
     throw e;
   } finally {
-    patchResult == null ? void 0 : patchResult.terminate();
+    patchResult?.terminate();
   }
 }
 
@@ -325,8 +325,7 @@ function calcAttributeValueStartOffset(node, ctx) {
   return info.index;
 }
 function getEndOffset(node, ctx) {
-  var _a;
-  if (((_a = node.position.end) == null ? void 0 : _a.offset) != null) {
+  if (node.position.end?.offset != null) {
     return node.position.end.offset;
   }
   if (isTag(node))
@@ -494,8 +493,7 @@ function skipSpaces(string, position) {
   return position;
 }
 function getSortedChildren(parent, code) {
-  var _a;
-  if (parent.type === "root" && ((_a = parent.children[0]) == null ? void 0 : _a.type) === "frontmatter") {
+  if (parent.type === "root" && parent.children[0]?.type === "frontmatter") {
     const children = [...parent.children];
     if (children.every((n) => n.position)) {
       return children.sort(
@@ -610,7 +608,6 @@ var RestoreContext = class {
     this.tokens.push(this.ctx.buildToken(type, range));
   }
   restore(result) {
-    var _a, _b;
     const nodeMap = remapLocationsAndGetNodeMap(result, this.tokens, {
       remapLocation: (n) => this.remapLocation(n),
       removeToken: (token) => this.virtualFragments.some(
@@ -619,7 +616,7 @@ var RestoreContext = class {
     });
     restoreNodes(result, nodeMap, this.restoreNodeProcesses);
     const firstOffset = Math.min(
-      ...[result.ast.body[0], (_a = result.ast.tokens) == null ? void 0 : _a[0], (_b = result.ast.comments) == null ? void 0 : _b[0]].filter((t) => Boolean(t)).map((t) => t.range[0])
+      ...[result.ast.body[0], result.ast.tokens?.[0], result.ast.comments?.[0]].filter((t) => Boolean(t)).map((t) => t.range[0])
     );
     if (firstOffset < result.ast.range[0]) {
       result.ast.range[0] = firstOffset;
@@ -1329,7 +1326,6 @@ function parse2(code, ctx) {
   return result;
 }
 function adjustHTML(ast, htmlElement, ctx) {
-  var _a;
   const htmlEnd = ctx.code.indexOf("</html");
   if (htmlEnd == null) {
     return;
@@ -1337,7 +1333,7 @@ function adjustHTML(ast, htmlElement, ctx) {
   const hasTokenAfter = Boolean(ctx.code.slice(htmlEnd + 7).trim());
   const children = [...htmlElement.children];
   for (const child of children) {
-    const offset = (_a = child.position) == null ? void 0 : _a.start.offset;
+    const offset = child.position?.start.offset;
     if (hasTokenAfter && offset != null) {
       if (htmlEnd <= offset) {
         htmlElement.children.splice(htmlElement.children.indexOf(child), 1);
@@ -1350,7 +1346,6 @@ function adjustHTML(ast, htmlElement, ctx) {
   }
 }
 function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyElement, ctx) {
-  var _a;
   const bodyEnd = ctx.code.indexOf("</body");
   if (bodyEnd == null) {
     return;
@@ -1361,7 +1356,7 @@ function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyEle
   }
   const children = [...bodyElement.children];
   for (const child of children) {
-    const offset = (_a = child.position) == null ? void 0 : _a.start.offset;
+    const offset = child.position?.start.offset;
     if (offset != null) {
       if (bodyEnd <= offset) {
         if (hasTokenAfterHtmlEnd && htmlEnd <= offset) {
@@ -1564,7 +1559,7 @@ function parseTemplate(code, filePath) {
   const normalized = ctx.locs.getNormalizedLineFeed();
   const ctxForAstro = normalized.needRemap ? new Context(normalized.code, filePath) : ctx;
   try {
-    const result = parse2((normalized == null ? void 0 : normalized.code) ?? code, ctxForAstro);
+    const result = parse2(normalized?.code ?? code, ctxForAstro);
     if (normalized.needRemap) {
       remap(result, normalized, code, ctxForAstro);
       ctx.originalAST = ctxForAstro.originalAST;
@@ -1577,7 +1572,7 @@ function parseTemplate(code, filePath) {
     return templateResult;
   } catch (e) {
     if (typeof e.pos === "number") {
-      const err = new ParseError(e.message, normalized == null ? void 0 : normalized.remapIndex(e.pos), ctx);
+      const err = new ParseError(e.message, normalized?.remapIndex(e.pos), ctx);
       err.astroCompilerError = e;
       throw err;
     }
@@ -1730,11 +1725,10 @@ var ParserOptionsContext = class {
     return getParser({}, this.parserOptions.parser);
   }
   isTypeScript() {
-    var _a, _b;
     if (this.state.isTypeScript != null) {
       return this.state.isTypeScript;
     }
-    const parserValue = getParserForLang({}, (_a = this.parserOptions) == null ? void 0 : _a.parser);
+    const parserValue = getParserForLang({}, this.parserOptions?.parser);
     if (typeof parserValue !== "string") {
       return this.state.isTypeScript = maybeTSESLintParserObject(parserValue) || isTSESLintParserObject(parserValue);
     }
@@ -1749,7 +1743,7 @@ var ParserOptionsContext = class {
         if (import_fs2.default.existsSync(pkgPath)) {
           try {
             return this.state.isTypeScript = TS_PARSER_NAMES.includes(
-              (_b = JSON.parse(import_fs2.default.readFileSync(pkgPath, "utf-8"))) == null ? void 0 : _b.name
+              JSON.parse(import_fs2.default.readFileSync(pkgPath, "utf-8"))?.name
             );
           } catch {
             return this.state.isTypeScript = false;
@@ -2011,7 +2005,7 @@ function addReference(list, reference) {
 function parseForESLint(code, options) {
   const { result: resultTemplate, context: ctx } = parseTemplate(
     code,
-    (options == null ? void 0 : options.filePath) ?? "<input>"
+    options?.filePath ?? "<input>"
   );
   const scriptContext = processTemplate(ctx, resultTemplate);
   const parserOptions = new ParserOptionsContext(options);

package/lib/index.mjs

@@ -137,7 +137,7 @@ ${code}`
     );
     throw e;
   } finally {
-    patchResult == null ? void 0 : patchResult.terminate();
+    patchResult?.terminate();
   }
 }
 
@@ -296,8 +296,7 @@ function calcAttributeValueStartOffset(node, ctx) {
   return info.index;
 }
 function getEndOffset(node, ctx) {
-  var _a;
-  if (((_a = node.position.end) == null ? void 0 : _a.offset) != null) {
+  if (node.position.end?.offset != null) {
     return node.position.end.offset;
   }
   if (isTag(node))
@@ -465,8 +464,7 @@ function skipSpaces(string, position) {
   return position;
 }
 function getSortedChildren(parent, code) {
-  var _a;
-  if (parent.type === "root" && ((_a = parent.children[0]) == null ? void 0 : _a.type) === "frontmatter") {
+  if (parent.type === "root" && parent.children[0]?.type === "frontmatter") {
     const children = [...parent.children];
     if (children.every((n) => n.position)) {
       return children.sort(
@@ -581,7 +579,6 @@ var RestoreContext = class {
     this.tokens.push(this.ctx.buildToken(type, range));
   }
   restore(result) {
-    var _a, _b;
     const nodeMap = remapLocationsAndGetNodeMap(result, this.tokens, {
       remapLocation: (n) => this.remapLocation(n),
       removeToken: (token) => this.virtualFragments.some(
@@ -590,7 +587,7 @@ var RestoreContext = class {
     });
     restoreNodes(result, nodeMap, this.restoreNodeProcesses);
     const firstOffset = Math.min(
-      ...[result.ast.body[0], (_a = result.ast.tokens) == null ? void 0 : _a[0], (_b = result.ast.comments) == null ? void 0 : _b[0]].filter((t) => Boolean(t)).map((t) => t.range[0])
+      ...[result.ast.body[0], result.ast.tokens?.[0], result.ast.comments?.[0]].filter((t) => Boolean(t)).map((t) => t.range[0])
     );
     if (firstOffset < result.ast.range[0]) {
       result.ast.range[0] = firstOffset;
@@ -1300,7 +1297,6 @@ function parse2(code, ctx) {
   return result;
 }
 function adjustHTML(ast, htmlElement, ctx) {
-  var _a;
   const htmlEnd = ctx.code.indexOf("</html");
   if (htmlEnd == null) {
     return;
@@ -1308,7 +1304,7 @@ function adjustHTML(ast, htmlElement, ctx) {
   const hasTokenAfter = Boolean(ctx.code.slice(htmlEnd + 7).trim());
   const children = [...htmlElement.children];
   for (const child of children) {
-    const offset = (_a = child.position) == null ? void 0 : _a.start.offset;
+    const offset = child.position?.start.offset;
     if (hasTokenAfter && offset != null) {
       if (htmlEnd <= offset) {
         htmlElement.children.splice(htmlElement.children.indexOf(child), 1);
@@ -1321,7 +1317,6 @@ function adjustHTML(ast, htmlElement, ctx) {
   }
 }
 function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyElement, ctx) {
-  var _a;
   const bodyEnd = ctx.code.indexOf("</body");
   if (bodyEnd == null) {
     return;
@@ -1332,7 +1327,7 @@ function adjustHTMLBody(ast, htmlElement, htmlEnd, hasTokenAfterHtmlEnd, bodyEle
   }
   const children = [...bodyElement.children];
   for (const child of children) {
-    const offset = (_a = child.position) == null ? void 0 : _a.start.offset;
+    const offset = child.position?.start.offset;
     if (offset != null) {
       if (bodyEnd <= offset) {
         if (hasTokenAfterHtmlEnd && htmlEnd <= offset) {
@@ -1535,7 +1530,7 @@ function parseTemplate(code, filePath) {
   const normalized = ctx.locs.getNormalizedLineFeed();
   const ctxForAstro = normalized.needRemap ? new Context(normalized.code, filePath) : ctx;
   try {
-    const result = parse2((normalized == null ? void 0 : normalized.code) ?? code, ctxForAstro);
+    const result = parse2(normalized?.code ?? code, ctxForAstro);
     if (normalized.needRemap) {
       remap(result, normalized, code, ctxForAstro);
       ctx.originalAST = ctxForAstro.originalAST;
@@ -1548,7 +1543,7 @@ function parseTemplate(code, filePath) {
     return templateResult;
   } catch (e) {
     if (typeof e.pos === "number") {
-      const err = new ParseError(e.message, normalized == null ? void 0 : normalized.remapIndex(e.pos), ctx);
+      const err = new ParseError(e.message, normalized?.remapIndex(e.pos), ctx);
       err.astroCompilerError = e;
       throw err;
     }
@@ -1701,11 +1696,10 @@ var ParserOptionsContext = class {
     return getParser({}, this.parserOptions.parser);
   }
   isTypeScript() {
-    var _a, _b;
     if (this.state.isTypeScript != null) {
       return this.state.isTypeScript;
     }
-    const parserValue = getParserForLang({}, (_a = this.parserOptions) == null ? void 0 : _a.parser);
+    const parserValue = getParserForLang({}, this.parserOptions?.parser);
     if (typeof parserValue !== "string") {
       return this.state.isTypeScript = maybeTSESLintParserObject(parserValue) || isTSESLintParserObject(parserValue);
     }
@@ -1720,7 +1714,7 @@ var ParserOptionsContext = class {
         if (fs2.existsSync(pkgPath)) {
           try {
             return this.state.isTypeScript = TS_PARSER_NAMES.includes(
-              (_b = JSON.parse(fs2.readFileSync(pkgPath, "utf-8"))) == null ? void 0 : _b.name
+              JSON.parse(fs2.readFileSync(pkgPath, "utf-8"))?.name
             );
           } catch {
             return this.state.isTypeScript = false;
@@ -1985,7 +1979,7 @@ function addReference(list, reference) {
 function parseForESLint(code, options) {
   const { result: resultTemplate, context: ctx } = parseTemplate(
     code,
-    (options == null ? void 0 : options.filePath) ?? "<input>"
+    options?.filePath ?? "<input>"
   );
   const scriptContext = processTemplate(ctx, resultTemplate);
   const parserOptions = new ParserOptionsContext(options);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "0.9.0",
+  "version": "0.9.1",
   "description": "Astro component parser for ESLint",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -47,7 +47,7 @@
   },
   "homepage": "https://github.com/ota-meshi/astro-eslint-parser#readme",
   "dependencies": {
-    "@astrojs/compiler": "^0.27.0 || ^0.28.0 || ^0.29.0",
+    "@astrojs/compiler": "^0.27.0 || ^0.28.0 || ^0.29.0 || ^0.30.0",
     "@typescript-eslint/types": "^5.25.0",
     "astrojs-compiler-sync": "^0.3.0",
     "debug": "^4.3.4",
@@ -68,8 +68,8 @@
     "@types/mocha": "^10.0.0",
     "@types/node": "^18.0.0",
     "@types/semver": "^7.3.9",
-    "@typescript-eslint/eslint-plugin": "^5.4.0",
-    "@typescript-eslint/parser": "^5.4.0",
+    "@typescript-eslint/eslint-plugin": "~5.45.0",
+    "@typescript-eslint/parser": "~5.45.0",
     "astro": "^1.6.1",
     "astro-eslint-parser": ">=0.1.0",
     "benchmark": "^2.1.4",
@@ -81,7 +81,7 @@
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.3.0",
     "eslint-formatter-codeframe": "^7.32.1",
-    "eslint-plugin-astro": "^0.20.0",
+    "eslint-plugin-astro": "^0.21.0",
     "eslint-plugin-eslint-comments": "^3.2.0",
     "eslint-plugin-json-schema-validator": "^4.0.0",
     "eslint-plugin-jsonc": "^2.0.0",
@@ -95,7 +95,7 @@
     "eslint-plugin-svelte": "^2.0.0",
     "estree-walker": "^3.0.0",
     "locate-character": "^2.0.5",
-    "magic-string": "^0.26.0",
+    "magic-string": "^0.27.0",
     "mocha": "^10.0.0",
     "mocha-chai-jest-snapshot": "^1.1.3",
     "nyc": "^15.1.0",
@@ -106,7 +106,7 @@
     "string-replace-loader": "^3.0.3",
     "svelte": "^3.48.0",
     "tsup": "^6.2.3",
-    "typescript": "~4.8.0"
+    "typescript": "~4.9.0"
   },
   "publishConfig": {
     "access": "public"