fix(propfunctionprops): prevent 'undefined', 'null', 'never' conversi…

…on to PropFnInterface fix QwikDev#4946
maiieul · Oct 27, 2023 · 55484f7 · 55484f7
1 parent ac60661
commit 55484f7
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/packages/docs/src/routes/api/qwik/api.json b/packages/docs/src/routes/api/qwik/api.json
@@ -1624,7 +1624,7 @@
         }
       ],
       "kind": "TypeAlias",
-      "content": "```typescript\nexport type PropFunctionProps<PROPS extends {}> = {\n    [K in keyof PROPS]: NonNullable<PROPS[K]> extends (...args: infer ARGS) => infer RET ? PropFnInterface<ARGS, Awaited<RET>> : PROPS[K];\n};\n```\n**References:** [PropFnInterface](#propfninterface)",
+      "content": "```typescript\nexport type PropFunctionProps<PROPS extends {}> = {\n    [K in keyof PROPS]: PROPS[K] extends null | undefined | never ? PROPS[K] : NonNullable<PROPS[K]> extends (...args: infer ARGS) => infer RET ? PropFnInterface<ARGS, Awaited<RET>> : PROPS[K];\n};\n```\n**References:** [PropFnInterface](#propfninterface)",
       "editUrl": "https://github.com/BuilderIO/qwik/tree/main/packages/qwik/src/core/component/component.public.ts",
       "mdFile": "qwik.propfunctionprops.md"
     },

diff --git a/packages/docs/src/routes/api/qwik/index.md b/packages/docs/src/routes/api/qwik/index.md
@@ -2123,9 +2123,9 @@ export type PropFunction<T extends Function = (...args: any[]) => any> =
 
 ```typescript
 export type PropFunctionProps<PROPS extends {}> = {
-  [K in keyof PROPS]: NonNullable<PROPS[K]> extends (
-    ...args: infer ARGS
-  ) => infer RET
+  [K in keyof PROPS]: PROPS[K] extends null | undefined | never
+    ? PROPS[K]
+    : NonNullable<PROPS[K]> extends (...args: infer ARGS) => infer RET
     ? PropFnInterface<ARGS, Awaited<RET>>
     : PROPS[K];
 };

diff --git a/packages/qwik/src/core/api.md b/packages/qwik/src/core/api.md
@@ -1401,7 +1401,7 @@ export type PropFunction<T extends Function = (...args: any[]) => any> = T exten
 
 // @public (undocumented)
 export type PropFunctionProps<PROPS extends {}> = {
-    [K in keyof PROPS]: NonNullable<PROPS[K]> extends (...args: infer ARGS) => infer RET ? PropFnInterface<ARGS, Awaited<RET>> : PROPS[K];
+    [K in keyof PROPS]: PROPS[K] extends null | undefined | never ? PROPS[K] : NonNullable<PROPS[K]> extends (...args: infer ARGS) => infer RET ? PropFnInterface<ARGS, Awaited<RET>> : PROPS[K];
 };
 
 // @public

diff --git a/packages/qwik/src/core/component/component.public.ts b/packages/qwik/src/core/component/component.public.ts
@@ -162,7 +162,9 @@ export const isQwikComponent = (component: any): component is Component<any> =>
 
 /** @public */
 export type PropFunctionProps<PROPS extends {}> = {
-  [K in keyof PROPS]: NonNullable<PROPS[K]> extends (...args: infer ARGS) => infer RET
+  [K in keyof PROPS]: PROPS[K] extends null | undefined | never
+    ? PROPS[K]
+    : NonNullable<PROPS[K]> extends (...args: infer ARGS) => infer RET
     ? PropFnInterface<ARGS, Awaited<RET>>
     : PROPS[K];
 };