ts-gems 1.0.0 → 1.1.2

package/lib/common.d.ts

@@ -23,7 +23,7 @@ type JsonType = BasicPrimitive | null | object | (BasicPrimitive | object)[]
  * Builtin
  * @desc Type representing Builtin types in JavaScript
  */
-export type Builtin = Primitive | Function | String | Number | Date | Error | RegExp | JSON | Math |
+export type Builtin = Primitive | Function | String | Number | Date | Error | RegExp |
     ArrayBuffer | DataView | Int8Array | Uint8Array | Uint8ClampedArray | Int16Array | Uint16Array |
     Int32Array | Uint32Array | Float32Array | Float64Array;
 

package/lib/deep-modify.d.ts

@@ -17,7 +17,7 @@ type _DeepPartial<T> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepPartial<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepPartial<T[K]> }
                                         : T extends (infer U)[] ? DeepPartial<U>[]
-                                            : { [P in keyof T]?: DeepPartial<T[P]> };
+                                            : { [P in keyof T]?: DeepPartial<Exclude<T[P], undefined>> };
 
 /**
  * Combination of Partial and Writable but deeply
@@ -34,7 +34,7 @@ type _DeepBuildable<T> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepBuildable<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepBuildable<T[K]> }
                                         : T extends (infer U)[] ? DeepBuildable<U>[]
-                                            : { -readonly [P in keyof T]?: DeepBuildable<T[P]> };
+                                            : { -readonly [P in keyof T]?: DeepBuildable<Exclude<T[P], undefined>> };
 
 /**
  * Make all properties in T required deeply
@@ -51,7 +51,7 @@ type _DeepRequired<T> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepRequired<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepRequired<T[K]> }
                                         : T extends (infer U)[] ? DeepRequired<U>[]
-                                            : { [P in keyof T]-?: DeepRequired<T[P]> };
+                                            : { [P in keyof T]-?: DeepRequired<Exclude<T[P], undefined>> };
 
 
 /**
@@ -69,7 +69,7 @@ type _DeepReadonly<T> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepReadonly<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepReadonly<T[K]> }
                                         : T extends (infer U)[] ? DeepReadonly<U>[]
-                                            : { readonly [P in keyof T]: DeepReadonly<T[P]> };
+                                            : { readonly [P in keyof T]: DeepReadonly<Exclude<T[P], undefined>> };
 
 /**
  * Make all properties in T writable deeply
@@ -86,12 +86,12 @@ type _DeepWritable<T> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepWritable<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepWritable<T[K]> }
                                         : T extends (infer U)[] ? DeepWritable<U>[]
-                                            : { -readonly [P in keyof T]: DeepWritable<T[P]> };
+                                            : { -readonly [P in keyof T]: DeepWritable<Exclude<T[P], undefined>> };
 
 /**
  * Make all properties in T nullable deeply
  */
-export type DeepNullish<T> = _DeepNullish<T>;
+export type DeepNullish<T> = _DeepNullish<DeepRequired<T>>;
 type _DeepNullish<T> =
     T extends Builtin ? T | null | undefined
         : T extends Promise<infer U> ? Promise<DeepNullish<U>>
@@ -102,5 +102,5 @@ type _DeepNullish<T> =
                             : T extends ReadonlySet<infer U> ? ReadonlySet<DeepNullish<U>>
                                 : T extends WeakSet<infer U> ? WeakSet<DeepNullish<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepNullish<T[K]> }
-                                        : T extends (infer U)[] ? DeepNullish<U>[]
-                                            : { [P in keyof T]-?: DeepNullish<T[P]> };
+                                        : T extends (infer U)[] ? DeepNullish<U>[] | null | undefined
+                                            : { [P in keyof T]: DeepNullish<T[P]>| null | undefined };

package/lib/deep-omit.d.ts

@@ -17,7 +17,7 @@ type _DeepOmitOptional<T, K extends keyof T = Exclude<keyof T, OptionalKeys<T>>>
                                 : T extends WeakSet<infer U> ? WeakSet<DeepOmitOptional<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepOmitOptional<T[K]> }
                                         : T extends (infer U)[] ? DeepOmitOptional<U>[]
