@waron97/prbot 3.2.0 → 3.3.0

package/src/agrippa/lib/pbEdit.js

@@ -14,6 +14,7 @@
 
 import { stringify as yamlStringify } from 'yaml';
 import { pad, toSlug } from './pbProject.js';
+import { SCRIPT_TEMPLATE } from './pbScriptTemplate.js';
 
 // Fixed element sizes (measured across all fixtures). Containers are sized by
 // the layout engine; we seed a small default so a stubbed clone stays valid.
@@ -27,6 +28,12 @@ const SIZE = {
     userTask: [84, 84],
     subProcess: [350, 200],
     transaction: [350, 200],
+    // LRP-only (measured across the real LRP corpus):
+    intermediateCatchEvent: [36, 36],
+    intermediateThrowEvent: [36, 36],
+    callActivity: [84, 84],
+    parallelGateway: [50, 50],
+    eventBasedGateway: [50, 50],
 };
 
 // BPMN id prefixes by node type (mirrors the upstream naming convention).
@@ -40,10 +47,29 @@ const PREFIX = {
     userTask: 'UserTask',
     subProcess: 'SubProcess',
     transaction: 'Transaction',
+    intermediateCatchEvent: 'IntermediateCatchEvent',
+    intermediateThrowEvent: 'IntermediateThrowEvent',
+    callActivity: 'CallActivity',
+    parallelGateway: 'ParallelGateway',
+    eventBasedGateway: 'EventBasedGateway',
 };
 
 const CONTAINER = new Set(['subProcess', 'transaction']);
 
