@prisma/orm-family-sql 8.0.0-rc.18-dev.16 → 8.0.0-rc.18-dev.17

package/dist/opaque-sql-Dset3kln-BzzXoO94.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"opaque-sql-Dset3kln-BzzXoO94.mjs","names":[],"sources":["../../../../2-sql/4-lanes/relational-core/dist/opaque-sql-Dset3kln.mjs"],"sourcesContent":["import { structuredError } from \"@internal/utils/structured-error\";\nimport { isColumnDefaultLiteralInputValue } from \"@internal/contract/types\";\n//#region src/ast/ddl-types.ts\nvar DdlColumnDefault = class {\n\tfreeze() {\n\t\tObject.freeze(this);\n\t}\n};\nvar LiteralColumnDefault = class extends DdlColumnDefault {\n\tkind = \"literal\";\n\tvalue;\n\tconstructor(value) {\n\t\tsuper();\n\t\tif (!isColumnDefaultLiteralInputValue(value)) throw structuredError(\"CONTRACT.DEFAULT_INVALID\", \"Invalid column default literal value\");\n\t\tthis.value = value;\n\t\tthis.freeze();\n\t}\n};\nvar FunctionColumnDefault = class extends DdlColumnDefault {\n\tkind = \"function\";\n\texpression;\n\tconstructor(expression) {\n\t\tsuper();\n\t\tthis.expression = expression;\n\t\tthis.freeze();\n\t}\n};\nvar DdlColumn = class {\n\tname;\n\ttype;\n\tnotNull;\n\tprimaryKey;\n\tdefault;\n\t/** Codec identity for this column. When present, the DDL walker builds the codec with the column's type parameters and runs the literal default through both declared conversions in order — `codec.toWire(codec.fromDataTypeValue(dataType.fromContract(default.value, params)), {})` — to obtain the wire value it inlines into the DDL string (`encodeLiteralDefault`), and reads each element of a list default the same way (`encodeListLiteralDefault`). The read-back is what makes the pair sound: a contract stores a literal default as its data type's stored JSON, which is not always the application value `toWire` takes (`pg/int8@1` stores decimal text for a `bigint`). A `Date` is the one authored value JSON has no notation for, so it arrives as itself, and the codec reads it with `toDataTypeValue` before `fromDataTypeValue` and `toWire`, so the column's type checks it. A `null` default the type refuses is SQL NULL, `DEFAULT NULL`; a JSON type reads it as the JSON value null. When absent, literal defaults follow RawSqlLiteral wire-scalar semantics (string / number / boolean / bigint / null / Uint8Array / Date inlined directly). */\n\tcodecRef;\n\tconstructor(options) {\n\t\tthis.name = options.name;\n\t\tthis.type = options.type;\n\t\tthis.notNull = options.notNull;\n\t\tthis.primaryKey = options.primaryKey;\n\t\tthis.default = options.default;\n\t\tthis.codecRef = options.codecRef;\n\t\tObject.freeze(this);\n\t}\n};\nvar DdlNode = class {\n\t/**\n\t* Structural brand: every DDL node answers `true`. Lets {@link isDdlNode}\n\t* recognise any `DdlNode` subclass — including target-contributed kinds —\n\t* without a central kind registry that subclasses would have to register\n\t* into.\n\t*/\n\tisDdlNode() {\n\t\treturn true;\n\t}\n\tfreeze() {\n\t\tObject.freeze(this);\n\t}\n\tcollectParamRefs() {\n\t\treturn [];\n\t}\n};\nfunction isDdlNode(value) {\n\treturn typeof value === \"object\" && value !== null && \"isDdlNode\" in value && typeof value.isDdlNode === \"function\";\n}\n/**\n* A composite (or single-column) PRIMARY KEY constraint on a `CreateTable`\n* node. When `name` is set, the adapter renders `CONSTRAINT <name> PRIMARY KEY\n* (…)`; otherwise it renders an anonymous `PRIMARY KEY (…)`.\n*\n* Frozen on construction — immutable after creation.\n*/\nvar PrimaryKeyConstraint = class {\n\tkind = \"primary-key\";\n\tcolumns;\n\tname;\n\tconstructor(options) {\n\t\tthis.columns = Object.freeze([...options.columns]);\n\t\tthis.name = options.name;\n\t\tObject.freeze(this);\n\t}\n};\n/**\n* A FOREIGN KEY constraint on a `CreateTable` node. `onDelete` and `onUpdate`\n* use the same `ReferentialAction` vocabulary already used by the migration\n* planner and the contract IR — no parallel string enum.\n*\n* Frozen on construction — immutable after creation.\n*/\nvar ForeignKeyConstraint = class {\n\tkind = \"foreign-key\";\n\tcolumns;\n\trefTable;\n\trefColumns;\n\tonDelete;\n\tonUpdate;\n\tname;\n\tconstructor(options) {\n\t\tthis.columns = Object.freeze([...options.columns]);\n\t\tthis.refTable = options.refTable;\n\t\tthis.refColumns = Object.freeze([...options.refColumns]);\n\t\tthis.onDelete = options.onDelete;\n\t\tthis.onUpdate = options.onUpdate;\n\t\tthis.name = options.name;\n\t\tObject.freeze(this);\n\t}\n};\n/**\n* A table-level UNIQUE constraint on a `CreateTable` node. When `name` is\n* set, the adapter renders `CONSTRAINT <name> UNIQUE (…)`; otherwise it\n* renders an anonymous `UNIQUE (…)`.\n*\n* Frozen on construction — immutable after creation.\n*/\nvar UniqueConstraint = class {\n\tkind = \"unique\";\n\tcolumns;\n\tname;\n\tconstructor(options) {\n\t\tthis.columns = Object.freeze([...options.columns]);\n\t\tthis.name = options.name;\n\t\tObject.freeze(this);\n\t}\n};\n/**\n* A table-level CHECK constraint carrying a raw SQL predicate expression. Used\n* for checks that are not enum value-set restrictions — e.g. the element-non-null\n* constraint on a scalar-array column (`array_position(col, NULL) IS NULL`).\n* The `expression` is emitted through `renderOpaqueSql`, so callers must supply safe,\n* pre-validated SQL.\n*\n* Frozen on construction — immutable after creation.\n*/\nvar CheckExpressionConstraint = class {\n\tkind = \"check-expression\";\n\tname;\n\texpression;\n\tconstructor(options) {\n\t\tthis.name = options.name;\n\t\tthis.expression = options.expression;\n\t\tObject.freeze(this);\n\t}\n};\n//#endregion\n//#region src/ast/opaque-sql.ts\n/**\n* SQL text that Prisma does not parse, placed inside a larger statement: a CHECK or policy predicate, an index element list or predicate, a column default, or an ALTER COLUMN TYPE conversion. ADR 244 calls such text opaque.\n*/\nvar OpaqueSql = class {\n\ttext;\n\tconstructor(text) {\n\t\tthis.text = text;\n\t\tObject.freeze(this);\n\t}\n};\nfunction opaqueSql(text) {\n\treturn new OpaqueSql(text);\n}\n/**\n* The text as a statement includes it. Text containing `--` ends with a line break, so a line comment on its last line cannot hide what the statement writes after it.\n*/\nfunction renderOpaqueSql(sql) {\n\treturn sql.text.includes(\"--\") ? `${sql.text}\\n` : sql.text;\n}\n//#endregion\nexport { DdlColumn as a, ForeignKeyConstraint as c, PrimaryKeyConstraint as d, UniqueConstraint as f, CheckExpressionConstraint as i, FunctionColumnDefault as l, opaqueSql as n, DdlColumnDefault as o, isDdlNode as p, renderOpaqueSql as r, DdlNode as s, OpaqueSql as t, LiteralColumnDefault as u };\n\n//# sourceMappingURL=opaque-sql-Dset3kln.mjs.map"],"mappings":";;;AAGA,IAAI,mBAAmB,MAAM;CAC5B,SAAS;EACR,OAAO,OAAO,IAAI;CACnB;AACD;AACA,IAAI,uBAAuB,cAAc,iBAAiB;CACzD,OAAO;CACP;CACA,YAAY,OAAO;EAClB,MAAM;EACN,IAAI,CAAC,iCAAiC,KAAK,GAAG,MAAM,gBAAgB,4BAA4B,sCAAsC;EACtI,KAAK,QAAQ;EACb,KAAK,OAAO;CACb;AACD;AACA,IAAI,wBAAwB,cAAc,iBAAiB;CAC1D,OAAO;CACP;CACA,YAAY,YAAY;EACvB,MAAM;EACN,KAAK,aAAa;EAClB,KAAK,OAAO;CACb;AACD;AACA,IAAI,YAAY,MAAM;CACrB;CACA;CACA;CACA;CACA;;CAEA;CACA,YAAY,SAAS;EACpB,KAAK,OAAO,QAAQ;EACpB,KAAK,OAAO,QAAQ;EACpB,KAAK,UAAU,QAAQ;EACvB,KAAK,aAAa,QAAQ;EAC1B,KAAK,UAAU,QAAQ;EACvB,KAAK,WAAW,QAAQ;EACxB,OAAO,OAAO,IAAI;CACnB;AACD;AACA,IAAI,UAAU,MAAM;;;;;;;CAOnB,YAAY;EACX,OAAO;CACR;CACA,SAAS;EACR,OAAO,OAAO,IAAI;CACnB;CACA,mBAAmB;EAClB,OAAO,CAAC;CACT;AACD;AACA,SAAS,UAAU,OAAO;CACzB,OAAO,OAAO,UAAU,YAAY,UAAU,QAAQ,eAAe,SAAS,OAAO,MAAM,cAAc;AAC1G;;;;;;;;AAQA,IAAI,uBAAuB,MAAM;CAChC,OAAO;CACP;CACA;CACA,YAAY,SAAS;EACpB,KAAK,UAAU,OAAO,OAAO,CAAC,GAAG,QAAQ,OAAO,CAAC;EACjD,KAAK,OAAO,QAAQ;EACpB,OAAO,OAAO,IAAI;CACnB;AACD;;;;;;;;AAQA,IAAI,uBAAuB,MAAM;CAChC,OAAO;CACP;CACA;CACA;CACA;CACA;CACA;CACA,YAAY,SAAS;EACpB,KAAK,UAAU,OAAO,OAAO,CAAC,GAAG,QAAQ,OAAO,CAAC;EACjD,KAAK,WAAW,QAAQ;EACxB,KAAK,aAAa,OAAO,OAAO,CAAC,GAAG,QAAQ,UAAU,CAAC;EACvD,KAAK,WAAW,QAAQ;EACxB,KAAK,WAAW,QAAQ;EACxB,KAAK,OAAO,QAAQ;EACpB,OAAO,OAAO,IAAI;CACnB;AACD;;;;;;;;AAQA,IAAI,mBAAmB,MAAM;CAC5B,OAAO;CACP;CACA;CACA,YAAY,SAAS;EACpB,KAAK,UAAU,OAAO,OAAO,CAAC,GAAG,QAAQ,OAAO,CAAC;EACjD,KAAK,OAAO,QAAQ;EACpB,OAAO,OAAO,IAAI;CACnB;AACD;;;;;;;;;;AAUA,IAAI,4BAA4B,MAAM;CACrC,OAAO;CACP;CACA;CACA,YAAY,SAAS;EACpB,KAAK,OAAO,QAAQ;EACpB,KAAK,aAAa,QAAQ;EAC1B,OAAO,OAAO,IAAI;CACnB;AACD;;;;AAMA,IAAI,YAAY,MAAM;CACrB;CACA,YAAY,MAAM;EACjB,KAAK,OAAO;EACZ,OAAO,OAAO,IAAI;CACnB;AACD;AACA,SAAS,UAAU,MAAM;CACxB,OAAO,IAAI,UAAU,IAAI;AAC1B;;;;AAIA,SAAS,gBAAgB,KAAK;CAC7B,OAAO,IAAI,KAAK,SAAS,IAAI,IAAI,GAAG,IAAI,KAAK,MAAM,IAAI;AACxD"}

