drizzle-valibot 0.4.2-e8ab855 → 0.4.2-ec2e97b

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 (20) hide show
  1. package/column.d.cts +1 -1
  2. package/column.d.mts +1 -1
  3. package/column.d.ts +1 -1
  4. package/column.types.d.cts +33 -33
  5. package/column.types.d.mts +33 -33
  6. package/column.types.d.ts +33 -33
  7. package/index.cjs +239 -168
  8. package/index.cjs.map +1 -1
  9. package/index.mjs +239 -168
  10. package/index.mjs.map +1 -1
  11. package/package.json +72 -72
  12. package/schema.types.d.cts +6 -5
  13. package/schema.types.d.mts +6 -5
  14. package/schema.types.d.ts +6 -5
  15. package/schema.types.internal.d.cts +3 -3
  16. package/schema.types.internal.d.mts +3 -3
  17. package/schema.types.internal.d.ts +3 -3
  18. package/utils.d.cts +7 -3
  19. package/utils.d.mts +7 -3
  20. package/utils.d.ts +7 -3
package/package.json CHANGED
@@ -1,74 +1,74 @@
1
1
  {
2
- "name": "drizzle-valibot",
3
- "version": "0.4.2-e8ab855",
4
- "description": "Generate valibot schemas from Drizzle ORM schemas",
5
- "type": "module",
6
- "scripts": {
7
- "build": "tsx scripts/build.ts",
8
- "b": "pnpm build",
9
- "test:types": "cd tests && tsc",
10
- "pack": "(cd dist && npm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
11
- "publish": "npm publish package.tgz",
12
- "test": "vitest run"
13
- },
14
- "exports": {
15
- ".": {
16
- "import": {
17
- "types": "./index.d.mts",
18
- "default": "./index.mjs"
19
- },
20
- "require": {
21
- "types": "./index.d.cjs",
22
- "default": "./index.cjs"
23
- },
24
- "types": "./index.d.ts",
25
- "default": "./index.mjs"
26
- }
27
- },
28
- "main": "./index.cjs",
29
- "module": "./index.mjs",
30
- "types": "./index.d.ts",
31
- "publishConfig": {
32
- "provenance": true
33
- },
34
- "repository": {
35
- "type": "git",
36
- "url": "git+https://github.com/drizzle-team/drizzle-orm.git"
37
- },
38
- "keywords": [
39
- "valibot",
40
- "validate",
41
- "validation",
42
- "schema",
43
- "drizzle",
44
- "orm",
45
- "pg",
46
- "mysql",
47
- "postgresql",
48
- "postgres",
49
- "sqlite",
50
- "database",
51
- "sql",
52
- "typescript",
53
- "ts"
54
- ],
55
- "author": "Drizzle Team",
56
- "license": "Apache-2.0",
57
- "peerDependencies": {
58
- "drizzle-orm": ">=0.36.0",
59
- "valibot": ">=1.0.0-beta.7"
60
- },
61
- "devDependencies": {
62
- "@rollup/plugin-typescript": "^11.1.0",
63
- "@types/node": "^18.15.10",
64
- "cpy": "^10.1.0",
65
- "drizzle-orm": "link:../drizzle-orm/dist",
66
- "json-rules-engine": "^7.3.1",
67
- "rimraf": "^5.0.0",
68
- "rollup": "^3.29.5",
69
- "valibot": "1.0.0-beta.7",
70
- "vite-tsconfig-paths": "^4.3.2",
71
- "vitest": "^3.1.3",
72
- "zx": "^7.2.2"
73
- }
2
+ "name": "drizzle-valibot",
3
+ "version": "0.4.2-ec2e97b",
4
+ "description": "Generate valibot schemas from Drizzle ORM schemas",
5
+ "type": "module",
6
+ "scripts": {
7
+ "build:artifact": "pnpm run build",
8
+ "build": "tsx scripts/build.ts",
9
+ "b": "pnpm build",
10
+ "test:types": "cd tests && tsc",
11
+ "pack": "(cd dist && npm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
12
+ "pack:artifact": "pnpm run pack",
13
+ "publish": "npm publish package.tgz",
14
+ "test": "vitest run"
15
+ },
16
+ "exports": {
17
+ ".": {
18
+ "import": {
19
+ "types": "./index.d.mts",
20
+ "default": "./index.mjs"
21
+ },
22
+ "require": {
23
+ "types": "./index.d.cjs",
24
+ "default": "./index.cjs"
25
+ },
26
+ "types": "./index.d.ts",
27
+ "default": "./index.mjs"
28
+ }
29
+ },
30
+ "main": "./index.cjs",
31
+ "module": "./index.mjs",
32
+ "types": "./index.d.ts",
33
+ "publishConfig": {
34
+ "provenance": true
35
+ },
36
+ "repository": {
37
+ "type": "git",
38
+ "url": "git+https://github.com/drizzle-team/drizzle-orm.git"
39
+ },
40
+ "keywords": [
41
+ "valibot",
42
+ "validate",
43
+ "validation",
44
+ "schema",
45
+ "drizzle",
46
+ "orm",
47
+ "pg",
48
+ "mysql",
49
+ "postgresql",
50
+ "postgres",
51
+ "sqlite",
52
+ "database",
53
+ "sql",
54
+ "typescript",
55
+ "ts"
56
+ ],
57
+ "author": "Drizzle Team",
58
+ "license": "Apache-2.0",
59
+ "peerDependencies": {
60
+ "drizzle-orm": ">=1.0.0-beta.1",
61
+ "valibot": ">=1.0.0-beta.7"
62
+ },
63
+ "devDependencies": {
64
+ "@rollup/plugin-typescript": "^11.1.0",
65
+ "@types/node": "^18.15.10",
66
+ "cpy": "^10.1.0",
67
+ "drizzle-orm": "link:../drizzle-orm/dist",
68
+ "json-rules-engine": "^7.3.1",
69
+ "rimraf": "^5.0.0",
70
+ "rollup": "^3.29.5",
71
+ "valibot": "1.0.0-beta.7",
72
+ "zx": "^7.2.2"
73
+ }
74
74
  }
