@xdbml/parse 0.3.0 → 0.3.1

package/dist/parser.d.ts

@@ -219,6 +219,8 @@ export declare class Parser {
     /** True if the token looks like the start of a TypeExpression. */
     private tokenStartsType;
     private parseTupleElements;
+    /** Lookahead for a tuple position marker `[ <number> ]` (vs. a settings block). */
+    private positionMarkerAhead;
     private parseMapType;
     private parseSetType;
     /**

package/dist/parser.js

@@ -1049,7 +1049,11 @@ export class Parser {
             this.expect(TokenKind.RBracket, "Expected ']' after position");
             const nameTok = this.expect(TokenKind.Identifier, 'Expected tuple element name');
             const type = this.parseTypeExpression();
-            const settings = this.maybeSettingsBlock();
+            // Optional per-element settings. A following `[` only opens a settings
+            // block if it is NOT the next element's `[N]` position marker; otherwise
+            // maybeSettingsBlock would greedily consume it and fail on the number
+            // (grammar: tupleElement's settingsBlock is optional).
+            const settings = this.positionMarkerAhead() ? [] : this.maybeSettingsBlock();
             out.push({
                 kind: 'TupleElement',
                 position: parseInt(numTok.text, 10),
@@ -1058,11 +1062,19 @@ export class Parser {
                 settings,
                 span: this.spanFrom(start),
             });
-            if (!this.match(TokenKind.Comma))
-                break;
+            // Elements may be separated by a comma OR by whitespace/newline alone
+            // (grammar: `tupleElement (COMMA? tupleElement)+`). Consume an optional
+            // separator; the loop condition resumes on the next `[N]`.
+            this.match(TokenKind.Comma);
         }
         return out;
     }
+    /** Lookahead for a tuple position marker `[ <number> ]` (vs. a settings block). */
+    positionMarkerAhead() {
+        return this.check(TokenKind.LBracket)
+            && this.peek(1).kind === TokenKind.NumberLiteral
+            && this.peek(2).kind === TokenKind.RBracket;
+    }
     parseMapType() {
         const start = this.peek().start;
         const kwTok = this.advance();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xdbml/parse",
-  "version": "0.3.0",
+  "version": "0.3.1",
   "description": "Parser for xDBML (eXtended Database Markup Language), a strict superset of DBML 3.13.6: tokenizer, parser, module resolver, and name resolver.",
   "license": "Apache-2.0",
   "author": "Hackolade",