@prisma-next/family-sql 0.13.0-dev.3 → 0.13.0-dev.31

package/dist/control.mjs

@@ -1,6 +1,6 @@
-import { n as sqlFamilyAuthoringFieldPresets, t as sqlFamilyAuthoringTypes } from "./authoring-type-constructors-D4lQ-qpj.mjs";
-import { t as SqlContractSerializer } from "./sql-contract-serializer-CY7qnms7.mjs";
-import { a as contractToSchemaIR, c as extractCodecControlHooks, o as detectDestructiveChanges, s as resolveValueSetValues, t as verifySqlSchema } from "./verify-sql-schema-DlAgBiT_.mjs";
+import { i as sqlFamilyPslBlockDescriptors, n as sqlFamilyAuthoringFieldPresets, r as sqlFamilyEntityTypes, t as sqlFamilyAuthoringTypes } from "./authoring-type-constructors-CjFfO6LM.mjs";
+import { t as SqlContractSerializer } from "./sql-contract-serializer-D6-28zKd.mjs";
+import { a as contractToSchemaIR, c as extractCodecControlHooks, o as detectDestructiveChanges, s as resolveValueSetValues, t as verifySqlSchema } from "./verify-sql-schema-xT4udQLQ.mjs";
 import { t as collectSupportedCodecTypeIds } from "./verify-C-G0obRm.mjs";
 import { n as temporalAuthoringPresets, r as timestampNowControlDescriptor } from "./timestamp-now-generator-CloimujU.mjs";
 import { sqlEmission } from "@prisma-next/sql-contract-emitter";
@@ -155,20 +155,6 @@ function toFieldName(columnName) {
 	};
 	return { name };
 }
-function toEnumName(pgTypeName) {
-	let name;
-	if (hasSeparators(pgTypeName)) name = snakeToPascalCase(pgTypeName);
-	else name = pgTypeName.charAt(0).toUpperCase() + pgTypeName.slice(1);
-	if (needsEscaping(name)) return {
-		name: escapeName(name),
-		map: pgTypeName
-	};
-	if (name !== pgTypeName) return {
-		name,
-		map: pgTypeName
-	};
-	return { name };
-}
 function pluralize(word) {
 	if (word.endsWith("s") || word.endsWith("x") || word.endsWith("z") || word.endsWith("ch") || word.endsWith("sh")) return `${word}es`;
 	if (word.endsWith("y") && !/[aeiou]y$/i.test(word)) return `${word.slice(0, -1)}ies`;
@@ -333,7 +319,6 @@ const PARAMETERIZED_NATIVE_TYPES = {
 	}
 };
 const PARAMETERIZED_TYPE_PATTERN = /^(.+?)\((.+)\)$/;
-const ENUM_CODEC_ID = "pg/enum@1";
 function getOwnMappingValue(map, key) {
 	return Object.hasOwn(map, key) ? map[key] : void 0;
 }
