@xdbml/parse 0.4.0 → 0.5.1

package/dist/ast.d.ts

@@ -38,7 +38,7 @@ export interface ExperimentalDeclaration {
     features: string[];
     span: Span;
 }
-export type TopLevelStatement = ProjectDeclaration | ContainerDeclaration | EntityDeclaration | TypeDeclaration | EdgeDeclaration | ViewDeclaration | EnumDeclaration | RefDeclaration | TablePartialDeclaration | TableGroupDeclaration | NoteDeclaration | TopLevelRecordsDeclaration | ModuleImportDirective;
+export type TopLevelStatement = ProjectDeclaration | ContainerDeclaration | EntityDeclaration | TypeDeclaration | EdgeDeclaration | ViewDeclaration | EnumDeclaration | RefDeclaration | TablePartialDeclaration | TableGroupDeclaration | SupertypeGroupDeclaration | NoteDeclaration | TopLevelRecordsDeclaration | ModuleImportDirective;
 export interface ProjectDeclaration {
     kind: 'ProjectDeclaration';
     name: string;
@@ -81,7 +81,11 @@ export interface FieldDeclaration {
 export type TypeExpression = ScalarType | ObjectType | ArrayType | TupleType | MapType | SetType | UnionType | OneOfType | AnyOfType | AllOfType | JsonType | NamedTypeReference;
 export interface ScalarType {
     kind: 'ScalarType';
-    /** The base name: `int`, `varchar`, `decimal`, `objectId`, `Decimal128`, etc. */
+    /**
+     * The base name: `int`, `varchar`, `decimal`, `objectId`, `Decimal128`,
+     * etc. May be qualified, `core.job_status`, when it names an Enum
+     * declared in a container (spec §16).
+     */
     name: string;
     /** `(p, s)` parameters, e.g. for `decimal(19, 4)`. Numbers preserved as strings to keep round-trip fidelity. */
     params?: string[];
@@ -182,7 +186,7 @@ export interface TypeDeclaration {
     kind: 'TypeDeclaration';
     name: string;
     /**
-     * v0.2 scalar form (spec §14.7): when present, this Type is an alias
+     * v0.2 scalar form (spec §15.7): when present, this Type is an alias
      * for the given type expression rather than an object-shaped record.
      * Examples:
      *
@@ -229,6 +233,11 @@ export interface EnumDeclaration {
     kind: 'EnumDeclaration';
     /** Source casing of `enum` or `Enum`; both are valid. */
     keywordCasing: string;
+    /**
+     * May be `container.enum` form when declared schema-qualified at the
+     * top level (`enum core.job_status`); the resolver files it under that
+     * container, like an Enum declared inside the Container block.
+     */
     name: string;
     values: EnumValue[];
     span: Span;
@@ -339,6 +348,21 @@ export interface TableGroupDeclaration {
     members: string[];
     span: Span;
 }
+export interface SupertypeGroupDeclaration {
+    kind: 'SupertypeGroupDeclaration';
+    name: string;
+    settings: Setting[];
+    members: SupertypeGroupMember[];
+    span: Span;
+}
+export interface SupertypeGroupMember {
+    kind: 'SupertypeGroupMember';
+    /** Entity path as written: `Person` or `crm.Person`. */
+    name: string;
+    /** Member settings; `strategy` is the only recognized one (spec §12.7.4). */
+    settings: Setting[];
+    span: Span;
+}
 export interface PartialInjection {
     kind: 'PartialInjection';
     /** Identifier after the `~`. */
@@ -385,7 +409,7 @@ export interface ModuleImportDirective {
     /**
      * Directive mode:
      *   - `'reuse'`: transitive (visible to files that further import this file).
-     *     The recommended default per spec §26.4.
+     *     The recommended default per spec §27.4.
      *   - `'use'`: non-transitive (private to this file).
      */
     mode: 'use' | 'reuse';
@@ -424,9 +448,10 @@ export type ImportSpec = {
  *     type Email as PII_Email
  *     field core.dim_customer.email
  *
- * The element type is one of the keywords from §26.3 (table, entity,
+ * The element type is one of the keywords from §27.3 (table, entity,
  * collection, record, enum, tablepartial, note, schema, container,
- * tablegroup, type, edge, view, diagramview, field). Stored lowercased.
+ * tablegroup, type, edge, view, diagramview, field, and from v0.5
+ * supertypegroup). Stored lowercased.
  *
  * The source path follows xDBML's standard dotted form. Container.Entity
  * for an entity inside a Container; Container.Entity.Field for a field.
@@ -447,7 +472,7 @@ export interface ImportItem {
  * an entity, type, container, etc. clone). Field imports are not supported
  * in P4 -- when they land, this type may grow to a wider union.
  *
- * Per spec §26.6, the clone contains exactly the imported declaration(s),
+ * Per spec §27.6, the clone contains exactly the imported declaration(s),
  * without surrounding wrappers from the source file. For an entity clone
  * the content is the EntityDeclaration alone (no container wrapper); for a
  * container clone the content is the ContainerDeclaration including its
@@ -459,7 +484,7 @@ export interface CloneBlock {
      * Statements that the importing file pulls in from the source. Most are
      * top-level shapes (Entity, Type, Enum, Container, etc.). The one
      * exception is `FieldDeclaration`: when the parent directive imports
-     * one or more fields via `field <path>` items (spec §26.8), each field
+     * one or more fields via `field <path>` items (spec §27.8), each field
      * appears here as a bare FieldDeclaration with no entity wrapper.
      * The `flatten()` pass lifts each bare field into a synthetic
      * TypeDeclaration at file scope so downstream consumers see a normal
@@ -545,7 +570,7 @@ export interface ParseOptions {
      * Because this reader is synchronous, a host that supports remote sources
      * must return the fetched text from a cache it populated beforehand. The
      * network fetch, and its SSRF / redirect / size / timeout obligations
-     * (spec §26.14.5), live in the host's resolver, not in the parser.
+     * (spec §27.14.5), live in the host's resolver, not in the parser.
      *
      * If absent, reference-only directives fall back to the P4 rejection
      * with a clear "no resolver available" message. Clone-block-bearing

package/dist/index.d.ts

@@ -27,13 +27,15 @@
 export * from './ast.ts';
 export { tokenize, TokenKind, LexError } from './lexer.ts';
 export type { Token } from './lexer.ts';
-export { parse, Parser, ParseError } from './parser.ts';
+export { parse, Parser, ParseError, SUPPORTED_XDBML_VERSION, compareVersions } from './parser.ts';
 export { flatten } from './module-resolver.ts';
 export { classifyModuleSource, isUrlKey, ModuleSourceError, } from './module-resolver.ts';
 export type { ModuleSource } from './module-resolver.ts';
 export { resolveNames, SymbolTable } from './name-resolver.ts';
 export { FOREIGN_MASTER_FLAG, checkRelationships, hasForeignMasterFlag, isForeignMaster, pathToString, refChildEndpoint, refParentEndpoint, relationshipType, versionAtLeast, CONSTRAINT_TYPES, V04_RELATIONSHIP_SETTINGS, constraintType, entityNames, isEntityLevelEndpoint, isUndirected, } from './relationships.ts';
 export type { RelationshipType, ConstraintType } from './relationships.ts';
+export { SUPERTYPE_GROUP_VALUES, canonicalSupertypeGroupValue, checkSupertypeGroups, resolveSupertypeGroups, subtypeStrategy, supertypeChains, supertypeGroupSettings, } from './supertypes.ts';
+export type { Completeness, Exclusivity, MaterializationStrategy, MergeOption, ResolvedSupertypeGroup, SupertypeGroupSettings, SupertypeGroupValueSetting, } from './supertypes.ts';
 export type { Diagnostic, DiagnosticCode, ResolutionResult, SymbolEntry, SymbolKind, } from './name-resolver.ts';
 export { xdbmlLanguageConfig, xdbmlMonarchTokensProvider, } from './monarch.ts';
 export type { XDbmlLanguageConfiguration, XDbmlMonarchLanguage, } from './monarch.ts';

package/dist/index.js

@@ -26,9 +26,10 @@
  */
 export * from "./ast.js";
 export { tokenize, TokenKind, LexError } from "./lexer.js";
-export { parse, Parser, ParseError } from "./parser.js";
+export { parse, Parser, ParseError, SUPPORTED_XDBML_VERSION, compareVersions } from "./parser.js";
 export { flatten } from "./module-resolver.js";
 export { classifyModuleSource, isUrlKey, ModuleSourceError, } from "./module-resolver.js";
 export { resolveNames, SymbolTable } from "./name-resolver.js";
 export { FOREIGN_MASTER_FLAG, checkRelationships, hasForeignMasterFlag, isForeignMaster, pathToString, refChildEndpoint, refParentEndpoint, relationshipType, versionAtLeast, CONSTRAINT_TYPES, V04_RELATIONSHIP_SETTINGS, constraintType, entityNames, isEntityLevelEndpoint, isUndirected, } from "./relationships.js";
+export { SUPERTYPE_GROUP_VALUES, canonicalSupertypeGroupValue, checkSupertypeGroups, resolveSupertypeGroups, subtypeStrategy, supertypeChains, supertypeGroupSettings, } from "./supertypes.js";
 export { xdbmlLanguageConfig, xdbmlMonarchTokensProvider, } from "./monarch.js";

package/dist/keywords.d.ts

@@ -33,13 +33,14 @@ export declare const ENTITY_KEYWORDS: readonly ["table", "entity", "collection",
  * The full set of declaration keywords. Includes containers,
  * entities, and other top-level constructs.
  */
-export declare const DECLARATION_KEYWORDS: readonly ["project", "container", "schema", "database", "keyspace", "namespace", "dataset", "bucket", "table", "entity", "collection", "record", "type", "edge", "view", "enum", "ref", "note", "tablepartial", "tablegroup", "diagramview"];
+export declare const DECLARATION_KEYWORDS: readonly ["project", "container", "schema", "database", "keyspace", "namespace", "dataset", "bucket", "table", "entity", "collection", "record", "type", "edge", "view", "enum", "ref", "note", "tablepartial", "tablegroup", "supertypegroup", "diagramview"];
 export declare const STRUCTURAL_TYPE_KEYWORDS: readonly ["object", "struct", "array", "list", "map", "dict", "dictionary", "set", "json", "jsonb", "variant"];
 export declare const POLYMORPHISM_KEYWORDS: readonly ["union", "oneof", "anyof", "allof"];
 export declare const SCALAR_TYPES: readonly ["tinyint", "smallint", "mediumint", "int", "integer", "bigint", "int32", "int64", "float", "double", "decimal", "dec", "numeric", "real", "bit", "bool", "boolean", "char", "varchar", "varchar2", "nvarchar", "nvarchar2", "nchar", "text", "mediumtext", "longtext", "string", "ntext", "binary", "varbinary", "blob", "mediumblob", "longblob", "tinyblob", "tinytext", "json", "jsonb", "variant", "xml", "date", "time", "datetime", "datetime2", "timestamp", "timestamptz", "year", "uuid", "inet6", "money", "smallmoney", "enum"];
 export declare const BSON_TYPES: readonly ["objectid", "decimal128", "bindata", "minkey", "maxkey", "symbol", "regex", "long", "double"];
+export declare const TARGET_NATIVE_TYPES: readonly ["number", "binary_float", "binary_double", "clob", "nclob", "bfile", "raw", "rowid", "urowid", "xmltype", "sdo_geometry", "interval", "serial", "smallserial", "bigserial", "serial2", "serial4", "serial8", "int2", "int4", "int8", "float4", "float8", "bytea", "citext", "inet", "cidr", "macaddr", "macaddr8", "tsvector", "tsquery", "hstore", "jsonpath", "timetz", "varbit", "int4range", "int8range", "numrange", "tsrange", "tstzrange", "daterange", "uniqueidentifier", "datetimeoffset", "smalldatetime", "rowversion", "hierarchyid", "sql_variant", "timestamp_ntz", "timestamp_ltz", "timestamp_tz", "vector", "float64", "bignumeric", "bigdecimal", "bytes", "geometry", "geography", "ascii", "varint", "timeuuid", "uint32", "uint64", "sint32", "sint64", "fixed32", "fixed64", "sfixed32", "sfixed64", "uint8", "uint16", "int16", "float32"];
 export declare const SETTING_FLAGS: readonly ["pk", "primary", "key", "unique", "null", "not", "required", "increment", "inactive", "foreign_master"];
-export declare const SETTING_KEYS: readonly ["note", "default", "ref", "name", "color", "headercolor", "as", "check", "type", "target", "targets", "database_type", "source", "source_cardinality", "target_cardinality", "min_source", "max_source", "min_target", "max_target", "undirected", "source_role", "target_role", "source_verb", "target_verb", "constraint_type", "discriminator", "source_query", "materialized", "refresh_schedule", "refresh_on", "source_database", "storage_options", "pattern", "format", "minlength", "maxlength", "minimum", "maximum", "exclusiveminimum", "exclusivemaximum", "multipleof", "minitems", "maxitems", "uniqueitems", "minproperties", "maxproperties", "synonyms", "business_term", "granularity", "tags", "delete", "update", "indexes", "checks", "replication", "location", "default_charset", "cloned_at"];
+export declare const SETTING_KEYS: readonly ["note", "default", "ref", "name", "color", "headercolor", "as", "check", "type", "target", "targets", "database_type", "source", "source_cardinality", "target_cardinality", "min_source", "max_source", "min_target", "max_target", "undirected", "source_role", "target_role", "source_verb", "target_verb", "constraint_type", "discriminator", "supertype", "completeness", "exclusivity", "strategy", "merge", "source_query", "materialized", "refresh_schedule", "refresh_on", "source_database", "storage_options", "pattern", "format", "minlength", "maxlength", "minimum", "maximum", "exclusiveminimum", "exclusivemaximum", "multipleof", "minitems", "maxitems", "uniqueitems", "minproperties", "maxproperties", "synonyms", "business_term", "granularity", "tags", "delete", "update", "indexes", "checks", "replication", "location", "default_charset", "cloned_at"];
 export declare const GRANULARITY_VALUES: readonly ["year", "quarter", "month", "week", "day", "hour", "minute", "second", "millisecond", "microsecond", "nanosecond"];
 export declare const DIRECTIVE_KEYWORDS: readonly ["xdbml", "experimental"];
 export declare const MODULE_KEYWORDS: readonly ["use", "reuse", "from", "as"];

package/dist/keywords.js

@@ -66,6 +66,7 @@ export const DECLARATION_KEYWORDS = [
     'note',
     'tablepartial',
     'tablegroup',
+    'supertypegroup',
     'diagramview',
 ];
 /* -------------------------------------------------------------------------
@@ -97,9 +98,15 @@ export const POLYMORPHISM_KEYWORDS = [
 /* -------------------------------------------------------------------------
  * Scalar and BSON types
  *
- * The parser accepts any identifier as a scalar type (open vocabulary),
- * so these lists drive color, not validation. Themes color them under
- * `storage.type` (TextMate) or `type` (Monarch).
+ * The parser accepts any identifier as a scalar type (open vocabulary,
+ * spec §1.2 principle 4), so these lists never reject a type name.
+ * They serve two purposes: themes color them under `storage.type`
+ * (TextMate) or `type` (Monarch), and the name resolver treats them as
+ * built-in names, which a Named Type cannot shadow (spec §15.2).
+ * Adding a name here therefore changes resolution as well as color: a
+ * document declaring `Type <that name>` would stop resolving to its own
+ * Type. Target-native names that only need color go in
+ * TARGET_NATIVE_TYPES below.
  * ----------------------------------------------------------------------- */
 export const SCALAR_TYPES = [
     // Integers
@@ -138,6 +145,51 @@ export const BSON_TYPES = [
     'long',
     'double',
 ];
+/* -------------------------------------------------------------------------
+ * Target-native types (highlighting only)
+ *
+ * Common type names of specific targets, colored like SCALAR_TYPES so
+ * that a physical model reads the same in the editor as a generic one.
+ * Unlike SCALAR_TYPES, these are not built-in names: the resolver
+ * passes them through like any other target-native name, and a Named
+ * Type or Enum may be declared under one of them.
+ *
+ * Coloring is position-independent (Monarch and TextMate both match
+ * the bare word), so a field named after a listed type is colored as a
+ * type too. Generic words that often name fields -- `point`, `line`,
+ * `box`, `path`, `circle`, `image`, `counter`, `duration`, `name` --
+ * are left out for that reason. The list is a convenience, not a
+ * vocabulary: a name missing from it is still a valid type.
+ * ----------------------------------------------------------------------- */
+export const TARGET_NATIVE_TYPES = [
+    // Oracle
+    'number', 'binary_float', 'binary_double', 'clob', 'nclob', 'bfile',
+    'raw', 'rowid', 'urowid', 'xmltype', 'sdo_geometry',
+    // Oracle, PostgreSQL, BigQuery, Databricks
+    'interval',
+    // PostgreSQL
+    'serial', 'smallserial', 'bigserial', 'serial2', 'serial4', 'serial8',
+    'int2', 'int4', 'int8', 'float4', 'float8', 'bytea', 'citext',
+    'inet', 'cidr', 'macaddr', 'macaddr8', 'tsvector', 'tsquery', 'hstore',
+    'jsonpath', 'timetz', 'varbit',
+    'int4range', 'int8range', 'numrange', 'tsrange', 'tstzrange', 'daterange',
+    // SQL Server
+    'uniqueidentifier', 'datetimeoffset', 'smalldatetime', 'rowversion',
+    'hierarchyid', 'sql_variant',
+    // Snowflake (plus `number`, `interval`, `geography`, `geometry`)
+    'timestamp_ntz', 'timestamp_ltz', 'timestamp_tz', 'vector',
+    // BigQuery, Avro, Protobuf
+    'float64', 'bignumeric', 'bigdecimal', 'bytes',
+    // Spatial, across several targets
+    'geometry', 'geography',
+    // Cassandra
+    'ascii', 'varint', 'timeuuid',
+    // Protobuf
+    'uint32', 'uint64', 'sint32', 'sint64',
+    'fixed32', 'fixed64', 'sfixed32', 'sfixed64',
+    // ClickHouse
+    'uint8', 'uint16', 'int16', 'float32',
+];
 /* -------------------------------------------------------------------------
  * Settings vocabulary
  *
@@ -196,6 +248,12 @@ export const SETTING_KEYS = [
     'target_verb',
     'constraint_type',
     'discriminator',
+    // v0.5 supertype groups (spec 12.2); `discriminator` is listed above
+    'supertype',
+    'completeness',
+    'exclusivity',
+    'strategy',
+    'merge',
     'source_query',
     'materialized',
     'refresh_schedule',

package/dist/module-resolver.d.ts

@@ -30,13 +30,13 @@ import type { CloneBlock, ModuleImportDirective, ParseOptions, XDbmlDocument } f
  *
  * Inside a Container body, each `ModuleImportDirective` is replaced by its
  * `clone.statements` as `ContainerBodyItem`s. Note that the spec table in
- * §26.6 guarantees that clone-block content for entity/edge/view/enum
+ * §27.6 guarantees that clone-block content for entity/edge/view/enum
  * imports is shape-compatible with `ContainerBodyItem`; other shapes
  * (e.g., a TablePartial clone inside a Container directive) would be
  * semantically invalid per the spec and would surface as a downstream
  * type error rather than being caught here.
  *
- * Field-level imports (spec §26.8) get a special transform: the clone
+ * Field-level imports (spec §27.8) get a special transform: the clone
  * block holds a bare `FieldDeclaration`, which `flatten()` lifts into a
  * synthetic `TypeDeclaration` at file scope. Downstream consumers see
  * a normal Named Type and can use it as a field type without learning
@@ -59,7 +59,7 @@ export type ParseFn = (source: string, options: ParseOptions, resolutionStack: R
  *   - `kind: 'resolved'`  -- the file was opened, parsed, and a clone
  *     block was synthesized
  *   - `kind: 'cycle'`     -- the resolution chain already contains this
- *     file; per spec §26.15 cycles are allowed, so we return an empty
+ *     file; per spec §27.15 cycles are allowed, so we return an empty
  *     clone block and let name resolution (P6+) handle the actual
  *     cross-file linking
  *   - `kind: 'no-resolver'` -- no `readFile` was supplied; caller should

package/dist/module-resolver.js

@@ -30,13 +30,13 @@ import { SCALAR_TYPES, BSON_TYPES } from "./keywords.js";
  *
  * Inside a Container body, each `ModuleImportDirective` is replaced by its
  * `clone.statements` as `ContainerBodyItem`s. Note that the spec table in
- * §26.6 guarantees that clone-block content for entity/edge/view/enum
+ * §27.6 guarantees that clone-block content for entity/edge/view/enum
  * imports is shape-compatible with `ContainerBodyItem`; other shapes
  * (e.g., a TablePartial clone inside a Container directive) would be
  * semantically invalid per the spec and would surface as a downstream
  * type error rather than being caught here.
  *
- * Field-level imports (spec §26.8) get a special transform: the clone
+ * Field-level imports (spec §27.8) get a special transform: the clone
  * block holds a bare `FieldDeclaration`, which `flatten()` lifts into a
  * synthetic `TypeDeclaration` at file scope. Downstream consumers see
  * a normal Named Type and can use it as a field type without learning
@@ -92,11 +92,11 @@ function flattenTopLevel(stmt, out) {
  *
  *   - For SCALAR fields (any TypeExpression that isn't ObjectType): the
  *     Type is in scalar form with `scalarBase = field.type`. Equivalent
- *     to the v0.2 scalar-Named-Type form (spec §14.7).
+ *     to the v0.2 scalar-Named-Type form (spec §15.7).
  *
  *   - For OBJECT-typed fields (`field foo object { ... }`): the Type is
  *     in object form with `body = field.type.fields`. Equivalent to the
- *     v0.1 object-Named-Type form (spec §14).
+ *     v0.1 object-Named-Type form (spec §15).
  *
  * Other type shapes (Array, Map, Set, Tuple, Union, polymorphic types)
  * are valid as `scalarBase` of a Type and pass through unchanged. The
@@ -225,7 +225,7 @@ export function resolveImport(directive, options, resolutionStack, depth, parseF
  * import spec. Applies aliases by renaming the extracted declaration.
  *
  * For `ImportAll`: every TopLevelStatement except ProjectDeclaration
- * (per spec §26.4, Project declarations cannot be imported).
+ * (per spec §27.4, Project declarations cannot be imported).
  *
  * For `ImportList`: each item is matched by element-type + source path.
  * Items not found in the source produce nothing (silent for P5; a
@@ -234,7 +234,7 @@ export function resolveImport(directive, options, resolutionStack, depth, parseF
 function extractImports(spec, sourceDoc) {
     if (spec.kind === 'ImportAll') {
         // ImportAll never matches field imports (the `*` form is for top-level
-        // declarations only per spec §26.2). Return the source's top-level
+        // declarations only per spec §27.2). Return the source's top-level
         // statements minus Project.
         return sourceDoc.statements
             .filter((s) => s.kind !== 'ProjectDeclaration')
@@ -248,7 +248,7 @@ function extractImports(spec, sourceDoc) {
             out.push(applyAlias(found, item));
         }
         // Silent skip on not-found. The spec leaves diagnostics to name
-        // resolution (§26.13). In practice, users notice missing entities
+        // resolution (§27.13). In practice, users notice missing entities
         // because their references downstream become unresolved.
     }
     return out;
@@ -276,6 +276,8 @@ function extractImports(spec, sourceDoc) {
  *       ViewDeclaration with matching name; supports dotted path.
  *   - 'tablegroup':
  *       TableGroupDeclaration with matching name (top-level only).
+ *   - 'supertypegroup':
+ *       SupertypeGroupDeclaration with matching name (top-level only, v0.5).
  *   - 'tablepartial':
  *       TablePartialDeclaration with matching name (top-level only).
  *   - 'note':
@@ -344,6 +346,12 @@ function findImportTarget(item, doc) {
     if (item.elementType === 'tablegroup') {
         return doc.statements.find((s) => s.kind === 'TableGroupDeclaration' && s.name === path);
     }
+    // SupertypeGroup (spec §12, v0.5): top-level only, bare name. The group
+    // comes with its membership; its entities resolve in the importing
+    // document, by import or declaration, like TableGroup members.
+    if (item.elementType === 'supertypegroup') {
+        return doc.statements.find((s) => s.kind === 'SupertypeGroupDeclaration' && s.name === path);
+    }
     if (item.elementType === 'tablepartial') {
         return doc.statements.find((s) => s.kind === 'TablePartialDeclaration' && s.name === path);
     }
@@ -382,8 +390,18 @@ function findImportTarget(item, doc) {
         }
         return undefined;
     }
-    // Enum: top-level OR container-scoped.
+    // Enum: top-level OR container-scoped. A top-level Enum declared with
+    // a qualified name (`enum core.job_status`, the DBML form) matches its
+    // full dotted path and imports under its bare name, like the
+    // container-scoped form: the source container does not survive into
+    // the importing file (spec §27.16).
     if (item.elementType === 'enum') {
+        if (segments.length > 1) {
+            const qualifiedTopLevel = doc.statements.find((s) => s.kind === 'EnumDeclaration' && s.name === path);
+            if (qualifiedTopLevel && qualifiedTopLevel.kind === 'EnumDeclaration') {
+                return { ...qualifiedTopLevel, name: segments[segments.length - 1] };
+            }
+        }
         if (segments.length === 1) {
             return doc.statements.find((s) => s.kind === 'EnumDeclaration' && s.name === segments[0]);
         }
@@ -403,7 +421,7 @@ function findImportTarget(item, doc) {
  * object types to find a FieldDeclaration in a referenced source document.
  * Returns undefined when any segment fails to resolve.
  *
- * Path shapes accepted (per spec §26.8):
+ * Path shapes accepted (per spec §27.8):
  *   - `entity.field`                    -- top-level entity
  *   - `container.entity.field`          -- container-qualified entity
  *   - `entity.field.sub`                -- nested via ObjectType
@@ -594,6 +612,8 @@ function applyAlias(stmt, item) {
             return { ...stmt, name: item.alias };
         case 'TableGroupDeclaration':
             return { ...stmt, name: item.alias };
+        case 'SupertypeGroupDeclaration':
+            return { ...stmt, name: item.alias };
         case 'TablePartialDeclaration':
             return { ...stmt, name: item.alias };
         case 'NoteDeclaration':
@@ -605,7 +625,7 @@ function applyAlias(stmt, item) {
     }
 }
 /* -------------------------------------------------------------------------
- * Module source classification (spec §26.14, "Remote module sources")
+ * Module source classification (spec §27.14, "Remote module sources")
  *
  * A `from` source is recognized purely by its scheme. A source beginning
  * with 'https://' is a remote (URL) source; anything else is a relative
@@ -617,7 +637,7 @@ function applyAlias(stmt, item) {
  * This is pure, synchronous classification. The actual network fetch is
  * delegated to ParseOptions.readFile (the host's resolver). The obligations
  * on a fetcher (SSRF defenses, https-only redirects, size and time limits)
- * live with that resolver, not here; see spec §26.14.5.
+ * live with that resolver, not here; see spec §27.14.5.
  * ----------------------------------------------------------------------- */
 /** Raised when a `from` source string is structurally disallowed. */
 export class ModuleSourceError extends Error {
@@ -687,7 +707,7 @@ export function classifyModuleSource(from) {
  *   - A remote (https) source resolves to its normalized href. No '.xdbml'
  *     is appended (a raw-content URL may carry a query string).
  *   - A relative source whose importer is itself a remote module resolves
- *     against the importer's base URL per RFC 3986 (spec §26.14.1). A remote
+ *     against the importer's base URL per RFC 3986 (spec §27.14.1). A remote
  *     module therefore can never reach the local filesystem.
  *   - A relative source with a local importer resolves on the filesystem,
  *     exactly as in v0.2.

package/dist/monarch.d.ts

@@ -53,6 +53,7 @@ export interface XDbmlMonarchLanguage {
     polymorphismKeywords: string[];
     scalarTypes: string[];
     bsonTypes: string[];
+    nativeTypes: string[];
     settingFlags: string[];
     settingKeys: string[];
     granularityValues: string[];

package/dist/monarch.js

@@ -18,7 +18,7 @@
  * dependency on consumers that just want to parse. The Monaco types
  * are structurally compatible -- the consumer casts at the boundary.
  */
-import { CONTAINER_KEYWORDS, ENTITY_KEYWORDS, DECLARATION_KEYWORDS, STRUCTURAL_TYPE_KEYWORDS, POLYMORPHISM_KEYWORDS, SCALAR_TYPES, BSON_TYPES, SETTING_FLAGS, SETTING_KEYS, GRANULARITY_VALUES, } from "./keywords.js";
+import { CONTAINER_KEYWORDS, ENTITY_KEYWORDS, DECLARATION_KEYWORDS, STRUCTURAL_TYPE_KEYWORDS, POLYMORPHISM_KEYWORDS, SCALAR_TYPES, BSON_TYPES, TARGET_NATIVE_TYPES, SETTING_FLAGS, SETTING_KEYS, GRANULARITY_VALUES, } from "./keywords.js";
 /* -------------------------------------------------------------------------
  * Language configuration
  * ----------------------------------------------------------------------- */
@@ -102,6 +102,9 @@ export const xdbmlMonarchTokensProvider = {
     scalarTypes: [...SCALAR_TYPES],
     // BSON / document-store types
     bsonTypes: [...BSON_TYPES],
+    // Target-native types (Oracle `number`, PostgreSQL `serial`, ...):
+    // colored like scalar types, but not built-ins -- see keywords.ts.
+    nativeTypes: [...TARGET_NATIVE_TYPES],
     // Bare-flag settings: `pk`, `unique`, `not null`, etc.
     // `not null` and `primary key` are two words but tokenized one at a time
     // here -- the highlighter colors each as `keyword.setting`.
@@ -165,6 +168,7 @@ export const xdbmlMonarchTokensProvider = {
                         '@decls': 'keyword.declaration',
                         '@scalarTypes': 'type',
                         '@bsonTypes': 'type.bson',
+                        '@nativeTypes': 'type',
                         '@settingFlags': 'keyword.setting',
                         '@settingKeys': 'keyword.setting',
                         '@granularityValues': 'keyword.value',

package/dist/name-resolver.d.ts

@@ -1,5 +1,5 @@
 /**
- * Name resolution pass (spec §26.10 / §26.15, parser batch P6).
+ * Name resolution pass (spec §27.10 / §27.15, parser batch P6).
  *
  * `resolveNames(doc)` walks an xDBML document (the flattened view; clone
  * blocks have been merged) and produces:
@@ -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' | 'unresolved-type' | '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';
+export type DiagnosticCode = 'duplicate-declaration' | 'unresolved-type' | 'possible-type-typo' | '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';
 /**
  * A single resolution diagnostic. Severity is currently always `error`,
  * but the field is included to leave room for future warnings (e.g.,