@dbml/parse 8.0.0-alpha.11 → 8.0.0-alpha.13

package/dist/dbml-parse.mjs

@@ -1235,7 +1235,7 @@ var isAbsolute = function(r) {
 	}
 	relativeTo(r) {
 		let j = relative$1(r, this.path);
-		return j.startsWith(".") ? j : `./${j}`;
+		return !j.startsWith("./") && !j.startsWith("../") && ![".", ".."].includes(j) ? `./${j}` : j;
 	}
 	toString() {
 		return this.path;
@@ -7638,7 +7638,7 @@ var ProjectBinder = class {
 	interpretBody(r) {
 		return r.body.flatMap((r) => {
 			let j = r;
-			switch (j.type?.value.toLowerCase()) {
+			switch (j.getElementKind()) {
 				case ElementKind.Table: {
 					let r = this.interpretSubElement(j);
 					return r.getValue() && this.project.tables?.push(r.getValue()), r.getErrors();
@@ -8591,7 +8591,7 @@ var TableBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
+			switch (r.getElementKind()) {
 				case ElementKind.Note: return this.table.note = {
 					value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 					token: getTokenPosition(r)
@@ -8611,8 +8611,8 @@ var TableBinder = class {
 		P.name = extractVariableFromExpression(r.expression) || "";
 		let F = r.expression ? this.compiler.nodeReferee(r.expression).getFiltered(UNHANDLED) : void 0, I = this.compiler.parseFile(this.filepath).getValue().ast, L = this.compiler.nodeSymbol(I).getFiltered(UNHANDLED);
 		if (F && !L.inNestedSchema(this.compiler, F)) {
-			let M = this.compiler.nodeSymbol(this.declarationNode).getFiltered(UNHANDLED), P = M ? (this.compiler.symbolUses(M).getFiltered(UNHANDLED) ?? []).find((r) => r.filepath.equals(this.filepath)) : void 0;
-			N.push(new CompileError(CompileErrorCode.UNSUPPORTED, `Import TablePartial from '${F.filepath}' first. Currently, importing a table that uses a table partial requires that table partial to also be in scope.`, P?.useSpecifierDeclaration ?? r));
+			let M = this.compiler.nodeSymbol(this.declarationNode).getFiltered(UNHANDLED), I = M ? (this.compiler.symbolUses(M).getFiltered(UNHANDLED) ?? []).find((r) => r.filepath.equals(this.filepath)) : void 0;
+			N.push(new CompileError(CompileErrorCode.UNSUPPORTED, `TablePartial ${P.name} from '${F.filepath}' should be imported. Currently, importing a table that uses a table partial requires that table partial to also be in scope.`, I?.useSpecifierDeclaration ?? r));
 		}
 		return this.table.partials.push(P), N;
 	}
@@ -9014,8 +9014,8 @@ var TableGroupBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
-				case "note":
+			switch (r.getElementKind()) {
+				case ElementKind.Note:
 					this.tableGroup.note = {
 						value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 						token: getTokenPosition(r)
@@ -9236,7 +9236,7 @@ var TablePartialBinder = class {
 	}
 	interpretSubElements(r) {
 		return r.flatMap((r) => {
-			switch (r.type?.value.toLowerCase()) {
+			switch (r.getElementKind()) {
 				case ElementKind.Note: return this.tablePartial.note = {
 					value: normalizeNote(extractQuotedStringToken(r.body instanceof BlockExpressionNode ? r.body.body[0].callee : r.body.callee)),
 					token: getTokenPosition(r)
@@ -13179,48 +13179,6 @@ var dbmlMonarchTokensProvider = {
 			[/[/*]/, "comment"]
 		]
 	}
-}, MemoryProjectLayout = class r {
-	constructor(r = {}) {
-		this.files = r instanceof Map ? new Map(r) : new Map(Object.entries(r));
-	}
-	setSource(r, j) {
-		this.files.set(r.absolute, j);
-	}
-	getSource(r) {
-		return this.files.get(r.absolute) ?? void 0;
-	}
-	deleteSource(r) {
-		this.files.delete(r.absolute);
-	}
-	clearSource() {
-		this.files.clear();
-	}
-	exists(r) {
-		return this.isFile(r) || this.isDirectory(r);
-	}
-	isFile(r) {
-		return this.files.has(r.absolute);
-	}
-	isDirectory(r) {
-		let j = r.absolute.endsWith("/") ? r.absolute : `${r.absolute}/`;
-		for (let r of this.files.keys()) if (r.startsWith(j)) return !0;
-		return !1;
-	}
-	listDirectory(r) {
-		let j = r?.absolute ?? "/", M = j.endsWith("/") ? j : j + "/", N = /* @__PURE__ */ new Set();
-		for (let r of this.files.keys()) {
-			if (!r.startsWith(M)) continue;
-			let j = r.slice(M.length), P = j.indexOf("/");
-			N.add(M + (P === -1 ? j : j.slice(0, P)));
-		}
-		return [...N].sort().map(Filepath.from);
-	}
-	getEntrypoints() {
-		return [...this.files.keys()].map(Filepath.from).sort((r, j) => r.absolute.localeCompare(j.absolute));
-	}
-	clone() {
-		return new r(this.files);
-	}
 };
 function containerStack(r, j) {
 	let M = this.token.flatStream(r), { index: N, token: P } = this.container.token(r, j), F = N === void 0 ? -1 : findLastIndex_default(M, (r) => !r.isInvalid, N);
@@ -13424,7 +13382,7 @@ function bindProject() {
 function interpretFile(r) {
 	let N = this.bindFile(r);
 	if (N.getErrors().length > 0) return N.map(() => void 0);
-	let P = this.parseFile(r).getValue().ast, F = this.nodeSymbol(P).getFiltered(UNHANDLED);
+	let { ast: P } = this.parseFile(r).getValue(), F = this.nodeSymbol(P).getFiltered(UNHANDLED);
 	return F ? this.interpretSymbol(F, r).map((r) => r === UNHANDLED || !r ? void 0 : r) : Report.create(void 0);
 }
 function interpretProject() {
@@ -13439,7 +13397,7 @@ function interpretProject() {
 		r.push(...F.getErrors()), N.push(...F.getWarnings());
 		let L = this.bindFile(P);
 		r.push(...L.getErrors()), N.push(...L.getWarnings());
-		let R = F.getValue().ast, z = this.nodeSymbol(R).getFiltered(UNHANDLED), B = z ? this.interpretSymbol(z, P) : Report.create(UNHANDLED), V = B.getFiltered(UNHANDLED);
+		let { ast: R } = F.getValue(), z = this.nodeSymbol(R).getFiltered(UNHANDLED), B = z ? this.interpretSymbol(z, P) : Report.create(UNHANDLED), V = B.getFiltered(UNHANDLED);
 		V && I.set(P.absolute, V), r.push(...B.getErrors()), N.push(...B.getWarnings());
 	}
 	let L = {};
@@ -14855,8 +14813,8 @@ function computeDeleteEdit(r, j, M) {
 	}];
 }
 var COMPUTING = Symbol("COMPUTING"), Compiler = class {
-	constructor(r = new MemoryProjectLayout()) {
-		this.nodeIdGenerator = new SyntaxNodeIdGenerator(), this.symbolIdGenerator = new NodeSymbolIdGenerator(), this.symbolFactory = new SymbolFactory(this.symbolIdGenerator), this.sourceSnapshot = /* @__PURE__ */ new Map(), this.globalCache = /* @__PURE__ */ new Map(), this.localCache = /* @__PURE__ */ new Map(), this.parseFile = this.localQuery(parseFile), this.parseProject = this.globalQuery(parseProject), this.validateNode = this.localQuery(validateNode), this.validateFile = this.localQuery(validateFile), this.nodeFullname = this.localQuery(nodeFullname), this.nodeAlias = this.localQuery(nodeAlias), this.nodeSettings = this.localQuery(nodeSettings), this.canonicalName = this.globalQuery(canonicalName), this.bindNode = this.globalQuery(bindNode), this.bindFile = this.globalQuery(bindFile), this.bindProject = this.globalQuery(bindProject), this.interpretSymbol = this.globalQuery(interpretSymbol), this.interpretMetadata = interpretMetadata.bind(this), this.interpretFile = this.globalQuery(interpretFile), this.interpretProject = this.globalQuery(interpretProject), this.nodeSymbol = this.globalQuery(nodeSymbol), this.nodeMetadata = this.globalQuery(nodeMetadata), this.symbolMembers = this.globalQuery(symbolMembers), this.lookupMembers = this.globalQuery(lookupMembers), this.nodeReferee = this.globalQuery(nodeReferee), this.resolutionIndex = this.globalQuery(resolutionIndex), this.symbolReferences = this.globalQuery(symbolReferences), this.symbolParent = this.globalQuery(symbolParent), this.symbolMetadata = this.globalQuery(symbolMetadata), this.symbolAliases = this.globalQuery(symbolAliases), this.symbolUses = this.globalQuery(symbolUses), this.fileDependencies = this.localQuery(fileDependencies), this.reachableFiles = this.globalQuery(reachableFiles), this.usableMembers = this.globalQuery(usableMembers), this.nodeAtPosition = this.localQuery(nodeAtPosition), this.renameTable = renameTable.bind(this), this.syncDiagramView = syncDiagramView.bind(this), this.token = {
+	constructor(r) {
+		this.layout = r, this.nodeIdGenerator = new SyntaxNodeIdGenerator(), this.symbolIdGenerator = new NodeSymbolIdGenerator(), this.symbolFactory = new SymbolFactory(this.symbolIdGenerator), this.sourceSnapshot = /* @__PURE__ */ new Map(), this.globalCache = /* @__PURE__ */ new Map(), this.localCache = /* @__PURE__ */ new Map(), this.parseFile = this.localQuery(parseFile), this.parseProject = this.globalQuery(parseProject), this.validateNode = this.localQuery(validateNode), this.validateFile = this.localQuery(validateFile), this.nodeFullname = this.localQuery(nodeFullname), this.nodeAlias = this.localQuery(nodeAlias), this.nodeSettings = this.localQuery(nodeSettings), this.canonicalName = this.globalQuery(canonicalName), this.bindNode = this.globalQuery(bindNode), this.bindFile = this.globalQuery(bindFile), this.bindProject = this.globalQuery(bindProject), this.interpretSymbol = this.globalQuery(interpretSymbol), this.interpretMetadata = interpretMetadata.bind(this), this.interpretFile = this.globalQuery(interpretFile), this.interpretProject = this.globalQuery(interpretProject), this.nodeSymbol = this.globalQuery(nodeSymbol), this.nodeMetadata = this.globalQuery(nodeMetadata), this.symbolMembers = this.globalQuery(symbolMembers), this.lookupMembers = this.globalQuery(lookupMembers), this.nodeReferee = this.globalQuery(nodeReferee), this.resolutionIndex = this.globalQuery(resolutionIndex), this.symbolReferences = this.globalQuery(symbolReferences), this.symbolParent = this.globalQuery(symbolParent), this.symbolMetadata = this.globalQuery(symbolMetadata), this.symbolAliases = this.globalQuery(symbolAliases), this.symbolUses = this.globalQuery(symbolUses), this.fileDependencies = this.localQuery(fileDependencies), this.reachableFiles = this.globalQuery(reachableFiles), this.usableMembers = this.globalQuery(usableMembers), this.nodeAtPosition = this.localQuery(nodeAtPosition), this.renameTable = renameTable.bind(this), this.syncDiagramView = syncDiagramView.bind(this), this.token = {
 			invalidStream: this.localQuery(invalidStream),
 			flatStream: this.localQuery(flatStream)
 		}, this.parse = {
@@ -14873,7 +14831,7 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 			element: this.localQuery(containerElement),
 			scope: this.localQuery(containerScope),
 			scopeKind: this.localQuery(containerScopeKind)
-		}, this.layout = r;
+		};
 	}
 	getSource(r) {
 		return this.layout.getSource(r);
@@ -14955,5 +14913,47 @@ var COMPUTING = Symbol("COMPUTING"), Compiler = class {
 			diagnosticsProvider: new DBMLDiagnosticsProvider(this)
 		};
 	}
+}, MemoryProjectLayout = class r {
+	constructor(r = {}) {
+		this.files = r instanceof Map ? new Map(r) : new Map(Object.entries(r));
+	}
+	setSource(r, j) {
+		this.files.set(r.absolute, j);
+	}
+	getSource(r) {
+		return this.files.get(r.absolute) ?? void 0;
+	}
+	deleteSource(r) {
+		this.files.delete(r.absolute);
+	}
+	clearSource() {
+		this.files.clear();
+	}
+	exists(r) {
+		return this.isFile(r) || this.isDirectory(r);
+	}
+	isFile(r) {
+		return this.files.has(r.absolute);
+	}
+	isDirectory(r) {
+		let j = r.absolute.endsWith("/") ? r.absolute : `${r.absolute}/`;
+		for (let r of this.files.keys()) if (r.startsWith(j)) return !0;
+		return !1;
+	}
+	listDirectory(r) {
+		let j = r?.absolute ?? "/", M = j.endsWith("/") ? j : j + "/", N = /* @__PURE__ */ new Set();
+		for (let r of this.files.keys()) {
+			if (!r.startsWith(M)) continue;
+			let j = r.slice(M.length), P = j.indexOf("/");
+			N.add(M + (P === -1 ? j : j.slice(0, P)));
+		}
+		return [...N].sort().map(Filepath.from);
+	}
+	getEntrypoints() {
+		return [...this.files.keys()].map(Filepath.from).sort((r, j) => r.absolute.localeCompare(j.absolute));
+	}
+	clone() {
+		return new r(this.files);
+	}
 };
 export { ArrayNode, AttributeNode, BlockExpressionNode, CallExpressionNode, CommaExpressionNode, CompileError, CompileErrorCode, Compiler, CompletionItemInsertTextRule, CompletionItemKind, DBMLCompletionItemProvider, DBMLDefinitionProvider, DBMLDiagnosticsProvider, DBMLReferencesProvider, DEFAULT_ENTRY, ElementDeclarationNode, ElementKind, EmptyNode, FALSY_VALUES, Filepath, FunctionApplicationNode, FunctionExpressionNode, GroupExpressionNode, IdentifierStreamNode, InfixExpressionNode, ListExpressionNode, LiteralNode, MarkerSeverity, MemoryProjectLayout, PostfixExpressionNode, PrefixExpressionNode, PrimaryExpressionNode, ProgramNode, ScopeKind, SymbolKind, SyntaxNode, SyntaxNodeIdGenerator, SyntaxNodeKind, SyntaxToken, SyntaxTokenKind, TRUTHY_VALUES, TupleExpressionNode, UNHANDLED, URI as Uri, UseDeclarationNode, UseSpecifierListNode, UseSpecifierNode, VariableNode, WildcardNode, addDoubleQuoteIfNeeded, dbmlLanguageConfig, dbmlMonarchTokensProvider, escapeString, extractNumericLiteral, extractSignedNumber, formatRecordValue, getRecordValueType, isBinaryType, isBooleanType, isDateTimeType, isEmptyStringLiteral, isFloatType, isFunctionExpression, isIntegerType, isNullish, isNumericType, isOp, isOpToken, isSerialType, isStringType, isTriviaToken, isValidIdentifier, normalizeTypeName, splitQualifiedIdentifier, tryExtractBoolean, tryExtractDateTime, tryExtractEnum, tryExtractInteger, tryExtractNumeric, tryExtractString, unescapeString, validateForeignKeys, validatePrimaryKey, validateUnique };

package/dist/src/compiler/index.d.ts

@@ -9,11 +9,11 @@ export { ScopeKind } from './types';
 export type { DiagramViewBlock, TableNameInput, TextEdit } from './queries/transform';
 export { addDoubleQuoteIfNeeded, escapeString, formatRecordValue, isValidIdentifier, splitQualifiedIdentifier, unescapeString, findDiagramViewBlocks, };
 export default class Compiler {
+    layout: DbmlProjectLayout;
     readonly nodeIdGenerator: SyntaxNodeIdGenerator;
     readonly symbolIdGenerator: NodeSymbolIdGenerator;
     readonly symbolFactory: SymbolFactory;
-    layout: DbmlProjectLayout;
-    constructor(layout?: DbmlProjectLayout);
+    constructor(layout: DbmlProjectLayout);
     getSource(filepath: Filepath): string | undefined;
     private sourceSnapshot;
     private cleanStaleLocalCache;

package/dist/src/compiler/projectLayout/layout.d.ts

@@ -8,7 +8,7 @@ export interface DbmlProjectLayout {
     getEntrypoints(): Filepath[];
 }
 export declare class MemoryProjectLayout implements DbmlProjectLayout {
-    private files;
+    private readonly files;
     constructor(files?: Map<string, string> | Record<string, string>);
     setSource(filePath: Filepath, content: string): void;
     getSource(filePath: Filepath): string | undefined;

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/parse",
-  "version": "8.0.0-alpha.11",
+  "version": "8.0.0-alpha.13",
   "description": "DBML parser v2",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -46,5 +46,5 @@
   "engines": {
     "node": ">=18"
   },
-  "gitHead": "976e0f27c85468fa8a0fbb2ded04862e86b05b89"
+  "gitHead": "632d9ce9317eff1404c5fe35fb16cf732faa3867"
 }