Strip properties with never values on polymorphic unions

edgedb · Aug 31, 2024 · db60558 · db60558
1 parent 31ec38b
commit db60558
Show file tree

Hide file tree

Showing 2 changed files with 27 additions and 23 deletions.
diff --git a/packages/driver/src/reflection/typeutil.ts b/packages/driver/src/reflection/typeutil.ts
@@ -15,9 +15,11 @@ export namespace typeutil {
     [k in keyof T]: [T[k]] extends [never] ? never : k;
   }[keyof T];
 
-  export type stripNever<T> = {
-    [k in nonNeverKeys<T>]: k extends keyof T ? T[k] : never;
-  };
+  export type stripNever<T> = T extends unknown // distribute below over unions
+    ? {
+        [k in nonNeverKeys<T>]: k extends keyof T ? T[k] : never;
+      }
+    : never;
 
   export type optionalKeys<T extends object> = {
     [k in keyof T]: undefined extends T[k] ? k : never;

diff --git a/packages/generate/src/syntax/typesystem.ts b/packages/generate/src/syntax/typesystem.ts
@@ -417,26 +417,28 @@ export type computeObjectShape<
         : never);
 
 type computePolyElShape<PolyEls, PolyTypeName> = typeutil.flatten<
-  PolyTypeName extends string
-    ? { __typename: PolyTypeName } & {
-        [k in keyof PolyEls as PolyEls[k] extends $expr_PolyShapeElement
-          ? PolyTypeName extends PolyEls[k]["__polyType__"]["__element__"]["__polyTypenames__"]
-            ? k
-            : never
-          : never]: PolyEls[k] extends $expr_PolyShapeElement<
-          infer PolyType,
-          infer ShapeEl
-        >
-          ? [k] extends [keyof PolyType["__element__"]["__pointers__"]]
-            ? shapeElementToTs<
-                PolyType["__element__"]["__pointers__"][k],
-                ShapeEl,
-                k extends "__type__" ? PolyTypeName : null
-              >
-            : never
-          : never;
-      }
-    : never
+  typeutil.stripNever<
+    PolyTypeName extends string
+      ? { __typename: PolyTypeName } & {
+          [k in keyof PolyEls as PolyEls[k] extends $expr_PolyShapeElement
+            ? PolyTypeName extends PolyEls[k]["__polyType__"]["__element__"]["__polyTypenames__"]
+              ? k
+              : never
+            : never]: PolyEls[k] extends $expr_PolyShapeElement<
+            infer PolyType,
+            infer ShapeEl
+          >
+            ? [k] extends [keyof PolyType["__element__"]["__pointers__"]]
+              ? shapeElementToTs<
+                  PolyType["__element__"]["__pointers__"][k],
+                  ShapeEl,
+                  k extends "__type__" ? PolyTypeName : null
+                >
+              : never
+            : never;
+        }
+      : never
+  >
 >;
 
 type getPolyElTypes<El> = El extends $expr_PolyShapeElement