@sinclair/typebox 0.34.0 → 0.34.1

package/build/cjs/type/module/compute.js

@@ -0,0 +1,154 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FromType = FromType;
+exports.ComputeType = ComputeType;
+exports.ComputeModuleProperties = ComputeModuleProperties;
+const index_1 = require("../create/index");
+const index_2 = require("../array/index");
+const index_3 = require("../awaited/index");
+const index_4 = require("../async-iterator/index");
+const index_5 = require("../constructor/index");
+const index_6 = require("../indexed/index");
+const index_7 = require("../function/index");
+const index_8 = require("../intersect/index");
+const index_9 = require("../iterator/index");
+const index_10 = require("../keyof/index");
+const index_11 = require("../object/index");
+const index_12 = require("../omit/index");
+const index_13 = require("../pick/index");
+const index_14 = require("../never/index");
+const index_15 = require("../partial/index");
+const index_16 = require("../record/index");
+const index_17 = require("../required/index");
+const index_18 = require("../tuple/index");
+const index_19 = require("../union/index");
+// ------------------------------------------------------------------
+// KindGuard
+// ------------------------------------------------------------------
+const KindGuard = require("../guard/kind");
+// prettier-ignore
+function DerefParameters(moduleProperties, types) {
+    return types.map((type) => {
+        return KindGuard.IsRef(type)
+            ? Deref(moduleProperties, type.$ref)
+            : FromType(moduleProperties, type);
+    });
+}
+// prettier-ignore
+function Deref(moduleProperties, ref) {
+    return (ref in moduleProperties
+        ? KindGuard.IsRef(moduleProperties[ref])
+            ? Deref(moduleProperties, moduleProperties[ref].$ref)
+            : FromType(moduleProperties, moduleProperties[ref])
+        : (0, index_14.Never)());
+}
+// prettier-ignore
+function FromAwaited(parameters) {
+    return (0, index_3.Awaited)(parameters[0]);
+}
+// prettier-ignore
+function FromIndex(parameters) {
+    return (0, index_6.Index)(parameters[0], parameters[1]);
+}
+// prettier-ignore
+function FromKeyOf(parameters) {
+    return (0, index_10.KeyOf)(parameters[0]);
+}
+// prettier-ignore
+function FromPartial(parameters) {
+    return (0, index_15.Partial)(parameters[0]);
+}
+// prettier-ignore
+function FromOmit(parameters) {
+    return (0, index_12.Omit)(parameters[0], parameters[1]);
+}
+// prettier-ignore
+function FromPick(parameters) {
+    return (0, index_13.Pick)(parameters[0], parameters[1]);
+}
+// prettier-ignore
+function FromRecord(parameters) {
+    return (0, index_16.Record)(parameters[0], parameters[1]);
+}
+// prettier-ignore
+function FromRequired(parameters) {
+    return (0, index_17.Required)(parameters[0]);
+}
+// prettier-ignore
+function FromComputed(moduleProperties, target, parameters) {
+    const dereferenced = DerefParameters(moduleProperties, parameters);
+    return (target === 'Awaited' ? FromAwaited(dereferenced) :
+        target === 'Index' ? FromIndex(dereferenced) :
+            target === 'KeyOf' ? FromKeyOf(dereferenced) :
+                target === 'Partial' ? FromPartial(dereferenced) :
+                    target === 'Omit' ? FromOmit(dereferenced) :
+                        target === 'Pick' ? FromPick(dereferenced) :
+                            target === 'Record' ? FromRecord(dereferenced) :
+                                target === 'Required' ? FromRequired(dereferenced) :
+                                    (0, index_14.Never)());
+}
+function FromObject(moduleProperties, properties) {
+    return (0, index_11.Object)(globalThis.Object.keys(properties).reduce((result, key) => {
+        return { ...result, [key]: FromType(moduleProperties, properties[key]) };
+    }, {}));
+}
+// prettier-ignore
+function FromConstructor(moduleProperties, parameters, instanceType) {
+    return (0, index_5.Constructor)(FromRest(moduleProperties, parameters), FromType(moduleProperties, instanceType));
+}
+// prettier-ignore
+function FromFunction(moduleProperties, parameters, returnType) {
+    return (0, index_7.Function)(FromRest(moduleProperties, parameters), FromType(moduleProperties, returnType));
+}
+function FromTuple(moduleProperties, types) {
+    return (0, index_18.Tuple)(FromRest(moduleProperties, types));
+}
+function FromIntersect(moduleProperties, types) {
+    return (0, index_8.Intersect)(FromRest(moduleProperties, types));
+}
+function FromUnion(moduleProperties, types) {
+    return (0, index_19.Union)(FromRest(moduleProperties, types));
+}
+function FromArray(moduleProperties, type) {
+    return (0, index_2.Array)(FromType(moduleProperties, type));
+}
+function FromAsyncIterator(moduleProperties, type) {
+    return (0, index_4.AsyncIterator)(FromType(moduleProperties, type));
+}
+function FromIterator(moduleProperties, type) {
+    return (0, index_9.Iterator)(FromType(moduleProperties, type));
+}
+function FromRest(moduleProperties, types) {
+    return types.map((type) => FromType(moduleProperties, type));
+}
+// prettier-ignore
+function FromType(moduleProperties, type) {
+    return (
+    // Note: The 'as never' is required due to excessive resolution of TIndex. In fact TIndex, TPick, TOmit and
+    // all need re-implementation to remove the PropertyKey[] selector. Reimplementation of these types should
+    // be a priority as there is a potential for the current inference to break on TS compiler changes.
+    KindGuard.IsComputed(type) ? (0, index_1.CreateType)(FromComputed(moduleProperties, type.target, type.parameters)) :
+        KindGuard.IsObject(type) ? (0, index_1.CreateType)(FromObject(moduleProperties, type.properties), type) :
+            KindGuard.IsConstructor(type) ? (0, index_1.CreateType)(FromConstructor(moduleProperties, type.parameters, type.returns), type) :
+                KindGuard.IsFunction(type) ? (0, index_1.CreateType)(FromFunction(moduleProperties, type.parameters, type.returns), type) :
+                    KindGuard.IsTuple(type) ? (0, index_1.CreateType)(FromTuple(moduleProperties, type.items || []), type) :
+                        KindGuard.IsIntersect(type) ? (0, index_1.CreateType)(FromIntersect(moduleProperties, type.allOf), type) :
+                            KindGuard.IsUnion(type) ? (0, index_1.CreateType)(FromUnion(moduleProperties, type.anyOf), type) :
+                                KindGuard.IsArray(type) ? (0, index_1.CreateType)(FromArray(moduleProperties, type.items), type) :
+                                    KindGuard.IsAsyncIterator(type) ? (0, index_1.CreateType)(FromAsyncIterator(moduleProperties, type.items), type) :
+                                        KindGuard.IsIterator(type) ? (0, index_1.CreateType)(FromIterator(moduleProperties, type.items), type) :
+                                            type);
+}
+// prettier-ignore
+function ComputeType(moduleProperties, key) {
+    return (key in moduleProperties
+        ? FromType(moduleProperties, moduleProperties[key])
+        : (0, index_14.Never)());
+}
+// prettier-ignore
+function ComputeModuleProperties(moduleProperties) {
+    return globalThis.Object.getOwnPropertyNames(moduleProperties).reduce((result, key) => {
+        return { ...result, [key]: ComputeType(moduleProperties, key) };
+    }, {});
+}

