effect-qb 0.14.0 → 0.15.0

package/src/internal/datatypes/lookup.ts

@@ -1,32 +1,6 @@
-import type * as Expression from ".././expression.js"
-import type { mysqlDatatypeFamilies, mysqlDatatypeKinds } from "../../mysql/datatypes/spec.js"
-import type { postgresDatatypeFamilies, postgresDatatypeKinds } from "../../postgres/datatypes/spec.js"
+import type * as Expression from "../scalar.js"
 import type { RuntimeOfTag, RuntimeTag } from "./shape.js"
 
-type KnownDialect = "postgres" | "mysql"
-
-type DialectKinds<Dialect extends KnownDialect> =
-  Dialect extends "postgres" ? typeof postgresDatatypeKinds :
-    typeof mysqlDatatypeKinds
-
-type DialectFamilies<Dialect extends KnownDialect> =
-  Dialect extends "postgres" ? typeof postgresDatatypeFamilies :
-    typeof mysqlDatatypeFamilies
-
-type StripParameterizedKind<Kind extends string> =
-  Kind extends `${infer Base}(${string}`
-    ? StripParameterizedKind<Base>
-    : Kind
-
-type StripArrayKind<Kind extends string> =
-  Kind extends `${infer Base}[]`
-    ? StripArrayKind<Base>
-    : Kind
-
-type BaseKind<Kind extends string> = StripArrayKind<StripParameterizedKind<Kind>>
-
-type IsArrayKind<Kind extends string> = Kind extends `${string}[]` ? true : false
-
 type ExactKindFamily =
   | "array"
   | "range"
@@ -35,101 +9,55 @@ type ExactKindFamily =
   | "enum"
   | "set"
 
-type KnownKindFamily<
-  Dialect extends KnownDialect,
-  Kind extends string
-> = IsArrayKind<Kind> extends true
-  ? "array"
-  : BaseKind<Kind> extends "null"
-    ? "null"
-    : BaseKind<Kind> extends keyof DialectKinds<Dialect>
-      ? DialectKinds<Dialect>[BaseKind<Kind>] extends { readonly family: infer Family extends string }
-        ? Family
-        : never
-      : `other:${Dialect}:${Kind}`
+type BaseFamilyOf<Db extends Expression.DbType.Base<any, any>> =
+  Db extends { readonly family?: infer Family extends string }
+    ? Family
+    : Db["kind"] extends "null"
+      ? "null"
+      : `other:${Db["dialect"]}:${Db["kind"]}`
+
+type BaseRuntimeTagOf<Db extends Expression.DbType.Base<any, any>> =
+  Db extends { readonly runtime?: infer Runtime extends RuntimeTag }
+    ? Runtime
+    : "unknown"
 
-type KnownKindRuntimeTag<
-  Dialect extends KnownDialect,
-  Kind extends string
-> = IsArrayKind<Kind> extends true
-  ? "array"
-  : BaseKind<Kind> extends "null"
-    ? "null"
-    : BaseKind<Kind> extends keyof DialectKinds<Dialect>
-      ? DialectKinds<Dialect>[BaseKind<Kind>] extends { readonly runtime: infer Runtime extends RuntimeTag }
-        ? Runtime
-        : "unknown"
-      : "unknown"
+type BaseCompareGroupOf<Db extends Expression.DbType.Base<any, any>> =
+  Db extends { readonly compareGroup?: infer CompareGroup extends string }
+    ? CompareGroup
+    : BaseFamilyOf<Db>
 
-type FamilyCastTargets<
-  Dialect extends KnownDialect,
-  Family extends string
-> = Family extends keyof DialectFamilies<Dialect>
-  ? DialectFamilies<Dialect>[Family] extends { readonly castTargets: readonly (infer CastTarget extends string)[] }
-    ? CastTarget
+type BaseCastTargetsOf<Db extends Expression.DbType.Base<any, any>> =
+  Db extends { readonly castTargets?: readonly (infer Target extends string)[] }
+    ? Target
     : never