package/schema.types.d.cts 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.cjs";
5
6
  import type { BuildRefine, BuildSchema, NoUnknownKeys } from "./schema.types.internal.cjs";
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['$inferSelect']>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
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['$inferInsert']>>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferInsert']>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
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['$inferInsert']>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
20
+ <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
20
21
  }
package/schema.types.d.mts 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.mjs";
5
6
  import type { BuildRefine, BuildSchema, NoUnknownKeys } from "./schema.types.internal.mjs";
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['$inferSelect']>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
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['$inferInsert']>>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferInsert']>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
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['$inferInsert']>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
20
+ <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
20
21
  }
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['$inferSelect']>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
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['$inferInsert']>>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferInsert']>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
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['$inferInsert']>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
20
+ <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
20
21
  }
package/schema.types.internal.d.cts CHANGED
@@ -1,6 +1,6 @@
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 { ExtractAdditionalProperties, GetValibotType, HandleColumn, HasBaseColumn } from "./column.types.cjs";
3
+ import type { GetValibotTypeFromColumn, HandleColumn } from "./column.types.cjs";
4
4
  import type { ColumnIsGeneratedAlwaysAs, GetSelection } from "./utils.cjs";
5
5
  export interface Conditions {
6
6
  never: (column?: Column) => boolean;
@@ -9,12 +9,12 @@ export interface Conditions {
9
9
  }
10
10
  type BuildRefineField<T> = T extends v.GenericSchema ? ((schema: T) => v.GenericSchema) | v.GenericSchema : never;
11
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<GetValibotType<TColumns[K]['_']['data'], TColumns[K]['_']['dataType'], TColumns[K]['_']['columnType'], TColumns[K]['_']['enumValues'], HasBaseColumn<TColumns[K]> extends true ? Assume<TColumns[K]['_']['baseColumn'], Column> : undefined, ExtractAdditionalProperties<TColumns[K]>>> : BuildRefine<GetSelection<TColumns[K]>>;
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
13
  };
