@prisma/orm-framework 8.0.0-rc.17-dev.30 → 8.0.0-rc.17-dev.31

package/dist/psl-parser.mjs

@@ -5,10 +5,11 @@ import { r as createDataTypeLookup } from "./data-type-4xQlxYB5-DD158cOq.mjs";
 import { S as isAuthoringPslBlockDescriptor, f as describeTaggedLiteralFailure, x as isAuthoringModelAttributeDescriptor } from "./temporal-presets-DEyPX8qQ-Bz4DdZ8v.mjs";
 import { _ as readWrittenValue, a as describeExpected, d as exactRewrite, i as describeAdmittedForms, n as admittedTags, o as describeRefusal, r as castTypedValue, t as admittedForms, v as tagForm } from "./authoring-Bv-ExMUC.mjs";
 import { a as flatPslModels, c as namespacePslExtensionBlocks } from "./psl-ast-CyvE6CR-.mjs";
+import { l as printSyntax } from "./ast-helpers-CzydMPdh-Mi0SrZRa.mjs";
 import { n as isPslIdentifier } from "./tokenizer-C-GTKKjR-B1vOzJy0.mjs";
-import { D as TypesBlockAst, S as PathExprAst, T as TaggedLiteralExprAst, a as CompositeTypeDeclarationAst, d as IdentifierAst, g as ModelDeclarationAst, i as BooleanLiteralExprAst, l as FunctionCallAst, p as MixinDeclarationAst, t as ArrayLiteralAst, u as GenericBlockDeclarationAst, v as NamespaceDeclarationAst, w as StringLiteralExprAst, x as ObjectLiteralExprAst, y as NumberLiteralExprAst } from "./declarations-CTFzoo9j-BaCuW9E2.mjs";
+import { D as TypesBlockAst, S as PathExprAst, T as TaggedLiteralExprAst, a as CompositeTypeDeclarationAst, c as FieldDeclarationAst, d as IdentifierAst, f as KeyValuePairAst, g as ModelDeclarationAst, h as ModelAttributeAst, i as BooleanLiteralExprAst, l as FunctionCallAst, p as MixinDeclarationAst, t as ArrayLiteralAst, u as GenericBlockDeclarationAst, v as NamespaceDeclarationAst, w as StringLiteralExprAst, x as ObjectLiteralExprAst, y as NumberLiteralExprAst } from "./declarations-DuSbyF44-Bee8mK-C.mjs";
 import { a as mapPslDiagnostics, c as readResolvedAttributes, i as keywordPslSpan, l as readResolvedConstructorCall, n as diagnosticFromSpan, o as nodePslSpan, r as diagnosticSource, s as readResolvedAttribute, t as createPslDiagnosticCollector } from "./resolve-C8PUf8zv-QAvnPhCt.mjs";