-                                            : { [P in K]: DeepOmitOptional<T[P]> };
+                                            : { [P in K]: DeepOmitOptional<Exclude<T[P], undefined>> };
 
 /**
  * Omit all required properties in T deeply
@@ -34,7 +34,7 @@ type _DeepOmitRequired<T, J extends keyof T = Exclude<keyof T, RequiredKeys<T>>>
                                 : T extends WeakSet<infer U> ? WeakSet<DeepOmitRequired<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepOmitRequired<T[K]> }
                                         : T extends (infer U)[] ? DeepOmitRequired<U>[]
-                                            : { [P in J]: DeepOmitRequired<T[P]> };
+                                            : { [P in J]: DeepOmitRequired<Exclude<T[P], undefined>> };
 
 /**
  * Omit all readonly properties in T deeply
@@ -51,7 +51,7 @@ type _DeepOmitReadonly<T, J extends keyof T = Exclude<keyof T, ReadonlyKeys<T>>>
                                 : T extends WeakSet<infer U> ? WeakSet<DeepOmitReadonly<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepOmitReadonly<T[K]> }
                                         : T extends (infer U)[] ? DeepOmitReadonly<U>[]
-                                            : { [P in J]: DeepOmitReadonly<T[P]> };
+                                            : { [P in J]: DeepOmitReadonly<Exclude<T[P], undefined>> };
 
 /**
  * Omit all writable properties in T deeply
@@ -68,10 +68,10 @@ type _DeepOmitWritable<T, K extends keyof T = Exclude<keyof T, WritableKeys<T>>>
                                 : T extends WeakSet<infer U> ? WeakSet<DeepOmitWritable<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepOmitWritable<T[K]> }
                                         : T extends (infer U)[] ? DeepOmitWritable<U>[]
-                                            : { [P in K]: DeepOmitWritable<T[P]> }
+                                            : { [P in K]: DeepOmitWritable<Exclude<T[P], undefined>> }
 
 /**
- * Omit all JSON properties in T deeply
+ * Omit all JSON friendly properties in T deeply
  */
 export type DeepOmitJson<T> = _DeepOmitJson<T>
 type _DeepOmitJson<T, K extends keyof T = Exclude<keyof T, JsonKeys<T>>> =
@@ -85,4 +85,4 @@ type _DeepOmitJson<T, K extends keyof T = Exclude<keyof T, JsonKeys<T>>> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepOmitJson<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepOmitJson<T[K]> }
                                         : T extends (infer U)[] ? DeepOmitJson<U>[]
-                                            : { [P in K]: DeepOmitJson<T[P]> };
+                                            : { [P in K]: DeepOmitJson<Exclude<T[P], undefined>> };

package/lib/deep-pick.d.ts

@@ -17,7 +17,7 @@ type _DeepPickOptional<T, K extends keyof T = OptionalKeys<T>> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepPickOptional<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepPickOptional<T[K]> }
                                         : T extends (infer U)[] ? DeepPickOptional<U>[]
-                                            : { [P in K]: DeepPickOptional<T[P]> };
+                                            : { [P in K]: DeepPickOptional<Exclude<T[P], undefined>> };
 
 /**
  * Pick all required properties in T deeply
@@ -34,7 +34,7 @@ type _DeepPickRequired<T, J extends keyof T = RequiredKeys<T>> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepPickRequired<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepPickRequired<T[K]> }
                                         : T extends (infer U)[] ? DeepPickRequired<U>[]
-                                            : { [P in J]: DeepPickRequired<T[P]> };
+                                            : { [P in J]: DeepPickRequired<Exclude<T[P], undefined>> };
 
 /**
  * Pick all readonly properties in T deeply
@@ -51,7 +51,7 @@ type _DeepPickReadonly<T, J extends keyof T = ReadonlyKeys<T>> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepPickReadonly<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepPickReadonly<T[K]> }
                                         : T extends (infer U)[] ? DeepPickReadonly<U>[]
-                                            : { [P in J]: DeepPickReadonly<T[P]> };
+                                            : { [P in J]: DeepPickReadonly<Exclude<T[P], undefined>> };
 
 /**
  * Pick all writable properties in T deeply
@@ -68,10 +68,10 @@ type _DeepPickWritable<T, K extends keyof T = WritableKeys<T>> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepPickWritable<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepPickWritable<T[K]> }
                                         : T extends (infer U)[] ? DeepPickWritable<U>[]
-                                            : { [P in K]: DeepPickWritable<T[P]> }
+                                            : { [P in K]: DeepPickWritable<Exclude<T[P], undefined>> }
 
 /**
- * Pick all JSON properties in T deeply
+ * Pick all JSON friendly properties in T deeply
  */
 export type DeepPickJson<T> = _DeepPickJson<T>
 type _DeepPickJson<T, K extends keyof T = JsonKeys<T>> =
