effect-qb 4.0.0-beta.66 → 4.0.0-beta.98

package/src/internal/renderer.ts

@@ -1,7 +1,6 @@
 import * as Query from "./query.js"
-import type * as Expression from "./scalar.js"
+import * as Expression from "./scalar.js"
 import { flattenSelection, type Projection, validateProjections } from "./projections.js"
-import * as Plan from "./row-set.js"
 
 /** Symbol used to attach rendered-query phantom row metadata. */
 export const TypeId: unique symbol = Symbol.for("effect-qb/Renderer")
@@ -38,8 +37,7 @@ export type RowOf<Value extends RenderedQuery<any, any>> = Value[typeof TypeId][
  *
  * Renderers only accept complete, dialect-compatible plans. The returned
  * `RenderedQuery` keeps the canonical `Query.ResultRow<...>` type attached for
- * downstream executor layers, and the built-in renderer also performs a
- * matching runtime aggregate-shape validation.
+ * downstream executor layers.
  */
 export interface Renderer<Dialect extends string = string> {
   readonly dialect: Dialect
@@ -91,24 +89,38 @@ export function make<Dialect extends string>(
   dialect: Dialect,
   render: CustomRender<Dialect>
 ): Renderer<Dialect> {
+  return makeRenderer(dialect, render, true)
+}
+
+/** Internal renderer factory for built-in renderers that derive projections from typed plans. */
+export function makeTrusted<Dialect extends string>(
+  dialect: Dialect,
+  render: CustomRender<Dialect>
+): Renderer<Dialect>
+export function makeTrusted<Dialect extends string>(
+  dialect: Dialect,
+  render: CustomRender<Dialect>
+): Renderer<Dialect> {
+  return makeRenderer(dialect, render, false)
+}
+
+const makeRenderer = <Dialect extends string>(
+  dialect: Dialect,
+  render: CustomRender<Dialect>,
+  validate: boolean
+): Renderer<Dialect> => {
   if (typeof render !== "function") {
     throw new Error(`Renderer.make requires an explicit render implementation for dialect: ${dialect}`)
   }
   return {
     dialect,
     render(plan) {
-      const required = Query.currentRequiredList(plan[Plan.TypeId].required)
-      if (required.length > 0) {
-        throw new Error(`query references sources that are not yet in scope: ${required.join(", ")}`)
-      }
-      const planDialect = plan[Plan.TypeId].dialect
-      if (planDialect !== dialect) {
-        throw new Error("effect-qb: plan dialect is not compatible with the target renderer or executor")
-      }
       const rendered = render(plan)
       const projections = rendered.projections ?? []
-      validateProjections(projections)
-      validateProjectionPathsMatchSelection(plan as Query.Plan.Any, projections)
+      if (validate) {
+        validateProjections(projections)
+        validateProjectionPathsMatchSelection(plan as Query.Plan.Any, projections)
+      }
       return {
         sql: rendered.sql,
         params: rendered.params ?? [],

package/src/internal/runtime/normalize.ts

@@ -23,6 +23,13 @@ const isPlainRecord = (value: unknown): value is Record<string, unknown> => {
 
 const pad = (value: number, width = 2): string => value.toString().padStart(width, "0")
 
+const validDate = (value: Date): Date => {
+  if (Number.isNaN(value.getTime())) {
+    throw new Error("Expected a valid Date value")
+  }
+  return value
+}
+
 const formatLocalDate = (value: Date): string =>
   `${pad(value.getUTCFullYear(), 4)}-${pad(value.getUTCMonth() + 1)}-${pad(value.getUTCDate())}`
 
@@ -125,7 +132,7 @@ const normalizeDecimalString = (value: unknown): string => {
 
 const normalizeLocalDate = (value: unknown): string => {
   if (value instanceof Date) {
-    return formatLocalDate(value)
+    return formatLocalDate(validDate(value))
   }
   const raw = expectString(value, "local date").trim()
   if (isValidLocalDateString(raw)) {
@@ -143,7 +150,7 @@ const normalizeLocalDate = (value: unknown): string => {
 
 const normalizeLocalTime = (value: unknown): string => {
   if (value instanceof Date) {
-    return formatLocalTime(value)
+    return formatLocalTime(validDate(value))
   }
   const raw = expectString(value, "local time").trim()
   if (isValidLocalTimeString(raw)) {
@@ -154,7 +161,7 @@ const normalizeLocalTime = (value: unknown): string => {
 
 const normalizeOffsetTime = (value: unknown): string => {
   if (value instanceof Date) {
-    return `${formatLocalTime(value)}Z`
+    return `${formatLocalTime(validDate(value))}Z`
   }
   const raw = expectString(value, "offset time").trim()
   if (isValidOffsetTimeString(raw)) {
@@ -165,7 +172,7 @@ const normalizeOffsetTime = (value: unknown): string => {
 
 const normalizeLocalDateTime = (value: unknown): string => {
   if (value instanceof Date) {
-    return formatLocalDateTime(value)
+    return formatLocalDateTime(validDate(value))
   }
   const raw = expectString(value, "local datetime").trim()
   const canonicalLocalDateTime = raw.replace(" ", "T")
@@ -184,7 +191,7 @@ const normalizeLocalDateTime = (value: unknown): string => {
 
 const normalizeInstant = (value: unknown): string => {
   if (value instanceof Date) {
-    return value.toISOString()
+    return validDate(value).toISOString()
   }
   const raw = expectString(value, "instant").trim()
   if (!/[zZ]|[+-]\d{2}:\d{2}$/.test(raw)) {

package/src/internal/scalar.ts

@@ -50,6 +50,7 @@ export declare namespace DbType {
     readonly runtime?: RuntimeTag
     readonly compareGroup?: string
     readonly castTargets?: readonly string[]
+    readonly implicitTargets?: readonly string[]
     readonly traits?: DatatypeTraits
     readonly driverValueMapping?: DriverValueMapping
   }
@@ -143,7 +144,12 @@ export interface DriverValueMapping {
   readonly jsonSelectSql?: (sql: string, dbType: DbType.Any) => string
 }
 
-export type DriverValueMappings = Readonly<Record<string, DriverValueMapping | undefined>>
+export type DriverValueMappings = Readonly<Partial<Record<string, DriverValueMapping>>>
+
+export type DriverValueMappingsFor<
+  Kind extends string,
+  Family extends string
+> = Readonly<Partial<Record<Kind | Family | RuntimeTag, DriverValueMapping>>>
 
 /** Canonical static metadata stored on an expression. */
 export interface State<

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

@@ -34,11 +34,11 @@ 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.Decoder<SelectRow<TableName, Fields>, never> : Variant extends "insert" ? Schema.Decoder<InsertRow<TableName, Fields>, never> : Schema.Decoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>;
+type SchemaOfVariant<Variant extends TableSchemaVariant, TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string> = Variant extends "select" ? Schema.ConstraintDecoder<SelectRow<TableName, Fields>, never> : Variant extends "insert" ? Schema.ConstraintDecoder<InsertRow<TableName, Fields>, never> : Schema.ConstraintDecoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>;
 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.Decoder<SelectRow<TableName, Fields>, never>;
-export declare const deriveInsertSchema: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => Schema.Decoder<InsertRow<TableName, Fields>, never>;
-export declare const deriveUpdateSchema: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => Schema.Decoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>;
+export declare const deriveSelectSchema: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => Schema.ConstraintDecoder<SelectRow<TableName, Fields>, never>;
+export declare const deriveInsertSchema: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => Schema.ConstraintDecoder<InsertRow<TableName, Fields>, never>;
+export declare const deriveUpdateSchema: <TableName extends string, Fields extends TableFieldMap, PrimaryKeyColumns extends keyof Fields & string>(tableName: TableName, fields: Fields, primaryKeyColumns: readonly PrimaryKeyColumns[]) => Schema.ConstraintDecoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>;
 /**
  * Derives the `select`, `insert`, and `update` schemas for a table.
  *
@@ -49,8 +49,8 @@ export declare const deriveUpdateSchema: <TableName extends string, Fields exten
  * `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.Decoder<SelectRow<TableName, Fields>, never>;
-    readonly insert: Schema.Decoder<InsertRow<TableName, Fields>, never>;
-    readonly update: Schema.Decoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>;
+    readonly select: Schema.ConstraintDecoder<SelectRow<TableName, Fields>, never>;
+    readonly insert: Schema.ConstraintDecoder<InsertRow<TableName, Fields>, never>;
+    readonly update: Schema.ConstraintDecoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>;
 };
 export {};

package/src/internal/schema-derivation.ts

@@ -151,9 +151,9 @@ type SchemaOfVariant<
   TableName extends string,
   Fields extends TableFieldMap,
   PrimaryKeyColumns extends keyof Fields & string
-> = Variant extends "select" ? Schema.Decoder<SelectRow<TableName, Fields>, never>
-  : Variant extends "insert" ? Schema.Decoder<InsertRow<TableName, Fields>, never>
-  : Schema.Decoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>
+> = Variant extends "select" ? Schema.ConstraintDecoder<SelectRow<TableName, Fields>, never>
+  : Variant extends "insert" ? Schema.ConstraintDecoder<InsertRow<TableName, Fields>, never>
+  : Schema.ConstraintDecoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>
 
 const fieldSchemaForVariant = (
   variant: TableSchemaVariant,
@@ -202,7 +202,7 @@ export const deriveSelectSchema = <
   tableName: TableName,
   fields: Fields,
   primaryKeyColumns: readonly PrimaryKeyColumns[]
-): Schema.Decoder<SelectRow<TableName, Fields>, never> =>
+): Schema.ConstraintDecoder<SelectRow<TableName, Fields>, never> =>
   deriveSchema("select", tableName, fields, primaryKeyColumns)
 
 export const deriveInsertSchema = <
@@ -213,7 +213,7 @@ export const deriveInsertSchema = <
   tableName: TableName,
   fields: Fields,
   primaryKeyColumns: readonly PrimaryKeyColumns[]
-): Schema.Decoder<InsertRow<TableName, Fields>, never> =>
+): Schema.ConstraintDecoder<InsertRow<TableName, Fields>, never> =>
   deriveSchema("insert", tableName, fields, primaryKeyColumns)
 
 export const deriveUpdateSchema = <
@@ -224,7 +224,7 @@ export const deriveUpdateSchema = <
   tableName: TableName,
   fields: Fields,
   primaryKeyColumns: readonly PrimaryKeyColumns[]
-): Schema.Decoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never> =>
+): Schema.ConstraintDecoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never> =>
   deriveSchema("update", tableName, fields, primaryKeyColumns)
 
 /**
@@ -245,9 +245,9 @@ export const deriveSchemas = <
   fields: Fields,
   primaryKeyColumns: readonly PrimaryKeyColumns[]
 ): {
-  readonly select: Schema.Decoder<SelectRow<TableName, Fields>, never>
-  readonly insert: Schema.Decoder<InsertRow<TableName, Fields>, never>
-  readonly update: Schema.Decoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>
+  readonly select: Schema.ConstraintDecoder<SelectRow<TableName, Fields>, never>
+  readonly insert: Schema.ConstraintDecoder<InsertRow<TableName, Fields>, never>
+  readonly update: Schema.ConstraintDecoder<UpdateRow<TableName, Fields, PrimaryKeyColumns>, never>
 } => ({
   select: deriveSelectSchema(tableName, fields, primaryKeyColumns),
   insert: deriveInsertSchema(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)
+}