feat: improve types to fix parent type of string Unicode properties (…

…#127)
eslint-community · Aug 25, 2023 · bc63c4c · bc63c4c
1 parent 6a8c538
commit bc63c4c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 25 deletions.
diff --git a/src/ast.ts b/src/ast.ts
@@ -330,6 +330,12 @@ export interface CharacterUnicodePropertyCharacterSet
 /** StringsUnicodePropertyCharacterSet is Unicode property escape with property of strings. */
 export interface StringsUnicodePropertyCharacterSet
     extends BaseUnicodePropertyCharacterSet {
+    parent:
+        | Alternative
+        | ClassIntersection
+        | ClassSubtraction
+        | Quantifier
+        | UnicodeSetsCharacterClass
     strings: true
     value: null
     negate: false

diff --git a/src/parser.ts b/src/parser.ts
@@ -16,7 +16,6 @@ import type {
     ClassSubtraction,
     UnicodeSetsCharacterClassElement,
     ClassSetOperand,
-    UnicodePropertyCharacterSet,
     UnicodeSetsCharacterClass,
     ExpressionCharacterClass,
     StringAlternative,
@@ -413,45 +412,31 @@ class RegExpParserState {
         strings: boolean,
     ): void {
         const parent = this._node
-        if (
-            (parent.type !== "Alternative" &&
-                parent.type !== "CharacterClass") ||
-            (strings && (negate || value))
-        ) {
+        if (parent.type !== "Alternative" && parent.type !== "CharacterClass") {
             throw new Error("UnknownError")
         }
 
         const base = {
             type: "CharacterSet",
-            parent,
             start,
             end,
             raw: this.source.slice(start, end),
             kind,
-            strings,
             key,
         } as const
-        const node: UnicodePropertyCharacterSet = strings
-            ? {
-                  ...base,
-                  value: null,
-                  negate: false,
-                  strings: true,
-              }
-            : {
-                  ...base,
-                  value,
-                  negate,
-                  strings: false,
-              }
 
-        if (node.strings) {
-            if (parent.type === "CharacterClass" && !parent.unicodeSets) {
+        if (strings) {
+            if (
+                (parent.type === "CharacterClass" && !parent.unicodeSets) ||
+                negate ||
+                value !== null
+            ) {
                 throw new Error("UnknownError")
             }
-            parent.elements.push(node)
+
+            parent.elements.push({ ...base, parent, strings, value, negate })
         } else {
-            parent.elements.push(node)
+            parent.elements.push({ ...base, parent, strings, value, negate })
         }
     }