@prisma/orm-framework 8.0.0-rc.14-dev.13 → 8.0.0-rc.14-dev.14

package/dist/psl-parser.mjs

@@ -4,7 +4,7 @@ import { a as or, i as okVoid, n as notOk, r as ok, t as and } from "./result-8O
 import { C as isAuthoringTypeConstructorDescriptor, S as isAuthoringPslBlockDescriptor, x as isAuthoringModelAttributeDescriptor } from "./temporal-presets-DsGuaFyT-DWzKyja_.mjs";
 import { a as flatPslModels, c as namespacePslExtensionBlocks } from "./psl-ast-CyvE6CR-.mjs";
 import { n as isPslIdentifier } from "./tokenizer-BMz7z2KR-J0yZ4im3.mjs";
-import { C as TaggedLiteralExprAst, S as StringLiteralExprAst, T as TypesBlockAst, _ as NumberLiteralExprAst, a as CompositeTypeDeclarationAst, d as IdentifierAst, g as NamespaceDeclarationAst, i as BooleanLiteralExprAst, l as FunctionCallAst, m as ModelDeclarationAst, t as ArrayLiteralAst, u as GenericBlockDeclarationAst, y as ObjectLiteralExprAst } from "./declarations-CgS5vnfJ-Dhi3X7oU.mjs";
+import { C as TaggedLiteralExprAst, S as StringLiteralExprAst, T as TypesBlockAst, _ as NumberLiteralExprAst, a as CompositeTypeDeclarationAst, d as IdentifierAst, g as NamespaceDeclarationAst, i as BooleanLiteralExprAst, l as FunctionCallAst, m as ModelDeclarationAst, t as ArrayLiteralAst, u as GenericBlockDeclarationAst, y as ObjectLiteralExprAst } from "./declarations-DqOfcPNK-CxtZmhmW.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-GE34dgM6-D33m6YEw.mjs";
 //#region ../../../1-framework/2-authoring/psl-parser/dist/index.mjs
 function getPositionalArgument(attribute, index = 0) {
@@ -583,9 +583,14 @@ function contributedTypeScope(typeConstructors) {
 	const existing = scopes.get(typeConstructors);
 	if (existing !== void 0) return existing;
 	const members = collect(typeConstructors, []);
-	const created = { lookup(name) {
-		return members.get(name);
-	} };
+	const created = {
+		lookup(name) {
+			return members.get(name);
+		},
+		entries() {
+			return members.entries();
+		}
+	};
 	scopes.set(typeConstructors, created);
 	return created;
 }
@@ -619,6 +624,25 @@ function findBlockDescriptor(descriptors, keyword) {
 		if (nested !== void 0) return nested;
 	}
 }
