@prisma-next/sql-contract 0.3.0-dev.135 → 0.3.0-dev.146

package/dist/{validators-i9MX9Dti.mjs → validators-BjZ6lOS1.mjs}

@@ -1,3 +1,4 @@
+import { ContractValidationError } from "@prisma-next/contract/validate-contract";
 import { type } from "arktype";
 
 //#region src/validators.ts
@@ -34,6 +35,7 @@ const ExecutionMutationDefaultSchema = type({
 });
 const ExecutionSchema = type({
 	"+": "reject",
+	executionHash: "string",
 	mutations: {
 		"+": "reject",
 		defaults: ExecutionMutationDefaultSchema.array().readonly()
@@ -94,12 +96,37 @@ const StorageTableSchema = type({
 });
 const StorageSchema = type({
 	"+": "reject",
+	storageHash: "string",
 	tables: type({ "[string]": StorageTableSchema }),
 	"types?": type({ "[string]": StorageTypeInstanceSchema })
 });
+function isPlainRecord(value) {
+	return typeof value === "object" && value !== null && !Array.isArray(value);
+}
+function isContractFieldType(value) {
+	if (!isPlainRecord(value)) return false;
+	const kind = value["kind"];
+	if (kind === "scalar") {
+		if (typeof value["codecId"] !== "string") return false;
+		const typeParams = value["typeParams"];
+		if (typeParams !== void 0 && !isPlainRecord(typeParams)) return false;
+		return true;
+	}
+	if (kind === "valueObject") return typeof value["name"] === "string";
+	if (kind === "union") {
+		const members = value["members"];
+		if (!Array.isArray(members)) return false;
+		return members.every((m) => isContractFieldType(m));
+	}
+	return false;
+}
+const ContractFieldTypeSchema = type("unknown").narrow((value, ctx) => isContractFieldType(value) ? true : ctx.mustBe("scalar, valueObject, or union field type"));
 const ModelFieldSchema = type({
-	"nullable?": "boolean",
-	"codecId?": "string"
+	"+": "reject",
+	nullable: "boolean",
+	type: ContractFieldTypeSchema,
+	"many?": "true",
+	"dict?": "true"
 });
 const ModelStorageFieldSchema = type({
 	column: "string",
@@ -121,20 +148,16 @@ const ModelSchema = type({
 const ContractMetaSchema = type({ "[string]": "unknown" });
 const SqlContractSchema = type({
 	"+": "reject",
-	"schemaVersion?": "'1'",
 	target: "string",
 	targetFamily: "'sql'",
 	"coreHash?": "string",
-	storageHash: "string",
-	"executionHash?": "string",
-	"profileHash?": "string",
-	"_generated?": "Record<string, unknown>",
+	profileHash: "string",
 	"capabilities?": "Record<string, Record<string, boolean>>",
 	"extensionPacks?": "Record<string, unknown>",
 	"meta?": ContractMetaSchema,
-	"sources?": "Record<string, unknown>",
 	"roots?": "Record<string, string>",
 	models: type({ "[string]": ModelSchema }),
+	"valueObjects?": "Record<string, unknown>",
 	storage: StorageSchema,
 	"execution?": ExecutionSchema
 });
@@ -162,30 +185,21 @@ function validateModel(value) {
 	return result;
 }
 /**
-* Validates the structural shape of a SqlContract using Arktype.
-*
-* **Responsibility: Validation Only**
-* This function validates that the contract has the correct structure and types.
-* It does NOT normalize the contract - normalization must happen in the contract builder.
+* Validates the structural shape of an SQL contract using Arktype.
 *
-* The contract passed to this function must already be normalized (all required fields present).
-* If normalization is needed, it should be done by the contract builder before calling this function.
-*
-* This ensures all required fields are present and have the correct types.
+* Ensures all required fields are present and have the correct types,
+* including SQL-specific storage structure (tables, columns, constraints).
 *
 * @param value - The contract value to validate (typically from a JSON import)
 * @returns The validated contract if structure is valid
-* @throws Error if the contract structure is invalid
+* @throws ContractValidationError if the contract structure is invalid
 */
 function validateSqlContract(value) {
-	if (typeof value !== "object" || value === null) throw new Error("Contract structural validation failed: value must be an object");
+	if (typeof value !== "object" || value === null) throw new ContractValidationError("Contract structural validation failed: value must be an object", "structural");
 	const rawValue = value;
-	if (rawValue.targetFamily !== void 0 && rawValue.targetFamily !== "sql") throw new Error(`Unsupported target family: ${rawValue.targetFamily}`);
+	if (rawValue.targetFamily !== void 0 && rawValue.targetFamily !== "sql") throw new ContractValidationError(`Unsupported target family: ${rawValue.targetFamily}`, "structural");
 	const contractResult = SqlContractSchema(value);
-	if (contractResult instanceof type.errors) {
-		const messages = contractResult.map((p) => p.message).join("; ");
-		throw new Error(`Contract structural validation failed: ${messages}`);
-	}
+	if (contractResult instanceof type.errors) throw new ContractValidationError(`Contract structural validation failed: ${contractResult.map((p) => p.message).join("; ")}`, "structural");
 	return contractResult;
 }
 /**
@@ -264,4 +278,4 @@ function validateStorageSemantics(storage) {
 
 //#endregion
 export { ForeignKeySchema as a, validateModel as c, validateStorageSemantics as d, ForeignKeyReferencesSchema as i, validateSqlContract as l, ColumnDefaultLiteralSchema as n, IndexSchema as o, ColumnDefaultSchema as r, ReferentialActionSchema as s, ColumnDefaultFunctionSchema as t, validateStorage as u };
-//# sourceMappingURL=validators-i9MX9Dti.mjs.map
+//# sourceMappingURL=validators-BjZ6lOS1.mjs.map

package/dist/validators-BjZ6lOS1.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"validators-BjZ6lOS1.mjs","names":["errors: string[]"],"sources":["../src/validators.ts"],"sourcesContent":["import type { Contract } from '@prisma-next/contract/types';\nimport { ContractValidationError } from '@prisma-next/contract/validate-contract';\nimport { type } from 'arktype';\nimport type {\n  ForeignKey,\n  ForeignKeyReferences,\n  PrimaryKey,\n  ReferentialAction,\n  SqlStorage,\n  StorageTypeInstance,\n  UniqueConstraint,\n} from './types';\n\ntype ColumnDefaultLiteral = {\n  readonly kind: 'literal';\n  readonly value: string | number | boolean | Record<string, unknown> | unknown[] | null;\n};\ntype ColumnDefaultFunction = { readonly kind: 'function'; readonly expression: string };\nconst literalKindSchema = type(\"'literal'\");\nconst functionKindSchema = type(\"'function'\");\nconst generatorKindSchema = type(\"'generator'\");\nconst generatorIdSchema = type('string').narrow((value, ctx) => {\n  return /^[A-Za-z0-9][A-Za-z0-9_-]*$/.test(value) ? true : ctx.mustBe('a flat generator id');\n});\n\nexport const ColumnDefaultLiteralSchema = type.declare<ColumnDefaultLiteral>().type({\n  kind: literalKindSchema,\n  value: 'string | number | boolean | null | unknown[] | Record<string, unknown>',\n});\n\nexport const ColumnDefaultFunctionSchema = type.declare<ColumnDefaultFunction>().type({\n  kind: functionKindSchema,\n  expression: 'string',\n});\n\nexport const ColumnDefaultSchema = ColumnDefaultLiteralSchema.or(ColumnDefaultFunctionSchema);\n\nconst ExecutionMutationDefaultValueSchema = type({\n  '+': 'reject',\n  kind: generatorKindSchema,\n  id: generatorIdSchema,\n  'params?': 'Record<string, unknown>',\n});\n\nconst ExecutionMutationDefaultSchema = type({\n  '+': 'reject',\n  ref: {\n    '+': 'reject',\n    table: 'string',\n    column: 'string',\n  },\n  'onCreate?': ExecutionMutationDefaultValueSchema,\n  'onUpdate?': ExecutionMutationDefaultValueSchema,\n});\n\nconst ExecutionSchema = type({\n  '+': 'reject',\n  executionHash: 'string',\n  mutations: {\n    '+': 'reject',\n    defaults: ExecutionMutationDefaultSchema.array().readonly(),\n  },\n});\n\nconst StorageColumnSchema = type({\n  '+': 'reject',\n  nativeType: 'string',\n  codecId: 'string',\n  nullable: 'boolean',\n  'typeParams?': 'Record<string, unknown>',\n  'typeRef?': 'string',\n  'default?': ColumnDefaultSchema,\n}).narrow((col, ctx) => {\n  if (col.typeParams !== undefined && col.typeRef !== undefined) {\n    return ctx.mustBe('a column with either typeParams or typeRef, not both');\n  }\n  return true;\n});\n\nconst StorageTypeInstanceSchema = type.declare<StorageTypeInstance>().type({\n  codecId: 'string',\n  nativeType: 'string',\n  typeParams: 'Record<string, unknown>',\n});\n\nconst PrimaryKeySchema = type.declare<PrimaryKey>().type({\n  columns: type.string.array().readonly(),\n  'name?': 'string',\n});\n\nconst UniqueConstraintSchema = type.declare<UniqueConstraint>().type({\n  columns: type.string.array().readonly(),\n  'name?': 'string',\n});\n\nexport const IndexSchema = type({\n  columns: type.string.array().readonly(),\n  'name?': 'string',\n  'using?': 'string',\n  'config?': 'Record<string, unknown>',\n});\n\nexport const ForeignKeyReferencesSchema = type.declare<ForeignKeyReferences>().type({\n  table: 'string',\n  columns: type.string.array().readonly(),\n});\n\nexport const ReferentialActionSchema = type\n  .declare<ReferentialAction>()\n  .type(\"'noAction' | 'restrict' | 'cascade' | 'setNull' | 'setDefault'\");\n\nexport const ForeignKeySchema = type.declare<ForeignKey>().type({\n  columns: type.string.array().readonly(),\n  references: ForeignKeyReferencesSchema,\n  'name?': 'string',\n  'onDelete?': ReferentialActionSchema,\n  'onUpdate?': ReferentialActionSchema,\n  constraint: 'boolean',\n  index: 'boolean',\n});\n\nconst StorageTableSchema = type({\n  '+': 'reject',\n  columns: type({ '[string]': StorageColumnSchema }),\n  'primaryKey?': PrimaryKeySchema,\n  uniques: UniqueConstraintSchema.array().readonly(),\n  indexes: IndexSchema.array().readonly(),\n  foreignKeys: ForeignKeySchema.array().readonly(),\n});\n\nconst StorageSchema = type({\n  '+': 'reject',\n  storageHash: 'string',\n  tables: type({ '[string]': StorageTableSchema }),\n  'types?': type({ '[string]': StorageTypeInstanceSchema }),\n});\n\nfunction isPlainRecord(value: unknown): value is Record<string, unknown> {\n  return typeof value === 'object' && value !== null && !Array.isArray(value);\n}\n\nfunction isContractFieldType(value: unknown): boolean {\n  if (!isPlainRecord(value)) return false;\n  const kind = value['kind'];\n  if (kind === 'scalar') {\n    if (typeof value['codecId'] !== 'string') return false;\n    const typeParams = value['typeParams'];\n    if (typeParams !== undefined && !isPlainRecord(typeParams)) return false;\n    return true;\n  }\n  if (kind === 'valueObject') {\n    return typeof value['name'] === 'string';\n  }\n  if (kind === 'union') {\n    const members = value['members'];\n    if (!Array.isArray(members)) return false;\n    return members.every((m) => isContractFieldType(m));\n  }\n  return false;\n}\n\nconst ContractFieldTypeSchema = type('unknown').narrow((value, ctx) =>\n  isContractFieldType(value) ? true : ctx.mustBe('scalar, valueObject, or union field type'),\n);\n\nconst ModelFieldSchema = type({\n  '+': 'reject',\n  nullable: 'boolean',\n  type: ContractFieldTypeSchema,\n  'many?': 'true',\n  'dict?': 'true',\n});\n\nconst ModelStorageFieldSchema = type({\n  column: 'string',\n  'codecId?': 'string',\n  'nullable?': 'boolean',\n});\n\nconst ModelStorageSchema = type({\n  table: 'string',\n  fields: type({ '[string]': ModelStorageFieldSchema }),\n});\n\nconst ModelSchema = type({\n  storage: ModelStorageSchema,\n  'fields?': type({ '[string]': ModelFieldSchema }),\n  'relations?': type({ '[string]': 'unknown' }),\n  'discriminator?': 'unknown',\n  'variants?': 'unknown',\n  'base?': 'string',\n  'owner?': 'string',\n});\n\nconst ContractMetaSchema = type({\n  '[string]': 'unknown',\n});\n\nconst SqlContractSchema = type({\n  '+': 'reject',\n  target: 'string',\n  targetFamily: \"'sql'\",\n  'coreHash?': 'string',\n  profileHash: 'string',\n  'capabilities?': 'Record<string, Record<string, boolean>>',\n  'extensionPacks?': 'Record<string, unknown>',\n  'meta?': ContractMetaSchema,\n  'roots?': 'Record<string, string>',\n  models: type({ '[string]': ModelSchema }),\n  'valueObjects?': 'Record<string, unknown>',\n  storage: StorageSchema,\n  'execution?': ExecutionSchema,\n});\n\n// NOTE: StorageColumnSchema, StorageTableSchema, and StorageSchema use bare type()\n// instead of type.declare<T>().type() because the ColumnDefault union's value field\n// includes bigint | Date (runtime-only types after decoding) which cannot be expressed\n// in Arktype's JSON validation DSL. The `as SqlStorage` cast in validateStorage() bridges\n// the gap between the JSON-safe Arktype output and the runtime TypeScript type.\n// See decodeContractDefaults() in validate.ts for the decoding step.\n\n/**\n * Validates the structural shape of SqlStorage using Arktype.\n *\n * @param value - The storage value to validate\n * @returns The validated storage if structure is valid\n * @throws Error if the storage structure is invalid\n */\nexport function validateStorage(value: unknown): SqlStorage {\n  const result = StorageSchema(value);\n  if (result instanceof type.errors) {\n    const messages = result.map((p: { message: string }) => p.message).join('; ');\n    throw new Error(`Storage validation failed: ${messages}`);\n  }\n  return result as SqlStorage;\n}\n\nexport function validateModel(value: unknown): unknown {\n  const result = ModelSchema(value);\n  if (result instanceof type.errors) {\n    const messages = result.map((p: { message: string }) => p.message).join('; ');\n    throw new Error(`Model validation failed: ${messages}`);\n  }\n  return result;\n}\n\n/**\n * Validates the structural shape of an SQL contract using Arktype.\n *\n * Ensures all required fields are present and have the correct types,\n * including SQL-specific storage structure (tables, columns, constraints).\n *\n * @param value - The contract value to validate (typically from a JSON import)\n * @returns The validated contract if structure is valid\n * @throws ContractValidationError if the contract structure is invalid\n */\nexport function validateSqlContract<T extends Contract<SqlStorage>>(value: unknown): T {\n  if (typeof value !== 'object' || value === null) {\n    throw new ContractValidationError(\n      'Contract structural validation failed: value must be an object',\n      'structural',\n    );\n  }\n\n  const rawValue = value as { targetFamily?: string };\n  if (rawValue.targetFamily !== undefined && rawValue.targetFamily !== 'sql') {\n    throw new ContractValidationError(\n      `Unsupported target family: ${rawValue.targetFamily}`,\n      'structural',\n    );\n  }\n\n  const contractResult = SqlContractSchema(value);\n\n  if (contractResult instanceof type.errors) {\n    const messages = contractResult.map((p: { message: string }) => p.message).join('; ');\n    throw new ContractValidationError(\n      `Contract structural validation failed: ${messages}`,\n      'structural',\n    );\n  }\n\n  // Arktype's inferred output type differs from T due to exactOptionalPropertyTypes\n  // and branded hash types — the runtime value is structurally compatible after validation\n  return contractResult as unknown as T;\n}\n\n/**\n * Validates semantic constraints on SqlStorage that cannot be expressed in Arktype schemas.\n *\n * Returns an array of human-readable error strings. Empty array = valid.\n *\n * Currently checks:\n * - duplicate named primary key / unique / index / foreign key objects within a table\n * - duplicate unique, index, or foreign key declarations within a table\n * - `setNull` referential action on a non-nullable FK column (would fail at runtime)\n * - `setDefault` referential action on a non-nullable FK column without a DEFAULT (would fail at runtime)\n */\nexport function validateStorageSemantics(storage: SqlStorage): string[] {\n  const errors: string[] = [];\n\n  for (const [tableName, table] of Object.entries(storage.tables)) {\n    const namedObjects = new Map<string, string[]>();\n    const registerNamedObject = (kind: string, name: string | undefined) => {\n      if (!name) return;\n      namedObjects.set(name, [...(namedObjects.get(name) ?? []), kind]);\n    };\n\n    registerNamedObject('primary key', table.primaryKey?.name);\n    for (const unique of table.uniques) {\n      registerNamedObject('unique constraint', unique.name);\n    }\n    for (const index of table.indexes) {\n      registerNamedObject('index', index.name);\n    }\n    for (const fk of table.foreignKeys) {\n      registerNamedObject('foreign key', fk.name);\n    }\n\n    for (const [name, kinds] of namedObjects) {\n      if (kinds.length > 1) {\n        errors.push(\n          `Table \"${tableName}\": named object \"${name}\" is declared multiple times (${kinds.join(', ')})`,\n        );\n      }\n    }\n\n    const seenUniqueDefinitions = new Set<string>();\n    for (const unique of table.uniques) {\n      const signature = JSON.stringify({ columns: unique.columns });\n      if (seenUniqueDefinitions.has(signature)) {\n        errors.push(\n          `Table \"${tableName}\": duplicate unique constraint definition on columns [${unique.columns.join(', ')}]`,\n        );\n        continue;\n      }\n      seenUniqueDefinitions.add(signature);\n    }\n\n    const seenIndexDefinitions = new Set<string>();\n    for (const index of table.indexes) {\n      const signature = JSON.stringify({\n        columns: index.columns,\n        using: index.using ?? null,\n        config: index.config ?? null,\n      });\n      if (seenIndexDefinitions.has(signature)) {\n        errors.push(\n          `Table \"${tableName}\": duplicate index definition on columns [${index.columns.join(', ')}]`,\n        );\n        continue;\n      }\n      seenIndexDefinitions.add(signature);\n    }\n\n    const seenForeignKeyDefinitions = new Set<string>();\n    for (const fk of table.foreignKeys) {\n      const signature = JSON.stringify({\n        columns: fk.columns,\n        references: fk.references,\n        onDelete: fk.onDelete ?? null,\n        onUpdate: fk.onUpdate ?? null,\n        constraint: fk.constraint,\n        index: fk.index,\n      });\n      if (seenForeignKeyDefinitions.has(signature)) {\n        errors.push(\n          `Table \"${tableName}\": duplicate foreign key definition on columns [${fk.columns.join(', ')}]`,\n        );\n        continue;\n      }\n      seenForeignKeyDefinitions.add(signature);\n    }\n\n    for (const fk of table.foreignKeys) {\n      for (const colName of fk.columns) {\n        const column = table.columns[colName];\n        if (!column) continue;\n\n        if (fk.onDelete === 'setNull' && !column.nullable) {\n          errors.push(\n            `Table \"${tableName}\": onDelete setNull on foreign key column \"${colName}\" which is NOT NULL`,\n          );\n        }\n        if (fk.onUpdate === 'setNull' && !column.nullable) {\n          errors.push(\n            `Table \"${tableName}\": onUpdate setNull on foreign key column \"${colName}\" which is NOT NULL`,\n          );\n        }\n        if (fk.onDelete === 'setDefault' && !column.nullable && column.default === undefined) {\n          errors.push(\n            `Table \"${tableName}\": onDelete setDefault on foreign key column \"${colName}\" which is NOT NULL and has no DEFAULT`,\n          );\n        }\n        if (fk.onUpdate === 'setDefault' && !column.nullable && column.default === undefined) {\n          errors.push(\n            `Table \"${tableName}\": onUpdate setDefault on foreign key column \"${colName}\" which is NOT NULL and has no DEFAULT`,\n          );\n        }\n      }\n    }\n  }\n\n  return errors;\n}\n"],"mappings":";;;;AAkBA,MAAM,oBAAoB,KAAK,YAAY;AAC3C,MAAM,qBAAqB,KAAK,aAAa;AAC7C,MAAM,sBAAsB,KAAK,cAAc;AAC/C,MAAM,oBAAoB,KAAK,SAAS,CAAC,QAAQ,OAAO,QAAQ;AAC9D,QAAO,8BAA8B,KAAK,MAAM,GAAG,OAAO,IAAI,OAAO,sBAAsB;EAC3F;AAEF,MAAa,6BAA6B,KAAK,SAA+B,CAAC,KAAK;CAClF,MAAM;CACN,OAAO;CACR,CAAC;AAEF,MAAa,8BAA8B,KAAK,SAAgC,CAAC,KAAK;CACpF,MAAM;CACN,YAAY;CACb,CAAC;AAEF,MAAa,sBAAsB,2BAA2B,GAAG,4BAA4B;AAE7F,MAAM,sCAAsC,KAAK;CAC/C,KAAK;CACL,MAAM;CACN,IAAI;CACJ,WAAW;CACZ,CAAC;AAEF,MAAM,iCAAiC,KAAK;CAC1C,KAAK;CACL,KAAK;EACH,KAAK;EACL,OAAO;EACP,QAAQ;EACT;CACD,aAAa;CACb,aAAa;CACd,CAAC;AAEF,MAAM,kBAAkB,KAAK;CAC3B,KAAK;CACL,eAAe;CACf,WAAW;EACT,KAAK;EACL,UAAU,+BAA+B,OAAO,CAAC,UAAU;EAC5D;CACF,CAAC;AAEF,MAAM,sBAAsB,KAAK;CAC/B,KAAK;CACL,YAAY;CACZ,SAAS;CACT,UAAU;CACV,eAAe;CACf,YAAY;CACZ,YAAY;CACb,CAAC,CAAC,QAAQ,KAAK,QAAQ;AACtB,KAAI,IAAI,eAAe,UAAa,IAAI,YAAY,OAClD,QAAO,IAAI,OAAO,uDAAuD;AAE3E,QAAO;EACP;AAEF,MAAM,4BAA4B,KAAK,SAA8B,CAAC,KAAK;CACzE,SAAS;CACT,YAAY;CACZ,YAAY;CACb,CAAC;AAEF,MAAM,mBAAmB,KAAK,SAAqB,CAAC,KAAK;CACvD,SAAS,KAAK,OAAO,OAAO,CAAC,UAAU;CACvC,SAAS;CACV,CAAC;AAEF,MAAM,yBAAyB,KAAK,SAA2B,CAAC,KAAK;CACnE,SAAS,KAAK,OAAO,OAAO,CAAC,UAAU;CACvC,SAAS;CACV,CAAC;AAEF,MAAa,cAAc,KAAK;CAC9B,SAAS,KAAK,OAAO,OAAO,CAAC,UAAU;CACvC,SAAS;CACT,UAAU;CACV,WAAW;CACZ,CAAC;AAEF,MAAa,6BAA6B,KAAK,SAA+B,CAAC,KAAK;CAClF,OAAO;CACP,SAAS,KAAK,OAAO,OAAO,CAAC,UAAU;CACxC,CAAC;AAEF,MAAa,0BAA0B,KACpC,SAA4B,CAC5B,KAAK,iEAAiE;AAEzE,MAAa,mBAAmB,KAAK,SAAqB,CAAC,KAAK;CAC9D,SAAS,KAAK,OAAO,OAAO,CAAC,UAAU;CACvC,YAAY;CACZ,SAAS;CACT,aAAa;CACb,aAAa;CACb,YAAY;CACZ,OAAO;CACR,CAAC;AAEF,MAAM,qBAAqB,KAAK;CAC9B,KAAK;CACL,SAAS,KAAK,EAAE,YAAY,qBAAqB,CAAC;CAClD,eAAe;CACf,SAAS,uBAAuB,OAAO,CAAC,UAAU;CAClD,SAAS,YAAY,OAAO,CAAC,UAAU;CACvC,aAAa,iBAAiB,OAAO,CAAC,UAAU;CACjD,CAAC;AAEF,MAAM,gBAAgB,KAAK;CACzB,KAAK;CACL,aAAa;CACb,QAAQ,KAAK,EAAE,YAAY,oBAAoB,CAAC;CAChD,UAAU,KAAK,EAAE,YAAY,2BAA2B,CAAC;CAC1D,CAAC;AAEF,SAAS,cAAc,OAAkD;AACvE,QAAO,OAAO,UAAU,YAAY,UAAU,QAAQ,CAAC,MAAM,QAAQ,MAAM;;AAG7E,SAAS,oBAAoB,OAAyB;AACpD,KAAI,CAAC,cAAc,MAAM,CAAE,QAAO;CAClC,MAAM,OAAO,MAAM;AACnB,KAAI,SAAS,UAAU;AACrB,MAAI,OAAO,MAAM,eAAe,SAAU,QAAO;EACjD,MAAM,aAAa,MAAM;AACzB,MAAI,eAAe,UAAa,CAAC,cAAc,WAAW,CAAE,QAAO;AACnE,SAAO;;AAET,KAAI,SAAS,cACX,QAAO,OAAO,MAAM,YAAY;AAElC,KAAI,SAAS,SAAS;EACpB,MAAM,UAAU,MAAM;AACtB,MAAI,CAAC,MAAM,QAAQ,QAAQ,CAAE,QAAO;AACpC,SAAO,QAAQ,OAAO,MAAM,oBAAoB,EAAE,CAAC;;AAErD,QAAO;;AAGT,MAAM,0BAA0B,KAAK,UAAU,CAAC,QAAQ,OAAO,QAC7D,oBAAoB,MAAM,GAAG,OAAO,IAAI,OAAO,2CAA2C,CAC3F;AAED,MAAM,mBAAmB,KAAK;CAC5B,KAAK;CACL,UAAU;CACV,MAAM;CACN,SAAS;CACT,SAAS;CACV,CAAC;AAEF,MAAM,0BAA0B,KAAK;CACnC,QAAQ;CACR,YAAY;CACZ,aAAa;CACd,CAAC;AAOF,MAAM,cAAc,KAAK;CACvB,SANyB,KAAK;EAC9B,OAAO;EACP,QAAQ,KAAK,EAAE,YAAY,yBAAyB,CAAC;EACtD,CAAC;CAIA,WAAW,KAAK,EAAE,YAAY,kBAAkB,CAAC;CACjD,cAAc,KAAK,EAAE,YAAY,WAAW,CAAC;CAC7C,kBAAkB;CAClB,aAAa;CACb,SAAS;CACT,UAAU;CACX,CAAC;AAEF,MAAM,qBAAqB,KAAK,EAC9B,YAAY,WACb,CAAC;AAEF,MAAM,oBAAoB,KAAK;CAC7B,KAAK;CACL,QAAQ;CACR,cAAc;CACd,aAAa;CACb,aAAa;CACb,iBAAiB;CACjB,mBAAmB;CACnB,SAAS;CACT,UAAU;CACV,QAAQ,KAAK,EAAE,YAAY,aAAa,CAAC;CACzC,iBAAiB;CACjB,SAAS;CACT,cAAc;CACf,CAAC;;;;;;;;AAgBF,SAAgB,gBAAgB,OAA4B;CAC1D,MAAM,SAAS,cAAc,MAAM;AACnC,KAAI,kBAAkB,KAAK,QAAQ;EACjC,MAAM,WAAW,OAAO,KAAK,MAA2B,EAAE,QAAQ,CAAC,KAAK,KAAK;AAC7E,QAAM,IAAI,MAAM,8BAA8B,WAAW;;AAE3D,QAAO;;AAGT,SAAgB,cAAc,OAAyB;CACrD,MAAM,SAAS,YAAY,MAAM;AACjC,KAAI,kBAAkB,KAAK,QAAQ;EACjC,MAAM,WAAW,OAAO,KAAK,MAA2B,EAAE,QAAQ,CAAC,KAAK,KAAK;AAC7E,QAAM,IAAI,MAAM,4BAA4B,WAAW;;AAEzD,QAAO;;;;;;;;;;;;AAaT,SAAgB,oBAAoD,OAAmB;AACrF,KAAI,OAAO,UAAU,YAAY,UAAU,KACzC,OAAM,IAAI,wBACR,kEACA,aACD;CAGH,MAAM,WAAW;AACjB,KAAI,SAAS,iBAAiB,UAAa,SAAS,iBAAiB,MACnE,OAAM,IAAI,wBACR,8BAA8B,SAAS,gBACvC,aACD;CAGH,MAAM,iBAAiB,kBAAkB,MAAM;AAE/C,KAAI,0BAA0B,KAAK,OAEjC,OAAM,IAAI,wBACR,0CAFe,eAAe,KAAK,MAA2B,EAAE,QAAQ,CAAC,KAAK,KAAK,IAGnF,aACD;AAKH,QAAO;;;;;;;;;;;;;AAcT,SAAgB,yBAAyB,SAA+B;CACtE,MAAMA,SAAmB,EAAE;AAE3B,MAAK,MAAM,CAAC,WAAW,UAAU,OAAO,QAAQ,QAAQ,OAAO,EAAE;EAC/D,MAAM,+BAAe,IAAI,KAAuB;EAChD,MAAM,uBAAuB,MAAc,SAA6B;AACtE,OAAI,CAAC,KAAM;AACX,gBAAa,IAAI,MAAM,CAAC,GAAI,aAAa,IAAI,KAAK,IAAI,EAAE,EAAG,KAAK,CAAC;;AAGnE,sBAAoB,eAAe,MAAM,YAAY,KAAK;AAC1D,OAAK,MAAM,UAAU,MAAM,QACzB,qBAAoB,qBAAqB,OAAO,KAAK;AAEvD,OAAK,MAAM,SAAS,MAAM,QACxB,qBAAoB,SAAS,MAAM,KAAK;AAE1C,OAAK,MAAM,MAAM,MAAM,YACrB,qBAAoB,eAAe,GAAG,KAAK;AAG7C,OAAK,MAAM,CAAC,MAAM,UAAU,aAC1B,KAAI,MAAM,SAAS,EACjB,QAAO,KACL,UAAU,UAAU,mBAAmB,KAAK,gCAAgC,MAAM,KAAK,KAAK,CAAC,GAC9F;EAIL,MAAM,wCAAwB,IAAI,KAAa;AAC/C,OAAK,MAAM,UAAU,MAAM,SAAS;GAClC,MAAM,YAAY,KAAK,UAAU,EAAE,SAAS,OAAO,SAAS,CAAC;AAC7D,OAAI,sBAAsB,IAAI,UAAU,EAAE;AACxC,WAAO,KACL,UAAU,UAAU,wDAAwD,OAAO,QAAQ,KAAK,KAAK,CAAC,GACvG;AACD;;AAEF,yBAAsB,IAAI,UAAU;;EAGtC,MAAM,uCAAuB,IAAI,KAAa;AAC9C,OAAK,MAAM,SAAS,MAAM,SAAS;GACjC,MAAM,YAAY,KAAK,UAAU;IAC/B,SAAS,MAAM;IACf,OAAO,MAAM,SAAS;IACtB,QAAQ,MAAM,UAAU;IACzB,CAAC;AACF,OAAI,qBAAqB,IAAI,UAAU,EAAE;AACvC,WAAO,KACL,UAAU,UAAU,4CAA4C,MAAM,QAAQ,KAAK,KAAK,CAAC,GAC1F;AACD;;AAEF,wBAAqB,IAAI,UAAU;;EAGrC,MAAM,4CAA4B,IAAI,KAAa;AACnD,OAAK,MAAM,MAAM,MAAM,aAAa;GAClC,MAAM,YAAY,KAAK,UAAU;IAC/B,SAAS,GAAG;IACZ,YAAY,GAAG;IACf,UAAU,GAAG,YAAY;IACzB,UAAU,GAAG,YAAY;IACzB,YAAY,GAAG;IACf,OAAO,GAAG;IACX,CAAC;AACF,OAAI,0BAA0B,IAAI,UAAU,EAAE;AAC5C,WAAO,KACL,UAAU,UAAU,kDAAkD,GAAG,QAAQ,KAAK,KAAK,CAAC,GAC7F;AACD;;AAEF,6BAA0B,IAAI,UAAU;;AAG1C,OAAK,MAAM,MAAM,MAAM,YACrB,MAAK,MAAM,WAAW,GAAG,SAAS;GAChC,MAAM,SAAS,MAAM,QAAQ;AAC7B,OAAI,CAAC,OAAQ;AAEb,OAAI,GAAG,aAAa,aAAa,CAAC,OAAO,SACvC,QAAO,KACL,UAAU,UAAU,6CAA6C,QAAQ,qBAC1E;AAEH,OAAI,GAAG,aAAa,aAAa,CAAC,OAAO,SACvC,QAAO,KACL,UAAU,UAAU,6CAA6C,QAAQ,qBAC1E;AAEH,OAAI,GAAG,aAAa,gBAAgB,CAAC,OAAO,YAAY,OAAO,YAAY,OACzE,QAAO,KACL,UAAU,UAAU,gDAAgD,QAAQ,wCAC7E;AAEH,OAAI,GAAG,aAAa,gBAAgB,CAAC,OAAO,YAAY,OAAO,YAAY,OACzE,QAAO,KACL,UAAU,UAAU,gDAAgD,QAAQ,wCAC7E;;;AAMT,QAAO"}

package/dist/validators.d.mts

@@ -1,4 +1,5 @@
-import { E as SqlStorage, d as ForeignKeyReferences, l as ForeignKey, v as ReferentialAction, x as SqlContract } from "./types-D6K16_9R.mjs";
+import { T as SqlStorage, f as ForeignKeyReferences, u as ForeignKey, y as ReferentialAction } from "./types-D6o_FjCJ.mjs";
+import { Contract } from "@prisma-next/contract/types";
 import * as arktype_internal_variants_object_ts0 from "arktype/internal/variants/object.ts";
 import * as arktype_internal_variants_string_ts0 from "arktype/internal/variants/string.ts";
 
@@ -33,22 +34,16 @@ declare const ForeignKeySchema: arktype_internal_variants_object_ts0.ObjectType<
 declare function validateStorage(value: unknown): SqlStorage;
 declare function validateModel(value: unknown): unknown;
 /**
- * Validates the structural shape of a SqlContract using Arktype.
+ * Validates the structural shape of an SQL contract using Arktype.
  *
- * **Responsibility: Validation Only**
- * This function validates that the contract has the correct structure and types.
- * It does NOT normalize the contract - normalization must happen in the contract builder.
- *
- * The contract passed to this function must already be normalized (all required fields present).
- * If normalization is needed, it should be done by the contract builder before calling this function.
- *
- * This ensures all required fields are present and have the correct types.
+ * Ensures all required fields are present and have the correct types,
+ * including SQL-specific storage structure (tables, columns, constraints).
  *
  * @param value - The contract value to validate (typically from a JSON import)
  * @returns The validated contract if structure is valid
- * @throws Error if the contract structure is invalid
+ * @throws ContractValidationError if the contract structure is invalid
  */
-declare function validateSqlContract<T extends SqlContract<SqlStorage>>(value: unknown): T;
+declare function validateSqlContract<T extends Contract<SqlStorage>>(value: unknown): T;
 /**
  * Validates semantic constraints on SqlStorage that cannot be expressed in Arktype schemas.
  *

package/dist/validators.d.mts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.mts","names":[],"sources":["../src/validators.ts"],"sourcesContent":[],"mappings":";;;;;KAYK,oBAAA;;8CAEyC;;AAJ7B,KAMZ,qBAAA,GAJoB;EAIpB,SAAA,IAAA,EAAA,UAAqB;EAQb,SAAA,UAAA,EAAA,MAAA;AAKb,CAAA;AAKa,cAVA,0BAUgF,EAVtD,oCAAA,CAAA,UAUsD,CAVtD,oBAUsD,EAAA,CAAA,CAAA,CAAA;AAA7D,cALnB,2BAKmB,EALQ,oCAAA,CAAA,UAKR,CALQ,qBAKR,EAAA,CAAA,CAAA,CAAA;AAAA,cAAnB,mBAAmB,EAAA,oCAAA,CAAA,UAAA,CAAA,oBAAA,GAAA,qBAAA,EAAA,CAAA,CAAA,CAAA;AAAA,cA2DnB,WA3DmB,EAgE9B,oCAAA,CALsB,UA3DQ,CAAA;EAAA,OAAA,EAAA,SAAA,MAAA,EAAA;EA2DnB,IAAA,CAAA,EAAA,MAAA;EAOA,KAAA,CAAA,EAAA,MAAA;EAKA,MAAA,CAAA,EAPX,MAOW,CAAA,MAAA,EAAA,OAE4D,CAAA;AAEzE,CAAA,EAAA,CAAa,CAAA,CAAA;AAyFG,cAlGH,0BAkG8C,EAlGpB,oCAAA,CAAA,UAkGoB,CAlGpB,oBAkGoB,EAAA,CAAA,CAAA,CAAA;AAS3C,cAtGH,uBAsGgB,EAtGO,oCAAA,CAAA,UAsGP,CAtGO,iBAsGP,EAAA,CAAA,CAAA,CAAA;AAyBb,cA3HH,gBA2HsB,EA3HN,oCAAA,CAAA,UA2HM,CA3HN,UA2HM,EAAA,CAAA,CAAA,CAAA;;;;;AAmCnC;;;iBArEgB,eAAA,kBAAiC;iBASjC,aAAA;;;;;;;;;;;;;;;;;iBAyBA,8BAA8B,YAAY,8BAA8B;;;;;;;;;;;;iBAmCxE,wBAAA,UAAkC"}
+{"version":3,"file":"validators.d.mts","names":[],"sources":["../src/validators.ts"],"sourcesContent":[],"mappings":";;;;;;KAaK,oBAAA;;8CAEyC;;AAJ7B,KAMZ,qBAAA,GAJoB;EAIpB,SAAA,IAAA,EAAA,UAAqB;EAQb,SAAA,UAAA,EAAA,MAAA;AAKb,CAAA;AAKa,cAVA,0BAUgF,EAVtD,oCAAA,CAAA,UAUsD,CAVtD,oBAUsD,EAAA,CAAA,CAAA,CAAA;AAA7D,cALnB,2BAKmB,EALQ,oCAAA,CAAA,UAKR,CALQ,qBAKR,EAAA,CAAA,CAAA,CAAA;AAAA,cAAnB,mBAAmB,EAAA,oCAAA,CAAA,UAAA,CAAA,oBAAA,GAAA,qBAAA,EAAA,CAAA,CAAA,CAAA;AAAA,cA4DnB,WA5DmB,EAiE9B,oCAAA,CALsB,UA5DQ,CAAA;EAAA,OAAA,EAAA,SAAA,MAAA,EAAA;EA4DnB,IAAA,CAAA,EAAA,MAAA;EAOA,KAAA,CAAA,EAAA,MAAA;EAKA,MAAA,CAAA,EAPX,MAOW,CAAA,MAAA,EAAA,OAE4D,CAAA;AAEzE,CAAA,EAAA,CAAa,CAAA,CAAA;AAqHG,cA9HH,0BA8H8C,EA9HpB,oCAAA,CAAA,UA8HoB,CA9HpB,oBA8HoB,EAAA,CAAA,CAAA,CAAA;AAS3C,cAlIH,uBAkIgB,EAlIO,oCAAA,CAAA,UAkIP,CAlIO,iBAkIP,EAAA,CAAA,CAAA,CAAA;AAmBb,cAjJH,gBAiJsB,EAjJN,oCAAA,CAAA,UAiJM,CAjJN,UAiJM,EAAA,CAAA,CAAA,CAAA;;;;;AA0CnC;;;iBAtEgB,eAAA,kBAAiC;iBASjC,aAAA;;;;;;;;;;;iBAmBA,8BAA8B,SAAS,8BAA8B;;;;;;;;;;;;iBA0CrE,wBAAA,UAAkC"}

package/dist/validators.mjs

@@ -1,3 +1,3 @@
-import { a as ForeignKeySchema, c as validateModel, d as validateStorageSemantics, i as ForeignKeyReferencesSchema, l as validateSqlContract, n as ColumnDefaultLiteralSchema, o as IndexSchema, r as ColumnDefaultSchema, s as ReferentialActionSchema, t as ColumnDefaultFunctionSchema, u as validateStorage } from "./validators-i9MX9Dti.mjs";
+import { a as ForeignKeySchema, c as validateModel, d as validateStorageSemantics, i as ForeignKeyReferencesSchema, l as validateSqlContract, n as ColumnDefaultLiteralSchema, o as IndexSchema, r as ColumnDefaultSchema, s as ReferentialActionSchema, t as ColumnDefaultFunctionSchema, u as validateStorage } from "./validators-BjZ6lOS1.mjs";
 
 export { ColumnDefaultFunctionSchema, ColumnDefaultLiteralSchema, ColumnDefaultSchema, ForeignKeyReferencesSchema, ForeignKeySchema, IndexSchema, ReferentialActionSchema, validateModel, validateSqlContract, validateStorage, validateStorageSemantics };

package/package.json

@@ -1,20 +1,21 @@
 {
   "name": "@prisma-next/sql-contract",
-  "version": "0.3.0-dev.135",
+  "version": "0.3.0-dev.146",
   "type": "module",
   "sideEffects": false,
   "description": "SQL contract types, validators, and IR factories for Prisma Next",
   "dependencies": {
     "arktype": "^2.1.25",
-    "@prisma-next/contract": "0.3.0-dev.135"
+    "@prisma-next/contract": "0.3.0-dev.146",
+    "@prisma-next/framework-components": "0.3.0-dev.146"
   },
   "devDependencies": {
     "tsdown": "0.18.4",
     "typescript": "5.9.3",
     "vitest": "4.0.17",
-    "@prisma-next/test-utils": "0.0.1",
     "@prisma-next/tsdown": "0.0.0",
-    "@prisma-next/tsconfig": "0.0.0"
+    "@prisma-next/tsconfig": "0.0.0",
+    "@prisma-next/test-utils": "0.0.1"
   },
   "files": [
     "dist",

package/src/exports/factories.ts

@@ -1,11 +1 @@
-export {
-  col,
-  contract,
-  fk,
-  index,
-  model,
-  pk,
-  storage,
-  table,
-  unique,
-} from '../factories';
+export { col, fk, index, model, pk, table, unique } from '../factories';

package/src/exports/types.ts

@@ -2,9 +2,10 @@ export type {
   CodecTypesOf,
   ContractWithTypeMaps,
   ExtractCodecTypes,
-  ExtractOperationTypes,
+  ExtractFieldOutputTypes,
   ExtractQueryOperationTypes,
   ExtractTypeMapsFromContract,
+  FieldOutputTypesOf,
   ForeignKey,
   ForeignKeyOptions,
   ForeignKeyReferences,
@@ -17,11 +18,9 @@ export type {
   ReferentialAction,
   ResolveCodecTypes,
   ResolveOperationTypes,
-  SqlContract,
   SqlModelFieldStorage,
   SqlModelStorage,
   SqlQueryOperationTypes,
-  SqlRelation,
   SqlStorage,
   StorageColumn,
   StorageTable,

package/src/exports/validate.ts

@@ -1,6 +1 @@
-export {
-  decodeContractDefaults,
-  isBigIntColumn,
-  normalizeContract,
-  validateContract,
-} from '../validate';
+export { validateContract } from '../validate';

package/src/factories.ts

@@ -1,18 +1,12 @@
-import type {
-  ExecutionHashBase,
-  ProfileHashBase,
-  StorageHashBase,
-} from '@prisma-next/contract/types';
+import type { ScalarFieldType } from '@prisma-next/contract/types';
 import type {
   ForeignKey,
   ForeignKeyOptions,
   ForeignKeyReferences,
   Index,
   PrimaryKey,
-  SqlContract,
   SqlModelFieldStorage,
   SqlModelStorage,
-  SqlStorage,
   StorageColumn,
   StorageTable,
   UniqueConstraint,
@@ -90,7 +84,7 @@ export function model(
   relations: Record<string, unknown> = {},
 ): {
   storage: SqlModelStorage;
-  fields: Record<string, { nullable: boolean; codecId?: string }>;
+  fields: Record<string, { readonly nullable: boolean; readonly type: ScalarFieldType }>;
   relations: Record<string, unknown>;
 } {
   const storage: SqlModelStorage = { table: tableName, fields };
@@ -99,52 +93,13 @@ export function model(
       name,
       {
         nullable: field.nullable ?? false,
-        ...(field.codecId !== undefined ? { codecId: field.codecId } : {}),
+        type: { kind: 'scalar' as const, codecId: field.codecId ?? 'core/unknown@1' },
       },
     ]),
-  ) as Record<string, { nullable: boolean; codecId?: string }>;
+  ) as Record<string, { nullable: boolean; type: ScalarFieldType }>;
   return {
     storage,
     fields: domainFields,
     relations,
   };
 }
-
-export function storage(tables: Record<string, StorageTable>): SqlStorage {
-  return { tables };
-}
-
-export function contract<
-  TStorageHash extends StorageHashBase<string> = StorageHashBase<string>,
-  TExecutionHash extends ExecutionHashBase<string> = ExecutionHashBase<string>,
-  TProfileHash extends ProfileHashBase<string> = ProfileHashBase<string>,
->(opts: {
-  target: string;
-  storageHash: TStorageHash;
-  executionHash?: TExecutionHash;
-  storage: SqlStorage;
-  models?: Record<string, unknown>;
-  schemaVersion?: '1';
-  targetFamily?: 'sql';
-  profileHash?: TProfileHash;
-  capabilities?: Record<string, Record<string, boolean>>;
-  extensionPacks?: Record<string, unknown>;
-  meta?: Record<string, unknown>;
-  sources?: Record<string, unknown>;
-}): SqlContract<SqlStorage, Record<string, unknown>, TStorageHash, TExecutionHash, TProfileHash> {
-  return {
-    schemaVersion: opts.schemaVersion ?? '1',
-    target: opts.target,
-    targetFamily: opts.targetFamily ?? 'sql',
-    storageHash: opts.storageHash,
-    ...(opts.executionHash !== undefined && { executionHash: opts.executionHash }),
-    storage: opts.storage,
-    models: opts.models ?? {},
-    roots: {},
-    ...(opts.profileHash !== undefined && { profileHash: opts.profileHash }),
-    ...(opts.capabilities !== undefined && { capabilities: opts.capabilities }),
-    ...(opts.extensionPacks !== undefined && { extensionPacks: opts.extensionPacks }),
-    ...(opts.meta !== undefined && { meta: opts.meta }),
-    ...(opts.sources !== undefined && { sources: opts.sources as Record<string, unknown> }),
-  } as SqlContract<SqlStorage, Record<string, unknown>, TStorageHash, TExecutionHash, TProfileHash>;
-}

package/src/types.ts

@@ -1,12 +1,4 @@
-import type {
-  ColumnDefault,
-  ContractBase,
-  DomainRelationOn,
-  ExecutionHashBase,
-  ExecutionSection,
-  ProfileHashBase,
-  StorageHashBase,
-} from '@prisma-next/contract/types';
+import type { ColumnDefault, StorageBase } from '@prisma-next/contract/types';
 
 /**
  * A column definition in storage.
@@ -111,7 +103,7 @@ export type StorageTypeInstance = {
   readonly typeParams: Record<string, unknown>;
 };
 
-export type SqlStorage = {
+export type SqlStorage<THash extends string = string> = StorageBase<THash> & {
   readonly tables: Record<string, StorageTable>;
   /**
    * Named type instances for parameterized/custom types.
@@ -131,12 +123,6 @@ export type SqlModelStorage = {
   readonly fields: Record<string, SqlModelFieldStorage>;
 };
 
-export type SqlRelation = {
-  readonly to: string;
-  readonly cardinality: '1:1' | '1:N' | 'N:1';
-  readonly on: DomainRelationOn;
-};
-
 export const DEFAULT_FK_CONSTRAINT = true;
 export const DEFAULT_FK_INDEX = true;
 
@@ -154,10 +140,12 @@ export type TypeMaps<
   TCodecTypes extends Record<string, { output: unknown }> = Record<string, never>,
   TOperationTypes extends Record<string, unknown> = Record<string, never>,
   TQueryOperationTypes extends Record<string, unknown> = Record<string, never>,
+  TFieldOutputTypes extends Record<string, Record<string, unknown>> = Record<string, never>,
 > = {
   readonly codecTypes: TCodecTypes;
   readonly operationTypes: TOperationTypes;
   readonly queryOperationTypes: TQueryOperationTypes;
+  readonly fieldOutputTypes: TFieldOutputTypes;
 };
 
 export type CodecTypesOf<T> = [T] extends [never]
@@ -199,31 +187,24 @@ export type ContractWithTypeMaps<TContract, TTypeMaps> = TContract & {
   readonly [K in TypeMapsPhantomKey]?: TTypeMaps;
 };
 
-export type SqlContract<
-  S extends SqlStorage = SqlStorage,
-  TModels extends Record<string, unknown> = Record<string, unknown>,
-  TStorageHash extends StorageHashBase<string> = StorageHashBase<string>,
-  TExecutionHash extends ExecutionHashBase<string> = ExecutionHashBase<string>,
-  TProfileHash extends ProfileHashBase<string> = ProfileHashBase<string>,
-> = Omit<ContractBase<TStorageHash, TExecutionHash, TProfileHash>, 'models'> & {
-  readonly targetFamily: string;
-  readonly storage: S;
-  readonly models: TModels;
-  readonly execution?: ExecutionSection;
-};
-
 export type ExtractTypeMapsFromContract<T> = TypeMapsPhantomKey extends keyof T
   ? NonNullable<T[TypeMapsPhantomKey & keyof T]>
   : never;
 
+export type FieldOutputTypesOf<T> = [T] extends [never]
+  ? Record<string, never>
+  : T extends { readonly fieldOutputTypes: infer F }
+    ? F extends Record<string, Record<string, unknown>>
+      ? F
+      : Record<string, never>
+    : Record<string, never>;
+
 export type ExtractCodecTypes<T> = CodecTypesOf<ExtractTypeMapsFromContract<T>>;
-export type ExtractOperationTypes<T> = OperationTypesOf<ExtractTypeMapsFromContract<T>>;
 export type ExtractQueryOperationTypes<T> = QueryOperationTypesOf<ExtractTypeMapsFromContract<T>>;
+export type ExtractFieldOutputTypes<T> = FieldOutputTypesOf<ExtractTypeMapsFromContract<T>>;
 
 export type ResolveCodecTypes<TContract, TTypeMaps> = [TTypeMaps] extends [never]
   ? ExtractCodecTypes<TContract>
   : CodecTypesOf<TTypeMaps>;
 
-export type ResolveOperationTypes<TContract, TTypeMaps> = [TTypeMaps] extends [never]
-  ? ExtractOperationTypes<TContract>
-  : OperationTypesOf<TTypeMaps>;
+export type ResolveOperationTypes<_TContract, TTypeMaps> = OperationTypesOf<TTypeMaps>;