feat: Allow parsed selectors to be passed directly to functions (#418)

fb55 · Apr 11, 2021 · 01afada · 01afada
1 parent 047ad89
commit 01afada
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 6 deletions.
diff --git a/src/compile.ts b/src/compile.ts
@@ -18,7 +18,7 @@ import type { CompiledQuery, InternalOptions } from "./types";
  * @param context Optional context for the selector.
  */
 export function compile<Node, ElementNode extends Node>(
-    selector: string,
+    selector: string | Selector[][],
     options: InternalOptions<Node, ElementNode>,
     context?: ElementNode[]
 ): CompiledQuery<ElementNode> {
@@ -27,11 +27,12 @@ export function compile<Node, ElementNode extends Node>(
 }
 
 export function compileUnsafe<Node, ElementNode extends Node>(
-    selector: string,
+    selector: string | Selector[][],
     options: InternalOptions<Node, ElementNode>,
     context?: ElementNode[] | ElementNode
 ): CompiledQuery<ElementNode> {
-    const token = parse(selector, options);
+    const token =
+        typeof selector === "string" ? parse(selector, options) : selector;
     return compileToken<Node, ElementNode>(token, options, context);
 }
 

diff --git a/src/types.ts b/src/types.ts
@@ -138,7 +138,10 @@ export interface CompiledQuery<ElementNode> {
     (node: ElementNode): boolean;
     shouldTestNextSiblings?: boolean;
 }
-export type Query<ElementNode> = string | CompiledQuery<ElementNode>;
+export type Query<ElementNode> =
+    | string
+    | CompiledQuery<ElementNode>
+    | Selector[][];
 export type CompileToken<Node, ElementNode extends Node> = (
     token: InternalSelector[][],
     options: InternalOptions<Node, ElementNode>,

diff --git a/test/api.ts b/test/api.ts
@@ -25,12 +25,29 @@ describe("API", () => {
         });
     });
 
-    describe("can be queried by function", () => {
-        it("in `is`", () => {
+    describe("can be queried with more than a selector", () => {
+        it("function in `is`", () => {
             expect(CSSselect.is(dom, (elem) => elem.attribs.id === "foo")).toBe(
                 true
             );
         });
+
+        it("parsed selector in `is`", () => {
+            expect(
+                CSSselect.is(dom, [
+                    [
+                        {
+                            type: "attribute",
+                            action: "equals",
+                            ignoreCase: false,
+                            name: "id",
+                            namespace: null,
+                            value: "foo",
+                        },
+                    ],
+                ])
+            ).toBe(true);
+        });
         // Probably more cases should be added here
     });