@prisma-next/psl-parser 0.3.0-dev.99 → 0.4.0-dev.1

package/README.md

@@ -6,7 +6,7 @@ Reusable PSL parser for Prisma Next.
 
 `@prisma-next/psl-parser` parses Prisma Schema Language (PSL) source into a deterministic AST with source spans and stable machine-readable diagnostics. It is intentionally parser-only: normalization to contract IR and emit integration happen in downstream milestones/packages.
 
-In the provider-based authoring model, PSL providers call this parser and then return `Result<ContractIR, ContractSourceDiagnostics>` to the framework emit pipeline.
+In the provider-based authoring model, PSL providers call this parser and then return `Result<Contract, ContractSourceDiagnostics>` to the framework emit pipeline.
 
 ## Responsibilities
 
@@ -22,7 +22,7 @@ In the provider-based authoring model, PSL providers call this parser and then r
 
 `@prisma-next/psl-parser` parses attributes **generically**:
 
-- Attributes may be **non-namespaced** (for example `@id`) or **namespaced** (for example `@pgvector.column`).
+- Attributes may be **non-namespaced** (for example `@id`) or **namespaced** (for example `@vendor.option`).
 - Attributes may include an **optional argument list**.
 - Arguments are parsed into positional/named entries with preserved raw values and source spans.
 - The parser owns **syntax + structure + spans**, not semantics.
@@ -73,4 +73,3 @@ flowchart LR
 - `docs/Architecture Overview.md`
 - `docs/architecture docs/subsystems/2. Contract Emitter & Types.md`
 - `docs/architecture docs/adrs/ADR 163 - Provider-invoked source interpretation packages.md`
-

package/dist/index.d.mts

@@ -1,3 +1,9 @@
-import { S as PslPosition, T as PslTypesBlock, _ as PslFieldAttribute, a as PslAttributeNamedArgument, b as PslModelAttribute, c as PslDefaultFunctionValue, d as PslDiagnostic, f as PslDiagnosticCode, g as PslField, h as PslEnumValue, i as PslAttributeArgument, l as PslDefaultLiteralValue, m as PslEnum, n as ParsePslDocumentResult, o as PslAttributePositionalArgument, p as PslDocumentAst, r as PslAttribute, s as PslAttributeTarget, t as ParsePslDocumentInput, u as PslDefaultValue, w as PslSpan, x as PslNamedTypeDeclaration, y as PslModel } from "./types-CyfspkvF.mjs";
-import { t as parsePslDocument } from "./parser-BgdIJNqs.mjs";
-export { type ParsePslDocumentInput, type ParsePslDocumentResult, type PslAttribute, type PslAttributeArgument, type PslAttributeNamedArgument, type PslAttributePositionalArgument, type PslAttributeTarget, type PslDefaultFunctionValue, type PslDefaultLiteralValue, type PslDefaultValue, type PslDiagnostic, type PslDiagnosticCode, type PslDocumentAst, type PslEnum, type PslEnumValue, type PslField, type PslFieldAttribute, type PslModel, type PslModelAttribute, type PslNamedTypeDeclaration, type PslPosition, type PslSpan, type PslTypesBlock, parsePslDocument };
+import { C as PslPosition, D as PslTypesBlock, E as PslTypeConstructorCall, S as PslNamedTypeDeclaration, T as PslSpan, _ as PslField, a as PslAttributeNamedArgument, b as PslModel, c as PslCompositeType, d as PslDefaultValue, f as PslDiagnostic, g as PslEnumValue, h as PslEnum, i as PslAttributeArgument, l as PslDefaultFunctionValue, m as PslDocumentAst, n as ParsePslDocumentResult, o as PslAttributePositionalArgument, p as PslDiagnosticCode, r as PslAttribute, s as PslAttributeTarget, t as ParsePslDocumentInput, u as PslDefaultLiteralValue, v as PslFieldAttribute, x as PslModelAttribute } from "./types-CYb3hCxS.mjs";
+import { t as parsePslDocument } from "./parser-B_U8b1dE.mjs";
+
+//#region src/attribute-helpers.d.ts
+declare function getPositionalArgument(attribute: PslAttribute, index?: number): string | undefined;
+declare function parseQuotedStringLiteral(value: string): string | undefined;
+//#endregion
+export { type ParsePslDocumentInput, type ParsePslDocumentResult, type PslAttribute, type PslAttributeArgument, type PslAttributeNamedArgument, type PslAttributePositionalArgument, type PslAttributeTarget, type PslCompositeType, type PslDefaultFunctionValue, type PslDefaultLiteralValue, type PslDefaultValue, type PslDiagnostic, type PslDiagnosticCode, type PslDocumentAst, type PslEnum, type PslEnumValue, type PslField, type PslFieldAttribute, type PslModel, type PslModelAttribute, type PslNamedTypeDeclaration, type PslPosition, type PslSpan, type PslTypeConstructorCall, type PslTypesBlock, getPositionalArgument, parsePslDocument, parseQuotedStringLiteral };
+//# sourceMappingURL=index.d.mts.map