-  : never
 
-type FamilyHasTextualTrait<
-  Dialect extends KnownDialect,
-  Family extends string
-> = Family extends keyof DialectFamilies<Dialect>
-  ? DialectFamilies<Dialect>[Family] extends { readonly traits: infer Traits }
+type BaseHasTextualTrait<Db extends Expression.DbType.Base<any, any>> =
+  Db extends { readonly traits?: infer Traits }
     ? Traits extends { readonly textual: true }
       ? true
       : false
     : false
-  : false
-
-type BaseFamilyOf<
-  Dialect extends KnownDialect,
-  Kind extends string
-> = Kind extends keyof DialectKinds<Dialect>
-  ? DialectKinds<Dialect>[Kind] extends { readonly family: infer Family extends string }
-    ? Family
-    : never
-  : `other:${Dialect}:${Kind}`
-
-type BaseRuntimeTagOf<
-  Dialect extends KnownDialect,
-  Kind extends string
-> = Kind extends keyof DialectKinds<Dialect>
-  ? DialectKinds<Dialect>[Kind] extends { readonly runtime: infer Runtime extends RuntimeTag }
-    ? Runtime
-    : "unknown"
-  : "unknown"
-
-type BaseCompareGroupOf<
-  Dialect extends KnownDialect,
-  Kind extends string
-> = BaseFamilyOf<Dialect, Kind> extends ExactKindFamily
-  ? Kind
-  : BaseFamilyOf<Dialect, Kind> extends keyof DialectFamilies<Dialect>
-    ? DialectFamilies<Dialect>[BaseFamilyOf<Dialect, Kind>] extends { readonly compareGroup: infer CompareGroup extends string }
-      ? CompareGroup
-      : never
-    : BaseFamilyOf<Dialect, Kind>
 
 export type FamilyOfDbType<Db extends Expression.DbType.Any> =
   Db extends Expression.DbType.Domain<any, infer Base extends Expression.DbType.Any, any>
     ? FamilyOfDbType<Base>
     : Db extends Expression.DbType.Array<any, any, any>
       ? "array"
-    : Db extends Expression.DbType.Range<any, any, any>
-      ? "range"
-      : Db extends Expression.DbType.Multirange<any, any, any>
-        ? "multirange"
-        : Db extends Expression.DbType.Composite<any, any, any>
-          ? "record"
-          : Db extends Expression.DbType.Enum<any, any>
-            ? "enum"
-            : Db extends Expression.DbType.Set<any, any>
-              ? "set"
-              : Db extends Expression.DbType.Json<any, any>
-                ? "json"
-              : Db extends Expression.DbType.Base<infer Dialect extends KnownDialect, infer Kind extends string>
-                ? BaseFamilyOf<Dialect, Kind>
-                : "other:unknown:unknown"
+      : Db extends Expression.DbType.Range<any, any, any>
+        ? "range"
+        : Db extends Expression.DbType.Multirange<any, any, any>
+          ? "multirange"
+          : Db extends Expression.DbType.Composite<any, any, any>
+            ? "record"
+            : Db extends Expression.DbType.Enum<any, any>
+              ? "enum"
+              : Db extends Expression.DbType.Set<any, any>
+                ? "set"
+                : Db extends Expression.DbType.Json<any, any>
+                  ? "json"
+                  : Db extends Expression.DbType.Base<any, any>
+                    ? BaseFamilyOf<Db>
+                    : "other:unknown:unknown"
 
 export type CompareGroupOfDbType<Db extends Expression.DbType.Any> =
   Db extends Expression.DbType.Domain<any, infer Base extends Expression.DbType.Any, any>
@@ -140,17 +68,17 @@ export type CompareGroupOfDbType<Db extends Expression.DbType.Any> =
         ? Kind
         : Db extends Expression.DbType.Multirange<any, any, infer Kind extends string>
           ? Kind
