@waron97/prbot 3.2.0 → 3.3.0

package/src/agrippa/lib/pbProject.js

@@ -52,7 +52,9 @@ const NODE_FIELDS = [
     'fields',
     'formKey',
     'attachedToRef',
-    'errorEventDefinition',
+    'eventDefinitions',
+    'calledElement',
+    'dataIO',
     'multiInstance',
     'documentation',
 ];
@@ -107,9 +109,12 @@ function geometryMaps(diagram) {
             if (s.attrs.isExpanded !== undefined)
                 expanded[s.attrs.bpmnElement] = s.attrs.isExpanded;
         }
+        // Always record the edge, even with zero waypoints (rare, but real —
+        // some exporters emit an empty <...:BPMNEdge>). Skipping on `.length`
+        // would drop the entry, so buildDiagram doesn't recreate the edge shape
+        // at all, losing a real (if degenerate) diagram element.
         for (const e of diagram.edges)
-            if (e.waypoints?.length)
-                waypoints[e.attrs.bpmnElement] = e.waypoints.map((w) => [w.x, w.y]);
+            waypoints[e.attrs.bpmnElement] = (e.waypoints || []).map((w) => [w.x, w.y]);
     }
     return { bounds, waypoints, expanded };
 }
@@ -121,6 +126,7 @@ function structEdge(e, geo) {
     if (e.name !== undefined) o.name = e.name;
     if (e.condition !== undefined) o.condition = e.condition;
     if (e.conditionType !== undefined) o.conditionType = e.conditionType;
+    if (e.conditionAttrs !== undefined) o.conditionAttrs = e.conditionAttrs;
     if (e.documentation !== undefined) o.documentation = e.documentation;
     if (geo.waypoints[e.id]) o.waypoints = geo.waypoints[e.id];
     return o;
@@ -166,9 +172,11 @@ function flattenNodes(structNodes, parentId, model, read, geo) {
             if (se.name !== undefined) e.name = se.name;
             if (se.condition !== undefined) e.condition = se.condition;
             if (se.conditionType !== undefined) e.conditionType = se.conditionType;
+            if (se.conditionAttrs !== undefined) e.conditionAttrs = se.conditionAttrs;
             if (se.documentation !== undefined) e.documentation = se.documentation;
             if (parentId) e.parent = parentId;
             if (se.waypoints) geo.waypoints[se.id] = se.waypoints;
+            if (se.labelPos) geo.labelPos[se.id] = se.labelPos;
             model.edges.push(e);
         }
         if (sn.nodes) flattenNodes(sn.nodes, sn.id, model, read, geo);
@@ -218,7 +226,10 @@ function decompose(payload) {
     // back for the diagram).
     const structure = {
         process: model.process,
+        messages: model.messages,
         errors: model.errors,
+        signals: model.signals,
+        extraDefs: model.extraDefs,
         nodes: nestNodes(model, null, scriptsMap, geo),
         annotations: model.annotations.map((a) =>
             geo.bounds[a.id] ? { ...a, layout: geo.bounds[a.id] } : a
@@ -226,6 +237,9 @@ function decompose(payload) {
         associations: model.associations.map((a) =>
             geo.waypoints[a.id] ? { ...a, waypoints: geo.waypoints[a.id] } : a
         ),
+        groups: (model.groups || []).map((g) =>
+            geo.bounds[g.id] ? { ...g, layout: geo.bounds[g.id] } : g
+        ),
     };
     files[STRUCTURE_FILE] = stringifyStructure(structure);
 
@@ -258,17 +272,22 @@ function recompose(read) {
 
     const model = {
         process: structure.process,
+        messages: structure.messages || [],
         errors: structure.errors || [],
+        signals: structure.signals || [],
+        extraDefs: structure.extraDefs || [],
         nodes: [],
         edges: [],
         annotations: structure.annotations || [],
         associations: structure.associations || [],
+        groups: structure.groups || [],
     };
-    const geo = { bounds: {}, waypoints: {}, expanded: {} };
+    const geo = { bounds: {}, waypoints: {}, expanded: {}, labelPos: {} };
     flattenNodes(structure.nodes, null, model, read, geo);
-    // annotation/association geometry (top-level lists carry it inline)
+    // annotation/association/group geometry (top-level lists carry it inline)
     for (const a of model.annotations) if (a.layout) geo.bounds[a.id] = a.layout;
     for (const a of model.associations) if (a.waypoints) geo.waypoints[a.id] = a.waypoints;
+    for (const g of model.groups) if (g.layout) geo.bounds[g.id] = g.layout;
 
     const built_page = buildProcess({ ns: manifest.ns, model, geo });
 
@@ -342,6 +361,15 @@ function localChecksum(read) {
     return computeChecksum(stableStringify(recompose(read)));
 }
 
+// Semantic checksum of a remote payload. Decompose → recompose normalises field
+// order and non-semantic server-side differences, same pipeline as localChecksum
+// so the two are directly comparable.
+function remoteChecksumPb(payload) {
+    const { files } = decompose(payload);
+    const read = (p) => files[p] ?? '';
+    return computeChecksum(stableStringify(recompose(read)));
+}
+
 // Enumerate the wizard's pages from the pages/*.yml files (the authoritative
 // local set). Each page links to its userTask via `page._id.stepkey`; the
 // manifest supplies the upstream page guid (absent => a locally-added page that
@@ -379,6 +407,7 @@ export {
     verifyRoundTrip,
     stableStringify,
     localChecksum,
+    remoteChecksumPb,
     enumeratePages,
     stringifyStructure,
     pad,

package/src/agrippa/lib/pbScriptTemplate.js

@@ -0,0 +1,29 @@
+// Initial body scaffolded into a new scriptTask's .js file (mirrors the
+// `pbtemplate` editor snippet) so created scripts aren't empty.
+export const SCRIPT_TEMPLATE = `try {
+    // ----------------------------
+    // Input gathering
+    // ----------------------------
+
+    // ----------------------------
+    // Output variable initialization
+    // ----------------------------
+
+    // ----------------------------
+    // Logical Helpers
+    // ----------------------------
+
+    // ----------------------------
+    // Main Execution
+    // ----------------------------
+
+    // ----------------------------
+    // Output
+    // ----------------------------
+
+} catch (err) {
+    execution.setVariable('isAlive', false);
+    execution.setVariable('errorCode', '');
+    execution.setVariable('errorMessage', err.message);
+}
+`;

package/src/commands/autopr.js

@@ -282,7 +282,7 @@ async function autopr(options) {
 
     const content = readFileSync(changelogPath, 'utf-8');
 
-    const duplicate = hasTridents ? findDuplicateLine(content, ids, []) : null;
+    const duplicate = findDuplicateLine(content, ids, options.jira ?? []);
 
     let appendMode = false;
     if (duplicate) {