package/build/cjs/type/module/infer.d.ts

@@ -0,0 +1,43 @@
+import { Ensure, Evaluate } from '../helpers/index';
+import { TSchema } from '../schema/index';
+import { TArray } from '../array/index';
+import { TAsyncIterator } from '../async-iterator/index';
+import { TConstructor } from '../constructor/index';
+import { TFunction } from '../function/index';
+import { TIntersect } from '../intersect/index';
+import { TIterator } from '../iterator/index';
+import { TObject, TProperties } from '../object/index';
+import { TOptional } from '../optional/index';
+import { TReadonly } from '../readonly/index';
+import { TRef } from '../ref/index';
+import { TTuple } from '../tuple/index';
+import { TUnion } from '../union/index';
+import { Static } from '../static/index';
+type TInferArray<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<Array<TInfer<ModuleProperties, Type>>>);
+type TInferAsyncIterator<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<AsyncIterableIterator<TInfer<ModuleProperties, Type>>>);
+type TInferConstructor<ModuleProperties extends TProperties, Parameters extends TSchema[], InstanceType extends TSchema> = Ensure<new (...args: TInferTuple<ModuleProperties, Parameters>) => TInfer<ModuleProperties, InstanceType>>;
+type TInferFunction<ModuleProperties extends TProperties, Parameters extends TSchema[], ReturnType extends TSchema> = Ensure<(...args: TInferTuple<ModuleProperties, Parameters>) => TInfer<ModuleProperties, ReturnType>>;
+type TInferIterator<ModuleProperties extends TProperties, Type extends TSchema> = (Ensure<IterableIterator<TInfer<ModuleProperties, Type>>>);
+type TInferIntersect<ModuleProperties extends TProperties, Types extends TSchema[], Result extends unknown = unknown> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TInferIntersect<ModuleProperties, R, Result & TInfer<ModuleProperties, L>> : Result);
+type ReadonlyOptionalPropertyKeys<Properties extends TProperties> = {
+    [K in keyof Properties]: Properties[K] extends TReadonly<TSchema> ? (Properties[K] extends TOptional<Properties[K]> ? K : never) : never;
+}[keyof Properties];
+type ReadonlyPropertyKeys<Source extends TProperties> = {
+    [K in keyof Source]: Source[K] extends TReadonly<TSchema> ? (Source[K] extends TOptional<Source[K]> ? never : K) : never;
+}[keyof Source];
+type OptionalPropertyKeys<Source extends TProperties> = {
+    [K in keyof Source]: Source[K] extends TOptional<TSchema> ? (Source[K] extends TReadonly<Source[K]> ? never : K) : never;
+}[keyof Source];
+type RequiredPropertyKeys<Source extends TProperties> = keyof Omit<Source, ReadonlyOptionalPropertyKeys<Source> | ReadonlyPropertyKeys<Source> | OptionalPropertyKeys<Source>>;
+type InferPropertiesWithModifiers<Properties extends TProperties, Source extends Record<keyof any, unknown>> = Evaluate<(Readonly<Partial<Pick<Source, ReadonlyOptionalPropertyKeys<Properties>>>> & Readonly<Pick<Source, ReadonlyPropertyKeys<Properties>>> & Partial<Pick<Source, OptionalPropertyKeys<Properties>>> & Required<Pick<Source, RequiredPropertyKeys<Properties>>>)>;
+type InferProperties<ModuleProperties extends TProperties, Properties extends TProperties> = InferPropertiesWithModifiers<Properties, {
+    [K in keyof Properties]: TInfer<ModuleProperties, Properties[K]>;
+}>;
+type TInferObject<ModuleProperties extends TProperties, Properties extends TProperties> = (InferProperties<ModuleProperties, Properties>);
+type TInferTuple<ModuleProperties extends TProperties, Types extends TSchema[], Result extends unknown[] = []> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TInferTuple<ModuleProperties, R, [...Result, TInfer<ModuleProperties, L>]> : Result);
+type TInferRef<ModuleProperties extends TProperties, Ref extends string> = (Ref extends keyof ModuleProperties ? TInfer<ModuleProperties, ModuleProperties[Ref]> : unknown);
+type TInferUnion<ModuleProperties extends TProperties, Types extends TSchema[], Result extends unknown = never> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TInferUnion<ModuleProperties, R, Result | TInfer<ModuleProperties, L>> : Result);
+type TInfer<ModuleProperties extends TProperties, Type extends TSchema> = (Type extends TArray<infer Type extends TSchema> ? TInferArray<ModuleProperties, Type> : Type extends TAsyncIterator<infer Type extends TSchema> ? TInferAsyncIterator<ModuleProperties, Type> : Type extends TConstructor<infer Parameters extends TSchema[], infer InstanceType extends TSchema> ? TInferConstructor<ModuleProperties, Parameters, InstanceType> : Type extends TFunction<infer Parameters extends TSchema[], infer ReturnType extends TSchema> ? TInferFunction<ModuleProperties, Parameters, ReturnType> : Type extends TIntersect<infer Types extends TSchema[]> ? TInferIntersect<ModuleProperties, Types> : Type extends TIterator<infer Type extends TSchema> ? TInferIterator<ModuleProperties, Type> : Type extends TObject<infer Properties extends TProperties> ? TInferObject<ModuleProperties, Properties> : Type extends TRef<infer Ref extends string> ? TInferRef<ModuleProperties, Ref> : Type extends TTuple<infer Types extends TSchema[]> ? TInferTuple<ModuleProperties, Types> : Type extends TUnion<infer Types extends TSchema[]> ? TInferUnion<ModuleProperties, Types> : Static<Type>);
+/** Inference Path for Imports. This type is used to compute TImport `static` */
+export type TInferFromModuleKey<ModuleProperties extends TProperties, Key extends PropertyKey> = (Key extends keyof ModuleProperties ? TInfer<ModuleProperties, ModuleProperties[Key]> : never);
+export {};