-        : Db extends Expression.DbType.Composite<any, any, infer Kind extends string>
+          : Db extends Expression.DbType.Composite<any, any, infer Kind extends string>
             ? Kind
             : Db extends Expression.DbType.Enum<any, infer Kind extends string>
               ? Kind
-            : Db extends Expression.DbType.Set<any, infer Kind extends string>
-              ? Kind
-            : Db extends Expression.DbType.Json<any, any>
-              ? never
-                : Db extends Expression.DbType.Base<infer Dialect extends KnownDialect, infer Kind extends string>
-                  ? BaseCompareGroupOf<Dialect, Kind>
-                  : "other:unknown:unknown"
+              : Db extends Expression.DbType.Set<any, infer Kind extends string>
+                ? Kind
+                : Db extends Expression.DbType.Json<any, any>
+                  ? never
+                  : Db extends Expression.DbType.Base<any, any>
+                    ? BaseCompareGroupOf<Db>
+                    : "other:unknown:unknown"
 
 export type RuntimeOfDbType<Db extends Expression.DbType.Any> =
   Db extends Expression.DbType.Domain<any, infer Base extends Expression.DbType.Any, any>
@@ -159,17 +87,17 @@ export type RuntimeOfDbType<Db extends Expression.DbType.Any> =
       ? ReadonlyArray<RuntimeOfDbType<Element>>
       : Db extends Expression.DbType.Composite<any, infer Fields extends Record<string, Expression.DbType.Any>, any>
         ? { readonly [K in keyof Fields]: RuntimeOfDbType<Fields[K]> }
-      : Db extends Expression.DbType.Range<any, any, any> | Expression.DbType.Multirange<any, any, any>
-        ? unknown
-        : Db extends Expression.DbType.Json<any, any>
-          ? import("../runtime-value.js").JsonValue
+        : Db extends Expression.DbType.Range<any, any, any> | Expression.DbType.Multirange<any, any, any>
+          ? unknown
+          : Db extends Expression.DbType.Json<any, any>
+            ? import("../runtime/value.js").JsonValue
             : Db extends Expression.DbType.Enum<any, any> | Expression.DbType.Set<any, any>
-            ? string
-            : Db extends Expression.DbType.Base<infer Dialect extends KnownDialect, infer Kind extends string>
-              ? BaseRuntimeTagOf<Dialect, Kind> extends infer Runtime extends RuntimeTag
-                ? RuntimeOfTag<Runtime>
+              ? string
+              : Db extends Expression.DbType.Base<any, any>
+                ? BaseRuntimeTagOf<Db> extends infer Runtime extends RuntimeTag
+                  ? RuntimeOfTag<Runtime>
+                  : unknown
                 : unknown
-              : unknown
 
 export type CanCompareDbTypes<
   Left extends Expression.DbType.Any,
@@ -221,12 +149,8 @@ export type CanTextuallyCoerceDbType<
       ? true
       : Db extends Expression.DbType.Json<any, any>
         ? false
-        : Db extends Expression.DbType.Base<infer D extends KnownDialect, infer Kind extends string>
-          ? Kind extends keyof DialectKinds<D>
-            ? FamilyHasTextualTrait<D, BaseFamilyOf<D, Kind>> extends true
-              ? true
-              : false
-            : false
+        : Db extends Expression.DbType.Base<any, any>
+          ? BaseHasTextualTrait<Db>
           : false
   : false
 
@@ -252,29 +176,14 @@ export type CanCastDbType<
               | Expression.DbType.Enum<any, any>
               | Expression.DbType.Set<any, any>
             ? true