@@ -85,4 +85,4 @@ type _DeepPickJson<T, K extends keyof T = JsonKeys<T>> =
                                 : T extends WeakSet<infer U> ? WeakSet<DeepPickJson<U>>
                                     : IfTuple<T> extends true ? { [K in OptionalKeys<T>]?: DeepPickJson<T[K]> }
                                         : T extends (infer U)[] ? DeepPickJson<U>[]
-                                            : { [P in K]: DeepPickJson<T[P]> };
+                                            : { [P in K]: DeepPickJson<Exclude<T[P], undefined>> };

package/lib/index.d.ts

@@ -4,3 +4,6 @@ export * from "./type-check";
 export * from "./modify";
 export * from "./deep-pick";
 export * from "./deep-omit";
+export * from "./deep-modify";
+export * from "./pick";
+export * from "./omit";

package/lib/keys.ts

@@ -12,27 +12,33 @@ export type KeysOf<T> = keyof T;
  */
 export type ValuesOf<T> = T[keyof T];
 
+/**
+ * RequiredKeys
+ * @desc Returns required keys of an object
+ */
+export type RequiredKeys<T> = {
+    [K in keyof T]-?: IfUndefined<T[K]> extends true
+        ? never
+        : T extends { [K1 in K]: any } ? K : never
+}[keyof T];
 
 /**
  * OptionalKeys
  * @desc Returns optional keys of an object
  */
-export type OptionalKeys<T> = ValuesOf<{
-    [K in keyof T]-?: {} extends Pick<T, K> ? K : never;
-}>;
+export type OptionalKeys<T> = {
+    [K in keyof T]-?: IfUndefined<T[K]> extends true
+        ? never
+        : T extends { [K1 in K]: any } ? never : K
+}[keyof T];
 
-/**
- * RequiredKeys
- * @desc Returns required keys of an object
- */
-export type RequiredKeys<T> = Exclude<keyof T, OptionalKeys<T>>;
 
 /**
  * @desc Returns readonly keys of an object
  */
-export type ReadonlyKeys<T> = ValuesOf<{
+export type ReadonlyKeys<T> = {
     [K in keyof T]-?: IfEquals<{ [Q in K]: T[K] }, { -readonly [Q in K]: T[K] }, never, K>
-}>;
+}[keyof T];
 
 /**
  * @desc Returns non function keys of an object
@@ -41,13 +47,18 @@ export type NonFunctionKeys<T> = Exclude<keyof T, FunctionKeys<T>>;
 
 
 /**
- * @desc Returns non function keys of an object
+ * @desc Returns JSON friendly keys of an object
  */