package/build/cjs/type/module/infer.js

@@ -0,0 +1,3 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", { value: true });

package/build/cjs/type/module/module.d.ts

@@ -1,48 +1,9 @@
-import { Ensure } from '../helpers/index';
 import { Kind } from '../symbols/index';
 import { SchemaOptions, TSchema } from '../schema/index';
-import { TObject, TProperties } from '../object/index';
-import { TConstructor } from '../constructor/index';
-import { TFunction } from '../function/index';
-import { TTuple } from '../tuple/index';
-import { TIntersect } from '../intersect/index';
-import { TUnion } from '../union/index';
-import { TArray } from '../array/index';
-import { TAsyncIterator } from '../async-iterator/index';
-import { TIterator } from '../iterator/index';
-import { TLiteral, TLiteralValue } from '../literal/index';
-import { TAny } from '../any/index';
-import { TBigInt } from '../bigint/index';
-import { TBoolean } from '../boolean/index';
-import { TDate } from '../date/index';
-import { TInteger } from '../integer/index';
-import { TNever } from '../never/index';
-import { TNumber } from '../number/index';
-import { TNull } from '../null/index';
-import { TRef } from '../ref/index';
-import { TRegExp } from '../regexp/index';
-import { TString } from '../string/index';
-import { TSymbol } from '../symbol/index';
-import { TTemplateLiteral, TTemplateLiteralKind } from '../template-literal/index';
-import { TUint8Array } from '../uint8array/index';
-import { TUndefined } from '../undefined/index';
-import { TUnknown } from '../unknown/index';
-import { TVoid } from '../void/index';
+import { TProperties } from '../object/index';
 import { Static } from '../static/index';
