@uigraph/sdk 1.2.11 → 1.2.12

package/LICENSE

@@ -5,10 +5,10 @@ License text copyright © 2017 MariaDB Corporation Ab, All Rights Reserved.
 
 Parameters
 
-Licensor:             UiGraph, Inc.
+Licensor:             UIGraph, Inc.
 Licensed Work:        The software made available under this License in this
                       repository (the "Licensed Work"). The Licensed Work is
-                      (c) UiGraph, Inc.
+                      (c) UIGraph, Inc.
 Additional Use Grant: You may make non-production use of the Licensed Work
                       free of charge, including for development, testing,
                       evaluation, and internal proof-of-concept purposes.

package/README.md

@@ -54,14 +54,14 @@ const ast = new SqlToAstParser(dialect).parse(sql)
 
 ## Package entry points
 
-| Import | Use when |
-|--------|----------|
-| `@uigraph/sdk` | Full SDK (Node.js or bundlers) |
-| `@uigraph/sdk/browser` | Browser environments |
-| `@uigraph/sdk/headless` | Server-side conversion without DOM APIs |
-| `@uigraph/sdk/aws-icons` | AWS icon metadata |
-| `@uigraph/sdk/azure-icons` | Azure icon metadata |
-| `@uigraph/sdk/animated-nodes` | Animated node icon metadata |
+| Import                        | Use when                                |
+| ----------------------------- | --------------------------------------- |
+| `@uigraph/sdk`                | Full SDK (Node.js or bundlers)          |
+| `@uigraph/sdk/browser`        | Browser environments                    |
+| `@uigraph/sdk/headless`       | Server-side conversion without DOM APIs |
+| `@uigraph/sdk/aws-icons`      | AWS icon metadata                       |
+| `@uigraph/sdk/azure-icons`    | Azure icon metadata                     |
+| `@uigraph/sdk/animated-nodes` | Animated node icon metadata             |
 
 ```ts
 import { convertMermaidToReactFlow } from '@uigraph/sdk/browser'
@@ -99,7 +99,7 @@ This project is licensed under the [Business Source License 1.1](LICENSE) (BUSL-
 
 - **Source available today** — you can read, modify, and redistribute the code under the terms of the license.
 - **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.
+- **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 commercial licensing questions, open an issue or contact the maintainers.

package/dist/index.cjs

@@ -2780,16 +2780,19 @@ const LAYOUT_SPACING = {
 	SUBGRAPH_HEADER_HEIGHT: 35,
 	SUBGRAPH_PADDING: 8,
 	SUBGRAPH_CONTENT_TOP_MARGIN: 10,
-	NODE_SEPARATION_HORIZONTAL: 80,
-	NODE_SEPARATION_VERTICAL: 100,
-	CONTAINER_SEPARATION_HORIZONTAL: 120,
-	CONTAINER_SEPARATION_VERTICAL: 160,
-	NESTED_SUBGRAPH_SEPARATION_HORIZONTAL: 120,
-	NESTED_SUBGRAPH_SEPARATION_VERTICAL: 140,
+	NODE_SEPARATION_HORIZONTAL: 120,
+	NODE_SEPARATION_VERTICAL: 180,
+	CONTAINER_SEPARATION_HORIZONTAL: 180,
+	CONTAINER_SEPARATION_VERTICAL: 280,
+	NESTED_SUBGRAPH_SEPARATION_HORIZONTAL: 160,
+	NESTED_SUBGRAPH_SEPARATION_VERTICAL: 220,
+	MIN_SUBGRAPH_WIDTH_HORIZONTAL: 600,
+	MIN_SUBGRAPH_WIDTH_VERTICAL: 240,
+	MIN_SUBGRAPH_HEIGHT: 200,
 	META_GRAPH_MARGIN: 100,
 	NESTED_CONTENT_MARGIN: 40,
-	MIXED_CONTENT_VERTICAL_SPACING: 100,
-	MIXED_CONTENT_HORIZONTAL_SPACING: 120
+	MIXED_CONTENT_VERTICAL_SPACING: 180,
+	MIXED_CONTENT_HORIZONTAL_SPACING: 160
 };
 const LAYOUT_RANKERS = {
 	NETWORK_SIMPLEX: "network-simplex",
@@ -3318,6 +3321,9 @@ const CONTAINER_SEPARATION_HORIZONTAL = LAYOUT_SPACING.CONTAINER_SEPARATION_HORI
 const CONTAINER_SEPARATION_VERTICAL = LAYOUT_SPACING.CONTAINER_SEPARATION_VERTICAL;
 const NESTED_SUBGRAPH_SEPARATION_HORIZONTAL = LAYOUT_SPACING.NESTED_SUBGRAPH_SEPARATION_HORIZONTAL;
 const NESTED_SUBGRAPH_SEPARATION_VERTICAL = LAYOUT_SPACING.NESTED_SUBGRAPH_SEPARATION_VERTICAL;
+const MIN_SUBGRAPH_WIDTH_HORIZONTAL = LAYOUT_SPACING.MIN_SUBGRAPH_WIDTH_HORIZONTAL;
+const MIN_SUBGRAPH_WIDTH_VERTICAL = LAYOUT_SPACING.MIN_SUBGRAPH_WIDTH_VERTICAL;
+const MIN_SUBGRAPH_HEIGHT = LAYOUT_SPACING.MIN_SUBGRAPH_HEIGHT;
 const META_GRAPH_MARGIN = LAYOUT_SPACING.META_GRAPH_MARGIN;
 const NESTED_CONTENT_MARGIN = LAYOUT_SPACING.NESTED_CONTENT_MARGIN;
 const MIXED_CONTENT_VERTICAL_SPACING = LAYOUT_SPACING.MIXED_CONTENT_VERTICAL_SPACING;
@@ -3404,6 +3410,7 @@ function processSubgraphsInHierarchicalOrder(subgraphs) {
 }
 function layoutSubgraphs(nodes, edges, subgraphs, direction) {
 	const subgraphLayouts = /* @__PURE__ */ new Map();
+	const isHorizontal = direction === "LR" || direction === "RL";
 	const orderedSubgraphs = processSubgraphsInHierarchicalOrder(subgraphs);
 	debugLog(`Laying out ${orderedSubgraphs.length} subgraphs in hierarchical order`);
 	orderedSubgraphs.forEach((subgraph) => {
@@ -3476,8 +3483,8 @@ function layoutSubgraphs(nodes, edges, subgraphs, direction) {
 		validateNodeSpacing(nodePositions, subgraph.id);
 		const baseWidth = maxX - minX + SUBGRAPH_PADDING * 2;
 		const baseHeight = maxY - minY + SUBGRAPH_PADDING * 2 + SUBGRAPH_HEADER_HEIGHT + SUBGRAPH_CONTENT_TOP_MARGIN;
-		const width = baseWidth + 4;
-		const height = baseHeight + 4;
+		const width = Math.max(baseWidth + SUBGRAPH_PADDING * 3, isHorizontal ? MIN_SUBGRAPH_WIDTH_HORIZONTAL : MIN_SUBGRAPH_WIDTH_VERTICAL);
+		const height = Math.max(baseHeight + SUBGRAPH_PADDING * 2, MIN_SUBGRAPH_HEIGHT);
 		subgraphLayouts.set(subgraph.id, {
 			id: subgraph.id,
 			title: subgraph.title,
@@ -3587,8 +3594,8 @@ function adjustParentSizesAfterPositioning(subgraphLayouts, subgraphPositions, o
 			const contentMaxBottom = Math.max(maxNodeBottom, maxChildBottom);
 			const requiredWidth = contentMaxRight + (isHorizontal ? SUBGRAPH_PADDING * 4 : SUBGRAPH_PADDING * 3);
 			const requiredHeight = contentMaxBottom + SUBGRAPH_PADDING * 3;
-			const newWidth = Math.max(layout.width, requiredWidth, isHorizontal ? 600 : 240);
-			const newHeight = Math.max(layout.height, requiredHeight, 200);
+			const newWidth = Math.max(layout.width, requiredWidth, isHorizontal ? MIN_SUBGRAPH_WIDTH_HORIZONTAL : MIN_SUBGRAPH_WIDTH_VERTICAL);
+			const newHeight = Math.max(layout.height, requiredHeight, MIN_SUBGRAPH_HEIGHT);
 			if (newWidth > layout.width || newHeight > layout.height) {
 				debugLog(`Post-positioning resize (iter ${iterations}): ${subgraph.id} ${layout.width}x${layout.height} → ${newWidth}x${newHeight}`);
 				layout.width = newWidth;

package/dist/index.mjs

@@ -2774,16 +2774,19 @@ const LAYOUT_SPACING = {
 	SUBGRAPH_HEADER_HEIGHT: 35,
 	SUBGRAPH_PADDING: 8,
 	SUBGRAPH_CONTENT_TOP_MARGIN: 10,
-	NODE_SEPARATION_HORIZONTAL: 80,
-	NODE_SEPARATION_VERTICAL: 100,
-	CONTAINER_SEPARATION_HORIZONTAL: 120,
-	CONTAINER_SEPARATION_VERTICAL: 160,
-	NESTED_SUBGRAPH_SEPARATION_HORIZONTAL: 120,
-	NESTED_SUBGRAPH_SEPARATION_VERTICAL: 140,
+	NODE_SEPARATION_HORIZONTAL: 120,
+	NODE_SEPARATION_VERTICAL: 180,
+	CONTAINER_SEPARATION_HORIZONTAL: 180,
+	CONTAINER_SEPARATION_VERTICAL: 280,
+	NESTED_SUBGRAPH_SEPARATION_HORIZONTAL: 160,
+	NESTED_SUBGRAPH_SEPARATION_VERTICAL: 220,
+	MIN_SUBGRAPH_WIDTH_HORIZONTAL: 600,
+	MIN_SUBGRAPH_WIDTH_VERTICAL: 240,
+	MIN_SUBGRAPH_HEIGHT: 200,
 	META_GRAPH_MARGIN: 100,
 	NESTED_CONTENT_MARGIN: 40,
-	MIXED_CONTENT_VERTICAL_SPACING: 100,
-	MIXED_CONTENT_HORIZONTAL_SPACING: 120
+	MIXED_CONTENT_VERTICAL_SPACING: 180,
+	MIXED_CONTENT_HORIZONTAL_SPACING: 160
 };
 ({
 	NETWORK_SIMPLEX: "network-simplex",
@@ -3311,6 +3314,9 @@ const CONTAINER_SEPARATION_HORIZONTAL = LAYOUT_SPACING.CONTAINER_SEPARATION_HORI
 const CONTAINER_SEPARATION_VERTICAL = LAYOUT_SPACING.CONTAINER_SEPARATION_VERTICAL;
 const NESTED_SUBGRAPH_SEPARATION_HORIZONTAL = LAYOUT_SPACING.NESTED_SUBGRAPH_SEPARATION_HORIZONTAL;
 const NESTED_SUBGRAPH_SEPARATION_VERTICAL = LAYOUT_SPACING.NESTED_SUBGRAPH_SEPARATION_VERTICAL;
+const MIN_SUBGRAPH_WIDTH_HORIZONTAL = LAYOUT_SPACING.MIN_SUBGRAPH_WIDTH_HORIZONTAL;
+const MIN_SUBGRAPH_WIDTH_VERTICAL = LAYOUT_SPACING.MIN_SUBGRAPH_WIDTH_VERTICAL;
+const MIN_SUBGRAPH_HEIGHT = LAYOUT_SPACING.MIN_SUBGRAPH_HEIGHT;
 const META_GRAPH_MARGIN = LAYOUT_SPACING.META_GRAPH_MARGIN;
 const NESTED_CONTENT_MARGIN = LAYOUT_SPACING.NESTED_CONTENT_MARGIN;
 const MIXED_CONTENT_VERTICAL_SPACING = LAYOUT_SPACING.MIXED_CONTENT_VERTICAL_SPACING;
@@ -3397,6 +3403,7 @@ function processSubgraphsInHierarchicalOrder(subgraphs) {
 }
 function layoutSubgraphs(nodes, edges, subgraphs, direction) {
 	const subgraphLayouts = /* @__PURE__ */ new Map();
+	const isHorizontal = direction === "LR" || direction === "RL";
 	const orderedSubgraphs = processSubgraphsInHierarchicalOrder(subgraphs);
 	debugLog(`Laying out ${orderedSubgraphs.length} subgraphs in hierarchical order`);
 	orderedSubgraphs.forEach((subgraph) => {
@@ -3469,8 +3476,8 @@ function layoutSubgraphs(nodes, edges, subgraphs, direction) {
 		validateNodeSpacing(nodePositions, subgraph.id);
 		const baseWidth = maxX - minX + SUBGRAPH_PADDING * 2;
 		const baseHeight = maxY - minY + SUBGRAPH_PADDING * 2 + SUBGRAPH_HEADER_HEIGHT + SUBGRAPH_CONTENT_TOP_MARGIN;
-		const width = baseWidth + 4;
-		const height = baseHeight + 4;
+		const width = Math.max(baseWidth + SUBGRAPH_PADDING * 3, isHorizontal ? MIN_SUBGRAPH_WIDTH_HORIZONTAL : MIN_SUBGRAPH_WIDTH_VERTICAL);
+		const height = Math.max(baseHeight + SUBGRAPH_PADDING * 2, MIN_SUBGRAPH_HEIGHT);
 		subgraphLayouts.set(subgraph.id, {
 			id: subgraph.id,
 			title: subgraph.title,
@@ -3580,8 +3587,8 @@ function adjustParentSizesAfterPositioning(subgraphLayouts, subgraphPositions, o
 			const contentMaxBottom = Math.max(maxNodeBottom, maxChildBottom);
 			const requiredWidth = contentMaxRight + (isHorizontal ? SUBGRAPH_PADDING * 4 : SUBGRAPH_PADDING * 3);
 			const requiredHeight = contentMaxBottom + SUBGRAPH_PADDING * 3;
-			const newWidth = Math.max(layout.width, requiredWidth, isHorizontal ? 600 : 240);
-			const newHeight = Math.max(layout.height, requiredHeight, 200);
+			const newWidth = Math.max(layout.width, requiredWidth, isHorizontal ? MIN_SUBGRAPH_WIDTH_HORIZONTAL : MIN_SUBGRAPH_WIDTH_VERTICAL);
+			const newHeight = Math.max(layout.height, requiredHeight, MIN_SUBGRAPH_HEIGHT);
 			if (newWidth > layout.width || newHeight > layout.height) {
 				debugLog(`Post-positioning resize (iter ${iterations}): ${subgraph.id} ${layout.width}x${layout.height} → ${newWidth}x${newHeight}`);
 				layout.width = newWidth;

package/package.json

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