@dbml/parse 8.2.2 → 8.2.4-alpha.2

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();
@@ -14713,49 +14705,35 @@ function findDiagramViewBlocks(r) {
 	}
 	return j;
 }
-function emitTablesBlock(r, j) {
-	let M = j.map((r) => {
-		let j = addDoubleQuoteIfNeeded(r.name);
-		return r.schemaName === "public" ? j : `${addDoubleQuoteIfNeeded(r.schemaName)}.${j}`;
-	});
-	r.push("  Tables {"), M.forEach((j) => r.push(`    ${j}`)), r.push("  }");
+function emitListSubBlock(r, j, M, N) {
+	r.push(`  ${j} {`), M.forEach((j) => r.push(`    ${N(j)}`)), r.push("  }");
 }
-function emitTableGroupsBlock(r, j) {
-	r.push("  TableGroups {"), j.forEach((j) => r.push(`    ${addDoubleQuoteIfNeeded(j.name)}`)), r.push("  }");
+function emitWildcardSubBlock(r, j) {
+	r.push(`  ${j} { * }`);
 }
-function emitSchemasBlock(r, j) {
-	r.push("  Schemas {"), j.forEach((j) => r.push(`    ${addDoubleQuoteIfNeeded(j.name)}`)), r.push("  }");
+function formatTableRef(r) {
+	let j = addDoubleQuoteIfNeeded(r.name);
+	return r.schemaName === "public" ? j : `${addDoubleQuoteIfNeeded(r.schemaName)}.${j}`;
 }
-function emitNotesBlock(r, j) {
-	r.push("  Notes {"), j.forEach((j) => r.push(`    ${addDoubleQuoteIfNeeded(j.name)}`)), r.push("  }");
+function formatNamed(r) {
+	return addDoubleQuoteIfNeeded(r.name);
+}
+function classifyDim(r) {
+	return r == null ? "null" : r.length === 0 ? "empty" : "items";
 }
 function generateDiagramViewBlock(r, j) {
 	let M = `DiagramView ${addDoubleQuoteIfNeeded(r)} {`;
 	if (!j) return `${M}\n}`;
-	let { tables: N, tableGroups: P, schemas: F, stickyNotes: I } = j, L = N === null, R = P === null, z = F === null;
-	if (L && R && z && I === null) return `${M}\n}`;
-	if (L || R || z) {
-		let r = !L && N.length > 0, j = !R && P.length > 0, B = !z && F.length > 0;
-		if (!(r || j || B)) {
-			if (I && I.length > 0) {
-				let r = [M];
-				return emitNotesBlock(r, I), r.push("}"), r.join("\n");
-			}
-			return `${M}\n  Notes { * }\n}`;
-		}
-		let V = [M];
-		return r && emitTablesBlock(V, N), j && emitTableGroupsBlock(V, P), B && emitSchemasBlock(V, F), I && I.length > 0 && emitNotesBlock(V, I), V.push("}"), V.join("\n");
-	}
-	let B = N, V = P, H = F, U = B.length === 0 && V.length === 0 && H.length === 0, W = I != null && I.length > 0;
-	if (U) {
-		if (W) {
-			let r = [M, "  Tables { * }"];
-			return emitNotesBlock(r, I), r.push("}"), r.join("\n");
-		}
-		return `${M}\n  *\n}`;
-	}
-	let G = [M];
-	return B.length > 0 && emitTablesBlock(G, B), V.length > 0 && emitTableGroupsBlock(G, V), H.length > 0 && emitSchemasBlock(G, H), W && emitNotesBlock(G, I), G.push("}"), G.join("\n");
+	let N = {
+		tables: classifyDim(j.tables),
+		tableGroups: classifyDim(j.tableGroups),
+		schemas: classifyDim(j.schemas),
+		stickyNotes: classifyDim(j.stickyNotes)
+	};
+	if (Object.values(N).every((r) => r === "null")) return `${M}\n}`;
+	if (Object.values(N).every((r) => r === "empty")) return `${M}\n  *\n}`;
+	let P = N.tables === "items" || N.tableGroups === "items" || N.schemas === "items", F = N.tables === "empty" && N.tableGroups === "empty" && N.schemas === "empty", I = [M];
+	return P ? (N.tables === "items" && emitListSubBlock(I, "Tables", j.tables, formatTableRef), N.tableGroups === "items" && emitListSubBlock(I, "TableGroups", j.tableGroups, formatNamed), N.schemas === "items" && emitListSubBlock(I, "Schemas", j.schemas, formatNamed)) : F && emitWildcardSubBlock(I, "Tables"), N.stickyNotes === "items" ? emitListSubBlock(I, "Notes", j.stickyNotes, formatNamed) : N.stickyNotes === "empty" && !P && !F && emitWildcardSubBlock(I, "Notes"), I.push("}"), I.join("\n");
 }
 function syncDiagramView(r, j, M) {
 	let N = this.getSource(r) ?? "", P = M ?? findDiagramViewBlocks(N), F = [];

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;