@rotorsoft/act 1.32.3 → 1.32.5

package/dist/index.js

@@ -809,7 +809,7 @@ function next_window_open(window, now) {
     const boundary = new Date(
       candidate.getTime() - candidate.getTime() % 36e5
     );
-    if (is_dst_gap_open(boundary, window.timeZone, window.start))
+    if (boundary.getTime() >= start_ms && is_dst_gap_open(boundary, window.timeZone, window.start))
       return boundary;
   }
   return new Date(start_ms + 864e5);
@@ -3050,6 +3050,7 @@ var DrainController = class {
       if (!cycle) {
         this._deps.breaker.passed();
         this._armed = false;
+        if (this._defer.size > 0) this._defer.schedule();
         return EMPTY_DRAIN;
       }
       const { leased, fetched, handled, acked, blocked, closeable } = cycle;
@@ -4950,23 +4951,29 @@ function base_type_name(zodType) {
   return t.constructor.name;
 }
 function merge_schemas(existing, incoming, state_name) {
-  if (existing instanceof ZodObject && incoming instanceof ZodObject) {
-    const existing_shape = existing.shape;
-    const incoming_shape = incoming.shape;
-    for (const key of Object.keys(incoming_shape)) {
-      if (key in existing_shape) {
-        const existing_base = base_type_name(existing_shape[key]);
-        const incoming_base = base_type_name(incoming_shape[key]);
-        if (existing_base !== incoming_base) {
-          throw new Error(
-            `Schema conflict in "${state_name}": key "${key}" has type "${existing_base}" but incoming partial declares "${incoming_base}"`
-          );
-        }
+  if (existing === incoming) return existing;
+  const existing_object = as_object(existing, "existing", state_name);
+  const incoming_object = as_object(incoming, "incoming", state_name);
+  const existing_shape = existing_object.shape;
+  const incoming_shape = incoming_object.shape;
+  for (const key of Object.keys(incoming_shape)) {
+    if (key in existing_shape) {
+      const existing_base = base_type_name(existing_shape[key]);
+      const incoming_base = base_type_name(incoming_shape[key]);
+      if (existing_base !== incoming_base) {
+        throw new Error(
+          `Schema conflict in "${state_name}": key "${key}" has type "${existing_base}" but incoming partial declares "${incoming_base}"`
+        );
       }
     }
-    return existing.extend(incoming_shape);
   }
-  return existing;
+  return existing_object.extend(incoming_shape);
+}
+function as_object(schema, side, state_name) {
+  if (schema instanceof ZodObject) return schema;
+  throw new Error(
+    `Cannot merge state schemas for "${state_name}": the ${side} partial's schema is a ${schema.constructor.name}, not a z.object. Partials of the same state are merged by extending their shapes, so declare every partial's state as a plain z.object({ ... }).`
+  );
 }
 function merge_inits(existing, incoming) {
   return () => ({ ...existing(), ...incoming() });