@tstdl/base 0.83.16 → 0.83.17
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/schema/schemas/assign.d.ts +1 -1
- package/utils/merge.d.ts +1 -2
package/package.json
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type { Merge } from '
|
|
1
|
+
import type { Merge } from '../../types.js';
|
|
2
2
|
import type { ObjectSchema, ObjectSchemaOrType } from '../types/index.js';
|
|
3
3
|
export declare function assign<T1, T2>(schema1: ObjectSchemaOrType<T1>, schema2: ObjectSchemaOrType<T2>): ObjectSchema<Merge<T1, T2>>;
|
|
4
4
|
export declare function assign<T1, T2, T3>(schema1: ObjectSchemaOrType<T1>, schema2: ObjectSchemaOrType<T2>, schema3: ObjectSchemaOrType<T3>): ObjectSchema<Merge<Merge<T1, T2>, T3>>;
|
package/utils/merge.d.ts
CHANGED
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type { Record } from '../types.js';
|
|
2
|
-
import type { Merge } from 'type-fest';
|
|
1
|
+
import type { Merge, Record } from '../types.js';
|
|
3
2
|
type BaseType = Record | any[] | Map<any, any> | Set<any>;
|
|
4
3
|
export declare function merge<A extends BaseType, B extends BaseType>(a: A | undefined, b: B | undefined): A extends (infer T)[] ? B extends (infer U)[] ? (T | U)[] : never : A extends Map<infer K, infer V> ? B extends Map<infer K2, infer V2> ? Map<K | K2, V | V2> : never : A extends Set<infer T> ? B extends Set<infer U> ? Set<T | U> : never : A extends Record ? B extends Record ? Merge<A, B> : never : never;
|
|
5
4
|
export {};
|