drizzle-arktype 0.1.2 → 0.1.3-08e4e66

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "drizzle-arktype",
-	"version": "0.1.2",
+	"version": "0.1.3-08e4e66",
 	"description": "Generate arktype schemas from Drizzle ORM schemas",
 	"type": "module",
 	"scripts": {
@@ -9,7 +9,8 @@
 		"test:types": "cd tests && tsc",
 		"pack": "(cd dist && npm pack --pack-destination ..) && rm -f package.tgz && mv *.tgz package.tgz",
 		"publish": "npm publish package.tgz",
-		"test": "vitest run"
+		"test": "vitest run",
+		"bench:types": "tsx ./benchmarks/types.ts"
 	},
 	"exports": {
 		".": {
@@ -56,19 +57,21 @@
 	"license": "Apache-2.0",
 	"peerDependencies": {
 		"arktype": ">=2.0.0",
-		"drizzle-orm": ">=0.36.0"
+		"drizzle-orm": ">=1.0.0-beta.1"
 	},
 	"devDependencies": {
+		"@ark/attest": "^0.45.8",
 		"@rollup/plugin-typescript": "^11.1.0",
 		"@types/node": "^18.15.10",
 		"arktype": "^2.1.10",
 		"cpy": "^10.1.0",
 		"drizzle-orm": "link:../drizzle-orm/dist",
-		"json-rules-engine": "7.3.0",
+		"json-rules-engine": "7.3.1",
 		"rimraf": "^5.0.0",
-		"rollup": "^3.20.7",
+		"rollup": "^3.29.5",
+		"tsx": "^4.19.3",
 		"vite-tsconfig-paths": "^4.3.2",
-		"vitest": "^1.6.0",
+		"vitest": "^3.1.3",
 		"zx": "^7.2.2"
 	}
 }

package/schema.types.d.cts

@@ -1,19 +1,20 @@
 import type { Type } from 'arktype';
-import type { Table, View } from 'drizzle-orm';
+import type { InferInsertModel, InferSelectModel, Table, View } from 'drizzle-orm';
+import type { CockroachEnum } from 'drizzle-orm/cockroach-core';
 import type { PgEnum } from 'drizzle-orm/pg-core';
 import type { BuildRefine, BuildSchema, NoUnknownKeys } from "./schema.types.internal.cjs";
 export interface CreateSelectSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'select', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferSelect']>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferSelectModel<TTable>>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
     <TView extends View>(view: TView): BuildSchema<'select', TView['_']['selectedFields'], undefined>;
     <TView extends View, TRefine extends BuildRefine<TView['_']['selectedFields']>>(view: TView, refine: NoUnknownKeys<TRefine, TView['$inferSelect']>): BuildSchema<'select', TView['_']['selectedFields'], TRefine>;
-    <TEnum extends PgEnum<any>>(enum_: TEnum): Type<TEnum['enumValues'][number], {}>;
+    <TEnum extends PgEnum<any> | CockroachEnum<any>>(enum_: TEnum): Type<TEnum['enumValues'][number]>;
 }
 export interface CreateInsertSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'insert', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable['$inferInsert']>>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferInsert']>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferInsertModel<TTable>>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
 }
 export interface CreateUpdateSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'update', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable['$inferInsert']>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
 }

package/schema.types.d.mts

@@ -1,19 +1,20 @@
 import type { Type } from 'arktype';
-import type { Table, View } from 'drizzle-orm';
+import type { InferInsertModel, InferSelectModel, Table, View } from 'drizzle-orm';
+import type { CockroachEnum } from 'drizzle-orm/cockroach-core';
 import type { PgEnum } from 'drizzle-orm/pg-core';
 import type { BuildRefine, BuildSchema, NoUnknownKeys } from "./schema.types.internal.mjs";
 export interface CreateSelectSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'select', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferSelect']>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferSelectModel<TTable>>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
     <TView extends View>(view: TView): BuildSchema<'select', TView['_']['selectedFields'], undefined>;
     <TView extends View, TRefine extends BuildRefine<TView['_']['selectedFields']>>(view: TView, refine: NoUnknownKeys<TRefine, TView['$inferSelect']>): BuildSchema<'select', TView['_']['selectedFields'], TRefine>;
-    <TEnum extends PgEnum<any>>(enum_: TEnum): Type<TEnum['enumValues'][number], {}>;
+    <TEnum extends PgEnum<any> | CockroachEnum<any>>(enum_: TEnum): Type<TEnum['enumValues'][number]>;
 }
 export interface CreateInsertSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'insert', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable['$inferInsert']>>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferInsert']>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferInsertModel<TTable>>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
 }
 export interface CreateUpdateSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'update', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable['$inferInsert']>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
 }