+// Default attrs injected at node creation so the editor accepts them without manual edits.
+const DEFAULT_ATTRS = {
+    scriptTask: {
+        scriptFormat: 'javascript',
+        'activiti:async': 'false',
+        'activiti:exclusive': 'false',
+        'activiti:autoStoreVariables': 'false',
+    },
+    serviceTask: {
+        'activiti:async': 'false',
+        'activiti:exclusive': 'false',
+    },
+};
+
 // Depth-first visit of every node in the nested graph, with its parent node.
 function eachNode(nodes, parent, fn) {
     for (const n of nodes || []) {
@@ -112,7 +138,7 @@ function nextScriptSeq(existingScriptFiles) {
 
 // ---------- add ----------
 
-// Add a node. For scriptTask, scaffolds an empty script file and refs it. For
+// Add a node. For scriptTask, scaffolds a templated script file and refs it. For
 // userTask, scaffolds a minimal page file + a manifest page entry (guid=null →
 // push will create it upstream). Container nodes start empty + expanded.
 function addNode(structure, manifest, opts, ctx = {}) {
@@ -130,7 +156,7 @@ function addNode(structure, manifest, opts, ctx = {}) {
     if (type === 'scriptTask') {
         const seq = nextScriptSeq(ctx.existingScripts);
         const file = `scripts/${pad(seq)}_${toSlug(name || id)}.js`;
-        writes[file] = '';
+        writes[file] = SCRIPT_TEMPLATE;
         node.script = file;
     } else if (type === 'userTask') {
         const formKey = toSlug(name || id);
@@ -161,6 +187,8 @@ function addNode(structure, manifest, opts, ctx = {}) {
         node.nodes = [];
     }
 
+    if (DEFAULT_ATTRS[type]) node.attrs = { ...DEFAULT_ATTRS[type] };
+
     if (parentId) {
         const f = findNode(structure, parentId);
         if (!f) throw new Error(`parent not found: ${parentId}`);
@@ -334,10 +362,9 @@ function connect(structure, { from, to, name, condition, conditionType, makeDefa
                 warnings.push(`replaced previous default flow ${prev} on ${from}.`);
         }
     }
-    // Re-check the gateway's invariant after the edit.
-    if (sf.node.type === 'exclusiveGateway') {
-        warnings.push(...lintGateways(structure).filter((w) => w.startsWith(from)));
-    }
+    // Re-check all structural invariants after the edit, scoped to affected nodes.
+    const allIssues = lintAll(structure);
+    warnings.push(...allIssues.filter((w) => w.startsWith(from) || w.startsWith(to)));
 
     return { writes: {}, deletes: [], result: { id, from, to, warnings } };
 }
@@ -407,6 +434,73 @@ function lintGateways(structure) {
     return issues;
 }
 
+// Flag non-default outgoing edges that are missing a name when a node has 2+
+// outgoing flows. In Activiti diagrams these labels are mandatory so operators
+// can distinguish branches at runtime.
+function lintEdgeNames(structure) {
+    const issues = [];
+    eachNode(structure.nodes, null, (n) => {
+        const outs = n.edges || [];
+        if (outs.length < 2) return;
+        const def = n.attrs?.default;
+        for (const e of outs) {
+            if (e.id === def) continue;
+            if (!e.name) {
+                issues.push(`${n.id} → ${e.target} (${e.id}): non-default flow has no name.`);
+            }
+        }
+    });
+    return issues;
+}
+
+// Gateway types that legitimately fan multiple flows into one node (a "join").
+// parallelGateway/eventBasedGateway joins are common in the real LRP corpus
+// (61 occurrences) — only exclusiveGateway's merge semantics need a lint rule.
+const JOIN_CAPABLE_GATEWAYS = new Set(['exclusiveGateway', 'parallelGateway', 'eventBasedGateway']);
+
+// Flag incoming-edge violations:
+// - Only a gateway may have >1 incoming flows (plain tasks/events are 1-in).
+// - An exclusiveGateway may not have both >1 incoming AND >1 outgoing (pick one
+//   direction for merging or splitting, not both at once) — parallel/event-based
+//   gateways may legitimately fork-then-join across the diagram, so this
+//   specific rule stays scoped to exclusiveGateway.
+function lintIncomingEdges(structure) {
+    const inCount = {};
+    const outCount = {};
+    eachNode(structure.nodes, null, (n) => {
+        for (const e of n.edges || []) {
+            inCount[e.target] = (inCount[e.target] || 0) + 1;
+            outCount[n.id] = (outCount[n.id] || 0) + 1;
+        }
+    });
+
+    const issues = [];
+    eachNode(structure.nodes, null, (n) => {
+        const inc = inCount[n.id] || 0;
+        const out = outCount[n.id] || 0;
+        if (inc > 1 && !JOIN_CAPABLE_GATEWAYS.has(n.type)) {
+            issues.push(
+                `${n.id} (${n.name || n.type}): only a gateway may have multiple incoming flows (has ${inc}).`
+            );
+        }
+        if (n.type === 'exclusiveGateway' && inc > 1 && out > 1) {
+            issues.push(
+                `${n.id} (${n.name || 'gateway'}): exclusiveGateway may not have both multiple incoming (${inc}) and multiple outgoing (${out}) flows.`
+            );
+        }
+    });
+    return issues;
+}
+
+// Run all lint rules and return combined issues.
+function lintAll(structure) {
+    return [
+        ...lintGateways(structure),
+        ...lintEdgeNames(structure),
+        ...lintIncomingEdges(structure),
+    ];
+}
+
 // Remove an edge by id, or by --from/--to pair.
 function disconnect(structure, { id, from, to }) {
     let removed = 0;
@@ -464,4 +558,7 @@ export {
     setDefault,
     listGraph,
     lintGateways,
+    lintEdgeNames,
+    lintIncomingEdges,
+    lintAll,
 };

package/src/agrippa/lib/pbLayout.js

@@ -37,7 +37,13 @@ const ROOT_OPTS = {
     'elk.layered.spacing.edgeEdgeBetweenLayers': '20',
     'elk.layered.spacing.edgeNodeBetweenLayers': '20',
 };
-const CONTAINER_OPTS = { 'elk.padding': '[top=40.0,left=20.0,bottom=20.0,right=20.0]' };
+const CONTAINER_OPTS = {
+    'elk.padding': '[top=50.0,left=30.0,bottom=50.0,right=30.0]',
+    'elk.layered.spacing.nodeNodeBetweenLayers': '60',
+    'elk.spacing.nodeNode': '80',
+    'elk.spacing.edgeNode': '20',
+    'elk.layered.spacing.edgeNodeBetweenLayers': '20',
+};
 
 function sizeOf(n) {
     if (SIZE[n.type]) return SIZE[n.type];
@@ -147,6 +153,9 @@ async function autoLayout(structure) {
                 sources: [source],
                 targets: [e.target],
                 sourcePort,
+                labels: e.name
+                    ? [{ id: `${e.id}__lbl`, text: e.name, width: Math.min(e.name.length * 6, 140), height: 14 }]
+                    : [],
                 layoutOptions: {
                     'elk.layered.priority.straightness': isHappy ? '10' : 1,
                     'elk.layered.priority.shortness': isHappy ? '10' : 1,
@@ -237,8 +246,20 @@ async function autoLayout(structure) {
                 height: round(p.height),
             };
         for (const e of n.edges || []) {
-            const wp = waypointsFor(e.id, lcaOffset(n.id, e.target));
+            const off = lcaOffset(n.id, e.target);
+            const wp = waypointsFor(e.id, off);
             if (wp) e.waypoints = wp;
+            if (e.name) {
+                const lbl = elkEdges[e.id]?.labels?.[0];
+                if (lbl) {
+                    e.labelPos = {
+                        x: round(lbl.x + off.x),
+                        y: round(lbl.y + off.y),
+                        width: round(lbl.width),
+                        height: round(lbl.height),
+                    };
+                }
+            }
         }
     });