package/dist/orm-client.d.mts

@@ -2,23 +2,23 @@ import { t as StorageColumn } from "./storage-table-DC9afJhr-CmRU56OS.mjs";
 import { l as SqlStorage } from "./sql-storage-tZhB8nS5-8NSWT0TW.mjs";
 import { D as QueryOperationTypesBase, d as ExtractAggregateTypes, f as ExtractCodecTypes, h as ExtractQueryOperationTypes, m as ExtractFieldOutputTypes, p as ExtractFieldInputTypes } from "./types-Dqf87mfA-BOElvimQ.mjs";
 import "./types-DMfBh16_.mjs";
-import { E as CodecRef$1, Ht as WhereArg, O as ColumnRef, St as OrderByNulls, _ as BinaryExpr, a as AndExpr, bt as OrExpr, c as AnyExpression, ft as LockingClause, r as AggregateFn, st as LimitOffsetValue, ut as LockStrength, vt as NullCheckExpr, xt as OrderByItem, zt as TableSource } from "./types-Sh5HuaZE-BwZNUDEi.mjs";
-import { n as SqlQueryPlan, t as Preparable } from "./plan-cGEaSXHv-yuz43WrR.mjs";
-import { C as TraitExpression, g as RawSqlInterpolation, i as CodecTypesBase, o as Expression, r as CodecExpression } from "./expression-Ck1wys3N-Cdc7eUQS.mjs";
-import "./expression-DUYovBa6.mjs";
-import { n as BuiltinFunctions, t as BooleanCodecType } from "./functions-DSwXxsTg.mjs";
-import { c as LockOptionCapabilities, l as LockStrengthCapabilities, u as LockWaitOptions } from "./ast-BoM9T1b2.mjs";
-import { r as TableIndexReferences, t as IndexReference } from "./index-reference-DJX-CNsb-D5uoBnH_.mjs";
-import "./index-reference-DGQdSRjQ.mjs";
-import "./plan-DdpaNNu1.mjs";
-import { c as CollectionMethodRegistry, r as CollectionMethodContributionId, u as ContributedMethodSignature } from "./collection-methods-BnR4UjcW-C_55W2m0.mjs";
-import { n as ExecutionContext } from "./query-lane-context-C42-u9L1-BSJoP83K.mjs";
-import "./query-lane-context-C4xq68Mr.mjs";
-import { h as RuntimeScope, o as ComputeColumnJsType } from "./types-Cl4MLNrS-BXDsTb9U.mjs";
-import "./types-BSBsW0qR.mjs";
-import { l as PreparedFor, n as Declaration, o as ParamsFromDeclaration, t as BindSiteParams, u as PreparedStatement } from "./transaction-state-DR3nKTmH-D5eFB250.mjs";
-import "./collection-methods-CyUXbXVw.mjs";
-import { M as ActivitySourceTarget, W as RuntimeQueryable$1, z as Runtime } from "./index-C8jUgdUh.mjs";
+import { E as CodecRef$1, Ht as WhereArg, O as ColumnRef, St as OrderByNulls, _ as BinaryExpr, a as AndExpr, bt as OrExpr, c as AnyExpression, ft as LockingClause, r as AggregateFn, st as LimitOffsetValue, ut as LockStrength, vt as NullCheckExpr, xt as OrderByItem, zt as TableSource } from "./types-DVaVM20q-B-QcMIOa.mjs";
+import { n as SqlQueryPlan, t as Preparable } from "./plan-Cbed2eDu-BZM3geSm.mjs";
+import { C as TraitExpression, g as RawSqlInterpolation, i as CodecTypesBase, o as Expression, r as CodecExpression } from "./expression-BzrfOiPC-3NqR8UzK.mjs";
+import "./expression-CeerCjQG.mjs";
+import { n as BuiltinFunctions, t as BooleanCodecType } from "./functions-Cp8soSAv.mjs";
+import { c as LockOptionCapabilities, l as LockStrengthCapabilities, u as LockWaitOptions } from "./ast-Dzsat0Zb.mjs";
+import { r as TableIndexReferences, t as IndexReference } from "./index-reference-DJaQLZA3-DxmYkkX-.mjs";
+import "./index-reference-CWppFpUV.mjs";
+import "./plan-BZpZafiQ.mjs";
+import { c as CollectionMethodRegistry, r as CollectionMethodContributionId, u as ContributedMethodSignature } from "./collection-methods-B-tM7OPZ-v8HK9Txa.mjs";
+import { n as ExecutionContext } from "./query-lane-context-BLOPW1rQ-Bn3ugl9a.mjs";
+import "./query-lane-context-Dpep1Fzy.mjs";
+import { h as RuntimeScope, o as ComputeColumnJsType } from "./types-Cv5t6_Ly-CcBWTpfM.mjs";
+import "./types-_7TbRpPw.mjs";
+import { l as PreparedFor, n as Declaration, o as ParamsFromDeclaration, t as BindSiteParams, u as PreparedStatement } from "./transaction-state-DR3nKTmH-n_12DsnU.mjs";
+import "./collection-methods-DQAFcGEB.mjs";
+import { M as ActivitySourceTarget, W as RuntimeQueryable$1, z as Runtime } from "./index-DWNoqFzr.mjs";
 import { CodecDescriptorRef, ScalarFieldDeclarationBuilder } from "@prisma/orm-framework/components/codec";
 import { Contract } from "@prisma/orm-framework/contract/types";
 import { AnnotationValue, AsyncIterableResult, MetaBuilder, OperationKind, ResultType, RuntimeExecuteOptions } from "@prisma/orm-framework/components/runtime";