package/schema.types.d.ts

@@ -1,19 +1,20 @@
 import type { Type } from 'arktype';
-import type { Table, View } from 'drizzle-orm';
+import type { InferInsertModel, InferSelectModel, Table, View } from 'drizzle-orm';
+import type { CockroachEnum } from 'drizzle-orm/cockroach-core';
 import type { PgEnum } from 'drizzle-orm/pg-core';
 import type { BuildRefine, BuildSchema, NoUnknownKeys } from './schema.types.internal.js';
 export interface CreateSelectSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'select', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferSelect']>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<TTable['_']['columns']>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferSelectModel<TTable>>): BuildSchema<'select', TTable['_']['columns'], TRefine>;
     <TView extends View>(view: TView): BuildSchema<'select', TView['_']['selectedFields'], undefined>;
     <TView extends View, TRefine extends BuildRefine<TView['_']['selectedFields']>>(view: TView, refine: NoUnknownKeys<TRefine, TView['$inferSelect']>): BuildSchema<'select', TView['_']['selectedFields'], TRefine>;
-    <TEnum extends PgEnum<any>>(enum_: TEnum): Type<TEnum['enumValues'][number], {}>;
+    <TEnum extends PgEnum<any> | CockroachEnum<any>>(enum_: TEnum): Type<TEnum['enumValues'][number]>;
 }
 export interface CreateInsertSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'insert', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable['$inferInsert']>>>(table: TTable, refine?: NoUnknownKeys<TRefine, TTable['$inferInsert']>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: NoUnknownKeys<TRefine, InferInsertModel<TTable>>): BuildSchema<'insert', TTable['_']['columns'], TRefine>;
 }
 export interface CreateUpdateSchema {
     <TTable extends Table>(table: TTable): BuildSchema<'update', TTable['_']['columns'], undefined>;
-    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof TTable['$inferInsert']>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
+    <TTable extends Table, TRefine extends BuildRefine<Pick<TTable['_']['columns'], keyof InferInsertModel<TTable>>>>(table: TTable, refine?: TRefine): BuildSchema<'update', TTable['_']['columns'], TRefine>;
 }

package/schema.types.internal.d.cts

@@ -1,24 +1,22 @@
 import type { Type, type } from 'arktype';
