@dbml/parse 8.2.0 → 8.2.1-alpha.0

package/dist/dbml-parse.mjs

@@ -1440,6 +1440,13 @@ function isEqualTupleOperands(r) {
 function isValidIndexName(r) {
 	return r instanceof PrimaryExpressionNode && r.expression instanceof VariableNode || r instanceof FunctionExpressionNode;
 }
+function getRightmostVariable(r) {
+	if (isExpressionAVariableNode(r)) return r;
+	if (isAccessExpression(r)) {
+		let j = r.rightExpression;
+		if (j && isExpressionAVariableNode(j)) return j;
+	}
+}
 function isTerminalAccessFragment(r) {
 	let j = r.parentNode;
 	return !isAccessExpression(j) || j.rightExpression !== r ? !1 : !(isAccessExpression(j.parentNode) && j.parentNode.leftExpression === j);
@@ -2898,24 +2905,24 @@ var DiagramViewBinder = class {
 		let P = [];
 		for (let M of r.body) {
 			if (!(M instanceof FunctionApplicationNode)) continue;
-			let r = M.callee && this.compiler.nodeReferee(M.callee).getFiltered(UNHANDLED);
-			if (r?.declaration instanceof ElementDeclarationNode) {
-				let j = destructureComplexVariable(r.declaration.name) ?? [];
-				if (j.length > 0) {
-					let r = j[j.length - 1], M = j.length > 1 ? j.slice(0, -1).join(".") : DEFAULT_SCHEMA_NAME;
+			let r = M.callee && getRightmostVariable(M.callee), N = r && this.compiler.nodeReferee(r).getFiltered(UNHANDLED);
+			if (N?.declaration instanceof ElementDeclarationNode) {
+				let r = destructureComplexVariable(N.declaration.name) ?? [];
+				if (r.length > 0) {
+					let j = r[r.length - 1], M = r.length > 1 ? r.slice(0, -1).join(".") : DEFAULT_SCHEMA_NAME;
 					P.push({
-						name: r,
+						name: j,
 						schemaName: M
 					});
 					continue;
 				}
 			}
-			let N = destructureComplexVariable(M.callee) ?? [];
-			if (N.length === 0) continue;
-			let F = N[N.length - 1], I = N.length > 1 ? N[0] : DEFAULT_SCHEMA_NAME;
+			let F = destructureComplexVariable(M.callee) ?? [];
+			if (F.length === 0) continue;
+			let I = F[F.length - 1], L = F.length > 1 ? F[0] : DEFAULT_SCHEMA_NAME;
 			P.push({
-				name: F,
-				schemaName: I
+				name: I,
+				schemaName: L
 			});
 		}
 		switch (M) {
@@ -14461,13 +14468,6 @@ function symbolAliases(r) {
 	let j = r.originalSymbol;
 	return allVisibleMembers(this).map((M) => M.filter((M) => M instanceof AliasSymbol && M.originalSymbol === j && M !== r));
 }
-function getRightmostVariable(r) {
-	if (isExpressionAVariableNode(r)) return r;
-	if (isAccessExpression(r)) {
-		let j = r.rightExpression;
-		if (j && isExpressionAVariableNode(j)) return j;
-	}
-}
 function resolutionIndex() {
 	let r = /* @__PURE__ */ new Map(), M = /* @__PURE__ */ new Map(), N = this.parseProject();
 	this.bindProject();

package/dist/src/core/utils/validate.d.ts

@@ -99,5 +99,6 @@ export declare function isEqualTupleOperands(value: InfixExpressionNode): boolea
 export declare function isValidIndexName(value?: SyntaxNode): value is (PrimaryExpressionNode & {
     expression: VariableNode;
 }) | FunctionExpressionNode;
+export declare function getRightmostVariable(node: SyntaxNode): SyntaxNode | undefined;
 export declare function isTerminalAccessFragment(node: SyntaxNode): boolean;
 export {};

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "8.2.0",
+  "version": "8.2.1-alpha.0",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "a4f2932e24a3d54b7c11d12710cd51e762a8442f"
+  "gitHead": "2132b2eb2c1c5e0d9bb0efd9a617becd44c39032"
 }