refactor: Set empty namespace to null in attributes

They are equivalent as per CSS selector spec
fb55 · Dec 26, 2021 · de367ca · de367ca
1 parent 5cad07b
commit de367ca
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 14 deletions.
diff --git a/src/__fixtures__/tests.ts b/src/__fixtures__/tests.ts
@@ -895,7 +895,7 @@ export const tests: [
                     action: AttributeAction.Exists,
                     name: "bar",
                     type: SelectorType.Attribute,
-                    namespace: "",
+                    namespace: null,
                     value: "",
                     ignoreCase: IgnoreCaseMode.Unknown,
                 },

diff --git a/src/parse.ts b/src/parse.ts
@@ -297,25 +297,26 @@ function parseSelector(
 
                 // Determine attribute name and namespace
 
+                let name: string;
                 let namespace: string | null = null;
 
                 if (selector.charCodeAt(selectorIndex) === CharCode.Pipe) {
-                    namespace = "";
-                    selectorIndex += 1;
+                    // Equivalent to no namespace
+                    name = getName(1);
                 } else if (selector.startsWith("*|", selectorIndex)) {
                     namespace = "*";
-                    selectorIndex += 2;
-                }
-
-                let name = getName(0);
+                    name = getName(2);
+                } else {
+                    name = getName(0);
 
-                if (
-                    namespace === null &&
-                    selector.charCodeAt(selectorIndex) === CharCode.Pipe &&
-                    selector.charCodeAt(selectorIndex + 1) !== CharCode.Equal
-                ) {
-                    namespace = name;
-                    name = getName(1);
+                    if (
+                        selector.charCodeAt(selectorIndex) === CharCode.Pipe &&
+                        selector.charCodeAt(selectorIndex + 1) !==
+                            CharCode.Equal
+                    ) {
+                        namespace = name;
+                        name = getName(1);
+                    }
                 }
 
                 stripWhitespace(0);