drizzle-valibot 0.4.1 → 0.4.2-08e4e66
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/column.d.cts +1 -1
- package/column.d.mts +1 -1
- package/column.d.ts +1 -1
- package/column.types.d.cts +40 -45
- package/column.types.d.mts +40 -45
- package/column.types.d.ts +40 -45
- package/index.cjs +238 -167
- package/index.cjs.map +1 -1
- package/index.mjs +238 -167
- package/index.mjs.map +1 -1
- package/package.json +5 -5
- package/schema.types.d.cts +6 -5
- package/schema.types.d.mts +6 -5
- package/schema.types.d.ts +6 -5
- package/schema.types.internal.d.cts +11 -13
- package/schema.types.internal.d.mts +11 -13
- package/schema.types.internal.d.ts +11 -13
- package/utils.d.cts +8 -4
- package/utils.d.mts +8 -4
- package/utils.d.ts +8 -4
package/schema.types.d.ts
CHANGED
|
@@ -1,20 +1,21 @@
|
|
|
1
|
-
import type { Table, View } from 'drizzle-orm';
|
|
1
|
+
import type { InferInsertModel, InferSelectModel, Table, View } from 'drizzle-orm';
|
|
2
|
+
import type { CockroachEnum } from 'drizzle-orm/cockroach-core';
|
|
2
3
|
import type { PgEnum } from 'drizzle-orm/pg-core';
|
|
3
4
|
import type * as v from 'valibot';
|
|
4
5
|
import type { EnumValuesToEnum } from './column.types.js';
|
|
5
6
|
import type { BuildRefine, BuildSchema, NoUnknownKeys } from './schema.types.internal.js';
|
|
6
7
|
export interface CreateSelectSchema {
|
|
7
8
|
<TTable extends Table>(table: TTable): BuildSchema<'select', TTable['_']['columns'], undefined>;
|
|
8
|
-
<TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable
|
|
9
|
+
<TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferSelectModel<TTable>>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
|
|
9
10
|
<TView extends View>(view: TView): BuildSchema<'select', TView['_']['selectedFields'], undefined>;
|
|
10
11
|
<TView extends View, TRefine extends BuildRefine<TView['_']['selectedFields']>>(view: TView, refine: NoUnknownKeys<TRefine, TView['$inferSelect']>): BuildSchema<'select', TView['_']['selectedFields'], TRefine>;
|
|
11
|
-
<TEnum extends PgEnum<any>>(enum_: TEnum): v.EnumSchema<EnumValuesToEnum<TEnum['enumValues']>, undefined>;
|
|
12
|
+
<TEnum extends PgEnum<any> | CockroachEnum<any>>(enum_: TEnum): v.EnumSchema<EnumValuesToEnum<TEnum['enumValues']>, undefined>;
|
|
12
13
|
}
|
|
13
14
|
export interface CreateInsertSchema {
|
|
14
15
|
<TTable extends Table>(table: TTable): BuildSchema<'insert', TTable['_']['columns'], undefined>;
|
|
15
|
-
<TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable
|
|
16
|
+
<TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferInsertModel<TTable>>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
|
|
16
17
|
}
|
|
17
18
|
export interface CreateUpdateSchema {
|
|
18
19
|
<TTable extends Table>(table: TTable): BuildSchema<'update', TTable['_']['columns'], undefined>;
|
|
19
|
-
<TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable
|
|
20
|
+
<TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
|
|
20
21
|
}
|
|
@@ -1,23 +1,21 @@
|
|
|
1
1
|
import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
|
|
2
2
|
import type * as v from 'valibot';
|
|
3
|
-
import type {
|
|
4
|
-
import type {
|
|
3
|
+
import type { GetValibotTypeFromColumn, HandleColumn } from "./column.types.cjs";
|
|
4
|
+
import type { ColumnIsGeneratedAlwaysAs, GetSelection } from "./utils.cjs";
|
|
5
5
|
export interface Conditions {
|
|
6
6
|
never: (column?: Column) => boolean;
|
|
7
7
|
optional: (column: Column) => boolean;
|
|
8
8
|
nullable: (column: Column) => boolean;
|
|
9
9
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
type
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
readonly [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? TRefinements extends object ? IsRefinementDefined<TRefinements, Assume<K, string>> extends true ? HandleRefinement<TType, TRefinements[Assume<K, keyof TRefinements>], TColumn> : HandleColumn<TType, TColumn> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[Assume<K, keyof TRefinements>] extends infer TNestedRefinements extends object ? TNestedRefinements : undefined : undefined> : v.AnySchema;
|
|
20
|
-
}>>, undefined>;
|
|
10
|
+
type BuildRefineField<T> = T extends v.GenericSchema ? ((schema: T) => v.GenericSchema) | v.GenericSchema : never;
|
|
11
|
+
export type BuildRefine<TColumns extends Record<string, any>> = {
|
|
12
|
+
[K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetValibotTypeFromColumn<TColumns[K]>> : BuildRefine<GetSelection<TColumns[K]>>;
|
|
13
|
+
};
|
|
14
|
+
type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => v.GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : v.NullableSchema<ReturnType<TRefinement>, undefined>) extends infer TSchema ? TType extends 'update' ? v.OptionalSchema<Assume<TSchema, v.GenericSchema>, undefined> : TSchema : v.AnySchema : TRefinement;
|
|
15
|
+
type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends v.GenericSchema | ((schema: any) => any) ? true : false : false;
|
|
16
|
+
export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = v.ObjectSchema<Simplify<{
|
|
17
|
+
readonly [K in keyof TColumns as ColumnIsGeneratedAlwaysAs<TColumns[K]> extends true ? TType extends 'select' ? K : never : K]: TColumns[K] extends infer TColumn extends Column ? IsRefinementDefined<TRefinements, Assume<K, string>> extends true ? Assume<HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn>, v.GenericSchema> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined> : v.AnySchema;
|
|
18
|
+
}>, undefined>;
|
|
21
19
|
export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
|
|
22
20
|
[K in keyof TRefinement]: K extends keyof TCompare ? TRefinement[K] extends Record<string, v.GenericSchema> ? NoUnknownKeys<TRefinement[K], TCompare[K]> : TRefinement[K] : DrizzleTypeError<`Found unknown key in refinement: "${K & string}"`>;
|
|
23
21
|
};
|
|
@@ -1,23 +1,21 @@
|
|
|
1
1
|
import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
|
|
2
2
|
import type * as v from 'valibot';
|
|
3
|
-
import type {
|
|
4
|
-
import type {
|
|
3
|
+
import type { GetValibotTypeFromColumn, HandleColumn } from "./column.types.mjs";
|
|
4
|
+
import type { ColumnIsGeneratedAlwaysAs, GetSelection } from "./utils.mjs";
|
|
5
5
|
export interface Conditions {
|
|
6
6
|
never: (column?: Column) => boolean;
|
|
7
7
|
optional: (column: Column) => boolean;
|
|
8
8
|
nullable: (column: Column) => boolean;
|
|
9
9
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
type
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
readonly [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? TRefinements extends object ? IsRefinementDefined<TRefinements, Assume<K, string>> extends true ? HandleRefinement<TType, TRefinements[Assume<K, keyof TRefinements>], TColumn> : HandleColumn<TType, TColumn> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[Assume<K, keyof TRefinements>] extends infer TNestedRefinements extends object ? TNestedRefinements : undefined : undefined> : v.AnySchema;
|
|
20
|
-
}>>, undefined>;
|
|
10
|
+
type BuildRefineField<T> = T extends v.GenericSchema ? ((schema: T) => v.GenericSchema) | v.GenericSchema : never;
|
|
11
|
+
export type BuildRefine<TColumns extends Record<string, any>> = {
|
|
12
|
+
[K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetValibotTypeFromColumn<TColumns[K]>> : BuildRefine<GetSelection<TColumns[K]>>;
|
|
13
|
+
};
|
|
14
|
+
type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => v.GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : v.NullableSchema<ReturnType<TRefinement>, undefined>) extends infer TSchema ? TType extends 'update' ? v.OptionalSchema<Assume<TSchema, v.GenericSchema>, undefined> : TSchema : v.AnySchema : TRefinement;
|
|
15
|
+
type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends v.GenericSchema | ((schema: any) => any) ? true : false : false;
|
|
16
|
+
export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = v.ObjectSchema<Simplify<{
|
|
17
|
+
readonly [K in keyof TColumns as ColumnIsGeneratedAlwaysAs<TColumns[K]> extends true ? TType extends 'select' ? K : never : K]: TColumns[K] extends infer TColumn extends Column ? IsRefinementDefined<TRefinements, Assume<K, string>> extends true ? Assume<HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn>, v.GenericSchema> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined> : v.AnySchema;
|
|
18
|
+
}>, undefined>;
|
|
21
19
|
export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
|
|
22
20
|
[K in keyof TRefinement]: K extends keyof TCompare ? TRefinement[K] extends Record<string, v.GenericSchema> ? NoUnknownKeys<TRefinement[K], TCompare[K]> : TRefinement[K] : DrizzleTypeError<`Found unknown key in refinement: "${K & string}"`>;
|
|
23
21
|
};
|
|
@@ -1,23 +1,21 @@
|
|
|
1
1
|
import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
|
|
2
2
|
import type * as v from 'valibot';
|
|
3
|
-
import type {
|
|
4
|
-
import type {
|
|
3
|
+
import type { GetValibotTypeFromColumn, HandleColumn } from './column.types.js';
|
|
4
|
+
import type { ColumnIsGeneratedAlwaysAs, GetSelection } from './utils.js';
|
|
5
5
|
export interface Conditions {
|
|
6
6
|
never: (column?: Column) => boolean;
|
|
7
7
|
optional: (column: Column) => boolean;
|
|
8
8
|
nullable: (column: Column) => boolean;
|
|
9
9
|
}
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
type
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
readonly [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? TRefinements extends object ? IsRefinementDefined<TRefinements, Assume<K, string>> extends true ? HandleRefinement<TType, TRefinements[Assume<K, keyof TRefinements>], TColumn> : HandleColumn<TType, TColumn> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[Assume<K, keyof TRefinements>] extends infer TNestedRefinements extends object ? TNestedRefinements : undefined : undefined> : v.AnySchema;
|
|
20
|
-
}>>, undefined>;
|
|
10
|
+
type BuildRefineField<T> = T extends v.GenericSchema ? ((schema: T) => v.GenericSchema) | v.GenericSchema : never;
|
|
11
|
+
export type BuildRefine<TColumns extends Record<string, any>> = {
|
|
12
|
+
[K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetValibotTypeFromColumn<TColumns[K]>> : BuildRefine<GetSelection<TColumns[K]>>;
|
|
13
|
+
};
|
|
14
|
+
type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => v.GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : v.NullableSchema<ReturnType<TRefinement>, undefined>) extends infer TSchema ? TType extends 'update' ? v.OptionalSchema<Assume<TSchema, v.GenericSchema>, undefined> : TSchema : v.AnySchema : TRefinement;
|
|
15
|
+
type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends v.GenericSchema | ((schema: any) => any) ? true : false : false;
|
|
16
|
+
export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = v.ObjectSchema<Simplify<{
|
|
17
|
+
readonly [K in keyof TColumns as ColumnIsGeneratedAlwaysAs<TColumns[K]> extends true ? TType extends 'select' ? K : never : K]: TColumns[K] extends infer TColumn extends Column ? IsRefinementDefined<TRefinements, Assume<K, string>> extends true ? Assume<HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn>, v.GenericSchema> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined> : v.AnySchema;
|
|
18
|
+
}>, undefined>;
|
|
21
19
|
export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
|
|
22
20
|
[K in keyof TRefinement]: K extends keyof TCompare ? TRefinement[K] extends Record<string, v.GenericSchema> ? NoUnknownKeys<TRefinement[K], TCompare[K]> : TRefinement[K] : DrizzleTypeError<`Found unknown key in refinement: "${K & string}"`>;
|
|
23
21
|
};
|
package/utils.d.cts
CHANGED
|
@@ -12,10 +12,14 @@ export type Json = Literal | {
|
|
|
12
12
|
[key: string]: any;
|
|
13
13
|
} | any[];
|
|
14
14
|
export type IsNever<T> = [T] extends [never] ? true : false;
|
|
15
|
-
export type
|
|
16
|
-
export type ColumnIsGeneratedAlwaysAs<TColumn extends Column
|
|
17
|
-
|
|
18
|
-
} ?
|
|
15
|
+
export type IsEnumDefined<TEnum extends string[] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
|
|
16
|
+
export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
|
|
17
|
+
generated: undefined;
|
|
18
|
+
} ? false : TColumn['_'] extends {
|
|
19
|
+
generated: {
|
|
20
|
+
type: 'byDefault';
|
|
21
|
+
};
|
|
22
|
+
} ? false : true : false;
|
|
19
23
|
export type RemoveNever<T> = {
|
|
20
24
|
[K in keyof T as T[K] extends never ? never : K]: T[K];
|
|
21
25
|
};
|
package/utils.d.mts
CHANGED
|
@@ -12,10 +12,14 @@ export type Json = Literal | {
|
|
|
12
12
|
[key: string]: any;
|
|
13
13
|
} | any[];
|
|
14
14
|
export type IsNever<T> = [T] extends [never] ? true : false;
|
|
15
|
-
export type
|
|
16
|
-
export type ColumnIsGeneratedAlwaysAs<TColumn extends Column
|
|
17
|
-
|
|
18
|
-
} ?
|
|
15
|
+
export type IsEnumDefined<TEnum extends string[] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
|
|
16
|
+
export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
|
|
17
|
+
generated: undefined;
|
|
18
|
+
} ? false : TColumn['_'] extends {
|
|
19
|
+
generated: {
|
|
20
|
+
type: 'byDefault';
|
|
21
|
+
};
|
|
22
|
+
} ? false : true : false;
|
|
19
23
|
export type RemoveNever<T> = {
|
|
20
24
|
[K in keyof T as T[K] extends never ? never : K]: T[K];
|
|
21
25
|
};
|
package/utils.d.ts
CHANGED
|
@@ -12,10 +12,14 @@ export type Json = Literal | {
|
|
|
12
12
|
[key: string]: any;
|
|
13
13
|
} | any[];
|
|
14
14
|
export type IsNever<T> = [T] extends [never] ? true : false;
|
|
15
|
-
export type
|
|
16
|
-
export type ColumnIsGeneratedAlwaysAs<TColumn extends Column
|
|
17
|
-
|
|
18
|
-
} ?
|
|
15
|
+
export type IsEnumDefined<TEnum extends string[] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
|
|
16
|
+
export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
|
|
17
|
+
generated: undefined;
|
|
18
|
+
} ? false : TColumn['_'] extends {
|
|
19
|
+
generated: {
|
|
20
|
+
type: 'byDefault';
|
|
21
|
+
};
|
|
22
|
+
} ? false : true : false;
|
|
19
23
|
export type RemoveNever<T> = {
|
|
20
24
|
[K in keyof T as T[K] extends never ? never : K]: T[K];
|
|
21
25
|
};
|