@dbml/core 11.0.0-alpha.2 → 11.0.0-alpha.4

package/lib/model_structure/database.cjs

@@ -1 +1 @@
-require("../_virtual/_rolldown/runtime.cjs");const e=require("../node_modules/lodash-es/get.cjs"),t=require("../node_modules/lodash-es/capitalize.cjs"),n=require("../node_modules/lodash-es/lodash.cjs"),r=require("./config.cjs"),i=require("./dbState.cjs"),a=require("./element.cjs"),o=require("./dep.cjs"),s=require("./enum.cjs"),c=require("./ref.cjs"),l=require("./table.cjs"),u=require("./tableGroup.cjs"),d=require("./schema.cjs"),f=require("./stickyNote.cjs"),p=require("./tablePartial.cjs"),m=require("./node.cjs"),h=require("./group.cjs"),g=require("./noteBox.cjs"),_=require("./link.cjs"),v=require("./kind.cjs");let y=require("@dbml/parse");n.init_lodash();var b=class extends a.default{constructor({schemas:t=[],tables:n=[],notes:a=[],enums:o=[],refs:s=[],deps:l=[],tableGroups:u=[],project:d={},aliases:f=[],records:p=[],tablePartials:m=[],diagramViews:h=[],nodes:g=[],groups:_=[],noteBoxes:v=[],links:y=[],kinds:b=[],frontMatter:x,diagramType:S}={}){super(),this.dbState=new i.default,this.generateId(),this.hasDefaultSchema=!1,this.schemas=[],this.notes=[],this.note=d.note?e.default(d,`note.value`,typeof d.note==`string`?d.note:null):null,this.noteToken=d.note?e.default(d,`note.token`,d.noteToken):null,this.databaseType=d.database_type,this.name=d.name,this.token=d.token,this.aliases=f,this.records=[],this.tablePartials=[],this.diagramViews=h,this.injectedRawRefs=[],this.processNotes(a),this.processRecords(p),this.processTablePartials(m),this.processSchemas(t),this.processSchemaElements(o,r.ENUM),this.processSchemaElements(n,r.TABLE),this.linkRecordsToTables(),this.processSchemaElements(a,r.NOTE),this.processSchemaElements(s,`ref`),this.processSchemaElements(l,`dep`),this.processSchemaElements(u,r.TABLE_GROUP),this.injectedRawRefs.forEach(e=>{let t=this.findOrCreateSchema(r.DEFAULT_SCHEMA_NAME),n=new c.default({...e,schema:t});t.refs.some(e=>e.equals(n))||t.pushRef(n)}),this.nodes=[],this.groups=[],this.noteBoxes=[],this.links=[],this.kinds=[],this.frontMatter=x??null,this.diagramType=S??null,this.processArch(b,g,_,v,y)}processArch(e,t,n,r,i){e.forEach(e=>this.kinds.push(new v.default({...e,database:this}))),t.forEach(e=>this.nodes.push(new m.default({...e,database:this}))),n.forEach(e=>this.groups.push(new h.default({...e,database:this}))),r.forEach(e=>this.noteBoxes.push(new g.default({...e,database:this})));let a=new Map;[...this.nodes,...this.groups,...this.noteBoxes].forEach(e=>{let t=e.alias??e.name;a.has(t)||a.set(t,e)}),this.groups.forEach(e=>{e.children.forEach(t=>{let n=a.get(t);n&&(e.childIds.push(n.id),n.groupId=e.id)})}),i.forEach(({from:e,to:t,...n})=>{let r=a.get(e),i=a.get(t);!r||!i||this.links.push(new _.default({...n,fromId:r.id,toId:i.id,database:this}))})}findKind(e){return this.kinds.find(t=>t.name===e)}generateId(){this.id=this.dbState.generateId(`dbId`)}processNotes(e){e.forEach(e=>{this.pushNote(new f.default({...e,database:this}))})}processRecords(e){e.forEach(({schemaName:e,tableName:t,columns:n,values:r,example:i,token:a})=>{this.records.push({id:this.dbState.generateId(`recordId`),schemaName:e,tableName:t,columns:n,values:r,example:i,token:a})})}processTablePartials(e){e.forEach(e=>{this.tablePartials.push(new p.default({...e,dbState:this.dbState}))})}pushNote(e){this.checkNote(e),this.notes.push(e)}checkNote(e){this.notes.some(t=>t.name===e.name)&&e.error(`Notes ${e.name} existed`)}processSchemas(e){e.forEach(e=>{this.pushSchema(new d.default({...e,database:this}))})}pushSchema(e){this.checkSchema(e),this.schemas.push(e)}checkSchema(e){this.schemas.some(t=>t.name===e.name)&&e.error(`Schemas ${e.name} existed`)}processSchemaElements(e,t){let n;e.forEach(e=>{switch(e.schemaName?(n=this.findOrCreateSchema(e.schemaName),e.schemaName):n=this.findOrCreateSchema(r.DEFAULT_SCHEMA_NAME),t){case r.TABLE:n.pushTable(new l.default({...e,schema:n}));break;case r.ENUM:n.pushEnum(new s.default({...e,schema:n}));break;case r.TABLE_GROUP:n.pushTableGroup(new u.default({...e,schema:n}));break;case`ref`:n.pushRef(new c.default({...e,schema:n}));break;case`dep`:n.pushDep(new o.default({...e,schema:n}));break;default:break}})}linkRecordsToTables(){let e={};this.schemas.forEach(t=>{e[t.name]={},t.tables.forEach(n=>{e[t.name][n.name]=n})}),this.records.forEach(t=>{let n=e[t.schemaName??`public`]?.[t.tableName];n&&(t.tableId=n.id,n.records.push(t))})}findOrCreateSchema(e){let n=this.schemas.find(t=>t.name===e||t.alias===e);return n||(n=new d.default({name:e,note:{value:e===`public`?`Default ${t.default(r.DEFAULT_SCHEMA_NAME)} Schema`:null},database:this}),this.pushSchema(n)),n}findTableAlias(e){let t=this.aliases.find(t=>t.name===e);if(!t||t.kind!==`table`)return null;let n=t.value.schemaName||`public`,r=this.schemas.find(e=>e.name===n);if(!r)return null;let{tableName:i}=t.value;return r.tables.find(e=>e.name===i)||null}findTable(e,t){let n=null;if(!e&&(n=this.findTableAlias(t),n))return n;let r=this.findOrCreateSchema(e||`public`);return r||this.error(`Schema ${e||`public`} don't exist`),r.findTable(t)}findEnum(e,t){let n=this.schemas.find(t=>t.name===e||t.alias===e);if(n)return n.enums.find(e=>e.name===t)}findTablePartial(e){return this.tablePartials.find(t=>t.name===e)}adjustCardinalitiesFromColumns(){this.schemas.forEach(e=>{e.refs.forEach(e=>{let t=e.endpoints.find(e=>(0,y.parseCardinality)(e.relation).max===`*`),n=e.endpoints.find(e=>(0,y.parseCardinality)(e.relation).max===1);if(!n)return;let r,i;t?(r=t,i=n):(r=e.endpoints[1],i=e.endpoints[0]),!(!r||!i)&&r.fields.every(e=>e.not_null||e.pk||e.increment)&&(i.relation=(0,y.makeCardinalityRequired)(i.relation))})})}export(){return{...this.exportChild()}}shallowExport(){return{hasDefaultSchema:this.hasDefaultSchema,note:this.note,databaseType:this.databaseType,name:this.name}}exportChild(){return{schemas:this.schemas.map(e=>e.export()),notes:this.notes.map(e=>e.export()),records:this.records.map(e=>({...e})),...this.archEntries(e=>e.map(e=>e.export()))}}exportChildIds(){return{schemaIds:this.schemas.map(e=>e.id),noteIds:this.notes.map(e=>e.id),...this.archIds(),...this.frontMatter?{frontMatter:this.frontMatter}:{},...this.diagramType?{diagramType:this.diagramType}:{}}}archEntries(e){let t={},n={nodes:this.nodes,groups:this.groups,noteBoxes:this.noteBoxes,links:this.links,kinds:this.kinds};return Object.entries(n).forEach(([n,r])=>{r.length&&(t[n]=e(r))}),t}archIds(){let e=this.archEntries(e=>e.map(e=>e.id));return{...e.nodes?{nodeIds:e.nodes}:{},...e.groups?{groupIds:e.groups}:{},...e.noteBoxes?{noteBoxIds:e.noteBoxes}:{},...e.links?{linkIds:e.links}:{},...e.kinds?{kindIds:e.kinds}:{}}}normalize(){let e={database:{[this.id]:{id:this.id,...this.shallowExport(),...this.exportChildIds()}},schemas:{},notes:{},refs:{},deps:{},depEdges:{},enums:{},tableGroups:{},tables:{},endpoints:{},enumValues:{},indexes:{},indexColumns:{},checks:{},fields:{},records:{},tablePartials:{}};return this.schemas.forEach(t=>t.normalize(e)),this.notes.forEach(t=>t.normalize(e)),this.records.forEach(t=>{e.records[t.id]={...t}}),this.tablePartials.forEach(t=>t.normalize(e)),Object.entries(this.archEntries(e=>e)).forEach(([t,n])=>{e[t]={},n.forEach(t=>t.normalize(e))}),e}};exports.default=b;
+require("../_virtual/_rolldown/runtime.cjs");const e=require("../node_modules/lodash-es/get.cjs"),t=require("../node_modules/lodash-es/capitalize.cjs"),n=require("../node_modules/lodash-es/lodash.cjs"),r=require("./config.cjs"),i=require("./dbState.cjs"),a=require("./element.cjs"),o=require("./dep.cjs"),s=require("./enum.cjs"),c=require("./ref.cjs"),l=require("./table.cjs"),u=require("./tableGroup.cjs"),d=require("./schema.cjs"),f=require("./stickyNote.cjs"),p=require("./tablePartial.cjs"),m=require("./node.cjs"),h=require("./group.cjs"),g=require("./link.cjs"),_=require("./kind.cjs");let v=require("@dbml/parse");n.init_lodash();var y=class extends a.default{constructor({schemas:t=[],tables:n=[],notes:a=[],enums:o=[],refs:s=[],deps:l=[],tableGroups:u=[],project:d={},aliases:f=[],records:p=[],tablePartials:m=[],diagramViews:h=[],nodes:g=[],groups:_=[],links:v=[],kinds:y=[],frontMatter:b,diagramType:x}={}){super(),this.dbState=new i.default,this.generateId(),this.hasDefaultSchema=!1,this.schemas=[],this.notes=[],this.note=d.note?e.default(d,`note.value`,typeof d.note==`string`?d.note:null):null,this.noteToken=d.note?e.default(d,`note.token`,d.noteToken):null,this.databaseType=d.database_type,this.name=d.name,this.token=d.token,this.aliases=f,this.records=[],this.tablePartials=[],this.diagramViews=h,this.injectedRawRefs=[],this.processNotes(a),this.processRecords(p),this.processTablePartials(m),this.processSchemas(t),this.processSchemaElements(o,r.ENUM),this.processSchemaElements(n,r.TABLE),this.linkRecordsToTables(),this.processSchemaElements(a,r.NOTE),this.processSchemaElements(s,`ref`),this.processSchemaElements(l,`dep`),this.processSchemaElements(u,r.TABLE_GROUP),this.injectedRawRefs.forEach(e=>{let t=this.findOrCreateSchema(r.DEFAULT_SCHEMA_NAME),n=new c.default({...e,schema:t});t.refs.some(e=>e.equals(n))||t.pushRef(n)}),this.nodes=[],this.groups=[],this.links=[],this.kinds=[],this.frontMatter=b??null,this.diagramType=x??null,this.processArch(y,g,_,v)}processArch(e,t,n,r){e.forEach(e=>this.kinds.push(new _.default({...e,database:this}))),t.forEach(e=>this.nodes.push(new m.default({...e,database:this}))),n.forEach(e=>this.groups.push(new h.default({...e,database:this})));let i=new Map,a=(e,t,n)=>{i.has(e)||i.set(e,{type:t,element:n})};this.nodes.forEach(e=>a(e.alias??e.name,`node`,e)),this.groups.forEach(e=>a(e.alias??e.name,`group`,e)),this.notes.forEach(e=>a(e.name,`note`,e)),this.groups.forEach(e=>{e.children.forEach(t=>{let n=i.get(t);n&&(e.childIds.push(n.element.id),e.childTypes.push(n.type),(n.element instanceof m.default||n.element instanceof h.default)&&(n.element.groupId=e.id))})}),r.forEach(({from:e,to:t,...n})=>{let r=i.get(e),a=i.get(t);!r||!a||this.links.push(new g.default({...n,fromId:r.element.id,fromType:r.type,toId:a.element.id,toType:a.type,database:this}))})}findKind(e){return this.kinds.find(t=>t.name===e)}generateId(){this.id=this.dbState.generateId(`dbId`)}processNotes(e){e.forEach(e=>{this.pushNote(new f.default({...e,database:this}))})}processRecords(e){e.forEach(({schemaName:e,tableName:t,columns:n,values:r,example:i,token:a})=>{this.records.push({id:this.dbState.generateId(`recordId`),schemaName:e,tableName:t,columns:n,values:r,example:i,token:a})})}processTablePartials(e){e.forEach(e=>{this.tablePartials.push(new p.default({...e,dbState:this.dbState}))})}pushNote(e){this.checkNote(e),this.notes.push(e)}checkNote(e){this.notes.some(t=>t.name===e.name)&&e.error(`Notes ${e.name} existed`)}processSchemas(e){e.forEach(e=>{this.pushSchema(new d.default({...e,database:this}))})}pushSchema(e){this.checkSchema(e),this.schemas.push(e)}checkSchema(e){this.schemas.some(t=>t.name===e.name)&&e.error(`Schemas ${e.name} existed`)}processSchemaElements(e,t){let n;e.forEach(e=>{switch(e.schemaName?(n=this.findOrCreateSchema(e.schemaName),e.schemaName):n=this.findOrCreateSchema(r.DEFAULT_SCHEMA_NAME),t){case r.TABLE:n.pushTable(new l.default({...e,schema:n}));break;case r.ENUM:n.pushEnum(new s.default({...e,schema:n}));break;case r.TABLE_GROUP:n.pushTableGroup(new u.default({...e,schema:n}));break;case`ref`:n.pushRef(new c.default({...e,schema:n}));break;case`dep`:n.pushDep(new o.default({...e,schema:n}));break;default:break}})}linkRecordsToTables(){let e={};this.schemas.forEach(t=>{e[t.name]={},t.tables.forEach(n=>{e[t.name][n.name]=n})}),this.records.forEach(t=>{let n=e[t.schemaName??`public`]?.[t.tableName];n&&(t.tableId=n.id,n.records.push(t))})}findOrCreateSchema(e){let n=this.schemas.find(t=>t.name===e||t.alias===e);return n||(n=new d.default({name:e,note:{value:e===`public`?`Default ${t.default(r.DEFAULT_SCHEMA_NAME)} Schema`:null},database:this}),this.pushSchema(n)),n}findTableAlias(e){let t=this.aliases.find(t=>t.name===e);if(!t||t.kind!==`table`)return null;let n=t.value.schemaName||`public`,r=this.schemas.find(e=>e.name===n);if(!r)return null;let{tableName:i}=t.value;return r.tables.find(e=>e.name===i)||null}findTable(e,t){let n=null;if(!e&&(n=this.findTableAlias(t),n))return n;let r=this.findOrCreateSchema(e||`public`);return r||this.error(`Schema ${e||`public`} don't exist`),r.findTable(t)}findEnum(e,t){let n=this.schemas.find(t=>t.name===e||t.alias===e);if(n)return n.enums.find(e=>e.name===t)}findTablePartial(e){return this.tablePartials.find(t=>t.name===e)}adjustCardinalitiesFromColumns(){this.schemas.forEach(e=>{e.refs.forEach(e=>{let t=e.endpoints.find(e=>(0,v.parseCardinality)(e.relation).max===`*`),n=e.endpoints.find(e=>(0,v.parseCardinality)(e.relation).max===1);if(!n)return;let r,i;t?(r=t,i=n):(r=e.endpoints[1],i=e.endpoints[0]),!(!r||!i)&&r.fields.every(e=>e.not_null||e.pk||e.increment)&&(i.relation=(0,v.makeCardinalityRequired)(i.relation))})})}export(){return{...this.exportChild()}}shallowExport(){return{hasDefaultSchema:this.hasDefaultSchema,note:this.note,databaseType:this.databaseType,name:this.name}}exportChild(){return{schemas:this.schemas.map(e=>e.export()),notes:this.notes.map(e=>e.export()),records:this.records.map(e=>({...e})),...this.archEntries(e=>e.map(e=>e.export()))}}exportChildIds(){return{schemaIds:this.schemas.map(e=>e.id),noteIds:this.notes.map(e=>e.id),...this.archIds(),...this.frontMatter?{frontMatter:this.frontMatter}:{},...this.diagramType?{diagramType:this.diagramType}:{}}}archEntries(e){let t={},n={nodes:this.nodes,groups:this.groups,links:this.links,kinds:this.kinds};return Object.entries(n).forEach(([n,r])=>{r.length&&(t[n]=e(r))}),t}archIds(){let e=this.archEntries(e=>e.map(e=>e.id));return{...e.nodes?{nodeIds:e.nodes}:{},...e.groups?{groupIds:e.groups}:{},...e.links?{linkIds:e.links}:{},...e.kinds?{kindIds:e.kinds}:{}}}normalize(){let e={database:{[this.id]:{id:this.id,...this.shallowExport(),...this.exportChildIds()}},schemas:{},notes:{},refs:{},deps:{},depEdges:{},enums:{},tableGroups:{},tables:{},endpoints:{},enumValues:{},indexes:{},indexColumns:{},checks:{},fields:{},records:{},tablePartials:{}};return this.schemas.forEach(t=>t.normalize(e)),this.notes.forEach(t=>t.normalize(e)),this.records.forEach(t=>{e.records[t.id]={...t}}),this.tablePartials.forEach(t=>t.normalize(e)),Object.entries(this.archEntries(e=>e)).forEach(([t,n])=>{e[t]={},n.forEach(t=>t.normalize(e))}),e}};exports.default=y;

