@typed-sql/core 1.0.0-beta.1 → 1.0.0-beta.2

package/CHANGELOG.md

@@ -1,5 +1,30 @@
 # @typed-sql/core
 
+## 1.0.0-beta.2
+
+### Patch Changes
+
+- 1563a7a: Declare and enforce the 1.0 package stability boundary. Core SQL, compiler, schema, config, AST,
+  PostgreSQL, MySQL, and CLI packages form the stable train; the TypeScript preview bridge and
+  language server remain explicitly experimental. Freeze public entrypoints and query type contracts,
+  and remove internal compiler/type helpers from stable package-root exports before 1.0.
+- 9dd6bc4: Finalize dialect contract version 3 with explicit identifier quoting and grammar-owned capability
+  declarations. Accept third-party snapshot dialects, validate grammar versions, and document the
+  public grammar-authoring and conformance workflow.
+- 3e2c75c: Infer ordered query parameter tuples and let TypeScript reject interpolation values that do not
+  match their SQL context. Dialect contract version 2 adds explicit parameter analysis; unresolved
+  positions remain `unknown`. Add typed nullable predicate composition through `sql.fragment()`,
+  `sql.and()`, `sql.or()`, `sql.where()`, and `sql.append()` while preserving row and parameter tuples.
+  Direct append fragments are grammar-analyzed cumulatively against their static base, so TypeScript
+  rejects fragment interpolation values that disagree with the referenced database columns.
+  Add `sql.empty` and SQL-template-native conditional structural fragments. The compiler analyzes
+  complete branch variants, preserves literal boolean-dependent result rows, and type-checks nested
+  fragment parameters without adding a query-builder DSL. Bound independent structural expansion at
+  64 variants by default, correlate repeated conditions, merge diagnostics and fragment expectations
+  across variants, and fail closed on incompatible contexts. Share indexed catalog and conservative
+  parameter-resolution primitives across grammars, harden cooked-template scanning, and add runtime,
+  resolver, scanner, and structural performance gates.
+
 ## 1.0.0-beta.1
 
 ### Patch Changes

package/README.md