package/dist/index.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.mts","names":[],"sources":["../src/attribute-helpers.ts"],"sourcesContent":[],"mappings":";;;;iBAEgB,qBAAA,YAAiC;iBAKjC,wBAAA"}

package/dist/index.mjs

@@ -1,3 +1,15 @@
-import { t as parsePslDocument } from "./parser-Br4vqzd-.mjs";
+import { t as parsePslDocument } from "./parser-Cr64fw1E.mjs";
 
-export { parsePslDocument };
+//#region src/attribute-helpers.ts
+function getPositionalArgument(attribute, index = 0) {
+	return attribute.args.filter((arg) => arg.kind === "positional")[index]?.value;
+}
+function parseQuotedStringLiteral(value) {
+	const match = value.trim().match(/^(['"])(.*)\1$/);
+	if (!match) return void 0;
+	return match[2] ?? "";
+}
+
+//#endregion
+export { getPositionalArgument, parsePslDocument, parseQuotedStringLiteral };
+//# sourceMappingURL=index.mjs.map

package/dist/index.mjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.mjs","names":[],"sources":["../src/attribute-helpers.ts"],"sourcesContent":["import type { PslAttribute } from './types';\n\nexport function getPositionalArgument(attribute: PslAttribute, index = 0): string | undefined {\n  const entries = attribute.args.filter((arg) => arg.kind === 'positional');\n  return entries[index]?.value;\n}\n\nexport function parseQuotedStringLiteral(value: string): string | undefined {\n  const trimmed = value.trim();\n  const match = trimmed.match(/^(['\"])(.*)\\1$/);\n  if (!match) return undefined;\n  return match[2] ?? '';\n}\n"],"mappings":";;;AAEA,SAAgB,sBAAsB,WAAyB,QAAQ,GAAuB;AAE5F,QADgB,UAAU,KAAK,QAAQ,QAAQ,IAAI,SAAS,aAAa,CAC1D,QAAQ;;AAGzB,SAAgB,yBAAyB,OAAmC;CAE1E,MAAM,QADU,MAAM,MAAM,CACN,MAAM,iBAAiB;AAC7C,KAAI,CAAC,MAAO,QAAO;AACnB,QAAO,MAAM,MAAM"}

package/dist/{parser-BgdIJNqs.d.mts → parser-B_U8b1dE.d.mts}

@@ -1,7 +1,7 @@
-import { n as ParsePslDocumentResult, t as ParsePslDocumentInput } from "./types-CyfspkvF.mjs";
+import { n as ParsePslDocumentResult, t as ParsePslDocumentInput } from "./types-CYb3hCxS.mjs";
 
 //#region src/parser.d.ts
 declare function parsePslDocument(input: ParsePslDocumentInput): ParsePslDocumentResult;
 //#endregion
 export { parsePslDocument as t };
-//# sourceMappingURL=parser-BgdIJNqs.d.mts.map
+//# sourceMappingURL=parser-B_U8b1dE.d.mts.map

package/dist/parser-B_U8b1dE.d.mts.map

@@ -0,0 +1 @@
+{"version":3,"file":"parser-B_U8b1dE.d.mts","names":[],"sources":["../src/parser.ts"],"sourcesContent":[],"mappings":";;;iBAkDgB,gBAAA,QAAwB,wBAAwB"}

package/dist/{parser-Br4vqzd-.mjs → parser-Cr64fw1E.mjs}

@@ -26,6 +26,7 @@ function parsePslDocument(input) {
 	};
 	const models = [];
 	const enums = [];
+	const compositeTypes = [];
 	let typesBlock;
 	let lineIndex = 0;
 	while (lineIndex < lines.length) {
@@ -58,6 +59,18 @@ function parsePslDocument(input) {
 			lineIndex = bounds.endLine + 1;
 			continue;
 		}
+		const compositeTypeMatch = line.match(/^type\s+([A-Za-z_]\w*)\s*\{$/);
+		if (compositeTypeMatch) {
+			const bounds = findBlockBounds(context, lineIndex);
+			const name = compositeTypeMatch[1] ?? "";
+			if (name.length === 0) {
+				lineIndex = bounds.endLine + 1;
+				continue;
+			}
+			compositeTypes.push(parseCompositeTypeBlock(context, name, bounds));
+			lineIndex = bounds.endLine + 1;
+			continue;
+		}
 		if (/^types\s*\{$/.test(line)) {
 			const bounds = findBlockBounds(context, lineIndex);
 			typesBlock = parseTypesBlock(context, bounds);
@@ -83,6 +96,7 @@ function parsePslDocument(input) {
 	const namedTypeNames = new Set((typesBlock?.declarations ?? []).map((declaration) => declaration.name));
 	const modelNames = new Set(models.map((model) => model.name));
 	const enumNames = new Set(enums.map((enumBlock) => enumBlock.name));
+	const compositeTypeNames = new Set(compositeTypes.map((ct) => ct.name));
 	for (const declaration of typesBlock?.declarations ?? []) {
 		if (SCALAR_TYPES.has(declaration.name)) {
 			pushDiagnostic(context, {
@@ -110,7 +124,7 @@ function parsePslDocument(input) {
 		...model,
 		fields: model.fields.map((field) => {
 			if (!namedTypeNames.has(field.typeName)) return field;
-			if (field.attributes.some((attribute) => attribute.name === "relation") || modelNames.has(field.typeName) || enumNames.has(field.typeName) || SCALAR_TYPES.has(field.typeName)) return field;
+			if (field.attributes.some((attribute) => attribute.name === "relation") || modelNames.has(field.typeName) || enumNames.has(field.typeName) || compositeTypeNames.has(field.typeName) || SCALAR_TYPES.has(field.typeName)) return field;
 			return {
 				...field,
 				typeRef: field.typeName
@@ -123,6 +137,7 @@ function parsePslDocument(input) {
 			sourceId: input.sourceId,
 			models: normalizedModels,
 			enums,
+			compositeTypes,
 			...ifDefined("types", typesBlock),
 			span: {
 				start: createPosition(context, 0, 0),
@@ -155,11 +170,39 @@ function parseModelBlock(context, name, bounds) {
 		span: createLineRangeSpan(context, bounds.startLine, bounds.endLine)
 	};
 }
+function parseCompositeTypeBlock(context, name, bounds) {
+	const fields = [];
+	const attributes = [];
+	for (let lineIndex = bounds.startLine + 1; lineIndex < bounds.endLine; lineIndex += 1) {
+		const line = stripInlineComment(context.lines[lineIndex] ?? "").trim();
+		if (line.length === 0) continue;
+		if (line.startsWith("@@")) {
+			const attribute = parseModelAttribute(context, line, lineIndex);
+			if (attribute) attributes.push(attribute);
+			continue;
+		}
+		const field = parseField(context, line, lineIndex);
+		if (field) fields.push(field);
+	}
+	return {
+		kind: "compositeType",
+		name,
+		fields,
+		attributes,
+		span: createLineRangeSpan(context, bounds.startLine, bounds.endLine)
+	};
+}
 function parseEnumBlock(context, name, bounds) {
 	const values = [];
+	const attributes = [];
 	for (let lineIndex = bounds.startLine + 1; lineIndex < bounds.endLine; lineIndex += 1) {
 		const line = stripInlineComment(context.lines[lineIndex] ?? "").trim();
 		if (line.length === 0) continue;
+		if (line.startsWith("@@")) {
+			const attribute = parseEnumAttribute(context, line, lineIndex);
+			if (attribute) attributes.push(attribute);
+			continue;
+		}
 		const valueMatch = line.match(/^([A-Za-z_]\w*)$/);
 		if (!valueMatch) {
 			pushDiagnostic(context, {
@@ -179,6 +222,7 @@ function parseEnumBlock(context, name, bounds) {
 		kind: "enum",
 		name,
 		values,
+		attributes,
 		span: createLineRangeSpan(context, bounds.startLine, bounds.endLine)
 	};
 }
@@ -188,7 +232,7 @@ function parseTypesBlock(context, bounds) {
 		const raw = context.lines[lineIndex] ?? "";
 		const line = stripInlineComment(raw).trim();
 		if (line.length === 0) continue;
-		const declarationMatch = line.match(/^([A-Za-z_]\w*)\s*=\s*([A-Za-z_]\w*)(.*)$/);
+		const declarationMatch = line.match(/^([A-Za-z_]\w*)\s*=\s*(.+)$/);
 		if (!declarationMatch) {
 			pushDiagnostic(context, {
 				code: "PSL_INVALID_TYPES_MEMBER",
@@ -198,13 +242,23 @@ function parseTypesBlock(context, bounds) {
 			continue;
 		}
 		const declarationName = declarationMatch[1] ?? "";
-		const baseType = declarationMatch[2] ?? "";
-		const attributePart = declarationMatch[3] ?? "";
 		const trimmedStartColumn = firstNonWhitespaceColumn(raw);
-		const attributeOffset = line.length - attributePart.length;
-		const attributeSource = attributePart.trimStart();
-		const leadingAttributeWhitespace = attributePart.length - attributeSource.length;
-		const attributeParse = extractAttributeTokensWithSpans(context, lineIndex, attributeSource, trimmedStartColumn + attributeOffset + leadingAttributeWhitespace);
+		const declarationValue = (declarationMatch[2] ?? "").trim();
+		const valueOffset = line.indexOf(declarationValue);
+		const declarationValueColumn = trimmedStartColumn + Math.max(valueOffset, 0);
+		const typeAndAttributeSplit = splitTypeAndAttributes(declarationValue);
+		const typeSource = typeAndAttributeSplit.typeSource.trim();
+		const attributeSource = typeAndAttributeSplit.attributeSource.trimStart();
+		const leadingAttributeWhitespace = typeAndAttributeSplit.attributeSource.length - attributeSource.length;
+		const typeConstructor = parseTypeConstructorCall(context, {
+			declarationValue: typeSource,
+			lineIndex,
+			startColumn: declarationValueColumn,
+			invalidCode: "PSL_INVALID_TYPES_MEMBER",
+			invalidMessage: (value) => `Invalid types declaration "${value}"`
+		});
+		if (typeConstructor === "malformed") continue;
+		const attributeParse = extractAttributeTokensWithSpans(context, lineIndex, attributeSource, declarationValueColumn + typeAndAttributeSplit.attributeOffset + leadingAttributeWhitespace);
 		if (!attributeParse.ok) continue;
 		const attributes = attributeParse.tokens.map((token) => parseAttributeToken(context, {
 			token: token.text,
@@ -212,6 +266,26 @@ function parseTypesBlock(context, bounds) {
 			lineIndex,
 			span: token.span
 		})).filter((attribute) => Boolean(attribute));
+		if (typeConstructor) {
+			declarations.push({
+				kind: "namedType",
+				name: declarationName,
+				typeConstructor,
+				attributes,
+				span: createTrimmedLineSpan(context, lineIndex)
+			});
+			continue;
+		}
+		const baseTypeMatch = typeSource.match(/^([A-Za-z_]\w*)$/);
+		if (!baseTypeMatch) {
+			pushDiagnostic(context, {
+				code: "PSL_INVALID_TYPES_MEMBER",
+				message: `Invalid types declaration "${line}"`,
+				span: createTrimmedLineSpan(context, lineIndex)
+			});
+			continue;
+		}
+		const baseType = baseTypeMatch[1] ?? "";
 		declarations.push({
 			kind: "namedType",
 			name: declarationName,
@@ -226,6 +300,39 @@ function parseTypesBlock(context, bounds) {
 		span: createLineRangeSpan(context, bounds.startLine, bounds.endLine)
 	};
 }
+function parseTypeConstructorCall(context, input) {
+	const value = input.declarationValue.trim();
+	const constructorMatch = value.match(/^([A-Za-z_][A-Za-z0-9_-]*(?:\.[A-Za-z_][A-Za-z0-9_-]*)*)\s*\(/);
+	if (!constructorMatch) return;
+	const openParen = value.indexOf("(");
+	const closeParen = value.lastIndexOf(")");
+	if (closeParen !== value.length - 1) {
+		pushDiagnostic(context, {
+			code: input.invalidCode,
+			message: input.invalidMessage(value),
+			span: createInlineSpan(context, input.lineIndex, input.startColumn, input.startColumn + value.length)
+		});
+		return "malformed";
+	}
+	const constructorPath = constructorMatch[1] ?? "";
+	const args = parseArgumentList(context, {
+		argsRaw: value.slice(openParen + 1, closeParen),
+		argsOffset: input.startColumn + openParen + 1,
+		lineIndex: input.lineIndex,
+		token: value,
+		span: createInlineSpan(context, input.lineIndex, input.startColumn, input.startColumn + value.length),
+		invalidCode: input.invalidCode,
+		invalidEmptyArgumentMessage: `Invalid empty argument in type constructor "${value}"`,
+		invalidNamedArgumentMessage: (part) => `Invalid named argument syntax "${part}" in type constructor "${value}"`
+	});
+	if (!args) return "malformed";
+	return {
+		kind: "typeConstructor",
+		path: constructorPath.split("."),
+		args,
+		span: createInlineSpan(context, input.lineIndex, input.startColumn, input.startColumn + value.length)
+	};
+}
 function parseModelAttribute(context, line, lineIndex) {
 	const tokenParse = extractAttributeTokensWithSpans(context, lineIndex, line, firstNonWhitespaceColumn(context.lines[lineIndex] ?? ""));
 	if (!tokenParse.ok || tokenParse.tokens.length !== 1) {
@@ -245,8 +352,37 @@ function parseModelAttribute(context, line, lineIndex) {
 		span: token.span
 	});
 }
+function parseEnumAttribute(context, line, lineIndex) {
+	const tokenParse = extractAttributeTokensWithSpans(context, lineIndex, line, firstNonWhitespaceColumn(context.lines[lineIndex] ?? ""));
+	if (!tokenParse.ok || tokenParse.tokens.length !== 1) {
+		pushDiagnostic(context, {
+			code: "PSL_INVALID_ENUM_MEMBER",
+			message: `Invalid enum value declaration "${line}"`,
+			span: createTrimmedLineSpan(context, lineIndex)
+		});
+		return;
+	}
+	const token = tokenParse.tokens[0];
+	if (!token) return;
+	const parsed = parseAttributeToken(context, {
+		token: token.text,
+		target: "enum",
+		lineIndex,
+		span: token.span
+	});
+	if (!parsed) return;
+	if (parsed.name !== "map") {
+		pushDiagnostic(context, {
+			code: "PSL_INVALID_ENUM_MEMBER",
+			message: `Invalid enum value declaration "${line}"`,
+			span: createTrimmedLineSpan(context, lineIndex)
+		});
+		return;
+	}
+	return parsed;
+}
 function parseField(context, line, lineIndex) {
-	const fieldMatch = line.match(/^([A-Za-z_]\w*)\s+([A-Za-z_]\w*(?:\[\])?)(\?)?(.*)$/);
+	const fieldMatch = line.match(/^([A-Za-z_]\w*)(\s+)(.+)$/);
 	if (!fieldMatch) {
 		pushDiagnostic(context, {
 			code: "PSL_INVALID_MODEL_MEMBER",
@@ -256,22 +392,42 @@ function parseField(context, line, lineIndex) {
 		return;
 	}
 	const fieldName = fieldMatch[1] ?? "";
-	const rawTypeToken = fieldMatch[2] ?? "";
-	const optionalMarker = fieldMatch[3] ?? "";
-	const attributePart = fieldMatch[4] ?? "";
-	const list = rawTypeToken.endsWith("[]");
-	const typeName = list ? rawTypeToken.slice(0, -2) : rawTypeToken;
-	const optional = optionalMarker === "?";
-	const attributes = [];
+	const separator = fieldMatch[2] ?? "";
+	const typeAndAttributeSplit = splitTypeAndAttributes(fieldMatch[3] ?? "");
+	const rawTypeSource = typeAndAttributeSplit.typeSource.trim();
+	const attributePart = typeAndAttributeSplit.attributeSource;
+	const optional = rawTypeSource.endsWith("?");
+	const typeSourceWithoutOptional = optional ? rawTypeSource.slice(0, -1).trimEnd() : rawTypeSource;
+	const list = typeSourceWithoutOptional.endsWith("[]");
+	const baseTypeSource = list ? typeSourceWithoutOptional.slice(0, -2).trimEnd() : typeSourceWithoutOptional;
 	const trimmedStartColumn = firstNonWhitespaceColumn(context.lines[lineIndex] ?? "");
-	const attributeOffset = line.length - attributePart.length;
+	const typeConstructor = parseTypeConstructorCall(context, {
+		declarationValue: baseTypeSource,
+		lineIndex,
+		startColumn: trimmedStartColumn + fieldName.length + separator.length,
+		invalidCode: "PSL_INVALID_MODEL_MEMBER",
+		invalidMessage: (value) => `Invalid field type constructor "${value}"`
+	});
+	if (typeConstructor === "malformed") return;
+	const simpleTypeMatch = baseTypeSource.match(/^([A-Za-z_]\w*)$/);
+	const typeName = typeConstructor?.path.join(".") ?? simpleTypeMatch?.[1];
+	if (!typeName) {
+		pushDiagnostic(context, {
+			code: "PSL_INVALID_MODEL_MEMBER",
+			message: `Invalid model member declaration "${line}"`,
+			span: createTrimmedLineSpan(context, lineIndex)
+		});
+		return;
+	}
+	const attributes = [];
 	const attributeSource = attributePart.trimStart();
 	const leadingAttributeWhitespace = attributePart.length - attributeSource.length;
-	const tokenParse = extractAttributeTokensWithSpans(context, lineIndex, attributeSource, trimmedStartColumn + attributeOffset + leadingAttributeWhitespace);
+	const tokenParse = extractAttributeTokensWithSpans(context, lineIndex, attributeSource, trimmedStartColumn + fieldName.length + separator.length + typeAndAttributeSplit.attributeOffset + leadingAttributeWhitespace);
 	if (!tokenParse.ok) return {
 		kind: "field",
 		name: fieldName,
 		typeName,
+		...ifDefined("typeConstructor", typeConstructor),
 		optional,
 		list,
 		attributes,
@@ -290,23 +446,81 @@ function parseField(context, line, lineIndex) {
 		kind: "field",
 		name: fieldName,
 		typeName,
+		...ifDefined("typeConstructor", typeConstructor),
 		optional,
 		list,
 		attributes,
 		span: createTrimmedLineSpan(context, lineIndex)
 	};
 }
+function isQuoteEscaped(value, quoteIndex) {
+	let backslashCount = 0;
+	for (let index = quoteIndex - 1; index >= 0 && value[index] === "\\"; index -= 1) backslashCount += 1;
+	return backslashCount % 2 === 1;
+}
+function splitTypeAndAttributes(value) {
+	let depthParen = 0;
+	let depthBracket = 0;
+	let depthBrace = 0;
+	let quote = null;
+	for (let index = 0; index < value.length; index += 1) {
+		const character = value[index] ?? "";
+		if (quote) {
+			if (character === quote && !isQuoteEscaped(value, index)) quote = null;
+			continue;
+		}
+		if (character === "\"" || character === "'") {
+			quote = character;
+			continue;
+		}
+		if (character === "(") {
+			depthParen += 1;
+			continue;
+		}
+		if (character === ")") {
+			depthParen = Math.max(0, depthParen - 1);
+			continue;
+		}
+		if (character === "[") {
+			depthBracket += 1;
+			continue;
+		}
+		if (character === "]") {
+			depthBracket = Math.max(0, depthBracket - 1);
+			continue;
+		}
+		if (character === "{") {
+			depthBrace += 1;
+			continue;
+		}
+		if (character === "}") {
+			depthBrace = Math.max(0, depthBrace - 1);
+			continue;
+		}
+		if (character === "@" && depthParen === 0 && depthBracket === 0 && depthBrace === 0) return {
+			typeSource: value.slice(0, index).trimEnd(),
+			attributeSource: value.slice(index),
+			attributeOffset: index
+		};
+	}
+	return {
+		typeSource: value.trimEnd(),
+		attributeSource: "",
+		attributeOffset: value.length
+	};
+}
 function parseAttributeToken(context, input) {
-	const expectsModelPrefix = input.target === "model";
-	if (expectsModelPrefix && !input.token.startsWith("@@")) {
+	const expectsBlockPrefix = input.target === "model" || input.target === "enum";
+	const targetLabel = input.target === "enum" ? "Enum" : "Model";
+	if (expectsBlockPrefix && !input.token.startsWith("@@")) {
 		pushDiagnostic(context, {
 			code: "PSL_INVALID_ATTRIBUTE_SYNTAX",
-			message: `Model attribute "${input.token}" must use @@ prefix`,
+			message: `${targetLabel} attribute "${input.token}" must use @@ prefix`,
 			span: input.span
 		});
 		return;
 	}
-	if (!expectsModelPrefix && !input.token.startsWith("@")) {
+	if (!expectsBlockPrefix && !input.token.startsWith("@")) {
 		pushDiagnostic(context, {
 			code: "PSL_INVALID_ATTRIBUTE_SYNTAX",
 			message: `Attribute "${input.token}" must use @ prefix`,
@@ -314,7 +528,7 @@ function parseAttributeToken(context, input) {
 		});
 		return;
 	}
-	if (!expectsModelPrefix && input.token.startsWith("@@")) {
+	if (!expectsBlockPrefix && input.token.startsWith("@@")) {
 		pushDiagnostic(context, {
 			code: "PSL_INVALID_ATTRIBUTE_SYNTAX",
 			message: `Attribute "${input.token}" is not valid in ${input.target} context`,
@@ -322,7 +536,7 @@ function parseAttributeToken(context, input) {
 		});
 		return;
 	}
-	const rawBody = expectsModelPrefix ? input.token.slice(2) : input.token.slice(1);
+	const rawBody = expectsBlockPrefix ? input.token.slice(2) : input.token.slice(1);
 	const openParen = rawBody.indexOf("(");
 	const closeParen = rawBody.lastIndexOf(")");
 	const hasArgs = openParen >= 0 || closeParen >= 0;
@@ -353,12 +567,15 @@ function parseAttributeToken(context, input) {
 			});
 			return;
 		}
-		const parsedArgs = parseAttributeArguments(context, {
+		const parsedArgs = parseArgumentList(context, {
 			argsRaw: rawBody.slice(openParen + 1, closeParen),
-			argsOffset: input.span.start.column - 1 + (expectsModelPrefix ? 2 : 1) + openParen + 1,
+			argsOffset: input.span.start.column - 1 + (expectsBlockPrefix ? 2 : 1) + openParen + 1,
 			lineIndex: input.lineIndex,
 			token: input.token,
-			span: input.span
+			span: input.span,
+			invalidCode: "PSL_INVALID_ATTRIBUTE_SYNTAX",
+			invalidEmptyArgumentMessage: `Invalid empty argument in attribute "${input.token}"`,
+			invalidNamedArgumentMessage: (part) => `Invalid named argument syntax "${part}"`
 		});
 		if (!parsedArgs) return;
 		args = parsedArgs;
@@ -371,7 +588,7 @@ function parseAttributeToken(context, input) {
 		span: input.span
 	};
 }
-function parseAttributeArguments(context, input) {
+function parseArgumentList(context, input) {
 	if (input.argsRaw.trim().length === 0) return [];
 	const parts = splitTopLevelSegments(input.argsRaw, ",");
 	const args = [];
@@ -380,8 +597,8 @@ function parseAttributeArguments(context, input) {
 		const trimmedPart = original.trim();
 		if (trimmedPart.length === 0) {
 			pushDiagnostic(context, {
-				code: "PSL_INVALID_ATTRIBUTE_SYNTAX",
-				message: `Invalid empty argument in attribute "${input.token}"`,
+				code: input.invalidCode,
+				message: input.invalidEmptyArgumentMessage,
 				span: input.span
 			});
 			return;
@@ -395,8 +612,8 @@ function parseAttributeArguments(context, input) {
 			const first = namedSplit[0];
 			if (!first) {
 				pushDiagnostic(context, {
-					code: "PSL_INVALID_ATTRIBUTE_SYNTAX",
-					message: `Invalid named argument syntax "${trimmedPart}"`,
+					code: input.invalidCode,
+					message: input.invalidNamedArgumentMessage(trimmedPart),
 					span: partSpan
 				});
 				return;
@@ -405,8 +622,8 @@ function parseAttributeArguments(context, input) {
 			const rawValue = trimmedPart.slice(first.end + 1).trim();
 			if (!name || rawValue.length === 0) {
 				pushDiagnostic(context, {
-					code: "PSL_INVALID_ATTRIBUTE_SYNTAX",
-					message: `Invalid named argument syntax "${trimmedPart}"`,
+					code: input.invalidCode,
+					message: input.invalidNamedArgumentMessage(trimmedPart),
 					span: partSpan
 				});
 				return;
@@ -435,16 +652,14 @@ function findBlockBounds(context, startLine) {
 	for (let lineIndex = startLine; lineIndex < context.lines.length; lineIndex += 1) {
 		const line = stripInlineComment(context.lines[lineIndex] ?? "");
 		let quote = null;
-		let previousCharacter = "";
-		for (const character of line) {
+		for (let index = 0; index < line.length; index += 1) {
+			const character = line[index] ?? "";
 			if (quote) {
-				if (character === quote && previousCharacter !== "\\") quote = null;
-				previousCharacter = character;
+				if (character === quote && !isQuoteEscaped(line, index)) quote = null;
 				continue;
 			}
 			if (character === "\"" || character === "'") {
 				quote = character;
-				previousCharacter = character;
 				continue;
 			}
 			if (character === "{") depth += 1;
@@ -456,7 +671,6 @@ function findBlockBounds(context, startLine) {
 					closed: true
 				};
 			}
-			previousCharacter = character;
 		}
 	}
 	pushDiagnostic(context, {
@@ -474,12 +688,13 @@ function splitTopLevelSegments(value, separator) {
 	const parts = [];
 	let depthParen = 0;
 	let depthBracket = 0;
+	let depthBrace = 0;
 	let quote = null;
 	let start = 0;
 	for (let index = 0; index < value.length; index += 1) {
 		const character = value[index] ?? "";
 		if (quote) {
-			if (character === quote && value[index - 1] !== "\\") quote = null;
+			if (character === quote && !isQuoteEscaped(value, index)) quote = null;
 			continue;
 		}
 		if (character === "\"" || character === "'") {
@@ -502,7 +717,15 @@ function splitTopLevelSegments(value, separator) {
 			depthBracket = Math.max(0, depthBracket - 1);
 			continue;
 		}
-		if (character === separator && depthParen === 0 && depthBracket === 0) {
+		if (character === "{") {
+			depthBrace += 1;
+			continue;
+		}
+		if (character === "}") {
+			depthBrace = Math.max(0, depthBrace - 1);
+			continue;
+		}
+		if (character === separator && depthParen === 0 && depthBracket === 0 && depthBrace === 0) {
 			parts.push({
 				value: value.slice(start, index),
 				start,
@@ -557,7 +780,7 @@ function extractAttributeTokensWithSpans(context, lineIndex, value, startColumn)
 			while (index < value.length) {
 				const char = value[index] ?? "";
 				if (quote) {
-					if (char === quote && value[index - 1] !== "\\") quote = null;
+					if (char === quote && !isQuoteEscaped(value, index)) quote = null;
 					index += 1;
 					continue;
 				}
@@ -618,7 +841,7 @@ function stripInlineComment(line) {
 		const current = line[index] ?? "";
 		const next = line[index + 1] ?? "";
 		if (quote) {
-			if (current === quote && line[index - 1] !== "\\") quote = null;
+			if (current === quote && !isQuoteEscaped(line, index)) quote = null;
 			continue;
 		}
 		if (current === "\"" || current === "'") {
@@ -678,4 +901,4 @@ function pushDiagnostic(context, diagnostic) {
 
 //#endregion
 export { parsePslDocument as t };
-//# sourceMappingURL=parser-Br4vqzd-.mjs.map
+//# sourceMappingURL=parser-Cr64fw1E.mjs.map