-          : Source extends Expression.DbType.Base<infer SourceDialect extends KnownDialect, infer SourceKind extends string>
-            ? Target extends Expression.DbType.Base<infer TargetDialect extends KnownDialect, infer TargetKind extends string>
-              ? SourceDialect extends TargetDialect
-                ? SourceKind extends keyof DialectKinds<SourceDialect>
-                  ? TargetKind extends keyof DialectKinds<TargetDialect>
-                    ? BaseFamilyOf<SourceDialect, SourceKind> extends ExactKindFamily
-                      ? BaseFamilyOf<SourceDialect, TargetKind> extends "text"
-                        ? FamilyCastTargets<SourceDialect, Extract<BaseFamilyOf<SourceDialect, SourceKind>, string>> extends infer Targets extends string
-                          ? "text" extends Targets
-                            ? true
-                            : false
-                          : false
-                        : false
-                      : BaseFamilyOf<SourceDialect, TargetKind> extends FamilyCastTargets<
-                          SourceDialect,
-                          Extract<BaseFamilyOf<SourceDialect, SourceKind>, string>
-                        >
-                        ? true
-                        : false
+            : Source extends Expression.DbType.Base<any, any>
+              ? Target extends Expression.DbType.Base<any, any>
+                ? BaseFamilyOf<Target> extends ExactKindFamily
+                  ? false
+                  : BaseFamilyOf<Target> extends BaseCastTargetsOf<Source>
+                    ? true
                     : false
-                  : false
                 : false
               : false
-            : false
     : false
   : false

package/src/internal/datatypes/shape.d.ts

@@ -0,0 +1,16 @@
+import type { BigIntString, DecimalString, InstantString, JsonValue, LocalDateString, LocalDateTimeString, LocalTimeString, OffsetTimeString, YearString } from "../runtime/value.js";
+export type RuntimeTag = "string" | "number" | "bigintString" | "boolean" | "json" | "localDate" | "localTime" | "offsetTime" | "localDateTime" | "instant" | "year" | "decimalString" | "bytes" | "array" | "record" | "unknown" | "null";
+export type RuntimeOfTag<Tag extends RuntimeTag> = Tag extends "string" ? string : Tag extends "number" ? number : Tag extends "bigintString" ? BigIntString : Tag extends "boolean" ? boolean : Tag extends "json" ? JsonValue : Tag extends "localDate" ? LocalDateString : Tag extends "localTime" ? LocalTimeString : Tag extends "offsetTime" ? OffsetTimeString : Tag extends "localDateTime" ? LocalDateTimeString : Tag extends "instant" ? InstantString : Tag extends "year" ? YearString : Tag extends "decimalString" ? DecimalString : Tag extends "bytes" ? Uint8Array : Tag extends "array" ? ReadonlyArray<unknown> : Tag extends "record" ? Record<string, unknown> : Tag extends "null" ? null : unknown;
+export interface DatatypeTraits {
+    readonly textual?: true;
+    readonly ordered?: true;
+}
+export interface DatatypeFamilySpec<CompareGroup extends string = string, CastTargets extends readonly string[] = readonly string[], Traits extends DatatypeTraits = DatatypeTraits> {
+    readonly compareGroup: CompareGroup;
+    readonly castTargets: CastTargets;
+    readonly traits: Traits;
+}
+export interface DatatypeKindSpec<Family extends string = string, Runtime extends RuntimeTag = RuntimeTag> {
+    readonly family: Family;
+    readonly runtime: Runtime;
+}

package/src/internal/datatypes/shape.ts

@@ -8,7 +8,7 @@ import type {
   LocalTimeString,
   OffsetTimeString,
   YearString
-} from "../runtime-value.js"
+} from "../runtime/value.js"
 
 export type RuntimeTag =
   | "string"

package/src/internal/derived-table.d.ts

