@dbml/parse 8.2.2 → 8.2.4

package/dist/dbml-parse.mjs

@@ -1249,8 +1249,8 @@ var isAbsolute = function(r) {
 		return r.path.startsWith(j);
 	}
 	toUri(r = {}) {
-		let j = r.protocol ?? this.protocol;
-		if (j === void 0) return this.path;
+		let j = r.protocol || this.protocol;
+		if (!j) return this.path;
 		let M = WIN_DRIVE_RE.test(this.path) ? `${j}:///` : `${j}://`;
 		return new URL(M + this.path).href;
 	}
@@ -3169,7 +3169,10 @@ var IndexesBinder = class {
 		this.compiler = r, this.declarationNode = j;
 	}
 	bind() {
-		return !(this.declarationNode.parent instanceof ElementDeclarationNode) || !this.declarationNode.parent.isKind(ElementKind.Table) || !(this.declarationNode.body instanceof BlockExpressionNode) ? [] : this.bindBody(this.declarationNode.body);
+		return !(this.declarationNode.parent instanceof ElementDeclarationNode) || !this.declarationNode.parent.isKind(ElementKind.Table) && !this.declarationNode.parent.isKind(ElementKind.TablePartial) || !(this.declarationNode.body instanceof BlockExpressionNode) ? [] : this.bindBody(this.declarationNode.body);
+	}
+	get ownerContainerKind() {
+		return this.declarationNode.parent.isKind(ElementKind.TablePartial) ? "TablePartial" : "Table";
 	}
 	bindBody(r) {
 		if (!r) return [];
@@ -3181,11 +3184,11 @@ var IndexesBinder = class {
 		return r.flatMap((r) => {
 			if (!r.callee) return [];
 			let M = destructureComplexVariable(this.declarationNode.parent.name)?.join(".") ?? "<unnamed>";
-			return [r.callee, ...r.args].flatMap(scanNonListNodeForBinding).flatMap((r) => r.variables.length + r.tupleElements.length > 1 ? [] : r.variables.length ? r.variables[0] : r.tupleElements).flatMap((r) => {
+			return [r.callee, ...r.args].flatMap(scanNonListNodeForBinding).flatMap((r) => r.variables.length > 1 ? [] : r.variables.length ? r.variables[0] : r.tupleElements).flatMap((r) => {
 				let N = extractVarNameFromPrimaryVariable(r);
 				if (N === void 0) return [];
 				let P = this.compiler.nodeReferee(r);
-				return !P.getValue() || P.hasValue(UNHANDLED) ? new CompileError(CompileErrorCode.BINDING_ERROR, `No column named '${N}' inside Table '${M}'`, r) : [];
+				return !P.getValue() || P.hasValue(UNHANDLED) ? new CompileError(CompileErrorCode.BINDING_ERROR, `No column named '${N}' inside ${this.ownerContainerKind} '${M}'`, r) : [];
 			});
 		});
 	}
@@ -11964,7 +11967,7 @@ var DBMLDefinitionProvider = class {
 			let P;
 			if (M.declaration && [SyntaxNodeKind.PRIMARY_EXPRESSION, SyntaxNodeKind.VARIABLE].includes(r.kind) && ({declaration: P} = M), P) {
 				let { startPos: r, endPos: j } = P, M = N;
-				return N && P.filepath && (M = URI.parse(P.filepath.toUri())), [{
+				return N && P.filepath && (M = URI.parse(P.filepath.toUri({ protocol: N.scheme }))), [{
 					range: {
 						startColumn: r.column + 1,
 						startLineNumber: r.line + 1,
@@ -12035,7 +12038,7 @@ var DBMLDefinitionProvider = class {
 				let M = this.compiler.nodeSymbol(r).getFiltered(UNHANDLED) ?? this.compiler.nodeReferee(r).getFiltered(UNHANDLED), P = M ? this.compiler.symbolReferences(M) : void 0;
 				if (P && P.length > 0) return P.map((r) => {
 					let j = N;
-					return N && r.filepath && (j = URI.parse(r.filepath.toUri())), {
+					return N && r.filepath && (j = URI.parse(r.filepath.toUri({ protocol: N.scheme }))), {
 						range: {
 							startColumn: r.startPos.column + 1,
 							startLineNumber: r.startPos.line + 1,
@@ -13798,12 +13801,6 @@ var ParsingContextStack = class {
 				if (this.check(SyntaxTokenKind.RBRACE) || this.check(SyntaxTokenKind.STRING_LITERAL) || this.check(SyntaxTokenKind.IDENTIFIER) && isFromKeyword(r) || isAtStartOfLine(this.previous(), r)) break;
 				markInvalid(r), this.advance();
 			}
-		}, this.synchronizeUseSpecifier = () => {
-			for (; !this.isAtEnd();) {
-				let r = this.peek();
-				if (this.check(SyntaxTokenKind.RBRACE) || isAtStartOfLine(this.previous(), r)) break;
-				markInvalid(r), this.advance();
-			}
 		}, this.synchronizeProgram = () => {
 			let r = this.peek();
 			r.kind === SyntaxTokenKind.EOF ? this.logError(r, CompileErrorCode.UNEXPECTED_EOF, "Unexpected EOF") : markInvalid(this.advance());
@@ -14038,16 +14035,12 @@ var ParsingContextStack = class {
 		try {
 			this.consume("Expect an import kind specifier (e.g. table, enum)", SyntaxTokenKind.IDENTIFIER), r.importKind = this.previous();
 		} catch (r) {
-			if (!(r instanceof PartialParsingError)) throw r;
-			if (!this.canHandle(r)) throw new PartialParsingError(r.token, j(), r.handlerContext);
-			this.synchronizeUseSpecifier();
+			throw r instanceof PartialParsingError ? new PartialParsingError(r.token, j(), r.handlerContext) : r;
 		}
 		if (this.check(SyntaxTokenKind.IDENTIFIER, SyntaxTokenKind.QUOTED_STRING)) try {
 			r.name = this.normalExpression();
 		} catch (M) {
-			if (!(M instanceof PartialParsingError)) throw M;
-			if (M.partialNode instanceof SyntaxNode && (r.name = M.partialNode), !this.canHandle(M)) throw new PartialParsingError(M.token, j(), M.handlerContext);
-			this.synchronizeUseSpecifier();
+			throw M instanceof PartialParsingError ? (M.partialNode instanceof SyntaxNode && (r.name = M.partialNode), new PartialParsingError(M.token, j(), M.handlerContext)) : M;
 		}
 		else r.importKind && this.logError(this.peek(), CompileErrorCode.UNEXPECTED_TOKEN, "Expect an element name");
 		if (isAsKeyword(this.peek())) {
@@ -14058,7 +14051,6 @@ var ParsingContextStack = class {
 			} catch (r) {
 				if (!(r instanceof PartialParsingError)) throw r;
 				if (!this.canHandle(r)) throw new PartialParsingError(r.token, j(), r.handlerContext);
-				this.synchronizeUseSpecifier();
 			}
 		}
 		return j();

package/dist/src/core/global_modules/indexes/bind.d.ts

@@ -6,6 +6,7 @@ export default class IndexesBinder {
     private declarationNode;
     constructor(compiler: Compiler, declarationNode: ElementDeclarationNode);
     bind(): CompileError[];
+    private get ownerContainerKind();
     private bindBody;
     private bindFields;
     private bindSubElements;

package/dist/src/core/parser/parser.d.ts

@@ -31,7 +31,6 @@ export default class Parser {
     private useSpecifierList;
     private synchronizeUseSpecifierList;
     private useSpecifier;
-    private synchronizeUseSpecifier;
     private synchronizeProgram;
     private elementDeclaration;
     private synchronizeElementDeclarationName;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "8.2.2",
+  "version": "8.2.4",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "34294e84c8a6acd1508c2d0442a8a93a12c79126"
+  "gitHead": "a8358e7ca39ab47272ee59a1915709d8f0f82f06"
 }