-import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
-import type { ArktypeNullable, ArktypeOptional, GetArktypeType, GetEnumValuesFromColumn, HandleColumn } from "./column.types.cjs";
-import type { GetSelection, RemoveNever } from "./utils.cjs";
+import type { Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
+import type { ArktypeNullable, ArktypeOptional, GetArktypeType, HandleColumn } from "./column.types.cjs";
+import type { ColumnIsGeneratedAlwaysAs, GetSelection } from "./utils.cjs";
 export interface Conditions {
     never: (column?: Column) => boolean;
     optional: (column: Column) => boolean;
     nullable: (column: Column) => boolean;
 }
 type GenericSchema = type.cast<unknown> | [type.cast<unknown>, '?'];
-export type BuildRefineColumns<TColumns extends Record<string, any>> = Simplify<RemoveNever<{
-    [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? GetArktypeType<TColumn['_']['data'], TColumn['_']['columnType'], GetEnumValuesFromColumn<TColumn>> extends infer TSchema extends GenericSchema ? TSchema : Type<any, {}> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildRefineColumns<GetSelection<TObject>> : TColumns[K];
+type BuildRefineField<T> = T extends GenericSchema ? ((schema: T) => GenericSchema) | GenericSchema : never;
+export type BuildRefine<TColumns extends Record<string, any>> = {
+    [K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetArktypeType<TColumns[K]>> : BuildRefine<GetSelection<TColumns[K]>>;
+};
+type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : ArktypeNullable<ReturnType<TRefinement>>) extends infer TSchema ? TType extends 'update' ? ArktypeOptional<TSchema> : TSchema : Type<any> : TRefinement;
+type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends GenericSchema | ((schema: any) => any) ? true : false : false;
+export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = type.instantiate<Simplify<{
+    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, K> extends true ? HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TNested extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TNested>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined> : any;
 }>>;
-export type BuildRefine<TColumns extends Record<string, any>> = BuildRefineColumns<TColumns> extends infer TBuildColumns ? {
-    [K in keyof TBuildColumns]?: TBuildColumns[K] extends GenericSchema ? ((schema: TBuildColumns[K]) => GenericSchema) | GenericSchema : TBuildColumns[K] extends Record<string, any> ? Simplify<BuildRefine<TBuildColumns[K]>> : never;
-} : never;
-type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement extends GenericSchema | ((schema: GenericSchema) => GenericSchema), TColumn extends Column> = TRefinement extends (schema: any) => GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : ArktypeNullable<ReturnType<TRefinement>>) extends infer TSchema ? TType extends 'update' ? ArktypeOptional<TSchema> : TSchema : Type<any, {}> : TRefinement;
-type IsRefinementDefined<TRefinements, TKey extends string> = TKey extends keyof TRefinements ? TRefinements[TKey] extends GenericSchema | ((schema: any) => any) ? true : false : false;
-export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = type.instantiate<Simplify<RemoveNever<{
-    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> : any;
-}>>>;
 export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
     [K in keyof TRefinement]: K extends keyof TCompare ? TRefinement[K] extends Record<string, GenericSchema> ? NoUnknownKeys<TRefinement[K], TCompare[K]> : TRefinement[K] : DrizzleTypeError<`Found unknown key in refinement: "${K & string}"`>;
 };

package/schema.types.internal.d.mts

@@ -1,24 +1,22 @@
 import type { Type, type } from 'arktype';
-import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
-import type { ArktypeNullable, ArktypeOptional, GetArktypeType, GetEnumValuesFromColumn, HandleColumn } from "./column.types.mjs";
-import type { GetSelection, RemoveNever } from "./utils.mjs";
+import type { Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
+import type { ArktypeNullable, ArktypeOptional, GetArktypeType, HandleColumn } from "./column.types.mjs";
+import type { ColumnIsGeneratedAlwaysAs, GetSelection } from "./utils.mjs";
 export interface Conditions {
     never: (column?: Column) => boolean;
     optional: (column: Column) => boolean;
     nullable: (column: Column) => boolean;
 }
 type GenericSchema = type.cast<unknown> | [type.cast<unknown>, '?'];
-export type BuildRefineColumns<TColumns extends Record<string, any>> = Simplify<RemoveNever<{
-    [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? GetArktypeType<TColumn['_']['data'], TColumn['_']['columnType'], GetEnumValuesFromColumn<TColumn>> extends infer TSchema extends GenericSchema ? TSchema : Type<any, {}> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildRefineColumns<GetSelection<TObject>> : TColumns[K];
+type BuildRefineField<T> = T extends GenericSchema ? ((schema: T) => GenericSchema) | GenericSchema : never;
+export type BuildRefine<TColumns extends Record<string, any>> = {
+    [K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetArktypeType<TColumns[K]>> : BuildRefine<GetSelection<TColumns[K]>>;
+};
+type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : ArktypeNullable<ReturnType<TRefinement>>) extends infer TSchema ? TType extends 'update' ? ArktypeOptional<TSchema> : TSchema : Type<any> : TRefinement;
+type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends GenericSchema | ((schema: any) => any) ? true : false : false;
+export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = type.instantiate<Simplify<{
+    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, K> extends true ? HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TNested extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TNested>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined> : any;
 }>>;
-export type BuildRefine<TColumns extends Record<string, any>> = BuildRefineColumns<TColumns> extends infer TBuildColumns ? {
-    [K in keyof TBuildColumns]?: TBuildColumns[K] extends GenericSchema ? ((schema: TBuildColumns[K]) => GenericSchema) | GenericSchema : TBuildColumns[K] extends Record<string, any> ? Simplify<BuildRefine<TBuildColumns[K]>> : never;
-} : never;
-type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement extends GenericSchema | ((schema: GenericSchema) => GenericSchema), TColumn extends Column> = TRefinement extends (schema: any) => GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : ArktypeNullable<ReturnType<TRefinement>>) extends infer TSchema ? TType extends 'update' ? ArktypeOptional<TSchema> : TSchema : Type<any, {}> : TRefinement;
-type IsRefinementDefined<TRefinements, TKey extends string> = TKey extends keyof TRefinements ? TRefinements[TKey] extends GenericSchema | ((schema: any) => any) ? true : false : false;
-export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = type.instantiate<Simplify<RemoveNever<{
-    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> : any;
-}>>>;
 export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
     [K in keyof TRefinement]: K extends keyof TCompare ? TRefinement[K] extends Record<string, GenericSchema> ? NoUnknownKeys<TRefinement[K], TCompare[K]> : TRefinement[K] : DrizzleTypeError<`Found unknown key in refinement: "${K & string}"`>;
 };

package/schema.types.internal.d.ts

@@ -1,24 +1,22 @@
 import type { Type, type } from 'arktype';
-import type { Assume, Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
-import type { ArktypeNullable, ArktypeOptional, GetArktypeType, GetEnumValuesFromColumn, HandleColumn } from './column.types.js';
-import type { GetSelection, RemoveNever } from './utils.js';
+import type { Column, DrizzleTypeError, SelectedFieldsFlat, Simplify, Table, View } from 'drizzle-orm';
+import type { ArktypeNullable, ArktypeOptional, GetArktypeType, HandleColumn } from './column.types.js';
+import type { ColumnIsGeneratedAlwaysAs, GetSelection } from './utils.js';
 export interface Conditions {
     never: (column?: Column) => boolean;
     optional: (column: Column) => boolean;
     nullable: (column: Column) => boolean;
 }
 type GenericSchema = type.cast<unknown> | [type.cast<unknown>, '?'];
-export type BuildRefineColumns<TColumns extends Record<string, any>> = Simplify<RemoveNever<{
-    [K in keyof TColumns]: TColumns[K] extends infer TColumn extends Column ? GetArktypeType<TColumn['_']['data'], TColumn['_']['columnType'], GetEnumValuesFromColumn<TColumn>> extends infer TSchema extends GenericSchema ? TSchema : Type<any, {}> : TColumns[K] extends infer TObject extends SelectedFieldsFlat<Column> | Table | View ? BuildRefineColumns<GetSelection<TObject>> : TColumns[K];
+type BuildRefineField<T> = T extends GenericSchema ? ((schema: T) => GenericSchema) | GenericSchema : never;
+export type BuildRefine<TColumns extends Record<string, any>> = {
+    [K in keyof TColumns as TColumns[K] extends Column | SelectedFieldsFlat<Column> | Table | View ? K : never]?: TColumns[K] extends Column ? BuildRefineField<GetArktypeType<TColumns[K]>> : BuildRefine<GetSelection<TColumns[K]>>;
+};
+type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement, TColumn extends Column> = TRefinement extends (schema: any) => GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : ArktypeNullable<ReturnType<TRefinement>>) extends infer TSchema ? TType extends 'update' ? ArktypeOptional<TSchema> : TSchema : Type<any> : TRefinement;
+type IsRefinementDefined<TRefinements extends Record<string | symbol | number, any> | undefined, TKey extends string | symbol | number> = TRefinements extends object ? TRefinements[TKey] extends GenericSchema | ((schema: any) => any) ? true : false : false;
+export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = type.instantiate<Simplify<{
+    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, K> extends true ? HandleRefinement<TType, TRefinements[K & keyof TRefinements], TColumn> : HandleColumn<TType, TColumn> : TColumns[K] extends infer TNested extends SelectedFieldsFlat<Column> | Table | View ? BuildSchema<TType, GetSelection<TNested>, TRefinements extends object ? TRefinements[K & keyof TRefinements] : undefined> : any;
 }>>;
-export type BuildRefine<TColumns extends Record<string, any>> = BuildRefineColumns<TColumns> extends infer TBuildColumns ? {
-    [K in keyof TBuildColumns]?: TBuildColumns[K] extends GenericSchema ? ((schema: TBuildColumns[K]) => GenericSchema) | GenericSchema : TBuildColumns[K] extends Record<string, any> ? Simplify<BuildRefine<TBuildColumns[K]>> : never;
-} : never;
-type HandleRefinement<TType extends 'select' | 'insert' | 'update', TRefinement extends GenericSchema | ((schema: GenericSchema) => GenericSchema), TColumn extends Column> = TRefinement extends (schema: any) => GenericSchema ? (TColumn['_']['notNull'] extends true ? ReturnType<TRefinement> : ArktypeNullable<ReturnType<TRefinement>>) extends infer TSchema ? TType extends 'update' ? ArktypeOptional<TSchema> : TSchema : Type<any, {}> : TRefinement;
-type IsRefinementDefined<TRefinements, TKey extends string> = TKey extends keyof TRefinements ? TRefinements[TKey] extends GenericSchema | ((schema: any) => any) ? true : false : false;
-export type BuildSchema<TType extends 'select' | 'insert' | 'update', TColumns extends Record<string, any>, TRefinements extends Record<string, any> | undefined> = type.instantiate<Simplify<RemoveNever<{
-    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> : any;
-}>>>;
 export type NoUnknownKeys<TRefinement extends Record<string, any>, TCompare extends Record<string, any>> = {
     [K in keyof TRefinement]: K extends keyof TCompare ? TRefinement[K] extends Record<string, GenericSchema> ? NoUnknownKeys<TRefinement[K], TCompare[K]> : TRefinement[K] : DrizzleTypeError<`Found unknown key in refinement: "${K & string}"`>;
 };

package/utils.d.cts

@@ -9,14 +9,12 @@ export declare function isWithEnum(column: Column): column is typeof column & {
 export declare const isPgEnum: (entity: any) => entity is PgEnum<[string, ...string[]]>;
 type Literal = type.infer<typeof literalSchema>;
 export type Json = Literal | Record<string, any> | any[];
-export type IsEnumDefined<TEnum extends [string, ...string[]] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
-export type IsNever<T> = [T] extends [never] ? true : false;
-export type ColumnIsGeneratedAlwaysAs<TColumn extends Column> = TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends undefined ? false : TColumn['_']['generated'] extends infer TGenerated extends {
-    type: string;
-} ? TGenerated['type'] extends 'byDefault' ? false : true : true;
-export type RemoveNever<T> = {
-    [K in keyof T as T[K] extends never ? never : K]: T[K];
-};
+export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
+    generated: undefined;
+} ? false : TColumn['_'] extends {
+    generated: {
+        type: 'byDefault';
+    };
+} ? false : true : false;
 export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
-export type IsUnknown<T> = unknown extends T ? [T] extends [null] ? false : true : false;
 export {};

package/utils.d.mts

@@ -9,14 +9,12 @@ export declare function isWithEnum(column: Column): column is typeof column & {
 export declare const isPgEnum: (entity: any) => entity is PgEnum<[string, ...string[]]>;
 type Literal = type.infer<typeof literalSchema>;
 export type Json = Literal | Record<string, any> | any[];
-export type IsEnumDefined<TEnum extends [string, ...string[]] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
-export type IsNever<T> = [T] extends [never] ? true : false;
-export type ColumnIsGeneratedAlwaysAs<TColumn extends Column> = TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends undefined ? false : TColumn['_']['generated'] extends infer TGenerated extends {
-    type: string;
-} ? TGenerated['type'] extends 'byDefault' ? false : true : true;
-export type RemoveNever<T> = {
-    [K in keyof T as T[K] extends never ? never : K]: T[K];
-};
+export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
+    generated: undefined;
+} ? false : TColumn['_'] extends {
+    generated: {
+        type: 'byDefault';
+    };
+} ? false : true : false;
 export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
-export type IsUnknown<T> = unknown extends T ? [T] extends [null] ? false : true : false;
 export {};

package/utils.d.ts

@@ -9,14 +9,12 @@ export declare function isWithEnum(column: Column): column is typeof column & {
 export declare const isPgEnum: (entity: any) => entity is PgEnum<[string, ...string[]]>;
 type Literal = type.infer<typeof literalSchema>;
 export type Json = Literal | Record<string, any> | any[];
-export type IsEnumDefined<TEnum extends [string, ...string[]] | undefined> = [string, ...string[]] extends TEnum ? false : undefined extends TEnum ? false : true;
-export type IsNever<T> = [T] extends [never] ? true : false;
-export type ColumnIsGeneratedAlwaysAs<TColumn extends Column> = TColumn['_']['identity'] extends 'always' ? true : TColumn['_']['generated'] extends undefined ? false : TColumn['_']['generated'] extends infer TGenerated extends {
-    type: string;
-} ? TGenerated['type'] extends 'byDefault' ? false : true : true;
-export type RemoveNever<T> = {
-    [K in keyof T as T[K] extends never ? never : K]: T[K];
-};
+export type ColumnIsGeneratedAlwaysAs<TColumn> = TColumn extends Column ? TColumn['_']['identity'] extends 'always' ? true : TColumn['_'] extends {
+    generated: undefined;
+} ? false : TColumn['_'] extends {
+    generated: {
+        type: 'byDefault';
+    };
+} ? false : true : false;
 export type GetSelection<T extends SelectedFieldsFlat<Column> | Table | View> = T extends Table ? T['_']['columns'] : T extends View ? T['_']['selectedFields'] : T;
-export type IsUnknown<T> = unknown extends T ? [T] extends [null] ? false : true : false;
 export {};