fix: 🐛 make optinal keys resolve to T | undefined

Author: streamich

src/modules/__tests__/json-rx.spec.ts

@@ -0,0 +1,9 @@
+import {SchemaOf, t} from '../../type';
+import {Message, NotificationMessage} from '../json-rx';
+
+test('...', () => {
+  console.log(NotificationMessage + '');
+  type adasfsad = SchemaOf<typeof NotificationMessage.type>;
+  type asdf = t.infer<typeof NotificationMessage.type>;
+  // console.log(Message + '');
+});

src/schema/schema.ts

@@ -489,19 +489,21 @@ export type TypeOfValue<T> = T extends BoolSchema
           ]
         : T extends ConSchema<infer U>
           ? U
-          : T extends KeySchema<infer K, infer V>
-            ? TypeOf<V>
-            : T extends ObjSchema<infer F>
-              ? NoEmptyInterface<TypeFields<Mutable<F>>>
-              : T extends MapSchema<infer U>
-                ? Record<string, TypeOf<U>>
-                : T extends BinSchema
-                  ? Uint8Array
-                  : T extends FnSchema<infer Req, infer Res, infer Ctx>
-                    ? (req: TypeOf<Req>, ctx: Ctx) => UndefToVoid<TypeOf<Res>> | Promise<UndefToVoid<TypeOf<Res>>>
-                    : T extends FnRxSchema<infer Req, infer Res, infer Ctx>
-                      ? (req$: Observable<TypeOf<Req>>, ctx: Ctx) => Observable<UndefToVoid<TypeOf<Res>>>
-                      : never;
+          : T extends OptKeySchema<infer K, infer V>
+            ? (TypeOf<V> | undefined)
+            : T extends KeySchema<infer K, infer V>
+              ? TypeOf<V>
+              : T extends ObjSchema<infer F>
+                ? NoEmptyInterface<TypeFields<Mutable<F>>>
+                : T extends MapSchema<infer U>
+                  ? Record<string, TypeOf<U>>
+                  : T extends BinSchema
+                    ? Uint8Array
+                    : T extends FnSchema<infer Req, infer Res, infer Ctx>
+                      ? (req: TypeOf<Req>, ctx: Ctx) => UndefToVoid<TypeOf<Res>> | Promise<UndefToVoid<TypeOf<Res>>>
+                      : T extends FnRxSchema<infer Req, infer Res, infer Ctx>
+                        ? (req$: Observable<TypeOf<Req>>, ctx: Ctx) => Observable<UndefToVoid<TypeOf<Res>>>
+                        : never;
 
 export type TypeOfMap<M extends Record<string, Schema>> = {
   [K in keyof M]: TypeOf<M[K]>;

src/type/classes/ObjType.ts

@@ -35,15 +35,14 @@ export class KeyType<K extends string, V extends Type> extends AbsType<schema.Ke
   }
 }
 
-export class KeyOptType<K extends string, V extends Type> extends KeyType<K, V> {
+export class KeyOptType<K extends string, V extends Type> extends AbsType<schema.OptKeySchema<K, SchemaOf<V>>> {
   public readonly optional: boolean = true;
 
   constructor(
     public readonly key: K,
     public readonly val: V,
   ) {
-    super(key, val);
-    (this as any).schema = schema.s.KeyOpt(key, schema.s.any) as any;
+    super(schema.s.KeyOpt(key, schema.s.any) as any);
   }
 
   protected toStringTitle(): string {
@@ -113,7 +112,7 @@ export class ObjType<
 
   public getField<K extends keyof schema.TypeOf<schema.ObjSchema<SchemaOfObjectFields<F>>>>(
     key: K,
-  ): KeyType<string, Type> | undefined {
+  ): KeyType<string, Type> | KeyOptType<string, Type> | undefined {
     return this.keys.find((f) => f.key === key);
   }