fix: object type merge

izatop · Nov 10, 2020 · f690a04 · f690a04
1 parent fb759b3
commit f690a04
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/packages/input/src/Type/ObjectType.ts b/packages/input/src/Type/ObjectType.ts
@@ -1,6 +1,6 @@
 import {entriesReverse, isFunction, isInstanceOf, isObject, MayNullable} from "@typesafeunit/util";
 import {AssertionObjectError, AssertionTypeError, IReadableTypeError} from "../Assertion";
-import {ObjectFields} from "../interfaces";
+import {ObjectFields, ObjectTypeMerge} from "../interfaces";
 import {TypeAbstract} from "../TypeAbstract";
 
 export class ObjectType<TValue extends Record<string, any>> extends TypeAbstract<TValue, Record<string, any>> {
@@ -17,6 +17,22 @@ export class ObjectType<TValue extends Record<string, any>> extends TypeAbstract
         return this.#name;
     }
 
+    public get fields(): ObjectFields<TValue> {
+        return this.#fields;
+    }
+
+    public merge<F extends Record<string, any>>(from: ObjectTypeMerge<F>): ObjectType<TValue & F> {
+        if (isInstanceOf(from, ObjectType)) {
+            return new ObjectType<TValue & F>(
+                Object.assign({}, this.fields, from) as any,
+            );
+        }
+
+        return new ObjectType<TValue & F>(
+            Object.assign({}, this.fields, from.fields) as any,
+        );
+    }
+
     public async validate(payload: MayNullable<Record<string, any>>): Promise<TValue> {
         this.assert(isObject(payload), `Wrong payload: ${this.name} expected`, payload);
 

diff --git a/packages/input/src/interfaces.ts b/packages/input/src/interfaces.ts
@@ -31,3 +31,5 @@ export type FieldSelectType<T> = T extends Record<string, any>
     : T extends Array<infer I>
         ? List<I>
         : TypeAbstract<T>;
+
+export type ObjectTypeMerge<T extends Record<string, any>> = ObjectType<T> | ObjectFields<T>;