@@ -387,15 +372,11 @@ function createPostgresTypeMap(enumTypeNames) {
 	} };
 }
 function extractEnumInfo(annotations) {
-	const storageTypes = (annotations?.["pg"])?.["storageTypes"];
+	const nativeEnumTypeNames = (annotations?.["pg"])?.["nativeEnumTypeNames"];
 	const typeNames = /* @__PURE__ */ new Set();
 	const definitions = /* @__PURE__ */ new Map();
-	if (storageTypes) {
-		for (const [key, typeInstance] of Object.entries(storageTypes)) if (typeInstance.codecId === ENUM_CODEC_ID) {
-			typeNames.add(key);
-			const values = typeInstance.typeParams?.["values"];
-			if (Array.isArray(values)) definitions.set(key, values);
-		}
+	if (Array.isArray(nativeEnumTypeNames)) {
+		for (const name of nativeEnumTypeNames) if (typeof name === "string") typeNames.add(name);
 	}
 	return {
 		typeNames,
@@ -619,37 +600,27 @@ const PSL_SCALAR_TYPE_NAMES = new Set([
 */
 function sqlSchemaIrToPslAst(schemaIR) {
 	const enumInfo = extractEnumInfo(schemaIR.annotations);
+	if (enumInfo.typeNames.size > 0) {
+		const names = [...enumInfo.typeNames].join(", ");
+		throw new Error(`contract infer: the database contains native Postgres enum type(s): ${names}. Native Postgres enums (CREATE TYPE … AS ENUM) are not adoptable by contract infer. Drop the native type and replace each column with a text column carrying a CHECK constraint, then re-run contract infer. The domain enum (enum Name { @@type("pg/text@1") … }) authoring surface generates the required check automatically.`);
+	}
 	return buildPslDocumentAst(schemaIR, {
-		typeMap: createPostgresTypeMap(enumInfo.typeNames),
+		typeMap: createPostgresTypeMap(/* @__PURE__ */ new Set()),
 		defaultMapping: createPostgresDefaultMapping(),
-		enumInfo,
 		parseRawDefault
 	});
 }
 function buildPslDocumentAst(schemaIR, options) {
-	const { typeMap, defaultMapping, enumInfo, parseRawDefault: rawDefaultParser } = options;
-	const { typeNames: enumTypeNames, definitions: enumDefinitions } = enumInfo ?? {
-		typeNames: /* @__PURE__ */ new Set(),
-		definitions: /* @__PURE__ */ new Map()
-	};
+	const { typeMap, defaultMapping, parseRawDefault: rawDefaultParser } = options;
 	const modelNames = buildTopLevelNameMap(Object.keys(schemaIR.tables), toModelName, "model", "table");
-	const enumNames = buildTopLevelNameMap(enumTypeNames, toEnumName, "enum", "enum type");
-	assertNoCrossKindNameCollisions(modelNames, enumNames);
 	const modelNameMap = new Map([...modelNames].map(([tableName, result]) => [tableName, result.name]));
-	const enumNameMap = new Map([...enumNames].map(([pgTypeName, result]) => [pgTypeName, result.name]));
-	const reservedNamedTypeNames = createReservedNamedTypeNames(modelNames, enumNames);
+	const reservedNamedTypeNames = createReservedNamedTypeNames(modelNames);
 	const fieldNamesByTable = buildFieldNamesByTable(schemaIR.tables);
 	const { relationsByTable } = inferRelations(schemaIR.tables, modelNameMap);
-	const namedTypes = seedNamedTypeRegistry(schemaIR, typeMap, enumNameMap, reservedNamedTypeNames);
+	const namedTypes = seedNamedTypeRegistry(schemaIR, typeMap, /* @__PURE__ */ new Map(), reservedNamedTypeNames);
 	const models = [];
-	for (const table of Object.values(schemaIR.tables)) models.push(buildModel(table, typeMap, enumNameMap, fieldNamesByTable, namedTypes, defaultMapping, rawDefaultParser, relationsByTable.get(table.name) ?? []));
+	for (const table of Object.values(schemaIR.tables)) models.push(buildModel(table, typeMap, /* @__PURE__ */ new Map(), fieldNamesByTable, namedTypes, defaultMapping, rawDefaultParser, relationsByTable.get(table.name) ?? []));
 	const sortedModels = topologicalSort(models, schemaIR.tables, modelNameMap);
-	const enums = [];
-	for (const [pgTypeName, values] of enumDefinitions) {
-		const enumName = enumNames.get(pgTypeName);
-		enums.push(buildEnum(enumName, values));
-	}
-	enums.sort((a, b) => a.name.localeCompare(b.name));
 	const namedTypeEntries = [...namedTypes.entriesByKey.values()].sort((a, b) => a.name.localeCompare(b.name));
 	const types = namedTypeEntries.length > 0 ? {
 		kind: "types",
@@ -662,7 +633,7 @@ function buildPslDocumentAst(schemaIR, options) {
 		namespaces: [makePslNamespace({
 			kind: "namespace",
 			name: UNSPECIFIED_PSL_NAMESPACE_ID,
-			entries: makePslNamespaceEntries(sortedModels, enums, [], []),
+			entries: makePslNamespaceEntries(sortedModels, [], []),
 			span: SYNTHETIC_SPAN
 		})],
 		...types ? { types } : {},
@@ -818,21 +789,6 @@ function namedArg(name, value) {
 		span: SYNTHETIC_SPAN
 	};
 }
-function buildEnum(name, values) {
-	const attrs = [];
-	if (name.map) attrs.push(buildMapAttribute("enum", name.map));
-	return {
-		kind: "enum",
-		name: name.name,
-		values: values.map((value) => ({
-			kind: "enumValue",
-			name: value,
-			span: SYNTHETIC_SPAN
-		})),
-		attributes: attrs,
-		span: SYNTHETIC_SPAN
-	};
-}
 function buildNamedTypeDeclaration(entry) {
 	const attribute = buildAttribute("namedType", entry.nativeTypeAttribute.name, (entry.nativeTypeAttribute.args ?? []).map(positionalArg));
 	return {
@@ -912,18 +868,9 @@ function buildTopLevelNameMap(sources, normalize, kind, sourceKind) {
 	}
 	return results;
 }
-function assertNoCrossKindNameCollisions(modelNames, enumNames) {
-	const enumSourceByName = new Map([...enumNames].map(([source, result]) => [result.name, source]));
-	const collisions = [...modelNames.entries()].map(([tableName, result]) => {
-		const enumSource = enumSourceByName.get(result.name);
-		return enumSource ? `- identifier "${result.name}" from table "${tableName}" collides with enum type "${enumSource}"` : void 0;
-	}).filter((detail) => detail !== void 0);
-	if (collisions.length > 0) throw new Error(`PSL top-level name collisions detected:\n${collisions.join("\n")}`);
-}
-function createReservedNamedTypeNames(modelNames, enumNames) {
+function createReservedNamedTypeNames(modelNames) {
 	const reservedNames = new Set(PSL_SCALAR_TYPE_NAMES);
 	for (const result of modelNames.values()) reservedNames.add(result.name);
-	for (const result of enumNames.values()) reservedNames.add(result.name);
 	return reservedNames;
 }
 function seedNamedTypeRegistry(schemaIR, typeMap, enumNameMap, reservedNames) {
@@ -1020,7 +967,7 @@ function extractCodecTypeIdsFromContract(contract) {
 	if (typeof contract === "object" && contract !== null && "storage" in contract && typeof contract.storage === "object" && contract.storage !== null && "namespaces" in contract.storage && typeof contract.storage.namespaces === "object" && contract.storage.namespaces !== null) {
 		const namespaces = contract.storage.namespaces;
 		for (const ns of Object.values(namespaces)) {
-			const tbls = ns.entries.table;
+			const tbls = ns.entries["table"];
 			if (typeof tbls !== "object" || tbls === null) continue;
 			for (const table of Object.values(tbls)) if (typeof table === "object" && table !== null && "columns" in table && typeof table.columns === "object" && table.columns !== null) {
 				const columns = table.columns;
@@ -1281,7 +1228,6 @@ function createSqlFamilyInstance(stack) {
 		verifySchema(options) {
 			const contract = deserializeWithTargetSerializer(options.contract);
 			const controlAdapter = getControlAdapter();
-			const resolveExistingEnumValues = controlAdapter.resolveExistingEnumValuesForContract?.(contract) ?? controlAdapter.resolveExistingEnumValues;
 			return verifySqlSchema({
 				contract,
 				schema: options.schema,
@@ -1289,8 +1235,7 @@ function createSqlFamilyInstance(stack) {
 				typeMetadataRegistry,
 				frameworkComponents: options.frameworkComponents,
 				...ifDefined("normalizeDefault", controlAdapter.normalizeDefault),
-				...ifDefined("normalizeNativeType", controlAdapter.normalizeNativeType),
-				...ifDefined("resolveExistingEnumValues", resolveExistingEnumValues)
+				...ifDefined("normalizeNativeType", controlAdapter.normalizeNativeType)
 			});
 		},
 		async sign(options) {
@@ -1303,7 +1248,7 @@ function createSqlFamilyInstance(stack) {
 			const controlAdapter = getControlAdapter();
 			const lowererContext = { contract };
 			for (const query of controlAdapter.bootstrapSignMarkerQueries()) {
-				const lowered = controlAdapter.lower(query, lowererContext);
+				const lowered = await controlAdapter.lowerToExecuteRequest(query, lowererContext);
 				await driver.query(lowered.sql, lowered.params);
 			}
 			const existingMarker = await controlAdapter.readMarker(driver, APP_SPACE_ID);
@@ -1384,7 +1329,7 @@ function createSqlFamilyInstance(stack) {
 			return sqlSchemaIrToPslAst(schemaIR);
 		},
 		lowerAst(ast, context) {
-			return getControlAdapter().lower(ast, context);
+			return getControlAdapter().lowerToExecuteRequest(ast, context);
 		},
 		bootstrapControlTableQueries() {
 			return getControlAdapter().bootstrapControlTableQueries();
@@ -1494,7 +1439,9 @@ var SqlFamilyDescriptor = class {
 	emission = sqlEmission;
 	authoring = {
 		field: sqlFamilyAuthoringFieldPresets,
-		type: sqlFamilyAuthoringTypes
+		type: sqlFamilyAuthoringTypes,
+		entityTypes: sqlFamilyEntityTypes,
+		pslBlockDescriptors: sqlFamilyPslBlockDescriptors
 	};
 	create(stack) {
 		return createSqlFamilyInstance(stack);