@uigraph/sdk 1.1.36 → 1.1.38

package/README.md

@@ -98,13 +98,17 @@ The repo needs an `NPM_TOKEN` secret (npm Automation token) configured before th
 This project is licensed under the [Business Source License 1.1](LICENSE) (BUSL-1.1).
 
 - **Source available today** — you can read, modify, and redistribute the code under the terms of the license.
-- **Production use** — permitted for most use cases, including internal and product integration. You may not offer the SDK (or substantial portions of it) as a hosted or embedded competitive offering against UiGraph's commercial platform. See [LICENSE](LICENSE) for the full Additional Use Grant.
+- **Non-production use** — free for development, testing, evaluation, and internal proof-of-concept.
+- **Production use** — requires a commercial license from UiGraph. Production use means any use that supports the ongoing operation of your business or organization.
 - **Future open source** — each version automatically converts to [Apache License 2.0](https://www.apache.org/licenses/LICENSE-2.0) four years after it is first published under BUSL.
 
-BUSL is not an OSI-approved open source license during the initial term. For questions about commercial licensing, open an issue or contact the maintainers.
+BUSL is not an OSI-approved open source license during the initial term. For commercial licensing questions, open an issue or contact the maintainers.
 
 ## Related projects
 
 - [uigraph-ui](https://github.com/uigraph-oss/uigraph-ui) — web application
 - [uigraph-api](https://github.com/uigraph-oss/uigraph-api) — backend API
 - [uigraph-graphql](https://github.com/uigraph-oss/uigraph-graphql) — GraphQL BFF
+- [uigraph-gateway](https://github.com/uigraph-oss/uigraph-gateway) — CLI sync API
+- [uigraph-mcp](https://github.com/uigraph-oss/uigraph-mcp) — MCP server for AI assistants
+- [uigraph-deploy](https://github.com/uigraph-oss/uigraph-deploy) — self-hosted deployment

package/dist/{__headless.DiJZCsKx.d.mts → __headless.BLqB7VsJ.d.mts}

@@ -79,8 +79,8 @@ declare const contextSchema: z$1.ZodObject<{
       borderAnimationEnabled: z$1.ZodOptional<z$1.ZodBoolean>;
     }, z$1.core.$strip>>;
     dbConfig: z$1.ZodOptional<z$1.ZodObject<{
-      service: z$1.ZodString;
-      database: z$1.ZodString;
+      serviceName: z$1.ZodString;
+      databaseName: z$1.ZodString;
       tableName: z$1.ZodString;
     }, z$1.core.$strip>>;
     table: z$1.ZodOptional<z$1.ZodObject<{

package/dist/{__headless.AhKww75N.cjs → __headless.DGmyg-me.cjs}

@@ -58,8 +58,8 @@ const contextSchema = zod.default.object({
 			borderAnimationEnabled: zod.default.boolean().optional()
 		}).optional(),
 		dbConfig: zod.default.object({
-			service: zod.default.string(),
-			database: zod.default.string(),
+			serviceName: zod.default.string(),
+			databaseName: zod.default.string(),
 			tableName: zod.default.string()
 		}).optional(),
 		table: zod.default.object({

package/dist/{__headless.B7jwmaZK.d.cts → __headless.DfSqiw4X.d.cts}

@@ -79,8 +79,8 @@ declare const contextSchema: z$1.ZodObject<{
       borderAnimationEnabled: z$1.ZodOptional<z$1.ZodBoolean>;
     }, z$1.core.$strip>>;
     dbConfig: z$1.ZodOptional<z$1.ZodObject<{
-      service: z$1.ZodString;
-      database: z$1.ZodString;
+      serviceName: z$1.ZodString;
+      databaseName: z$1.ZodString;
       tableName: z$1.ZodString;
     }, z$1.core.$strip>>;
     table: z$1.ZodOptional<z$1.ZodObject<{

package/dist/{__headless.CP3up7Jj.mjs → __headless.DpdtlCFx.mjs}

@@ -57,8 +57,8 @@ const contextSchema = z$1.object({
 			borderAnimationEnabled: z$1.boolean().optional()
 		}).optional(),
 		dbConfig: z$1.object({
-			service: z$1.string(),
-			database: z$1.string(),
+			serviceName: z$1.string(),
+			databaseName: z$1.string(),
 			tableName: z$1.string()
 		}).optional(),
 		table: z$1.object({

package/dist/{__index.BwoDgQJ5.d.mts → __index.BxD_9h1c.d.mts}

@@ -94,8 +94,8 @@ type CustomData = {
   componentFields?: RFComponentField[];
   shape?: string;
   serviceTable?: {
-    serviceId: string;
-    serviceDbId: string;
+    serviceName: string;
+    databaseName: string;
     tableName: string;
   };
   title?: string;

package/dist/{__index.Ci2jxLwq.d.cts → __index.CTSMJl1o.d.cts}

@@ -94,8 +94,8 @@ type CustomData = {
   componentFields?: RFComponentField[];
   shape?: string;
   serviceTable?: {
-    serviceId: string;
-    serviceDbId: string;
+    serviceName: string;
+    databaseName: string;
     tableName: string;
   };
   title?: string;

package/dist/browser.d.cts

@@ -1,4 +1,4 @@
-import { d as ServerComponentField } from "./__index.Ci2jxLwq.cjs";
+import { d as ServerComponentField } from "./__index.CTSMJl1o.cjs";
 import "./__component-type.tW2Xh7Xk.cjs";
 import { z } from "zod";
 

package/dist/browser.d.mts

@@ -1,4 +1,4 @@
-import { d as ServerComponentField } from "./__index.BwoDgQJ5.mjs";
+import { d as ServerComponentField } from "./__index.BxD_9h1c.mjs";
 import "./__component-type.CO8FgnQE.mjs";
 import { z } from "zod";
 

package/dist/headless.cjs

@@ -1,3 +1,3 @@
 require("./__component-type.69UkUMKl.cjs");
-const require_headless = require("./__headless.AhKww75N.cjs");
+const require_headless = require("./__headless.DGmyg-me.cjs");
 exports.contextSchema = require_headless.contextSchema;

package/dist/headless.d.cts

@@ -1,3 +1,3 @@
 import "./__component-type.tW2Xh7Xk.cjs";
-import { t as contextSchema } from "./__headless.B7jwmaZK.cjs";
+import { t as contextSchema } from "./__headless.DfSqiw4X.cjs";
 export { contextSchema };

package/dist/headless.d.mts

@@ -1,3 +1,3 @@
 import "./__component-type.CO8FgnQE.mjs";
-import { t as contextSchema } from "./__headless.DiJZCsKx.mjs";
+import { t as contextSchema } from "./__headless.BLqB7VsJ.mjs";
 export { contextSchema };

package/dist/headless.mjs

@@ -1,3 +1,3 @@
 import "./__component-type.CYmD-KIu.mjs";
-import { t as contextSchema } from "./__headless.CP3up7Jj.mjs";
+import { t as contextSchema } from "./__headless.DpdtlCFx.mjs";
 export { contextSchema };

package/dist/index.cjs

@@ -1,5 +1,5 @@
 const require_component_type = require("./__component-type.69UkUMKl.cjs");
-const require_headless = require("./__headless.AhKww75N.cjs");
+const require_headless = require("./__headless.DGmyg-me.cjs");
 let daily_code = require("daily-code");
 daily_code = require_component_type.__toESM(daily_code);
 let zod = require("zod");
@@ -778,49 +778,57 @@ function generateUUID() {
 	});
 }
 var AstToUiConverter = class {
-	static updateReactFlow({ nodes, edges, schema, sourceId, oldDataSources }) {
-		console.log("UPDATE:", {
-			nodes,
-			edges,
-			schema,
-			sourceId,
-			oldDataSources
-		});
-		const oldSource = oldDataSources.find((s) => s.id === sourceId);
-		const sourceNodePrefix = `${sourceId}-table-`;
+	static updateReactFlow({ nodes, edges, schema, sourceName, oldDataSources }) {
+		var _oldSource$schemaAst$;
+		const oldSource = oldDataSources.find((s) => s.name === sourceName);
+		const sourceNodePrefix = `${sourceName}-table-`;
 		const positions = this.calculateSmartLayout(schema);
-		const nodeTableMap = new Map(nodes.map((node) => {
-			var _oldSource$schemaAst$;
-			return [oldSource === null || oldSource === void 0 || (_oldSource$schemaAst$ = oldSource.schemaAst.tables.find((t) => {
-				var _localTable;
-				return t.id === ((_localTable = node.data.localTable) === null || _localTable === void 0 ? void 0 : _localTable.tableId);
-			})) === null || _oldSource$schemaAst$ === void 0 ? void 0 : _oldSource$schemaAst$.name, node];
-		}));
-		console.log("Old node table map:", nodeTableMap);
 		const tableNames = new Set(schema.tables.map((table) => table.name));
+		const sourceNodePool = nodes.filter((node) => node.id.startsWith(sourceNodePrefix));
+		const oldNodeByName = /* @__PURE__ */ new Map();
+		for (const node of sourceNodePool) {
+			var _localTable;
+			const tableName = (_localTable = node.data.localTable) === null || _localTable === void 0 ? void 0 : _localTable.tableName;
+			if (tableName) oldNodeByName.set(tableName, node);
+		}
+		const oldTableByName = /* @__PURE__ */ new Map();
+		for (const table of (_oldSource$schemaAst$ = oldSource === null || oldSource === void 0 ? void 0 : oldSource.schemaAst.tables) !== null && _oldSource$schemaAst$ !== void 0 ? _oldSource$schemaAst$ : []) oldTableByName.set(table.name, table);
+		const consumedNodeIds = /* @__PURE__ */ new Set();
+		function mergeWithPrev(baseNode, prevNode) {
+			var _prevNode$data, _prevNode$data$style, _prevNode$data2, _baseNode$data;
+			const mergedNode = _objectSpread2(_objectSpread2(_objectSpread2({}, prevNode), baseNode), {}, { data: _objectSpread2(_objectSpread2(_objectSpread2({}, (_prevNode$data = prevNode.data) !== null && _prevNode$data !== void 0 ? _prevNode$data : {}), baseNode.data), {}, { style: (_prevNode$data$style = (_prevNode$data2 = prevNode.data) === null || _prevNode$data2 === void 0 ? void 0 : _prevNode$data2.style) !== null && _prevNode$data$style !== void 0 ? _prevNode$data$style : (_baseNode$data = baseNode.data) === null || _baseNode$data === void 0 ? void 0 : _baseNode$data.style }) });
+			if (prevNode.style) mergedNode.style = prevNode.style;
+			if (prevNode.width !== void 0) mergedNode.width = prevNode.width;
+			if (prevNode.height !== void 0) mergedNode.height = prevNode.height;
+			return mergedNode;
+		}
 		const sourceNodes = schema.tables.map((table, index) => {
-			var _ref, _ref2, _prevNode$position, _prevNode$data, _prevNode$data$style, _prevNode$data2, _baseNode$data;
-			const prevNode = nodeTableMap.get(table.name);
+			var _ref, _ref2, _prevNode$position;
+			let prevNode = oldNodeByName.get(table.name);
+			if (!prevNode || consumedNodeIds.has(prevNode.id)) {
+				prevNode = void 0;
+				const newSignature = this.tableSignature(table);
+				for (const [oldName, oldTable] of oldTableByName) {
+					if (tableNames.has(oldName)) continue;
+					const candidate = oldNodeByName.get(oldName);
+					if (!candidate || consumedNodeIds.has(candidate.id)) continue;
+					if (this.tableSignature(oldTable) === newSignature) {
+						prevNode = candidate;
+						break;
+					}
+				}
+			}
 			const position = (_ref = (_ref2 = (_prevNode$position = prevNode === null || prevNode === void 0 ? void 0 : prevNode.position) !== null && _prevNode$position !== void 0 ? _prevNode$position : table.position) !== null && _ref2 !== void 0 ? _ref2 : positions[table.name]) !== null && _ref !== void 0 ? _ref : {
 				x: 100,
 				y: 100 + index * 210
 			};
-			const baseNode = this.tableAstToNode(sourceId, table, position, tableNames);
+			const baseNode = this.tableAstToNode(sourceName, table, position, tableNames);
 			if (!prevNode) return baseNode;
-			const mergedNode = _objectSpread2(_objectSpread2(_objectSpread2({}, prevNode), baseNode), {}, { data: _objectSpread2(_objectSpread2(_objectSpread2({}, (_prevNode$data = prevNode.data) !== null && _prevNode$data !== void 0 ? _prevNode$data : {}), baseNode.data), {}, { style: (_prevNode$data$style = (_prevNode$data2 = prevNode.data) === null || _prevNode$data2 === void 0 ? void 0 : _prevNode$data2.style) !== null && _prevNode$data$style !== void 0 ? _prevNode$data$style : (_baseNode$data = baseNode.data) === null || _baseNode$data === void 0 ? void 0 : _baseNode$data.style }) });
-			if (prevNode.style) mergedNode.style = prevNode.style;
-			if (prevNode.width !== void 0) mergedNode.width = prevNode.width;
-			if (prevNode.height !== void 0) mergedNode.height = prevNode.height;
-			return mergedNode;
-		}).filter((node) => {
-			var _schema$tables$find;
-			return nodeTableMap.has((_schema$tables$find = schema.tables.find((t) => {
-				var _localTable2;
-				return t.id === ((_localTable2 = node.data.localTable) === null || _localTable2 === void 0 ? void 0 : _localTable2.tableId);
-			})) === null || _schema$tables$find === void 0 ? void 0 : _schema$tables$find.name);
+			consumedNodeIds.add(prevNode.id);
+			return mergeWithPrev(baseNode, prevNode);
 		});
 		const validNodeIds = new Set(sourceNodes.map((node) => node.id));
-		const sourceEdges = schema.tables.flatMap((table) => this.createEdgesFromTable(sourceId, table, schema.tables).filter((edge) => validNodeIds.has(edge.source) && validNodeIds.has(edge.target)));
+		const sourceEdges = schema.tables.flatMap((table) => this.createEdgesFromTable(sourceName, table, schema.tables).filter((edge) => validNodeIds.has(edge.source) && validNodeIds.has(edge.target)));
 		const preservedNodes = nodes.filter((node) => !node.id.startsWith(sourceNodePrefix));
 		const preservedEdges = edges.filter((edge) => !edge.id.startsWith(sourceNodePrefix));
 		return {
@@ -828,7 +836,7 @@ var AstToUiConverter = class {
 			edges: [...preservedEdges, ...sourceEdges]
 		};
 	}
-	static toReactFlow(schema, sourceId) {
+	static toReactFlow(schema, sourceName) {
 		const nodes = [];
 		const edges = [];
 		const tableNames = new Set(schema.tables.map((table) => table.name));
@@ -838,9 +846,9 @@ var AstToUiConverter = class {
 				x: 100,
 				y: 100 + index * 210
 			};
-			const node = this.tableAstToNode(sourceId, table, position, tableNames);
+			const node = this.tableAstToNode(sourceName, table, position, tableNames);
 			nodes.push(node);
-			const tableEdges = this.createEdgesFromTable(sourceId, table, schema.tables);
+			const tableEdges = this.createEdgesFromTable(sourceName, table, schema.tables);
 			edges.push(...tableEdges);
 		});
 		return {
@@ -938,18 +946,40 @@ var AstToUiConverter = class {
 			startX
 		}).positions;
 	}
-	static tableAstToNode(sourceId, table, position, _validTableNames) {
+	static tableAstToNode(sourceName, table, position, _validTableNames) {
 		return {
-			id: generateTableNodeId(sourceId, table.id),
+			id: generateTableNodeId(sourceName, table.name),
 			type: "databaseTableSQL",
 			width: DEFAULT_NODE_WIDTH,
 			position,
 			data: { localTable: {
-				baseId: sourceId,
-				tableId: table.id
+				databaseName: sourceName,
+				tableName: table.name
 			} }
 		};
 	}
+	static tableSignature(table) {
+		const columns = [...table.columns].sort((a, b) => a.name.localeCompare(b.name)).map((col) => {
+			var _col$dataType$paramet, _col$dataType$paramet2;
+			const params = (_col$dataType$paramet = (_col$dataType$paramet2 = col.dataType.parameters) === null || _col$dataType$paramet2 === void 0 ? void 0 : _col$dataType$paramet2.join(",")) !== null && _col$dataType$paramet !== void 0 ? _col$dataType$paramet : "";
+			return [
+				col.name,
+				col.dataType.name,
+				params,
+				col.dataType.unsigned ? "u" : "",
+				col.dataType.timezone ? "tz" : "",
+				col.nullable ? "null" : "notnull",
+				col.autoIncrement ? "ai" : ""
+			].join(":");
+		});
+		const constraints = table.constraints.map((c) => JSON.stringify(c)).sort();
+		const indexes = [...table.indexes].map((idx) => JSON.stringify(idx)).sort();
+		return JSON.stringify({
+			columns,
+			constraints,
+			indexes
+		});
+	}
 	static extractPrimaryKeys(table) {
 		const pkConstraint = table.constraints.find((c) => c.type === "primary_key");
 		if (pkConstraint) return pkConstraint.columns;
@@ -966,13 +996,13 @@ var AstToUiConverter = class {
 		if (dataType.timezone) formatted += " WITH TIME ZONE";
 		return formatted;
 	}
-	static createEdgesFromTable(baseId, sourceTable, validTables) {
+	static createEdgesFromTable(sourceName, sourceTable, validTables) {
 		const edges = [];
 		this.extractForeignKeys(sourceTable).forEach((fk, index) => {
 			const targetTable = validTables.find((t) => t.id === fk.referencedTable || t.name === fk.referencedTable);
 			if (!targetTable) return;
-			const sourceNodeId = generateTableNodeId(baseId, sourceTable.id);
-			const targetNodeId = generateTableNodeId(baseId, targetTable.id);
+			const sourceNodeId = generateTableNodeId(sourceName, sourceTable.name);
+			const targetNodeId = generateTableNodeId(sourceName, targetTable.name);
 			const edgeId = `${sourceNodeId}-fk-${index}`;
 			const fkCols = fk.columns;
 			const allNotNull = fkCols.every((cn) => {
@@ -3288,18 +3318,7 @@ function createReactFlowElements(nodes, edges, subgraphs, subgraphLayouts, subgr
 	return {
 		nodes: reactFlowNodes,
 		edges: edges.map((edge, index) => {
-			const edgeColors = [
-				"#1976D2",
-				"#388E3C",
-				"#F57C00",
-				"#7B1FA2",
-				"#C2185B"
-			];
-			const edgeColor = edgeColors[index % edgeColors.length];
-			const edgeStyle = {
-				stroke: edgeColor,
-				strokeWidth: 2.5
-			};
+			const edgeStyle = { strokeWidth: 2.5 };
 			const edgeType = "default";
 			const animated = true;
 			switch (edge.type) {
@@ -3329,17 +3348,13 @@ function createReactFlowElements(nodes, edges, subgraphs, subgraphLayouts, subgr
 				labelStyle: {
 					fontSize: "12px",
 					fontWeight: "500",
-					color: edgeColor,
 					backgroundColor: "white",
-					padding: "2px 6px",
-					borderRadius: "4px",
-					border: `1px solid ${edgeColor}`
+					padding: "2px 6px"
 				},
 				markerEnd: {
 					type: __xyflow_react.MarkerType.ArrowClosed,
 					width: 20,
-					height: 20,
-					color: edgeColor
+					height: 20
 				},
 				sourceHandle: direction === "LR" || direction === "RL" ? "source-right" : "source-bottom",
 				targetHandle: direction === "LR" || direction === "RL" ? "target-left" : "target-top",
@@ -3825,15 +3840,11 @@ function _convertMermaidToReactFlowWithContext() {
 						componentField.data = newComponentField.data;
 					}
 				}
-				if (ctx.dbConfig) {
-					var _resolved$serviceId, _resolved$serviceDbId;
-					const resolved = (options === null || options === void 0 ? void 0 : options.resolveDbConfig) ? yield options.resolveDbConfig(ctx.dbConfig.service, ctx.dbConfig.database) : void 0;
-					clonedNode.data.serviceTable = {
-						serviceId: (_resolved$serviceId = resolved === null || resolved === void 0 ? void 0 : resolved.serviceId) !== null && _resolved$serviceId !== void 0 ? _resolved$serviceId : ctx.dbConfig.service,
-						serviceDbId: (_resolved$serviceDbId = resolved === null || resolved === void 0 ? void 0 : resolved.serviceDbId) !== null && _resolved$serviceDbId !== void 0 ? _resolved$serviceDbId : ctx.dbConfig.database,
-						tableName: ctx.dbConfig.tableName
-					};
-				}
+				if (ctx.dbConfig) clonedNode.data.serviceTable = {
+					serviceName: ctx.dbConfig.serviceName,
+					databaseName: ctx.dbConfig.databaseName,
+					tableName: ctx.dbConfig.tableName
+				};
 				if ((_ctx$style = ctx.style) === null || _ctx$style === void 0 ? void 0 : _ctx$style.height) clonedNode.height = ctx.style.height;
 				if ((_ctx$style2 = ctx.style) === null || _ctx$style2 === void 0 ? void 0 : _ctx$style2.width) clonedNode.width = ctx.style.width;
 				clonedNode.data = _objectSpread2(_objectSpread2(_objectSpread2({}, clonedNode.data), (0, daily_code.objectPick)((_ctx$style3 = ctx.style) !== null && _ctx$style3 !== void 0 ? _ctx$style3 : {}, [
@@ -4151,12 +4162,12 @@ function buildContextNodes(graphNodes, nodeIdMap) {
 			rows: tableRows !== null && tableRows !== void 0 ? tableRows : []
 		};
 		const serviceTable = toRecord(nodeData.serviceTable);
-		const serviceId = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceId);
-		const serviceDbId = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceDbId);
+		const serviceName = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceName);
+		const databaseName = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.databaseName);
 		const tableName = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.tableName);
-		if (serviceId && serviceDbId && tableName) nodeContext.dbConfig = {
-			service: serviceId,
-			database: serviceDbId,
+		if (serviceName && databaseName && tableName) nodeContext.dbConfig = {
+			serviceName,
+			databaseName,
 			tableName
 		};
 		const dynamicData = {};
@@ -4442,9 +4453,9 @@ function resolveMermaidDetailedNodeLabel(node) {
 		const lines = [];
 		const serviceTable = toRecord(nodeData === null || nodeData === void 0 ? void 0 : nodeData.serviceTable);
 		const dbConfig = toRecord(nodeData === null || nodeData === void 0 ? void 0 : nodeData.dbConfig);
-		const database = (_pickString = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceDbId)) !== null && _pickString !== void 0 ? _pickString : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.database);
+		const database = (_pickString = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.databaseName)) !== null && _pickString !== void 0 ? _pickString : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.databaseName);
 		const tableName = (_pickString2 = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.tableName)) !== null && _pickString2 !== void 0 ? _pickString2 : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.tableName);
-		const dbService = (_pickString3 = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceId)) !== null && _pickString3 !== void 0 ? _pickString3 : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.service);
+		const dbService = (_pickString3 = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceName)) !== null && _pickString3 !== void 0 ? _pickString3 : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.serviceName);
 		const dataSourceName = name !== null && name !== void 0 ? name : tableName;
 		lines.push(dataSourceName ? `DataSource: ${dataSourceName}` : "DataSource");
 		if (database && tableName) lines.push(`db: ${database}.${tableName}`);

package/dist/index.d.cts

@@ -1,6 +1,6 @@
-import { a as MermaidNode, c as SequenceParticipant, d as ServerComponentField, f as ServerComponentFieldInput, i as MermaidEdge, l as SubgraphInfo, n as RFComponentField, o as SequenceDiagramData, r as ReactFlowData, s as SequenceMessage, t as CustomData, u as SubgraphLayout } from "./__index.Ci2jxLwq.cjs";
+import { a as MermaidNode, c as SequenceParticipant, d as ServerComponentField, f as ServerComponentFieldInput, i as MermaidEdge, l as SubgraphInfo, n as RFComponentField, o as SequenceDiagramData, r as ReactFlowData, s as SequenceMessage, t as CustomData, u as SubgraphLayout } from "./__index.CTSMJl1o.cjs";
 import { t as ComponentInputType } from "./__component-type.tW2Xh7Xk.cjs";
-import { t as contextSchema } from "./__headless.B7jwmaZK.cjs";
+import { t as contextSchema } from "./__headless.DfSqiw4X.cjs";
 import z$1, { z } from "zod";
 import { Edge, Node } from "@xyflow/react";
 
@@ -131,12 +131,12 @@ interface DatabaseTableSQLNodeData extends Record<string, unknown> {
   };
   isForcedOpen?: boolean;
   localTable?: {
-    baseId: string;
-    tableId: string;
+    databaseName: string;
+    tableName: string;
   };
   serviceTable?: {
-    serviceId: string;
-    serviceDbId: string;
+    serviceName: string;
+    databaseName: string;
     tableName: string;
   };
 }
@@ -305,19 +305,19 @@ declare class AstToUiConverter {
     nodes,
     edges,
     schema,
-    sourceId,
+    sourceName,
     oldDataSources
   }: {
     nodes: Node[];
     edges: Edge[];
-    sourceId: string;
+    sourceName: string;
     schema: SchemaAST;
     oldDataSources: DataSource[];
   }): {
     nodes: Node[];
     edges: Edge[];
   };
-  static toReactFlow(schema: SchemaAST, sourceId: string): {
+  static toReactFlow(schema: SchemaAST, sourceName: string): {
     nodes: Node<DatabaseTableSQLNodeData>[];
     edges: Edge[];
   };
@@ -333,6 +333,7 @@ declare class AstToUiConverter {
    * Convert table AST to ReactFlow node
    */
   private static tableAstToNode;
+  private static tableSignature;
   /**
    * Extract primary keys from table
    */
@@ -745,10 +746,6 @@ declare function buildMetaData(fields: ServerComponentField[], data: Record<stri
 type ResolverOptions = {
   repositionNodes?: boolean;
   resolveCloudIcon?: (cloud: string | undefined, service: string) => Promise<string | undefined | null>;
-  resolveDbConfig?: (service: string, database: string) => Promise<{
-    serviceId?: string;
-    serviceDbId?: string;
-  } | undefined>;
 };
 declare function convertMermaidToReactFlowWithContext(mermaidCode: string, context: z$1.infer<typeof contextSchema>, options?: ResolverOptions): Promise<ReactFlowData>;
 //#endregion

package/dist/index.d.mts

@@ -1,6 +1,6 @@
-import { a as MermaidNode, c as SequenceParticipant, d as ServerComponentField, f as ServerComponentFieldInput, i as MermaidEdge, l as SubgraphInfo, n as RFComponentField, o as SequenceDiagramData, r as ReactFlowData, s as SequenceMessage, t as CustomData, u as SubgraphLayout } from "./__index.BwoDgQJ5.mjs";
+import { a as MermaidNode, c as SequenceParticipant, d as ServerComponentField, f as ServerComponentFieldInput, i as MermaidEdge, l as SubgraphInfo, n as RFComponentField, o as SequenceDiagramData, r as ReactFlowData, s as SequenceMessage, t as CustomData, u as SubgraphLayout } from "./__index.BxD_9h1c.mjs";
 import { t as ComponentInputType } from "./__component-type.CO8FgnQE.mjs";
-import { t as contextSchema } from "./__headless.DiJZCsKx.mjs";
+import { t as contextSchema } from "./__headless.BLqB7VsJ.mjs";
 import z$1, { z } from "zod";
 import { Edge, Node } from "@xyflow/react";
 
@@ -131,12 +131,12 @@ interface DatabaseTableSQLNodeData extends Record<string, unknown> {
   };
   isForcedOpen?: boolean;
   localTable?: {
-    baseId: string;
-    tableId: string;
+    databaseName: string;
+    tableName: string;
   };
   serviceTable?: {
-    serviceId: string;
-    serviceDbId: string;
+    serviceName: string;
+    databaseName: string;
     tableName: string;
   };
 }
@@ -305,19 +305,19 @@ declare class AstToUiConverter {
     nodes,
     edges,
     schema,
-    sourceId,
+    sourceName,
     oldDataSources
   }: {
     nodes: Node[];
     edges: Edge[];
-    sourceId: string;
+    sourceName: string;
     schema: SchemaAST;
     oldDataSources: DataSource[];
   }): {
     nodes: Node[];
     edges: Edge[];
   };
-  static toReactFlow(schema: SchemaAST, sourceId: string): {
+  static toReactFlow(schema: SchemaAST, sourceName: string): {
     nodes: Node<DatabaseTableSQLNodeData>[];
     edges: Edge[];
   };
@@ -333,6 +333,7 @@ declare class AstToUiConverter {
    * Convert table AST to ReactFlow node
    */
   private static tableAstToNode;
+  private static tableSignature;
   /**
    * Extract primary keys from table
    */
@@ -745,10 +746,6 @@ declare function buildMetaData(fields: ServerComponentField[], data: Record<stri
 type ResolverOptions = {
   repositionNodes?: boolean;
   resolveCloudIcon?: (cloud: string | undefined, service: string) => Promise<string | undefined | null>;
-  resolveDbConfig?: (service: string, database: string) => Promise<{
-    serviceId?: string;
-    serviceDbId?: string;
-  } | undefined>;
 };
 declare function convertMermaidToReactFlowWithContext(mermaidCode: string, context: z$1.infer<typeof contextSchema>, options?: ResolverOptions): Promise<ReactFlowData>;
 //#endregion

package/dist/index.mjs

@@ -1,5 +1,5 @@
 import { t as ComponentInputType } from "./__component-type.CYmD-KIu.mjs";
-import { t as contextSchema } from "./__headless.CP3up7Jj.mjs";
+import { t as contextSchema } from "./__headless.DpdtlCFx.mjs";
 import { arrayNonNullable, generateUUID as generateUUID$1, objectPick } from "daily-code";
 import { z } from "zod";
 import { MarkerType, Position } from "@xyflow/react";
@@ -772,49 +772,57 @@ function generateUUID() {
 	});
 }
 var AstToUiConverter = class {
-	static updateReactFlow({ nodes, edges, schema, sourceId, oldDataSources }) {
-		console.log("UPDATE:", {
-			nodes,
-			edges,
-			schema,
-			sourceId,
-			oldDataSources
-		});
-		const oldSource = oldDataSources.find((s) => s.id === sourceId);
-		const sourceNodePrefix = `${sourceId}-table-`;
+	static updateReactFlow({ nodes, edges, schema, sourceName, oldDataSources }) {
+		var _oldSource$schemaAst$;
+		const oldSource = oldDataSources.find((s) => s.name === sourceName);
+		const sourceNodePrefix = `${sourceName}-table-`;
 		const positions = this.calculateSmartLayout(schema);
-		const nodeTableMap = new Map(nodes.map((node) => {
-			var _oldSource$schemaAst$;
-			return [oldSource === null || oldSource === void 0 || (_oldSource$schemaAst$ = oldSource.schemaAst.tables.find((t) => {
-				var _localTable;
-				return t.id === ((_localTable = node.data.localTable) === null || _localTable === void 0 ? void 0 : _localTable.tableId);
-			})) === null || _oldSource$schemaAst$ === void 0 ? void 0 : _oldSource$schemaAst$.name, node];
-		}));
-		console.log("Old node table map:", nodeTableMap);
 		const tableNames = new Set(schema.tables.map((table) => table.name));
+		const sourceNodePool = nodes.filter((node) => node.id.startsWith(sourceNodePrefix));
+		const oldNodeByName = /* @__PURE__ */ new Map();
+		for (const node of sourceNodePool) {
+			var _localTable;
+			const tableName = (_localTable = node.data.localTable) === null || _localTable === void 0 ? void 0 : _localTable.tableName;
+			if (tableName) oldNodeByName.set(tableName, node);
+		}
+		const oldTableByName = /* @__PURE__ */ new Map();
+		for (const table of (_oldSource$schemaAst$ = oldSource === null || oldSource === void 0 ? void 0 : oldSource.schemaAst.tables) !== null && _oldSource$schemaAst$ !== void 0 ? _oldSource$schemaAst$ : []) oldTableByName.set(table.name, table);
+		const consumedNodeIds = /* @__PURE__ */ new Set();
+		function mergeWithPrev(baseNode, prevNode) {
+			var _prevNode$data, _prevNode$data$style, _prevNode$data2, _baseNode$data;
+			const mergedNode = _objectSpread2(_objectSpread2(_objectSpread2({}, prevNode), baseNode), {}, { data: _objectSpread2(_objectSpread2(_objectSpread2({}, (_prevNode$data = prevNode.data) !== null && _prevNode$data !== void 0 ? _prevNode$data : {}), baseNode.data), {}, { style: (_prevNode$data$style = (_prevNode$data2 = prevNode.data) === null || _prevNode$data2 === void 0 ? void 0 : _prevNode$data2.style) !== null && _prevNode$data$style !== void 0 ? _prevNode$data$style : (_baseNode$data = baseNode.data) === null || _baseNode$data === void 0 ? void 0 : _baseNode$data.style }) });
+			if (prevNode.style) mergedNode.style = prevNode.style;
+			if (prevNode.width !== void 0) mergedNode.width = prevNode.width;
+			if (prevNode.height !== void 0) mergedNode.height = prevNode.height;
+			return mergedNode;
+		}
 		const sourceNodes = schema.tables.map((table, index) => {
-			var _ref, _ref2, _prevNode$position, _prevNode$data, _prevNode$data$style, _prevNode$data2, _baseNode$data;
-			const prevNode = nodeTableMap.get(table.name);
+			var _ref, _ref2, _prevNode$position;
+			let prevNode = oldNodeByName.get(table.name);
+			if (!prevNode || consumedNodeIds.has(prevNode.id)) {
+				prevNode = void 0;
+				const newSignature = this.tableSignature(table);
+				for (const [oldName, oldTable] of oldTableByName) {
+					if (tableNames.has(oldName)) continue;
+					const candidate = oldNodeByName.get(oldName);
+					if (!candidate || consumedNodeIds.has(candidate.id)) continue;
+					if (this.tableSignature(oldTable) === newSignature) {
+						prevNode = candidate;
+						break;
+					}
+				}
+			}
 			const position = (_ref = (_ref2 = (_prevNode$position = prevNode === null || prevNode === void 0 ? void 0 : prevNode.position) !== null && _prevNode$position !== void 0 ? _prevNode$position : table.position) !== null && _ref2 !== void 0 ? _ref2 : positions[table.name]) !== null && _ref !== void 0 ? _ref : {
 				x: 100,
 				y: 100 + index * 210
 			};
-			const baseNode = this.tableAstToNode(sourceId, table, position, tableNames);
+			const baseNode = this.tableAstToNode(sourceName, table, position, tableNames);
 			if (!prevNode) return baseNode;
-			const mergedNode = _objectSpread2(_objectSpread2(_objectSpread2({}, prevNode), baseNode), {}, { data: _objectSpread2(_objectSpread2(_objectSpread2({}, (_prevNode$data = prevNode.data) !== null && _prevNode$data !== void 0 ? _prevNode$data : {}), baseNode.data), {}, { style: (_prevNode$data$style = (_prevNode$data2 = prevNode.data) === null || _prevNode$data2 === void 0 ? void 0 : _prevNode$data2.style) !== null && _prevNode$data$style !== void 0 ? _prevNode$data$style : (_baseNode$data = baseNode.data) === null || _baseNode$data === void 0 ? void 0 : _baseNode$data.style }) });
-			if (prevNode.style) mergedNode.style = prevNode.style;
-			if (prevNode.width !== void 0) mergedNode.width = prevNode.width;
-			if (prevNode.height !== void 0) mergedNode.height = prevNode.height;
-			return mergedNode;
-		}).filter((node) => {
-			var _schema$tables$find;
-			return nodeTableMap.has((_schema$tables$find = schema.tables.find((t) => {
-				var _localTable2;
-				return t.id === ((_localTable2 = node.data.localTable) === null || _localTable2 === void 0 ? void 0 : _localTable2.tableId);
-			})) === null || _schema$tables$find === void 0 ? void 0 : _schema$tables$find.name);
+			consumedNodeIds.add(prevNode.id);
+			return mergeWithPrev(baseNode, prevNode);
 		});
 		const validNodeIds = new Set(sourceNodes.map((node) => node.id));
-		const sourceEdges = schema.tables.flatMap((table) => this.createEdgesFromTable(sourceId, table, schema.tables).filter((edge) => validNodeIds.has(edge.source) && validNodeIds.has(edge.target)));
+		const sourceEdges = schema.tables.flatMap((table) => this.createEdgesFromTable(sourceName, table, schema.tables).filter((edge) => validNodeIds.has(edge.source) && validNodeIds.has(edge.target)));
 		const preservedNodes = nodes.filter((node) => !node.id.startsWith(sourceNodePrefix));
 		const preservedEdges = edges.filter((edge) => !edge.id.startsWith(sourceNodePrefix));
 		return {
@@ -822,7 +830,7 @@ var AstToUiConverter = class {
 			edges: [...preservedEdges, ...sourceEdges]
 		};
 	}
-	static toReactFlow(schema, sourceId) {
+	static toReactFlow(schema, sourceName) {
 		const nodes = [];
 		const edges = [];
 		const tableNames = new Set(schema.tables.map((table) => table.name));
@@ -832,9 +840,9 @@ var AstToUiConverter = class {
 				x: 100,
 				y: 100 + index * 210
 			};
-			const node = this.tableAstToNode(sourceId, table, position, tableNames);
+			const node = this.tableAstToNode(sourceName, table, position, tableNames);
 			nodes.push(node);
-			const tableEdges = this.createEdgesFromTable(sourceId, table, schema.tables);
+			const tableEdges = this.createEdgesFromTable(sourceName, table, schema.tables);
 			edges.push(...tableEdges);
 		});
 		return {
@@ -932,18 +940,40 @@ var AstToUiConverter = class {
 			startX
 		}).positions;
 	}
-	static tableAstToNode(sourceId, table, position, _validTableNames) {
+	static tableAstToNode(sourceName, table, position, _validTableNames) {
 		return {
-			id: generateTableNodeId(sourceId, table.id),
+			id: generateTableNodeId(sourceName, table.name),
 			type: "databaseTableSQL",
 			width: DEFAULT_NODE_WIDTH,
 			position,
 			data: { localTable: {
-				baseId: sourceId,
-				tableId: table.id
+				databaseName: sourceName,
+				tableName: table.name
 			} }
 		};
 	}
+	static tableSignature(table) {
+		const columns = [...table.columns].sort((a, b) => a.name.localeCompare(b.name)).map((col) => {
+			var _col$dataType$paramet, _col$dataType$paramet2;
+			const params = (_col$dataType$paramet = (_col$dataType$paramet2 = col.dataType.parameters) === null || _col$dataType$paramet2 === void 0 ? void 0 : _col$dataType$paramet2.join(",")) !== null && _col$dataType$paramet !== void 0 ? _col$dataType$paramet : "";
+			return [
+				col.name,
+				col.dataType.name,
+				params,
+				col.dataType.unsigned ? "u" : "",
+				col.dataType.timezone ? "tz" : "",
+				col.nullable ? "null" : "notnull",
+				col.autoIncrement ? "ai" : ""
+			].join(":");
+		});
+		const constraints = table.constraints.map((c) => JSON.stringify(c)).sort();
+		const indexes = [...table.indexes].map((idx) => JSON.stringify(idx)).sort();
+		return JSON.stringify({
+			columns,
+			constraints,
+			indexes
+		});
+	}
 	static extractPrimaryKeys(table) {
 		const pkConstraint = table.constraints.find((c) => c.type === "primary_key");
 		if (pkConstraint) return pkConstraint.columns;
@@ -960,13 +990,13 @@ var AstToUiConverter = class {
 		if (dataType.timezone) formatted += " WITH TIME ZONE";
 		return formatted;
 	}
-	static createEdgesFromTable(baseId, sourceTable, validTables) {
+	static createEdgesFromTable(sourceName, sourceTable, validTables) {
 		const edges = [];
 		this.extractForeignKeys(sourceTable).forEach((fk, index) => {
 			const targetTable = validTables.find((t) => t.id === fk.referencedTable || t.name === fk.referencedTable);
 			if (!targetTable) return;
-			const sourceNodeId = generateTableNodeId(baseId, sourceTable.id);
-			const targetNodeId = generateTableNodeId(baseId, targetTable.id);
+			const sourceNodeId = generateTableNodeId(sourceName, sourceTable.name);
+			const targetNodeId = generateTableNodeId(sourceName, targetTable.name);
 			const edgeId = `${sourceNodeId}-fk-${index}`;
 			const fkCols = fk.columns;
 			const allNotNull = fkCols.every((cn) => {
@@ -3281,18 +3311,7 @@ function createReactFlowElements(nodes, edges, subgraphs, subgraphLayouts, subgr
 	return {
 		nodes: reactFlowNodes,
 		edges: edges.map((edge, index) => {
-			const edgeColors = [
-				"#1976D2",
-				"#388E3C",
-				"#F57C00",
-				"#7B1FA2",
-				"#C2185B"
-			];
-			const edgeColor = edgeColors[index % edgeColors.length];
-			const edgeStyle = {
-				stroke: edgeColor,
-				strokeWidth: 2.5
-			};
+			const edgeStyle = { strokeWidth: 2.5 };
 			const edgeType = "default";
 			const animated = true;
 			switch (edge.type) {
@@ -3322,17 +3341,13 @@ function createReactFlowElements(nodes, edges, subgraphs, subgraphLayouts, subgr
 				labelStyle: {
 					fontSize: "12px",
 					fontWeight: "500",
-					color: edgeColor,
 					backgroundColor: "white",
-					padding: "2px 6px",
-					borderRadius: "4px",
-					border: `1px solid ${edgeColor}`
+					padding: "2px 6px"
 				},
 				markerEnd: {
 					type: MarkerType.ArrowClosed,
 					width: 20,
-					height: 20,
-					color: edgeColor
+					height: 20
 				},
 				sourceHandle: direction === "LR" || direction === "RL" ? "source-right" : "source-bottom",
 				targetHandle: direction === "LR" || direction === "RL" ? "target-left" : "target-top",
@@ -3818,15 +3833,11 @@ function _convertMermaidToReactFlowWithContext() {
 						componentField.data = newComponentField.data;
 					}
 				}
-				if (ctx.dbConfig) {
-					var _resolved$serviceId, _resolved$serviceDbId;
-					const resolved = (options === null || options === void 0 ? void 0 : options.resolveDbConfig) ? yield options.resolveDbConfig(ctx.dbConfig.service, ctx.dbConfig.database) : void 0;
-					clonedNode.data.serviceTable = {
-						serviceId: (_resolved$serviceId = resolved === null || resolved === void 0 ? void 0 : resolved.serviceId) !== null && _resolved$serviceId !== void 0 ? _resolved$serviceId : ctx.dbConfig.service,
-						serviceDbId: (_resolved$serviceDbId = resolved === null || resolved === void 0 ? void 0 : resolved.serviceDbId) !== null && _resolved$serviceDbId !== void 0 ? _resolved$serviceDbId : ctx.dbConfig.database,
-						tableName: ctx.dbConfig.tableName
-					};
-				}
+				if (ctx.dbConfig) clonedNode.data.serviceTable = {
+					serviceName: ctx.dbConfig.serviceName,
+					databaseName: ctx.dbConfig.databaseName,
+					tableName: ctx.dbConfig.tableName
+				};
 				if ((_ctx$style = ctx.style) === null || _ctx$style === void 0 ? void 0 : _ctx$style.height) clonedNode.height = ctx.style.height;
 				if ((_ctx$style2 = ctx.style) === null || _ctx$style2 === void 0 ? void 0 : _ctx$style2.width) clonedNode.width = ctx.style.width;
 				clonedNode.data = _objectSpread2(_objectSpread2(_objectSpread2({}, clonedNode.data), objectPick((_ctx$style3 = ctx.style) !== null && _ctx$style3 !== void 0 ? _ctx$style3 : {}, [
@@ -4144,12 +4155,12 @@ function buildContextNodes(graphNodes, nodeIdMap) {
 			rows: tableRows !== null && tableRows !== void 0 ? tableRows : []
 		};
 		const serviceTable = toRecord(nodeData.serviceTable);
-		const serviceId = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceId);
-		const serviceDbId = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceDbId);
+		const serviceName = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceName);
+		const databaseName = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.databaseName);
 		const tableName = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.tableName);
-		if (serviceId && serviceDbId && tableName) nodeContext.dbConfig = {
-			service: serviceId,
-			database: serviceDbId,
+		if (serviceName && databaseName && tableName) nodeContext.dbConfig = {
+			serviceName,
+			databaseName,
 			tableName
 		};
 		const dynamicData = {};
@@ -4435,9 +4446,9 @@ function resolveMermaidDetailedNodeLabel(node) {
 		const lines = [];
 		const serviceTable = toRecord(nodeData === null || nodeData === void 0 ? void 0 : nodeData.serviceTable);
 		const dbConfig = toRecord(nodeData === null || nodeData === void 0 ? void 0 : nodeData.dbConfig);
-		const database = (_pickString = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceDbId)) !== null && _pickString !== void 0 ? _pickString : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.database);
+		const database = (_pickString = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.databaseName)) !== null && _pickString !== void 0 ? _pickString : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.databaseName);
 		const tableName = (_pickString2 = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.tableName)) !== null && _pickString2 !== void 0 ? _pickString2 : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.tableName);
-		const dbService = (_pickString3 = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceId)) !== null && _pickString3 !== void 0 ? _pickString3 : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.service);
+		const dbService = (_pickString3 = pickString(serviceTable === null || serviceTable === void 0 ? void 0 : serviceTable.serviceName)) !== null && _pickString3 !== void 0 ? _pickString3 : pickString(dbConfig === null || dbConfig === void 0 ? void 0 : dbConfig.serviceName);
 		const dataSourceName = name !== null && name !== void 0 ? name : tableName;
 		lines.push(dataSourceName ? `DataSource: ${dataSourceName}` : "DataSource");
 		if (database && tableName) lines.push(`db: ${database}.${tableName}`);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uigraph/sdk",
-  "version": "1.1.36",
+  "version": "1.1.38",
   "type": "module",
   "license": "BUSL-1.1",
   "repository": {