drizzle-typebox 0.3.3-8bf5193 → 0.3.3-9fb1d0d

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.
@@ -1,22 +1,22 @@
1
1
  import type * as t from '@sinclair/typebox';
2
- import type { Table, View } from 'drizzle-orm';
2
+ import type { InferInsertModel, InferSelectModel, Table, View } from 'drizzle-orm';
3
3
  import type { PgEnum } from 'drizzle-orm/pg-core';
4
4
  import type { EnumValuesToEnum } from "./column.types.mjs";
5
5
  import type { BuildRefine, BuildSchema, NoUnknownKeys } from "./schema.types.internal.mjs";
6
6
  export interface CreateSelectSchema {
7
7
  <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>;
8
+ <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferSelectModel<TTable>>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
9
9
  <TView extends View>(view: TView): BuildSchema<'select', TView['_']['selectedFields'], undefined>;
10
10
  <TView extends View, TRefine extends BuildRefine<TView['_']['selectedFields']>>(view: TView, refine: NoUnknownKeys<TRefine, TView['$inferSelect']>): BuildSchema<'select', TView['_']['selectedFields'], TRefine>;
11
11
  <TEnum extends PgEnum<any>>(enum_: TEnum): t.TEnum<EnumValuesToEnum<TEnum['enumValues']>>;
12
12
  }
13
13
  export interface CreateInsertSchema {
14
14
  <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>;
15
+ <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
16
  }
17
17
  export interface CreateUpdateSchema {
18
18
  <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>;
19
+ <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
20
20
  }
21
21
  export interface CreateSchemaFactoryOptions {
22
22
  typeboxInstance?: any;
package/schema.types.d.ts CHANGED
@@ -1,22 +1,22 @@
1
1
  import type * as t from '@sinclair/typebox';
2
- import type { Table, View } from 'drizzle-orm';
2
+ import type { InferInsertModel, InferSelectModel, Table, View } from 'drizzle-orm';
3
3
  import type { PgEnum } from 'drizzle-orm/pg-core';
4
4
  import type { EnumValuesToEnum } from './column.types.js';
5
5
  import type { BuildRefine, BuildSchema, NoUnknownKeys } from './schema.types.internal.js';
6
6
  export interface CreateSelectSchema {
7
7
  <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>;
8
+ <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferSelectModel<TTable>>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
9
9
  <TView extends View>(view: TView): BuildSchema<'select', TView['_']['selectedFields'], undefined>;
10
10
  <TView extends View, TRefine extends BuildRefine<TView['_']['selectedFields']>>(view: TView, refine: NoUnknownKeys<TRefine, TView['$inferSelect']>): BuildSchema<'select', TView['_']['selectedFields'], TRefine>;
11
11
  <TEnum extends PgEnum<any>>(enum_: TEnum): t.TEnum<EnumValuesToEnum<TEnum['enumValues']>>;
12
12
  }
13
13
  export interface CreateInsertSchema {
14
14
  <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>;
15
+ <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
16
  }
17
17
  export interface CreateUpdateSchema {
18
18
  <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>;
19
+ <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
20
20
  }
21
21
  export interface CreateSchemaFactoryOptions {
22
22
  typeboxInstance?: any;
package/utils.d.cts CHANGED
@@ -23,8 +23,12 @@ export interface BufferSchema extends TSchema {
23
23
  }
24
24
  export type IsNever<T> = [T] extends [never] ? true : false;
25
25
  export type IsEnumDefined<TEnum extends string[] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
26
- export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends {
27
- type: 'byDefault';
28
- } | undefined ? false : true : false;
26
+ export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
27
+ generated: undefined;
28
+ } ? false : TColumn['_'] extends {
29
+ generated: {
30
+ type: 'byDefault';
31
+ };
32
+ } ? false : true : false;
29
33
  export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
30
34
  export {};
package/utils.d.mts CHANGED
@@ -23,8 +23,12 @@ export interface BufferSchema extends TSchema {
23
23
  }
24
24
  export type IsNever<T> = [T] extends [never] ? true : false;
25
25
  export type IsEnumDefined<TEnum extends string[] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
26
- export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends {
27
- type: 'byDefault';
28
- } | undefined ? false : true : false;
26
+ export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
27
+ generated: undefined;
28
+ } ? false : TColumn['_'] extends {
29
+ generated: {
30
+ type: 'byDefault';
31
+ };
32
+ } ? false : true : false;
29
33
  export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
30
34
  export {};
package/utils.d.ts CHANGED
@@ -23,8 +23,12 @@ export interface BufferSchema extends TSchema {
23
23
  }
24
24
  export type IsNever<T> = [T] extends [never] ? true : false;
25
25
  export type IsEnumDefined<TEnum extends string[] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
26
- export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends {
27
- type: 'byDefault';
28
- } | undefined ? false : true : false;
26
+ export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
27
+ generated: undefined;
28
+ } ? false : TColumn['_'] extends {
29
+ generated: {
30
+ type: 'byDefault';
31
+ };
32
+ } ? false : true : false;
29
33
  export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
30
34
  export {};