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

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

@@ -1 +1 @@
-{"version":3,"file":"psl-parser.d.mts","names":[],"sources":["../../../../1-framework/2-authoring/psl-parser/dist/index.d.mts"],"mappings":"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"}
+{"version":3,"file":"psl-parser.d.mts","names":[],"sources":["../../../../1-framework/2-authoring/psl-parser/dist/index.d.mts"],"mappings":"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"}

package/dist/psl-parser.mjs

@@ -4,9 +4,9 @@ import { a as or, i as okVoid, n as notOk, r as ok, t as and } from "./result-8O
 import { b as isAuthoringModelAttributeDescriptor, x as isAuthoringPslBlockDescriptor } from "./temporal-presets-DzBBD4St-BaL1QaZ7.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-C0VwsVFX-BcP1Nyv4.mjs";
+import { C as TaggedLiteralExprAst, S as StringLiteralExprAst, T as TypesBlockAst, _ as NumberLiteralExprAst, a as CompositeTypeDeclarationAst, b as PathExprAst, 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-BauPuujx-UErcHFt5.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/symbol-table-0DYRY2eQ.mjs
+//#region ../../../1-framework/2-authoring/psl-parser/dist/symbol-table-BdtlVJfe.mjs
 function* modelAttributeDescriptors(namespace) {
 	for (const value of Object.values(namespace)) {
 		if (isAuthoringModelAttributeDescriptor(value)) {
@@ -37,6 +37,57 @@ function resolveDescribeUnresolvedType(pslDiagnostics) {
 	if (pslDiagnostics?.describeUnresolvedType === void 0) return;
 	return blindCast(pslDiagnostics.describeUnresolvedType);
 }
+function writtenEntityReference(node) {
+	const name = IdentifierAst.cast(node)?.name();
+	if (name !== void 0) return {
+		namespace: void 0,
+		name
+	};
+	const path = PathExprAst.cast(node)?.path();
+	if (path === void 0 || path.length !== 2) return void 0;
+	const [namespace, member] = path;
+	return namespace === void 0 || member === void 0 ? void 0 : {
+		namespace,
+		name: member
+	};
+}
+function describeWrittenEntityReference(reference) {
+	return reference.namespace === void 0 ? reference.name : `${reference.namespace}.${reference.name}`;
+}
+const references = /* @__PURE__ */ new WeakMap();
+function entityReference(resolution) {
+	switch (resolution.kind) {
+		case "model":
+		case "compositeType":
+		case "namedType":
+		case "block": return interned(resolution.symbol, resolution.namespace);
+		default: return;
+	}
+}
+function interned(declaration, namespace) {
+	const existing = references.get(declaration);
+	if (existing !== void 0) return existing;
+	const reference = {
+		declaration,
+		namespace
+	};
+	references.set(declaration, reference);
+	return reference;
+}
+function matchesSelector(reference, expected) {
+	const declaration = reference.declaration;
+	if (declaration.kind !== expected.kind) return false;
+	return expected.kind !== "block" || declaration.kind === "block" && declaration.keyword === expected.keyword;
+}
+function describeResolution(resolution) {
+	switch (resolution.kind) {
+		case "block": return resolution.symbol.keyword;
+		case "contributedType": return "scalar type";
+		case "crossSpace": return "cross-space reference";
+		case "unresolved": return "unresolved name";
+		default: return resolution.kind;
+	}
+}
 function blockSpecFactoryOf(descriptor) {
 	return blindCast(descriptor.spec);
 }
@@ -431,10 +482,7 @@ function bind(options) {
 function bindBlock(block, ctx) {
 	const descriptor = findBlockDescriptor(ctx.pslBlockDescriptors, block.keyword);
 	if (descriptor === void 0) return;
-	const spec = blockSpecFactoryOf(descriptor)({
-		symbols: ctx.symbolTable,
-		block
-	});
+	const spec = blockSpecFactoryOf(descriptor)({ symbols: ctx.symbolTable });
 	for (const entry of block.node.entries()) {
 		const key = entry.key()?.name();
 		if (key === void 0) continue;
@@ -448,10 +496,7 @@ function bindBlock(block, ctx) {
 	for (const attribute of readResolvedAttributes(block.node.attributes(), ctx.sources)) {
 		const factory = attributeSpecs[attribute.name];
 		if (factory === void 0) continue;
-		bindArguments(attribute, blindCast(factory)({
-			symbols: ctx.symbolTable,
-			block
-		}), ctx);
+		bindArguments(attribute, blindCast(factory)({ symbols: ctx.symbolTable }), ctx);
 	}
 }
 function bindExpression(rule, expression, ctx, modelContext) {
@@ -527,14 +572,14 @@ function tryBindExpression(rule, expression, ctx, modelContext) {
 		}
 		case "entityRef": {
 			const node = expression.syntax;
-			const name = IdentifierAst.cast(node)?.name();
-			if (name === void 0) return {
+			const written = writtenEntityReference(node);
+			if (written === void 0) return {
 				matched: false,
 				references,
 				diagnostics
 			};
 			const failures = [];
-			const resolution = resolveEntity(name, node, {
+			const resolution = resolveEntity(written, node, {
 				...ctx,
 				diagnostics: failures
 			});
@@ -683,15 +728,23 @@ function targetFields(target) {
 	if (target === void 0) return void 0;
 	if (target.kind === "model" || target.kind === "compositeType") return target.symbol.fields;
 }
-function resolveEntity(name, node, ctx) {
-	const found = ctx.scope.lookup(name);
+function resolveEntity(written, node, ctx) {
+	const found = written.namespace === void 0 ? ctx.scope.lookup(written.name) : qualifiedMember(written.namespace, written.name, ctx.scope);
 	if (found === void 0) {
-		report(`Cannot find entity "${name}"`, node, ctx, "entity");
+		const name = describeWrittenEntityReference(written);
+		if (written.name !== "") report(`Cannot find entity "${name}"`, node, ctx, "entity");
 		return {
 			kind: "unresolved",
 			name
 		};
 	}
+	if ("badQualifier" in found) {
+		report(found.badQualifier, node, ctx, "entity");
+		return {
+			kind: "unresolved",
+			name: found.qualifier
+		};
+	}
 	return found;
 }
 function report(message, node, ctx, reference) {
@@ -1032,40 +1085,6 @@ function bool() {
 		}
 	};
 }
-const references = /* @__PURE__ */ new WeakMap();
-function entityReference(resolution) {
-	switch (resolution.kind) {
-		case "model":
-		case "compositeType":
-		case "namedType":
-		case "block": return interned(resolution.symbol, resolution.namespace);
-		default: return;
-	}
-}
-function interned(declaration, namespace) {
-	const existing = references.get(declaration);
-	if (existing !== void 0) return existing;
-	const reference = {
-		declaration,
-		namespace
-	};
-	references.set(declaration, reference);
-	return reference;
-}
-function matchesSelector(reference, expected) {
-	const declaration = reference.declaration;
-	if (declaration.kind !== expected.kind) return false;
-	return expected.kind !== "block" || declaration.kind === "block" && declaration.keyword === expected.keyword;
-}
-function describeResolution(resolution) {
-	switch (resolution.kind) {
-		case "block": return resolution.symbol.keyword;
-		case "contributedType": return "scalar type";
-		case "crossSpace": return "cross-space reference";
-		case "unresolved": return "unresolved name";
-		default: return resolution.kind;
-	}
-}
 function entityRef(expected) {
 	const label = `${expected.kind === "block" ? expected.keyword : expected.kind} reference`;
 	return {
@@ -1073,8 +1092,9 @@ function entityRef(expected) {
 		label,
 		expected,
 		parse: (arg, ctx) => {
-			const name = IdentifierAst.cast(arg.syntax)?.name();
-			if (name === void 0) return notOk([leafDiagnostic(ctx, arg, `Expected ${label}`)]);
+			const written = writtenEntityReference(arg.syntax);
+			if (written === void 0) return notOk([leafDiagnostic(ctx, arg, `Expected ${label}`)]);
+			const name = describeWrittenEntityReference(written);
 			const resolution = ctx.binder.symbolForNode(arg.syntax);
 			if (resolution === void 0 || resolution.kind === "unresolved") return notOk([]);
 			const reference = entityReference(resolution);
@@ -1556,7 +1576,8 @@ function interpretExtensionBlock(input) {
 	const ctx = {
 		sources,
 		symbols,
-		binder
+		binder,
+		selfBlock: block
 	};
 	const entries = spec.mode === "struct" ? interpretStructBlock(block, spec, ctx) : interpretMapBlock(block, spec, ctx);
 	const diagnostics = [...entries.diagnostics];
@@ -1698,14 +1719,12 @@ function interpretExtensionBlockAttributes(input) {
 			continue;
 		}
 		seenNames.add(name);
-		const spec = blindCast(declared[name])({
-			symbols,
-			block
-		});
+		const spec = blindCast(declared[name])({ symbols });
 		const result = interpretAttribute(attribute, spec, {
 			sources,
 			symbols,
-			binder
+			binder,
+			selfBlock: block
 		});
 		if (result.ok) {
 			const argSpans = Object.create(null);
@@ -1744,10 +1763,7 @@ function interpretExtensionBlocks(input) {
 		const parsed = interpretExtensionBlock({
 			block,
 			descriptor,
-			spec: blockSpecFactoryOf(descriptor)({
-				symbols: symbolTable,
-				block
-			}),
+			spec: blockSpecFactoryOf(descriptor)({ symbols: symbolTable }),
 			symbols: symbolTable,
 			sources,
 			binder