package/dist/orm-client.mjs

@@ -2,9 +2,9 @@ import { t as resolveStorageTable } from "./resolve-storage-table-DZsfnzeW.mjs";
 import { i as isUniqueConstraintViolation } from "./dist-x6jvtkKM.mjs";
 import { A as ParamRef, C as LiteralExpr, E as NullCheckExpr, F as SelectAst, G as isOrderByNulls, I as SubqueryExpr, L as TableSource, M as ProjectionItem, O as OrExpr, R as UpdateAst, S as ListExpression, T as NotExpr, U as isAggregateFn, V as checkLimitOffset, W as isOrderByDirection, _ as InsertAst, b as JsonArrayAggExpr, c as DeleteAst, f as EqColJoinOn, k as OrderByItem, l as DerivedTableSource, n as AndExpr, o as ColumnRef, p as ExistsExpr, q as isWhereExpr, r as BinaryExpr, s as DefaultValueExpr, t as AggregateExpr, v as InsertOnConflict, w as LockingClause, x as JsonObjectExpr, y as JoinAst, z as WindowFuncExpr } from "./types-NTQsD2MS-DAP2yVDn.mjs";
 import { t as collectOrderedParamRefs } from "./util-BBgcP3gI-XJBkxo1K.mjs";
-import { C as lockStrengthCapabilities, S as lockOptionCapabilities, T as missingCapability, n as JsonDocumentProjection, r as NativeJsonValueProjection, t as CodecJsonValueProjection, w as lockWaitPolicyOf, x as lockIncompatible } from "./ast-BDwGvnKK.mjs";
+import { C as lockStrengthCapabilities, S as lockOptionCapabilities, T as missingCapability, n as JsonDocumentProjection, r as NativeJsonValueProjection, t as CodecJsonValueProjection, w as lockWaitPolicyOf, x as lockIncompatible } from "./ast-CBO3PEJF.mjs";
 import { a as isExpression, s as toExpr, t as ExpressionImpl } from "./expression-impl-B-XNINxr-vYwKVFeP.mjs";
