perf: speed up addQuestionMarks

colinhacks · Jul 31, 2023 · 0483a8e · 0483a8e
1 parent 78a4090
commit 0483a8e
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 12 deletions.
diff --git a/deno/lib/helpers/util.ts b/deno/lib/helpers/util.ts
@@ -104,17 +104,16 @@ export namespace objectUtil {
   //   [k in keyof T]: undefined extends T[k] ? k : never;
   // }[keyof T];
 
-  type requiredKeys<T extends object> = {
-    [k in keyof T]: undefined extends T[k] ? never : k;
-  }[keyof T];
+  type keepRequiredKeys<T extends object> = {
+    [k in keyof T as undefined extends T[k] ? never : k]-?: T[k];
+  };
 
   // type alkjsdf = addQuestionMarks<{ a: any }>;
 
   export type addQuestionMarks<
-    T extends object,
-    R extends keyof T = requiredKeys<T>
+    T extends object
     // O extends keyof T = optionalKeys<T>
-  > = Pick<Required<T>, R> & Partial<T>;
+  > = keepRequiredKeys<T> & Partial<T>;
   //  = { [k in O]?: T[k] } & { [k in R]: T[k] };
 
   export type identity<T> = T;

diff --git a/src/helpers/util.ts b/src/helpers/util.ts
@@ -104,17 +104,16 @@ export namespace objectUtil {
   //   [k in keyof T]: undefined extends T[k] ? k : never;
   // }[keyof T];
 
-  type requiredKeys<T extends object> = {
-    [k in keyof T]: undefined extends T[k] ? never : k;
-  }[keyof T];
+  type keepRequiredKeys<T extends object> = {
+    [k in keyof T as undefined extends T[k] ? never : k]-?: T[k];
+  };
 
   // type alkjsdf = addQuestionMarks<{ a: any }>;
 
   export type addQuestionMarks<
-    T extends object,
-    R extends keyof T = requiredKeys<T>
+    T extends object
     // O extends keyof T = optionalKeys<T>
-  > = Pick<Required<T>, R> & Partial<T>;
+  > = keepRequiredKeys<T> & Partial<T>;
   //  = { [k in O]?: T[k] } & { [k in R]: T[k] };
 
   export type identity<T> = T;