@prisma/orm-family-sql 8.0.0-rc.21-dev.5 → 8.0.0-rc.21-dev.6

package/dist/{index-reference-YHvh6wAL-BAhOS7RC.d.mts → index-reference-YHvh6wAL-BupQRpkE.d.mts}

@@ -1,6 +1,6 @@
-import { t as Index } from "./sql-index-ByAAE7K8-Dqtn_vUL.mjs";
-import "./types-CkAd8SWm.mjs";
-import { S as StorageColumnScopeField, o as Expression, x as ScopeField } from "./expression-C3F6gxZH-DrYNeDbh.mjs";
+import { t as Index } from "./sql-index-ByAAE7K8-4TUFKGLK.mjs";
+import "./types-CXRxo_TK.mjs";
+import { S as StorageColumnScopeField, o as Expression, x as ScopeField } from "./expression-C3F6gxZH-EOb5cRCY.mjs";
 //#region ../../../2-sql-family/4-lanes/relational-core/dist/index-reference-YHvh6wAL.d.mts
 //#region src/index-reference.d.ts
 /**
@@ -64,4 +64,4 @@ declare function uniqueIndexNamesOfType(indexes: ReadonlyArray<NamedIndex>, type
 declare function createIndexReferences(input: IndexReferencesInput): Readonly<Record<string, IndexReference>>;
 //#endregion
 export { createIndexReferences as a, UniqueIndexNamesOfType as i, IndexReferencesInput as n, uniqueIndexNamesOfType as o, TableIndexReferences as r, IndexReference as t };
-//# sourceMappingURL=index-reference-YHvh6wAL-BAhOS7RC.d.mts.map
+//# sourceMappingURL=index-reference-YHvh6wAL-BupQRpkE.d.mts.map

package/dist/{index-reference-YHvh6wAL-BAhOS7RC.d.mts.map → index-reference-YHvh6wAL-BupQRpkE.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"index-reference-YHvh6wAL-BAhOS7RC.d.mts","names":[],"sources":["../../../../2-sql-family/4-lanes/relational-core/dist/index-reference-YHvh6wAL.d.mts"],"mappings":";;;;;;;;UAMU,eAAe,gBAAgB,SAAS,eAAe,WAAW,gBAAgB,SAAS,eAAe,WAAW,eAAe,sDAAsD,gBAAgB,SAAS,uCAAuC,SAAS;;WAElQ,SAAS;WACT,MAAM;WACN,SAAS;;;KAGf,kBAAkB,KAAK;WACjB,cAAc;IACrB,SAAS;WACF,YAAY;IACnB;KACC,uBAAuB,SAAS,KAAK;WAC/B,eAAe;gBACV,UAAU,uBAAuB,qBAAqB,UAAU,QAAQ;WAC7E;WACA;IACP,WAAW,wBAAwB,QAAQ,+BAA+B;KACzE,YAAY,KAAK;WACX,YAAY;IACnB;KACC,eAAe,KAAK;WACd,eAAe,gBAAgB;IACtC;;KAEC,aAAa,GAAG,OAAO,oBAAoB,kBAAkB,WAAW,MAAM;KAC9E,QAAQ,GAAG,QAAQ,KAAK,sBAAsB,gBAAgB;;KAE9D,uBAAuB,GAAG,0BAA0B,OAAO,kBAAkB,QAAQ;WAC/E,MAAM;mBACE,QAAQ,aAAa,GAAG,gBAAgB,OAAO,kBAAkB,QAAQ;WACjF,MAAM;;;;;KAKZ,qBAAqB,SAAS;WACxB,yBAAyB;WACzB,eAAe;gBACV,OAAO,kBAAkB,mBAAmB,QAAQ,aAAa,GAAG,gBAAgB,MAAM,eAAe,uBAAuB,SAAS,aAAa,GAAG,OAAO,YAAY,aAAa,GAAG,OAAO,eAAe,aAAa,GAAG;UACxO;WACC;WACA;WACA;aACE,SAAS,cAAc,KAAK;;;WAG9B,SAAS,uBAAuB,WAAW;;KAEjD,aAAa,KAAK;;iBAEN,uBAAuB,SAAS,cAAc,aAAa;;;;iBAI3D,sBAAsB,OAAO,uBAAuB,SAAS,eAAe"}
+{"version":3,"file":"index-reference-YHvh6wAL-BupQRpkE.d.mts","names":[],"sources":["../../../../2-sql-family/4-lanes/relational-core/dist/index-reference-YHvh6wAL.d.mts"],"mappings":";;;;;;;;UAMU,eAAe,gBAAgB,SAAS,eAAe,WAAW,gBAAgB,SAAS,eAAe,WAAW,eAAe,sDAAsD,gBAAgB,SAAS,uCAAuC,SAAS;;WAElQ,SAAS;WACT,MAAM;WACN,SAAS;;;KAGf,kBAAkB,KAAK;WACjB,cAAc;IACrB,SAAS;WACF,YAAY;IACnB;KACC,uBAAuB,SAAS,KAAK;WAC/B,eAAe;gBACV,UAAU,uBAAuB,qBAAqB,UAAU,QAAQ;WAC7E;WACA;IACP,WAAW,wBAAwB,QAAQ,+BAA+B;KACzE,YAAY,KAAK;WACX,YAAY;IACnB;KACC,eAAe,KAAK;WACd,eAAe,gBAAgB;IACtC;;KAEC,aAAa,GAAG,OAAO,oBAAoB,kBAAkB,WAAW,MAAM;KAC9E,QAAQ,GAAG,QAAQ,KAAK,sBAAsB,gBAAgB;;KAE9D,uBAAuB,GAAG,0BAA0B,OAAO,kBAAkB,QAAQ;WAC/E,MAAM;mBACE,QAAQ,aAAa,GAAG,gBAAgB,OAAO,kBAAkB,QAAQ;WACjF,MAAM;;;;;KAKZ,qBAAqB,SAAS;WACxB,yBAAyB;WACzB,eAAe;gBACV,OAAO,kBAAkB,mBAAmB,QAAQ,aAAa,GAAG,gBAAgB,MAAM,eAAe,uBAAuB,SAAS,aAAa,GAAG,OAAO,YAAY,aAAa,GAAG,OAAO,eAAe,aAAa,GAAG;UACxO;WACC;WACA;WACA;aACE,SAAS,cAAc,KAAK;;;WAG9B,SAAS,uBAAuB,WAAW;;KAEjD,aAAa,KAAK;;iBAEN,uBAAuB,SAAS,cAAc,aAAa;;;;iBAI3D,sBAAsB,OAAO,uBAAuB,SAAS,eAAe"}

package/dist/{index-type-validation-fGGwAHWc.d.mts → index-type-validation-BFJlwjWi.d.mts}

@@ -1,5 +1,5 @@
-import { l as SqlStorage } from "./sql-storage-DeCAh5Hi-CEM-m8cs.mjs";
-import "./types-DfKvtJwS-CrpWTGBJ.mjs";
+import { l as SqlStorage } from "./sql-storage-B_AM6tU1-BOPQxXo7.mjs";
+import "./types-DNTLudNR-DiVulPhL.mjs";
 import { a as IndexTypeRegistry } from "./index-types-H1O43iYT-BD0VwPqV.mjs";
 import { Contract } from "@prisma/orm-framework/contract/types";
 //#region ../../../2-sql-family/1-core/contract/dist/index-type-validation.d.mts
@@ -13,4 +13,4 @@ type CodecTraitsLookup = (codecId: string) => readonly string[] | undefined;
 declare function validateIndexTypes(contract: Contract<SqlStorage>, indexTypeRegistry: IndexTypeRegistry, codecTraits: CodecTraitsLookup): void;
 //#endregion
 export { validateIndexTypes as n, CodecTraitsLookup as t };
-//# sourceMappingURL=index-type-validation-fGGwAHWc.d.mts.map
+//# sourceMappingURL=index-type-validation-BFJlwjWi.d.mts.map

package/dist/{index-type-validation-fGGwAHWc.d.mts.map → index-type-validation-BFJlwjWi.d.mts.map}

@@ -1 +1 @@
-{"version":3,"file":"index-type-validation-fGGwAHWc.d.mts","names":[],"sources":["../../../../2-sql-family/1-core/contract/dist/index-type-validation.d.mts"],"mappings":";;;;;;;;;;;KAUK,qBAAqB;iBACT,mBAAmB,UAAU,SAAS,aAAa,mBAAmB,mBAAmB,aAAa"}
+{"version":3,"file":"index-type-validation-BFJlwjWi.d.mts","names":[],"sources":["../../../../2-sql-family/1-core/contract/dist/index-type-validation.d.mts"],"mappings":";;;;;;;;;;;KAUK,qBAAqB;iBACT,mBAAmB,UAAU,SAAS,aAAa,mBAAmB,mBAAmB,aAAa"}

package/dist/{interpreter-CS21wD1i-G0u1x8t_.mjs → interpreter-CrQFtK4p-CM5k_t4g.mjs}

@@ -1,28 +1,28 @@
-import { n as isAuthoredIndexInput } from "./index-naming-BOcJT1B3-mG8Fd6KN.mjs";
+import { n as isAuthoredIndexInput } from "./index-naming-BOcJT1B3-D-49owHA.mjs";
 import { u as sqlCodecColumnLength } from "./sql-data-type-D7M-YTTY-D2vRqDxn.mjs";
 import { n as providesPslEntityPlacement } from "./entity-handle-lowering-hook-BJZSlVVF.mjs";
-import "./foreign-key-materialization-BM59w_Xg.mjs";
+import "./foreign-key-materialization-CCHAR789.mjs";
 import { p as sqlTextFromStored } from "./sql-expression-CKgKznXS.mjs";
 import { t as deriveValueSetFromEntity } from "./value-set-derivation-hook-HVaxhALD.mjs";
-import { n as buildSqlContractFromDefinition } from "./derived-checks-D5HVRvqN-BJx1gwPA.mjs";
+import { n as buildSqlContractFromDefinition } from "./derived-checks-BuTkSE9l-gyx0d0dX.mjs";
 import { i as mapFieldNamesToColumns, n as getAttribute, o as storageName, r as getNamedArgument, t as formatDbAttributeMigrationMessage } from "./psl-attribute-parsing-BCsFWsSp-BJ-wGlY6.mjs";
-import { _ as modelSpecContext, b as sqlAttributeSpecs, d as interpretModelAttribute, f as lowerEnumDefault, g as modelCoordinateKey, h as modelAttributeSpecsFrom, l as instantiatePslTypeConstructor, m as lowerTypeGenerators, n as collectResolvedFields, o as fieldSpecContext, p as lowerTypeDefault, r as contractError, s as getAuthoringEntity, t as PSL_CHECK_ON_STI_VARIANT, u as interpretFieldAttribute, y as resolveFieldTypeDescriptor } from "./psl-field-resolution-Bvhx79fP-CQqHf_L4.mjs";
+import { _ as modelSpecContext, b as sqlAttributeSpecs, d as interpretModelAttribute, f as lowerEnumDefault, g as modelCoordinateKey, h as modelAttributeSpecsFrom, l as instantiatePslTypeConstructor, m as lowerTypeGenerators, n as collectResolvedFields, o as fieldSpecContext, p as lowerTypeDefault, r as contractError, s as getAuthoringEntity, t as PSL_CHECK_ON_STI_VARIANT, u as interpretFieldAttribute, y as resolveFieldTypeDescriptor } from "./psl-field-resolution-Bvhx79fP-CuyYFk8z.mjs";
 import { t as defaultTableName } from "./default-table-name-BfFY8qYR-CWZFDX6v.mjs";
 import { t as compareStrings } from "./compare-strings-BVf3BgCV-CefXnrMB.mjs";
 import { isStructuredError } from "@prisma/orm-framework/utils/structured-error";
 import { ifDefined } from "@prisma/orm-framework/utils/defined";
 import { applyDiscriminatorRule, describeDiscriminatorRefusal, encodeEnumMembers, instantiateAuthoringEntityType, instantiateAuthoringTypeAlias, instantiateAuthoringTypeConstructor, isAuthoringEntityTypeDescriptor, isAuthoringModelAttributeDescriptor, resolveTypeAliasGenerators } from "@prisma/orm-framework/components/authoring";
 import { UNBOUND_NAMESPACE_ID } from "@prisma/orm-framework/components/ir";
+import { crossRef } from "@prisma/orm-framework/contract/types";
+import { assertDefined, invariant } from "@prisma/orm-framework/utils/assertions";
 import { blindCast } from "@prisma/orm-framework/utils/casts";
 import { InternalError } from "@prisma/orm-framework/utils/internal-error";
-import { crossRef } from "@prisma/orm-framework/contract/types";
 import { NamespaceDeclarationAst } from "@prisma/orm-framework/psl-parser/syntax";
 import { resolveToOneRelationNullable } from "@prisma/orm-framework/contract-authoring";
-import { assertDefined, invariant } from "@prisma/orm-framework/utils/assertions";
 import { notOk, ok } from "@prisma/orm-framework/utils/result";
 import { contributedTypeAliasOf, createPslDiagnosticCollector, diagnosticSource, findBlockDescriptor, interpretExtensionBlocks, nodePslSpan, resolveTypeAliases, typeAliasAttributeNames, typeAliasSpecContext, typeReferenceNode } from "@prisma/orm-framework/psl-parser";
 import { claimedBlockKeywords, enumMemberAttributeDiagnostics, fkRelationPairKey, requiredOneToOneBackrelationDiagnostic, unsupportedBlockDiagnostic } from "@prisma/orm-framework/psl-parser/interpret";
-//#region ../../../2-sql-family/2-authoring/contract-psl/dist/interpreter-CS21wD1i.mjs
+//#region ../../../2-sql-family/2-authoring/contract-psl/dist/interpreter-CrQFtK4p.mjs
 function describeUnsupportedSqlAliasAttribute(attribute) {
 	return attribute.name.startsWith("db.") ? formatDbAttributeMigrationMessage(attribute) : void 0;
 }
@@ -1551,16 +1551,11 @@ function writtenBaseValue(base) {
 function modelLabel(namespaceId, modelName, qualified) {
 	return qualified ? `${namespaceId}.${modelName}` : modelName;
 }
-function resolvePolymorphism(models, physicalNames, discriminatorDeclarations, baseDeclarations, reported, syntheticPkFieldsByVariant, stiBaseFieldsByBase, diagnostics) {
-	let patched = models;
-	for (const [baseKey, fieldNames] of stiBaseFieldsByBase) {
-		const baseModel = patched[baseKey];
-		if (!baseModel || fieldNames.length === 0) continue;
-		patched = {
-			...patched,
-			[baseKey]: stripStorageOnlyDomainFields(baseModel, fieldNames)
-		};
-	}
+/**
+* Pairs each `@@discriminator` with the variants that declare `@@base` on it, before the build, so the build writes the discriminator's value set before it computes the storage hash (ADR 309). Reports a model with both attributes, a discriminator no variant names, a duplicate value, and a base with no discriminator.
+*/
+function resolveVariants(modelKeys, discriminatorDeclarations, baseDeclarations, reported, diagnostics) {
+	const discriminators = /* @__PURE__ */ new Map();
 	for (const [modelKey, decl] of discriminatorDeclarations) {
 		const modelName = decl.model.name;
 		if (baseDeclarations.has(modelKey)) {
@@ -1571,8 +1566,7 @@ function resolvePolymorphism(models, physicalNames, discriminatorDeclarations, b
 			});
 			continue;
 		}
-		const model = patched[modelKey];
-		if (!model) continue;
+		if (!modelKeys.has(modelKey)) continue;
 		const variants = {};
 		for (const baseDecl of baseDeclarations.values()) {
 			if (baseDecl.base.key !== modelKey || baseDecl.value === void 0) continue;
@@ -1598,22 +1592,18 @@ function resolvePolymorphism(models, physicalNames, discriminatorDeclarations, b
 			});
 			continue;
 		}