+function* recordNames(...records) {
+	for (const record of records) yield* Object.keys(record);
+}
+var Scope = class {
+	parent;
+	constructor(parent) {
+		this.parent = parent;
+	}
+	*entries() {
+		const seen = /* @__PURE__ */ new Set();
+		for (const name of this.ownNames()) {
+			if (seen.has(name)) continue;
+			seen.add(name);
+			const resolution = this.lookup(name);
+			if (resolution !== void 0) yield [name, resolution];
+		}
+		for (const entry of this.parent?.entries() ?? []) if (!seen.has(entry[0])) yield entry;
+	}
+};
 function contributedResolution(member) {
 	return member.kind === "contributedType" ? {
 		kind: "contributedType",
@@ -648,22 +672,25 @@ function namespaceMember(namespace, name) {
 		namespace
 	};
 }
-var ContributedScope = class {
+var ContributedScope = class extends Scope {
 	#registry;
 	constructor(registry) {
+		super(void 0);
 		this.#registry = registry;
 	}
 	lookup(name) {
 		const member = this.#registry.lookup(name);
 		return member === void 0 ? void 0 : contributedResolution(member);
 	}
+	*ownNames() {
+		for (const [name] of this.#registry.entries()) yield name;
+	}
 };
-var DocumentScope = class {
+var DocumentScope = class extends Scope {
 	#records;
-	#parent;
 	constructor(records, parent) {
+		super(parent);
 		this.#records = records;
-		this.#parent = parent;
 	}
 	lookup(name) {
 		const records = this.#records;
@@ -692,18 +719,25 @@ var DocumentScope = class {
 			kind: "namespace",
 			symbol: namespace
 		};
-		return this.#parent?.lookup(name);
+		return this.parent?.lookup(name);
+	}
+	ownNames() {
+		const records = this.#records;
+		return recordNames(records.models, records.compositeTypes, records.namedTypes, records.blocks, records.namespaces);
 	}
 };
-var NamespaceScope = class {
+var NamespaceScope = class extends Scope {
 	#namespace;
-	#parent;
 	constructor(namespace, parent) {
+		super(parent);
 		this.#namespace = namespace;
-		this.#parent = parent;
 	}
 	lookup(name) {
-		return namespaceMember(this.#namespace, name) ?? this.#parent.lookup(name);
+		return namespaceMember(this.#namespace, name) ?? this.parent?.lookup(name);
+	}
+	ownNames() {
+		const namespace = this.#namespace;
+		return recordNames(namespace.models, namespace.compositeTypes, namespace.blocks);
 	}
 };
 function contributedScope(registry) {
@@ -718,6 +752,13 @@ function namespaceScope(namespace, parent) {
 function isNamespaceLike(resolution) {
 	return resolution.kind === "namespace" || resolution.kind === "contributedNamespace";
 }
+function* memberEntries(qualifier) {
+	if (qualifier.kind === "contributedNamespace") {
+		for (const [name, member] of qualifier.symbol.members) yield [name, contributedResolution(member)];
+		return;
+	}
+	yield* new NamespaceScope(qualifier.symbol, void 0).entries();
+}
 function lookupMember(qualifier, name) {
 	if (qualifier.kind === "contributedNamespace") {
 		const member = qualifier.symbol.members.get(name);
@@ -726,15 +767,19 @@ function lookupMember(qualifier, name) {
 	return namespaceMember(qualifier.symbol, name);
 }
 const PSL_UNRESOLVED_REFERENCE = "PSL_UNRESOLVED_REFERENCE";
-function typeReferenceNode(field) {
-	return field.node.typeAnnotation()?.name()?.syntax;
+function typeReferenceNode(symbol) {
+	return symbol.node.typeAnnotation()?.name()?.syntax;
 }
 var PslBinder = class {
 	#declarations;
 	#references;
-	constructor(declarations, references) {
+	#documentScope;
+	#scopes;
+	constructor(declarations, references, documentScope, scopes) {
 		this.#declarations = declarations;
 		this.#references = references;
+		this.#documentScope = documentScope;
+		this.#scopes = scopes;
 	}
 	declaredSymbol(node) {
 		return this.#declarations.get(node);
@@ -742,6 +787,9 @@ var PslBinder = class {
 	symbolForNode(node) {
 		return this.#references.get(node);
 	}
+	scopeAt(node) {
+		return node.findAncestor((ancestor) => this.#scopes.get(ancestor)) ?? this.#documentScope;
+	}
 };
 var ScopeStack = class {
 	#base;
@@ -760,12 +808,12 @@ var ScopeStack = class {
 		this.#scopes.pop();
 	}
 };
-function walkEntities(symbolTable, stack, visit) {
+function walkEntities(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);
 	for (const namespace of Object.values(topLevel.namespaces)) {
-		stack.push(namespaceScope(namespace, stack.current()));
+		stack.push(binder.scopeAt(namespace.declarations[0].node.syntax));
 		for (const entity of Object.values(namespace.models)) visit(entity);
 		for (const entity of Object.values(namespace.compositeTypes)) visit(entity);
 		stack.pop();
@@ -774,24 +822,35 @@ function walkEntities(symbolTable, stack, visit) {
 function createBinder(options) {
 	const { sources, symbolTable, typeConstructors, attributeSpecs, controlMutationDefaults, describeUnsupportedAttribute } = options;
 	const pslBlockDescriptors = options.pslBlockDescriptors ?? {};
-	const stack = new ScopeStack(documentScope(symbolTable.topLevel, contributedScope(contributedTypeScope(typeConstructors))));
+	const document = documentScope(symbolTable.topLevel, contributedScope(contributedTypeScope(typeConstructors)));
+	const stack = new ScopeStack(document);
+	const scopes = /* @__PURE__ */ new WeakMap();
 	const declarations = /* @__PURE__ */ new WeakMap();
 	const references = /* @__PURE__ */ new WeakMap();
 	const diagnostics = [];
-	const binder = new PslBinder(declarations, references);
-	for (const symbol of Object.values(symbolTable.topLevel.namedTypes)) declarations.set(symbol.node.syntax, symbol);
+	const binder = new PslBinder(declarations, references, document, scopes);
+	for (const symbol of Object.values(symbolTable.topLevel.namedTypes)) {
+		declarations.set(symbol.node.syntax, symbol);
+		const name = symbol.node.typeAnnotation()?.name();
+		const outcome = resolveTypeReference(name, document);
+		if (name !== void 0 && outcome !== void 0) references.set(name.syntax, outcome.resolution);
+	}
 	for (const symbol of Object.values(symbolTable.topLevel.blocks)) declarations.set(symbol.node.syntax, symbol);
 	for (const namespace of Object.values(symbolTable.topLevel.namespaces)) {
-		for (const declaration of namespace.declarations) declarations.set(declaration.node.syntax, namespace);
+		const scope = namespaceScope(namespace, document);
+		for (const declaration of namespace.declarations) {
+			declarations.set(declaration.node.syntax, namespace);
+			scopes.set(declaration.node.syntax, scope);
+		}
 		for (const symbol of Object.values(namespace.blocks)) declarations.set(symbol.node.syntax, symbol);
 	}
-	walkEntities(symbolTable, stack, (entity) => {
+	walkEntities(symbolTable, stack, binder, (entity) => {
 		declarations.set(entity.node.syntax, entity);
 		for (const field of Object.values(entity.fields)) {
 			declarations.set(field.node.syntax, field);
 			const node = typeReferenceNode(field);
 			if (node === void 0) continue;
-			const outcome = resolveTypeReference(field, stack.current());
+			const outcome = resolveTypeReference(field.node.typeAnnotation()?.name(), stack.current());
 			if (outcome === void 0) continue;
 			references.set(node, outcome.resolution);
 			if (outcome.message !== void 0) diagnostics.push({
@@ -806,7 +865,7 @@ function createBinder(options) {
 			});
 		}
 	});
-	walkEntities(symbolTable, stack, (entity) => {
+	walkEntities(symbolTable, stack, binder, (entity) => {
 		const context = {
 			owner: entity,
 			scope: stack.current(),
@@ -849,7 +908,7 @@ function createBinder(options) {
 	};
 	bindBlocks(symbolTable.topLevel.blocks);
 	for (const namespace of Object.values(symbolTable.topLevel.namespaces)) {
-		stack.push(namespaceScope(namespace, stack.current()));
+		stack.push(binder.scopeAt(namespace.declarations[0].node.syntax));
 		bindBlocks(namespace.blocks);
 		stack.pop();
 	}
@@ -1132,12 +1191,12 @@ function report(message, node, ctx, reference) {
 		...diagnosticSource(ctx.sources, node).at()
 	});
 }
-function resolveTypeReference(field, scope) {
-	if (field.malformedType === true) return void 0;
-	if (field.typeContractSpaceId !== void 0) return { resolution: { kind: "crossSpace" } };
-	const name = field.typeName;
-	if (name === "") return void 0;
-	const namespaceId = field.typeNamespaceId;
+function resolveTypeReference(reference, scope) {
+	if (reference === void 0 || reference.isOverQualified()) return void 0;
+	if (reference.space() !== void 0) return { resolution: { kind: "crossSpace" } };
+	const name = reference.identifier()?.name();
+	if (name === void 0 || name === "") return void 0;
+	const namespaceId = reference.namespace()?.name();
 	const found = namespaceId === void 0 ? scope.lookup(name) : qualifiedMember(namespaceId, name, scope);
 	if (found === void 0) {
 		const written = namespaceId === void 0 ? name : `${namespaceId}.${name}`;
@@ -1474,13 +1533,19 @@ function buildSymbolTable(options) {
 				namespace = {
 					kind: "namespace",
 					name,
-					declarations: [],
+					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());
@@ -1537,10 +1602,6 @@ function buildBlock(name, node, sources) {
 }
 function extendNamespace(namespace, node, diagnostics, sources) {
 	const { models, compositeTypes, blocks } = namespace;
-	namespace.declarations.push({
-		node,
-		span: nodePslSpan(node.syntax, sources)
-	});
 	for (const member of node.declarations()) {
 		const memberName = member.name()?.name();
 		if (memberName === void 0) continue;
@@ -1651,6 +1712,6 @@ function nodeRange(node, sources) {
 	};
 }
 //#endregion
-export { NAME_THE_PSL_SOURCE_LOSES, PSL_UNRESOLVED_REFERENCE, assembleAttributeSpecs, blockAttribute, blockSpecFactoryOf, bool, buildSymbolTable, createBinder, createPslDiagnosticCollector, diagnosticFromSpan, diagnosticSource, entityRef, fieldAttribute, fieldRef, findBlockDescriptor, flatPslModels, funcCall, getPositionalArgument, identifier, int, interpretArgs, interpretAttribute, interpretExtensionBlock, interpretExtensionBlockAttributes, interpretExtensionBlocks, isPrismaNextSchema, isPslIdentifier, json, jsonValue, keywordPslSpan, leafDiagnostic, list, mapBlock, mapPslDiagnostics, modelAttribute, namespacePslExtensionBlocks, nodePslSpan, num, numLiteral, oneOf, optional, parseQuotedStringLiteral, readResolvedAttribute, readResolvedAttributes, readResolvedConstructorCall, record, referencedFieldRef, renameLegacyDirective, str, structBlock, taggedLiteral, typeReferenceNode };
+export { NAME_THE_PSL_SOURCE_LOSES, PSL_UNRESOLVED_REFERENCE, assembleAttributeSpecs, blockAttribute, blockSpecFactoryOf, bool, buildSymbolTable, createBinder, createPslDiagnosticCollector, diagnosticFromSpan, diagnosticSource, entityRef, entityReference, fieldAttribute, fieldRef, findBlockDescriptor, flatPslModels, funcCall, getPositionalArgument, identifier, int, interpretArgs, interpretAttribute, interpretExtensionBlock, interpretExtensionBlockAttributes, interpretExtensionBlocks, isNamespaceLike, isPrismaNextSchema, isPslIdentifier, json, jsonValue, keywordPslSpan, leafDiagnostic, list, mapBlock, mapPslDiagnostics, matchesSelector, memberEntries, modelAttribute, namespacePslExtensionBlocks, nodePslSpan, num, numLiteral, oneOf, optional, parseQuotedStringLiteral, readResolvedAttribute, readResolvedAttributes, readResolvedConstructorCall, record, referencedFieldRef, renameLegacyDirective, str, structBlock, taggedLiteral, typeReferenceNode };
 
 //# sourceMappingURL=psl-parser.mjs.map