drizzle-zod 0.8.3-e8ab855 → 0.8.3-fd8bfcc

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.
Files changed (23) hide show
  1. package/column.d.cts +4 -4
  2. package/column.d.mts +4 -4
  3. package/column.d.ts +4 -4
  4. package/column.types.d.cts +18 -18
  5. package/column.types.d.mts +18 -18
  6. package/column.types.d.ts +18 -18
  7. package/index.cjs +214 -168
  8. package/index.cjs.map +1 -1
  9. package/index.mjs +215 -168
  10. package/index.mjs.map +1 -1
  11. package/package.json +2 -2
  12. package/schema.d.cts +2 -2
  13. package/schema.d.mts +2 -2
  14. package/schema.d.ts +2 -2
  15. package/schema.types.d.cts +10 -8
  16. package/schema.types.d.mts +10 -8
  17. package/schema.types.d.ts +10 -8
  18. package/schema.types.internal.d.cts +3 -2
  19. package/schema.types.internal.d.mts +3 -2
  20. package/schema.types.internal.d.ts +3 -2
  21. package/utils.d.cts +6 -7
  22. package/utils.d.mts +6 -7
  23. package/utils.d.ts +6 -7
package/schema.types.d.ts CHANGED
@@ -1,25 +1,27 @@
1
- import type { Table, View } from 'drizzle-orm';
1
+ import type { InferInsertModel, InferSelectModel, Table, View } from 'drizzle-orm';
2
2
  import type { PgEnum } from 'drizzle-orm/pg-core';
3
3
  import type { z } from 'zod/v4';
4
4
  import type { BuildRefine, BuildSchema, NoUnknownKeys } from './schema.types.internal.js';
5
- export interface CreateSelectSchema<TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> {
5
+ export interface CreateSelectSchema<TCoerce extends CoerceOptions> {
6
6
  <TTable extends Table>(table: TTable): BuildSchema<'select', TTable['_']['columns'], undefined, TCoerce>;
7
- <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns'], TCoerce>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferSelect']>): BuildSchema<'select', TTable['_']['columns'], TRefine, TCoerce>;
7
+ <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns'], TCoerce>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferSelectModel<TTable>>): BuildSchema<'select', TTable['_']['columns'], TRefine, TCoerce>;
8
8
  <TView extends View>(view: TView): BuildSchema<'select', TView['_']['selectedFields'], undefined, TCoerce>;
9
9
  <TView extends View, TRefine extends BuildRefine<TView['_']['selectedFields'], TCoerce>>(view: TView, refine: NoUnknownKeys<TRefine, TView['$inferSelect']>): BuildSchema<'select', TView['_']['selectedFields'], TRefine, TCoerce>;
10
10
  <TEnum extends PgEnum<any>>(enum_: TEnum): z.ZodEnum<{
11
11
  [K in TEnum['enumValues'][number]]: K;
12
12
  }>;
13
13
  }
14
- export interface CreateInsertSchema<TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> {
14
+ export interface CreateInsertSchema<TCoerce extends CoerceOptions> {
15
15
  <TTable extends Table>(table: TTable): BuildSchema<'insert', TTable['_']['columns'], undefined, TCoerce>;
16
- <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable['$inferInsert']>, TCoerce>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferInsert']>): BuildSchema<'insert', TTable['_']['columns'], TRefine, TCoerce>;
16
+ <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>, TCoerce>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferInsertModel<TTable>>): BuildSchema<'insert', TTable['_']['columns'], TRefine, TCoerce>;
17
17
  }