-		patched = {
-			...patched,
-			[modelKey]: {
-				...model,
-				discriminator: { field: decl.fieldName },
-				variants
-			}
-		};
+		discriminators.set(modelKey, {
+			discriminator: { field: decl.fieldName },
+			variants
+		});
 	}
+	const bases = /* @__PURE__ */ new Map();
 	for (const [variantKey, baseDecl] of baseDeclarations) {
-		const baseName = baseDecl.base.model.name;
 		if (!discriminatorDeclarations.has(baseDecl.base.key)) {
 			if (reported.discriminators.has(baseDecl.base.key)) continue;
 			const qualified = baseDecl.namespaceId !== baseDecl.base.namespaceId;
 			const variantLabel = modelLabel(baseDecl.namespaceId, baseDecl.model.name, qualified);
-			const baseLabel = modelLabel(baseDecl.base.namespaceId, baseName, qualified);
+			const baseLabel = modelLabel(baseDecl.base.namespaceId, baseDecl.base.model.name, qualified);
 			diagnostics.push({
 				code: "PSL_ORPHANED_BASE",
 				message: `Model "${variantLabel}" declares @@base(${baseLabel}, ...) but "${baseLabel}" has no @@discriminator`,
@@ -1621,13 +1611,47 @@ function resolvePolymorphism(models, physicalNames, discriminatorDeclarations, b
 			});
 			continue;
 		}
-		if (discriminatorDeclarations.has(variantKey)) continue;
+		if (discriminatorDeclarations.has(variantKey) || !modelKeys.has(variantKey)) continue;
+		bases.set(variantKey, crossRef(baseDecl.base.model.name, baseDecl.base.namespaceId));
+	}
+	return {
+		discriminators,
+		bases
+	};
+}
+/** The model nodes with the discriminator, variants and base the build writes. */
+function withPolymorphism(modelNodes, polymorphism, defaultNamespaceId) {
+	return modelNodes.map((node) => {
+		const key = modelCoordinateKey(node.namespaceId ?? defaultNamespaceId, node.modelName);
+		const discriminator = polymorphism.discriminators.get(key);
+		const base = polymorphism.bases.get(key);
+		return {
+			...node,
+			...discriminator ?? {},
+			...ifDefined("base", base)
+		};
+	});
+}
+/**
+* Points each variant without `@@map` at its base table, and strips from the domain the columns a variant's or a base's model only stores: STI columns on the base, and the link column of an MTI variant. The discriminator, the variants and the base are written by the build.
+*/
+function resolveVariantStorage(models, physicalNames, baseDeclarations, polymorphism, syntheticPkFieldsByVariant, stiBaseFieldsByBase) {
+	let patched = models;
+	for (const [baseKey, fieldNames] of stiBaseFieldsByBase) {
+		const baseModel = patched[baseKey];
+		if (!baseModel || fieldNames.length === 0) continue;
+		patched = {
+			...patched,
+			[baseKey]: stripStorageOnlyDomainFields(baseModel, fieldNames)
+		};
+	}
+	for (const variantKey of polymorphism.bases.keys()) {
+		const baseDecl = baseDeclarations.get(variantKey);
 		const variantModel = patched[variantKey];
-		if (!variantModel) continue;
+		if (!baseDecl || !variantModel) continue;
 		const resolvedTable = storageName(getAttribute(baseDecl.model.attributes, "map") !== void 0 ? baseDecl.model : baseDecl.base.model, physicalNames);
 		const patchedVariant = {
 			...variantModel,
-			base: crossRef(baseName, baseDecl.base.namespaceId),
 			...resolvedTable ? { storage: {
 				...variantModel.storage,
 				table: resolvedTable
@@ -1866,6 +1890,7 @@ function interpretPslDocumentToSqlContract(input) {
 	const models = [];
 	const modelEntries = [];
 	const compositeTypes = [];
+	const compositeTypeNamespaces = /* @__PURE__ */ new Map();
 	for (const namespace of namespaceSymbols) {
 		for (const model of Object.values(namespace.models)) {
 			models.push(model);
@@ -1874,7 +1899,19 @@ function interpretPslDocumentToSqlContract(input) {
 				namespaceId: namespace.id
 			});
 		}
-		compositeTypes.push(...Object.values(namespace.compositeTypes));
+		for (const compositeType of Object.values(namespace.compositeTypes)) {
+			const firstNamespaceId = compositeTypeNamespaces.get(compositeType.name);
+			if (firstNamespaceId !== void 0) {
+				diagnostics.push({
+					code: "PSL_DUPLICATE_DECLARATION",
+					message: `Composite type "${compositeType.name}" is declared in namespace "${firstNamespaceId}" and in namespace "${namespace.id}". Every composite type is stored in the default storage namespace, so composite type names must differ across namespaces. Rename one of them.`,
+					...diagnosticSource(input.sources, compositeType.node.syntax).at()
+				});
+				continue;
+			}
+			compositeTypeNamespaces.set(compositeType.name, namespace.id);
+			compositeTypes.push(compositeType);
+		}
 	}
 	const physicalNames = /* @__PURE__ */ new Map();
 	for (const model of models) {
@@ -2202,6 +2239,12 @@ function interpretPslDocumentToSqlContract(input) {
 		summary: "PSL to SQL contract interpretation failed",
 		diagnostics: [...input.seedDiagnostics ?? [], ...diagnostics.toExternal()]
 	});
+	const polyDiagnostics = createPslDiagnosticCollector(input.sources);
+	const polymorphism = resolveVariants(new Set(stiColumnModelNodes.map((node) => modelCoordinateKey(node.namespaceId ?? defaultNamespaceId, node.modelName))), discriminatorDeclarations, baseDeclarations, reported, polyDiagnostics);
+	if (polyDiagnostics.length > 0) return notOk({
+		summary: "PSL to SQL contract interpretation failed",
+		diagnostics: polyDiagnostics.toExternal()
+	});
 	const { createNamespace } = input;
 	const createNamespaceWithExtensions = (nsInput) => {
 		const entities = namespaceExtensionEntities.get(nsInput.id);
@@ -2239,7 +2282,7 @@ function interpretPslDocumentToSqlContract(input) {
 			...namespaceExtensionEntities.size > 0 ? { namespaces: [...namespaceExtensionEntities.keys()] } : {},
 			createNamespace: createNamespaceWithExtensions,
 			...ifDefined("valueObjects", valueObjects.length > 0 ? valueObjects : void 0),
-			models: stiColumnModelNodes
+			models: withPolymorphism(stiColumnModelNodes, polymorphism, defaultNamespaceId)
 		}, input.codecLookup, input.dataTypes.lookup);
 	} catch (error) {
 		const refusal = relationIndexRefusal(error, relationIndexLocations);
@@ -2260,24 +2303,18 @@ function interpretPslDocumentToSqlContract(input) {
 		invariant(!Object.hasOwn(modelsByCoordinate, coordinate), `symbol table guarantees coordinate uniqueness; duplicate model "${namespaceId}.${modelName}" reached interpretation`);
 		modelsByCoordinate[coordinate] = model;
 	}
-	const polyDiagnostics = createPslDiagnosticCollector(input.sources);
-	const polymorphicModels = resolvePolymorphism(modelsByCoordinate, physicalNames, discriminatorDeclarations, baseDeclarations, reported, syntheticPkFieldsByVariant, stiBaseFieldsByBase, polyDiagnostics);
-	if (polyDiagnostics.length > 0) return notOk({
-		summary: "PSL to SQL contract interpretation failed",
-		diagnostics: polyDiagnostics.toExternal()
-	});
+	const polymorphicModels = resolveVariantStorage(modelsByCoordinate, physicalNames, baseDeclarations, polymorphism, syntheticPkFieldsByVariant, stiBaseFieldsByBase);
 	const filteredRoots = Object.fromEntries(Object.entries(contract.roots).filter(([, crossReference]) => !baseDeclarations.has(modelCoordinateKey(crossReference.namespace, crossReference.model))));
 	return ok({
 		...contract,
 		roots: filteredRoots,
 		domain: { namespaces: Object.fromEntries(Object.entries(contract.domain.namespaces).map(([namespaceId, namespaceSlice]) => [namespaceId, {
 			models: Object.fromEntries(Object.entries(namespaceSlice.models).map(([modelName, model]) => [modelName, polymorphicModels[modelCoordinateKey(namespaceId, modelName)] ?? model])),
-			...ifDefined("enum", namespaceSlice.enum),
-			...ifDefined("valueObjects", namespaceSlice.valueObjects)
+			...ifDefined("enum", namespaceSlice.enum)
 		}])) }
 	});
 }
 //#endregion
 export { normalizeReferentialAction as a, interpretPslDocumentToSqlContract as i, buildEntityTypesByDiscriminator as n, indexFkRelations as r, applyBackrelationCandidates as t };
 
-//# sourceMappingURL=interpreter-CS21wD1i-G0u1x8t_.mjs.map
+//# sourceMappingURL=interpreter-CrQFtK4p-CM5k_t4g.mjs.map