@@ -0,0 +1,4 @@
+import { type CompletePlan, type CteSource, type DerivedSource, type LateralSource, type QueryPlan } from "./query.js";
+export declare const makeDerivedSource: <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>, Alias extends string>(plan: CompletePlan<PlanValue>, alias: Alias) => DerivedSource<PlanValue, Alias>;
+export declare const makeCteSource: <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>, Alias extends string>(plan: CompletePlan<PlanValue>, alias: Alias, recursive?: boolean) => CteSource<PlanValue, Alias>;
+export declare const makeLateralSource: <PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>, Alias extends string>(plan: PlanValue, alias: Alias) => LateralSource<PlanValue, Alias>;

package/src/internal/derived-table.ts

@@ -1,7 +1,7 @@
 import { pipeArguments } from "effect/Pipeable"
 
-import * as Expression from "./expression.js"
-import * as Plan from "./plan.js"
+import * as Expression from "./scalar.js"
+import * as Plan from "./row-set.js"
 import {
   type CompletePlan,
   type CteSource,
@@ -22,6 +22,17 @@ const DerivedProto = {
   }
 }
 
+const attachPipe = <Value extends object>(value: Value): Value => {
+  Object.defineProperty(value, "pipe", {
+    configurable: true,
+    writable: true,
+    value: function(this: unknown) {
+      return pipeArguments(value, arguments)
+    }
+  })
+  return value
+}
+
 const setPath = (
   target: Record<string, unknown>,
   path: readonly string[],
@@ -45,7 +56,7 @@ const setPath = (
 const pathAlias = (path: readonly string[]): string => path.join("__")
 
 const reboundedColumns = <
-  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any>,
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
   Alias extends string
 >(
   plan: PlanValue,
@@ -67,13 +78,7 @@ const reboundedColumns = <
       runtimeSchema: expression[Expression.TypeId].runtimeSchema,
       nullability: expression[Expression.TypeId].nullability,
       dialect: expression[Expression.TypeId].dialect,
-      aggregation: "scalar",
-      source: {
-        tableName: alias,
-        columnName: projection.alias,
-        baseTableName: alias
-      },
-      sourceNullability: "propagate" as const,
+      kind: "scalar",
       dependencies: {
         [alias]: true
       } as Record<Alias, true>
@@ -87,14 +92,14 @@ const reboundedColumns = <
 }
 
 export const makeDerivedSource = <
-  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any>,
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
   Alias extends string
 >(
   plan: CompletePlan<PlanValue>,
   alias: Alias
 ): DerivedSource<PlanValue, Alias> => {
   const columns = reboundedColumns(plan, alias)
-  const derived = Object.create(DerivedProto) as Record<string, unknown>
+  const derived = attachPipe(Object.create(DerivedProto)) as Record<string, unknown>
   Object.assign(derived, columns)
   derived.kind = "derived"
   derived.name = alias
@@ -107,7 +112,7 @@ export const makeDerivedSource = <
 }
 
 export const makeCteSource = <
-  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any>,
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
   Alias extends string
 >(
   plan: CompletePlan<PlanValue>,
@@ -115,7 +120,7 @@ export const makeCteSource = <
   recursive = false
 ): CteSource<PlanValue, Alias> => {
   const columns = reboundedColumns(plan, alias)
-  const cte = Object.create(DerivedProto) as Record<string, unknown>
+  const cte = attachPipe(Object.create(DerivedProto)) as Record<string, unknown>
   Object.assign(cte, columns)
   cte.kind = "cte"
   cte.name = alias
@@ -129,14 +134,14 @@ export const makeCteSource = <
 }
 
 export const makeLateralSource = <
-  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any>,
+  PlanValue extends QueryPlan<any, any, any, any, any, any, any, any, any, any>,
   Alias extends string
 >(
   plan: PlanValue,
   alias: Alias
 ): LateralSource<PlanValue, Alias> => {
   const columns = reboundedColumns(plan, alias)
-  const lateral = Object.create(DerivedProto) as Record<string, unknown>
+  const lateral = attachPipe(Object.create(DerivedProto)) as Record<string, unknown>
   Object.assign(lateral, columns)
   lateral.kind = "lateral"
   lateral.name = alias