@likec4/generators 1.50.0 → 1.52.0

package/dist/index.mjs

@@ -524,17 +524,18 @@ function inferKind(style, parentCell) {
 	const s = style?.toLowerCase() ?? "";
 	switch (true) {
 		case !style: return parentCell?.style?.toLowerCase().includes("container=1") ? "component" : "container";
-		case s.includes("umlactor") || s.includes("shape=person"): return "actor";
+		case s.includes("umlactor") || s.includes("shape=person") || s.includes("shape=actor"): return "actor";
 		case s.includes("swimlane"):
 		case s.includes("container=1"): return "system";
 		case !!parentCell?.style?.toLowerCase().includes("container=1"): return "component";
 		default: return "container";
 	}
 }
-/** Infer LikeC4 shape from DrawIO style when possible (cylinder, document, etc.). */
+/** Infer LikeC4 shape from DrawIO style when possible (person, cylinder, document, etc.). */
 function inferShape(style) {
 	if (!style) return void 0;
 	const s = style.toLowerCase();
+	if (s.includes("shape=actor") || s.includes("shape=person") || s.includes("umlactor")) return "person";
 	if (s.includes("shape=cylinder") || s.includes("cylinder3")) return "cylinder";
 	if (s.includes("shape=document")) return "document";
 	if (s.includes("shape=rectangle") && s.includes("rounded")) return "rectangle";
@@ -1525,7 +1526,7 @@ function getThemeColorValues(viewmodel, color, fallback) {
 function drawioShape(shape) {
 	const rectStyle = "shape=rectangle;rounded=1;arcSize=12;";
 	switch (shape) {
-		case "person": return "shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;";
+		case "person": return "shape=actor;";
 		case "rectangle":
 		case "browser":
 		case "mobile":

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@likec4/generators",
-  "version": "1.50.0",
+  "version": "1.52.0",
   "license": "MIT",
   "bugs": "https://github.com/likec4/likec4/issues",
   "homepage": "https://likec4.dev",
@@ -39,10 +39,10 @@
   "dependencies": {
     "langium": "3.5.0",
     "pako": "^2.1.0",
-    "remeda": "^2.33.5",
+    "remeda": "^2.33.6",
     "json5": "^2.2.3",
-    "@likec4/core": "1.50.0",
-    "@likec4/log": "1.50.0"
+    "@likec4/core": "1.52.0",
+    "@likec4/log": "1.52.0"
   },
   "devDependencies": {
     "@types/node": "~22.19.11",
@@ -50,7 +50,7 @@
     "typescript": "5.9.3",
     "obuild": "^0.4.31",
     "vitest": "4.0.18",
-    "@likec4/tsconfig": "1.50.0",
+    "@likec4/tsconfig": "1.52.0",
     "@likec4/devops": "1.42.0"
   },
   "scripts": {

package/src/drawio/generate-drawio.ts

@@ -236,7 +236,7 @@ function drawioShape(shape: Node['shape']): string {
   const rectStyle = 'shape=rectangle;rounded=1;arcSize=12;'
   switch (shape) {
     case 'person':
-      return 'shape=umlActor;verticalLabelPosition=bottom;verticalAlign=top;'
+      return 'shape=actor;'
     case 'rectangle':
     case 'browser':
     case 'mobile':

package/src/drawio/parse-drawio.ts

@@ -138,7 +138,7 @@ function findOpenTagEnd(xml: string, start: number): number {
   let i = start
   while (i < xml.length) {
     const c = xml[i]
-    if (c === '"' || c === "'") {
+    if (c === '"' || c === '\'') {
       if (quoteChar === '') quoteChar = c
       else if (quoteChar === c) quoteChar = ''
     } else if (c === '>' && quoteChar === '') return i
@@ -561,7 +561,7 @@ function inferKind(
   switch (true) {
     case !style:
       return parentCell?.style?.toLowerCase().includes('container=1') ? 'component' : 'container'
-    case s.includes('umlactor') || s.includes('shape=person'):
+    case s.includes('umlactor') || s.includes('shape=person') || s.includes('shape=actor'):
       return 'actor'
     case s.includes('swimlane'):
     case s.includes('container=1'):
@@ -573,10 +573,12 @@ function inferKind(
   }
 }
 
-/** Infer LikeC4 shape from DrawIO style when possible (cylinder, document, etc.). */
+/** Infer LikeC4 shape from DrawIO style when possible (person, cylinder, document, etc.). */
 function inferShape(style: string | undefined): string | undefined {
   if (!style) return undefined
   const s = style.toLowerCase()
+  // Actor/person shape (export may use shape=actor or shape=umlActor; legacy may have shape=person)
+  if (s.includes('shape=actor') || s.includes('shape=person') || s.includes('umlactor')) return 'person'
   if (s.includes('shape=cylinder') || s.includes('cylinder3')) return 'cylinder'
   if (s.includes('shape=document')) return 'document'
   if (s.includes('shape=rectangle') && s.includes('rounded')) return 'rectangle'