@@ -1,7 +1,7 @@
 # @typed-sql/core
 
 The driver- and dialect-neutral foundation of [typed-sql](https://github.com/Lojhan/typed-sql).
-It owns the `sql` tagged template, `Query<Row>`, safe query fragments, rendering contract, database
+It owns the `sql` tagged template, `Query<Row, Parameters>`, safe query fragments, rendering contract, database
 adapter contract, diagnostics, and the interface implemented by every SQL grammar.
 
 Most applications install it alongside one dialect:
@@ -23,24 +23,129 @@ const query = sql`
 `;
 ```
 
+The compiler supplies the ordered parameter tuple from SQL context. For example, comparing an
+interpolation with a `bigint` column produces `Query<Row, readonly [bigint]>`, so passing a `string`
+is a normal TypeScript error. Positions that cannot be proven remain `unknown`.
+
+For optional runtime filters, infer a static base query and compose predicates without concatenating
+values into SQL:
+
+```ts
+import { sql } from "@typed-sql/postgres";
+import type { QueryRow } from "@typed-sql/core";
+
+const base = sql`SELECT account.id, account.status FROM accounts AS account`;
+type Account = QueryRow<typeof base>;
+
+function filtered(status: Account["status"] | null, minimumId: Account["id"] | null) {
+  const predicates = [
+    status == null ? undefined : sql.fragment`account.status = ${status}`,
+    minimumId == null ? undefined : sql.fragment`account.id >= ${minimumId}`,
+  ] as const;
+  return sql.where(base, sql.and(predicates));
+}
+```
+
+`sql.and()` and `sql.or()` accept nullable fragment tuples, preserve parameter order, parenthesize
+each predicate, and render `TRUE` when every predicate is absent. `sql.where()` preserves the base
+row and concatenates its parameter tuple with the fragment tuple. This is a safe parameterization
+and type-composition boundary; arbitrary dynamic SQL strings are intentionally not analyzed.
+
+`sql.append()` provides the type-safe equivalent of conditionally appending clauses:
+
+```ts
+function filtered2(filters: { status?: Account["status"] | null; minimumId?: Account["id"] | null }) {
+  const query = sql`SELECT account.id, account.status FROM accounts AS account`;
+  return sql.append(
+    query,
+    sql.fragment` WHERE 1 = 1`,
+    filters.status == null ? undefined : sql.fragment` AND account.status = ${filters.status}`,
+    filters.minimumId == null ? undefined : sql.fragment` AND account.id >= ${filters.minimumId}`,
+  );
+}
+```
+
+JavaScript does not support operator overloading, so `query += fragment` would stringify the values
+and erase their type and parameter segments. `sql.append()` skips `undefined`, `null`, and `false`,
+then concatenates only validated fragments. Variadic arguments retain exact parameter order;
+mutable fragment arrays can be spread and retain their allowed parameter union, but have a
+variable-length parameter array.
+
+When direct variadic fragments are visible to the typed-sql compiler, it analyzes them cumulatively
+with the static base. The grammar therefore supplies each interpolation's expected column type;
+the core runtime alone only owns immutable composition and parameterization.
+
+`sql.empty` enables SQL-template-native conditional structure:
+
+```ts
+const query = sql`
+  SELECT account.id, account.email
+    ${select.status ? sql.fragment`, account.status` : sql.empty}
+  FROM accounts AS account
+`;
+```
+
+The runtime only flattens fragment segments and values. The compiler analyzes every finite branch as
+a complete statement and supplies the branch-dependent row type; no clause-builder abstraction is
+introduced. Structural compilation defaults to at most 64 correlated variants and fails with
+`TSQ003` before invoking a grammar if independent conditions exceed that bound.
+
+`sql.join()` accepts only `SqlFragment` values. Its optional separator is also a trusted fragment,
+so use `sql.raw(" UNION ALL ")` when a non-comma separator is intentional; an arbitrary runtime
+string is never promoted to SQL implicitly.
+
 `@typed-sql/core` is directly useful to grammar and adapter authors:
 
 ```ts
 import {
   DIALECT_CONTRACT_VERSION,
+  assertDialectPlugin,
   createDatabase,
   defineConfig,
+  closestName,
+  ParameterCollector,
   renderQuery,
+  parameterTypeLiteral,
+  ResolverSchemaIndex,
   rowTypeLiteral,
   sql,
+  unionTypeLiterals,
   type DialectPlugin,
+  type DialectCapabilities,
   type Query,
+  type QueryParameters,
+  type QueryRow,
+  type SqlFragment,
   type SchemaSnapshot,
 } from "@typed-sql/core";
 ```
 
+`ResolverSchemaIndex`, `ParameterCollector`, `unionTypeLiterals`, and `closestName` are reusable,
+dialect-neutral resolver primitives. Future PostgreSQL, MySQL, MSSQL, SQLite, and third-party
+grammars can share indexed catalog lookup and conservative parameter merging while keeping SQL
+semantics, built-ins, quoting, type policy, and unsupported syntax inside their own package.
+
 The package has no database, parser, grammar, driver, TypeScript compiler, or editor dependency.
 See the [architecture contract](https://github.com/Lojhan/typed-sql/blob/main/docs/ARCHITECTURE.md)
+and [grammar authoring guide](https://github.com/Lojhan/typed-sql/blob/main/docs/GRAMMAR_AUTHORING.md)
 and [root documentation](https://github.com/Lojhan/typed-sql#readme).
 
+## Diagnostics
+
+Diagnostic meanings become stable at 1.0. Consumers should key automation on `code`, not English
+message text. The machine-readable registry is exported as `diagnosticRegistry`.
+
+| Range | Meaning |
+| --- | --- |
+| `TSQ001` | SQL syntax error |
+| `TSQ002` | Parser resource limit exceeded |
+| `TSQ003` | Conditional SQL exceeded the configured structural variant bound |
+| `TSQ007` | Dialect/snapshot contract mismatch |
+| `TSQ100`–`TSQ108` | Catalog lookup, ambiguity, output naming, and cast errors |
+| `TSQ202`–`TSQ204` | Unknown/ambiguous functions and unsafe operator inference |
+| `TSQ205` | A shared fragment has incompatible parameter expectations across structural branches |
+| `TSQ210`–`TSQ217` | CTE, DML arity, join, and subquery safety errors |
+| `TSQ301` | Schema or type-policy drift |
+| `TSQ401` | Deliberately unsupported dialect surface |
+
 MIT © typed-sql contributors

package/dist/packages/core/src/diagnostics.d.ts

@@ -7,6 +7,10 @@ export declare const diagnosticRegistry: Readonly<{
         readonly category: "resource";
         readonly summary: "SQL exceeded a parser resource limit.";
     };
+    readonly TSQ003: {
+        readonly category: "resource";
+        readonly summary: "Conditional SQL exceeded the structural variant limit.";
+    };
     readonly TSQ007: {
         readonly category: "contract";
         readonly summary: "The schema snapshot and dialect do not match.";
@@ -59,6 +63,10 @@ export declare const diagnosticRegistry: Readonly<{
         readonly category: "type";
         readonly summary: "A function overload is ambiguous.";
     };
+    readonly TSQ205: {
+        readonly category: "type";
+        readonly summary: "A composed parameter has incompatible structural contexts.";
+    };
     readonly TSQ210: {
         readonly category: "support";
         readonly summary: "Recursive CTE inference is not supported safely.";

package/dist/packages/core/src/diagnostics.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../../src/diagnostics.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB;;iBACnB,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,iCAAiC;;;iBAC9D,QAAQ,EAAE,UAAU;iBAAE,OAAO,EAAE,uCAAuC;;;iBACtE,QAAQ,EAAE,UAAU;iBAAE,OAAO,EAAE,+CAA+C;;;iBAC9E,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,oCAAoC;;;iBACjE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,qCAAqC;;;iBAClE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,kCAAkC;;;iBAC/D,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,kDAAkD;;;iBAC/E,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,oDAAoD;;;iBACjF,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,oDAAoD;;;iBACjF,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,sCAAsC;;;iBACjE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,yCAAyC;;;iBACtE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,iCAAiC;;;iBAC9D,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,wBAAwB;;;iBACnD,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,wCAAwC;;;iBACnE,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,mCAAmC;;;iBAC9D,QAAQ,EAAE,SAAS;iBAAE,OAAO,EAAE,kDAAkD;;;iBAChF,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,2BAA2B;;;iBACxD,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,6BAA6B;;;iBAC1D,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,wCAAwC;;;iBACrE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,0CAA0C;;;iBACvE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,kDAAkD;;;iBAC/E,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,uDAAuD;;;iBACpF,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,oDAAoD;;;iBACjF,QAAQ,EAAE,OAAO;iBAAE,OAAO,EAAE,qEAAqE;;;iBACjG,QAAQ,EAAE,SAAS;iBAAE,OAAO,EAAE,mDAAmD;;EAClF,CAAC;AAEZ,MAAM,MAAM,sBAAsB,GAAG,MAAM,OAAO,kBAAkB,CAAC;AAErE,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,sBAAsB,CAEvF"}
+{"version":3,"file":"diagnostics.d.ts","sourceRoot":"","sources":["../../../../src/diagnostics.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,kBAAkB;;iBACnB,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,iCAAiC;;;iBAC9D,QAAQ,EAAE,UAAU;iBAAE,OAAO,EAAE,uCAAuC;;;iBACtE,QAAQ,EAAE,UAAU;iBAAE,OAAO,EAAE,wDAAwD;;;iBACvF,QAAQ,EAAE,UAAU;iBAAE,OAAO,EAAE,+CAA+C;;;iBAC9E,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,oCAAoC;;;iBACjE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,qCAAqC;;;iBAClE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,kCAAkC;;;iBAC/D,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,kDAAkD;;;iBAC/E,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,oDAAoD;;;iBACjF,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,oDAAoD;;;iBACjF,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,sCAAsC;;;iBACjE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,yCAAyC;;;iBACtE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,iCAAiC;;;iBAC9D,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,wBAAwB;;;iBACnD,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,wCAAwC;;;iBACnE,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,mCAAmC;;;iBAC9D,QAAQ,EAAE,MAAM;iBAAE,OAAO,EAAE,4DAA4D;;;iBACvF,QAAQ,EAAE,SAAS;iBAAE,OAAO,EAAE,kDAAkD;;;iBAChF,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,2BAA2B;;;iBACxD,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,6BAA6B;;;iBAC1D,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,wCAAwC;;;iBACrE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,0CAA0C;;;iBACvE,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,kDAAkD;;;iBAC/E,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,uDAAuD;;;iBACpF,QAAQ,EAAE,QAAQ;iBAAE,OAAO,EAAE,oDAAoD;;;iBACjF,QAAQ,EAAE,OAAO;iBAAE,OAAO,EAAE,qEAAqE;;;iBACjG,QAAQ,EAAE,SAAS;iBAAE,OAAO,EAAE,mDAAmD;;EAClF,CAAC;AAEZ,MAAM,MAAM,sBAAsB,GAAG,MAAM,OAAO,kBAAkB,CAAC;AAErE,wBAAgB,wBAAwB,CAAC,KAAK,EAAE,MAAM,GAAG,KAAK,IAAI,sBAAsB,CAEvF"}

package/dist/packages/core/src/diagnostics.js

@@ -1,6 +1,7 @@
 export const diagnosticRegistry = Object.freeze({
     TSQ001: { category: "syntax", summary: "SQL syntax could not be parsed." },
     TSQ002: { category: "resource", summary: "SQL exceeded a parser resource limit." },
+    TSQ003: { category: "resource", summary: "Conditional SQL exceeded the structural variant limit." },
     TSQ007: { category: "contract", summary: "The schema snapshot and dialect do not match." },
     TSQ100: { category: "schema", summary: "A referenced table does not exist." },
     TSQ101: { category: "schema", summary: "A referenced column does not exist." },
@@ -14,6 +15,7 @@ export const diagnosticRegistry = Object.freeze({
     TSQ202: { category: "type", summary: "A function is unknown." },
     TSQ203: { category: "type", summary: "An operator cannot be inferred safely." },
     TSQ204: { category: "type", summary: "A function overload is ambiguous." },
+    TSQ205: { category: "type", summary: "A composed parameter has incompatible structural contexts." },
     TSQ210: { category: "support", summary: "Recursive CTE inference is not supported safely." },
     TSQ211: { category: "schema", summary: "A CTE name is duplicated." },
     TSQ212: { category: "result", summary: "A CTE does not return rows." },

package/dist/packages/core/src/diagnostics.js.map

@@ -1 +1 @@
-{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../../../src/diagnostics.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,iCAAiC,EAAE;IAC1E,MAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,uCAAuC,EAAE;IAClF,MAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,+CAA+C,EAAE;IAC1F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oCAAoC,EAAE;IAC7E,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,qCAAqC,EAAE;IAC9E,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kCAAkC,EAAE;IAC3E,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kDAAkD,EAAE;IAC3F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oDAAoD,EAAE;IAC7F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oDAAoD,EAAE;IAC7F,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,sCAAsC,EAAE;IAC7E,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,yCAAyC,EAAE;IAClF,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,iCAAiC,EAAE;IAC1E,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB,EAAE;IAC/D,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,wCAAwC,EAAE;IAC/E,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,mCAAmC,EAAE;IAC1E,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,kDAAkD,EAAE;IAC5F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,2BAA2B,EAAE;IACpE,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,6BAA6B,EAAE;IACtE,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,wCAAwC,EAAE;IACjF,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,0CAA0C,EAAE;IACnF,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kDAAkD,EAAE;IAC3F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,uDAAuD,EAAE;IAChG,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oDAAoD,EAAE;IAC7F,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,qEAAqE,EAAE;IAC7G,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,mDAAmD,EAAE;CACrF,CAAC,CAAC;AAIZ,MAAM,UAAU,wBAAwB,CAAC,KAAa;IACpD,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC"}
+{"version":3,"file":"diagnostics.js","sourceRoot":"","sources":["../../../../src/diagnostics.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,MAAM,CAAC;IAC9C,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,iCAAiC,EAAE;IAC1E,MAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,uCAAuC,EAAE;IAClF,MAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,wDAAwD,EAAE;IACnG,MAAM,EAAE,EAAE,QAAQ,EAAE,UAAU,EAAE,OAAO,EAAE,+CAA+C,EAAE;IAC1F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oCAAoC,EAAE;IAC7E,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,qCAAqC,EAAE;IAC9E,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kCAAkC,EAAE;IAC3E,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kDAAkD,EAAE;IAC3F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oDAAoD,EAAE;IAC7F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oDAAoD,EAAE;IAC7F,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,sCAAsC,EAAE;IAC7E,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,yCAAyC,EAAE;IAClF,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,iCAAiC,EAAE;IAC1E,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,wBAAwB,EAAE;IAC/D,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,wCAAwC,EAAE;IAC/E,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,mCAAmC,EAAE;IAC1E,MAAM,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAE,4DAA4D,EAAE;IACnG,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,kDAAkD,EAAE;IAC5F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,2BAA2B,EAAE;IACpE,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,6BAA6B,EAAE;IACtE,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,wCAAwC,EAAE;IACjF,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,0CAA0C,EAAE;IACnF,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,kDAAkD,EAAE;IAC3F,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,uDAAuD,EAAE;IAChG,MAAM,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,OAAO,EAAE,oDAAoD,EAAE;IAC7F,MAAM,EAAE,EAAE,QAAQ,EAAE,OAAO,EAAE,OAAO,EAAE,qEAAqE,EAAE;IAC7G,MAAM,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAE,mDAAmD,EAAE;CACrF,CAAC,CAAC;AAIZ,MAAM,UAAU,wBAAwB,CAAC,KAAa;IACpD,OAAO,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,KAAK,CAAC,CAAC;AAClD,CAAC"}

package/dist/packages/core/src/index.d.ts

@@ -1,7 +1,9 @@
-export { createDatabase, renderQuery, sql } from "./query.js";
-export { diagnosticRegistry, isTypedSqlDiagnosticCode } from "./diagnostics.js";
 export type { TypedSqlDiagnosticCode } from "./diagnostics.js";
-export { defineConfig, DIALECT_CONTRACT_VERSION, rowTypeLiteral } from "./types.js";
-export type * from "./query.js";
-export type * from "./types.js";
+export { diagnosticRegistry, isTypedSqlDiagnosticCode } from "./diagnostics.js";
+export type { Database, OptionalSqlFragment, Query, QueryExecutor, QueryParameters, QueryRow, RenderedQuery, SqlFragment, SqlRenderer, SqlSegment, SqlTag, TransactionRunner, } from "./query.js";
+export { createDatabase, renderQuery, sql } from "./query.js";
+export type { ResolverType } from "./resolver.js";
+export { closestName, ParameterCollector, ResolverSchemaIndex, unionTypeLiterals } from "./resolver.js";
+export type { ColumnSnapshot, DialectAnalysis, DialectCapabilities, DialectPlugin, DomainSnapshot, FunctionSnapshot, GeneratedSchemaMetadata, GeneratedSchemaSnapshot, ResolvedColumn, ResolvedParameter, SchemaProvider, SchemaSnapshot, SourceRange, SqlDiagnostic, TableSnapshot, TypedSqlConfig, } from "./types.js";
+export { assertDialectPlugin, DIALECT_CONTRACT_VERSION, defineConfig, parameterTypeLiteral, rowTypeLiteral, } from "./types.js";
 //# sourceMappingURL=index.d.ts.map

package/dist/packages/core/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAChF,YAAY,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC;AACpF,mBAAmB,YAAY,CAAC;AAChC,mBAAmB,YAAY,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"AAAA,YAAY,EAAE,sBAAsB,EAAE,MAAM,kBAAkB,CAAC;AAC/D,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAChF,YAAY,EACV,QAAQ,EACR,mBAAmB,EACnB,KAAK,EACL,aAAa,EACb,eAAe,EACf,QAAQ,EACR,aAAa,EACb,WAAW,EACX,WAAW,EACX,UAAU,EACV,MAAM,EACN,iBAAiB,GAClB,MAAM,YAAY,CAAC;AACpB,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAC9D,YAAY,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAClD,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AACxG,YAAY,EACV,cAAc,EACd,eAAe,EACf,mBAAmB,EACnB,aAAa,EACb,cAAc,EACd,gBAAgB,EAChB,uBAAuB,EACvB,uBAAuB,EACvB,cAAc,EACd,iBAAiB,EACjB,cAAc,EACd,cAAc,EACd,WAAW,EACX,aAAa,EACb,aAAa,EACb,cAAc,GACf,MAAM,YAAY,CAAC;AACpB,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,YAAY,EACZ,oBAAoB,EACpB,cAAc,GACf,MAAM,YAAY,CAAC"}

package/dist/packages/core/src/index.js

@@ -1,4 +1,5 @@
-export { createDatabase, renderQuery, sql } from "./query.js";
 export { diagnosticRegistry, isTypedSqlDiagnosticCode } from "./diagnostics.js";
-export { defineConfig, DIALECT_CONTRACT_VERSION, rowTypeLiteral } from "./types.js";
+export { createDatabase, renderQuery, sql } from "./query.js";
+export { closestName, ParameterCollector, ResolverSchemaIndex, unionTypeLiterals } from "./resolver.js";
+export { assertDialectPlugin, DIALECT_CONTRACT_VERSION, defineConfig, parameterTypeLiteral, rowTypeLiteral, } from "./types.js";
 //# sourceMappingURL=index.js.map

package/dist/packages/core/src/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAC9D,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAEhF,OAAO,EAAE,YAAY,EAAE,wBAAwB,EAAE,cAAc,EAAE,MAAM,YAAY,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../src/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,wBAAwB,EAAE,MAAM,kBAAkB,CAAC;AAehF,OAAO,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,EAAE,MAAM,YAAY,CAAC;AAE9D,OAAO,EAAE,WAAW,EAAE,kBAAkB,EAAE,mBAAmB,EAAE,iBAAiB,EAAE,MAAM,eAAe,CAAC;AAmBxG,OAAO,EACL,mBAAmB,EACnB,wBAAwB,EACxB,YAAY,EACZ,oBAAoB,EACpB,cAAc,GACf,MAAM,YAAY,CAAC"}

package/dist/packages/core/src/query.d.ts

@@ -10,20 +10,43 @@ export type SqlSegment = {
     readonly kind: "identifier";
     readonly name: string;
 };
-export interface SqlFragment {
-    readonly [fragmentBrand]: true;
+export interface SqlFragment<Params extends readonly unknown[] = readonly unknown[]> {
+    readonly [fragmentBrand]: () => Params;
     readonly segments: readonly SqlSegment[];
 }
-export interface Query<Row> {
-    readonly [queryBrand]: (value: Row) => Row;
+export type QueryRow<Value> = Value extends Query<infer Row, infer _Params> ? Row : never;
+export type QueryParameters<Value> = Value extends Query<infer _Row, infer Params> ? Params : never;
+type SqlPartParameters<Part> = [Part] extends [SqlFragment<infer Params>] ? Params : readonly [Part];
+export type SqlPartsParameters<Parts extends readonly unknown[], Accumulator extends readonly unknown[] = readonly []> = number extends Parts["length"] ? readonly unknown[] : Parts extends readonly [infer Head, ...infer Tail] ? SqlPartsParameters<Tail, readonly [...Accumulator, ...SqlPartParameters<Head>]> : Accumulator;
+type CheckedSqlParts<Parts extends readonly unknown[], Expected extends readonly unknown[]> = Parts & ([SqlPartsParameters<Parts>] extends [Expected] ? unknown : never);
+type PresentFragment<Part> = Exclude<Part, false | null | undefined>;
+type OptionalFragmentParameters<Part> = [PresentFragment<Part>] extends [never] ? readonly [] : PresentFragment<Part> extends SqlFragment<infer Params> ? Params : readonly unknown[];
+export type FragmentListParameters<Parts extends readonly unknown[], Accumulator extends readonly unknown[] = readonly []> = number extends Parts["length"] ? readonly OptionalFragmentParameters<Parts[number]>[number][] : Parts extends readonly [infer Head, ...infer Tail] ? FragmentListParameters<Tail, readonly [...Accumulator, ...OptionalFragmentParameters<Head>]> : Accumulator;
+export type OptionalSqlFragment = SqlFragment | false | null | undefined;
+export interface Query<Row, Params extends readonly unknown[] = readonly unknown[]> {
+    readonly [queryBrand]: {
+        readonly row: (value: Row) => Row;
+        readonly params: (value: Params) => Params;
+    };
     readonly segments: readonly SqlSegment[];
 }
 export interface SqlTag {
-    <Row = unknown>(strings: TemplateStringsArray, ...parts: readonly unknown[]): Query<Row>;
-    readonly ident: (name: string) => SqlFragment;
-    readonly value: (value: unknown) => SqlFragment;
-    readonly join: (parts: readonly SqlFragment[], separator?: string) => SqlFragment;
-    readonly raw: (text: string) => SqlFragment;
+    <Row = unknown, Parts extends readonly unknown[] = readonly unknown[]>(strings: TemplateStringsArray, ...parts: Parts): Query<Row, SqlPartsParameters<Parts>>;
+    /**
+     * @internal Reserved compiler-overlay protocol. Applications must use the `sql` tag directly;
+     * this member may change alongside matching core/compiler releases without application-level compatibility.
+     */
+    readonly __typed: <Row, Params extends readonly unknown[]>() => <const Parts extends readonly unknown[]>(strings: TemplateStringsArray, ...parts: CheckedSqlParts<Parts, Params>) => Query<Row, Params>;
+    readonly fragment: <Parts extends readonly unknown[]>(strings: TemplateStringsArray, ...parts: Parts) => SqlFragment<SqlPartsParameters<Parts>>;
+    readonly empty: SqlFragment<readonly []>;
+    readonly ident: (name: string) => SqlFragment<readonly []>;
+    readonly value: <Value>(value: Value) => SqlFragment<readonly [Value]>;
+    readonly join: <const Parts extends readonly SqlFragment[]>(parts: Parts, separator?: SqlFragment<readonly []>) => SqlFragment<FragmentListParameters<Parts>>;
+    readonly and: <const Parts extends readonly OptionalSqlFragment[]>(parts: Parts) => SqlFragment<FragmentListParameters<Parts>>;
+    readonly or: <const Parts extends readonly OptionalSqlFragment[]>(parts: Parts) => SqlFragment<FragmentListParameters<Parts>>;
+    readonly where: <Row, QueryParams extends readonly unknown[], PredicateParams extends readonly unknown[]>(query: Query<Row, QueryParams>, predicate: SqlFragment<PredicateParams>) => Query<Row, readonly [...QueryParams, ...PredicateParams]>;
+    readonly append: <Row, QueryParams extends readonly unknown[], const Parts extends readonly OptionalSqlFragment[]>(query: Query<Row, QueryParams>, ...parts: Parts) => Query<Row, readonly [...QueryParams, ...FragmentListParameters<Parts>]>;
+    readonly raw: (text: string) => SqlFragment<readonly []>;
     readonly dynamic: (text: string) => Query<unknown>;
 }
 export interface SqlRenderer {
@@ -38,12 +61,12 @@ export interface QueryExecutor {
     execute(text: string, values: readonly unknown[]): Promise<readonly unknown[]>;
 }
 export interface Database {
-    execute<Row>(query: Query<Row>): Promise<readonly Row[]>;
+    execute<Row, Params extends readonly unknown[]>(query: Query<Row, Params>): Promise<readonly Row[]>;
     transaction<T>(fn: (db: Database) => Promise<T>): Promise<T>;
 }
 export type TransactionRunner = <T>(fn: (executor: QueryExecutor) => Promise<T>) => Promise<T>;
 export declare const sql: SqlTag;
-export declare function renderQuery<Row>(queryValue: Query<Row>, renderer: SqlRenderer): RenderedQuery;
+export declare function renderQuery<Row, Params extends readonly unknown[]>(queryValue: Query<Row, Params>, renderer: SqlRenderer): RenderedQuery;
 export declare function createDatabase(executor: QueryExecutor, renderer: SqlRenderer, transactionRunner?: TransactionRunner): Database;
 export {};
 //# sourceMappingURL=query.d.ts.map

package/dist/packages/core/src/query.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../../src/query.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/query.js

@@ -1,63 +1,138 @@
-const fragmentBrand = Symbol("typed-sql.fragment");
-const queryBrand = Symbol("typed-sql.query");
+const fragmentBrand = Symbol.for("@typed-sql/core.fragment");
+const queryBrand = Symbol.for("@typed-sql/core.query");
 const text = (textValue) => ({ kind: "text", text: textValue });
 const value = (valueItem) => ({ kind: "value", value: valueItem });
+const fragmentTypeBrand = () => [];
+const queryTypeBrand = Object.freeze({
+    row: (row) => row,
+    params: (params) => params,
+});
 function fragment(segments) {
-    return Object.freeze({ [fragmentBrand]: true, segments: Object.freeze([...segments]) });
+    return Object.freeze({
+        [fragmentBrand]: fragmentTypeBrand,
+        segments: Object.freeze(segments),
+    });
 }
 function isFragment(part) {
-    return typeof part === "object" && part !== null && fragmentBrand in part;
+    return (typeof part === "object" &&
+        part !== null &&
+        fragmentBrand in part &&
+        Array.isArray(part.segments));
 }
 function query(segments) {
-    return Object.freeze({ [queryBrand]: (row) => row, segments: Object.freeze([...segments]) });
+    return Object.freeze({
+        [queryBrand]: queryTypeBrand,
+        segments: Object.freeze(segments),
+    });
 }
-const tag = (strings, ...parts) => {
+function templateSegments(strings, parts) {
     const segments = [];
     for (let index = 0; index < strings.length; index += 1) {
         segments.push(text(strings[index] ?? ""));
-        if (index < parts.length) {
-            const part = parts[index];
-            if (isFragment(part))
-                segments.push(...part.segments);
-            else
-                segments.push(value(part));
-        }
+        if (index >= parts.length)
+            continue;
+        const part = parts[index];
+        if (isFragment(part))
+            segments.push(...part.segments);
+        else
+            segments.push(value(part));
     }
-    return query(segments);
+    return segments;
+}
+const tag = (strings, ...parts) => {
+    return query(templateSegments(strings, parts));
+};
+const fragmentTag = (strings, ...parts) => {
+    return fragment(templateSegments(strings, parts));
 };
+function booleanGroup(parts, operator) {
+    const segments = [];
+    for (const part of parts) {
+        if (part === undefined || part === null || part === false)
+            continue;
+        if (!isFragment(part))
+            throw new TypeError(`sql.${operator.toLowerCase()}() accepts SQL fragments or empty values`);
+        if (segments.length > 0)
+            segments.push(text(` ${operator} `));
+        segments.push(text("("), ...part.segments, text(")"));
+    }
+    if (segments.length === 0)
+        segments.push(text("TRUE"));
+    return fragment(segments);
+}
+const commaSeparator = fragment([text(", ")]);
 export const sql = Object.assign(tag, {
+    __typed() {
+        return (strings, ...parts) => tag(strings, ...parts);
+    },
+    fragment: fragmentTag,
+    empty: fragment([]),
     ident(name) {
         if (name.length === 0 || name.includes("\0"))
             throw new TypeError("SQL identifiers must be non-empty and cannot contain NUL");
         return fragment([{ kind: "identifier", name }]);
     },
-    value(valueItem) { return fragment([value(valueItem)]); },
-    join(parts, separator = ", ") {
+    value(valueItem) {
+        return fragment([value(valueItem)]);
+    },
+    join(parts, separator = commaSeparator) {
+        if (!isFragment(separator))
+            throw new TypeError("sql.join() separator must be a trusted SQL fragment");
         const segments = [];
         parts.forEach((part, index) => {
+            if (!isFragment(part))
+                throw new TypeError("sql.join() accepts SQL fragments");
             if (index > 0)
-                segments.push(text(separator));
+                segments.push(...separator.segments);
             segments.push(...part.segments);
         });
         return fragment(segments);
     },
-    raw(sqlText) { return fragment([text(sqlText)]); },
-    dynamic(sqlText) { return query([text(sqlText)]); },
+    and(parts) {
+        return booleanGroup(parts, "AND");
+    },
+    or(parts) {
+        return booleanGroup(parts, "OR");
+    },
+    where(queryValue, predicate) {
+        return query([
+            ...queryValue.segments,
+            text(" WHERE "),
+            ...predicate.segments,
+        ]);
+    },
+    append(queryValue, ...parts) {
+        const segments = [...queryValue.segments];
+        for (const part of parts) {
+            if (part === undefined || part === null || part === false)
+                continue;
+            if (!isFragment(part))
+                throw new TypeError("sql.append() accepts SQL fragments or empty values");
+            segments.push(...part.segments);
+        }
+        return query(segments);
+    },
+    raw(sqlText) {
+        return fragment([text(sqlText)]);
+    },
+    dynamic(sqlText) {
+        return query([text(sqlText)]);
+    },
 });
 export function renderQuery(queryValue, renderer) {
     const values = [];
-    let queryText = "";
+    const chunks = [];
     for (const segment of queryValue.segments) {
         if (segment.kind === "text")
-            queryText += segment.text;
+            chunks.push(segment.text);
         else if (segment.kind === "identifier")
-            queryText += renderer.quoteIdentifier(segment.name);
+            chunks.push(renderer.quoteIdentifier(segment.name));
         else {
             values.push(segment.value);
-            queryText += renderer.placeholder(values.length);
+            chunks.push(renderer.placeholder(values.length));
         }
     }
-    return { text: queryText, values: Object.freeze(values) };
+    return { text: chunks.join(""), values: Object.freeze(values) };
 }
 class DatabaseImplementation {
     #executor;
@@ -70,7 +145,7 @@ class DatabaseImplementation {
     }
     async execute(queryValue) {
         const rendered = renderQuery(queryValue, this.#renderer);
-        return await this.#executor.execute(rendered.text, rendered.values);
+        return (await this.#executor.execute(rendered.text, rendered.values));
     }
     async transaction(fn) {
         if (this.#transactionRunner === undefined)

package/dist/packages/core/src/query.js.map

@@ -1 +1 @@
-{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/query.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../../src/query.ts"],"names":[],"mappings":"AAAA,MAAM,aAAa,GAAkB,MAAM,CAAC,GAAG,CAAC,0BAA0B,CAAU,CAAC;AACrF,MAAM,UAAU,GAAkB,MAAM,CAAC,GAAG,CAAC,uBAAuB,CAAU,CAAC;AAqH/E,MAAM,IAAI,GAAG,CAAC,SAAiB,EAAc,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,IAAI,EAAE,SAAS,EAAE,CAAC,CAAC;AACpF,MAAM,KAAK,GAAG,CAAC,SAAkB,EAAc,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,KAAK,EAAE,SAAS,EAAE,CAAC,CAAC;AACxF,MAAM,iBAAiB,GAAG,GAAuB,EAAE,CAAC,EAAE,CAAC;AACvD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC;IACnC,GAAG,EAAE,CAAC,GAAY,EAAW,EAAE,CAAC,GAAG;IACnC,MAAM,EAAE,CAAC,MAA0B,EAAsB,EAAE,CAAC,MAAM;CACnE,CAAC,CAAC;AAEH,SAAS,QAAQ,CAAoC,QAAsB;IACzE,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,CAAC,aAAa,CAAC,EAAE,iBAAiC;QAClD,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;KAClC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,UAAU,CAAC,IAAa;IAC/B,OAAO,CACL,OAAO,IAAI,KAAK,QAAQ;QACxB,IAAI,KAAK,IAAI;QACb,aAAa,IAAI,IAAI;QACrB,KAAK,CAAC,OAAO,CAAE,IAA6B,CAAC,QAAQ,CAAC,CACvD,CAAC;AACJ,CAAC;AAED,SAAS,KAAK,CAAyC,QAAsB;IAC3E,OAAO,MAAM,CAAC,MAAM,CAAC;QACnB,CAAC,UAAU,CAAC,EAAE,cAAkE;QAChF,QAAQ,EAAE,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC;KAClC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,gBAAgB,CAAC,OAA6B,EAAE,KAAyB;IAChF,MAAM,QAAQ,GAAiB,EAAE,CAAC;IAClC,KAAK,IAAI,KAAK,GAAG,CAAC,EAAE,KAAK,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,IAAI,CAAC,EAAE,CAAC;QACvD,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;QAC1C,IAAI,KAAK,IAAI,KAAK,CAAC,MAAM;YAAE,SAAS;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,KAAK,CAAC,CAAC;QAC1B,IAAI,UAAU,CAAC,IAAI,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;;YACjD,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC;IAClC,CAAC;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC;AAED,MAAM,GAAG,GAAG,CACV,OAA6B,EAC7B,GAAG,KAAY,EACwB,EAAE;IACzC,OAAO,KAAK,CAAiC,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AACjF,CAAC,CAAC;AAEF,MAAM,WAAW,GAAG,CAClB,OAA6B,EAC7B,GAAG,KAAY,EACyB,EAAE;IAC1C,OAAO,QAAQ,CAA4B,gBAAgB,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,CAAC;AAC/E,CAAC,CAAC;AAEF,SAAS,YAAY,CACnB,KAAY,EACZ,QAAsB;IAEtB,MAAM,QAAQ,GAAiB,EAAE,CAAC;IAClC,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,KAAK;YAAE,SAAS;QACpE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,OAAO,QAAQ,CAAC,WAAW,EAAE,0CAA0C,CAAC,CAAC;QACpH,IAAI,QAAQ,CAAC,MAAM,GAAG,CAAC;YAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI,QAAQ,GAAG,CAAC,CAAC,CAAC;QAC9D,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,QAAQ,EAAE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,QAAQ,CAAC,MAAM,KAAK,CAAC;QAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC;IACvD,OAAO,QAAQ,CAAgC,QAAQ,CAAC,CAAC;AAC3D,CAAC;AAED,MAAM,cAAc,GAAG,QAAQ,CAAc,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;AAE3D,MAAM,CAAC,MAAM,GAAG,GAAW,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE;IAC5C,OAAO;QACL,OAAO,CACL,OAA6B,EAC7B,GAAG,KAAqC,EACxC,EAAE,CAAC,GAAG,CAAa,OAAO,EAAE,GAAI,KAA0B,CAAkC,CAAC;IACjG,CAAC;IACD,QAAQ,EAAE,WAAW;IACrB,KAAK,EAAE,QAAQ,CAAc,EAAE,CAAC;IAChC,KAAK,CAAC,IAAY;QAChB,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,IAAI,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC;YAC1C,MAAM,IAAI,SAAS,CAAC,0DAA0D,CAAC,CAAC;QAClF,OAAO,QAAQ,CAAc,CAAC,EAAE,IAAI,EAAE,YAAY,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC;IAC/D,CAAC;IACD,KAAK,CAAQ,SAAgB;QAC3B,OAAO,QAAQ,CAAmB,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC;IACxD,CAAC;IACD,IAAI,CACF,KAAY,EACZ,SAAS,GAA6B,cAAc;QAEpD,IAAI,CAAC,UAAU,CAAC,SAAS,CAAC;YAAE,MAAM,IAAI,SAAS,CAAC,qDAAqD,CAAC,CAAC;QACvG,MAAM,QAAQ,GAAiB,EAAE,CAAC;QAClC,KAAK,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC5B,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,MAAM,IAAI,SAAS,CAAC,kCAAkC,CAAC,CAAC;YAC/E,IAAI,KAAK,GAAG,CAAC;gBAAE,QAAQ,CAAC,IAAI,CAAC,GAAG,SAAS,CAAC,QAAQ,CAAC,CAAC;YACpD,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC,CAAC,CAAC;QACH,OAAO,QAAQ,CAAgC,QAAQ,CAAC,CAAC;IAC3D,CAAC;IACD,GAAG,CAAqD,KAAY;QAClE,OAAO,YAAY,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IACpC,CAAC;IACD,EAAE,CAAqD,KAAY;QACjE,OAAO,YAAY,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACnC,CAAC;IACD,KAAK,CACH,UAAmC,EACnC,SAAuC;QAEvC,OAAO,KAAK,CAAqD;YAC/D,GAAG,UAAU,CAAC,QAAQ;YACtB,IAAI,CAAC,SAAS,CAAC;YACf,GAAG,SAAS,CAAC,QAAQ;SACtB,CAAC,CAAC;IACL,CAAC;IACD,MAAM,CACJ,UAAmC,EACnC,GAAG,KAAY;QAEf,MAAM,QAAQ,GAAiB,CAAC,GAAG,UAAU,CAAC,QAAQ,CAAC,CAAC;QACxD,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;YACzB,IAAI,IAAI,KAAK,SAAS,IAAI,IAAI,KAAK,IAAI,IAAI,IAAI,KAAK,KAAK;gBAAE,SAAS;YACpE,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC;gBAAE,MAAM,IAAI,SAAS,CAAC,oDAAoD,CAAC,CAAC;YACjG,QAAQ,CAAC,IAAI,CAAC,GAAG,IAAI,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QACD,OAAO,KAAK,CAAmE,QAAQ,CAAC,CAAC;IAC3F,CAAC;IACD,GAAG,CAAC,OAAe;QACjB,OAAO,QAAQ,CAAc,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAChD,CAAC;IACD,OAAO,CAAC,OAAe;QACrB,OAAO,KAAK,CAA8B,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;IAC7D,CAAC;CACF,CAAkB,CAAC;AAEpB,MAAM,UAAU,WAAW,CACzB,UAA8B,EAC9B,QAAqB;IAErB,MAAM,MAAM,GAAc,EAAE,CAAC;IAC7B,MAAM,MAAM,GAAa,EAAE,CAAC;IAC5B,KAAK,MAAM,OAAO,IAAI,UAAU,CAAC,QAAQ,EAAE,CAAC;QAC1C,IAAI,OAAO,CAAC,IAAI,KAAK,MAAM;YAAE,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAClD,IAAI,OAAO,CAAC,IAAI,KAAK,YAAY;YAAE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,eAAe,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;aACvF,CAAC;YACJ,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC;YAC3B,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC;QACnD,CAAC;IACH,CAAC;IACD,OAAO,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;AAClE,CAAC;AAED,MAAM,sBAAsB;IACjB,SAAS,CAAgB;IACzB,SAAS,CAAc;IACvB,kBAAkB,CAAgC;IAE3D,YAAY,QAAuB,EAAE,QAAqB,EAAE,iBAAqC;QAC/F,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,SAAS,GAAG,QAAQ,CAAC;QAC1B,IAAI,CAAC,kBAAkB,GAAG,iBAAiB,CAAC;IAC9C,CAAC;IAED,KAAK,CAAC,OAAO,CAAyC,UAA8B;QAClF,MAAM,QAAQ,GAAG,WAAW,CAAC,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC;QACzD,OAAO,CAAC,MAAM,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,QAAQ,CAAC,MAAM,CAAC,CAAmB,CAAC;IAC1F,CAAC;IAED,KAAK,CAAC,WAAW,CAAI,EAAgC;QACnD,IAAI,IAAI,CAAC,kBAAkB,KAAK,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,qDAAqD,CAAC,CAAC;QAClH,OAAO,IAAI,CAAC,kBAAkB,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE,CAChD,EAAE,CAAC,IAAI,sBAAsB,CAAC,QAAQ,EAAE,IAAI,CAAC,SAAS,EAAE,IAAI,CAAC,kBAAkB,CAAC,CAAC,CAClF,CAAC;IACJ,CAAC;CACF;AAED,MAAM,UAAU,cAAc,CAC5B,QAAuB,EACvB,QAAqB,EACrB,iBAAqC;IAErC,OAAO,IAAI,sBAAsB,CAAC,QAAQ,EAAE,QAAQ,EAAE,iBAAiB,CAAC,CAAC;AAC3E,CAAC"}

package/dist/packages/core/src/resolver.d.ts

@@ -0,0 +1,28 @@
+import type { ColumnSnapshot, FunctionSnapshot, ResolvedParameter, SchemaSnapshot, TableSnapshot } from "./types.js";
+export interface ResolverType {
+    readonly tsType: string;
+    readonly nullable: boolean;
+    readonly databaseType?: string;
+}
+/** Shared parameter inference state for grammar implementations. */
+export declare class ParameterCollector {
+    #private;
+    record(index: number, expected?: ResolverType): ResolverType;
+    values(): readonly ResolvedParameter[];
+}
+export declare function unionTypeLiterals(types: readonly string[]): string;
+export declare function closestName(name: string, candidates: readonly string[]): string | undefined;
+interface IndexedTable {
+    readonly key: string;
+    readonly table: TableSnapshot;
+}
+/** Precomputed case-sensitive and folded schema lookups shared by SQL grammars. */
+export declare class ResolverSchemaIndex {
+    #private;
+    constructor(snapshot: SchemaSnapshot);
+    tables(name: string, schema?: string, caseSensitive?: boolean): readonly IndexedTable[];
+    column(table: TableSnapshot, name: string, caseSensitive?: boolean): ColumnSnapshot | undefined;
+    functions(name: string, arity: number, schema?: string): readonly FunctionSnapshot[];
+}
+export {};
+//# sourceMappingURL=resolver.d.ts.map

package/dist/packages/core/src/resolver.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolver.d.ts","sourceRoot":"","sources":["../../../../src/resolver.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,cAAc,EAAE,gBAAgB,EAAE,iBAAiB,EAAE,cAAc,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAErH,MAAM,WAAW,YAAY;IAC3B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,oEAAoE;AACpE,qBAAa,kBAAkB;;IAI7B,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,YAAY,GAAG,YAAY,CA2B3D;IAED,MAAM,IAAI,SAAS,iBAAiB,EAAE,CAErC;CACF;AAED,wBAAgB,iBAAiB,CAAC,KAAK,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,CAGlE;AAoBD,wBAAgB,WAAW,CAAC,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,MAAM,EAAE,GAAG,MAAM,GAAG,SAAS,CAW3F;AAED,UAAU,YAAY;IACpB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC;CAC/B;AAQD,mFAAmF;AACnF,qBAAa,mBAAmB;;IAO9B,YAAY,QAAQ,EAAE,cAAc,EAanC;IAED,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,SAAS,YAAY,EAAE,CAQpF;IAED,MAAM,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,UAAQ,GAAG,cAAc,GAAG,SAAS,CAI5F;IAED,SAAS,CAAC,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,SAAS,gBAAgB,EAAE,CAKnF;CAcF"}

package/dist/packages/core/src/resolver.js

@@ -0,0 +1,130 @@
+/** Shared parameter inference state for grammar implementations. */
+export class ParameterCollector {
+    #parameters = new Map();
+    #conflicts = new Map();
+    record(index, expected) {
+        const candidate = expected === undefined ? { index, tsType: "unknown", nullable: true } : { index, ...expected };
+        const current = this.#parameters.get(index);
+        const existingConflict = this.#conflicts.get(index);
+        if (existingConflict !== undefined)
+            return existingConflict;
+        if (current === undefined || (current.tsType === "unknown" && candidate.tsType !== "unknown")) {
+            this.#parameters.set(index, candidate);
+            return candidate;
+        }
+        if (candidate.tsType === "unknown")
+            return current;
+        if (current.tsType !== candidate.tsType) {
+            const conflict = { index, tsType: "unknown", nullable: true };
+            this.#parameters.set(index, conflict);
+            this.#conflicts.set(index, conflict);
+            return conflict;
+        }
+        const merged = {
+            index,
+            tsType: current.tsType,
+            nullable: current.nullable || candidate.nullable,
+            ...(current.databaseType === candidate.databaseType && current.databaseType !== undefined
+                ? { databaseType: current.databaseType }
+                : {}),
+        };
+        this.#parameters.set(index, merged);
+        return merged;
+    }
+    values() {
+        return [...this.#parameters.values()].sort((left, right) => left.index - right.index);
+    }
+}
+export function unionTypeLiterals(types) {
+    const distinct = [...new Set(types)];
+    return distinct.includes("unknown") ? "unknown" : distinct.join(" | ") || "unknown";
+}
+function editDistance(left, right) {
+    const rows = Array.from({ length: left.length + 1 }, (_, index) => index);
+    for (let column = 1; column <= right.length; column += 1) {
+        let diagonal = rows[0];
+        rows[0] = column;
+        for (let row = 1; row <= left.length; row += 1) {
+            const above = rows[row];
+            rows[row] = Math.min(rows[row] + 1, rows[row - 1] + 1, diagonal + (left[row - 1] === right[column - 1] ? 0 : 1));
+            diagonal = above;
+        }
+    }
+    return rows[left.length];
+}
+export function closestName(name, candidates) {
+    let closest;
+    let closestDistance = Number.POSITIVE_INFINITY;
+    for (const candidate of candidates) {
+        const distance = editDistance(name, candidate);
+        if (distance < closestDistance) {
+            closest = candidate;
+            closestDistance = distance;
+        }
+    }
+    return closest !== undefined && closestDistance <= Math.max(2, Math.floor(name.length / 2)) ? closest : undefined;
+}
+function addToIndex(index, key, value) {
+    const values = index.get(key);
+    if (values === undefined)
+        index.set(key, [value]);
+    else if (!values.includes(value))
+        values.push(value);
+}
+/** Precomputed case-sensitive and folded schema lookups shared by SQL grammars. */
+export class ResolverSchemaIndex {
+    #exactTables = new Map();
+    #foldedTables = new Map();
+    #exactColumns = new WeakMap();
+    #foldedColumns = new WeakMap();
+    #functions = new Map();
+    constructor(snapshot) {
+        for (const [key, table] of Object.entries(snapshot.tables)) {
+            const indexed = { key, table };
+            const unqualifiedKey = key.slice(key.lastIndexOf(".") + 1);
+            for (const candidate of new Set([key, unqualifiedKey, table.name])) {
+                addToIndex(this.#exactTables, candidate, indexed);
+                addToIndex(this.#foldedTables, candidate.toLowerCase(), indexed);
+            }
+            this.#indexColumns(table);
+        }
+        for (const value of Object.values(snapshot.functions ?? {})) {
+            addToIndex(this.#functions, `${value.name.toLowerCase()}/${value.argumentTypes.length}`, value);
+        }
+    }
+    tables(name, schema, caseSensitive = false) {
+        const index = caseSensitive ? this.#exactTables : this.#foldedTables;
+        const matches = index.get(caseSensitive ? name : name.toLowerCase()) ?? [];
+        if (schema === undefined)
+            return matches;
+        return matches.filter(({ key, table }) => {
+            const tableSchema = table.schema ?? key.slice(0, Math.max(0, key.lastIndexOf(".")));
+            return caseSensitive ? tableSchema === schema : tableSchema.toLowerCase() === schema.toLowerCase();
+        });
+    }
+    column(table, name, caseSensitive = false) {
+        if (!this.#exactColumns.has(table))
+            this.#indexColumns(table);
+        const index = caseSensitive ? this.#exactColumns : this.#foldedColumns;
+        return index.get(table)?.get(caseSensitive ? name : name.toLowerCase());
+    }
+    functions(name, arity, schema) {
+        const matches = this.#functions.get(`${name.toLowerCase()}/${arity}`) ?? [];
+        return schema === undefined
+            ? matches
+            : matches.filter((candidate) => candidate.schema?.toLowerCase() === schema.toLowerCase());
+    }
+    #indexColumns(table) {
+        const exactColumns = new Map();
+        const foldedColumns = new Map();
+        for (const [columnKey, column] of Object.entries(table.columns)) {
+            exactColumns.set(columnKey, column);
+            exactColumns.set(column.name, column);
+            foldedColumns.set(columnKey.toLowerCase(), column);
+            foldedColumns.set(column.name.toLowerCase(), column);
+        }
+        this.#exactColumns.set(table, exactColumns);
+        this.#foldedColumns.set(table, foldedColumns);
+    }
+}
+//# sourceMappingURL=resolver.js.map

package/dist/packages/core/src/resolver.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"resolver.js","sourceRoot":"","sources":["../../../../src/resolver.ts"],"names":[],"mappings":"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"}

package/dist/packages/core/src/types.d.ts

@@ -1,4 +1,4 @@
-export declare const DIALECT_CONTRACT_VERSION: 1;
+export declare const DIALECT_CONTRACT_VERSION: 3;
 export interface SourceRange {
     readonly start: number;
     readonly end: number;
@@ -65,11 +65,24 @@ export interface ResolvedColumn {
     readonly databaseType?: string;
     readonly range: SourceRange;
 }
+export interface ResolvedParameter {
+    /** One-based database placeholder index. */
+    readonly index: number;
+    readonly tsType: string;
+    readonly nullable: boolean;
+    readonly databaseType?: string;
+}
 export interface DialectAnalysis {
     readonly columns: readonly ResolvedColumn[];
+    readonly parameters: readonly ResolvedParameter[];
     readonly diagnostics: readonly SqlDiagnostic[];
     readonly resultKind?: "rows" | "command";
 }
+/**
+ * Grammar-owned feature declarations. Core intentionally does not assign meaning to the keys.
+ * Tooling and applications can expose them without teaching neutral packages dialect semantics.
+ */
+export type DialectCapabilities = Readonly<Record<string, boolean>>;
 export interface DialectPlugin<Snapshot extends SchemaSnapshot = SchemaSnapshot, Policy = unknown> {
     readonly contractVersion: typeof DIALECT_CONTRACT_VERSION;
     readonly id: string;
@@ -77,8 +90,11 @@ export interface DialectPlugin<Snapshot extends SchemaSnapshot = SchemaSnapshot,
     readonly grammarVersion: string;
     /** Exact package entrypoint from which applications import the dialect's `sql` tag. */
     readonly sqlModule: string;
+    /** Grammar-owned feature names and their support status. */
+    readonly capabilities: DialectCapabilities;
     readonly defaultTypePolicy: Policy;
     placeholder(index: number): string;
+    quoteIdentifier(identifier: string): string;
     analyze(sql: string, snapshot: Snapshot, policy?: Policy): DialectAnalysis;
     validateSnapshot(value: unknown): Snapshot;
 }
@@ -94,7 +110,12 @@ export interface TypedSqlConfig<Snapshot extends SchemaSnapshot = SchemaSnapshot
     readonly outDir: string;
     readonly projects?: readonly string[];
     readonly typePolicy?: Policy;
+    readonly compiler?: {
+        readonly maxStructuralVariants?: number;
+    };
 }
+export declare function assertDialectPlugin(value: unknown): asserts value is DialectPlugin;
 export declare function defineConfig<Snapshot extends SchemaSnapshot, Policy>(config: TypedSqlConfig<Snapshot, Policy>): TypedSqlConfig<Snapshot, Policy>;
 export declare function rowTypeLiteral(columns: readonly ResolvedColumn[]): string;
+export declare function parameterTypeLiteral(parameterCount: number, parameters: readonly ResolvedParameter[]): string;
 //# sourceMappingURL=types.d.ts.map

package/dist/packages/core/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,wBAAwB,EAAG,CAAU,CAAC;AAEnD,MAAM,WAAW,WAAW;IAC1B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC;IACrB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;CACzB;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,GAAG,SAAS,GAAG,MAAM,CAAC;IAChD,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;CAC9B;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,iBAAiB,CAAC,EAAE,MAAM,CAAC;CACrC;AAED,MAAM,WAAW,aAAa;IAC5B,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;CAC5D;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;IAC9B,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;CAC5B;AAED,MAAM,WAAW,gBAAgB;IAC/B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,aAAa,EAAE,SAAS,MAAM,EAAE,CAAC;IAC1C,QAAQ,CAAC,kBAAkB,CAAC,EAAE,MAAM,CAAC;IACrC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,OAAO,CAAC;CACjC;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,aAAa,EAAE,CAAC,CAAC;IAC1B,QAAQ,CAAC,OAAO,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,cAAc,CAAC,EAAE,MAAM,CAAC;IACjC,QAAQ,CAAC,OAAO,CAAC,EAAE,MAAM,CAAC;IAC1B,QAAQ,CAAC,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,CAAC,CAAC;IACzD,QAAQ,CAAC,KAAK,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,SAAS,MAAM,EAAE,CAAC,CAAC,CAAC;IAC7D,QAAQ,CAAC,OAAO,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,CAAC;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,gBAAgB,CAAC,CAAC,CAAC;CACjE;AAED,MAAM,WAAW,uBAAuB;IACtC,QAAQ,CAAC,gBAAgB,EAAE,MAAM,CAAC;IAClC,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;IAC5B,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;CACjC;AAED,MAAM,WAAW,uBAAwB,SAAQ,cAAc;IAC7D,QAAQ,CAAC,QAAQ,EAAE,uBAAuB,CAAC;CAC5C;AAED,MAAM,WAAW,cAAc;IAC7B,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;IAC/B,QAAQ,CAAC,KAAK,EAAE,WAAW,CAAC;CAC7B;AAED,MAAM,WAAW,iBAAiB;IAChC,4CAA4C;IAC5C,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;IAC3B,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,CAAC;CAChC;AAED,MAAM,WAAW,eAAe;IAC9B,QAAQ,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,CAAC;IAC5C,QAAQ,CAAC,UAAU,EAAE,SAAS,iBAAiB,EAAE,CAAC;IAClD,QAAQ,CAAC,WAAW,EAAE,SAAS,aAAa,EAAE,CAAC;IAC/C,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC1C;AAED;;;GAGG;AACH,MAAM,MAAM,mBAAmB,GAAG,QAAQ,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC;AAEpE,MAAM,WAAW,aAAa,CAAC,QAAQ,SAAS,cAAc,GAAG,cAAc,EAAE,MAAM,GAAG,OAAO;IAC/F,QAAQ,CAAC,eAAe,EAAE,OAAO,wBAAwB,CAAC;IAC1D,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;IACpB,0FAA0F;IAC1F,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,uFAAuF;IACvF,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAC;IAC3B,4DAA4D;IAC5D,QAAQ,CAAC,YAAY,EAAE,mBAAmB,CAAC;IAC3C,QAAQ,CAAC,iBAAiB,EAAE,MAAM,CAAC;IACnC,WAAW,CAAC,KAAK,EAAE,MAAM,GAAG,MAAM,CAAC;IACnC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,MAAM,CAAC;IAC5C,OAAO,CAAC,GAAG,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC;IAC3E,gBAAgB,CAAC,KAAK,EAAE,OAAO,GAAG,QAAQ,CAAC;CAC5C;AAED,MAAM,WAAW,cAAc,CAAC,QAAQ,SAAS,cAAc,GAAG,cAAc;IAC9E,UAAU,IAAI,OAAO,CAAC,QAAQ,CAAC,CAAC;CACjC;AAED,MAAM,WAAW,cAAc,CAAC,QAAQ,SAAS,cAAc,GAAG,cAAc,EAAE,MAAM,GAAG,OAAO;IAChG,QAAQ,CAAC,OAAO,EAAE,aAAa,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;IAClD,QAAQ,CAAC,MAAM,EAAE;QACf,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;QACtB,QAAQ,CAAC,QAAQ,CAAC,EAAE,cAAc,CAAC,QAAQ,CAAC,CAAC;KAC9C,CAAC;IACF,QAAQ,CAAC,MAAM,EAAE,MAAM,CAAC;IACxB,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,MAAM,EAAE,CAAC;IACtC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC;IAC7B,QAAQ,CAAC,QAAQ,CAAC,EAAE;QAClB,QAAQ,CAAC,qBAAqB,CAAC,EAAE,MAAM,CAAC;KACzC,CAAC;CACH;AAMD,wBAAgB,mBAAmB,CAAC,KAAK,EAAE,OAAO,GAAG,OAAO,CAAC,KAAK,IAAI,aAAa,CAoBlF;AAED,wBAAgB,YAAY,CAAC,QAAQ,SAAS,cAAc,EAAE,MAAM,EAClE,MAAM,EAAE,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,GACvC,cAAc,CAAC,QAAQ,EAAE,MAAM,CAAC,CAOlC;AAED,wBAAgB,cAAc,CAAC,OAAO,EAAE,SAAS,cAAc,EAAE,GAAG,MAAM,CAKzE;AAED,wBAAgB,oBAAoB,CAAC,cAAc,EAAE,MAAM,EAAE,UAAU,EAAE,SAAS,iBAAiB,EAAE,GAAG,MAAM,CAS7G"}

package/dist/packages/core/src/types.js

@@ -1,7 +1,34 @@
-export const DIALECT_CONTRACT_VERSION = 1;
+export const DIALECT_CONTRACT_VERSION = 3;
+function record(value) {
+    return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+export function assertDialectPlugin(value) {
+    if (!record(value))
+        throw new TypeError("typed-sql dialect must be an object");
+    if (value.contractVersion !== DIALECT_CONTRACT_VERSION) {
+        throw new TypeError(`Unsupported typed-sql dialect contract ${String(value.contractVersion)}`);
+    }
+    for (const property of ["id", "grammarVersion", "sqlModule"]) {
+        if (typeof value[property] !== "string" || value[property].length === 0) {
+            throw new TypeError(`typed-sql dialect.${property} must be a non-empty string`);
+        }
+    }
+    if (!("defaultTypePolicy" in value))
+        throw new TypeError("typed-sql dialect.defaultTypePolicy is required");
+    if (!record(value.capabilities) ||
+        Object.values(value.capabilities).some((supported) => typeof supported !== "boolean")) {
+        throw new TypeError("typed-sql dialect.capabilities must contain only boolean feature declarations");
+    }
+    for (const method of ["placeholder", "quoteIdentifier", "analyze", "validateSnapshot"]) {
+        if (typeof value[method] !== "function")
+            throw new TypeError(`typed-sql dialect.${method} must be a function`);
+    }
+}
 export function defineConfig(config) {
-    if (config.dialect.contractVersion !== DIALECT_CONTRACT_VERSION) {
-        throw new TypeError(`Unsupported typed-sql dialect contract ${config.dialect.contractVersion}`);
+    assertDialectPlugin(config.dialect);
+    const maximum = config.compiler?.maxStructuralVariants;
+    if (maximum !== undefined && (!Number.isSafeInteger(maximum) || maximum < 1)) {
+        throw new TypeError("compiler.maxStructuralVariants must be a positive safe integer");
     }
     return Object.freeze(config);
 }
@@ -9,4 +36,16 @@ export function rowTypeLiteral(columns) {
     const properties = columns.map((column) => `${JSON.stringify(column.name)}: ${column.tsType}${column.nullable ? " | null" : ""};`);
     return `{ ${properties.join(" ")} }`;
 }
+export function parameterTypeLiteral(parameterCount, parameters) {
+    const byIndex = new Map(parameters.map((parameter) => [parameter.index, parameter]));
+    const elements = Array.from({ length: parameterCount }, (_, offset) => {
+        const parameter = byIndex.get(offset + 1);
+        if (!parameter)
+            return "unknown";
+        if (parameter.tsType === "unknown")
+            return "unknown";
+        return `${parameter.tsType}${parameter.nullable ? " | null" : ""}`;
+    });
+    return `readonly [${elements.join(", ")}]`;
+}
 //# sourceMappingURL=types.js.map

package/dist/packages/core/src/types.js.map

@@ -1 +1 @@
-{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,CAAC,MAAM,wBAAwB,GAAG,CAAU,CAAC;AAgHnD,MAAM,UAAU,YAAY,CAC1B,MAAwC;IAExC,IAAI,MAAM,CAAC,OAAO,CAAC,eAAe,KAAK,wBAAwB,EAAE,CAAC;QAChE,MAAM,IAAI,SAAS,CAAC,0CAA0C,MAAM,CAAC,OAAO,CAAC,eAAe,EAAE,CAAC,CAAC;IAClG,CAAC;IACD,OAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AAC/B,CAAC;AAED,MAAM,UAAU,cAAc,CAAC,OAAkC;IAC/D,MAAM,UAAU,GAAG,OAAO,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACnI,OAAO,KAAK,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC;AACvC,CAAC"}
+{"version":3,"file":"types.js","sourceRoot":"","sources":["../../../../src/types.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typed-sql/core",
-  "version": "1.0.0-beta.1",
+  "version": "1.0.0-beta.2",
   "description": "Driver- and dialect-neutral typed SQL query contracts.",
   "license": "MIT",
   "author": "Lojhan",
@@ -27,6 +27,9 @@
   "publishConfig": {
     "access": "public"
   },
+  "typedSql": {
+    "releaseTrack": "stable"
+  },
   "sideEffects": false,
   "type": "module",
   "exports": {