-import { n as codecRefForStorageColumn } from "./codec-descriptor-registry-Bg9OjQf_.mjs";
+import { n as codecRefForStorageColumn } from "./codec-descriptor-registry-4kw8FPpo.mjs";
 import { t as createFunctions } from "./functions-0YWByawj.mjs";
 import { t as createIndexReferences } from "./index-reference-DR62gjQS.mjs";
 import { o as settlementOf } from "./transaction-state-BfXhs7D7-3k10jZ8I.mjs";
@@ -626,7 +626,7 @@ function resolveAggregate(query) {
 	if (resolved === void 0) throw unsupportedAggregate(query, input);
 	const nullability = resolved.nullable ? { nullable: true } : {
 		nullable: false,
-		emptyResultJson: resolved.emptyResultJson
+		emptyResultWire: resolved.emptyResultWire
 	};
 	return {
 		codec: resolved.output,
@@ -669,13 +669,12 @@ function inputCodecRef(query) {
 * count's zero cardinality — so this covers only the degenerate case of a
 * result set with no row: an absent aggregate alias, or an include whose
 * envelope never arrived. The answer reads off the operation's declared row:
-* NULL where the row is nullable, else the value the row declares, decoded
-* through the codec it declared beside it — so the application sees the same
-* value shape a real row would produce, in whichever form that codec's
-* canonical JSON takes.
+* NULL where the row is nullable, else the wire value the row declares, read
+* with the declared codec's `fromWire` — so the application sees the same value
+* shape a real row would produce.
 */
-function emptyAggregateResult(result, codec) {
-	return result.nullable ? null : codec.decodeJson(result.emptyResultJson);
+async function emptyAggregateResult(result, codec) {
+	return result.nullable ? null : codec.fromWire(result.emptyResultWire, {});
 }
 /** The columns of a model's own and inherited fields, for operations that apply each column to the model's table: `groupBy`, `distinct` and `distinctOn`. */
 function mapFieldsToColumns(contract, namespaceId, modelName, fieldNames) {
@@ -2450,7 +2449,7 @@ function createPreparedRowsConsumer(options) {
 			raw,
 			mapped: mapRow(raw)
 		}));
-		for (const parent of parents) for (const include of includes) parent.mapped[include.alias] = include.consume(parent.raw[include.alias]);
+		for (const parent of parents) for (const include of includes) parent.mapped[include.alias] = await include.consume(parent.raw[include.alias]);
 		for (const parent of parents) yield castRow(parent.mapped);
 	})());
 }
