drizzle-valibot 0.4.1 → 0.4.2-2acab7f

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 +39 -45
  5. package/column.types.d.mts +39 -45
  6. package/column.types.d.ts +39 -45
  7. package/index.cjs +216 -165
  8. package/index.cjs.map +1 -1
  9. package/index.mjs +216 -165
  10. package/index.mjs.map +1 -1
  11. package/package.json +5 -5
  12. package/schema.types.d.cts +4 -4
  13. package/schema.types.d.mts +4 -4
  14. package/schema.types.d.ts +4 -4
  15. package/schema.types.internal.d.cts +11 -13
  16. package/schema.types.internal.d.mts +11 -13
  17. package/schema.types.internal.d.ts +11 -13
  18. package/utils.d.cts +8 -4
  19. package/utils.d.mts +8 -4
  20. package/utils.d.ts +8 -4
package/schema.types.internal.d.cts CHANGED
@@ -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 { ExtractAdditionalProperties, GetBaseColumn, GetEnumValuesFromColumn, GetValibotType, HandleColumn } from "./column.types.cjs";
4
- import type { GetSelection, RemoveNever } from "./utils.cjs";
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
- export type BuildRefineColumns<TColumns extends Record<string, any>> = Simplify<RemoveNever<{
11
- [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? GetValibotType<TColumn['_']['data'], TColumn['_']['dataType'], TColumn['_']['columnType'], GetEnumValuesFromColumn<TColumn>, GetBaseColumn<TColumn>, ExtractAdditionalProperties<TColumn>> extends infer TSchema extends v.GenericSchema ? TSchema : v.AnySchema : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildRefineColumns<GetSelection<TObject>> : TColumns[K];
12
- }>>;
13
- export type BuildRefine<TColumns extends Record<string, any>> = BuildRefineColumns<TColumns> extends infer TBuildColumns ? {
14
- [K in keyof TBuildColumns]?: TBuildColumns[K] extends v.GenericSchema ? ((schema: TBuildColumns[K]) => v.GenericSchema) | v.GenericSchema : TBuildColumns[K] extends Record<string, any> ? Simplify<BuildRefine<TBuildColumns[K]>> : never;
15
- } : never;
16
- type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement extends v.GenericSchema | ((schema: v.GenericSchema) => v.GenericSchema), 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;
17
- type IsRefinementDefined<TRefinements, TKey extends string> = TKey extends keyof TRefinements ? TRefinements[TKey] extends v.GenericSchema | ((schema: any) => any) ? true : false : false;
18
- export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = v.ObjectSchema<Simplify<RemoveNever<{
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 ? 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/schema.types.internal.d.mts CHANGED
@@ -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 { ExtractAdditionalProperties, GetBaseColumn, GetEnumValuesFromColumn, GetValibotType, HandleColumn } from "./column.types.mjs";
4
- import type { GetSelection, RemoveNever } from "./utils.mjs";
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
- export type BuildRefineColumns<TColumns extends Record<string, any>> = Simplify<RemoveNever<{
11
- [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? GetValibotType<TColumn['_']['data'], TColumn['_']['dataType'], TColumn['_']['columnType'], GetEnumValuesFromColumn<TColumn>, GetBaseColumn<TColumn>, ExtractAdditionalProperties<TColumn>> extends infer TSchema extends v.GenericSchema ? TSchema : v.AnySchema : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildRefineColumns<GetSelection<TObject>> : TColumns[K];
12
- }>>;
13
- export type BuildRefine<TColumns extends Record<string, any>> = BuildRefineColumns<TColumns> extends infer TBuildColumns ? {
14
- [K in keyof TBuildColumns]?: TBuildColumns[K] extends v.GenericSchema ? ((schema: TBuildColumns[K]) => v.GenericSchema) | v.GenericSchema : TBuildColumns[K] extends Record<string, any> ? Simplify<BuildRefine<TBuildColumns[K]>> : never;
15
- } : never;
16
- type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement extends v.GenericSchema | ((schema: v.GenericSchema) => v.GenericSchema), 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;
17
- type IsRefinementDefined<TRefinements, TKey extends string> = TKey extends keyof TRefinements ? TRefinements[TKey] extends v.GenericSchema | ((schema: any) => any) ? true : false : false;
18
- export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = v.ObjectSchema<Simplify<RemoveNever<{
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 ? 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/schema.types.internal.d.ts CHANGED
@@ -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 { ExtractAdditionalProperties, GetBaseColumn, GetEnumValuesFromColumn, GetValibotType, HandleColumn } from './column.types.js';
4
- import type { GetSelection, RemoveNever } from './utils.js';
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
- export type BuildRefineColumns<TColumns extends Record<string, any>> = Simplify<RemoveNever<{
11
- [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? GetValibotType<TColumn['_']['data'], TColumn['_']['dataType'], TColumn['_']['columnType'], GetEnumValuesFromColumn<TColumn>, GetBaseColumn<TColumn>, ExtractAdditionalProperties<TColumn>> extends infer TSchema extends v.GenericSchema ? TSchema : v.AnySchema : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildRefineColumns<GetSelection<TObject>> : TColumns[K];
12
- }>>;
13
- export type BuildRefine<TColumns extends Record<string, any>> = BuildRefineColumns<TColumns> extends infer TBuildColumns ? {
14
- [K in keyof TBuildColumns]?: TBuildColumns[K] extends v.GenericSchema ? ((schema: TBuildColumns[K]) => v.GenericSchema) | v.GenericSchema : TBuildColumns[K] extends Record<string, any> ? Simplify<BuildRefine<TBuildColumns[K]>> : never;
15
- } : never;
16
- type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement extends v.GenericSchema | ((schema: v.GenericSchema) => v.GenericSchema), 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;
17
- type IsRefinementDefined<TRefinements, TKey extends string> = TKey extends keyof TRefinements ? TRefinements[TKey] extends v.GenericSchema | ((schema: any) => any) ? true : false : false;
18
- export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = v.ObjectSchema<Simplify<RemoveNever<{
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 ? 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 ArrayHasAtLeastOneValue<TEnum extends [any, ...any[]] | undefined> = TEnum extends [infer TString, ...any[]] ? TString extends `${infer TLiteral}` ? TLiteral extends any ? true : false : false : false;
16
- export type ColumnIsGeneratedAlwaysAs<TColumn extends Column> = TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends undefined ? false : TColumn['_']['generated'] extends infer TGenerated extends {
17
- type: string;
18
- } ? TGenerated['type'] extends 'byDefault' ? false : true : true;
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 ArrayHasAtLeastOneValue<TEnum extends [any, ...any[]] | undefined> = TEnum extends [infer TString, ...any[]] ? TString extends `${infer TLiteral}` ? TLiteral extends any ? true : false : false : false;
16
- export type ColumnIsGeneratedAlwaysAs<TColumn extends Column> = TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends undefined ? false : TColumn['_']['generated'] extends infer TGenerated extends {
17
- type: string;
18
- } ? TGenerated['type'] extends 'byDefault' ? false : true : true;
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 ArrayHasAtLeastOneValue<TEnum extends [any, ...any[]] | undefined> = TEnum extends [infer TString, ...any[]] ? TString extends `${infer TLiteral}` ? TLiteral extends any ? true : false : false : false;
16
- export type ColumnIsGeneratedAlwaysAs<TColumn extends Column> = TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends undefined ? false : TColumn['_']['generated'] extends infer TGenerated extends {
17
- type: string;
18
- } ? TGenerated['type'] extends 'byDefault' ? false : true : true;
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
  };