-//#region ../../../1-framework/2-authoring/psl-parser/dist/symbol-table-DzoniUhK.mjs
+//#region ../../../1-framework/2-authoring/psl-parser/dist/binder-DNpvbbBT.mjs
 function* modelAttributeDescriptors(namespace) {
 	for (const value of Object.values(namespace)) {
 		if (isAuthoringModelAttributeDescriptor(value)) {
@@ -265,6 +266,12 @@ function namespaceMember(namespace, name) {
 		symbol: block,
 		namespace
 	};
+	const mixin = namespace.mixins[name];
+	if (mixin !== void 0) return {
+		kind: "mixin",
+		symbol: mixin,
+		namespace
+	};
 }
 var ContributedScope = class extends Scope {
 	#registry;
@@ -308,6 +315,11 @@ var DocumentScope = class extends Scope {
 			kind: "block",
 			symbol: block
 		};
+		const mixin = records.mixins[name];
+		if (mixin !== void 0) return {
+			kind: "mixin",
+			symbol: mixin
+		};
 		const namespace = records.namespaces[name];
 		if (namespace !== void 0) return {
 			kind: "namespace",
@@ -317,7 +329,7 @@ var DocumentScope = class extends Scope {
 	}
 	ownNames() {
 		const records = this.#records;
-		return recordNames(records.models, records.compositeTypes, records.namedTypes, records.blocks, records.namespaces);
+		return recordNames(records.models, records.compositeTypes, records.namedTypes, records.blocks, records.mixins, records.namespaces);
 	}
 };
 var NamespaceScope = class extends Scope {
@@ -331,7 +343,7 @@ var NamespaceScope = class extends Scope {
 	}
 	ownNames() {
 		const namespace = this.#namespace;
-		return recordNames(namespace.models, namespace.compositeTypes, namespace.blocks);
+		return recordNames(namespace.models, namespace.compositeTypes, namespace.blocks, namespace.mixins);
 	}
 };
 function contributedScope(registry) {
@@ -366,6 +378,355 @@ function lookupMember(qualifier, name) {
 	}
 	return namespaceMember(qualifier.symbol, name);
 }
+/**
+* Owns duplicate-declaration detection for all PSL scopes; downstream consumers
+* should consume first-wins symbols rather than re-emitting duplicate diagnostics.
+*/
+function buildSymbolTable(options) {
+	const { documents, sources } = options;
+	const diagnostics = [];
+	const namespaces = Object.create(null);
+	const namedTypes = Object.create(null);
+	const blocks = Object.create(null);
+	const models = Object.create(null);
+	const compositeTypes = Object.create(null);
+	const mixins = Object.create(null);
+	const topLevelNames = /* @__PURE__ */ new Set();
+	for (const document of documents) {
+		const sourceFile = sources.sourceFileFor(document.syntax);
+		const claim = (taken, name) => {
+			const text = name?.name();
+			if (text === void 0) return void 0;
+			if (taken.has(text)) {
+				const range = nameRange(name, sources);
+				if (range) diagnostics.push({
+					code: "PSL_DUPLICATE_DECLARATION",
+					message: `Duplicate declaration of "${text}"`,
+					filename: sourceFile.filename,
+					range
+				});
+				return;
+			}
+			taken.add(text);
+			return text;
+		};
+		for (const declaration of document.declarations()) if (declaration instanceof ModelDeclarationAst) {
+			const name = claim(topLevelNames, declaration.name());
+			if (name !== void 0) models[name] = buildModel(name, declaration, sources, diagnostics);
+		} else if (declaration instanceof CompositeTypeDeclarationAst) {
+			const name = claim(topLevelNames, declaration.name());
+			if (name !== void 0) compositeTypes[name] = buildCompositeType(name, declaration, sources, diagnostics);
+		} else if (declaration instanceof GenericBlockDeclarationAst) {
+			const name = claim(topLevelNames, declaration.name());
+			if (name !== void 0) blocks[name] = buildBlock(name, declaration, sources);
+		} else if (declaration instanceof MixinDeclarationAst) {
+			const name = claim(topLevelNames, declaration.name());
+			if (name !== void 0) mixins[name] = buildMixin(name, declaration, sources, diagnostics);
+		} else if (declaration instanceof NamespaceDeclarationAst) {
+			const declaredName = declaration.name()?.name();
+			if (declaredName === void 0) continue;
+			let namespace = namespaces[declaredName];
+			if (namespace === void 0) {
+				const name = claim(topLevelNames, declaration.name());
+				if (name === void 0) continue;
+				namespace = {
+					kind: "namespace",
+					name,
+					declarations: [{
+						node: declaration,
+						span: nodePslSpan(declaration.syntax, sources)
+					}],
+					models: Object.create(null),
+					compositeTypes: Object.create(null),
+					blocks: Object.create(null),
+					mixins: Object.create(null)
+				};
+				namespaces[name] = namespace;
+			} else namespace.declarations.push({
+				node: declaration,
+				span: nodePslSpan(declaration.syntax, sources)
+			});
+			extendNamespace(namespace, declaration, diagnostics, sources);
+		} else if (declaration instanceof TypesBlockAst) for (const binding of declaration.declarations()) {
+			const name = claim(topLevelNames, binding.name());
+			if (name === void 0) continue;
+			const resolved = resolveNamedTypeBinding(binding, sources);
+			namedTypes[name] = {
+				kind: "namedType",
+				name,
+				node: binding,
+				span: nodePslSpan(binding.syntax, sources),
+				...resolved
+			};
+		}
+	}
+	return {
+		symbolTable: { topLevel: {
+			namespaces,
+			namedTypes,
+			blocks,
+			models,
+			compositeTypes,
+			mixins
+		} },
+		diagnostics
+	};
+}
+function buildModel(name, node, sources, diagnostics) {
+	return {
+		kind: "model",
+		name,
+		node,
+		span: nodePslSpan(node.syntax, sources),
+		fields: buildFields(name, node.fields(), sources, diagnostics),
+		attributes: readResolvedAttributes(node.attributes(), sources)
+	};
+}
+function buildCompositeType(name, node, sources, diagnostics) {
+	return {
+		kind: "compositeType",
+		name,
+		node,
+		span: nodePslSpan(node.syntax, sources),
+		fields: buildFields(name, node.fields(), sources, diagnostics),
+		attributes: readResolvedAttributes(node.attributes(), sources)
+	};
+}
+function buildBlock(name, node, sources) {
+	return {
+		kind: "block",
+		name,
+		keyword: node.keyword()?.text ?? "",
+		node,
+		span: nodePslSpan(node.syntax, sources),
+		entries: Array.from(node.entries()),
+		attributes: readResolvedAttributes(node.attributes(), sources)
+	};
+}
+const FIELD_BLOCK_KEYWORDS = /* @__PURE__ */ new Set(["model", "type"]);
+function buildMixin(name, node, sources, diagnostics) {
+	const keyword = node.keyword()?.text ?? "";
+	const hasFields = FIELD_BLOCK_KEYWORDS.has(keyword);
+	return {
+		kind: "mixin",
+		name,
+		keyword,
+		node,
+		span: nodePslSpan(node.syntax, sources),
+		fields: hasFields ? buildFields(name, node.fields(), sources, diagnostics) : Object.create(null),
+		entries: hasFields ? [] : Array.from(node.entries()),
+		attributes: readResolvedAttributes(node.attributes(), sources)
+	};
+}
+function extendNamespace(namespace, node, diagnostics, sources) {
+	const { models, compositeTypes, blocks, mixins } = namespace;
+	for (const member of node.declarations()) {
+		const memberName = member.name()?.name();
+		if (memberName === void 0) continue;
+		if (Object.hasOwn(models, memberName) || Object.hasOwn(compositeTypes, memberName) || Object.hasOwn(blocks, memberName) || Object.hasOwn(mixins, memberName)) {
+			const range = nameRange(member.name(), sources);
+			if (range) diagnostics.push({
+				code: "PSL_DUPLICATE_DECLARATION",
+				message: `Duplicate declaration of "${memberName}"`,
+				filename: sources.sourceFileFor(member.syntax).filename,
+				range
+			});
+			continue;
+		}
+		if (member instanceof ModelDeclarationAst) models[memberName] = buildModel(memberName, member, sources, diagnostics);
+		else if (member instanceof CompositeTypeDeclarationAst) compositeTypes[memberName] = buildCompositeType(memberName, member, sources, diagnostics);
+		else if (member instanceof GenericBlockDeclarationAst) blocks[memberName] = buildBlock(memberName, member, sources);
+		else if (member instanceof MixinDeclarationAst) mixins[memberName] = buildMixin(memberName, member, sources, diagnostics);
+	}
+}
+function placeMixinMembers(input) {
+	const { topLevel } = input.symbolTable;
+	const diagnostics = [];
+	for (const records of [topLevel, ...Object.values(topLevel.namespaces)]) {
+		for (const symbol of Object.values(records.models)) placeFields(symbol, input, diagnostics);
+		for (const symbol of Object.values(records.compositeTypes)) placeFields(symbol, input, diagnostics);
+		for (const symbol of Object.values(records.blocks)) placeEntries(symbol, input, diagnostics);
+	}
+	return diagnostics;
+}
+function includesMixin(symbol, input) {
+	for (const inclusion of symbol.node.inclusions()) if (input.mixinOf(inclusion) !== void 0) return true;
+	return false;
+}
+function inclusionDiagnostic(code, message, inclusion, sources) {
+	return {
+		code,
+		message,
+		filename: sources.sourceFileFor(inclusion.syntax).filename,
+		range: nodeRange(inclusion.syntax, sources)
+	};
+}
+function mixinToPlace(inclusion, symbol, placed, input, diagnostics) {
+	const mixin = input.mixinOf(inclusion);
+	if (mixin === void 0) return void 0;
+	if (placed.has(mixin)) {
+		diagnostics.push(inclusionDiagnostic(symbol.kind === "block" ? "PSL_INVALID_EXTENSION_BLOCK_MEMBER" : "PSL_INVALID_MODEL_MEMBER", `Mixin "${mixin.name}" is already included in this block`, inclusion, input.sources));
+		return;
+	}
+	placed.add(mixin);
+	return mixin;
+}
+function alreadyProvided(mixin, member, symbol, inclusion, sources) {
+	return inclusionDiagnostic("PSL_DUPLICATE_DECLARATION", `Mixin "${mixin.name}" provides "${member}", which "${symbol.name}" already has`, inclusion, sources);
+}
+function writtenAttributes(symbol) {
+	return new Map(symbol.attributes.map((attribute) => [attribute.node.syntax, attribute]));
+}
+function placeFields(symbol, input, diagnostics) {
+	if (!includesMixin(symbol, input)) return;
+	const { sources } = input;
+	const ownFields = new Map(Object.values(symbol.fields).map((field) => [field.node.syntax, field]));
+	const ownAttributes = writtenAttributes(symbol);
+	const fields = Object.create(null);
+	const attributes = [];
+	const placed = /* @__PURE__ */ new Set();
+	for (const member of symbol.node.members()) if (member instanceof FieldDeclarationAst) {
+		const field = ownFields.get(member.syntax);
+		if (field === void 0) continue;
+		if (Object.hasOwn(fields, field.name)) {
+			const diagnostic = duplicateDeclaration(field.name, member.name(), sources);
+			if (diagnostic !== void 0) diagnostics.push(diagnostic);
+		} else fields[field.name] = field;
+	} else if (member instanceof ModelAttributeAst) {
+		const attribute = ownAttributes.get(member.syntax);
+		if (attribute !== void 0) attributes.push(attribute);
+	} else {
+		const mixin = mixinToPlace(member, symbol, placed, input, diagnostics);
+		if (mixin === void 0) continue;
+		for (const field of Object.values(mixin.fields)) if (Object.hasOwn(fields, field.name)) diagnostics.push(alreadyProvided(mixin, field.name, symbol, member, sources));
+		else fields[field.name] = field;
+		attributes.push(...mixin.attributes);
+	}
+	symbol.fields = fields;
+	symbol.attributes = attributes;
+}
+function placeEntries(symbol, input, diagnostics) {
+	if (!includesMixin(symbol, input)) return;
+	const ownAttributes = writtenAttributes(symbol);
+	const entries = [];
+	const attributes = [];
+	const placed = /* @__PURE__ */ new Set();
+	for (const member of symbol.node.members()) if (member instanceof KeyValuePairAst) entries.push(member);
+	else if (member instanceof ModelAttributeAst) {
+		const attribute = ownAttributes.get(member.syntax);
+		if (attribute !== void 0) attributes.push(attribute);
+	} else {
+		const mixin = mixinToPlace(member, symbol, placed, input, diagnostics);
+		if (mixin === void 0) continue;
+		const present = new Set(entries.map((entry) => entry.key()?.name()));
+		for (const entry of mixin.entries) {
+			const key = entry.key()?.name();
+			if (key !== void 0 && present.has(key)) diagnostics.push(alreadyProvided(mixin, key, symbol, member, input.sources));
+			else entries.push(entry);
+		}
+		attributes.push(...mixin.attributes);
+	}
+	symbol.entries = entries;
+	symbol.attributes = attributes;
+}
+function duplicateDeclaration(name, nameNode, sources) {
+	const range = nameRange(nameNode, sources);
+	if (nameNode === void 0 || range === void 0) return void 0;
+	return {
+		code: "PSL_DUPLICATE_DECLARATION",
+		message: `Duplicate declaration of "${name}"`,
+		filename: sources.sourceFileFor(nameNode.syntax).filename,
+		range
+	};
+}
+function buildFields(ownerName, fields, sources, diagnostics) {
+	const result = Object.create(null);
+	for (const field of fields) {
+		const nameNode = field.name();
+		const name = nameNode?.name();
+		if (name === void 0) continue;
+		if (Object.hasOwn(result, name)) {
+			const diagnostic = duplicateDeclaration(name, nameNode, sources);
+			if (diagnostic !== void 0) diagnostics.push(diagnostic);
+			continue;
+		}
+		result[name] = buildField(ownerName, name, field, sources, diagnostics);
+	}
+	return result;
+}
+function buildField(ownerName, name, node, sources, diagnostics) {
+	const attributes = readResolvedAttributes(node.attributes(), sources);
+	const span = nodePslSpan(node.syntax, sources);
+	const annotation = node.typeAnnotation();
+	const typeName = annotation?.name();
+	if (typeName?.isOverQualified()) {
+		const path = typeName.path();
+		diagnostics.push({
+			code: "PSL_INVALID_QUALIFIED_TYPE",
+			message: `Field "${ownerName}.${name}" has an invalid qualified type "${path.join(".")}"; use at most one namespace qualifier (e.g. "ns.TypeName")`,
+			filename: sources.sourceFileFor(typeName.syntax).filename,
+			range: nodeRange(typeName.syntax, sources)
+		});
+		return {
+			kind: "field",
+			name,
+			node,
+			span,
+			typeName: path[path.length - 1] ?? "",
+			optional: false,
+			list: false,
+			elementOptional: false,
+			malformedType: true,
+			attributes
+		};
+	}
+	const typeConstructor = annotation?.isConstructor() ? readResolvedConstructorCall(annotation, sources) : void 0;
+	const typeNamespaceId = typeName?.namespace()?.name();
+	const typeContractSpaceId = typeName?.space()?.name();
+	return {
+		kind: "field",
+		name,
+		node,
+		span,
+		typeName: typeName?.identifier()?.name() ?? "",
+		...typeNamespaceId !== void 0 ? { typeNamespaceId } : {},
+		...typeContractSpaceId !== void 0 ? { typeContractSpaceId } : {},
+		optional: annotation?.isOptional() ?? false,
+		list: annotation?.isList() ?? false,
+		elementOptional: annotation?.isElementOptional() ?? false,
+		...typeConstructor !== void 0 ? { typeConstructor } : {},
+		attributes
+	};
+}
+function resolveNamedTypeBinding(node, sources) {
+	const annotation = node.typeAnnotation();
+	const isConstructor = annotation?.isConstructor() ?? false;
+	const baseType = annotation?.name()?.identifier()?.name();
+	const typeConstructor = readResolvedConstructorCall(annotation, sources);
+	return {
+		isConstructor,
+		...!isConstructor && baseType !== void 0 ? { baseType } : {},
+		...typeConstructor !== void 0 ? { typeConstructor } : {},
+		attributes: readResolvedAttributes(node.attributes(), sources)
+	};
+}
+function nameRange(name, sources) {
+	if (name === void 0) return void 0;
+	const sourceFile = sources.sourceFileFor(name.syntax);
+	for (const token of name.syntax.tokens()) if (token.kind === "Ident") return {
+		start: sourceFile.positionAt(token.offset),
+		end: sourceFile.positionAt(token.offset + token.text.length)
+	};
+}
+function nodeRange(node, sources) {
+	const sourceFile = sources.sourceFileFor(node);
+	const start = node.offset;
+	const end = start + node.green.textLength;
+	return {
+		start: sourceFile.positionAt(start),
+		end: sourceFile.positionAt(end)
+	};
+}
 const PSL_UNRESOLVED_REFERENCE = "PSL_UNRESOLVED_REFERENCE";
 function typeReferenceNode(symbol) {
 	return symbol.node.typeAnnotation()?.name()?.syntax;
@@ -413,17 +774,33 @@ var ScopeStack = class {
 		this.#scopes.pop();
 	}
 };
-function walkEntities(symbolTable, stack, binder, visit) {
+const FIELD_MIXIN_KEYWORDS = /* @__PURE__ */ new Set(["model", "type"]);
+function hasFields(mixin) {
+	return FIELD_MIXIN_KEYWORDS.has(mixin.keyword);
+}
+function walkFieldOwners(symbolTable, stack, binder, visit) {
 	const { topLevel } = symbolTable;
-	for (const entity of Object.values(topLevel.models)) visit(entity);
-	for (const entity of Object.values(topLevel.compositeTypes)) visit(entity);
+	const visitAll = (records, namespace) => {
+		for (const entity of Object.values(records.models)) visit(entity, namespace);
+		for (const entity of Object.values(records.compositeTypes)) visit(entity, namespace);
+		for (const mixin of Object.values(records.mixins)) if (hasFields(mixin)) visit(mixin, namespace);
+	};
+	visitAll(topLevel);
 	for (const namespace of Object.values(topLevel.namespaces)) {
 		stack.push(binder.scopeAt(namespace.declarations[0].node.syntax));
-		for (const entity of Object.values(namespace.models)) visit(entity, namespace);
-		for (const entity of Object.values(namespace.compositeTypes)) visit(entity, namespace);
+		visitAll(namespace, namespace);
 		stack.pop();
 	}
 }
+function isWrittenIn(member, holder) {
+	return member.parent === holder.node.syntax;
+}
+function ownFields(owner) {
+	return Object.values(owner.fields).filter((field) => isWrittenIn(field.node.syntax, owner));
+}
+function ownAttributes(holder) {
+	return holder.attributes.filter((attribute) => isWrittenIn(attribute.node.syntax, holder));
+}
 function declarationResolution(entity, namespace) {
 	return entity.kind === "model" ? {
 		kind: "model",
@@ -490,6 +867,14 @@ function bind(options) {
 			symbol
 		});
 	}
+	for (const symbol of Object.values(symbolTable.topLevel.mixins)) {
+		declarations.set(symbol.node.syntax, symbol);
+		const declaredName = symbol.node.name()?.syntax;
+		if (declaredName !== void 0) references.set(declaredName, {
+			kind: "mixin",
+			symbol
+		});
+	}
 	for (const namespace of Object.values(symbolTable.topLevel.namespaces)) {
 		const scope = namespaceScope(namespace, document);
 		for (const declaration of namespace.declarations) {
@@ -510,12 +895,37 @@ function bind(options) {
 				namespace
 			});
 		}
-	}
-	walkEntities(symbolTable, stack, binder, (entity, namespace) => {
-		declarations.set(entity.node.syntax, entity);
-		const declaredName = entity.node.name()?.syntax;
-		if (declaredName !== void 0) references.set(declaredName, declarationResolution(entity, namespace));
-		for (const field of Object.values(entity.fields)) {
+		for (const symbol of Object.values(namespace.mixins)) {
+			declarations.set(symbol.node.syntax, symbol);
+			const declaredName = symbol.node.name()?.syntax;
+			if (declaredName !== void 0) references.set(declaredName, {
+				kind: "mixin",
+				symbol,
+				namespace
+			});
+		}
+	}
+	const included = /* @__PURE__ */ new Map();
+	const inclusionContext = {
+		sources,
+		references,
+		diagnostics,
+		included
+	};
+	bindInclusions(symbolTable.topLevel, document, inclusionContext);
+	for (const namespace of Object.values(symbolTable.topLevel.namespaces)) bindInclusions(namespace, binder.scopeAt(namespace.declarations[0].node.syntax), inclusionContext);
+	diagnostics.push(...placeMixinMembers({
+		symbolTable,
+		sources,
+		mixinOf: (inclusion) => included.get(inclusion.syntax)
+	}));
+	walkFieldOwners(symbolTable, stack, binder, (entity, namespace) => {
+		if (entity.kind !== "mixin") {
+			declarations.set(entity.node.syntax, entity);
+			const declaredName = entity.node.name()?.syntax;
+			if (declaredName !== void 0) references.set(declaredName, declarationResolution(entity, namespace));
+		}
+		for (const field of ownFields(entity)) {
 			declarations.set(field.node.syntax, field);
 			const fieldName = field.node.name()?.syntax;
 			if (fieldName !== void 0) references.set(fieldName, {
@@ -550,7 +960,7 @@ function bind(options) {
 			});
 		}
 	});
-	walkEntities(symbolTable, stack, binder, (entity) => {
+	walkFieldOwners(symbolTable, stack, binder, (entity) => {
 		const context = {
 			owner: entity,
 			scope: stack.current(),
@@ -560,17 +970,17 @@ function bind(options) {
 			sources,
 			describeUnsupportedAttribute
 		};
-		const specContext = entity.kind === "model" ? {
+		const specContext = entity.kind === "model" || entity.kind === "mixin" && entity.keyword === "model" ? {
 			symbols: symbolTable,
 			model: entity,
 			defaultFunctionRegistry,
 			dataTypes
 		} : void 0;
-		bindAttributes(entity, entity.attributes, attributeSpecs.model, (factory) => specContext === void 0 ? void 0 : factory(specContext), {
+		bindAttributes(entity, ownAttributes(entity), attributeSpecs.model, (factory) => specContext === void 0 ? void 0 : factory(specContext), {
 			...context,
 			field: void 0
 		});
-		for (const field of Object.values(entity.fields)) bindAttributes(field, field.attributes, attributeSpecs.field, (factory) => {
+		for (const field of ownFields(entity)) bindAttributes(field, field.attributes, attributeSpecs.field, (factory) => {
 			if (specContext === void 0) return void 0;
 			const node = typeReferenceNode(field);
 			const typeResolution = node === void 0 ? void 0 : references.get(node);
@@ -592,17 +1002,22 @@ function bind(options) {
 		references,
 		diagnostics
 	};
-	const bindBlocks = (blocks) => {
+	const bindBlocks = (records) => {
 		const context = {
 			...blockContext,
 			scope: stack.current()
 		};
-		for (const block of Object.values(blocks)) bindBlock(block, context);
-	};
-	bindBlocks(symbolTable.topLevel.blocks);
+		for (const block of Object.values(records.blocks)) bindBlock({
+			keyword: block.keyword,
+			entries: block.entries.filter((entry) => isWrittenIn(entry.syntax, block)),
+			attributes: ownAttributes(block)
+		}, context);
+		for (const mixin of Object.values(records.mixins)) if (!hasFields(mixin)) bindBlock(mixin, context);
+	};
+	bindBlocks(symbolTable.topLevel);
 	for (const namespace of Object.values(symbolTable.topLevel.namespaces)) {
 		stack.push(binder.scopeAt(namespace.declarations[0].node.syntax));
-		bindBlocks(namespace.blocks);
+		bindBlocks(namespace);
 		stack.pop();
 	}
 	return {
@@ -610,6 +1025,49 @@ function bind(options) {
 		diagnostics
 	};
 }
+function bindInclusions(records, scope, ctx) {
+	const report = (code, message, inclusion) => {
+		ctx.diagnostics.push({
+			code,
+			message,
+			...diagnosticSource(ctx.sources, inclusion.syntax).at()
+		});
+	};
+	for (const mixin of Object.values(records.mixins)) for (const inclusion of mixin.node.inclusions()) {
+		if (inclusion.name() === void 0) continue;
+		report(hasFields(mixin) ? "PSL_INVALID_MODEL_MEMBER" : "PSL_INVALID_EXTENSION_BLOCK_MEMBER", "A mixin cannot include another mixin", inclusion);
+	}
+	const holders = [
+		...Object.values(records.models),
+		...Object.values(records.compositeTypes),
+		...Object.values(records.blocks)
+	];
+	for (const holder of holders) {
+		const keyword = holder.kind === "model" ? "model" : holder.kind === "compositeType" ? "type" : holder.keyword;
+		for (const inclusion of holder.node.inclusions()) {
+			const reference = inclusion.name();
+			const outcome = resolveTypeReference(reference, scope, ctx.references);
+			if (reference === void 0 || outcome === void 0) continue;
+			const { resolution } = outcome;
+			if (resolution.kind !== "mixin") {
+				const name = printSyntax(reference.syntax);
+				ctx.references.set(reference.syntax, {
+					kind: "unresolved",
+					name
+				});
+				report(PSL_UNRESOLVED_REFERENCE, `Cannot find mixin "${name}"`, inclusion);
+				continue;
+			}
+			ctx.references.set(reference.syntax, resolution);
+			const mixin = resolution.symbol;
+			if (mixin.keyword === keyword) {
+				ctx.included.set(inclusion.syntax, mixin);
+				continue;
+			}
+			report(holder.kind === "block" ? "PSL_INVALID_EXTENSION_BLOCK_MEMBER" : "PSL_INVALID_MODEL_MEMBER", `Mixin "${mixin.name}" is for "${mixin.keyword}" blocks, not "${keyword}" blocks`, inclusion);
+		}
+	}
+}
 function bindBlock(block, ctx) {
 	const descriptor = findBlockDescriptor(ctx.pslBlockDescriptors, block.keyword);
 	if (descriptor === void 0) return;
@@ -1062,11 +1520,11 @@ function resolveTypeReference(reference, scope, references, describeUnresolved)
 		message: found.badQualifier,
 		name: found.qualifier
 	};
-	if (found.kind === "namespace" || found.kind === "contributedNamespace") {
+	if (found.kind === "namespace" || found.kind === "contributedNamespace" || found.kind === "mixin") {
 		const written = namespaceId === void 0 ? name : `${namespaceId}.${name}`;
 		return {
 			resolution: found,
-			message: `"${written}" is a namespace; a type reference must name a model, composite type, enum, or named type`,
+			message: `"${written}" is a ${found.kind === "mixin" ? "mixin" : "namespace"}; a type reference must name a model, composite type, enum, or named type`,
 			name: written
 		};
 	}
@@ -1092,278 +1550,6 @@ function describeQualifier(resolution) {
 function own(record, name) {
 	return Object.hasOwn(record, name) ? record[name] : void 0;
 }
-/**
-* Owns duplicate-declaration detection for all PSL scopes; downstream consumers
-* should consume first-wins symbols rather than re-emitting duplicate diagnostics.
-*/
-function buildSymbolTable(options) {
-	const { documents, sources } = options;
-	const diagnostics = [];
-	const namespaces = Object.create(null);
-	const namedTypes = Object.create(null);
-	const blocks = Object.create(null);
-	const models = Object.create(null);
-	const compositeTypes = Object.create(null);
-	const topLevelNames = /* @__PURE__ */ new Set();
-	for (const document of documents) {
-		const sourceFile = sources.sourceFileFor(document.syntax);
-		const claim = (taken, name) => {
-			const text = name?.name();
-			if (text === void 0) return void 0;
-			if (taken.has(text)) {
-				const range = nameRange(name, sources);
-				if (range) diagnostics.push({
-					code: "PSL_DUPLICATE_DECLARATION",
-					message: `Duplicate declaration of "${text}"`,
-					filename: sourceFile.filename,
-					range
-				});
-				return;
-			}
-			taken.add(text);
-			return text;
-		};
-		for (const declaration of document.declarations()) if (declaration instanceof ModelDeclarationAst) {
-			const name = claim(topLevelNames, declaration.name());
-			if (name !== void 0) models[name] = buildModel(name, declaration, sources, diagnostics);
-		} else if (declaration instanceof CompositeTypeDeclarationAst) {
-			const name = claim(topLevelNames, declaration.name());
-			if (name !== void 0) compositeTypes[name] = buildCompositeType(name, declaration, sources, diagnostics);
-		} else if (declaration instanceof GenericBlockDeclarationAst) {
-			const name = claim(topLevelNames, declaration.name());
-			if (name !== void 0) blocks[name] = buildBlock(name, declaration, sources);
-		} else if (declaration instanceof NamespaceDeclarationAst) {
-			const declaredName = declaration.name()?.name();
-			if (declaredName === void 0) continue;
-			let namespace = namespaces[declaredName];
-			if (namespace === void 0) {
-				const name = claim(topLevelNames, declaration.name());
-				if (name === void 0) continue;
-				namespace = {
-					kind: "namespace",
-					name,
-					declarations: [{
-						node: declaration,
-						span: nodePslSpan(declaration.syntax, sources)
-					}],
-					models: Object.create(null),
-					compositeTypes: Object.create(null),
-					blocks: Object.create(null)
-				};
-				namespaces[name] = namespace;
-			} else namespace.declarations.push({
-				node: declaration,
-				span: nodePslSpan(declaration.syntax, sources)
-			});
-			extendNamespace(namespace, declaration, diagnostics, sources);
-		} else if (declaration instanceof TypesBlockAst) for (const binding of declaration.declarations()) {
-			const name = claim(topLevelNames, binding.name());
-			if (name === void 0) continue;
-			const resolved = resolveNamedTypeBinding(binding, sources);
-			namedTypes[name] = {
-				kind: "namedType",
-				name,
-				node: binding,
-				span: nodePslSpan(binding.syntax, sources),
-				...resolved
-			};
-		}
-		reportMixins(document.declarations(), sources, diagnostics);
-	}
-	return {
-		symbolTable: { topLevel: {
-			namespaces,
-			namedTypes,
-			blocks,
-			models,
-			compositeTypes
-		} },
-		diagnostics
-	};
-}
-function buildModel(name, node, sources, diagnostics) {
-	return {
-		kind: "model",
-		name,
-		node,
-		span: nodePslSpan(node.syntax, sources),
-		fields: buildFields(name, node.fields(), sources, diagnostics),
-		attributes: readResolvedAttributes(node.attributes(), sources)
-	};
-}
-function buildCompositeType(name, node, sources, diagnostics) {
-	return {
-		kind: "compositeType",
-		name,
-		node,
-		span: nodePslSpan(node.syntax, sources),
-		fields: buildFields(name, node.fields(), sources, diagnostics),
-		attributes: readResolvedAttributes(node.attributes(), sources)
-	};
-}
-function buildBlock(name, node, sources) {
-	return {
-		kind: "block",
-		name,
-		keyword: node.keyword()?.text ?? "",
-		node,
-		span: nodePslSpan(node.syntax, sources),
-		entries: Array.from(node.entries()),
-		attributes: readResolvedAttributes(node.attributes(), sources)
-	};
-}
-function extendNamespace(namespace, node, diagnostics, sources) {
-	const { models, compositeTypes, blocks } = namespace;
-	for (const member of node.declarations()) {
-		if (member instanceof MixinDeclarationAst) continue;
-		const memberName = member.name()?.name();
-		if (memberName === void 0) continue;
-		if (Object.hasOwn(models, memberName) || Object.hasOwn(compositeTypes, memberName) || Object.hasOwn(blocks, memberName)) {
-			const range = nameRange(member.name(), sources);
-			if (range) diagnostics.push({
-				code: "PSL_DUPLICATE_DECLARATION",
-				message: `Duplicate declaration of "${memberName}"`,
-				filename: sources.sourceFileFor(member.syntax).filename,
-				range
-			});
-			continue;
-		}
-		if (member instanceof ModelDeclarationAst) models[memberName] = buildModel(memberName, member, sources, diagnostics);
-		else if (member instanceof CompositeTypeDeclarationAst) compositeTypes[memberName] = buildCompositeType(memberName, member, sources, diagnostics);
-		else if (member instanceof GenericBlockDeclarationAst) blocks[memberName] = buildBlock(memberName, member, sources);
-	}
-}
-const MIXINS_NOT_SUPPORTED = "Mixins are not supported yet";
-function reportMixins(declarations, sources, diagnostics) {
-	for (const declaration of declarations) {
-		if (declaration instanceof NamespaceDeclarationAst) {
-			reportMixins(declaration.declarations(), sources, diagnostics);
-			continue;
-		}
-		if (declaration instanceof TypesBlockAst) continue;
-		if (declaration instanceof MixinDeclarationAst) {
-			const range = nameRange(declaration.name(), sources) ?? mixinKeywordRange(declaration, sources);
-			if (range !== void 0) diagnostics.push({
-				code: "PSL_INVALID_DECLARATION",
-				message: MIXINS_NOT_SUPPORTED,
-				filename: sources.sourceFileFor(declaration.syntax).filename,
-				range
-			});
-		}
-		for (const inclusion of declaration.inclusions()) reportInclusion(inclusion, sources, diagnostics);
-	}
-}
-function reportInclusion(inclusion, sources, diagnostics) {
-	if (inclusion.name() === void 0) return;
-	diagnostics.push({
-		code: "PSL_INVALID_DECLARATION",
-		message: MIXINS_NOT_SUPPORTED,
-		filename: sources.sourceFileFor(inclusion.syntax).filename,
-		range: nodeRange(inclusion.syntax, sources)
-	});
-}
-function mixinKeywordRange(declaration, sources) {
-	const token = declaration.mixinKeyword();
-	if (token === void 0) return void 0;
-	const sourceFile = sources.sourceFileFor(declaration.syntax);
-	return {
-		start: sourceFile.positionAt(token.offset),
-		end: sourceFile.positionAt(token.offset + token.text.length)
-	};
-}
-function buildFields(ownerName, fields, sources, diagnostics) {
-	const result = Object.create(null);
-	for (const field of fields) {
-		const nameNode = field.name();
-		const name = nameNode?.name();
-		if (name === void 0) continue;
-		if (Object.hasOwn(result, name)) {
-			const range = nameRange(nameNode, sources);
-			if (range) diagnostics.push({
-				code: "PSL_DUPLICATE_DECLARATION",
-				message: `Duplicate declaration of "${name}"`,
-				filename: sources.sourceFileFor(field.syntax).filename,
-				range
-			});
-			continue;
-		}
-		result[name] = buildField(ownerName, name, field, sources, diagnostics);
-	}
-	return result;
-}
-function buildField(ownerName, name, node, sources, diagnostics) {
-	const attributes = readResolvedAttributes(node.attributes(), sources);
-	const span = nodePslSpan(node.syntax, sources);
-	const annotation = node.typeAnnotation();
-	const typeName = annotation?.name();
-	if (typeName?.isOverQualified()) {
-		const path = typeName.path();
-		diagnostics.push({
-			code: "PSL_INVALID_QUALIFIED_TYPE",
-			message: `Field "${ownerName}.${name}" has an invalid qualified type "${path.join(".")}"; use at most one namespace qualifier (e.g. "ns.TypeName")`,
-			filename: sources.sourceFileFor(typeName.syntax).filename,
-			range: nodeRange(typeName.syntax, sources)
-		});
-		return {
-			kind: "field",
-			name,
-			node,
-			span,
-			typeName: path[path.length - 1] ?? "",
-			optional: false,
-			list: false,
-			elementOptional: false,
-			malformedType: true,
-			attributes
-		};
-	}
-	const typeConstructor = annotation?.isConstructor() ? readResolvedConstructorCall(annotation, sources) : void 0;
-	const typeNamespaceId = typeName?.namespace()?.name();
-	const typeContractSpaceId = typeName?.space()?.name();
-	return {
-		kind: "field",
-		name,
-		node,
-		span,
-		typeName: typeName?.identifier()?.name() ?? "",
-		...typeNamespaceId !== void 0 ? { typeNamespaceId } : {},
-		...typeContractSpaceId !== void 0 ? { typeContractSpaceId } : {},
-		optional: annotation?.isOptional() ?? false,
-		list: annotation?.isList() ?? false,
-		elementOptional: annotation?.isElementOptional() ?? false,
-		...typeConstructor !== void 0 ? { typeConstructor } : {},
-		attributes
-	};
-}
-function resolveNamedTypeBinding(node, sources) {
-	const annotation = node.typeAnnotation();
-	const isConstructor = annotation?.isConstructor() ?? false;
-	const baseType = annotation?.name()?.identifier()?.name();
-	const typeConstructor = readResolvedConstructorCall(annotation, sources);
-	return {
-		isConstructor,
-		...!isConstructor && baseType !== void 0 ? { baseType } : {},
-		...typeConstructor !== void 0 ? { typeConstructor } : {},
-		attributes: readResolvedAttributes(node.attributes(), sources)
-	};
-}
-function nameRange(name, sources) {
-	if (name === void 0) return void 0;
-	const sourceFile = sources.sourceFileFor(name.syntax);
-	for (const token of name.syntax.tokens()) if (token.kind === "Ident") return {
-		start: sourceFile.positionAt(token.offset),
-		end: sourceFile.positionAt(token.offset + token.text.length)
-	};
-}
-function nodeRange(node, sources) {
-	const sourceFile = sources.sourceFileFor(node);
-	const start = node.offset;
-	const end = start + node.green.textLength;
-	return {
-		start: sourceFile.positionAt(start),
-		end: sourceFile.positionAt(end)
-	};
-}
 //#endregion
 //#region ../../../1-framework/2-authoring/psl-parser/dist/index.mjs
 function getPositionalArgument(attribute, index = 0) {