@dbml/core 11.0.1 → 11.0.2-arch.0.2

package/lib/parse/deprecated/postgresParser.mjs

@@ -1,7 +1,7 @@
 import { __commonJSMin as e } from "../../_virtual/_rolldown/runtime.mjs";
 import { require_lodash as t } from "../../packages/dbml-core/node_modules/lodash/lodash.mjs";
 import { require_pluralize as n } from "../../node_modules/pluralize/pluralize.mjs";
-//#region src/parse/deprecated/postgresParser.cjs
+// src/parse/deprecated/postgresParser.cjs
 var r = /* @__PURE__ */ e(((e, r) => {
 	var i = t();
 	n();
@@ -2816,6 +2816,5 @@ var r = /* @__PURE__ */ e(((e, r) => {
 		parse: s
 	};
 }));
-//#endregion
 export default r();
 export { r as require_postgresParser };

package/lib/parse/deprecated/schemarbParser.mjs

@@ -1,7 +1,7 @@
 import { __commonJSMin as e } from "../../_virtual/_rolldown/runtime.mjs";
 import { require_lodash as t } from "../../packages/dbml-core/node_modules/lodash/lodash.mjs";
 import { require_pluralize as n } from "../../node_modules/pluralize/pluralize.mjs";
-//#region src/parse/deprecated/schemarbParser.cjs
+// src/parse/deprecated/schemarbParser.cjs
 var r = /* @__PURE__ */ e(((e, r) => {
 	t(), n();
 	function i(e, t) {
@@ -713,6 +713,5 @@ var r = /* @__PURE__ */ e(((e, r) => {
 		parse: o
 	};
 }));
-//#endregion
 export default r();
 export { r as require_schemarbParser };

package/lib/parse/error.mjs

@@ -1,4 +1,4 @@
-//#region src/parse/error.ts
+// src/parse/error.ts
 var e = class e {
 	constructor(e) {
 		this.diags = e;
@@ -13,5 +13,4 @@ var e = class e {
 function t(n) {
 	return Array.isArray(n) ? n.flatMap(t) : n instanceof e ? n.diags : [n];
 }
-//#endregion
 export { e as CompilerDiagnostics };

package/lib/transform/index.cjs

@@ -1 +1 @@
-require("../_virtual/_rolldown/runtime.cjs");let e=require("@dbml/parse");function t(t,n,r){let i=new e.MemoryProjectLayout;return i.setSource(e.DEFAULT_ENTRY,r),new e.Compiler(i).renameTable(e.DEFAULT_ENTRY,t,n).get(e.DEFAULT_ENTRY.absolute)??r}function n(t,n,r){let i=new e.MemoryProjectLayout;return i.setSource(e.DEFAULT_ENTRY,t),new e.Compiler(i).syncDiagramView(e.DEFAULT_ENTRY,n,r)}function r(t,n){let r=new e.MemoryProjectLayout;return r.setSource(e.DEFAULT_ENTRY,t),new e.Compiler(r).syncDep(e.DEFAULT_ENTRY,n)}function i(t,n,r,i){let a=new e.MemoryProjectLayout;return a.setSource(e.DEFAULT_ENTRY,t),new e.Compiler(a).updateElementSettingEdit(e.DEFAULT_ENTRY,n,r,i)}function a(t,n,r,i){let a=new e.MemoryProjectLayout;return a.setSource(e.DEFAULT_ENTRY,t),new e.Compiler(a).updateElementSetting(e.DEFAULT_ENTRY,n,r,i)}exports.renameTable=t,exports.syncDep=r,exports.syncDiagramView=n,exports.updateElementSetting=a,exports.updateElementSettingEdit=i;
+require("../_virtual/_rolldown/runtime.cjs");let e=require("@dbml/parse");function t(t,n,r){let i=new e.MemoryProjectLayout;return i.setSource(e.DEFAULT_ENTRY,r),new e.Compiler(i).renameTable(e.DEFAULT_ENTRY,t,n).get(e.DEFAULT_ENTRY.absolute)??r}function n(t,n,r,i){let a=new e.MemoryProjectLayout;return a.setSource(e.DEFAULT_ENTRY,r),new e.Compiler(a).renameElement(e.DEFAULT_ENTRY,t,n,i).get(e.DEFAULT_ENTRY.absolute)??r}function r(t,n,r){let i=new e.MemoryProjectLayout;return i.setSource(e.DEFAULT_ENTRY,t),new e.Compiler(i).syncDiagramView(e.DEFAULT_ENTRY,n,r)}function i(t,n){let r=new e.MemoryProjectLayout;return r.setSource(e.DEFAULT_ENTRY,t),new e.Compiler(r).syncDep(e.DEFAULT_ENTRY,n)}function a(t,n,r,i){let a=new e.MemoryProjectLayout;return a.setSource(e.DEFAULT_ENTRY,t),new e.Compiler(a).updateElementSettingEdit(e.DEFAULT_ENTRY,n,r,i)}function o(t,n,r,i){let a=new e.MemoryProjectLayout;return a.setSource(e.DEFAULT_ENTRY,t),new e.Compiler(a).updateElementSetting(e.DEFAULT_ENTRY,n,r,i)}exports.renameElement=n,exports.renameTable=t,exports.syncDep=i,exports.syncDiagramView=r,exports.updateElementSetting=o,exports.updateElementSettingEdit=a;

package/lib/transform/index.mjs

@@ -1,24 +1,27 @@
 import { Compiler as e, DEFAULT_ENTRY as t, MemoryProjectLayout as n, findDiagramViewBlocks as r } from "@dbml/parse";
-//#region src/transform/index.ts
+// src/transform/index.ts
 function i(r, i, a) {
 	let o = new n();
 	return o.setSource(t, a), new e(o).renameTable(t, r, i).get(t.absolute) ?? a;
 }
-function a(r, i, a) {
+function a(r, i, a, o) {
+	let s = new n();
+	return s.setSource(t, a), new e(s).renameElement(t, r, i, o).get(t.absolute) ?? a;
+}
+function o(r, i, a) {
 	let o = new n();
 	return o.setSource(t, r), new e(o).syncDiagramView(t, i, a);
 }
-function o(r, i) {
+function s(r, i) {
 	let a = new n();
 	return a.setSource(t, r), new e(a).syncDep(t, i);
 }
-function s(r, i, a, o) {
+function c(r, i, a, o) {
 	let s = new n();
 	return s.setSource(t, r), new e(s).updateElementSettingEdit(t, i, a, o);
 }
-function c(r, i, a, o) {
+function l(r, i, a, o) {
 	let s = new n();
 	return s.setSource(t, r), new e(s).updateElementSetting(t, i, a, o);
 }
-//#endregion
-export { r as findDiagramViewBlocks, i as renameTable, o as syncDep, a as syncDiagramView, c as updateElementSetting, s as updateElementSettingEdit };
+export { r as findDiagramViewBlocks, a as renameElement, i as renameTable, s as syncDep, o as syncDiagramView, l as updateElementSetting, c as updateElementSettingEdit };

package/lib/transform/relations.mjs

@@ -1,8 +1,7 @@
 import { CARDINALITY_MANY as e, CARDINALITY_MAYBE as t, CARDINALITY_ONE as n, CARDINALITY_SOME as r } from "@dbml/parse";
-//#region src/transform/relations.ts
+// src/transform/relations.ts
 function i(i, a) {
 	let o = i.pk || i.unique || i.increment, s = a.pk || a.unique || a.increment, c = i.not_null || i.pk || i.increment, l = a.not_null || a.pk || a.increment, u, d;
 	return o && s ? (u = t, d = c ? n : t) : !o && !s ? (u = l ? r : e, d = c ? r : e) : (u = o ? l ? n : t : e, d = s ? c ? n : t : e), [u, d];
 }
-//#endregion
 export { i as inferMultiplicitiesFromColumns };

package/lib/utils/version.mjs

@@ -1,5 +1,4 @@
 import { version as e } from "../packages/dbml-core/package.json.mjs";
-//#region src/utils/version.ts
+// src/utils/version.ts
 var t = e;
-//#endregion
 export { t as VERSION };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "11.0.1",
+  "version": "11.0.2-arch.0.2",
   "description": "> TODO: description",
   "author": "Holistics <dev@holistics.io>",
   "license": "Apache-2.0",
@@ -48,7 +48,7 @@
     "lint:fix": "eslint --fix ."
   },
   "dependencies": {
-    "@dbml/parse": "^11.0.1",
+    "@dbml/parse": "11.0.2-arch.0.2",
     "antlr4": "^4.13.1",
     "lodash": "^4.18.1",
     "lodash-es": "^4.18.1",
@@ -59,7 +59,7 @@
   "devDependencies": {
     "bluebird": "^3.5.5"
   },
-  "gitHead": "0418f4b2e67a160852e500bddf1992e10196d5ac",
+  "gitHead": "5333531159362040dbc3421119ea76a91016f1c0",
   "engines": {
     "node": ">=16"
   }

package/types/index.d.ts

@@ -4,6 +4,7 @@ import importer from './import';
 import exporter from './export';
 import {
   renameTable,
+  renameElement,
   updateElementSetting,
   updateElementSettingEdit,
   syncDiagramView,
@@ -12,6 +13,7 @@ import {
 } from './transform';
 export {
   renameTable,
+  renameElement,
   updateElementSetting,
   updateElementSettingEdit,
   syncDiagramView,
@@ -68,6 +70,9 @@ export {
   isEndpointOptional,
   isEndpointRequired,
   makeRelationshipRequired,
+  ARCH_BUILTIN_ROLES,
+  ARCH_NAME_PRECEDENCE,
+  fullName,
 } from '@dbml/parse';
 
 export { inferMultiplicitiesFromColumns } from './transform/relations';
@@ -95,11 +100,14 @@ export type {
   DepIdentifier,
   NoteIdentifier,
   TableGroupIdentifier,
+  ArchElementIdentifier,
+  ArchLinkIdentifier,
   CustomMetadata,
   CustomMetadataValue,
   CustomMetadataValueType,
   RelationCardinality,
   RelationshipOp,
   DbmlProjectLayout,
+  ArchRoleSpec,
   FileSpecifierInfo,
 } from '@dbml/parse';

package/types/model_structure/database.d.ts

@@ -16,6 +16,12 @@ import { NormalizedIndexIdMap } from './indexes';
 import { NormalizedCheckIdMap } from './check';
 import TablePartial, { NormalizedTablePartialIdMap } from './tablePartial';
 import { TokenPosition, DiagramView } from '@dbml/parse';
+import type {
+  Group as RawGroup, Link as RawLink, Node as RawNode,
+} from '@dbml/parse';
+import Node, { NormalizedNodeIdMap } from './node';
+import Group, { NormalizedGroupIdMap } from './group';
+import Link, { NormalizedLinkIdMap } from './link';
 export interface Project {
     note: RawNote;
     database_type: string;
@@ -66,6 +72,11 @@ export interface RawDatabase {
     records: RawTableRecord[];
     tablePartials: TablePartial[];
     diagramViews: DiagramView[];
+    nodes?: RawNode[];
+    groups?: RawGroup[];
+    links?: RawLink[];
+    frontMatter?: Record<string, string>;
+    diagramType?: 'arch';
 }
 
 declare class Database extends Element {
@@ -79,6 +90,11 @@ declare class Database extends Element {
     name: string;
     records: TableRecord[];
     diagramViews: DiagramView[];
+    nodes: Node[];
+    groups: Group[];
+    links: Link[];
+    diagramType: 'arch' | null;
+    frontMatter: Record<string, string> | null;
     id: number;
     constructor({ schemas, tables, enums, refs, tableGroups, project, records }: RawDatabase);
     generateId(): void;
@@ -307,6 +323,12 @@ export interface NormalizedDatabase {
     name: string;
     schemaIds: number[];
     noteIds: number[];
+    // Present only for a file with architecture content
+    nodeIds?: number[];
+    groupIds?: number[];
+    linkIds?: number[];
+    diagramType?: 'arch';
+    frontMatter?: Record<string, string>;
 }
 
 export interface NormalizedDatabaseIdMap {
@@ -331,5 +353,9 @@ export interface NormalizedModel {
     checks: NormalizedCheckIdMap;
     tablePartials: NormalizedTablePartialIdMap;
     records: NormalizedRecordIdMap;
+    // Present only when non-empty
+    nodes?: NormalizedNodeIdMap;
+    groups?: NormalizedGroupIdMap;
+    links?: NormalizedLinkIdMap;
 }
 export default Database;

package/types/model_structure/dbState.d.ts

@@ -16,5 +16,8 @@ export default class DbState {
     indexColumnId: number;
     recordId: number;
     tablePartialId: number;
+    nodeId: number;
+    groupId: number;
+    linkId: number;
     generateId(el: Exclude<keyof DbState, 'generateId'>): number;
 }

package/types/model_structure/group.d.ts

@@ -0,0 +1,41 @@
+import type { ArchRef, ArchSettings, CustomMetadata, Group as RawGroup } from '@dbml/parse';
+import Element, { Token } from './element';
+import Database from './database';
+import DbState from './dbState';
+import type { NormalizedModel } from './database';
+import type { ArchElementType } from './link';
+
+declare class Group extends Element {
+    id: number;
+    name: string;
+    alias: string | null;
+    children: ArchRef[];
+    childIds: number[];
+    childTypes: ArchElementType[];
+    settings: ArchSettings;
+    metadata: CustomMetadata;
+    note: string | null;
+    noteToken: Token | null;
+    groupId: number | null;
+    database: Database;
+    dbState: DbState;
+    constructor(raw: RawGroup & { database: Database });
+    generateId(): void;
+    export(): Omit<NormalizedGroup, 'id' | 'childIds' | 'childTypes' | 'groupId'>;
+    normalize(model: NormalizedModel): void;
+}
+export interface NormalizedGroup {
+    id: number;
+    name: string;
+    alias: string | null;
+    childIds: number[];
+    childTypes: ArchElementType[];
+    settings: ArchSettings;
+    metadata: CustomMetadata;
+    note: string | null;
+    groupId: number | null;
+}
+export interface NormalizedGroupIdMap {
+    [_id: number]: NormalizedGroup;
+}
+export default Group;

package/types/model_structure/link.d.ts

@@ -0,0 +1,37 @@
+import type { ArchSettings, LinkOp, Link as RawLink } from '@dbml/parse';
+import Element from './element';
+import Database from './database';
+import DbState from './dbState';
+import type { NormalizedModel } from './database';
+
+// What an arch link end or group member is; ids are counted per type
+export type ArchElementType = 'node' | 'group' | 'note';
+
+declare class Link extends Element {
+    id: number;
+    fromId: number;
+    fromType: ArchElementType;
+    toId: number;
+    toType: ArchElementType;
+    op: LinkOp;
+    settings: ArchSettings;
+    database: Database;
+    dbState: DbState;
+    constructor(raw: Omit<RawLink, 'from' | 'fromRole' | 'to' | 'toRole'> & { fromId: number; fromType: ArchElementType; toId: number; toType: ArchElementType; database: Database });
+    generateId(): void;
+    export(): Omit<NormalizedLink, 'id' | 'fromId' | 'fromType' | 'toId' | 'toType'>;
+    normalize(model: NormalizedModel): void;
+}
+export interface NormalizedLink {
+    id: number;
+    fromId: number;
+    fromType: ArchElementType;
+    toId: number;
+    toType: ArchElementType;
+    op: LinkOp;
+    settings: ArchSettings;
+}
+export interface NormalizedLinkIdMap {
+    [_id: number]: NormalizedLink;
+}
+export default Link;

package/types/model_structure/node.d.ts

@@ -0,0 +1,41 @@
+import type { ArchSettings, CustomMetadata, Node as RawNode } from '@dbml/parse';
+import Element, { Token } from './element';
+import Database from './database';
+import DbState from './dbState';
+import type { NormalizedModel } from './database';
+
+declare class Node extends Element {
+    id: number;
+    name: string;
+    alias: string | null;
+    role: string;
+    type: string | null;
+    icon: string | null;
+    settings: ArchSettings;
+    metadata: CustomMetadata;
+    note: string | null;
+    noteToken: Token | null;
+    groupId: number | null;
+    database: Database;
+    dbState: DbState;
+    constructor(raw: RawNode & { database: Database });
+    generateId(): void;
+    export(): Omit<NormalizedNode, 'id' | 'groupId'>;
+    normalize(model: NormalizedModel): void;
+}
+export interface NormalizedNode {
+    id: number;
+    name: string;
+    alias: string | null;
+    role: string;
+    type: string | null;
+    icon: string | null;
+    settings: ArchSettings;
+    metadata: CustomMetadata;
+    note: string | null;
+    groupId: number | null;
+}
+export interface NormalizedNodeIdMap {
+    [_id: number]: NormalizedNode;
+}
+export default Node;

package/types/transform/index.d.ts

@@ -9,6 +9,13 @@ export function renameTable(
   dbmlCode: string
 ): string;
 
+export function renameElement(
+  oldHandle: string,
+  newName: string,
+  dbmlCode: string,
+  role?: string,
+): string;
+
 export function updateElementSettingEdit(
   dbmlCode: string,
   target: ElementIdentifier,