14
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
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
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 ? 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;
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
18
  }>, undefined>;
19
19
  export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
20
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}"`>;
package/schema.types.internal.d.mts CHANGED
@@ -1,6 +1,6 @@
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 { ExtractAdditionalProperties, GetValibotType, HandleColumn, HasBaseColumn } from "./column.types.mjs";
3
+ import type { GetValibotTypeFromColumn, HandleColumn } from "./column.types.mjs";
4
4
  import type { ColumnIsGeneratedAlwaysAs, GetSelection } from "./utils.mjs";
5
5
  export interface Conditions {
6
6
  never: (column?: Column) => boolean;
@@ -9,12 +9,12 @@ export interface Conditions {
9
9
  }
10
10
  type BuildRefineField<T> = T extends v.GenericSchema ? ((schema: T) => v.GenericSchema) | v.GenericSchema : never;
11
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<GetValibotType<TColumns[K]['_']['data'], TColumns[K]['_']['dataType'], TColumns[K]['_']['columnType'], TColumns[K]['_']['enumValues'], HasBaseColumn<TColumns[K]> extends true ? Assume<TColumns[K]['_']['baseColumn'], Column> : undefined, ExtractAdditionalProperties<TColumns[K]>>> : BuildRefine<GetSelection<TColumns[K]>>;
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
13
  };
14
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
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
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 ? 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;
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
18
  }>, undefined>;
19
19
  export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
20
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}"`>;
package/schema.types.internal.d.ts CHANGED
@@ -1,6 +1,6 @@
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 { ExtractAdditionalProperties, GetValibotType, HandleColumn, HasBaseColumn } from './column.types.js';
3
+ import type { GetValibotTypeFromColumn, HandleColumn } from './column.types.js';
4
4
  import type { ColumnIsGeneratedAlwaysAs, GetSelection } from './utils.js';
5
5
  export interface Conditions {
6
6
  never: (column?: Column) => boolean;
@@ -9,12 +9,12 @@ export interface Conditions {
9
9
  }
10
10
  type BuildRefineField<T> = T extends v.GenericSchema ? ((schema: T) => v.GenericSchema) | v.GenericSchema : never;
11
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<GetValibotType<TColumns[K]['_']['data'], TColumns[K]['_']['dataType'], TColumns[K]['_']['columnType'], TColumns[K]['_']['enumValues'], HasBaseColumn<TColumns[K]> extends true ? Assume<TColumns[K]['_']['baseColumn'], Column> : undefined, ExtractAdditionalProperties<TColumns[K]>>> : BuildRefine<GetSelection<TColumns[K]>>;
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
13
  };
14
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
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
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 ? 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;
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
18
  }>, undefined>;
19
19
  export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
20
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}"`>;
package/utils.d.cts CHANGED
@@ -13,9 +13,13 @@ export type Json = Literal | {
13
13
  } | any[];
14
14
  export type IsNever<T> = [T] extends [never] ? true : false;
15
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 {
17
- type: 'byDefault';
18
- } | undefined ? false : true : false;
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
@@ -13,9 +13,13 @@ export type Json = Literal | {
13
13
  } | any[];
14
14
  export type IsNever<T> = [T] extends [never] ? true : false;
15
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 {
17
- type: 'byDefault';
18
- } | undefined ? false : true : false;
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
@@ -13,9 +13,13 @@ export type Json = Literal | {
13
13
  } | any[];
14
14
  export type IsNever<T> = [T] extends [never] ? true : false;
15
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 {
17
- type: 'byDefault';
18
- } | undefined ? false : true : false;
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
  };