18
- export interface CreateUpdateSchema<TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> {
18
+ export interface CreateUpdateSchema<TCoerce extends CoerceOptions> {
19
19
  <TTable extends Table>(table: TTable): BuildSchema<'update', TTable['_']['columns'], undefined, TCoerce>;
20
- <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable['$inferInsert']>, TCoerce>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine, TCoerce>;
20
+ <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>, TCoerce>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine, TCoerce>;
21
21
  }
22
- export interface CreateSchemaFactoryOptions<TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> {
22
+ export interface CreateSchemaFactoryOptions<TCoerce extends CoerceOptions> {
23
23
  zodInstance?: any;
24
24
  coerce?: TCoerce;
25
25
  }
26
+ export type CoerceOptions = Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined;
27
+ export type FactoryOptions = CreateSchemaFactoryOptions<CoerceOptions>;
package/schema.types.internal.d.cts CHANGED
@@ -1,6 +1,7 @@
1
1
  import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
2
2
  import type { z } from 'zod/v4';
3
3
  import type { GetZodType, HandleColumn } from "./column.types.cjs";
4
+ import type { CoerceOptions } from "./schema.types.cjs";
4
5
  import type { ColumnIsGeneratedAlwaysAs, GetSelection } from "./utils.cjs";
5
6
  export interface Conditions {
6
7
  never: (column?: Column) => boolean;
@@ -8,12 +9,12 @@ export interface Conditions {
8
9
  nullable: (column: Column) => boolean;
9
10
  }
10
11
  type BuildRefineField<T> = T extends z.ZodType ? ((schema: T) => z.ZodType) | z.ZodType : never;
11
- export type BuildRefine<TColumns extends Record<string, any>, TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> = {
12
+ export type BuildRefine<TColumns extends Record<string, any>, TCoerce extends CoerceOptions> = {
12
13
  [K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetZodType<TColumns[K], TCoerce>> : BuildRefine<GetSelection<TColumns[K]>, TCoerce>;
13
14
  };
14
15
  type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => z.ZodType ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : z.ZodNullable<ReturnType<TRefinement>>) extends infer TSchema extends z.ZodType ? TType extends 'update' ? z.ZodOptional<TSchema> : TSchema : z.ZodType : TRefinement;
15
16
  type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends z.ZodType | ((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, TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> = z.ZodObject<Simplify<{
17
+ export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined, TCoerce extends CoerceOptions> = z.ZodObject<Simplify<{
17
18
  [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, K> extends true ? Assume<HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn>, z.ZodType> : HandleColumn<TType, TColumn, TCoerce> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined, TCoerce> : z.ZodAny;
18
19
  }>, {
19
20
  out: {};
package/schema.types.internal.d.mts CHANGED
@@ -1,6 +1,7 @@
1
1
  import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
2
2
  import type { z } from 'zod/v4';
3
3
  import type { GetZodType, HandleColumn } from "./column.types.mjs";
4
+ import type { CoerceOptions } from "./schema.types.mjs";
4
5
  import type { ColumnIsGeneratedAlwaysAs, GetSelection } from "./utils.mjs";
5
6
  export interface Conditions {
6
7
  never: (column?: Column) => boolean;
@@ -8,12 +9,12 @@ export interface Conditions {
8
9
  nullable: (column: Column) => boolean;
9
10
  }
10
11
  type BuildRefineField<T> = T extends z.ZodType ? ((schema: T) => z.ZodType) | z.ZodType : never;
11
- export type BuildRefine<TColumns extends Record<string, any>, TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> = {
12
+ export type BuildRefine<TColumns extends Record<string, any>, TCoerce extends CoerceOptions> = {
12
13
  [K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetZodType<TColumns[K], TCoerce>> : BuildRefine<GetSelection<TColumns[K]>, TCoerce>;
13
14
  };
14
15
  type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => z.ZodType ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : z.ZodNullable<ReturnType<TRefinement>>) extends infer TSchema extends z.ZodType ? TType extends 'update' ? z.ZodOptional<TSchema> : TSchema : z.ZodType : TRefinement;
15
16
  type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends z.ZodType | ((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, TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> = z.ZodObject<Simplify<{
17
+ export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined, TCoerce extends CoerceOptions> = z.ZodObject<Simplify<{
17
18
  [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, K> extends true ? Assume<HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn>, z.ZodType> : HandleColumn<TType, TColumn, TCoerce> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined, TCoerce> : z.ZodAny;
18
19
  }>, {
19
20
  out: {};
package/schema.types.internal.d.ts CHANGED
@@ -1,6 +1,7 @@
1
1
  import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
2
2
  import type { z } from 'zod/v4';
3
3
  import type { GetZodType, HandleColumn } from './column.types.js';
4
+ import type { CoerceOptions } from './schema.types.js';
4
5
  import type { ColumnIsGeneratedAlwaysAs, GetSelection } from './utils.js';
5
6
  export interface Conditions {
6
7
  never: (column?: Column) => boolean;
@@ -8,12 +9,12 @@ export interface Conditions {
8
9
  nullable: (column: Column) => boolean;
9
10
  }
10
11
  type BuildRefineField<T> = T extends z.ZodType ? ((schema: T) => z.ZodType) | z.ZodType : never;
11
- export type BuildRefine<TColumns extends Record<string, any>, TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> = {
12
+ export type BuildRefine<TColumns extends Record<string, any>, TCoerce extends CoerceOptions> = {
12
13
  [K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetZodType<TColumns[K], TCoerce>> : BuildRefine<GetSelection<TColumns[K]>, TCoerce>;
13
14
  };
14
15
  type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => z.ZodType ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : z.ZodNullable<ReturnType<TRefinement>>) extends infer TSchema extends z.ZodType ? TType extends 'update' ? z.ZodOptional<TSchema> : TSchema : z.ZodType : TRefinement;
15
16
  type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends z.ZodType | ((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, TCoerce extends Partial<Record<'bigint' | 'boolean' | 'date' | 'number' | 'string', true>> | true | undefined> = z.ZodObject<Simplify<{
17
+ export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined, TCoerce extends CoerceOptions> = z.ZodObject<Simplify<{
17
18
  [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, K> extends true ? Assume<HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn>, z.ZodType> : HandleColumn<TType, TColumn, TCoerce> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TObject>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined, TCoerce> : z.ZodAny;
18
19
  }>, {
19
20
  out: {};
package/utils.d.cts CHANGED
@@ -2,8 +2,7 @@ import type { Column, SelectedFieldsFlat, Table, View } from 'drizzle-orm';
2
2
  import type { PgEnum } from 'drizzle-orm/pg-core';
3
3
  import type { z } from 'zod/v4';
4
4
  import type { literalSchema } from "./column.cjs";
5
- export declare function isColumnType<T extends Column>(column: Column, columnTypes: string[]): column is T;
6
- export declare function isWithEnum(column: Column): column is typeof column & {
5
+ export declare function isWithEnum(column: Column<any>): column is typeof column & {
7
6
  enumValues: [string, ...string[]];
8
7
  };
9
8
  export declare const isPgEnum: (entity: any) => entity is PgEnum<[string, ...string[]]>;
@@ -11,10 +10,10 @@ type Literal = z.infer<typeof literalSchema>;
11
10
  export type Json = Literal | {
12
11
  [key: string]: any;
13
12
  } | any[];
14
- export type IsNever<T> = [T] extends [never] ? true : false;
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['_']['generated'] extends {
13
+ export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column<any> ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
14
+ generated: undefined;
15
+ } ? false : TColumn['_']['generated'] extends {
17
16
  type: 'byDefault';
18
- } | undefined ? false : true : false;
19
- export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
17
+ } ? false : true : false;
18
+ export type GetSelection<T extends SelectedFieldsFlat<Column<any>> | Table<any> | View> = T extends Table<any> ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
20
19
  export {};
package/utils.d.mts CHANGED
@@ -2,8 +2,7 @@ import type { Column, SelectedFieldsFlat, Table, View } from 'drizzle-orm';
2
2
  import type { PgEnum } from 'drizzle-orm/pg-core';
3
3
  import type { z } from 'zod/v4';
4
4
  import type { literalSchema } from "./column.mjs";
5
- export declare function isColumnType<T extends Column>(column: Column, columnTypes: string[]): column is T;
6
- export declare function isWithEnum(column: Column): column is typeof column & {
5
+ export declare function isWithEnum(column: Column<any>): column is typeof column & {
7
6
  enumValues: [string, ...string[]];
8
7
  };
9
8
  export declare const isPgEnum: (entity: any) => entity is PgEnum<[string, ...string[]]>;
@@ -11,10 +10,10 @@ type Literal = z.infer<typeof literalSchema>;
11
10
  export type Json = Literal | {
12
11
  [key: string]: any;
13
12
  } | any[];
14
- export type IsNever<T> = [T] extends [never] ? true : false;
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['_']['generated'] extends {
13
+ export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column<any> ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
14
+ generated: undefined;
15
+ } ? false : TColumn['_']['generated'] extends {
17
16
  type: 'byDefault';
18
- } | undefined ? false : true : false;
19
- export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
17
+ } ? false : true : false;
18
+ export type GetSelection<T extends SelectedFieldsFlat<Column<any>> | Table<any> | View> = T extends Table<any> ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
20
19
  export {};
package/utils.d.ts CHANGED
@@ -2,8 +2,7 @@ import type { Column, SelectedFieldsFlat, Table, View } from 'drizzle-orm';
2
2
  import type { PgEnum } from 'drizzle-orm/pg-core';
3
3
  import type { z } from 'zod/v4';
4
4
  import type { literalSchema } from './column.js';
5
- export declare function isColumnType<T extends Column>(column: Column, columnTypes: string[]): column is T;
6
- export declare function isWithEnum(column: Column): column is typeof column & {
5
+ export declare function isWithEnum(column: Column<any>): column is typeof column & {
7
6
  enumValues: [string, ...string[]];
8
7
  };
9
8
  export declare const isPgEnum: (entity: any) => entity is PgEnum<[string, ...string[]]>;
@@ -11,10 +10,10 @@ type Literal = z.infer<typeof literalSchema>;
11
10
  export type Json = Literal | {
12
11
  [key: string]: any;
13
12
  } | any[];
14
- export type IsNever<T> = [T] extends [never] ? true : false;
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['_']['generated'] extends {
13
+ export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column<any> ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
14
+ generated: undefined;
15
+ } ? false : TColumn['_']['generated'] extends {
17
16
  type: 'byDefault';
18
- } | undefined ? false : true : false;
19
- export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
17
+ } ? false : true : false;
18
+ export type GetSelection<T extends SelectedFieldsFlat<Column<any>> | Table<any> | View> = T extends Table<any> ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
20
19
  export {};