-export type JsonKeys<T> = ValuesOf<{
-    [K in keyof T]-?: IfUndefined<T[K]> extends false ?
-        K extends symbol ? never :
-            IfJson<T[K]> extends true ?
-                K : never : never;
+export type JsonKeys<T> = _JsonKeys<T>;
+type _JsonKeys<T, J = Required<T>> = ValuesOf<{
+    [K in keyof J]: IfUndefined<J[K]> extends true
+        ? never
+        : K extends symbol
+            ? never
+            : IfJson<J[K]> extends true
+                ? K
+                : never
+
 }>;
 
 /**

package/lib/omit.d.ts

@@ -0,0 +1,27 @@
+import {JsonKeys, OptionalKeys, ReadonlyKeys, RequiredKeys, WritableKeys} from './keys';
+
+/**
+ * Omit all optional properties in T
+ */
+export type OmitOptional<T> = Omit<T, OptionalKeys<T>>;
+
+/**
+ * Omit all required properties in T
+ */
+export type OmitRequired<T> = Omit<T, RequiredKeys<T>>;
+
+/**
+ * Omit all readonly properties in T
+ */
+export type OmitReadonly<T> = Omit<T, ReadonlyKeys<T>>;
+
+
+/**
+ * Omit all writable properties in T
+ */
+export type OmitWritable<T> = Omit<T, WritableKeys<T>>;
+
+/**
+ * Omit all JSON friendly properties in T
+ */
+export type OmitJson<T> = Omit<T, JsonKeys<T>>;

package/lib/pick.d.ts

@@ -0,0 +1,27 @@
+import {JsonKeys, OptionalKeys, ReadonlyKeys, RequiredKeys, WritableKeys} from './keys';
+
+/**
+ * Pick all optional properties in T
+ */
+export type PickOptional<T> = Pick<T, OptionalKeys<T>>;
+
+/**
+ * Pick all required properties in T
+ */
+export type PickRequired<T> = Pick<T, RequiredKeys<T>>;
+
+/**
+ * Pick all readonly properties in T
+ */
+export type PickReadonly<T> = Pick<T, ReadonlyKeys<T>>;
+
+
+/**
+ * Pick all writable properties in T
+ */
+export type PickWritable<T> = Pick<T, WritableKeys<T>>;
+
+/**
+ * Pick all JSON friendly properties (no symbols) in T
+ */
+export type PickJson<T> = Pick<T, JsonKeys<T>>;

package/lib/type-check.d.ts

@@ -69,17 +69,15 @@ export type IfPrimitiveOrAny<T, Y = true, N = false> =
  * Returns Y if typeof T is JSON like, N otherwise
  */
 export type IfJson<T, Y = true, N = false> =
-    IfNever<T> extends true ? N :
-        IfClass<T> extends true ? N :
-            IfFunction<T> extends true ? N :
-                IfUndefined<T> extends true ? N :
-                    IfEquals<T, number> extends true ? Y :
-                        IfEquals<T, string> extends true ? Y :
-                            IfEquals<T, boolean> extends true ? Y :
-                                IfEquals<T, null> extends true ? Y :
-                                    IfObject<T, Y> extends true ? Y :
-                                        T extends (infer U)[] ? IfJson<U> extends true ? Y : N
-                                            : N;
+    IfNull<T> extends true ? Y :
+        IfNever<T> extends true ? N :
+            IfUnknown<T> extends true ? N :
+                IfClass<T> extends true ? N :
+                    IfFunction<T> extends true ? N :
+                        IfUndefined<T> extends true ? N :
+                            T extends symbol ? N :
+                                T extends (infer U)[] ? IfJson<U> extends true ? Y : N
+                                    : Y;
 
 export type IfJsonOrAny<T, Y = true, N = false> =
     IfAny<T> extends true ? Y : IfJson<T, Y, N>;

package/package.json

@@ -12,7 +12,7 @@
     "lodash",
     "underscore"
   ],
-  "version": "1.0.0",
+  "version": "1.1.2",
   "types": "lib/index.d.ts",
   "repository": "git@github.com:panates/ts-gems.git",
   "author": "Eray Hanoglu <e.hanoglu@panates.com>",
@@ -32,9 +32,10 @@
     "typescript": ">=4.0.0"
   },
   "devDependencies": {
-    "@types/jest": "^27.0.3",
+    "@types/jest": "^27.4.0",
+    "jest": "^27.4.7",
     "prettier": "^2.5.1",
-    "ts-jest": "^27.1.2",
-    "typescript": "^4.5.4"
+    "ts-jest": "^27.1.3",
+    "typescript": "^4.5.5"
   }
 }