@prisma-next/contract 0.11.0 → 0.12.0

package/dist/validate-domain.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"validate-domain.mjs","names":["f"],"sources":["../src/validate-domain.ts"],"sourcesContent":["import { ContractValidationError } from './contract-validation-error';\n\nexport interface DomainModelShape {\n  readonly fields: Record<string, unknown>;\n  readonly relations?: Record<string, { readonly to: string }>;\n  readonly discriminator?: { readonly field: string };\n  readonly variants?: Record<string, unknown>;\n  readonly base?: string;\n  readonly owner?: string;\n}\n\nexport interface DomainContractShape {\n  readonly roots: Record<string, string>;\n  readonly models: Record<string, DomainModelShape>;\n  readonly valueObjects?: Record<string, { readonly fields: Record<string, unknown> }>;\n}\n\nexport function validateContractDomain(contract: DomainContractShape): void {\n  const errors: string[] = [];\n  const modelNames = new Set(Object.keys(contract.models));\n\n  validateRoots(contract, modelNames, errors);\n  validateVariantsAndBases(contract, modelNames, errors);\n  validateRelationTargets(contract, modelNames, errors);\n  validateDiscriminators(contract, errors);\n  validateOwnership(contract, modelNames, errors);\n  validateValueObjectReferences(contract, errors);\n  validateFieldModifiers(contract, errors);\n\n  if (errors.length > 0) {\n    throw new ContractValidationError(\n      `Contract domain validation failed:\\n- ${errors.join('\\n- ')}`,\n      'domain',\n    );\n  }\n}\n\nfunction validateRoots(\n  contract: DomainContractShape,\n  modelNames: Set<string>,\n  errors: string[],\n): void {\n  const seenValues = new Set<string>();\n  for (const [rootKey, modelName] of Object.entries(contract.roots)) {\n    if (seenValues.has(modelName)) {\n      errors.push(`Duplicate root value: \"${modelName}\" is mapped by multiple root keys`);\n    }\n    seenValues.add(modelName);\n\n    if (!modelNames.has(modelName)) {\n      errors.push(\n        `Root \"${rootKey}\" references model \"${modelName}\" which does not exist in models`,\n      );\n    }\n  }\n}\n\nfunction validateVariantsAndBases(\n  contract: DomainContractShape,\n  modelNames: Set<string>,\n  errors: string[],\n): void {\n  const models = new Map(Object.entries(contract.models));\n\n  for (const [modelName, model] of models) {\n    if (model.variants) {\n      for (const variantName of Object.keys(model.variants)) {\n        if (!modelNames.has(variantName)) {\n          errors.push(\n            `Model \"${modelName}\" lists variant \"${variantName}\" which does not exist in models`,\n          );\n          continue;\n        }\n        const variantModel = models.get(variantName);\n        if (!variantModel) continue;\n        if (variantModel.base !== modelName) {\n          errors.push(\n            `Variant \"${variantName}\" has base \"${variantModel.base ?? '(none)'}\" but expected \"${modelName}\"`,\n          );\n        }\n      }\n    }\n\n    if (model.base) {\n      if (!modelNames.has(model.base)) {\n        errors.push(`Model \"${modelName}\" has base \"${model.base}\" which does not exist in models`);\n        continue;\n      }\n      const baseModel = models.get(model.base);\n      if (!baseModel) continue;\n      if (!baseModel.variants || !Object.hasOwn(baseModel.variants, modelName)) {\n        errors.push(\n          `Model \"${modelName}\" has base \"${model.base}\" which does not list it as a variant`,\n        );\n      }\n    }\n  }\n}\n\nfunction validateRelationTargets(\n  contract: DomainContractShape,\n  modelNames: Set<string>,\n  errors: string[],\n): void {\n  for (const [modelName, model] of Object.entries(contract.models)) {\n    for (const [relName, relation] of Object.entries(model.relations ?? {})) {\n      if (!modelNames.has(relation.to)) {\n        errors.push(\n          `Relation \"${relName}\" on model \"${modelName}\" targets \"${relation.to}\" which does not exist in models`,\n        );\n      }\n    }\n  }\n}\n\nfunction validateDiscriminators(contract: DomainContractShape, errors: string[]): void {\n  for (const [modelName, model] of Object.entries(contract.models)) {\n    if (model.discriminator) {\n      if (!model.variants || Object.keys(model.variants).length === 0) {\n        errors.push(`Model \"${modelName}\" has discriminator but no variants`);\n      }\n      if (!Object.hasOwn(model.fields, model.discriminator.field)) {\n        errors.push(\n          `Discriminator field \"${model.discriminator.field}\" is not a field on model \"${modelName}\"`,\n        );\n      }\n    }\n\n    if (model.variants && Object.keys(model.variants).length > 0 && !model.discriminator) {\n      errors.push(`Model \"${modelName}\" has variants but no discriminator`);\n    }\n\n    if (model.base) {\n      if (model.discriminator) {\n        errors.push(`Model \"${modelName}\" has base and must not have discriminator`);\n      }\n      if (model.variants && Object.keys(model.variants).length > 0) {\n        errors.push(`Model \"${modelName}\" has base and must not have variants`);\n      }\n    }\n  }\n}\n\nfunction validateOwnership(\n  contract: DomainContractShape,\n  modelNames: Set<string>,\n  errors: string[],\n): void {\n  for (const [modelName, model] of Object.entries(contract.models)) {\n    if (!model.owner) continue;\n\n    if (model.owner === modelName) {\n      errors.push(`Model \"${modelName}\" cannot own itself`);\n    }\n\n    if (!modelNames.has(model.owner)) {\n      errors.push(`Model \"${modelName}\" has owner \"${model.owner}\" which does not exist in models`);\n    }\n\n    for (const [rootKey, rootModel] of Object.entries(contract.roots)) {\n      if (rootModel === modelName) {\n        errors.push(\n          `Owned model \"${modelName}\" must not appear in roots (found as root \"${rootKey}\")`,\n        );\n      }\n    }\n  }\n}\n\ninterface FieldTypeLike {\n  readonly kind?: string;\n  readonly name?: string;\n  readonly members?: readonly FieldTypeLike[];\n}\n\ninterface FieldLike {\n  readonly type?: FieldTypeLike;\n  readonly many?: boolean;\n  readonly dict?: boolean;\n}\n\nfunction forEachContractField(\n  contract: DomainContractShape,\n  callback: (field: unknown, location: string) => void,\n): void {\n  for (const [modelName, model] of Object.entries(contract.models)) {\n    for (const [fieldName, field] of Object.entries(model.fields)) {\n      callback(field, `Model \"${modelName}\" field \"${fieldName}\"`);\n    }\n  }\n  for (const [voName, vo] of Object.entries(contract.valueObjects ?? {})) {\n    for (const [fieldName, field] of Object.entries(vo.fields)) {\n      callback(field, `Value object \"${voName}\" field \"${fieldName}\"`);\n    }\n  }\n}\n\nfunction validateValueObjectReferences(contract: DomainContractShape, errors: string[]): void {\n  const voNames = new Set(Object.keys(contract.valueObjects ?? {}));\n\n  function checkType(type: FieldTypeLike | undefined, location: string): void {\n    if (!type) return;\n    if (type.kind === 'valueObject' && type.name && !voNames.has(type.name)) {\n      errors.push(\n        `${location} references value object \"${type.name}\" which does not exist in valueObjects`,\n      );\n      return;\n    }\n    if (type.kind === 'union') {\n      for (const member of type.members ?? []) checkType(member, location);\n    }\n  }\n\n  forEachContractField(contract, (field, location) => {\n    const f = field as FieldLike | undefined;\n    checkType(f?.type, location);\n  });\n}\n\nfunction validateFieldModifiers(contract: DomainContractShape, errors: string[]): void {\n  forEachContractField(contract, (field, location) => {\n    const f = field as FieldLike | undefined;\n    if (f?.many && f?.dict) {\n      errors.push(`${location} cannot have both \"many\" and \"dict\" modifiers`);\n    }\n  });\n}\n"],"mappings":"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"}
+{"version":3,"file":"validate-domain.mjs","names":["f"],"sources":["../src/validate-domain.ts"],"sourcesContent":["import { ContractValidationError } from './contract-validation-error';\nimport type { CrossReference } from './cross-reference';\nimport type { ContractWithDomain } from './domain-envelope';\nimport { asNamespaceId, type NamespaceId } from './namespace-id';\n\nexport interface DomainModelShape {\n  readonly fields: Record<string, unknown>;\n  readonly relations?: Record<string, { readonly to: CrossReference }>;\n  readonly discriminator?: { readonly field: string };\n  readonly variants?: Record<string, unknown>;\n  readonly base?: CrossReference;\n  readonly owner?: string;\n}\n\nexport interface DomainContractShape extends ContractWithDomain {\n  readonly roots: Record<string, CrossReference>;\n}\n\ninterface IndexedModel {\n  readonly namespaceId: NamespaceId;\n  readonly name: string;\n  readonly model: DomainModelShape;\n}\n\ntype ModelIndex = Map<NamespaceId, Map<string, IndexedModel>>;\n\nfunction indexDomainModels(contract: DomainContractShape): ModelIndex {\n  const index: ModelIndex = new Map();\n  for (const [namespaceKey, namespace] of Object.entries(contract.domain.namespaces)) {\n    const namespaceId = asNamespaceId(namespaceKey);\n    let modelsInNamespace = index.get(namespaceId);\n    if (modelsInNamespace === undefined) {\n      modelsInNamespace = new Map();\n      index.set(namespaceId, modelsInNamespace);\n    }\n    for (const [name, model] of Object.entries(namespace.models)) {\n      modelsInNamespace.set(name, { namespaceId, name, model });\n    }\n  }\n  return index;\n}\n\nfunction lookupModel(index: ModelIndex, ref: CrossReference): IndexedModel | undefined {\n  return index.get(ref.namespace)?.get(ref.model);\n}\n\nfunction* iterateIndexedModels(index: ModelIndex): IterableIterator<IndexedModel> {\n  for (const modelsInNamespace of index.values()) {\n    for (const entry of modelsInNamespace.values()) {\n      yield entry;\n    }\n  }\n}\n\nexport function validateContractDomain(contract: DomainContractShape): void {\n  const errors: string[] = [];\n  const modelIndex = indexDomainModels(contract);\n\n  validateRoots(contract, modelIndex, errors);\n  validateVariantsAndBases(modelIndex, errors);\n  validateRelationTargets(modelIndex, errors);\n  validateDiscriminators(modelIndex, errors);\n  validateOwnership(contract, modelIndex, errors);\n  validateValueObjectReferences(contract, errors);\n  validateFieldModifiers(modelIndex, contract, errors);\n\n  if (errors.length > 0) {\n    throw new ContractValidationError(\n      `Contract domain validation failed:\\n- ${errors.join('\\n- ')}`,\n      'domain',\n    );\n  }\n}\n\nfunction validateRoots(\n  contract: DomainContractShape,\n  modelIndex: ModelIndex,\n  errors: string[],\n): void {\n  const seenRootTargets = new Map<NamespaceId, Set<string>>();\n  for (const [rootKey, crossRef] of Object.entries(contract.roots)) {\n    let modelsInNamespace = seenRootTargets.get(crossRef.namespace);\n    if (modelsInNamespace === undefined) {\n      modelsInNamespace = new Set();\n      seenRootTargets.set(crossRef.namespace, modelsInNamespace);\n    }\n    if (modelsInNamespace.has(crossRef.model)) {\n      errors.push(\n        `Duplicate root value: \"${crossRef.namespace}:${crossRef.model}\" is mapped by multiple root keys`,\n      );\n    }\n    modelsInNamespace.add(crossRef.model);\n\n    if (!lookupModel(modelIndex, crossRef)) {\n      errors.push(\n        `Root \"${rootKey}\" references model \"${crossRef.namespace}:${crossRef.model}\" which does not exist in domain.namespaces`,\n      );\n    }\n  }\n}\n\nfunction validateVariantsAndBases(modelIndex: ModelIndex, errors: string[]): void {\n  for (const { namespaceId, name: modelName, model } of iterateIndexedModels(modelIndex)) {\n    if (model.variants) {\n      for (const variantName of Object.keys(model.variants)) {\n        const variantRef: CrossReference = { namespace: namespaceId, model: variantName };\n        const variantEntry = lookupModel(modelIndex, variantRef);\n        if (!variantEntry) {\n          errors.push(\n            `Model \"${namespaceId}:${modelName}\" lists variant \"${variantName}\" which does not exist at that namespace coordinate`,\n          );\n          continue;\n        }\n        const variantBase = variantEntry.model.base;\n        if (variantBase?.namespace !== namespaceId || variantBase?.model !== modelName) {\n          errors.push(\n            `Variant \"${namespaceId}:${variantName}\" has base \"${variantBase?.namespace ?? '?'}:${variantBase?.model ?? '(none)'}\" but expected \"${namespaceId}:${modelName}\"`,\n          );\n        }\n      }\n    }\n\n    if (model.base) {\n      const baseEntry = lookupModel(modelIndex, model.base);\n      if (!baseEntry) {\n        errors.push(\n          `Model \"${namespaceId}:${modelName}\" has base \"${model.base.namespace}:${model.base.model}\" which does not exist in domain.namespaces`,\n        );\n        continue;\n      }\n      if (!baseEntry.model.variants || !Object.hasOwn(baseEntry.model.variants, modelName)) {\n        errors.push(\n          `Model \"${namespaceId}:${modelName}\" has base \"${model.base.namespace}:${model.base.model}\" which does not list it as a variant`,\n        );\n      }\n    }\n  }\n}\n\nfunction validateRelationTargets(modelIndex: ModelIndex, errors: string[]): void {\n  for (const { namespaceId, name: modelName, model } of iterateIndexedModels(modelIndex)) {\n    for (const [relName, relation] of Object.entries(model.relations ?? {})) {\n      if (!lookupModel(modelIndex, relation.to)) {\n        errors.push(\n          `Relation \"${relName}\" on model \"${namespaceId}:${modelName}\" targets \"${relation.to.namespace}:${relation.to.model}\" which does not exist in domain.namespaces`,\n        );\n      }\n    }\n  }\n}\n\nfunction validateDiscriminators(modelIndex: ModelIndex, errors: string[]): void {\n  for (const { namespaceId, name: modelName, model } of iterateIndexedModels(modelIndex)) {\n    if (model.discriminator) {\n      if (!model.variants || Object.keys(model.variants).length === 0) {\n        errors.push(`Model \"${namespaceId}:${modelName}\" has discriminator but no variants`);\n      }\n      if (!Object.hasOwn(model.fields, model.discriminator.field)) {\n        errors.push(\n          `Discriminator field \"${model.discriminator.field}\" is not a field on model \"${namespaceId}:${modelName}\"`,\n        );\n      }\n    }\n\n    if (model.variants && Object.keys(model.variants).length > 0 && !model.discriminator) {\n      errors.push(`Model \"${namespaceId}:${modelName}\" has variants but no discriminator`);\n    }\n\n    if (model.base) {\n      if (model.discriminator) {\n        errors.push(`Model \"${namespaceId}:${modelName}\" has base and must not have discriminator`);\n      }\n      if (model.variants && Object.keys(model.variants).length > 0) {\n        errors.push(`Model \"${namespaceId}:${modelName}\" has base and must not have variants`);\n      }\n    }\n  }\n}\n\nfunction validateOwnership(\n  contract: DomainContractShape,\n  modelIndex: ModelIndex,\n  errors: string[],\n): void {\n  for (const { namespaceId, name: modelName, model } of iterateIndexedModels(modelIndex)) {\n    if (!model.owner) continue;\n\n    if (model.owner === modelName) {\n      errors.push(`Model \"${namespaceId}:${modelName}\" cannot own itself`);\n    }\n\n    const ownerRef: CrossReference = { namespace: namespaceId, model: model.owner };\n    if (!lookupModel(modelIndex, ownerRef)) {\n      errors.push(\n        `Model \"${namespaceId}:${modelName}\" has owner \"${namespaceId}:${model.owner}\" which does not exist in domain.namespaces`,\n      );\n    }\n\n    for (const [rootKey, rootRef] of Object.entries(contract.roots)) {\n      if (rootRef.namespace === namespaceId && rootRef.model === modelName) {\n        errors.push(\n          `Owned model \"${namespaceId}:${modelName}\" must not appear in roots (found as root \"${rootKey}\")`,\n        );\n      }\n    }\n  }\n}\n\ninterface FieldTypeLike {\n  readonly kind?: string;\n  readonly name?: string;\n  readonly members?: readonly FieldTypeLike[];\n}\n\ninterface FieldLike {\n  readonly type?: FieldTypeLike;\n  readonly many?: boolean;\n  readonly dict?: boolean;\n}\n\nfunction validateValueObjectReferences(contract: DomainContractShape, errors: string[]): void {\n  const voNamesByNamespace = new Map<NamespaceId, Set<string>>();\n  for (const [namespaceKey, namespace] of Object.entries(contract.domain.namespaces)) {\n    const namespaceId = asNamespaceId(namespaceKey);\n    voNamesByNamespace.set(namespaceId, new Set(Object.keys(namespace.valueObjects ?? {})));\n  }\n\n  function checkType(\n    type: FieldTypeLike | undefined,\n    location: string,\n    namespaceId: NamespaceId,\n  ): void {\n    if (!type) return;\n    const voNames = voNamesByNamespace.get(namespaceId) ?? new Set<string>();\n    if (type.kind === 'valueObject' && type.name && !voNames.has(type.name)) {\n      errors.push(\n        `${location} references value object \"${namespaceId}:${type.name}\" which does not exist in that namespace's valueObjects`,\n      );\n      return;\n    }\n    if (type.kind === 'union') {\n      for (const member of type.members ?? []) checkType(member, location, namespaceId);\n    }\n  }\n\n  for (const [namespaceKey, namespace] of Object.entries(contract.domain.namespaces)) {\n    const namespaceId = asNamespaceId(namespaceKey);\n    for (const [modelName, model] of Object.entries(namespace.models)) {\n      for (const [fieldName, field] of Object.entries(model.fields)) {\n        const f = field as FieldLike | undefined;\n        checkType(f?.type, `Model \"${namespaceId}:${modelName}\" field \"${fieldName}\"`, namespaceId);\n      }\n    }\n    for (const [voName, vo] of Object.entries(namespace.valueObjects ?? {})) {\n      for (const [fieldName, field] of Object.entries(vo.fields)) {\n        const f = field as FieldLike | undefined;\n        checkType(\n          f?.type,\n          `Value object \"${namespaceId}:${voName}\" field \"${fieldName}\"`,\n          namespaceId,\n        );\n      }\n    }\n  }\n}\n\nfunction validateFieldModifiers(\n  modelIndex: ModelIndex,\n  contract: DomainContractShape,\n  errors: string[],\n): void {\n  for (const { namespaceId, name: modelName, model } of iterateIndexedModels(modelIndex)) {\n    for (const [fieldName, field] of Object.entries(model.fields)) {\n      const f = field as FieldLike | undefined;\n      if (f?.many && f?.dict) {\n        errors.push(\n          `Model \"${namespaceId}:${modelName}\" field \"${fieldName}\" cannot have both \"many\" and \"dict\" modifiers`,\n        );\n      }\n    }\n  }\n  for (const [namespaceKey, namespace] of Object.entries(contract.domain.namespaces)) {\n    const namespaceId = asNamespaceId(namespaceKey);\n    for (const [voName, vo] of Object.entries(namespace.valueObjects ?? {})) {\n      for (const [fieldName, field] of Object.entries(vo.fields)) {\n        const f = field as FieldLike | undefined;\n        if (f?.many && f?.dict) {\n          errors.push(\n            `Value object \"${namespaceId}:${voName}\" field \"${fieldName}\" cannot have both \"many\" and \"dict\" modifiers`,\n          );\n        }\n      }\n    }\n  }\n}\n"],"mappings":"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"}

