refacotor: refactor code & change to generate snapshots for the const…

…ruct-tree test (#23) * Revert "feat: implement templateRanges option (#22)" This reverts commit 2538b1e. * refactor: remove unused codes * refactor: remove unused codes * refactor: implement Pointer * refactor * refactor * refactor
yeonjuan · Nov 29, 2024 · f3d474e · f3d474e
1 parent 2538b1e
commit f3d474e
Show file tree

Hide file tree

Showing 131 changed files with 8,547 additions and 8,841 deletions.
diff --git a/.gitignore b/.gitignore
@@ -3,4 +3,4 @@ coverage
 dist
 .yarn/*
 !.yarn/releases
-.DS_store
+tsconfig.build.tsbuildinfo
diff --git a/README.md b/README.md
@@ -470,7 +470,7 @@ interface ScriptTagNode extends BaseNode {
   openStart: OpenScriptTagStartNode;
   openEnd: OpenScriptTagEndNode;
   close: CloseScriptTagNode;
-  children: ScriptTagContentNode[];
+  value?: ScriptTagContentNode;
 }
 ```
 
@@ -529,7 +529,7 @@ interface StyleTagNode extends BaseNode {
   openStart: OpenStyleTagStartNode;
   openEnd: OpenStyleTagEndNode;
   close: CloseStyleTagNode;
-  children: StyleTagContentNode[];
+  value?: StyleTagContentNode;
 }
 ```
 
@@ -586,7 +586,7 @@ interface CommentNode extends BaseNode {
   type: "Comment";
   open: CommentOpenNode;
   close: CommentCloseNode;
-  children: CommentContentNode[];
+  value: CommentContentNode;
 }
 ```
 

diff --git a/package.json b/package.json
@@ -19,6 +19,7 @@
     "@typescript-eslint/parser": "^6.1.0",
     "eslint": "^8.23.0",
     "jest": "^29.6.1",
+    "jest-file-snapshot": "0.7.0",
     "prettier": "^2.7.1",
     "rimraf": "^3.0.2",
     "ts-jest": "^29.1.1",

diff --git a/src/parser/__tests__/__snapshots__/token-adapter.spec.ts.snap b/src/parser/__tests__/__snapshots__/token-adapter.spec.ts.snap
@@ -8,7 +8,6 @@ exports[`parse basic 1`] = `
         "attributes": [],
         "children": [
           {
-            "isTemplate": false,
             "loc": {
               "end": {
                 "column": 12,
@@ -154,7 +153,6 @@ exports[`parse basic 1`] = `
       "value": ">",
     },
     {
-      "isTemplate": false,
       "loc": {
         "end": {
           "column": 12,
@@ -202,7 +200,6 @@ exports[`parse token adapter 1`] = `
         "attributes": [],
         "children": [
           {
-            "isTemplate": false,
             "loc": {
               "end": {
                 "column": 12,
@@ -348,7 +345,6 @@ exports[`parse token adapter 1`] = `
       "value": ">",
     },
     {
-      "isTemplate": false,
       "loc": {
         "end": {
           "column": 12,

diff --git a/src/parser/parse.ts b/src/parser/parse.ts
@@ -7,8 +7,7 @@ import { Options } from "../types/parse";
 
 export function parse(html: string, options?: Options): ParseResult {
   const tokenAdapter = (options && options.tokenAdapter) || defaultTokenAdapter;
-  const templateRanges = (options && options.templateRanges) || [];
-  const { tokens } = tokenize(html, tokenAdapter, templateRanges);
+  const { tokens } = tokenize(html, tokenAdapter);
   const { ast } = constructTree(tokens, undefined);
   return {
     ast: clearParent(ast),

diff --git a/src/tokenizer/__tests__/__input__/template-syntax-attributes-key-value.html b/src/tokenizer/__tests__/__input__/template-syntax-attributes-key-value.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-attributes-key.html b/src/tokenizer/__tests__/__input__/template-syntax-attributes-key.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-attributes-value-bare.html b/src/tokenizer/__tests__/__input__/template-syntax-attributes-value-bare.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-attributes-value-quote.html b/src/tokenizer/__tests__/__input__/template-syntax-attributes-value-quote.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-attributes.html b/src/tokenizer/__tests__/__input__/template-syntax-attributes.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-comment-content.html b/src/tokenizer/__tests__/__input__/template-syntax-comment-content.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-data.html b/src/tokenizer/__tests__/__input__/template-syntax-data.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-script-attributes.html b/src/tokenizer/__tests__/__input__/template-syntax-script-attributes.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-script-content.html b/src/tokenizer/__tests__/__input__/template-syntax-script-content.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-style-attributes.html b/src/tokenizer/__tests__/__input__/template-syntax-style-attributes.html
diff --git a/src/tokenizer/__tests__/__input__/template-syntax-style-content.html b/src/tokenizer/__tests__/__input__/template-syntax-style-content.html
diff --git a/src/tokenizer/__tests__/__output__/attributes-apostrophe.ts b/src/tokenizer/__tests__/__output__/attributes-apostrophe.ts
@@ -34,7 +34,6 @@ export default [
   {
     type: TokenTypes.Text,
     value: "\n  ",
-    isTemplate: false,
     range: [5, 8],
     loc: {
       start: {
@@ -65,7 +64,6 @@ export default [
   {
     type: TokenTypes.AttributeKey,
     value: "class",
-    isTemplate: false,
     range: [14, 19],
     loc: {
       start: {
@@ -110,7 +108,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "test class",
     range: [21, 31],
     loc: {
@@ -141,7 +138,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "data-test",
     range: [33, 42],
     loc: {
@@ -187,7 +183,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "data<test>",
     range: [44, 54],
     loc: {
@@ -233,7 +228,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n    some text\n\n    ",
     range: [56, 76],
     loc: {
@@ -279,7 +273,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n      another text\n\n      ",
     range: [81, 108],
     loc: {
@@ -310,7 +303,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "custom-attr",
     range: [132, 143],
     loc: {
@@ -356,7 +348,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "custom >test",
     range: [145, 157],
     loc: {
@@ -387,7 +378,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "with-spaces",
     range: [167, 178],
     loc: {
@@ -433,7 +423,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "spaces test",
     range: [185, 196],
     loc: {
@@ -479,7 +468,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n        custom element\n        text\n      ",
     range: [205, 248],
     loc: {
@@ -510,7 +498,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n    ",
     range: [265, 270],
     loc: {
@@ -541,7 +528,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n  ",
     range: [276, 279],
     loc: {
@@ -573,7 +559,6 @@ export default [
   {
     type: TokenTypes.Text,
     value: "\n",
-    isTemplate: false,
     range: [286, 287],
     loc: {
       start: {
@@ -603,7 +588,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n",
     range: [293, 294],
     loc: {

diff --git a/src/tokenizer/__tests__/__output__/attributes-bare-wrong-quote.ts b/src/tokenizer/__tests__/__output__/attributes-bare-wrong-quote.ts
@@ -18,7 +18,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "target",
     range: [3, 9],
     loc: {
@@ -49,7 +48,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "”_blank”",
     range: [10, 18],
     loc: {

diff --git a/src/tokenizer/__tests__/__output__/attributes-bare.ts b/src/tokenizer/__tests__/__output__/attributes-bare.ts
@@ -18,7 +18,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "key",
     range: [5, 8],
     loc: {
@@ -49,7 +48,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "value",
     range: [11, 16],
     loc: {
@@ -65,7 +63,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "and-another",
     range: [18, 29],
     loc: {
@@ -96,7 +93,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "value",
     range: [32, 37],
     loc: {
@@ -142,7 +138,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n\n",
     range: [44, 46],
     loc: {
@@ -173,7 +168,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "some",
     range: [52, 56],
     loc: {
@@ -204,7 +198,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "custom-attribute",
     range: [57, 73],
     loc: {
@@ -235,7 +228,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n  some text\n\n  ",
     range: [74, 90],
     loc: {
@@ -266,7 +258,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "and",
     range: [106, 109],
     loc: {
@@ -297,7 +288,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "here",
     range: [110, 114],
     loc: {
@@ -313,7 +303,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeKey,
-    isTemplate: false,
     value: "and-even",
     range: [119, 127],
     loc: {
@@ -344,7 +333,6 @@ export default [
   },
   {
     type: TokenTypes.AttributeValue,
-    isTemplate: false,
     value: "here",
     range: [130, 134],
     loc: {
@@ -375,7 +363,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n    custom element\n    text\n  ",
     range: [138, 169],
     loc: {
@@ -406,7 +393,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n",
     range: [186, 187],
     loc: {
@@ -437,7 +423,6 @@ export default [
   },
   {
     type: TokenTypes.Text,
-    isTemplate: false,
     value: "\n",
     range: [194, 195],
     loc: {