@@ -2473,10 +2472,10 @@ function createPreparedIncludeConsumer(context, include) {
 		}));
 		return {
 			alias,
-			consume: (raw) => {
+			consume: async (raw) => {
 				const parsed = parseCombineEnvelope(include, raw);
 				const result = {};
-				for (const branch of branches) result[branch.name] = branch.consume(parsed[branch.name]);
+				for (const branch of branches) result[branch.name] = await branch.consume(parsed[branch.name]);
 				return result;
 			}
 		};
@@ -2498,16 +2497,17 @@ function createPreparedIncludeConsumer(context, include) {
 	const fused = deferResolution(() => createPreparedIncludedRowDecoder(contract, include, bindingFor));
 	return {
 		alias,
-		consume: (raw) => {
+		consume: async (raw) => {
 			const rows = parseIncludedRows(include, raw);
 			if (rows.length === 0) return toOne ? null : [];
 			const decoder = fused();
 			if (!decoder || !rows.every(decoder.matches)) return consumeRowInclude(rows, mapRow, bindingFor, nested, toOne);
-			const mapped = rows.map((row) => {
-				const result = decoder.decode(row);
-				for (const child of nested) result[child.alias] = child.consume(row[child.alias]);
-				return result;
-			});
+			const mapped = [];
+			for (const row of rows) {
+				const result = await decoder.decode(row);
+				for (const child of nested) result[child.alias] = await child.consume(row[child.alias]);
+				mapped.push(result);
+			}
 			return toOne ? mapped[0] ?? null : mapped;
 		}
 	};
@@ -2529,10 +2529,10 @@ function createPreparedIncludedRowDecoder(contract, include, bindingFor) {
 		return {
 			key,
 			field: fieldOf(key),
-			decode(value) {
+			async decode(value) {
 				if (value === null || value === void 0) return value;
 				const resolved = binding();
-				return resolved ? decodeIncludedColumnValue(resolved.ref, resolved.codecId, resolved.codec, value) : value;
+				return resolved ? decodeIncludedColumnValue(resolved, value) : value;
 			}
 		};
 	});
@@ -2541,9 +2541,9 @@ function createPreparedIncludedRowDecoder(contract, include, bindingFor) {
 			const actual = Object.keys(row);
 			return actual.length === keys.length && actual.every((key, index) => key === keys[index]);
 		},
-		decode(row) {
+		async decode(row) {
 			const result = {};
-			for (const operation of operations) result[operation.field] = operation.decode(row[operation.key]);
+			for (const operation of operations) result[operation.field] = await operation.decode(row[operation.key]);
 			return result;
 		}
 	};
@@ -2604,7 +2604,7 @@ function consumeIncludeRows(context, state, namespaceId, modelName, rows) {
 			};
 		});
 		const bindings = /* @__PURE__ */ new WeakMap();
-		for (const parent of parentRows) for (const include of state.includes) parent.mapped[include.relationName] = decodeIncludePayload(contract, context, include, parent.raw[include.relationName], bindings);
+		for (const parent of parentRows) for (const include of state.includes) parent.mapped[include.relationName] = await decodeIncludePayload(contract, context, include, parent.raw[include.relationName], bindings);
 		for (const row of parentRows) yield blindCast(row.mapped);
 	};
 	return new AsyncIterableResult(generator());
