schemastery - npm Package Compare versions

Comparing version 3.5.2 to 3.5.3

lib/index.d.ts

@@ -1,32 +0,16 @@
-import { Dict, Intersect } from 'cosmokit';
-interface Schema<S = any, T = S> extends Schema.Base<T> {
-    (data?: S): T;
-    new (data?: S): T;
-    [kSchema]: true;
-    toJSON(): Schema.Base<T>;
-    required(value?: boolean): Schema<S, T>;
-    hidden(value?: boolean): Schema<S, T>;
-    role(text: string): Schema<S, T>;
-    link(link: string): Schema<S, T>;
-    default(value: T): Schema<S, T>;
-    comment(text: string): Schema<S, T>;
-    description(text: string): Schema<S, T>;
-    pattern(source: string, flags?: string): Schema<S, T>;
-    pattern(regexp: RegExp): Schema<S, T>;
-    max(value: number): Schema<S, T>;
-    min(value: number): Schema<S, T>;
-    step(value: number): Schema<S, T>;
-    set(key: string, value: Schema): Schema<S, T>;
-    push(value: Schema): Schema<S, T>;
-}
+import { Dict } from 'cosmokit';
+declare const kSchema: unique symbol;
 declare namespace Schema {
-    export type From<T> = T extends string | number | boolean ? Schema<T> : T extends Schema ? T : T extends typeof String ? Schema<string> : T extends typeof Number ? Schema<number> : T extends typeof Boolean ? Schema<boolean> : T extends typeof Function ? Schema<Function, (...args: any[]) => any> : T extends Constructor<infer S> ? Schema<S> : never;
+    export type From<X> = X extends string | number | boolean ? Schema<X> : X extends Schema ? X : X extends typeof String ? Schema<string> : X extends typeof Number ? Schema<number> : X extends typeof Boolean ? Schema<boolean> : X extends typeof Function ? Schema<Function, (...args: any[]) => any> : X extends Constructor<infer S> ? Schema<S> : never;
     type _TypeS<X> = X extends Schema<infer S, unknown> ? S : never;
-    type _TypeT<X> = ReturnType<Extract<X, Schema>>;
+    type Inverse<X> = X extends Schema<any, infer Y> ? (arg: Y) => void : never;
     export type TypeS<X> = _TypeS<From<X>>;
-    export type TypeT<X> = _TypeT<From<X>>;
-    export type Resolve = (data: any, schema?: Schema, strict?: boolean) => [any, any?];
+    export type TypeT<X> = ReturnType<From<X>>;
+    export type Resolve = (data: any, schema: Schema, strict?: boolean) => [any, any?];
+    export type IntersectS<X> = From<X> extends Schema<infer S, unknown> ? S : never;
+    export type IntersectT<X> = Inverse<From<X>> extends ((arg: infer T) => void) ? T : never;
     export interface Base<T = any> {
-        uid?: number;
-        type?: string;
+        uid: number;
+        meta: Meta<T>;
+        type: string;
         sKey?: Schema;
@@ -39,3 +23,2 @@ inner?: Schema;
         value?: T;
-        meta?: Meta<T>;
         refs?: Dict<Schema>;
@@ -70,7 +53,7 @@ toString(inline?: boolean): string;
     export interface Static {
-        <T = any>(options: Base<T>): Schema<T>;
-        new <T = any>(options: Base<T>): Schema<T>;
+        <T = any>(options: Partial<Base<T>>): Schema<T>;
+        new <T = any>(options: Partial<Base<T>>): Schema<T>;
         prototype: Schema;
         resolve: Resolve;
-        from<T = any>(source?: T): Schema<From<T>>;
+        from<X = any>(source?: X): From<X>;
         extend(type: string, resolve: Resolve): void;
@@ -94,3 +77,3 @@ any(): Schema<any>;
         union<X>(list: readonly X[]): Schema<TypeS<X>, TypeT<X>>;
-        intersect<X>(list: readonly X[]): Schema<Intersect<TypeS<X>>, Intersect<TypeT<X>>>;
+        intersect<X>(list: readonly X[]): Schema<IntersectS<X>, IntersectT<X>>;
         transform<X, T>(inner: X, callback: (value: TypeS<X>) => T): Schema<TypeS<X>, T>;
@@ -100,4 +83,22 @@ }
 }
-declare const kSchema: unique symbol;
 declare const Schema: Schema.Static;
+interface Schema<in S = any, out T = S> extends Schema.Base<T> {
+    (data?: S | null): T;
+    new (data?: S | null): T;
+    [kSchema]: true;
+    toJSON(): Schema.Base<T>;
+    required(value?: boolean): Schema<S, T>;
+    hidden(value?: boolean): Schema<S, T>;
+    role(text: string): Schema<S, T>;
+    link(link: string): Schema<S, T>;
+    default(value: T): Schema<S, T>;
+    comment(text: string): Schema<S, T>;
+    description(text: string): Schema<S, T>;
+    pattern(regexp: RegExp): Schema<S, T>;
+    max(value: number): Schema<S, T>;
+    min(value: number): Schema<S, T>;
+    step(value: number): Schema<S, T>;
+    set(key: string, value: Schema): Schema<S, T>;
+    push(value: Schema): Schema<S, T>;
+}
 export = Schema;

package.json

 {
   "name": "schemastery",
   "description": "Type driven schema validator",
-  "version": "3.5.2",
+  "version": "3.5.3",
   "main": "lib/index.cjs",
@@ -6,0 +6,0 @@ "module": "lib/index.mjs",

No alert changes

Improved metrics

Total package byte prevSize

95905

increased by2.82%

Lines of code

892

increased by2.29%

No dependency changes