fix for TS 5.4 (fix #35)

g-plane · Mar 12, 2024 · ed964d1 · stof · Mar 12, 2024 · g-plane
1 parent 6857d4a
commit ed964d1
Show file tree

Hide file tree

Showing 5 changed files with 19 additions and 13 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -2,6 +2,8 @@
 
 ## Unreleased
 
+- Fixed for TypeScript 5.4. (Fix [#35](https://github.com/g-plane/typed-query-selector/issues/35))
+
 ## v2.11.0
 
 - Added `.js` extension in import statements.

diff --git a/package.json b/package.json
@@ -16,9 +16,9 @@
     "fmt": "prettier --write *.ts"
   },
   "devDependencies": {
-    "@gplane/tsconfig": "^6.0.0",
+    "@gplane/tsconfig": "^6.1.0",
     "@type-challenges/utils": "^0.1.1",
     "prettier": "^3.0.3",
-    "typescript": "^5.1.3"
+    "typescript": "^5.4.2"
   }
 }
diff --git a/parser.d.ts b/parser.d.ts
@@ -72,9 +72,13 @@ type PreprocessUnchecked<I> = I extends `${infer L}\\${Quotes}${infer R}` // rem
 
 /** Parse `:is()` and `:where()` */
 type ExpandFunctions<I> = I extends `${infer L}:is(${infer Args})${infer R}`
-  ? ExpandFunctions<`${L}&${Split<Trim<Args>>}${R}`>
+  ? Split<Trim<Args>> extends string
+    ? ExpandFunctions<`${L}&${Split<Trim<Args>>}${R}`>
+    : unknown
   : I extends `${infer L}:where(${infer Args})${infer R}`
-  ? ExpandFunctions<`${L}&${Split<Trim<Args>>}${R}`>
+  ? Split<Trim<Args>> extends string
+    ? ExpandFunctions<`${L}&${Split<Trim<Args>>}${R}`>
+    : unknown
   : I extends `${infer L}:${infer Pseudo}(${string})${infer R}`
   ? IsIdentifier<Pseudo> extends true
     ? ExpandFunctions<`${L}${R}`>

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/shim.d.ts b/shim.d.ts
@@ -6,7 +6,7 @@ declare global {
 
     querySelectorAll<S extends string>(
       selector: S,
-    ): NodeListOf<ParseSelector<S>>
+    ): NodeListOf<ParseSelector<S> extends Node ? ParseSelector<S> : Node>
   }
 
   interface Element {