astro-eslint-parser 0.9.1 → 0.9.3

package/lib/index.d.ts

@@ -174,7 +174,7 @@ interface AstroProgram extends Omit<TSESTree.Program, "type" | "body"> {
 /** Node of Astro fragment */
 interface AstroFragment extends BaseNode {
     type: "AstroFragment";
-    children: AstroChild[];
+    children: (AstroChild | AstroDoctype)[];
     parent?: AstroParentNode;
 }
 /** Node of Astro html comment */
@@ -212,78 +212,78 @@ type SourceLocation = TSESTree.SourceLocation;
 type Range = TSESTree.Range;
 type Position = TSESTree.Position;
 
-type index_Comment = Comment;
-type index_Token = Token;
-type index_SourceLocation = SourceLocation;
-type index_Range = Range;
-type index_Position = Position;
-type index_AstroNode = AstroNode;
 type index_AstroChild = AstroChild;
-type index_AstroParentNode = AstroParentNode;
-type index_AstroProgram = AstroProgram;
+type index_AstroDoctype = AstroDoctype;
 type index_AstroFragment = AstroFragment;
 type index_AstroHTMLComment = AstroHTMLComment;
-type index_AstroDoctype = AstroDoctype;
+type index_AstroNode = AstroNode;
+type index_AstroParentNode = AstroParentNode;
+type index_AstroProgram = AstroProgram;
+type index_AstroRawText = AstroRawText;
 type index_AstroShorthandAttribute = AstroShorthandAttribute;
 type index_AstroTemplateLiteralAttribute = AstroTemplateLiteralAttribute;
-type index_AstroRawText = AstroRawText;
-type index_JSXNode = JSXNode;
+type index_Comment = Comment;
+type index_JSXAttribute = JSXAttribute;
 type index_JSXChild = JSXChild;
-type index_JSXParentNode = JSXParentNode;
-type index_JSXElement = JSXElement;
-type index_JSXFragment = JSXFragment;
-type index_JSXOpeningElement = JSXOpeningElement;
 type index_JSXClosingElement = JSXClosingElement;
 type index_JSXClosingFragment = JSXClosingFragment;
-type index_JSXOpeningFragment = JSXOpeningFragment;
-type index_JSXAttribute = JSXAttribute;
-type index_JSXSpreadAttribute = JSXSpreadAttribute;
-type index_JSXTagNameExpression = JSXTagNameExpression;
+type index_JSXElement = JSXElement;
+type index_JSXEmptyExpression = JSXEmptyExpression;
+type index_JSXExpression = JSXExpression;
+type index_JSXExpressionContainer = JSXExpressionContainer;
+type index_JSXFragment = JSXFragment;
 type index_JSXIdentifier = JSXIdentifier;
 type index_JSXMemberExpression = JSXMemberExpression;
 type index_JSXNamespacedName = JSXNamespacedName;
-type index_JSXExpression = JSXExpression;
-type index_JSXExpressionContainer = JSXExpressionContainer;
+type index_JSXNode = JSXNode;
+type index_JSXOpeningElement = JSXOpeningElement;
+type index_JSXOpeningFragment = JSXOpeningFragment;
+type index_JSXParentNode = JSXParentNode;
+type index_JSXSpreadAttribute = JSXSpreadAttribute;
 type index_JSXSpreadChild = JSXSpreadChild;
-type index_JSXEmptyExpression = JSXEmptyExpression;
+type index_JSXTagNameExpression = JSXTagNameExpression;
 type index_JSXText = JSXText;
+type index_Position = Position;
+type index_Range = Range;
+type index_SourceLocation = SourceLocation;
+type index_Token = Token;
 declare namespace index {
   export {
-    index_Comment as Comment,
-    index_Token as Token,
-    index_SourceLocation as SourceLocation,
-    index_Range as Range,
-    index_Position as Position,
-    index_AstroNode as AstroNode,
     index_AstroChild as AstroChild,
-    index_AstroParentNode as AstroParentNode,
-    index_AstroProgram as AstroProgram,
+    index_AstroDoctype as AstroDoctype,
     index_AstroFragment as AstroFragment,
     index_AstroHTMLComment as AstroHTMLComment,
-    index_AstroDoctype as AstroDoctype,
+    index_AstroNode as AstroNode,
+    index_AstroParentNode as AstroParentNode,
+    index_AstroProgram as AstroProgram,
+    index_AstroRawText as AstroRawText,
     index_AstroShorthandAttribute as AstroShorthandAttribute,
     index_AstroTemplateLiteralAttribute as AstroTemplateLiteralAttribute,
-    index_AstroRawText as AstroRawText,
-    index_JSXNode as JSXNode,
+    index_Comment as Comment,
+    index_JSXAttribute as JSXAttribute,
     index_JSXChild as JSXChild,
-    index_JSXParentNode as JSXParentNode,
-    index_JSXElement as JSXElement,
-    index_JSXFragment as JSXFragment,
-    index_JSXOpeningElement as JSXOpeningElement,
     index_JSXClosingElement as JSXClosingElement,
     index_JSXClosingFragment as JSXClosingFragment,
-    index_JSXOpeningFragment as JSXOpeningFragment,
-    index_JSXAttribute as JSXAttribute,
-    index_JSXSpreadAttribute as JSXSpreadAttribute,
-    index_JSXTagNameExpression as JSXTagNameExpression,
+    index_JSXElement as JSXElement,
+    index_JSXEmptyExpression as JSXEmptyExpression,
+    index_JSXExpression as JSXExpression,
+    index_JSXExpressionContainer as JSXExpressionContainer,
+    index_JSXFragment as JSXFragment,
     index_JSXIdentifier as JSXIdentifier,
     index_JSXMemberExpression as JSXMemberExpression,
     index_JSXNamespacedName as JSXNamespacedName,
-    index_JSXExpression as JSXExpression,
-    index_JSXExpressionContainer as JSXExpressionContainer,
+    index_JSXNode as JSXNode,
+    index_JSXOpeningElement as JSXOpeningElement,
+    index_JSXOpeningFragment as JSXOpeningFragment,
+    index_JSXParentNode as JSXParentNode,
+    index_JSXSpreadAttribute as JSXSpreadAttribute,
     index_JSXSpreadChild as JSXSpreadChild,
-    index_JSXEmptyExpression as JSXEmptyExpression,
+    index_JSXTagNameExpression as JSXTagNameExpression,
     index_JSXText as JSXText,
+    index_Position as Position,
+    index_Range as Range,
+    index_SourceLocation as SourceLocation,
+    index_Token as Token,
   };
 }
 

package/lib/index.js

@@ -875,60 +875,10 @@ function processTemplate(ctx, resultTemplate) {
           openRootFragment(start);
         }
         for (const attr of node.attributes) {
-          if ((node.type === "component" || node.type === "fragment") && (attr.kind === "quoted" || attr.kind === "empty" || attr.kind === "expression" || attr.kind === "template-literal")) {
-            const colonIndex = attr.name.indexOf(":");
-            if (colonIndex >= 0) {
-              const start2 = attr.position.start.offset;
-              script.appendOriginal(start2 + colonIndex);
-              script.skipOriginalOffset(1);
-              script.appendVirtualScript(`_`);
-              script.restoreContext.addToken(import_types.AST_TOKEN_TYPES.JSXIdentifier, [
-                start2,
-                start2 + colonIndex
-              ]);
-              script.restoreContext.addToken(import_types.AST_TOKEN_TYPES.Punctuator, [
-                start2 + colonIndex,
-                start2 + colonIndex + 1
-              ]);
-              script.restoreContext.addToken(import_types.AST_TOKEN_TYPES.JSXIdentifier, [
-                start2 + colonIndex + 1,
-                start2 + attr.name.length
-              ]);
-              script.restoreContext.addRestoreNodeProcess(
-                (scriptNode, context) => {
-                  if (scriptNode.type === import_types.AST_NODE_TYPES.JSXAttribute && scriptNode.range[0] === start2) {
-                    const baseNameNode = scriptNode.name;
-                    const nsn = {
-                      ...baseNameNode,
-                      type: import_types.AST_NODE_TYPES.JSXNamespacedName,
-                      namespace: {
-                        type: import_types.AST_NODE_TYPES.JSXIdentifier,
-                        name: attr.name.slice(0, colonIndex),
-                        ...ctx.getLocations(
-                          baseNameNode.range[0],
-                          baseNameNode.range[0] + colonIndex
-                        )
-                      },
-                      name: {
-                        type: import_types.AST_NODE_TYPES.JSXIdentifier,
-                        name: attr.name.slice(colonIndex + 1),
-                        ...ctx.getLocations(
-                          baseNameNode.range[0] + colonIndex + 1,
-                          baseNameNode.range[1]
-                        )
-                      }
-                    };
-                    scriptNode.name = nsn;
-                    nsn.namespace.parent = nsn;
-                    nsn.name.parent = nsn;
-                    context.addRemoveToken(
-                      (token) => token.range[0] === baseNameNode.range[0] && token.range[1] === baseNameNode.range[1]
-                    );
-                    return true;
-                  }
-                  return false;
-                }
-              );
+          if (attr.kind === "quoted" || attr.kind === "empty" || attr.kind === "expression" || attr.kind === "template-literal") {
+            const needPunctuatorsProcess = node.type === "component" || node.type === "fragment" ? /[.:@]/u.test(attr.name) : /[.@]/u.test(attr.name) || attr.name.startsWith(":");
+            if (needPunctuatorsProcess) {
+              processAttributePunctuators(attr);
             }
           }
           if (attr.kind === "shorthand") {
@@ -1123,6 +1073,111 @@ function processTemplate(ctx, resultTemplate) {
   }
   script.appendOriginal(ctx.code.length);
   return script;
+  function processAttributePunctuators(attr) {
+    const start = attr.position.start.offset;
+    let targetIndex = start;
+    let colonOffset;
+    for (let index = 0; index < attr.name.length; index++) {
+      const char = attr.name[index];
+      if (char !== ":" && char !== "." && char !== "@") {
+        continue;
+      }
+      if (index === 0) {
+        targetIndex++;
+      }
+      const punctuatorIndex = start + index;
+      script.appendOriginal(punctuatorIndex);
+      script.skipOriginalOffset(1);
+      script.appendVirtualScript(`_`);
+      if (char === ":" && index !== 0 && colonOffset == null) {
+        colonOffset = index;
+      }
+    }
+    if (colonOffset != null) {
+      const punctuatorIndex = start + colonOffset;
+      script.restoreContext.addToken(import_types.AST_TOKEN_TYPES.JSXIdentifier, [
+        start,
+        punctuatorIndex
+      ]);
+      script.restoreContext.addToken(import_types.AST_TOKEN_TYPES.Punctuator, [
+        punctuatorIndex,
+        punctuatorIndex + 1
+      ]);
+      script.restoreContext.addToken(import_types.AST_TOKEN_TYPES.JSXIdentifier, [
+        punctuatorIndex + 1,
+        start + attr.name.length
+      ]);
+    } else {
+      script.restoreContext.addToken(import_types.AST_TOKEN_TYPES.JSXIdentifier, [
+        start,
+        start + attr.name.length
+      ]);
+    }
+    script.restoreContext.addRestoreNodeProcess((scriptNode, context) => {
+      if (scriptNode.type === import_types.AST_NODE_TYPES.JSXAttribute && scriptNode.range[0] === targetIndex) {
+        const baseNameNode = scriptNode.name;
+        if (colonOffset != null) {
+          const nameNode = {
+            ...baseNameNode,
+            type: import_types.AST_NODE_TYPES.JSXNamespacedName,
+            namespace: {
+              type: import_types.AST_NODE_TYPES.JSXIdentifier,
+              name: attr.name.slice(0, colonOffset),
+              ...ctx.getLocations(
+                baseNameNode.range[0],
+                baseNameNode.range[0] + colonOffset
+              )
+            },
+            name: {
+              type: import_types.AST_NODE_TYPES.JSXIdentifier,
+              name: attr.name.slice(colonOffset + 1),
+              ...ctx.getLocations(
+                baseNameNode.range[0] + colonOffset + 1,
+                baseNameNode.range[1]
+              )
+            }
+          };
+          scriptNode.name = nameNode;
+          nameNode.namespace.parent = nameNode;
+          nameNode.name.parent = nameNode;
+        } else {
+          if (baseNameNode.type === import_types.AST_NODE_TYPES.JSXIdentifier) {
+            const nameNode = {
+              ...baseNameNode,
+              name: attr.name
+            };
+            scriptNode.name = nameNode;
+          } else {
+            const nameNode = {
+              ...baseNameNode,
+              namespace: {
+                ...baseNameNode.namespace,
+                name: attr.name.slice(
+                  baseNameNode.namespace.range[0] - start,
+                  baseNameNode.namespace.range[1] - start
+                )
+              },
+              name: {
+                ...baseNameNode.name,
+                name: attr.name.slice(
+                  baseNameNode.name.range[0] - start,
+                  baseNameNode.name.range[1] - start
+                )
+              }
+            };
+            scriptNode.name = nameNode;
+            nameNode.namespace.parent = nameNode;
+            nameNode.name.parent = nameNode;
+          }
+        }
+        context.addRemoveToken(
+          (token) => token.range[0] === baseNameNode.range[0] && token.range[1] === baseNameNode.range[1]
+        );
+        return true;
+      }
+      return false;
+    });
+  }
   function generateUniqueId(base) {
     let candidate = `$_${base.replace(/\W/g, "_")}${uniqueIdSeq++}`;
     while (usedUniqueIds.has(candidate) || ctx.code.includes(candidate)) {

package/lib/index.mjs

@@ -846,60 +846,10 @@ function processTemplate(ctx, resultTemplate) {
           openRootFragment(start);
         }
         for (const attr of node.attributes) {
-          if ((node.type === "component" || node.type === "fragment") && (attr.kind === "quoted" || attr.kind === "empty" || attr.kind === "expression" || attr.kind === "template-literal")) {
-            const colonIndex = attr.name.indexOf(":");
-            if (colonIndex >= 0) {
-              const start2 = attr.position.start.offset;
-              script.appendOriginal(start2 + colonIndex);
-              script.skipOriginalOffset(1);
-              script.appendVirtualScript(`_`);
-              script.restoreContext.addToken(AST_TOKEN_TYPES.JSXIdentifier, [
-                start2,
-                start2 + colonIndex
-              ]);
-              script.restoreContext.addToken(AST_TOKEN_TYPES.Punctuator, [
-                start2 + colonIndex,
-                start2 + colonIndex + 1
-              ]);
-              script.restoreContext.addToken(AST_TOKEN_TYPES.JSXIdentifier, [
-                start2 + colonIndex + 1,
-                start2 + attr.name.length
-              ]);
-              script.restoreContext.addRestoreNodeProcess(
-                (scriptNode, context) => {
-                  if (scriptNode.type === AST_NODE_TYPES.JSXAttribute && scriptNode.range[0] === start2) {
-                    const baseNameNode = scriptNode.name;
-                    const nsn = {
-                      ...baseNameNode,
-                      type: AST_NODE_TYPES.JSXNamespacedName,
-                      namespace: {
-                        type: AST_NODE_TYPES.JSXIdentifier,
-                        name: attr.name.slice(0, colonIndex),
-                        ...ctx.getLocations(
-                          baseNameNode.range[0],
-                          baseNameNode.range[0] + colonIndex
-                        )
-                      },
-                      name: {
-                        type: AST_NODE_TYPES.JSXIdentifier,
-                        name: attr.name.slice(colonIndex + 1),
-                        ...ctx.getLocations(
-                          baseNameNode.range[0] + colonIndex + 1,
-                          baseNameNode.range[1]
-                        )
-                      }
-                    };
-                    scriptNode.name = nsn;
-                    nsn.namespace.parent = nsn;
-                    nsn.name.parent = nsn;
-                    context.addRemoveToken(
-                      (token) => token.range[0] === baseNameNode.range[0] && token.range[1] === baseNameNode.range[1]
-                    );
-                    return true;
-                  }
-                  return false;
-                }
-              );
+          if (attr.kind === "quoted" || attr.kind === "empty" || attr.kind === "expression" || attr.kind === "template-literal") {
+            const needPunctuatorsProcess = node.type === "component" || node.type === "fragment" ? /[.:@]/u.test(attr.name) : /[.@]/u.test(attr.name) || attr.name.startsWith(":");
+            if (needPunctuatorsProcess) {
+              processAttributePunctuators(attr);
             }
           }
           if (attr.kind === "shorthand") {
@@ -1094,6 +1044,111 @@ function processTemplate(ctx, resultTemplate) {
   }
   script.appendOriginal(ctx.code.length);
   return script;
+  function processAttributePunctuators(attr) {
+    const start = attr.position.start.offset;
+    let targetIndex = start;
+    let colonOffset;
+    for (let index = 0; index < attr.name.length; index++) {
+      const char = attr.name[index];
+      if (char !== ":" && char !== "." && char !== "@") {
+        continue;
+      }
+      if (index === 0) {
+        targetIndex++;
+      }
+      const punctuatorIndex = start + index;
+      script.appendOriginal(punctuatorIndex);
+      script.skipOriginalOffset(1);
+      script.appendVirtualScript(`_`);
+      if (char === ":" && index !== 0 && colonOffset == null) {
+        colonOffset = index;
+      }
+    }
+    if (colonOffset != null) {
+      const punctuatorIndex = start + colonOffset;
+      script.restoreContext.addToken(AST_TOKEN_TYPES.JSXIdentifier, [
+        start,
+        punctuatorIndex
+      ]);
+      script.restoreContext.addToken(AST_TOKEN_TYPES.Punctuator, [
+        punctuatorIndex,
+        punctuatorIndex + 1
+      ]);
+      script.restoreContext.addToken(AST_TOKEN_TYPES.JSXIdentifier, [
+        punctuatorIndex + 1,
+        start + attr.name.length
+      ]);
+    } else {
+      script.restoreContext.addToken(AST_TOKEN_TYPES.JSXIdentifier, [
+        start,
+        start + attr.name.length
+      ]);
+    }
+    script.restoreContext.addRestoreNodeProcess((scriptNode, context) => {
+      if (scriptNode.type === AST_NODE_TYPES.JSXAttribute && scriptNode.range[0] === targetIndex) {
+        const baseNameNode = scriptNode.name;
+        if (colonOffset != null) {
+          const nameNode = {
+            ...baseNameNode,
+            type: AST_NODE_TYPES.JSXNamespacedName,
+            namespace: {
+              type: AST_NODE_TYPES.JSXIdentifier,
+              name: attr.name.slice(0, colonOffset),
+              ...ctx.getLocations(
+                baseNameNode.range[0],
+                baseNameNode.range[0] + colonOffset
+              )
+            },
+            name: {
+              type: AST_NODE_TYPES.JSXIdentifier,
+              name: attr.name.slice(colonOffset + 1),
+              ...ctx.getLocations(
+                baseNameNode.range[0] + colonOffset + 1,
+                baseNameNode.range[1]
+              )
+            }
+          };
+          scriptNode.name = nameNode;
+          nameNode.namespace.parent = nameNode;
+          nameNode.name.parent = nameNode;
+        } else {
+          if (baseNameNode.type === AST_NODE_TYPES.JSXIdentifier) {
+            const nameNode = {
+              ...baseNameNode,
+              name: attr.name
+            };
+            scriptNode.name = nameNode;
+          } else {
+            const nameNode = {
+              ...baseNameNode,
+              namespace: {
+                ...baseNameNode.namespace,
+                name: attr.name.slice(
+                  baseNameNode.namespace.range[0] - start,
+                  baseNameNode.namespace.range[1] - start
+                )
+              },
+              name: {
+                ...baseNameNode.name,
+                name: attr.name.slice(
+                  baseNameNode.name.range[0] - start,
+                  baseNameNode.name.range[1] - start
+                )
+              }
+            };
+            scriptNode.name = nameNode;
+            nameNode.namespace.parent = nameNode;
+            nameNode.name.parent = nameNode;
+          }
+        }
+        context.addRemoveToken(
+          (token) => token.range[0] === baseNameNode.range[0] && token.range[1] === baseNameNode.range[1]
+        );
+        return true;
+      }
+      return false;
+    });
+  }
   function generateUniqueId(base) {
     let candidate = `$_${base.replace(/\W/g, "_")}${uniqueIdSeq++}`;
     while (usedUniqueIds.has(candidate) || ctx.code.includes(candidate)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-eslint-parser",
-  "version": "0.9.1",
+  "version": "0.9.3",
   "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 || ^0.30.0",
+    "@astrojs/compiler": "^0.27.0 || ^0.28.0 || ^0.29.0 || ^0.30.0 || ^0.31.0",
     "@typescript-eslint/types": "^5.25.0",
     "astrojs-compiler-sync": "^0.3.0",
     "debug": "^4.3.4",
@@ -68,15 +68,15 @@
     "@types/mocha": "^10.0.0",
     "@types/node": "^18.0.0",
     "@types/semver": "^7.3.9",
-    "@typescript-eslint/eslint-plugin": "~5.45.0",
-    "@typescript-eslint/parser": "~5.45.0",
+    "@typescript-eslint/eslint-plugin": "~5.48.0",
+    "@typescript-eslint/parser": "~5.48.0",
     "astro": "^1.6.1",
     "astro-eslint-parser": ">=0.1.0",
     "benchmark": "^2.1.4",
     "chai": "^4.3.4",
     "code-red": "^0.2.3",
     "env-cmd": "^10.1.0",
-    "esbuild": "^0.15.0",
+    "esbuild": "^0.16.0",
     "esbuild-register": "^3.3.3",
     "eslint": "^8.15.0",
     "eslint-config-prettier": "^8.3.0",