-type InferImport<Properties extends TProperties, Key extends keyof Properties, ModuleProperties extends TProperties> = (Infer<Properties[Key], ModuleProperties>);
-type InferRef<Ref extends string, Properties extends TProperties> = (Ref extends keyof Properties ? Infer<Properties[Ref], Properties> : never);
-type InferObject<Properties extends TProperties, ModuleProperties extends TProperties> = {
-    [K in keyof Properties]: Infer<Properties[K], ModuleProperties>;
-} & {};
-type InferConstructor<Parameters extends TSchema[], InstanceType extends TSchema, Properties extends TProperties> = Ensure<new (...args: InferTuple<Parameters, Properties>) => Infer<InstanceType, Properties>>;
-type InferFunction<Parameters extends TSchema[], ReturnType extends TSchema, Properties extends TProperties> = Ensure<(...args: InferTuple<Parameters, Properties>) => Infer<ReturnType, Properties>>;
-type InferTuple<Types extends TSchema[], Properties extends TProperties, Result extends unknown[] = []> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? InferTuple<R, Properties, [...Result, Infer<L, Properties>]> : Result);
-type InferIntersect<Types extends TSchema[], Properties extends TProperties, Result extends unknown = unknown> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? InferIntersect<R, Properties, Result & Infer<L, Properties>> : Result);
-type InferUnion<Types extends TSchema[], Properties extends TProperties, Result extends unknown = never> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? InferUnion<R, Properties, Result | Infer<L, Properties>> : Result);
-type InferArray<Type extends TSchema, Module extends TProperties> = (Ensure<Array<Infer<Type, Module>>>);
-type InferAsyncIterator<Type extends TSchema, Properties extends TProperties> = (Ensure<AsyncIterableIterator<Infer<Type, Properties>>>);
-type InferIterator<Type extends TSchema, Properties extends TProperties> = (Ensure<IterableIterator<Infer<Type, Properties>>>);
-type Infer<Type extends TSchema, Properties extends TProperties = {}> = (Type extends TImport<infer S extends TProperties, infer K extends string> ? InferImport<S, K, S> : Type extends TRef<infer S extends string> ? InferRef<S, Properties> : Type extends TObject<infer S extends TProperties> ? InferObject<S, Properties> : Type extends TConstructor<infer S extends TSchema[], infer R extends TSchema> ? InferConstructor<S, R, Properties> : Type extends TFunction<infer S extends TSchema[], infer R extends TSchema> ? InferFunction<S, R, Properties> : Type extends TTuple<infer S extends TSchema[]> ? InferTuple<S, Properties> : Type extends TIntersect<infer S extends TSchema[]> ? InferIntersect<S, Properties> : Type extends TUnion<infer S extends TSchema[]> ? InferUnion<S, Properties> : Type extends TArray<infer S extends TSchema> ? InferArray<S, Properties> : Type extends TAsyncIterator<infer S extends TSchema> ? InferAsyncIterator<S, Properties> : Type extends TIterator<infer S extends TSchema> ? InferIterator<S, Properties> : Type extends TTemplateLiteral<infer S extends TTemplateLiteralKind[]> ? Static<TTemplateLiteral<S>> : Type extends TLiteral<infer S extends TLiteralValue> ? S : Type extends TAny ? any : Type extends TBigInt ? bigint : Type extends TBoolean ? boolean : Type extends TDate ? Date : Type extends TInteger ? number : Type extends TNever ? never : Type extends TNumber ? number : Type extends TRegExp ? string : Type extends TString ? string : Type extends TSymbol ? symbol : Type extends TNull ? null : Type extends TUint8Array ? Uint8Array : Type extends TUndefined ? undefined : Type extends TUnknown ? unknown : Type extends TVoid ? void : never);
+import { TComputeModuleProperties } from './compute';
+import { TInferFromModuleKey } from './infer';
 export interface TDefinitions<ModuleProperties extends TProperties> extends TSchema {
     static: {
         [K in keyof ModuleProperties]: Static<ModuleProperties[K]>;
@@ -51,21 +12,16 @@ export interface TDefinitions<ModuleProperties extends TProperties> extends TSch
 }
 export interface TImport<ModuleProperties extends TProperties = {}, Key extends keyof ModuleProperties = keyof ModuleProperties> extends TSchema {
     [Kind]: 'Import';
-    static: InferImport<ModuleProperties, Key, ModuleProperties>;
+    static: TInferFromModuleKey<ModuleProperties, Key>;
     $defs: ModuleProperties;
     $ref: Key;
 }
-export declare class TModule<Properties extends TProperties> {
+export declare class TModule<ModuleProperties extends TProperties, ComputedModuleProperties extends TProperties = TComputeModuleProperties<ModuleProperties>> {
     private readonly $defs;
-    private readonly options;
-    constructor($defs: Properties, options?: SchemaOptions);
-    /** `[Json]` Returns the Type definitions for this module */
-    Defs(): TDefinitions<Properties>;
+    constructor($defs: ModuleProperties);
     /** `[Json]` Imports a Type by Key. */
-    Import<Key extends keyof Properties>(key: Key, options?: SchemaOptions): TImport<Properties, Key>;
-    /** `[Internal]` For each definition, assign an `$id` property. */
-    private ResolveDefinitionsWithIdentifiers;
+    Import<Key extends keyof ComputedModuleProperties>(key: Key, options?: SchemaOptions): TImport<ComputedModuleProperties, Key>;
+    private WithIdentifiers;
 }
 /** `[Json]` Creates a Type Definition Module. */
 export declare function Module<Properties extends TProperties>(properties: Properties): TModule<Properties>;
-export {};

package/build/cjs/type/module/module.js

@@ -6,25 +6,28 @@ exports.Module = Module;
 const index_1 = require("../create/index");
 const index_2 = require("../symbols/index");
 // ------------------------------------------------------------------
+// Module Infrastructure Types
+// ------------------------------------------------------------------
+const compute_1 = require("./compute");
+// ------------------------------------------------------------------
 // Module
 // ------------------------------------------------------------------
 // prettier-ignore
 class TModule {
-    constructor($defs, options = {}) {
-        this.$defs = $defs;
-        this.options = options;
-    }
-    /** `[Json]` Returns the Type definitions for this module */
-    Defs() {
-        return (0, index_1.CreateType)({ $defs: this.ResolveDefinitionsWithIdentifiers() }, this.options);
+    constructor($defs) {
+        const computed = (0, compute_1.ComputeModuleProperties)($defs);
+        const identified = this.WithIdentifiers(computed);
+        this.$defs = identified;
     }
     /** `[Json]` Imports a Type by Key. */
     Import(key, options) {
-        return (0, index_1.CreateType)({ [index_2.Kind]: 'Import', $defs: this.ResolveDefinitionsWithIdentifiers(), $ref: key }, options);
+        return (0, index_1.CreateType)({ [index_2.Kind]: 'Import', $defs: this.$defs, $ref: key }, options);
     }
-    /** `[Internal]` For each definition, assign an `$id` property. */
-    ResolveDefinitionsWithIdentifiers() {
-        return globalThis.Object.getOwnPropertyNames(this.$defs).reduce((Result, Key) => ({ ...Result, [Key]: { ...this.$defs[Key], $id: Key } }), {});
+    // prettier-ignore
+    WithIdentifiers($defs) {
+        return globalThis.Object.getOwnPropertyNames($defs).reduce((result, key) => {
+            return { ...result, [key]: { ...$defs[key], $id: key } };
+        }, {});
     }
 }
 exports.TModule = TModule;

package/build/cjs/type/not/not.d.ts

@@ -7,4 +7,4 @@ export interface TNot<T extends TSchema = TSchema> extends TSchema {
     not: T;
 }
 /** `[Json]` Creates a Not type */
-export declare function Not<T extends TSchema>(not: T, options?: SchemaOptions): TNot<T>;
+export declare function Not<Type extends TSchema>(type: Type, options?: SchemaOptions): TNot<Type>;

package/build/cjs/type/not/not.js

@@ -5,6 +5,6 @@ exports.Not = Not;
 const type_1 = require("../create/type");
 const index_1 = require("../symbols/index");
 /** `[Json]` Creates a Not type */
-function Not(not, options) {
-    return (0, type_1.CreateType)({ [index_1.Kind]: 'Not', not }, options);
+function Not(type, options) {
+    return (0, type_1.CreateType)({ [index_1.Kind]: 'Not', not: type }, options);
 }

package/build/cjs/type/omit/omit-from-mapped-key.d.ts

@@ -2,11 +2,11 @@ import type { TSchema, SchemaOptions } from '../schema/index';
 import type { TProperties } from '../object/index';
 import { type TMappedResult, type TMappedKey } from '../mapped/index';
 import { type TOmit } from './omit';
-type TFromPropertyKey<T extends TSchema, K extends PropertyKey> = {
-    [_ in K]: TOmit<T, [K]>;
+type TFromPropertyKey<Type extends TSchema, Key extends PropertyKey> = {
+    [_ in Key]: TOmit<Type, [Key]>;
 };
-type TFromPropertyKeys<T extends TSchema, K extends PropertyKey[], Acc extends TProperties = {}> = (K extends [infer LK extends PropertyKey, ...infer RK extends PropertyKey[]] ? TFromPropertyKeys<T, RK, Acc & TFromPropertyKey<T, LK>> : Acc);
-type TFromMappedKey<T extends TSchema, K extends TMappedKey> = (TFromPropertyKeys<T, K['keys']>);
-export type TOmitFromMappedKey<T extends TSchema, K extends TMappedKey, P extends TProperties = TFromMappedKey<T, K>> = (TMappedResult<P>);
-export declare function OmitFromMappedKey<T extends TSchema, K extends TMappedKey, P extends TProperties = TFromMappedKey<T, K>>(T: T, K: K, options?: SchemaOptions): TMappedResult<P>;
+type TFromPropertyKeys<Type extends TSchema, PropertyKeys extends PropertyKey[], Result extends TProperties = {}> = (PropertyKeys extends [infer LK extends PropertyKey, ...infer RK extends PropertyKey[]] ? TFromPropertyKeys<Type, RK, Result & TFromPropertyKey<Type, LK>> : Result);
+type TFromMappedKey<Type extends TSchema, MappedKey extends TMappedKey> = (TFromPropertyKeys<Type, MappedKey['keys']>);
+export type TOmitFromMappedKey<Type extends TSchema, MappedKey extends TMappedKey, Properties extends TProperties = TFromMappedKey<Type, MappedKey>> = (TMappedResult<Properties>);
+export declare function OmitFromMappedKey<Type extends TSchema, MappedKey extends TMappedKey, Properties extends TProperties = TFromMappedKey<Type, MappedKey>>(type: Type, mappedKey: MappedKey, options?: SchemaOptions): TMappedResult<Properties>;
 export {};

package/build/cjs/type/omit/omit-from-mapped-key.js

@@ -6,23 +6,21 @@ const index_1 = require("../mapped/index");
 const omit_1 = require("./omit");
 const value_1 = require("../clone/value");
 // prettier-ignore
-function FromPropertyKey(T, K, options) {
-    return {
-        [K]: (0, omit_1.Omit)(T, [K], (0, value_1.Clone)(options))
-    };
+function FromPropertyKey(type, key, options) {
+    return { [key]: (0, omit_1.Omit)(type, [key], (0, value_1.Clone)(options)) };
 }
 // prettier-ignore
-function FromPropertyKeys(T, K, options) {
-    return K.reduce((Acc, LK) => {
-        return { ...Acc, ...FromPropertyKey(T, LK, options) };
+function FromPropertyKeys(type, propertyKeys, options) {
+    return propertyKeys.reduce((Acc, LK) => {
+        return { ...Acc, ...FromPropertyKey(type, LK, options) };
     }, {});
 }
 // prettier-ignore
-function FromMappedKey(T, K, options) {
-    return FromPropertyKeys(T, K.keys, options);
+function FromMappedKey(type, mappedKey, options) {
+    return FromPropertyKeys(type, mappedKey.keys, options);
 }
 // prettier-ignore
-function OmitFromMappedKey(T, K, options) {
-    const P = FromMappedKey(T, K, options);
-    return (0, index_1.MappedResult)(P);
+function OmitFromMappedKey(type, mappedKey, options) {
+    const properties = FromMappedKey(type, mappedKey, options);
+    return (0, index_1.MappedResult)(properties);
 }

package/build/cjs/type/omit/omit-from-mapped-result.d.ts

@@ -3,10 +3,10 @@ import type { Ensure, Evaluate } from '../helpers/index';
 import type { TProperties } from '../object/index';
 import { type TMappedResult } from '../mapped/index';
 import { type TOmit } from './omit';
-type TFromProperties<P extends TProperties, K extends PropertyKey[]> = ({
-    [K2 in keyof P]: TOmit<P[K2], K>;
+type TFromProperties<Properties extends TProperties, PropertyKeys extends PropertyKey[]> = ({
+    [K2 in keyof Properties]: TOmit<Properties[K2], PropertyKeys>;
 });
-type TFromMappedResult<R extends TMappedResult, K extends PropertyKey[]> = (Evaluate<TFromProperties<R['properties'], K>>);
-export type TOmitFromMappedResult<T extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<T, K>> = (Ensure<TMappedResult<P>>);
-export declare function OmitFromMappedResult<R extends TMappedResult, K extends PropertyKey[], P extends TProperties = TFromMappedResult<R, K>>(R: R, K: [...K], options?: SchemaOptions): TMappedResult<P>;
+type TFromMappedResult<MappedResult extends TMappedResult, PropertyKeys extends PropertyKey[]> = (Evaluate<TFromProperties<MappedResult['properties'], PropertyKeys>>);
+export type TOmitFromMappedResult<MappedResult extends TMappedResult, PropertyKeys extends PropertyKey[], Properties extends TProperties = TFromMappedResult<MappedResult, PropertyKeys>> = (Ensure<TMappedResult<Properties>>);
+export declare function OmitFromMappedResult<MappedResult extends TMappedResult, PropertyKeys extends PropertyKey[], Properties extends TProperties = TFromMappedResult<MappedResult, PropertyKeys>>(mappedResult: MappedResult, propertyKeys: [...PropertyKeys], options?: SchemaOptions): TMappedResult<Properties>;
 export {};

package/build/cjs/type/omit/omit-from-mapped-result.js

@@ -6,18 +6,18 @@ const index_1 = require("../mapped/index");
 const omit_1 = require("./omit");
 const value_1 = require("../clone/value");
 // prettier-ignore
-function FromProperties(P, K, options) {
-    const Acc = {};
-    for (const K2 of globalThis.Object.getOwnPropertyNames(P))
-        Acc[K2] = (0, omit_1.Omit)(P[K2], K, (0, value_1.Clone)(options));
-    return Acc;
+function FromProperties(properties, propertyKeys, options) {
+    const result = {};
+    for (const K2 of globalThis.Object.getOwnPropertyNames(properties))
+        result[K2] = (0, omit_1.Omit)(properties[K2], propertyKeys, (0, value_1.Clone)(options));
+    return result;
 }
 // prettier-ignore
-function FromMappedResult(R, K, options) {
-    return FromProperties(R.properties, K, options);
+function FromMappedResult(mappedResult, propertyKeys, options) {
+    return FromProperties(mappedResult.properties, propertyKeys, options);
 }
 // prettier-ignore
-function OmitFromMappedResult(R, K, options) {
-    const P = FromMappedResult(R, K, options);
-    return (0, index_1.MappedResult)(P);
+function OmitFromMappedResult(mappedResult, propertyKeys, options) {
+    const properties = FromMappedResult(mappedResult, propertyKeys, options);
+    return (0, index_1.MappedResult)(properties);
 }

package/build/cjs/type/omit/omit.d.ts

@@ -2,23 +2,35 @@ import type { SchemaOptions, TSchema } from '../schema/index';
 import type { TupleToUnion, Evaluate, Ensure } from '../helpers/index';
 import { type TRecursive } from '../recursive/index';
 import type { TMappedKey, TMappedResult } from '../mapped/index';
+import { TComputed } from '../computed/index';
+import { TLiteral, TLiteralValue } from '../literal/index';
+import { type TIndexPropertyKeys } from '../indexed/index';
 import { type TIntersect } from '../intersect/index';
 import { type TUnion } from '../union/index';
 import { type TObject, type TProperties } from '../object/index';
-import { type TIndexPropertyKeys } from '../indexed/index';
+import { type TRef } from '../ref/index';
 import { type TOmitFromMappedKey } from './omit-from-mapped-key';
 import { type TOmitFromMappedResult } from './omit-from-mapped-result';
-type TFromIntersect<T extends TSchema[], K extends PropertyKey[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromIntersect<R, K, [...Acc, TOmit<L, K>]> : Acc);
-type TFromUnion<T extends TSchema[], K extends PropertyKey[], Acc extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromUnion<R, K, [...Acc, TOmit<L, K>]> : Acc);
-type TFromProperties<T extends TProperties, K extends PropertyKey[], I extends PropertyKey = TupleToUnion<K>> = Evaluate<Omit<T, I>>;
-type TFromObject<T extends TObject, K extends PropertyKey[], Properties extends TProperties = T['properties']> = Ensure<TObject<(TFromProperties<Properties, K>)>>;
-export type TOmit<T extends TProperties, K extends PropertyKey[]> = (T extends TRecursive<infer S extends TSchema> ? TRecursive<TOmit<S, K>> : T extends TIntersect<infer S extends TSchema[]> ? TIntersect<TFromIntersect<S, K>> : T extends TUnion<infer S extends TSchema[]> ? TUnion<TFromUnion<S, K>> : T extends TObject<infer S extends TProperties> ? TFromObject<TObject<S>, K> : TObject<{}>);
-/** `[Json]` Constructs a type whose keys are omitted from the given type */
-export declare function Omit<T extends TMappedResult, K extends PropertyKey[]>(T: T, K: [...K], options?: SchemaOptions): TOmitFromMappedResult<T, K>;
-/** `[Json]` Constructs a type whose keys are omitted from the given type */
-export declare function Omit<T extends TSchema, K extends TMappedKey>(T: T, K: K, options?: SchemaOptions): TOmitFromMappedKey<T, K>;
-/** `[Json]` Constructs a type whose keys are omitted from the given type */
-export declare function Omit<T extends TSchema, K extends TSchema, I extends PropertyKey[] = TIndexPropertyKeys<K>>(T: T, K: K, options?: SchemaOptions): TOmit<T, I>;
-/** `[Json]` Constructs a type whose keys are omitted from the given type */
-export declare function Omit<T extends TSchema, K extends PropertyKey[]>(T: T, K: readonly [...K], options?: SchemaOptions): TOmit<T, K>;
+type TFromIntersect<Types extends TSchema[], PropertyKeys extends PropertyKey[], Result extends TSchema[] = []> = (Types extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromIntersect<R, PropertyKeys, [...Result, TOmit<L, PropertyKeys>]> : Result);
+type TFromUnion<T extends TSchema[], K extends PropertyKey[], Result extends TSchema[] = []> = (T extends [infer L extends TSchema, ...infer R extends TSchema[]] ? TFromUnion<R, K, [...Result, TOmit<L, K>]> : Result);
+type TFromProperties<Properties extends TProperties, PropertyKeys extends PropertyKey[], UnionKey extends PropertyKey = TupleToUnion<PropertyKeys>> = (Evaluate<Omit<Properties, UnionKey>>);
+type TFromObject<Type extends TObject, PropertyKeys extends PropertyKey[], Properties extends TProperties = Type['properties']> = Ensure<TObject<(TFromProperties<Properties, PropertyKeys>)>>;
+type TUnionFromPropertyKeys<PropertyKeys extends PropertyKey[], Result extends TLiteral[] = []> = (PropertyKeys extends [infer Key extends PropertyKey, ...infer Rest extends PropertyKey[]] ? Key extends TLiteralValue ? TUnionFromPropertyKeys<Rest, [...Result, TLiteral<Key>]> : TUnionFromPropertyKeys<Rest, [...Result]> : TUnion<Result>);
+export type TOmitResolve<Properties extends TProperties, PropertyKeys extends PropertyKey[]> = (Properties extends TRecursive<infer Types extends TSchema> ? TRecursive<TOmitResolve<Types, PropertyKeys>> : Properties extends TIntersect<infer Types extends TSchema[]> ? TIntersect<TFromIntersect<Types, PropertyKeys>> : Properties extends TUnion<infer Types extends TSchema[]> ? TUnion<TFromUnion<Types, PropertyKeys>> : Properties extends TObject<infer Types extends TProperties> ? TFromObject<TObject<Types>, PropertyKeys> : TObject<{}>);
+type TResolvePropertyKeys<Key extends TSchema | PropertyKey[]> = Key extends TSchema ? TIndexPropertyKeys<Key> : Key;
+type TResolveTypeKey<Key extends TSchema | PropertyKey[]> = Key extends PropertyKey[] ? TUnionFromPropertyKeys<Key> : Key;
+export type TOmit<Type extends TSchema, Key extends TSchema | PropertyKey[], IsTypeRef extends boolean = Type extends TRef ? true : false, IsKeyRef extends boolean = Key extends TRef ? true : false> = (Type extends TMappedResult ? TOmitFromMappedResult<Type, TResolvePropertyKeys<Key>> : Key extends TMappedKey ? TOmitFromMappedKey<Type, Key> : [
+    IsTypeRef,
+    IsKeyRef
+] extends [true, true] ? TComputed<'Omit', [Type, TResolveTypeKey<Key>]> : [
+    IsTypeRef,
+    IsKeyRef
+] extends [false, true] ? TComputed<'Omit', [Type, TResolveTypeKey<Key>]> : [
+    IsTypeRef,
+    IsKeyRef
+] extends [true, false] ? TComputed<'Omit', [Type, TResolveTypeKey<Key>]> : TOmitResolve<Type, TResolvePropertyKeys<Key>>);
+/** `[Json]` Constructs a type whose keys are picked from the given type */
+export declare function Omit<Type extends TSchema, Key extends PropertyKey[]>(type: Type, key: readonly [...Key], options?: SchemaOptions): TOmit<Type, Key>;
+/** `[Json]` Constructs a type whose keys are picked from the given type */
+export declare function Omit<Type extends TSchema, Key extends TSchema>(type: Type, key: Key, options?: SchemaOptions): TOmit<Type, Key>;
 export {};

package/build/cjs/type/omit/omit.js

@@ -4,61 +4,72 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Omit = Omit;
 const type_1 = require("../create/type");
 const discard_1 = require("../discard/discard");
-const index_1 = require("../intersect/index");
-const index_2 = require("../union/index");
-const index_3 = require("../object/index");
-const index_4 = require("../indexed/index");
+const symbols_1 = require("../symbols/symbols");
+const index_1 = require("../computed/index");
+const index_2 = require("../literal/index");
+const index_3 = require("../indexed/index");
+const index_4 = require("../intersect/index");
+const index_5 = require("../union/index");
+const index_6 = require("../object/index");
+// ------------------------------------------------------------------
+// Mapped
+// ------------------------------------------------------------------
 const omit_from_mapped_key_1 = require("./omit-from-mapped-key");
 const omit_from_mapped_result_1 = require("./omit-from-mapped-result");
-const symbols_1 = require("../symbols/symbols");
 // ------------------------------------------------------------------
 // TypeGuard
 // ------------------------------------------------------------------
 const kind_1 = require("../guard/kind");
+const value_1 = require("../guard/value");
 // prettier-ignore
-function FromIntersect(T, K) {
-    return T.map((T) => OmitResolve(T, K));
+function FromIntersect(types, propertyKeys) {
+    return types.map((type) => OmitResolve(type, propertyKeys));
 }
 // prettier-ignore
-function FromUnion(T, K) {
-    return T.map((T) => OmitResolve(T, K));
+function FromUnion(types, propertyKeys) {
+    return types.map((type) => OmitResolve(type, propertyKeys));
 }
 // ------------------------------------------------------------------
 // FromProperty
 // ------------------------------------------------------------------
 // prettier-ignore
-function FromProperty(T, K) {
-    const { [K]: _, ...R } = T;
+function FromProperty(properties, key) {
+    const { [key]: _, ...R } = properties;
     return R;
 }
 // prettier-ignore
-function FromProperties(T, K) {
-    return K.reduce((T, K2) => FromProperty(T, K2), T);
+function FromProperties(properties, propertyKeys) {
+    return propertyKeys.reduce((T, K2) => FromProperty(T, K2), properties);
 }
 // prettier-ignore
-function FromObject(T, K) {
-    const options = (0, discard_1.Discard)(T, [symbols_1.TransformKind, '$id', 'required', 'properties']);
-    const properties = FromProperties(T['properties'], K);
-    return (0, index_3.Object)(properties, options);
+function FromObject(properties, propertyKeys) {
+    const options = (0, discard_1.Discard)(properties, [symbols_1.TransformKind, '$id', 'required', 'properties']);
+    const omittedProperties = FromProperties(properties['properties'], propertyKeys);
+    return (0, index_6.Object)(omittedProperties, options);
+}
+// prettier-ignore
+function UnionFromPropertyKeys(propertyKeys) {
+    const result = propertyKeys.reduce((result, key) => (0, kind_1.IsLiteralValue)(key) ? [...result, (0, index_2.Literal)(key)] : result, []);
+    return (0, index_5.Union)(result);
 }
-// ------------------------------------------------------------------
-// OmitResolve
-// ------------------------------------------------------------------
 // prettier-ignore
-function OmitResolve(T, K) {
-    return ((0, kind_1.IsIntersect)(T) ? (0, index_1.Intersect)(FromIntersect(T.allOf, K)) :
-        (0, kind_1.IsUnion)(T) ? (0, index_2.Union)(FromUnion(T.anyOf, K)) :
-            (0, kind_1.IsObject)(T) ? FromObject(T, K) :
-                (0, index_3.Object)({}));
+function OmitResolve(properties, propertyKeys) {
+    return ((0, kind_1.IsIntersect)(properties) ? (0, index_4.Intersect)(FromIntersect(properties.allOf, propertyKeys)) :
+        (0, kind_1.IsUnion)(properties) ? (0, index_5.Union)(FromUnion(properties.anyOf, propertyKeys)) :
+            (0, kind_1.IsObject)(properties) ? FromObject(properties, propertyKeys) :
+                (0, index_6.Object)({}));
 }
-function Omit(T, K, options) {
-    // mapped
-    if ((0, kind_1.IsMappedKey)(K))
-        return (0, omit_from_mapped_key_1.OmitFromMappedKey)(T, K, options);
-    if ((0, kind_1.IsMappedResult)(T))
-        return (0, omit_from_mapped_result_1.OmitFromMappedResult)(T, K, options);
-    // non-mapped
-    const I = (0, kind_1.IsSchema)(K) ? (0, index_4.IndexPropertyKeys)(K) : K;
-    // special: mapping types require overridable options
-    return (0, type_1.CreateType)({ ...OmitResolve(T, I), ...options });
+/** `[Json]` Constructs a type whose keys are picked from the given type */
+// prettier-ignore
+function Omit(type, key, options) {
+    const typeKey = (0, value_1.IsArray)(key) ? UnionFromPropertyKeys(key) : key;
+    const propertyKeys = (0, kind_1.IsSchema)(key) ? (0, index_3.IndexPropertyKeys)(key) : key;
+    const isTypeRef = (0, kind_1.IsRef)(type);
+    const isKeyRef = (0, kind_1.IsRef)(key);
+    return ((0, kind_1.IsMappedResult)(type) ? (0, omit_from_mapped_result_1.OmitFromMappedResult)(type, propertyKeys, options) :
+        (0, kind_1.IsMappedKey)(key) ? (0, omit_from_mapped_key_1.OmitFromMappedKey)(type, key, options) :
+            (isTypeRef && isKeyRef) ? (0, index_1.Computed)('Omit', [type, typeKey], options) :
+                (!isTypeRef && isKeyRef) ? (0, index_1.Computed)('Omit', [type, typeKey], options) :
+                    (isTypeRef && !isKeyRef) ? (0, index_1.Computed)('Omit', [type, typeKey], options) :
+                        (0, type_1.CreateType)({ ...OmitResolve(type, propertyKeys), ...options }));
 }