effect-qb 0.16.0 → 0.19.0

package/src/internal/schema-derivation.d.ts

@@ -1,64 +1,7 @@
-import * as VariantSchema from "@effect/experimental/VariantSchema";
 import type * as Brand from "effect/Brand";
 import * as Schema from "effect/Schema";
 import { type AnyColumnDefinition, type HasDefault, type InsertType, type IsGenerated, type IsNullable, type SelectType, type UpdateType } from "./column-state.js";
-/** Variant-schema helper used to derive select / insert / update schemas. */
-export declare const TableSchema: {
-    readonly Struct: <const A extends VariantSchema.Struct.Fields>(fields: A & VariantSchema.Struct.Validate<A, "insert" | "select" | "update">) => VariantSchema.Struct<A>;
-    readonly Field: <const A extends VariantSchema.Field.ConfigWithKeys<"insert" | "select" | "update">>(config: A & { readonly [K in Exclude<keyof A, "insert" | "select" | "update">]: never; }) => VariantSchema.Field<A>;
-    readonly FieldOnly: <const Keys extends readonly ("insert" | "select" | "update")[]>(...keys: Keys) => <S extends Schema.Schema.All | Schema.PropertySignature.All<PropertyKey>>(schema: S) => VariantSchema.Field<{ readonly [K in Keys[number]]: S; }>;
-    readonly FieldExcept: <const Keys extends readonly ("insert" | "select" | "update")[]>(...keys: Keys) => <S extends Schema.Schema.All | Schema.PropertySignature.All<PropertyKey>>(schema: S) => VariantSchema.Field<{ readonly [K in Exclude<"insert", Keys[number]> | Exclude<"select", Keys[number]> | Exclude<"update", Keys[number]>]: S; }>;
-    readonly fieldEvolve: {
-        <Self extends VariantSchema.Field<any> | VariantSchema.Field.ValueAny, const Mapping extends Self extends VariantSchema.Field<infer S extends VariantSchema.Field.Config> ? { readonly [K in keyof S]?: ((variant: S[K]) => VariantSchema.Field.ValueAny) | undefined; } : {
-            readonly insert?: ((variant: Self) => VariantSchema.Field.ValueAny) | undefined;
-            readonly select?: ((variant: Self) => VariantSchema.Field.ValueAny) | undefined;
-            readonly update?: ((variant: Self) => VariantSchema.Field.ValueAny) | undefined;
-        }>(f: Mapping): (self: Self) => VariantSchema.Field<Self extends VariantSchema.Field<infer S_1 extends VariantSchema.Field.Config> ? { readonly [K in keyof S_1]: K extends keyof Mapping ? Mapping[K] extends (arg: any) => any ? ReturnType<Mapping[K]> : S_1[K] : S_1[K]; } : {
-            readonly insert: "insert" extends infer T ? T extends "insert" ? T extends keyof Mapping ? Mapping[T] extends (arg: any) => any ? ReturnType<Mapping[T]> : Self : Self : never : never;
-            readonly select: "select" extends infer T_1 ? T_1 extends "select" ? T_1 extends keyof Mapping ? Mapping[T_1] extends (arg: any) => any ? ReturnType<Mapping[T_1]> : Self : Self : never : never;
-            readonly update: "update" extends infer T_2 ? T_2 extends "update" ? T_2 extends keyof Mapping ? Mapping[T_2] extends (arg: any) => any ? ReturnType<Mapping[T_2]> : Self : Self : never : never;
-        }>;
-        <Self extends VariantSchema.Field<any> | VariantSchema.Field.ValueAny, const Mapping_1 extends Self extends VariantSchema.Field<infer S extends VariantSchema.Field.Config> ? { readonly [K in keyof S]?: ((variant: S[K]) => VariantSchema.Field.ValueAny) | undefined; } : {
-            readonly insert?: ((variant: Self) => VariantSchema.Field.ValueAny) | undefined;
-            readonly select?: ((variant: Self) => VariantSchema.Field.ValueAny) | undefined;
-            readonly update?: ((variant: Self) => VariantSchema.Field.ValueAny) | undefined;
-        }>(self: Self, f: Mapping_1): VariantSchema.Field<Self extends VariantSchema.Field<infer S_1 extends VariantSchema.Field.Config> ? { readonly [K in keyof S_1]: K extends keyof Mapping_1 ? Mapping_1[K] extends (arg: any) => any ? ReturnType<Mapping_1[K]> : S_1[K] : S_1[K]; } : {
-            readonly insert: "insert" extends infer T ? T extends "insert" ? T extends keyof Mapping_1 ? Mapping_1[T] extends (arg: any) => any ? ReturnType<Mapping_1[T]> : Self : Self : never : never;
-            readonly select: "select" extends infer T_1 ? T_1 extends "select" ? T_1 extends keyof Mapping_1 ? Mapping_1[T_1] extends (arg: any) => any ? ReturnType<Mapping_1[T_1]> : Self : Self : never : never;
-            readonly update: "update" extends infer T_2 ? T_2 extends "update" ? T_2 extends keyof Mapping_1 ? Mapping_1[T_2] extends (arg: any) => any ? ReturnType<Mapping_1[T_2]> : Self : Self : never : never;
-        }>;
-    };
-    readonly fieldFromKey: {
-        <Self extends VariantSchema.Field<any> | VariantSchema.Field.ValueAny, const Mapping_2 extends Self extends VariantSchema.Field<infer S extends VariantSchema.Field.Config> ? { readonly [K in keyof S]?: string | undefined; } : {
-            readonly insert?: string | undefined;
-            readonly select?: string | undefined;
-            readonly update?: string | undefined;
-        }>(mapping: Mapping_2): (self: Self) => VariantSchema.Field<Self extends VariantSchema.Field<infer S_1 extends VariantSchema.Field.Config> ? { readonly [K in keyof S_1]: K extends keyof Mapping_2 ? Mapping_2[K] extends string ? VariantSchema.fromKey.Rename<S_1[K], Mapping_2[K]> : S_1[K] : S_1[K]; } : {
-            readonly insert: "insert" extends infer T ? T extends "insert" ? T extends keyof Mapping_2 ? Mapping_2[T] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T]> : Self : Self : never : never;
-            readonly select: "select" extends infer T_1 ? T_1 extends "select" ? T_1 extends keyof Mapping_2 ? Mapping_2[T_1] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T_1]> : Self : Self : never : never;
-            readonly update: "update" extends infer T_2 ? T_2 extends "update" ? T_2 extends keyof Mapping_2 ? Mapping_2[T_2] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_2[T_2]> : Self : Self : never : never;
-        }>;
-        <Self extends VariantSchema.Field<any> | VariantSchema.Field.ValueAny, const Mapping_3 extends Self extends VariantSchema.Field<infer S extends VariantSchema.Field.Config> ? { readonly [K in keyof S]?: string | undefined; } : {
-            readonly insert?: string | undefined;
-            readonly select?: string | undefined;
-            readonly update?: string | undefined;
-        }>(self: Self, mapping: Mapping_3): VariantSchema.Field<Self extends VariantSchema.Field<infer S_1 extends VariantSchema.Field.Config> ? { readonly [K in keyof S_1]: K extends keyof Mapping_3 ? Mapping_3[K] extends string ? VariantSchema.fromKey.Rename<S_1[K], Mapping_3[K]> : S_1[K] : S_1[K]; } : {
-            readonly insert: "insert" extends infer T ? T extends "insert" ? T extends keyof Mapping_3 ? Mapping_3[T] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T]> : Self : Self : never : never;
-            readonly select: "select" extends infer T_1 ? T_1 extends "select" ? T_1 extends keyof Mapping_3 ? Mapping_3[T_1] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T_1]> : Self : Self : never : never;
-            readonly update: "update" extends infer T_2 ? T_2 extends "update" ? T_2 extends keyof Mapping_3 ? Mapping_3[T_2] extends string ? VariantSchema.fromKey.Rename<Self, Mapping_3[T_2]> : Self : Self : never : never;
-        }>;
-    };
-    readonly Class: <Self = never>(identifier: string) => <const Fields extends VariantSchema.Struct.Fields>(fields: Fields & VariantSchema.Struct.Validate<Fields, "insert" | "select" | "update">, annotations?: Schema.Annotations.Schema<Self, readonly []> | undefined) => [Self] extends [never] ? "Missing `Self` generic - use `class Self extends Class<Self>()({ ... })`" : VariantSchema.Class<Self, Fields, VariantSchema.ExtractFields<"select", Fields, true>, Schema.Struct.Type<VariantSchema.ExtractFields<"select", Fields, true>>, Schema.Struct.Encoded<VariantSchema.ExtractFields<"select", Fields, true>>, Schema.Schema.Context<VariantSchema.ExtractFields<"select", Fields, true>[keyof VariantSchema.ExtractFields<"select", Fields, true>]>, Schema.Struct.Constructor<VariantSchema.ExtractFields<"select", Fields, true>>> & {
-        readonly insert: Schema.Struct<VariantSchema.ExtractFields<"insert", Fields, false> extends infer T ? { [K in keyof T]: T[K]; } : never>;
-        readonly select: Schema.Struct<VariantSchema.ExtractFields<"select", Fields, false> extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never>;
-        readonly update: Schema.Struct<VariantSchema.ExtractFields<"update", Fields, false> extends infer T_2 ? { [K in keyof T_2]: T_2[K]; } : never>;
-    };
-    readonly Union: <const Members extends readonly VariantSchema.Struct<any>[]>(...members: Members) => VariantSchema.Union<Members> & VariantSchema.Union.Variants<Members, "insert" | "select" | "update">;
-    readonly extract: {
-        <V extends "insert" | "select" | "update">(variant: V): <A extends VariantSchema.Struct<any>>(self: A) => VariantSchema.Extract<V, A, V extends "select" ? true : false>;
-        <V extends "insert" | "select" | "update", A extends VariantSchema.Struct<any>>(self: A, variant: V): VariantSchema.Extract<V, A, V extends "select" ? true : false>;
-    };
-};
+export type TableSchemaVariant = "select" | "insert" | "update";
 /** Normalized field map used by table definitions. */
 export type TableFieldMap = Record<string, AnyColumnDefinition>;
 type GeneratedKeys<Fields extends TableFieldMap> = {
@@ -91,15 +34,23 @@ export type InsertRow<TableName extends string, Fields extends TableFieldMap> =
 export type UpdateRow<TableName extends string, Fields extends TableFieldMap, PrimaryKey extends keyof Fields> = Simplify<Partial<{
     [K in UpdateKeys<Fields, PrimaryKey>]: BrandedUpdateType<Fields[K], TableName, Extract<K, string>>;
 }>>;
+type SchemaOfVariant<Variant extends TableSchemaVariant, TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string> = Variant extends "select" ? Schema.Schema<SelectRow<TableName, Fields>> : Variant extends "insert" ? Schema.Schema<InsertRow<TableName, Fields>> : Schema.Schema<UpdateRow<TableName, Fields, PrimaryKeyColumns>>;
+export declare const deriveSchema: <Variant extends TableSchemaVariant, TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(variant: Variant, tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => SchemaOfVariant<Variant, TableName, Fields, PrimaryKeyColumns>;
+export declare const deriveSelectSchema: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => Schema.Schema<SelectRow<TableName, Fields>>;
+export declare const deriveInsertSchema: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => Schema.Schema<InsertRow<TableName, Fields>>;
+export declare const deriveUpdateSchema: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => Schema.Schema<UpdateRow<TableName, Fields, PrimaryKeyColumns>>;
 /**
  * Derives the `select`, `insert`, and `update` schemas for a table.
  *
  * This is the central place where the column capability flags are turned into
  * real runtime schemas.
+ *
+ * @deprecated Prefer `deriveSelectSchema`, `deriveInsertSchema`, and
+ * `deriveUpdateSchema` so individual variants are derived lazily.
  */
 export declare const deriveSchemas: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => {
-    readonly select: Schema.Schema<{ [K in keyof { [K in keyof Fields]: BrandedSelectType<Fields[K], TableName, Extract<K, string>>; }]: { [K in keyof Fields]: BrandedSelectType<Fields[K], TableName, Extract<K, string>>; }[K]; }, { [K in keyof { [K in keyof Fields]: BrandedSelectType<Fields[K], TableName, Extract<K, string>>; }]: { [K in keyof Fields]: BrandedSelectType<Fields[K], TableName, Extract<K, string>>; }[K]; }, never>;
-    readonly insert: Schema.Schema<{ [K in Exclude<keyof Fields, GeneratedKeys<Fields> | OptionalInsertKeys<Fields>>]: BrandedInsertType<Fields[K], TableName, Extract<K, string>>; } & { [K in OptionalInsertKeys<Fields>]?: BrandedInsertType<Fields[K], TableName, Extract<K, string>> | undefined; } extends infer T ? { [K in keyof T]: T[K]; } : never, { [K in Exclude<keyof Fields, GeneratedKeys<Fields> | OptionalInsertKeys<Fields>>]: BrandedInsertType<Fields[K], TableName, Extract<K, string>>; } & { [K in OptionalInsertKeys<Fields>]?: BrandedInsertType<Fields[K], TableName, Extract<K, string>> | undefined; } extends infer T ? { [K in keyof T]: T[K]; } : never, never>;
-    readonly update: Schema.Schema<Partial<{ [K in Exclude<keyof Fields, PrimaryKeyColumns | GeneratedKeys<Fields>>]: BrandedUpdateType<Fields[K], TableName, Extract<K, string>>; }> extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never, Partial<{ [K in Exclude<keyof Fields, PrimaryKeyColumns | GeneratedKeys<Fields>>]: BrandedUpdateType<Fields[K], TableName, Extract<K, string>>; }> extends infer T_1 ? { [K in keyof T_1]: T_1[K]; } : never, never>;
+    readonly select: Schema.Schema<SelectRow<TableName, Fields>>;
+    readonly insert: Schema.Schema<InsertRow<TableName, Fields>>;
+    readonly update: Schema.Schema<UpdateRow<TableName, Fields, PrimaryKeyColumns>>;
 };
 export {};

package/src/internal/schema-derivation.ts

@@ -1,4 +1,3 @@
-import * as VariantSchema from "@effect/experimental/VariantSchema"
 import type * as Brand from "effect/Brand"
 import * as Schema from "effect/Schema"
 
@@ -12,13 +11,7 @@ import {
   type UpdateType
 } from "./column-state.js"
 
-/** Variant-schema helper used to derive select / insert / update schemas. */
-export const TableSchema = VariantSchema.make({
-  variants: ["select", "insert", "update"] as const,
-  defaultVariant: "select"
-})
-
-type Variants = "select" | "insert" | "update"
+export type TableSchemaVariant = "select" | "insert" | "update"
 
 /** Normalized field map used by table definitions. */
 export type TableFieldMap = Record<string, AnyColumnDefinition>
@@ -153,11 +146,95 @@ const updateSchema = (
   return Schema.optional(base)
 }
 
+type SchemaOfVariant<
+  Variant extends TableSchemaVariant,
+  TableName extends string,
+  Fields extends TableFieldMap,
+  PrimaryKeyColumns extends keyof Fields & string
+> = Variant extends "select" ? Schema.Schema<SelectRow<TableName, Fields>>
+  : Variant extends "insert" ? Schema.Schema<InsertRow<TableName, Fields>>
+  : Schema.Schema<UpdateRow<TableName, Fields, PrimaryKeyColumns>>
+
+const fieldSchemaForVariant = (
+  variant: TableSchemaVariant,
+  column: AnyColumnDefinition,
+  tableName: string,
+  columnName: string,
+  primaryKeySet: ReadonlySet<string>
+): any | undefined => {
+  switch (variant) {
+    case "select":
+      return selectSchema(column, tableName, columnName)
+    case "insert":
+      return insertSchema(column, tableName, columnName)
+    case "update":
+      return updateSchema(column, tableName, columnName, primaryKeySet.has(columnName))
+  }
+}
+
+export const deriveSchema = <
+  Variant extends TableSchemaVariant,
+  TableName extends string,
+  Fields extends TableFieldMap,
+  PrimaryKeyColumns extends keyof Fields & string
+>(
+  variant: Variant,
+  tableName: TableName,
+  fields: Fields,
+  primaryKeyColumns: readonly PrimaryKeyColumns[]
+): SchemaOfVariant<Variant, TableName, Fields, PrimaryKeyColumns> => {
+  const primaryKeySet = new Set<string>(primaryKeyColumns)
+  const structFields: Record<string, any> = {}
+  for (const [key, column] of Object.entries(fields)) {
+    const schema = fieldSchemaForVariant(variant, column, tableName, key, primaryKeySet)
+    if (schema !== undefined) {
+      structFields[key] = schema
+    }
+  }
+  return Schema.Struct(structFields) as unknown as SchemaOfVariant<Variant, TableName, Fields, PrimaryKeyColumns>
+}
+
+export const deriveSelectSchema = <
+  TableName extends string,
+  Fields extends TableFieldMap,
+  PrimaryKeyColumns extends keyof Fields & string
+>(
+  tableName: TableName,
+  fields: Fields,
+  primaryKeyColumns: readonly PrimaryKeyColumns[]
+): Schema.Schema<SelectRow<TableName, Fields>> =>
+  deriveSchema("select", tableName, fields, primaryKeyColumns)
+
+export const deriveInsertSchema = <
+  TableName extends string,
+  Fields extends TableFieldMap,
+  PrimaryKeyColumns extends keyof Fields & string
+>(
+  tableName: TableName,
+  fields: Fields,
+  primaryKeyColumns: readonly PrimaryKeyColumns[]
+): Schema.Schema<InsertRow<TableName, Fields>> =>
+  deriveSchema("insert", tableName, fields, primaryKeyColumns)
+
+export const deriveUpdateSchema = <
+  TableName extends string,
+  Fields extends TableFieldMap,
+  PrimaryKeyColumns extends keyof Fields & string
+>(
+  tableName: TableName,
+  fields: Fields,
+  primaryKeyColumns: readonly PrimaryKeyColumns[]
+): Schema.Schema<UpdateRow<TableName, Fields, PrimaryKeyColumns>> =>
+  deriveSchema("update", tableName, fields, primaryKeyColumns)
+
 /**
  * Derives the `select`, `insert`, and `update` schemas for a table.
  *
  * This is the central place where the column capability flags are turned into
  * real runtime schemas.
+ *
+ * @deprecated Prefer `deriveSelectSchema`, `deriveInsertSchema`, and
+ * `deriveUpdateSchema` so individual variants are derived lazily.
  */
 export const deriveSchemas = <
   TableName extends string,
@@ -171,33 +248,8 @@ export const deriveSchemas = <
   readonly select: Schema.Schema<SelectRow<TableName, Fields>>
   readonly insert: Schema.Schema<InsertRow<TableName, Fields>>
   readonly update: Schema.Schema<UpdateRow<TableName, Fields, PrimaryKeyColumns>>
-} => {
-  const primaryKeySet = new Set<string>(primaryKeyColumns)
-  const variants: Record<string, VariantSchema.Field<any>> = {}
-  for (const [key, column] of Object.entries(fields)) {
-    const config: Record<Variants, any> = {
-      select: selectSchema(column, tableName, key),
-      insert: undefined,
-      update: undefined
-    }
-    const insert = insertSchema(column, tableName, key)
-    const update = updateSchema(column, tableName, key, primaryKeySet.has(key))
-    if (insert !== undefined) {
-      config.insert = insert
-    } else {
-      delete config.insert
-    }
-    if (update !== undefined) {
-      config.update = update
-    } else {
-      delete config.update
-    }
-    variants[key] = TableSchema.Field(config)
-  }
-  const struct = TableSchema.Struct(variants as any)
-  return {
-    select: TableSchema.extract(struct, "select") as unknown as Schema.Schema<SelectRow<TableName, Fields>>,
-    insert: TableSchema.extract(struct, "insert") as unknown as Schema.Schema<InsertRow<TableName, Fields>>,
-    update: TableSchema.extract(struct, "update") as unknown as Schema.Schema<UpdateRow<TableName, Fields, PrimaryKeyColumns>>
-  }
-}
+} => ({
+  select: deriveSelectSchema(tableName, fields, primaryKeyColumns),
+  insert: deriveInsertSchema(tableName, fields, primaryKeyColumns),
+  update: deriveUpdateSchema(tableName, fields, primaryKeyColumns)
+})

