@xdbml/parse 0.6.3 → 0.6.4

package/dist/module-resolver.d.ts

@@ -107,6 +107,12 @@ export declare function isUrlKey(s: string): boolean;
  * union; throws ModuleSourceError for disallowed forms. Pure and sync.
  */
 export declare function classifyModuleSource(from: string): ModuleSource;
+/**
+ * A local file path with Windows backslashes turned into forward slashes;
+ * a URL key is returned unchanged. The parser keys modules, and detects
+ * import cycles, on paths in this form.
+ */
+export declare function toForwardSlashes(p: string): string;
 /**
  * Default recursion depth limit for module resolution. Enough for any
  * realistic module graph; small enough to bound stack usage on

package/dist/module-resolver.js

@@ -731,8 +731,11 @@ export function classifyModuleSource(from) {
  *     exactly as in v0.2.
  *
  * Uses pure string / WHATWG-URL manipulation (no node:path) so the same
- * code runs in Node and the browser. Forward slashes only; Windows paths
- * with backslashes should be normalized before reaching the parser.
+ * code runs in Node and the browser. A local path may use backslashes, as
+ * a native Windows path does (`C:\\repo\\main.xdbml`): they read as forward
+ * slashes, and the key handed to `readFile` uses forward slashes, which
+ * Node's fs accepts on Windows. Until v0.6.4 a backslash path lost its
+ * directory, so './lib' was read from the working directory instead.
  */
 function resolveModulePath(fromClause, importerPath) {
     const source = classifyModuleSource(fromClause);
@@ -749,21 +752,30 @@ function resolveModulePath(fromClause, importerPath) {
         // also what we want for the cycle-detection / de-duplication key.
         return new URL(rel, importerPath).href;
     }
-    // Local relative source (unchanged v0.2 behavior).
-    let withExt = source.from;
+    // Local relative source (v0.2 behavior, with Windows separators read as
+    // forward slashes from v0.6.4).
+    let withExt = toForwardSlashes(source.from);
     if (!withExt.endsWith('.xdbml')) {
         withExt = `${withExt}.xdbml`;
     }
-    // Absolute path: return as-is.
-    if (withExt.startsWith('/'))
+    // Absolute path, POSIX or with a Windows drive letter: return as-is.
+    if (withExt.startsWith('/') || /^[A-Za-z]:\//.test(withExt))
         return withExt;
     // No importer context: return as-is (resolver handles it).
     if (!importerPath)
         return withExt;
     // Resolve relative to importer's directory.
-    const importerDir = posixDirname(importerPath);
+    const importerDir = posixDirname(toForwardSlashes(importerPath));
     return posixJoin(importerDir, withExt);
 }
+/**
+ * A local file path with Windows backslashes turned into forward slashes;
+ * a URL key is returned unchanged. The parser keys modules, and detects
+ * import cycles, on paths in this form.
+ */
+export function toForwardSlashes(p) {
+    return isUrlKey(p) ? p : p.replace(/\\/g, '/');
+}
 function posixDirname(p) {
     const idx = p.lastIndexOf('/');
     if (idx < 0)

package/dist/name-resolver.d.ts

@@ -67,7 +67,7 @@ export interface SymbolEntry {
  * Stable diagnostic code. Tooling can match on these to filter or style
  * messages without parsing the human-readable text.
  */
-export type DiagnosticCode = 'duplicate-declaration' | 'name-collision' | 'container-target-missing' | 'container-target-not-in-project' | 'unresolved-type' | 'possible-type-typo' | 'unresolved-key-field' | 'unresolved-index-field' | 'key-path-crosses-collection' | 'invalid-key-flags' | 'duplicate-primary-key' | 'duplicate-unique-key' | 'null-in-primary-key' | 'duplicate-constraints-block' | 'ref-target-not-key' | 'unresolved-entity' | 'unresolved-field' | 'unresolved-partial' | 'unresolved-tablegroup-member' | 'unresolved-records-entity' | 'unresolved-records-column' | 'empty-import' | 'invalid-nested-path' | 'foreign-master-composite' | 'foreign-master-duplicate-child' | 'foreign-master-without-ref' | 'construct-requires-version' | 'ambiguous-ref-endpoint' | 'invalid-constraint-type' | 'constraint-type-on-foreign-master' | 'invalid-undirected' | 'entity-level-many-to-many' | 'missing-supertype' | 'unresolved-supertype-group-member' | 'invalid-supertype-group-value' | 'duplicate-subtype' | 'supertype-is-subtype' | 'subtype-in-multiple-groups' | 'supertype-cycle' | 'supertype-attribute-redeclared' | 'discriminator-on-overlapping-group' | 'merge-without-roll-up' | 'empty-supertype-group' | 'source-query-in-settings' | 'duplicate-source-query' | 'duplicate-diagram-view' | 'duplicate-diagram-view-category' | 'unresolved-diagram-view-name' | 'ambiguous-diagram-view-name' | 'diagram-view-wrong-category' | 'unknown-diagram-view-setting';
+export type DiagnosticCode = 'duplicate-declaration' | 'name-collision' | 'container-target-missing' | 'container-target-not-in-project' | 'unresolved-type' | 'possible-type-typo' | 'unresolved-key-field' | 'unresolved-index-field' | 'key-path-crosses-collection' | 'invalid-key-flags' | 'duplicate-primary-key' | 'duplicate-unique-key' | 'null-in-primary-key' | 'duplicate-constraints-block' | 'ref-target-not-key' | 'unresolved-entity' | 'unresolved-field' | 'unresolved-partial' | 'unresolved-tablegroup-member' | 'unresolved-records-entity' | 'unresolved-records-column' | 'empty-import' | 'invalid-nested-path' | 'foreign-master-composite' | 'foreign-master-duplicate-child' | 'foreign-master-without-ref' | 'construct-requires-version' | 'ambiguous-ref-endpoint' | 'invalid-constraint-type' | 'constraint-type-on-foreign-master' | 'invalid-undirected' | 'entity-level-many-to-many' | 'missing-supertype' | 'unresolved-supertype-group-member' | 'invalid-supertype-group-value' | 'duplicate-subtype' | 'supertype-is-subtype' | 'subtype-in-multiple-groups' | 'supertype-cycle' | 'supertype-attribute-redeclared' | 'discriminator-on-overlapping-group' | 'merge-without-roll-up' | 'empty-supertype-group' | 'source-query-in-settings' | 'duplicate-source-query' | 'duplicate-diagram-view' | 'duplicate-diagram-view-category' | 'unresolved-diagram-view-name' | 'ambiguous-diagram-view-name' | 'diagram-view-wrong-category' | 'unknown-diagram-view-setting' | 'invalid-tuple-positions' | 'named-type-shadows-builtin';
 /**
  * A single resolution diagnostic. Severity is currently always `error`,
  * but the field is included to leave room for future warnings (e.g.,

package/dist/name-resolver.js

@@ -239,6 +239,28 @@ export function resolveNames(doc) {
     diagnostics.push(...checkViews(flat));
     // Pass 7: diagram views (spec §18.6).
     diagnostics.push(...checkDiagramViews(flat));
+    // Pass 8: Types under the name of a built-in type (spec §15.2).
+    for (const t of flat.statements) {
+        if (t.kind !== 'TypeDeclaration' || !BUILTIN_TYPES.has(t.name.toLowerCase()))
+            continue;
+        {
+            diagnostics.push({
+                severity: 'error',
+                code: 'named-type-shadows-builtin',
+                message: `Type '${t.name}' takes the name of a built-in type. Built-in types take precedence, so a field ` +
+                    `typed ${t.name.toLowerCase()} keeps the built-in type: rename the Type (spec §15.2).`,
+                span: t.span,
+            });
+        }
+    }
+    // The parser checked neither rule before v0.6.4, so a document declaring
+    // a version earlier than 0.6 draws a warning and stays valid (§8.6, §15.2).
+    if (!versionAtLeast(flat, '0.6')) {
+        for (const d of diagnostics) {
+            if (d.code === 'invalid-tuple-positions' || d.code === 'named-type-shadows-builtin')
+                d.severity = 'warning';
+        }
+    }
     return { diagnostics, symbols };
 }
 /* -------------------------------------------------------------------------
@@ -569,11 +591,24 @@ function resolveTypeExpression(expr, symbols, diagnostics) {
         case 'SetType':
             resolveTypeExpression(expr.elementType, symbols, diagnostics);
             return;
-        case 'TupleType':
+        case 'TupleType': {
+            // Spec §8.6: positions form a contiguous range from 0, each once.
+            const positions = expr.elements.map((e) => e.position);
+            const sorted = [...positions].sort((a, b) => a - b);
+            if (sorted.some((p, i) => p !== i)) {
+                diagnostics.push({
+                    severity: 'error',
+                    code: 'invalid-tuple-positions',
+                    message: `Tuple positions ${positions.map((p) => `[${p}]`).join(', ')} do not run from [0] to ` +
+                        `[${positions.length - 1}], each once: a tuple numbers its elements from 0 without a gap (spec §8.6).`,
+                    span: expr.span,
+                });
+            }
             for (const elem of expr.elements) {
                 resolveTypeExpression(elem.type, symbols, diagnostics);
             }
             return;
+        }
         case 'JsonType':
             // No nested type expressions.
             return;

package/dist/parser.d.ts

@@ -26,7 +26,7 @@ export declare class ParseError extends Error {
  * declaring a later version is refused (spec 4.1) rather than parsed with
  * semantics it does not have.
  */
-export declare const SUPPORTED_XDBML_VERSION = "0.6.3";
+export declare const SUPPORTED_XDBML_VERSION = "0.6.4";
 /** Compare dotted version strings numerically: -1, 0 or 1. */
 export declare function compareVersions(a: string, b: string): number;
 export declare class Parser {
@@ -40,6 +40,8 @@ export declare class Parser {
      * 1-arg form).
      */
     private options;
+    /** The version the document declares, once read; undefined without a declaration. */
+    private declaredVersion;
     /**
      * The set of file paths currently being parsed in the resolution chain.
      * Used for cycle detection: when resolving a directive whose `from` path

package/dist/parser.js

@@ -11,7 +11,7 @@
  */
 import { markPrimaryKeyNotNull } from "./constraints.js";
 import { TokenKind, tokenize, } from "./lexer.js";
-import { resolveImport, classifyModuleSource, ModuleSourceError } from "./module-resolver.js";
+import { resolveImport, classifyModuleSource, ModuleSourceError, toForwardSlashes } from "./module-resolver.js";
 export class ParseError extends Error {
     position;
     /**
@@ -32,7 +32,7 @@ export class ParseError extends Error {
  * declaring a later version is refused (spec 4.1) rather than parsed with
  * semantics it does not have.
  */
-export const SUPPORTED_XDBML_VERSION = '0.6.3';
+export const SUPPORTED_XDBML_VERSION = '0.6.4';
 /** Compare dotted version strings numerically: -1, 0 or 1. */
 export function compareVersions(a, b) {
     const pa = a.split('.').map((n) => Number(n) || 0);
@@ -134,6 +134,8 @@ export class Parser {
      * 1-arg form).
      */
     options;
+    /** The version the document declares, once read; undefined without a declaration. */
+    declaredVersion;
     /**
      * The set of file paths currently being parsed in the resolution chain.
      * Used for cycle detection: when resolving a directive whose `from` path
@@ -274,6 +276,7 @@ export class Parser {
             this.advance(); // .
             version += `.${this.advance().text}`;
         }
+        this.declaredVersion = version;
         if (compareVersions(version, SUPPORTED_XDBML_VERSION) > 0) {
             throw new ParseError(`This document declares 'xdbml: ${version}', which is newer than the ` +
                 `latest version this parser supports (${SUPPORTED_XDBML_VERSION}). ` +
@@ -733,6 +736,12 @@ export class Parser {
         const start = this.peek().start;
         const modeTok = this.advance(); // 'use' or 'reuse'
         const mode = modeTok.text.toLowerCase();
+        // Appendix D, item 3: the module system belongs to the v0.2 feature set,
+        // so a document declaring xdbml: 0.1 cannot use it (checked from v0.6.4).
+        if (this.declaredVersion && compareVersions(this.declaredVersion, '0.2') < 0) {
+            throw new ParseError(`The module system (use and reuse) needs xdbml: 0.2 or later; this document declares ` +
+                `xdbml: ${this.declaredVersion} (spec §27, Appendix D).`, modeTok.start);
+        }
         // Import spec: '*' or '{ ... }'
         let spec;
         if (this.check(TokenKind.Star)) {
@@ -742,16 +751,15 @@ export class Parser {
         else if (this.check(TokenKind.LBrace)) {
             this.advance();
             const items = [];
-            // Skip leading whitespace/newlines (already handled by lexer).
-            while (!this.check(TokenKind.RBrace) && !this.check(TokenKind.EOF)) {
-                items.push(this.parseImportItem(context));
-                if (this.match(TokenKind.Comma)) {
-                    // Tolerate trailing comma before the closing brace.
-                    continue;
-                }
-                else {
+            // A list body (spec §3.9, §27.2, v0.6.4): items one per line, or
+            // separated by commas, with commas and semicolons optional anywhere
+            // between items. Until v0.6.4 the parser required a comma between
+            // two items, against the multi-line form §27.2 shows.
+            for (;;) {
+                this.skipListSeparators();
+                if (this.check(TokenKind.RBrace) || this.check(TokenKind.EOF))
                     break;
-                }
+                items.push(this.parseImportItem(context));
             }
             this.expect(TokenKind.RBrace, "Expected '}' closing import item list");
             if (items.length === 0) {
@@ -2524,7 +2532,7 @@ export function parse(source, options = {}) {
     // the outer level too). If no filePath is provided, the stack is empty.
     const initialStack = new Set();
     if (options.filePath)
-        initialStack.add(options.filePath);
+        initialStack.add(toForwardSlashes(options.filePath));
     const doc = new Parser(tokens, options, initialStack, 0).parseDocument();
     applyEntityAliases(doc);
     return doc;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@xdbml/parse",
-  "version": "0.6.3",
+  "version": "0.6.4",
   "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",