@rotorsoft/act 1.31.20 → 1.31.21

package/dist/@types/builders/merge.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/builders/merge.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAU,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAuD1D;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC3B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EACzC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,IAAI,CAON;AAuID;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,EAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GAC1D,IAAI,CAcN;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,IAAI,CA+BN;AAGD,eAAO,MAAM,MAAM,eAAgB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE;IACnD,MAAM;IACN,MAAM;CACN,CAAC"}
+{"version":3,"file":"merge.d.ts","sourceRoot":"","sources":["../../../src/builders/merge.ts"],"names":[],"mappings":"AAYA,OAAO,KAAK,EAAU,KAAK,EAAE,MAAM,mBAAmB,CAAC;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,yBAAyB,CAAC;AAuD1D;;;GAGG;AACH,wBAAgB,cAAc,CAC5B,KAAK,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC3B,MAAM,EAAE,GAAG,CAAC,MAAM,EAAE,KAAK,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,CAAC,EACzC,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,EAC5B,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,IAAI,CAON;AAuMD;;;;;;;;GAQG;AACH,wBAAgB,oBAAoB,CAClC,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,EAC3D,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;IAAE,SAAS,EAAE,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAA;CAAE,CAAC,GAC1D,IAAI,CAcN;AAED;;;GAGG;AACH,wBAAgB,gBAAgB,CAC9B,IAAI,EAAE,UAAU,CAAC,GAAG,CAAC,EACrB,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,GAAG,CAAC,GAC1B,IAAI,CA+BN;AAGD,eAAO,MAAM,MAAM,eAAgB;IAAE,MAAM,EAAE,MAAM,CAAA;CAAE;IACnD,MAAM;IACN,MAAM;CACN,CAAC"}

package/dist/index.cjs

@@ -6515,6 +6515,25 @@ function register_new_state(state2, states, actions, events) {
     events[name] = { schema: state2.events[name], reactions: /* @__PURE__ */ new Map() };
   }
 }
+function pick_declared(existing, incoming, what, state_name) {
+  if (existing && incoming && existing !== incoming)
+    throw new Error(`Duplicate ${what} for state "${state_name}"`);
+  return incoming ?? existing;
+}
+function autoclose_of(existing, state2) {
+  pick_declared(
+    existing.autoclose,
+    state2.autoclose,
+    "autoclose policy",
+    state2.name
+  );
+  const owner = state2.autoclose ? state2 : existing;
+  return {
+    autoclose: owner.autoclose,
+    autoclose_after_days: owner.autoclose_after_days,
+    autoclose_keep_days: owner.autoclose_keep_days
+  };
+}
 function merge_into_existing(state2, existing, states, actions, events) {
   for (const name of Object.keys(state2.actions)) {
     if (existing.actions[name] === state2.actions[name]) continue;
@@ -6539,11 +6558,26 @@ function merge_into_existing(state2, existing, states, actions, events) {
     patch: merged_patch,
     on: { ...existing.on, ...state2.on },
     given: { ...existing.given, ...state2.given },
-    snap: state2.snap && existing.snap && state2.snap !== existing.snap ? (() => {
-      throw new Error(
-        `Duplicate snap strategy for state "${state2.name}"`
-      );
-    })() : state2.snap || existing.snap
+    snap: pick_declared(existing.snap, state2.snap, "snap strategy", state2.name),
+    // Per-action retry policy is keyed by action name, so the two partials'
+    // maps combine. Left `undefined` when neither declared one, so the
+    // orchestrator's `me.options?.[action]` lookup is unchanged.
+    options: existing.options || state2.options ? { ...existing.options, ...state2.options } : void 0,
+    disclose: pick_declared(
+      existing.disclose,
+      state2.disclose,
+      "disclosure predicate",
+      state2.name
+    ),
+    archive: pick_declared(
+      existing.archive,
+      state2.archive,
+      "archiver",
+      state2.name
+    ),
+    // `.autocloses(...)` sets its two day fields alongside the predicate, so
+    // the whole triple travels together from whichever partial declared it.
+    ...autoclose_of(existing, state2)
   };
   states.set(state2.name, merged);
   for (const name of Object.keys(merged.actions)) {