package/lib/model_structure/database.mjs

@@ -14,24 +14,23 @@ import g from "./stickyNote.mjs";
 import _ from "./tablePartial.mjs";
 import v from "./node.mjs";
 import y from "./group.mjs";
-import b from "./noteBox.mjs";
-import x from "./link.mjs";
-import S from "./kind.mjs";
-import { makeCardinalityRequired as C, parseCardinality as w } from "@dbml/parse";
+import b from "./link.mjs";
+import x from "./kind.mjs";
+import { makeCardinalityRequired as S, parseCardinality as C } from "@dbml/parse";
 //#region src/model_structure/database.ts
 n();
-var T = class extends l {
-	constructor({ schemas: t = [], tables: n = [], notes: l = [], enums: u = [], refs: d = [], deps: p = [], tableGroups: m = [], project: h = {}, aliases: g = [], records: _ = [], tablePartials: v = [], diagramViews: y = [], nodes: b = [], groups: x = [], noteBoxes: S = [], links: C = [], kinds: w = [], frontMatter: T, diagramType: E } = {}) {
+var w = class extends l {
+	constructor({ schemas: t = [], tables: n = [], notes: l = [], enums: u = [], refs: d = [], deps: p = [], tableGroups: m = [], project: h = {}, aliases: g = [], records: _ = [], tablePartials: v = [], diagramViews: y = [], nodes: b = [], groups: x = [], links: S = [], kinds: C = [], frontMatter: w, diagramType: T } = {}) {
 		super(), this.dbState = new c(), this.generateId(), this.hasDefaultSchema = !1, this.schemas = [], this.notes = [], this.note = h.note ? e(h, "note.value", typeof h.note == "string" ? h.note : null) : null, this.noteToken = h.note ? e(h, "note.token", h.noteToken) : null, this.databaseType = h.database_type, this.name = h.name, this.token = h.token, this.aliases = g, this.records = [], this.tablePartials = [], this.diagramViews = y, this.injectedRawRefs = [], this.processNotes(l), this.processRecords(_), this.processTablePartials(v), this.processSchemas(t), this.processSchemaElements(u, i), this.processSchemaElements(n, o), this.linkRecordsToTables(), this.processSchemaElements(l, a), this.processSchemaElements(d, "ref"), this.processSchemaElements(p, "dep"), this.processSchemaElements(m, s), this.injectedRawRefs.forEach((e) => {
 			let t = this.findOrCreateSchema(r), n = new f({
 				...e,
 				schema: t
 			});
 			t.refs.some((e) => e.equals(n)) || t.pushRef(n);
-		}), this.nodes = [], this.groups = [], this.noteBoxes = [], this.links = [], this.kinds = [], this.frontMatter = T ?? null, this.diagramType = E ?? null, this.processArch(w, b, x, S, C);
+		}), this.nodes = [], this.groups = [], this.links = [], this.kinds = [], this.frontMatter = w ?? null, this.diagramType = T ?? null, this.processArch(C, b, x, S);
 	}
-	processArch(e, t, n, r, i) {
-		e.forEach((e) => this.kinds.push(new S({
+	processArch(e, t, n, r) {
+		e.forEach((e) => this.kinds.push(new x({
 			...e,
 			database: this
 		}))), t.forEach((e) => this.nodes.push(new v({
@@ -40,29 +39,26 @@ var T = class extends l {
 		}))), n.forEach((e) => this.groups.push(new y({
 			...e,
 			database: this
-		}))), r.forEach((e) => this.noteBoxes.push(new b({
-			...e,
-			database: this
 		})));
-		let a = /* @__PURE__ */ new Map();
-		[
-			...this.nodes,
-			...this.groups,
-			...this.noteBoxes
-		].forEach((e) => {
-			let t = e.alias ?? e.name;
-			a.has(t) || a.set(t, e);
-		}), this.groups.forEach((e) => {
+		let i = /* @__PURE__ */ new Map(), a = (e, t, n) => {
+			i.has(e) || i.set(e, {
+				type: t,
+				element: n
+			});
+		};
+		this.nodes.forEach((e) => a(e.alias ?? e.name, "node", e)), this.groups.forEach((e) => a(e.alias ?? e.name, "group", e)), this.notes.forEach((e) => a(e.name, "note", e)), this.groups.forEach((e) => {
 			e.children.forEach((t) => {
-				let n = a.get(t);
-				n && (e.childIds.push(n.id), n.groupId = e.id);
+				let n = i.get(t);
+				n && (e.childIds.push(n.element.id), e.childTypes.push(n.type), (n.element instanceof v || n.element instanceof y) && (n.element.groupId = e.id));
 			});
-		}), i.forEach(({ from: e, to: t, ...n }) => {
-			let r = a.get(e), i = a.get(t);
-			!r || !i || this.links.push(new x({
+		}), r.forEach(({ from: e, to: t, ...n }) => {
+			let r = i.get(e), a = i.get(t);
+			!r || !a || this.links.push(new b({
 				...n,
-				fromId: r.id,
-				toId: i.id,
+				fromId: r.element.id,
+				fromType: r.type,
+				toId: a.element.id,
+				toType: a.type,
 				database: this
 			}));
 		});
@@ -203,10 +199,10 @@ var T = class extends l {
 	adjustCardinalitiesFromColumns() {
 		this.schemas.forEach((e) => {
 			e.refs.forEach((e) => {
-				let t = e.endpoints.find((e) => w(e.relation).max === "*"), n = e.endpoints.find((e) => w(e.relation).max === 1);
+				let t = e.endpoints.find((e) => C(e.relation).max === "*"), n = e.endpoints.find((e) => C(e.relation).max === 1);
 				if (!n) return;
 				let r, i;
-				t ? (r = t, i = n) : (r = e.endpoints[1], i = e.endpoints[0]), !(!r || !i) && r.fields.every((e) => e.not_null || e.pk || e.increment) && (i.relation = C(i.relation));
+				t ? (r = t, i = n) : (r = e.endpoints[1], i = e.endpoints[0]), !(!r || !i) && r.fields.every((e) => e.not_null || e.pk || e.increment) && (i.relation = S(i.relation));
 			});
 		});
 	}
@@ -242,7 +238,6 @@ var T = class extends l {
 		let t = {}, n = {
 			nodes: this.nodes,
 			groups: this.groups,
-			noteBoxes: this.noteBoxes,
 			links: this.links,
 			kinds: this.kinds
 		};
@@ -255,7 +250,6 @@ var T = class extends l {
 		return {
 			...e.nodes ? { nodeIds: e.nodes } : {},
 			...e.groups ? { groupIds: e.groups } : {},
-			...e.noteBoxes ? { noteBoxIds: e.noteBoxes } : {},
 			...e.links ? { linkIds: e.links } : {},
 			...e.kinds ? { kindIds: e.kinds } : {}
 		};
@@ -292,4 +286,4 @@ var T = class extends l {
 	}
 };
 //#endregion
-export { T as default };
+export { w as default };

package/lib/model_structure/dbState.cjs

@@ -1 +1 @@
-require("../_virtual/_rolldown/runtime.cjs");var e=class{constructor(){this.dbId=1,this.schemaId=1,this.enumId=1,this.tableGroupId=1,this.refId=1,this.depId=1,this.depEdgeId=1,this.tableId=1,this.noteId=1,this.enumValueId=1,this.endpointId=1,this.indexId=1,this.checkId=1,this.fieldId=1,this.indexColumnId=1,this.recordId=1,this.tablePartialId=1,this.elementId=1,this.linkId=1,this.kindId=1}generateId(e){let t=this[e];return this[e]+=1,t}};exports.default=e;
+require("../_virtual/_rolldown/runtime.cjs");var e=class{constructor(){this.dbId=1,this.schemaId=1,this.enumId=1,this.tableGroupId=1,this.refId=1,this.depId=1,this.depEdgeId=1,this.tableId=1,this.noteId=1,this.enumValueId=1,this.endpointId=1,this.indexId=1,this.checkId=1,this.fieldId=1,this.indexColumnId=1,this.recordId=1,this.tablePartialId=1,this.nodeId=1,this.groupId=1,this.linkId=1,this.kindId=1}generateId(e){let t=this[e];return this[e]+=1,t}};exports.default=e;

package/lib/model_structure/dbState.mjs

@@ -1,7 +1,7 @@
 //#region src/model_structure/dbState.ts
 var e = class {
 	constructor() {
-		this.dbId = 1, this.schemaId = 1, this.enumId = 1, this.tableGroupId = 1, this.refId = 1, this.depId = 1, this.depEdgeId = 1, this.tableId = 1, this.noteId = 1, this.enumValueId = 1, this.endpointId = 1, this.indexId = 1, this.checkId = 1, this.fieldId = 1, this.indexColumnId = 1, this.recordId = 1, this.tablePartialId = 1, this.elementId = 1, this.linkId = 1, this.kindId = 1;
+		this.dbId = 1, this.schemaId = 1, this.enumId = 1, this.tableGroupId = 1, this.refId = 1, this.depId = 1, this.depEdgeId = 1, this.tableId = 1, this.noteId = 1, this.enumValueId = 1, this.endpointId = 1, this.indexId = 1, this.checkId = 1, this.fieldId = 1, this.indexColumnId = 1, this.recordId = 1, this.tablePartialId = 1, this.nodeId = 1, this.groupId = 1, this.linkId = 1, this.kindId = 1;
 	}
 	generateId(e) {
 		let t = this[e];

package/lib/model_structure/group.cjs

@@ -1 +1 @@
-require("../_virtual/_rolldown/runtime.cjs");const e=require("./element.cjs");var t=class extends e.default{constructor({name:e,alias:t,children:n,settings:r,note:i,token:a,database:o}){super(a),this.name=e,this.alias=t,this.children=n,this.childIds=[],this.settings=r,this.note=i?.value??null,this.noteToken=i?.token??null,this.groupId=null,this.database=o,this.dbState=o.dbState,this.generateId()}generateId(){this.id=this.dbState.generateId(`elementId`)}export(){return{name:this.name,alias:this.alias,settings:this.settings,note:this.note}}normalize(e){e.groups[this.id]={id:this.id,...this.export(),childIds:this.childIds,groupId:this.groupId}}};exports.default=t;
+require("../_virtual/_rolldown/runtime.cjs");const e=require("./element.cjs");var t=class extends e.default{constructor({name:e,alias:t,children:n,settings:r,note:i,token:a,database:o}){super(a),this.name=e,this.alias=t,this.children=n,this.childIds=[],this.childTypes=[],this.settings=r,this.note=i?.value??null,this.noteToken=i?.token??null,this.groupId=null,this.database=o,this.dbState=o.dbState,this.generateId()}generateId(){this.id=this.dbState.generateId(`groupId`)}export(){return{name:this.name,alias:this.alias,settings:this.settings,note:this.note}}normalize(e){e.groups[this.id]={id:this.id,...this.export(),childIds:this.childIds,childTypes:this.childTypes,groupId:this.groupId}}};exports.default=t;

package/lib/model_structure/group.mjs

@@ -2,10 +2,10 @@ import e from "./element.mjs";
 //#region src/model_structure/group.ts
 var t = class extends e {
 	constructor({ name: e, alias: t, children: n, settings: r, note: i, token: a, database: o }) {
-		super(a), this.name = e, this.alias = t, this.children = n, this.childIds = [], this.settings = r, this.note = i?.value ?? null, this.noteToken = i?.token ?? null, this.groupId = null, this.database = o, this.dbState = o.dbState, this.generateId();
+		super(a), this.name = e, this.alias = t, this.children = n, this.childIds = [], this.childTypes = [], this.settings = r, this.note = i?.value ?? null, this.noteToken = i?.token ?? null, this.groupId = null, this.database = o, this.dbState = o.dbState, this.generateId();
 	}
 	generateId() {
-		this.id = this.dbState.generateId("elementId");
+		this.id = this.dbState.generateId("groupId");
 	}
 	export() {
 		return {
@@ -20,6 +20,7 @@ var t = class extends e {
 			id: this.id,
 			...this.export(),
 			childIds: this.childIds,
+			childTypes: this.childTypes,
 			groupId: this.groupId
 		};
 	}

package/lib/model_structure/link.cjs

@@ -1 +1 @@
-require("../_virtual/_rolldown/runtime.cjs");const e=require("./element.cjs");var t=class extends e.default{constructor({fromId:e,toId:t,op:n,settings:r,token:i,database:a}){super(i),this.fromId=e,this.toId=t,this.op=n,this.settings=r,this.database=a,this.dbState=a.dbState,this.generateId()}generateId(){this.id=this.dbState.generateId(`linkId`)}export(){return{op:this.op,settings:this.settings}}normalize(e){e.links[this.id]={id:this.id,...this.export(),fromId:this.fromId,toId:this.toId}}};exports.default=t;
+require("../_virtual/_rolldown/runtime.cjs");const e=require("./element.cjs");var t=class extends e.default{constructor({fromId:e,fromType:t,toId:n,toType:r,op:i,settings:a,token:o,database:s}){super(o),this.fromId=e,this.fromType=t,this.toId=n,this.toType=r,this.op=i,this.settings=a,this.database=s,this.dbState=s.dbState,this.generateId()}generateId(){this.id=this.dbState.generateId(`linkId`)}export(){return{op:this.op,settings:this.settings}}normalize(e){e.links[this.id]={id:this.id,...this.export(),fromId:this.fromId,fromType:this.fromType,toId:this.toId,toType:this.toType}}};exports.default=t;

package/lib/model_structure/link.mjs

@@ -1,8 +1,8 @@
 import e from "./element.mjs";
 //#region src/model_structure/link.ts
 var t = class extends e {
-	constructor({ fromId: e, toId: t, op: n, settings: r, token: i, database: a }) {
-		super(i), this.fromId = e, this.toId = t, this.op = n, this.settings = r, this.database = a, this.dbState = a.dbState, this.generateId();
+	constructor({ fromId: e, fromType: t, toId: n, toType: r, op: i, settings: a, token: o, database: s }) {
+		super(o), this.fromId = e, this.fromType = t, this.toId = n, this.toType = r, this.op = i, this.settings = a, this.database = s, this.dbState = s.dbState, this.generateId();
 	}
 	generateId() {
 		this.id = this.dbState.generateId("linkId");
@@ -18,7 +18,9 @@ var t = class extends e {
 			id: this.id,
 			...this.export(),
 			fromId: this.fromId,
-			toId: this.toId
+			fromType: this.fromType,
+			toId: this.toId,
+			toType: this.toType
 		};
 	}
 };

package/lib/model_structure/node.cjs

@@ -1 +1 @@
-require("../_virtual/_rolldown/runtime.cjs");const e=require("./element.cjs");var t=class extends e.default{constructor({name:e,alias:t,kind:n,type:r,image:i,settings:a,note:o,token:s,database:c}){super(s),this.name=e,this.alias=t,this.kindId=c.findKind(n)?.id??null,this.type=r,this.image=i,this.settings=a,this.note=o?.value??null,this.noteToken=o?.token??null,this.groupId=null,this.database=c,this.dbState=c.dbState,this.generateId()}generateId(){this.id=this.dbState.generateId(`elementId`)}export(){return{name:this.name,alias:this.alias,type:this.type,image:this.image,settings:this.settings,note:this.note}}normalize(e){e.nodes[this.id]={id:this.id,...this.export(),kindId:this.kindId,groupId:this.groupId}}};exports.default=t;
+require("../_virtual/_rolldown/runtime.cjs");const e=require("./element.cjs");var t=class extends e.default{constructor({name:e,alias:t,kind:n,type:r,image:i,settings:a,note:o,token:s,database:c}){super(s),this.name=e,this.alias=t,this.kindId=c.findKind(n)?.id??null,this.type=r,this.image=i,this.settings=a,this.note=o?.value??null,this.noteToken=o?.token??null,this.groupId=null,this.database=c,this.dbState=c.dbState,this.generateId()}generateId(){this.id=this.dbState.generateId(`nodeId`)}export(){return{name:this.name,alias:this.alias,type:this.type,image:this.image,settings:this.settings,note:this.note}}normalize(e){e.nodes[this.id]={id:this.id,...this.export(),kindId:this.kindId,groupId:this.groupId}}};exports.default=t;

package/lib/model_structure/node.mjs

@@ -5,7 +5,7 @@ var t = class extends e {
 		super(s), this.name = e, this.alias = t, this.kindId = c.findKind(n)?.id ?? null, this.type = r, this.image = i, this.settings = a, this.note = o?.value ?? null, this.noteToken = o?.token ?? null, this.groupId = null, this.database = c, this.dbState = c.dbState, this.generateId();
 	}
 	generateId() {
-		this.id = this.dbState.generateId("elementId");
+		this.id = this.dbState.generateId("nodeId");
 	}
 	export() {
 		return {

package/lib/packages/dbml-core/package.json.cjs

@@ -1 +1 @@
-require("../../_virtual/_rolldown/runtime.cjs");var e=`11.0.0-alpha.2`;exports.version=e;
+require("../../_virtual/_rolldown/runtime.cjs");var e=`11.0.0-alpha.4`;exports.version=e;

package/lib/packages/dbml-core/package.json.mjs

@@ -1,4 +1,4 @@
 //#region package.json
-var e = "11.0.0-alpha.2";
+var e = "11.0.0-alpha.4";
 //#endregion
 export { e as version };

package/package.json

@@ -1,7 +1,7 @@
 {
   "$schema": "https://json.schemastore.org/package",
   "name": "@dbml/core",
-  "version": "11.0.0-alpha.2",
+  "version": "11.0.0-alpha.4",
   "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.0-alpha.2",
+    "@dbml/parse": "^11.0.0-alpha.4",
     "antlr4": "^4.13.1",
     "lodash": "^4.18.1",
     "lodash-es": "^4.18.1",
@@ -59,7 +59,7 @@
   "devDependencies": {
     "bluebird": "^3.5.5"
   },
-  "gitHead": "75a0e5bf55149fef937ec7d02e48c170421229ff",
+  "gitHead": "40f71a2018dd2a5a9452cd4ba680ef08289fae3a",
   "engines": {
     "node": ">=16"
   }

package/types/model_structure/database.d.ts

@@ -17,11 +17,10 @@ import { NormalizedCheckIdMap } from './check';
 import TablePartial, { NormalizedTablePartialIdMap } from './tablePartial';
 import { TokenPosition, DiagramView } from '@dbml/parse';
 import type {
-  Group as RawGroup, Kind as RawKind, Link as RawLink, Node as RawNode, NoteBox as RawNoteBox,
+  Group as RawGroup, Kind as RawKind, Link as RawLink, Node as RawNode,
 } from '@dbml/parse';
 import Node, { NormalizedNodeIdMap } from './node';
 import Group, { NormalizedGroupIdMap } from './group';
-import NoteBox, { NormalizedNoteBoxIdMap } from './noteBox';
 import Link, { NormalizedLinkIdMap } from './link';
 import Kind, { NormalizedKindIdMap } from './kind';
 export interface Project {
@@ -76,7 +75,6 @@ export interface RawDatabase {
     diagramViews: DiagramView[];
     nodes?: RawNode[];
     groups?: RawGroup[];
-    noteBoxes?: RawNoteBox[];
     links?: RawLink[];
     kinds?: RawKind[];
     frontMatter?: Record<string, string>;
@@ -96,7 +94,6 @@ declare class Database extends Element {
     diagramViews: DiagramView[];
     nodes: Node[];
     groups: Group[];
-    noteBoxes: NoteBox[];
     links: Link[];
     kinds: Kind[];
     frontMatter: Record<string, string> | null;
@@ -333,7 +330,6 @@ export interface NormalizedDatabase {
     // Present only for a file with architecture content
     nodeIds?: number[];
     groupIds?: number[];
-    noteBoxIds?: number[];
     linkIds?: number[];
     kindIds?: number[];
     frontMatter?: Record<string, string>;
@@ -365,7 +361,6 @@ export interface NormalizedModel {
     // Present only when non-empty
     nodes?: NormalizedNodeIdMap;
     groups?: NormalizedGroupIdMap;
-    noteBoxes?: NormalizedNoteBoxIdMap;
     links?: NormalizedLinkIdMap;
     kinds?: NormalizedKindIdMap;
 }

package/types/model_structure/dbState.d.ts

@@ -16,8 +16,8 @@ export default class DbState {
     indexColumnId: number;
     recordId: number;
     tablePartialId: number;
-    // Nodes, groups and note boxes share one counter, so an id names one of them
-    elementId: number;
+    nodeId: number;
+    groupId: number;
     linkId: number;
     kindId: number;
     generateId(el: Exclude<keyof DbState, 'generateId'>): number;

package/types/model_structure/group.d.ts

@@ -3,6 +3,7 @@ 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;
@@ -10,6 +11,7 @@ declare class Group extends Element {
     alias: string | null;
     children: string[];
     childIds: number[];
+    childTypes: ArchElementType[];
     settings: ArchSettings;
     note: string | null;
     noteToken: Token | null;
@@ -18,7 +20,7 @@ declare class Group extends Element {
     dbState: DbState;
     constructor(raw: RawGroup & { database: Database });
     generateId(): void;
-    export(): Omit<NormalizedGroup, 'id' | 'childIds' | 'groupId'>;
+    export(): Omit<NormalizedGroup, 'id' | 'childIds' | 'childTypes' | 'groupId'>;
     normalize(model: NormalizedModel): void;
 }
 export interface NormalizedGroup {
@@ -26,6 +28,7 @@ export interface NormalizedGroup {
     name: string;
     alias: string | null;
     childIds: number[];
+    childTypes: ArchElementType[];
     settings: ArchSettings;
     note: string | null;
     groupId: number | null;

package/types/model_structure/link.d.ts

@@ -4,23 +4,30 @@ 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' | 'to'> & { fromId: number; toId: number; database: Database });
+    constructor(raw: Omit<RawLink, 'from' | 'to'> & { fromId: number; fromType: ArchElementType; toId: number; toType: ArchElementType; database: Database });
     generateId(): void;
-    export(): Omit<NormalizedLink, 'id' | 'fromId' | 'toId'>;
+    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;
 }

package/lib/model_structure/noteBox.cjs

@@ -1 +0,0 @@
-require("../_virtual/_rolldown/runtime.cjs");const e=require("./element.cjs");var t=class extends e.default{constructor({name:e,alias:t,content:n,token:r,database:i}){super(r),this.name=e,this.alias=t,this.content=n,this.groupId=null,this.database=i,this.dbState=i.dbState,this.generateId()}generateId(){this.id=this.dbState.generateId(`elementId`)}export(){return{name:this.name,alias:this.alias,content:this.content}}normalize(e){e.noteBoxes[this.id]={id:this.id,...this.export(),groupId:this.groupId}}};exports.default=t;

package/lib/model_structure/noteBox.mjs

@@ -1,26 +0,0 @@
-import e from "./element.mjs";
-//#region src/model_structure/noteBox.ts
-var t = class extends e {
-	constructor({ name: e, alias: t, content: n, token: r, database: i }) {
-		super(r), this.name = e, this.alias = t, this.content = n, this.groupId = null, this.database = i, this.dbState = i.dbState, this.generateId();
-	}
-	generateId() {
-		this.id = this.dbState.generateId("elementId");
-	}
-	export() {
-		return {
-			name: this.name,
-			alias: this.alias,
-			content: this.content
-		};
-	}
-	normalize(e) {
-		e.noteBoxes[this.id] = {
-			id: this.id,
-			...this.export(),
-			groupId: this.groupId
-		};
-	}
-};
-//#endregion
-export { t as default };

package/types/model_structure/noteBox.d.ts

@@ -1,30 +0,0 @@
-import type { NoteBox as RawNoteBox } from '@dbml/parse';
-import Element from './element';
-import Database from './database';
-import DbState from './dbState';
-import type { NormalizedModel } from './database';
-
-declare class NoteBox extends Element {
-    id: number;
-    name: string;
-    alias: string | null;
-    content: string;
-    groupId: number | null;
-    database: Database;
-    dbState: DbState;
-    constructor(raw: RawNoteBox & { database: Database });
-    generateId(): void;
-    export(): Omit<NormalizedNoteBox, 'id' | 'groupId'>;
-    normalize(model: NormalizedModel): void;
-}
-export interface NormalizedNoteBox {
-    id: number;
-    name: string;
-    alias: string | null;
-    content: string;
-    groupId: number | null;
-}
-export interface NormalizedNoteBoxIdMap {
-    [_id: number]: NormalizedNoteBox;
-}
-export default NoteBox;