package/src/internal/schema-expression.ts

@@ -6,7 +6,7 @@ export const TypeId: unique symbol = Symbol.for("effect-qb/SchemaExpression")
 export type TypeId = typeof TypeId
 
 const SchemaExpressionProto = {
-  pipe(this: unknown) {
+  pipe(this: Pipeable) {
     return pipeArguments(this, arguments)
   }
 }
@@ -15,7 +15,7 @@ const attachPipe = <Value extends object>(value: Value): Value => {
   Object.defineProperty(value, "pipe", {
     configurable: true,
     writable: true,
-    value: function(this: unknown) {
+    value: function(this: Value) {
       return pipeArguments(value, arguments)
     }
   })

package/src/internal/sql-expression-renderer.ts

@@ -0,0 +1,19 @@
+import type { RenderedAst, RenderState, SqlDialect } from "./dialect.js"
+import type * as Expression from "./scalar.js"
+import type * as QueryAst from "./query-ast.js"
+
+export const renderQueryAst = (
+  ast: QueryAst.Ast<Record<string, unknown>, any, QueryAst.QueryStatement>,
+  state: RenderState,
+  dialect: SqlDialect
+): RenderedAst => {
+  return dialect.renderQueryAst(ast, state, dialect)
+}
+
+export const renderExpression = (
+  expression: Expression.Any,
+  state: RenderState,
+  dialect: SqlDialect
+): string => {
+  return dialect.renderExpression(expression, state, dialect)
+}