@@ -2648,7 +2648,7 @@ function consumeIncludeRows(context, state, namespaceId, modelName, rows) {
 * each branch is dispatched to the row or scalar decoder per its
 * declared shape (see `decodeCombineIncludePayload`).
 */
-function decodeIncludePayload(contract, context, include, raw, bindings) {
+async function decodeIncludePayload(contract, context, include, raw, bindings) {
 	if (include.scalar) return decodeScalarIncludePayload(contract, context, include, include.scalar, raw);
 	if (include.combine) return decodeCombineIncludePayload(contract, context, include, include.combine, raw, bindings);
 	const rawChildren = parseIncludedRows(include, raw);
@@ -2672,17 +2672,17 @@ function decodeIncludePayload(contract, context, include, raw, bindings) {
 		consume: (value) => decodeIncludePayload(contract, context, nested, value, bindings)
 	})), isToOneCardinality(include.cardinality));
 }
-function consumeRowInclude(rawChildren, mapChildRow, bindingFor, nested, toOne) {
+async function consumeRowInclude(rawChildren, mapChildRow, bindingFor, nested, toOne) {
 	const mappedChildren = [];
 	for (const childRow of rawChildren) {
-		const decodedChildRow = decodeIncludedStorageRow(childRow, bindingFor);
+		const decodedChildRow = await decodeIncludedStorageRow(childRow, bindingFor);
 		const mapped = mapChildRow(decodedChildRow);
-		for (const child of nested) mapped[child.alias] = child.consume(decodedChildRow[child.alias]);
+		for (const child of nested) mapped[child.alias] = await child.consume(decodedChildRow[child.alias]);
 		mappedChildren.push(mapped);
 	}
 	return toOne ? mappedChildren[0] ?? null : mappedChildren;
 }
-function decodeIncludedStorageRow(row, bindingFor) {
+async function decodeIncludedStorageRow(row, bindingFor) {
 	const decoded = {};
 	for (const [key, value] of Object.entries(row)) {
 		if (value === null || value === void 0) {
@@ -2690,7 +2690,7 @@ function decodeIncludedStorageRow(row, bindingFor) {
 			continue;
 		}
 		const binding = bindingFor(key);
-		decoded[key] = binding ? decodeIncludedColumnValue(binding.ref, binding.codecId, binding.codec, value) : value;
+		decoded[key] = binding ? await decodeIncludedColumnValue(binding, value) : value;
 	}
 	return decoded;
 }
@@ -2702,7 +2702,11 @@ function resolveIncludedColumnBinding(contract, context, include, key) {
 	return {
 		ref,
 		codec,
-		codecId: context.codecDescriptors.codecRefForColumn(ref.namespaceId, ref.table, ref.column)?.codecId ?? ref.storageColumn.codecId
+		codecId: context.codecDescriptors.codecRefForColumn(ref.namespaceId, ref.table, ref.column)?.codecId ?? ref.storageColumn.codecId,
+		ctx: { column: {
+			table: ref.table,
+			name: ref.column
+		} }
 	};
 }
 function resolveIncludedColumnRef(contract, include, key) {
@@ -2730,7 +2734,8 @@ function resolveIncludedColumnRef(contract, include, key) {
 		};
 	}
 }
-function decodeIncludedColumnValue(ref, codecId, codec, value) {
+async function decodeIncludedColumnValue(binding, value) {
+	const { ref, codecId } = binding;
 	if (ref.storageColumn.many !== false) {
 		if (!Array.isArray(value)) wrapIncludedDecodeFailure(/* @__PURE__ */ new TypeError(`expected an array from the driver for many-typed column, got ${typeof value}`), ref, codecId);
 		const decoded = [];
@@ -2739,16 +2744,19 @@ function decodeIncludedColumnValue(ref, codecId, codec, value) {
 				decoded.push(null);
 				continue;
 			}
-			decoded.push(decodeIncludedJsonValue(ref, codecId, codec, element));
+			decoded.push(await decodeIncludedJsonValue(binding, element));
 		}
 		return decoded;
 	}
-	return decodeIncludedJsonValue(ref, codecId, codec, value);
+	return decodeIncludedJsonValue(binding, value);
 }
-/** `ref` names the value for a decode failure; an aggregate names its relation where a column would name itself. */
-function decodeIncludedJsonValue(ref, codecId, codec, value) {
+/**
+* Reads a value the database put into JSON with its codec's `fromWire`, with the call context an ordinary row's cell gets. `ref` names the value for a decode failure; an aggregate names its relation where a column would name itself.
+*/
+async function decodeIncludedJsonValue(binding, value) {
+	const { ref, codecId, codec, ctx } = binding;
 	try {
-		return codec.decodeJson(blindCast(value));
+		return await codec.fromWire(value, ctx);
 	} catch (error) {
 		if (isRuntimeError(error)) throw error;
 		wrapIncludedDecodeFailure(error, ref, codecId);
@@ -2785,18 +2793,18 @@ function wrapIncludedDecodeFailure(error, ref, codecId) {
 * bug — `parseCombineEnvelope` throws loudly rather than papering over
 * it with an empty shape.
 */
-function decodeCombineIncludePayload(contract, context, include, branches, raw, bindings) {
+async function decodeCombineIncludePayload(contract, context, include, branches, raw, bindings) {
 	const parsed = parseCombineEnvelope(include, raw);
 	const result = {};
 	for (const [branchName, branch] of Object.entries(branches)) {
 		const branchRaw = parsed[branchName];
-		if (branch.kind === "rows") result[branchName] = decodeIncludePayload(contract, context, {
+		if (branch.kind === "rows") result[branchName] = await decodeIncludePayload(contract, context, {
 			...include,
 			nested: branch.state,
 			scalar: void 0,
 			combine: void 0
 		}, branchRaw, bindings);
-		else result[branchName] = decodeScalarIncludePayload(contract, context, include, branch.selector, branchRaw);
+		else result[branchName] = await decodeScalarIncludePayload(contract, context, include, branch.selector, branchRaw);
 	}
 	return result;
 }
@@ -2855,16 +2863,21 @@ function resolveScalarIncludeMetadata(contract, context, include, scalar) {
 		codec: context.contractCodecs.forCodecRef(resolved.codec)
 	};
 }
-function consumeScalarInclude(include, resolved, codec, raw) {
+async function consumeScalarInclude(include, resolved, codec, raw) {
 	if (raw === null || raw === void 0) return emptyAggregateResult(resolved, codec);
 	const parsed = parseIncludePayload(raw);
 	if (!isPlainObjectEnvelope(parsed)) throw new InternalError(`scalar() envelope for include "${include.relationName}" has unexpected shape (expected object, got ${describeEnvelopeShape(parsed)}); this indicates a planner or decoder bug.`);
 	const value = parsed["value"];
 	if (value === null || value === void 0) return emptyAggregateResult(resolved, codec);
 	return decodeIncludedJsonValue({
-		table: include.relatedTableName,
-		column: include.relationName
-	}, resolved.codec.codecId, codec, value);
+		ref: {
+			table: include.relatedTableName,
+			column: include.relationName
+		},
+		codecId: resolved.codec.codecId,
+		codec,
+		ctx: {}
+	}, value);
 }
 function parseIncludedRows(include, value) {
 	if (value === null || value === void 0) return [];
@@ -5618,9 +5631,9 @@ var CollectionBase = class CollectionBase {
 			plan: compiled,
 			async consume(source) {
 				const row = (await source.toArray())[0] ?? {};
-				return blindCast(Object.fromEntries(results.map(({ alias, resolved, codec }) => {
-					return [alias, (Object.hasOwn(row, alias) ? row[alias] : void 0) ?? emptyAggregateResult(resolved, codec)];
-				})));
+				return blindCast(Object.fromEntries(await Promise.all(results.map(async ({ alias, resolved, codec }) => {
+					return [alias, (Object.hasOwn(row, alias) ? row[alias] : void 0) ?? await emptyAggregateResult(resolved, codec)];
+				}))));
 			}
 		};
 	}