@sigitex/outlaw 1.2.0 → 2.0.0

package/src/schemaBuilder/metadata.ts

@@ -1,4 +1,5 @@
 // oxlint-disable typescript/no-explicit-any
+export type { ColumnRef } from "./ColumnRef"
 export type Text = "text"
 export type Integer = "integer"
 export type Real = "real"
@@ -16,7 +17,9 @@ export type TableData = {
   readonly constraints: TableConstraintData[]
 }
 
-export type CheckExpression = string | ((name: string, column: ColumnData) => string)
+export type CheckExpression =
+  | string
+  | ((name: string, column: ColumnData) => string)
 
 export type ColumnData = {
   readonly name: string
@@ -30,14 +33,15 @@ export type ColumnData = {
   readonly check: CheckExpression | undefined
 }
 
-export type ColumnRef = {
+export type ForeignKeyData = {
   readonly table: string
   readonly column: string
 }
 
-export type ForeignKeyData = ColumnRef
-
-export type TableConstraintData = TablePrimaryKeyData | TableUniqueData | TableCheckData
+export type TableConstraintData =
+  | TablePrimaryKeyData
+  | TableUniqueData
+  | TableCheckData
 
 export type TablePrimaryKeyData = {
   readonly type: "primaryKey"
@@ -51,7 +55,9 @@ export type TableUniqueData = {
 
 export type TableCheckData = {
   readonly type: "check"
-  readonly expression: string | ((columns: Record<string, string>, table: TableData) => string)
+  readonly expression:
+    | string
+    | ((columns: Record<string, string>, table: TableData) => string)
 }
 
 export type PrimaryKeyData = {

package/src/schemaBuilder/schemaBuilder.types.ts

@@ -1,9 +1,18 @@
 // oxlint-disable typescript/no-explicit-any
-import type { CheckExpression, ColumnData, ColumnRef, IndexData, TableData, ViewData } from "./metadata"
+import type {
+  CheckExpression,
+  ColumnData,
+  ColumnRef,
+  IndexData,
+  TableData,
+  ViewData,
+} from "./metadata"
 import type { Mapping } from "./Mapping"
+import type { QuerySource } from "../queryBuilder/QuerySource"
+import type { QueryScope } from "../queryBuilder/QueryScope"
 
 export type SchemaMembers = {
-  readonly [key: string]: AnyBuildTable | BuildView<any> | BuildIndex
+  readonly [key: string]: AnyBuildTable | AnyBuildView | BuildIndex
 }
 
 export type TablesOf<M extends SchemaMembers> = {
@@ -11,7 +20,7 @@ export type TablesOf<M extends SchemaMembers> = {
 }
 
 export type ViewsOf<M extends SchemaMembers> = {
-  [K in keyof M as M[K] extends BuildView<any> ? K : never]: M[K]
+  [K in keyof M as M[K] extends AnyBuildView ? K : never]: M[K]
 }
 
 export type IndexesOf<M extends SchemaMembers> = {
@@ -30,7 +39,10 @@ export type BuildColumns = {
   readonly [columnName: string]: BuildColumn<any, any>
 }
 
-export type InferColumn<BC> = BC extends BuildColumn<infer Type, infer Defined>
+export type InferColumn<BC> = BC extends {
+  readonly $value?: infer Type
+  readonly $defined?: infer Defined
+}
   ? "notNull" extends Defined
     ? Type
     : "primaryKey" extends Defined
@@ -38,7 +50,7 @@ export type InferColumn<BC> = BC extends BuildColumn<infer Type, infer Defined>
       : Type | null
   : never
 
-export type InferTable<BT> = BT extends BuildTable<infer Columns>
+export type InferTable<BT> = BT extends { readonly $columns: infer Columns }
   ? { [K in keyof Columns]: InferColumn<Columns[K]> }
   : never
 
@@ -49,25 +61,36 @@ export type RefBy = {
   readonly value: unknown
 }
 
-type BuildTableDSL<DefineColumns> = {
+type BuildTableDSL<DefineColumns, Name extends string> = {
   readonly $kind: "table"
-  primaryKey: (...columns: (keyof DefineColumns)[]) => BuildTable<DefineColumns>
-  unique: (...columns: (keyof DefineColumns)[]) => BuildTable<DefineColumns>
-  check: (expression: string | ((columns: ColumnNames<DefineColumns>, table: TableData) => string)) => BuildTable<DefineColumns>
-  select(all: "*"): SchemaSelect<DefineColumns, DefineColumns>
-  select<C extends keyof DefineColumns>(...columns: C[]): SchemaSelect<Pick<DefineColumns, C>, DefineColumns>
+  readonly $columns: DefineColumns
+  primaryKey: (
+    ...columns: (keyof DefineColumns)[]
+  ) => BuildTable<DefineColumns, Name>
+  unique: (
+    ...columns: (keyof DefineColumns)[]
+  ) => BuildTable<DefineColumns, Name>
+  check: (
+    expression:
+      | string
+      | ((columns: ColumnNames<DefineColumns>, table: TableData) => string),
+  ) => BuildTable<DefineColumns, Name>
   readonly by: {
     readonly [K in keyof DefineColumns]: (
       value: InferColumn<DefineColumns[K]>,
     ) => RefBy
   }
   readonly $meta: TableData
-  readonly infer: InferTable<BuildTable<DefineColumns>>
+  readonly infer: {
+    [Key in keyof DefineColumns]: InferColumn<DefineColumns[Key]>
+  }
 }
 
-export type BuildTable<DefineColumns> = BuildTableDSL<DefineColumns> & {
-  readonly [K in keyof DefineColumns]: ColumnRef
-}
+export type BuildTable<
+  DefineColumns,
+  Name extends string = string,
+> = BuildTableDSL<DefineColumns, Name> &
+  QuerySource<Name, QueryScope.SchemaColumns<DefineColumns>>
 
 export type AnyBuildTable = {
   readonly $kind: "table"
@@ -75,8 +98,16 @@ export type AnyBuildTable = {
   readonly [key: string]: unknown
 }
 
-// oxlint-disable-next-line no-unused-vars
-export type BuildView<SelectColumns = unknown> = {
+export type BuildView<
+  SelectColumns extends QueryScope.Columns = QueryScope.Columns,
+  Name extends string = string,
+> = QuerySource<Name, SelectColumns> & {
+  readonly $kind: "view"
+  readonly $meta: ViewData
+  readonly $tableData: TableData
+}
+
+export type AnyBuildView = {
   readonly $kind: "view"
   readonly $meta: ViewData
   readonly $tableData: TableData
@@ -87,27 +118,23 @@ export type BuildIndex = {
   readonly $meta: IndexData
 }
 
-/** Schema-level select builder — tracks column types without requiring a connection. */
-export type SchemaSelect<SelectColumns, Columns> = {
-  where<Column extends keyof Columns>(column: Column, value: unknown): SchemaSelect<SelectColumns, Columns>
-  where<Column extends keyof Columns>(column: Column, operator: string): SchemaSelect<SelectColumns, Columns>
-  where<Column extends keyof Columns>(column: Column, operator: string, value: unknown): SchemaSelect<SelectColumns, Columns>
-  orderBy(sorts: [keyof Columns, "asc" | "desc"][]): SchemaSelect<SelectColumns, Columns>
-  limit(n: number): SchemaSelect<SelectColumns, Columns>
-  offset(n: number): SchemaSelect<SelectColumns, Columns>
-  join<JC>(table: BuildTable<JC>): SchemaSelect<SelectColumns & JC, Columns & JC>
-  leftJoin<JC>(table: BuildTable<JC>): SchemaSelect<SelectColumns & JC, Columns & JC>
-  on(left: ColumnRef, operator: string, right: ColumnRef): SchemaSelect<SelectColumns, Columns>
-}
+export type SchemaSelect<
+  SelectColumns extends QueryScope.Columns,
+  Scope extends QueryScope,
+> = QueryScope.Selection<SelectColumns, Scope>
 
 export type BuildColumn<Type, Defined extends string> = Omit<
   {
+    readonly $value?: Type
+    readonly $defined?: Defined
     readonly notNull: BuildColumn<Type, Defined | "notNull">
     readonly primaryKey: BuildColumn<Type, Defined | "primaryKey"> &
       BuildPrimaryKey<Type, Defined | "primaryKey">
     readonly default: (sql: string) => BuildColumn<Type, Defined | "default">
     readonly unique: BuildColumn<Type, Defined | "unique">
-    readonly check: (expression: CheckExpression) => BuildColumn<Type, Defined | "check">
+    readonly check: (
+      expression: CheckExpression,
+    ) => BuildColumn<Type, Defined | "check">
     readonly foreignKey: BuildForeignKey<Type, Defined>
     readonly map: BuildColumnMap<Type, Defined>
   },