package/package.json

@@ -1,39 +1,46 @@
 {
   "name": "@prisma-next/contract",
-  "version": "0.11.0",
+  "version": "0.12.0",
   "license": "Apache-2.0",
   "type": "module",
   "sideEffects": false,
   "description": "Data contract type definitions and JSON schema for Prisma Next",
   "dependencies": {
-    "@prisma-next/utils": "0.11.0",
+    "@prisma-next/utils": "0.12.0",
     "@standard-schema/spec": "^1.1.0",
     "arktype": "^2.2.0"
   },
   "devDependencies": {
-    "@prisma-next/test-utils": "0.11.0",
-    "@prisma-next/tsconfig": "0.11.0",
-    "@prisma-next/tsdown": "0.11.0",
+    "@prisma-next/tsconfig": "0.12.0",
+    "@prisma-next/tsdown": "0.12.0",
     "tsdown": "0.22.0",
     "typescript": "5.9.3",
     "vitest": "4.1.6"
   },
+  "peerDependencies": {
+    "typescript": ">=5.9"
+  },
+  "peerDependenciesMeta": {
+    "typescript": {
+      "optional": true
+    }
+  },
   "files": [
     "dist",
     "src",
     "schemas"
   ],
-  "engines": {
-    "node": ">=20"
-  },
   "exports": {
     "./contract-validation-error": "./dist/contract-validation-error.mjs",
     "./hashing": "./dist/hashing.mjs",
-    "./testing": "./dist/testing.mjs",
+    "./hashing-utils": "./dist/hashing-utils.mjs",
     "./types": "./dist/types.mjs",
     "./validate-domain": "./dist/validate-domain.mjs",
     "./package.json": "./package.json"
   },
+  "engines": {
+    "node": ">=24"
+  },
   "repository": {
     "type": "git",
     "url": "https://github.com/prisma/prisma-next.git",

package/src/canonicalization-path-match.ts

@@ -0,0 +1,44 @@
+import type { PreserveEmptyPredicate } from './canonicalization';
+
+export type PathSegment = string | '*' | readonly string[];
+
+export type PathPattern = readonly PathSegment[];
+
+export function matchesPathPattern(path: readonly string[], pattern: PathPattern): boolean {
+  if (path.length !== pattern.length) {
+    return false;
+  }
+
+  for (let i = 0; i < pattern.length; i++) {
+    const segment = pattern[i];
+    const value = path[i];
+    if (segment === undefined || value === undefined) {
+      return false;
+    }
+
+    if (segment === '*') {
+      continue;
+    }
+
+    if (typeof segment === 'string') {
+      if (value !== segment) {
+        return false;
+      }
+      continue;
+    }
+
+    if (Array.isArray(segment)) {
+      if (!segment.includes(value)) {
+        return false;
+      }
+    }
+  }
+
+  return true;
+}
+
+export function createPreserveEmptyPredicate(
+  patterns: readonly PathPattern[],
+): PreserveEmptyPredicate {
+  return (path) => patterns.some((pattern) => matchesPathPattern(path, pattern));
+}

package/src/canonicalization-storage-sort.ts

@@ -0,0 +1,88 @@
+import type { StorageSort } from './canonicalization';
+
+export type PathSegment = string | '*';
+
+export interface NamedArraySortTarget {
+  readonly path: readonly PathSegment[];
+  readonly arrayKeys: readonly string[];
+}
+
+function isPlainRecord(value: unknown): value is Record<string, unknown> {
+  return typeof value === 'object' && value !== null && !Array.isArray(value);
+}
+
+export function compareByNameProperty(a: unknown, b: unknown): number {
+  const nameA = isPlainRecord(a) && typeof a['name'] === 'string' ? a['name'] : '';
+  const nameB = isPlainRecord(b) && typeof b['name'] === 'string' ? b['name'] : '';
+  return nameA.localeCompare(nameB);
+}
+
+function sortArrayKeysOnRecord(
+  record: Record<string, unknown>,
+  arrayKeys: readonly string[],
+  compare: (a: unknown, b: unknown) => number,
+): Record<string, unknown> {
+  const sorted: Record<string, unknown> = { ...record };
+  for (const key of arrayKeys) {
+    const value = record[key];
+    if (Array.isArray(value)) {
+      sorted[key] = [...value].sort(compare);
+    }
+  }
+  return sorted;
+}
+
+function walkAndSort(
+  node: unknown,
+  pathSegments: readonly PathSegment[],
+  arrayKeys: readonly string[],
+  compare: (a: unknown, b: unknown) => number,
+): unknown {
+  if (pathSegments.length === 0) {
+    if (!isPlainRecord(node)) {
+      return node;
+    }
+    return sortArrayKeysOnRecord(node, arrayKeys, compare);
+  }
+
+  if (!isPlainRecord(node)) {
+    return node;
+  }
+
+  const [head, ...rest] = pathSegments;
+  if (head === undefined) {
+    return node;
+  }
+
+  if (head === '*') {
+    const sorted: Record<string, unknown> = { ...node };
+    for (const key of Object.keys(node)) {
+      sorted[key] = walkAndSort(node[key], rest, arrayKeys, compare);
+    }
+    return sorted;
+  }
+
+  const child = node[head];
+  if (child === undefined) {
+    return node;
+  }
+
+  return { ...node, [head]: walkAndSort(child, rest, arrayKeys, compare) };
+}
+
+export function createStorageSort(
+  targets: readonly NamedArraySortTarget[],
+  compare: (a: unknown, b: unknown) => number = compareByNameProperty,
+): StorageSort {
+  return (storage) => {
+    if (!isPlainRecord(storage)) {
+      return storage;
+    }
+
+    let result: unknown = storage;
+    for (const target of targets) {
+      result = walkAndSort(result, target.path, target.arrayKeys, compare);
+    }
+    return result;
+  };
+}

package/src/canonicalization.ts

@@ -1,7 +1,7 @@
 import { isArrayEqual } from '@prisma-next/utils/array-equal';
 import { ifDefined } from '@prisma-next/utils/defined';
 import type { JsonObject } from '@prisma-next/utils/json';
-
+import { matchesPathPattern, type PathPattern } from './canonicalization-path-match';
 import type { Contract } from './contract-types';
 
 /**
@@ -14,6 +14,49 @@ import type { Contract } from './contract-types';
  */
 export type SerializeContract = (contract: Contract) => JsonObject;
 
+/**
+ * Family-contributed predicate for the default-omission walk. Called when
+ * a value at `path` is a default (empty object/array or `false`); if this
+ * returns `true` the value is kept rather than stripped.
+ *
+ * The framework only calls the predicate inside the `isDefaultValue` branch,
+ * so there is no need to guard against non-default values.
+ */
+export type PreserveEmptyPredicate = (path: readonly string[]) => boolean;
+
+/**
+ * Family-contributed storage sort. Applied to the serialized `storage`
+ * subtree after the default-omission walk; the result replaces the
+ * `storage` field before the final key sort. Use to establish a
+ * deterministic order for storage arrays (indexes, uniques) that the
+ * family-agnostic `sortObjectKeys` pass cannot handle.
+ */
+export type StorageSort = (storage: unknown) => unknown;
+
+const DOMAIN_NAMESPACE_SLOT_PATTERN = ['domain', 'namespaces', '*'] as const satisfies PathPattern;
+const DOMAIN_MODELS_CONTAINER_PATTERN = [
+  'domain',
+  'namespaces',
+  '*',
+  'models',
+] as const satisfies PathPattern;
+const DOMAIN_MODEL_RELATIONS_PATTERN = [
+  'domain',
+  'namespaces',
+  '*',
+  'models',
+  '*',
+  'relations',
+] as const satisfies PathPattern;
+const DOMAIN_MODEL_STORAGE_PATTERN = [
+  'domain',
+  'namespaces',
+  '*',
+  'models',
+  '*',
+  'storage',
+] as const satisfies PathPattern;
+
 const TOP_LEVEL_ORDER = [
   'schemaVersion',
   'canonicalVersion',
@@ -21,8 +64,6 @@ const TOP_LEVEL_ORDER = [
   'target',
   'profileHash',
   'roots',
-  'models',
-  'valueObjects',
   'domain',
   'storage',
   'execution',
@@ -42,13 +83,17 @@ function isDefaultValue(value: unknown): boolean {
   return false;
 }
 
-function omitDefaults(obj: unknown, path: readonly string[]): unknown {
+function omitDefaults(
+  obj: unknown,
+  path: readonly string[],
+  shouldPreserveEmpty: PreserveEmptyPredicate | undefined,
+): unknown {
   if (obj === null || typeof obj !== 'object') {
     return obj;
   }
 
   if (Array.isArray(obj)) {
-    return obj.map((item) => omitDefaults(item, path));
+    return obj.map((item) => omitDefaults(item, path, shouldPreserveEmpty));
   }
 
   const result: Record<string, unknown> = {};
@@ -69,25 +114,16 @@ function omitDefaults(obj: unknown, path: readonly string[]): unknown {
     }
 
     if (isDefaultValue(value)) {
-      const isRequiredModels = isArrayEqual(currentPath, ['models']);
-      const isRequiredNamespaces = isArrayEqual(currentPath, ['storage', 'namespaces']);
-      const isNamespaceSlot =
+      const isRequiredDomainNamespaces = isArrayEqual(currentPath, ['domain', 'namespaces']);
+      const isDomainNamespaceSlot = matchesPathPattern(currentPath, DOMAIN_NAMESPACE_SLOT_PATTERN);
+      const isRequiredDomainModels = matchesPathPattern(
+        currentPath,
+        DOMAIN_MODELS_CONTAINER_PATTERN,
+      );
+      const isRequiredStorageNamespaces = isArrayEqual(currentPath, ['storage', 'namespaces']);
+      const isStorageNamespaceSlot =
         currentPath.length === 3 &&
         isArrayEqual([currentPath[0], currentPath[1]], ['storage', 'namespaces']);
-      const isRequiredNamespaceTables =
-        currentPath.length === 4 &&
-        currentPath[0] === 'storage' &&
-        currentPath[1] === 'namespaces' &&
-        currentPath[3] === 'tables';
-      // Preserve per-table payloads even when empty. SQL tables are never
-      // emitted empty; Mongo collections legitimately are (a declared
-      // collection with no schema is a valid representation), and the
-      // family-agnostic canonicalizer must not strip them.
-      const isNamespaceTableEntry =
-        currentPath.length === 5 &&
-        currentPath[0] === 'storage' &&
-        currentPath[1] === 'namespaces' &&
-        currentPath[3] === 'tables';
       const isRequiredRoots = isArrayEqual(currentPath, ['roots']);
       const isRequiredExtensionPacks = isArrayEqual(currentPath, ['extensionPacks']);
       const isRequiredCapabilities = isArrayEqual(currentPath, ['capabilities']);
@@ -98,56 +134,19 @@ function omitDefaults(obj: unknown, path: readonly string[]): unknown {
         'defaults',
       ]);
       const isExtensionNamespace = currentPath.length === 2 && currentPath[0] === 'extensionPacks';
-      const isModelRelations =
-        currentPath.length === 3 &&
-        isArrayEqual([currentPath[0], currentPath[2]], ['models', 'relations']);
-      const isModelStorage =
-        currentPath.length === 3 &&
-        isArrayEqual([currentPath[0], currentPath[2]], ['models', 'storage']);
-      const isNamespaceTableUniques =
-        currentPath.length === 6 &&
-        currentPath[0] === 'storage' &&
-        currentPath[1] === 'namespaces' &&
-        currentPath[3] === 'tables' &&
-        currentPath[5] === 'uniques';
-      const isNamespaceTableIndexes =
-        currentPath.length === 6 &&
-        currentPath[0] === 'storage' &&
-        currentPath[1] === 'namespaces' &&
-        currentPath[3] === 'tables' &&
-        currentPath[5] === 'indexes';
-      const isNamespaceTableForeignKeys =
-        currentPath.length === 6 &&
-        currentPath[0] === 'storage' &&
-        currentPath[1] === 'namespaces' &&
-        currentPath[3] === 'tables' &&
-        currentPath[5] === 'foreignKeys';
-
-      // `storage.types.<name>.typeParams` is part of the StorageTypeInstance
-      // shape (validators require it). Preserve it even when empty so the
-      // emitted contract.json remains structurally valid after a round-trip.
-      const isStorageTypeTypeParams =
-        currentPath.length === 4 &&
-        currentPath[0] === 'storage' &&
-        currentPath[1] === 'types' &&
-        key === 'typeParams';
-
-      const isFkBooleanField =
-        currentPath.length === 7 &&
-        currentPath[0] === 'storage' &&
-        currentPath[1] === 'namespaces' &&
-        currentPath[3] === 'tables' &&
-        currentPath[5] === 'foreignKeys' &&
-        (key === 'constraint' || key === 'index');
+      const isModelRelations = matchesPathPattern(currentPath, DOMAIN_MODEL_RELATIONS_PATTERN);
+      const isModelStorage = matchesPathPattern(currentPath, DOMAIN_MODEL_STORAGE_PATTERN);
 
       const isNullableField = key === 'nullable';
 
+      const isFamilyPreserved = shouldPreserveEmpty?.(currentPath) ?? false;
+
       if (
-        !isRequiredModels &&
-        !isRequiredNamespaces &&
-        !isNamespaceSlot &&
-        !isRequiredNamespaceTables &&
-        !isNamespaceTableEntry &&
+        !isRequiredDomainNamespaces &&
+        !isDomainNamespaceSlot &&
+        !isRequiredDomainModels &&
+        !isRequiredStorageNamespaces &&
+        !isStorageNamespaceSlot &&
         !isRequiredRoots &&
         !isRequiredExtensionPacks &&
         !isRequiredCapabilities &&
@@ -156,18 +155,14 @@ function omitDefaults(obj: unknown, path: readonly string[]): unknown {
         !isExtensionNamespace &&
         !isModelRelations &&
         !isModelStorage &&
-        !isNamespaceTableUniques &&
-        !isNamespaceTableIndexes &&
-        !isNamespaceTableForeignKeys &&
-        !isFkBooleanField &&
         !isNullableField &&
-        !isStorageTypeTypeParams
+        !isFamilyPreserved
       ) {
         continue;
       }
     }
 
-    result[key] = omitDefaults(value, currentPath);
+    result[key] = omitDefaults(value, currentPath, shouldPreserveEmpty);
   }
 
   return result;
@@ -191,88 +186,6 @@ function sortObjectKeys(obj: unknown): unknown {
   return sorted;
 }
 
-type NamespaceObject = {
-  tables?: Record<string, unknown>;
-  [key: string]: unknown;
-};
-
-type StorageObject = {
-  namespaces?: Record<string, unknown>;
-  [key: string]: unknown;
-};
-
-type TableObject = {
-  indexes?: unknown[];
-  uniques?: unknown[];
-  [key: string]: unknown;
-};
-
-function sortTableArrays(tableObj: TableObject): TableObject {
-  const sortedTable: TableObject = { ...tableObj };
-
-  if (Array.isArray(tableObj.indexes)) {
-    sortedTable.indexes = [...tableObj.indexes].sort((a, b) => {
-      const nameA = (a as { name?: string })?.name || '';
-      const nameB = (b as { name?: string })?.name || '';
-      return nameA.localeCompare(nameB);
-    });
-  }
-
-  if (Array.isArray(tableObj.uniques)) {
-    sortedTable.uniques = [...tableObj.uniques].sort((a, b) => {
-      const nameA = (a as { name?: string })?.name || '';
-      const nameB = (b as { name?: string })?.name || '';
-      return nameA.localeCompare(nameB);
-    });
-  }
-
-  return sortedTable;
-}
-
-function sortIndexesAndUniques(storage: unknown): unknown {
-  if (!storage || typeof storage !== 'object') {
-    return storage;
-  }
-
-  const storageObj = storage as StorageObject;
-  if (!storageObj.namespaces || typeof storageObj.namespaces !== 'object') {
-    return storage;
-  }
-
-  const namespaces = storageObj.namespaces;
-  const result: StorageObject = { ...storageObj, namespaces: {} };
-  const resultNamespaces = result.namespaces as Record<string, unknown>;
-
-  for (const nsId of Object.keys(namespaces)) {
-    const ns = namespaces[nsId];
-    if (!ns || typeof ns !== 'object') {
-      resultNamespaces[nsId] = ns;
-      continue;
-    }
-
-    const nsObj = ns as NamespaceObject;
-    if (!nsObj.tables || typeof nsObj.tables !== 'object') {
-      resultNamespaces[nsId] = ns;
-      continue;
-    }
-
-    const sortedTables: Record<string, unknown> = {};
-    const sortedTableNames = Object.keys(nsObj.tables).sort();
-    for (const tableName of sortedTableNames) {
-      const table = nsObj.tables[tableName];
-      if (!table || typeof table !== 'object') {
-        sortedTables[tableName] = table;
-        continue;
-      }
-      sortedTables[tableName] = sortTableArrays(table as TableObject);
-    }
-
-    resultNamespaces[nsId] = { ...nsObj, tables: sortedTables };
-  }
-
-  return result;
-}
-
 export function orderTopLevel(obj: Record<string, unknown>): Record<string, unknown> {
   const ordered: Record<string, unknown> = {};
   const remaining = new Set(Object.keys(obj));
@@ -304,6 +217,21 @@ export interface CanonicalizeContractOptions {
    * the per-target serializer not putting them in the JSON shape.
    */
   readonly serializeContract: SerializeContract;
+  /**
+   * Family-contributed preserve-empty predicate. When the walk encounters a
+   * default value (empty object/array or `false`) at `path`, calling this
+   * with the full path allows the family to veto the omission. If absent,
+   * only the framework's family-agnostic required-slot rules apply.
+   */
+  readonly shouldPreserveEmpty?: PreserveEmptyPredicate;
+  /**
+   * Family-contributed storage sort. Applied to the serialized `storage`
+   * subtree after the default-omission walk, before the final key sort.
+   * SQL family uses this to impose a deterministic order on `indexes` and
+   * `uniques` arrays within each namespace table. Families that require no
+   * special storage ordering omit this hook.
+   */
+  readonly sortStorage?: StorageSort;
 }
 
 /**
@@ -322,17 +250,20 @@ export function canonicalizeContractToObject(
     target: serialized['target'],
     profileHash: serialized['profileHash'],
     roots: serialized['roots'],
-    models: serialized['models'],
-    ...ifDefined('valueObjects', serialized['valueObjects']),
+    domain: serialized['domain'],
     storage: serialized['storage'],
     ...ifDefined('execution', serialized['execution']),
     extensionPacks: serialized['extensionPacks'],
     capabilities: serialized['capabilities'],
     meta: serialized['meta'],
   };
-  const withDefaultsOmitted = omitDefaults(normalized, []) as Record<string, unknown>;
-  const withSortedIndexes = sortIndexesAndUniques(withDefaultsOmitted['storage']);
-  const withSortedStorage = { ...withDefaultsOmitted, storage: withSortedIndexes };
+  const withDefaultsOmitted = omitDefaults(normalized, [], options.shouldPreserveEmpty) as Record<
+    string,
+    unknown
+  >;
+  const withSortedStorage = options.sortStorage
+    ? { ...withDefaultsOmitted, storage: options.sortStorage(withDefaultsOmitted['storage']) }
+    : withDefaultsOmitted;
   const withSortedKeys = sortObjectKeys(withSortedStorage) as Record<string, unknown>;
   return orderTopLevel(withSortedKeys);
 }

package/src/contract-types.ts

@@ -1,3 +1,5 @@
+import type { CrossReference } from './cross-reference';
+import type { ApplicationDomain } from './domain-envelope';
 import type { ContractModelBase, ContractValueObject } from './domain-types';
 import type {
   ExecutionHashBase,
@@ -43,15 +45,12 @@ export interface Contract<
 > {
   readonly target: string;
   readonly targetFamily: string;
-  readonly roots: Record<string, string>;
-  readonly models: TModels;
-  readonly valueObjects?: Record<string, ContractValueObject>;
+  readonly roots: Record<string, CrossReference>;
   /**
-   * Domain plane keyed as `domain[plane][namespaceId][entityKind][entityName]`.
-   * Optional until downstream slices populate it; when absent the field is
-   * omitted from the on-disk envelope so emitted contracts stay byte-stable.
+   * Application plane (ADR 221): `domain.namespaces.<nsId>.{ models, valueObjects }`.
+   * `TModels` types the union of model entries across namespaces for family DSL inference.
    */
-  readonly domain?: Record<string, Record<string, Record<string, unknown>>>;
+  readonly domain: ApplicationDomain<TModels>;
   readonly storage: TStorage;
   readonly capabilities: Record<string, Record<string, boolean>>;
   readonly extensionPacks: Record<string, unknown>;
@@ -59,3 +58,30 @@ export interface Contract<
   readonly profileHash: ProfileHashBase<string>;
   readonly meta: Record<string, unknown>;
 }
+
+export type ContractModelsMap<TContract extends Contract> =
+  TContract extends Contract<StorageBase, infer TModels> ? TModels : never;
+
+type ExactlyOneKey<T extends Record<string, unknown>> = keyof T extends infer Only extends keyof T
+  ? [keyof T] extends [Only]
+    ? Only
+    : never
+  : never;
+
+type NamespaceValueObjectsOf<TNamespace> = TNamespace extends {
+  readonly valueObjects?: infer VO;
+}
+  ? VO extends Record<string, ContractValueObject>
+    ? VO
+    : Record<never, never>
+  : Record<never, never>;
+
+/** Value-object map for the contract's sole domain namespace (type-level single-namespace projection). */
+export type ContractValueObjectsMap<TContract extends Contract> =
+  NamespaceValueObjectsOf<
+    TContract['domain']['namespaces'][ExactlyOneKey<TContract['domain']['namespaces']>]
+  > extends infer Projected
+    ? Projected extends Record<string, ContractValueObject>
+      ? Projected
+      : Record<never, never>
+    : Record<never, never>;

package/src/contract-validation-error.ts

@@ -10,3 +10,10 @@ export class ContractValidationError extends Error {
     this.phase = phase;
   }
 }
+
+export class DomainNamespaceResolutionError extends Error {
+  constructor(message: string) {
+    super(message);
+    this.name = 'DomainNamespaceResolutionError';
+  }
+}