foldkit 0.153.0 → 0.154.0

package/dist/update/update.js

@@ -108,12 +108,13 @@ export const refresh = (refreshable) => model => pipe(refreshable.read(model), O
  *  Command that produces the child's Message, such as an animating
  *  component's overridable leave Command.
  *
- *  A parent that is itself a Submodel passes a
- *  {@link ChildFoldWithParentOutMessage} and receives a
- *  {@link FoldWithOutMessage}, whose results may include the parent's own
- *  OutMessage. Add `toParentOutMessage` only when it forwards at least one
- *  child OutMessage from the current Submodel to its parent. Omit
- *  `toParentOutMessage` when the local `foldOutMessage` handles every variant.
+ *  A parent that is itself a Submodel receives a
+ *  {@link FoldWithOutMessage} when `foldOutMessage` emits a derived parent
+ *  OutMessage. Add `toParentOutMessage` only when at least one child OutMessage
+ *  should continue to the current Submodel's parent. When provided,
+ *  `foldOutMessage` still handles forwarded variants locally. A derived
+ *  OutMessage replaces the one-to-one lift for the dispatch. When the Step
+ *  emits nothing, the lift runs as usual.
  *
  *  An entry point that takes nothing but the child Model, such as
  *  `Dialog.close`, has no input to pass: fold it with
@@ -153,21 +154,18 @@ const runChildFold = (childFold, context, model, input) => pipe(model, childFold
         const update = childFold.foldOutMessage === undefined ||
             childUpdate.outMessage === undefined
             ? { model: modelWithChild, commands: mappedCommands }
-            : combine(modelWithChild, [
-                stepModel => ({
-                    model: stepModel,
-                    commands: mappedCommands,
-                }),
-                childFold.foldOutMessage(childUpdate.outMessage, context),
-            ]);
-        if (childFold.toParentOutMessage === undefined) {
+            : appendOutMessageStep(childFold.foldOutMessage, childUpdate.outMessage, context, modelWithChild, mappedCommands);
+        if (update.outMessage !== undefined) {
             return update;
         }
-        if (childUpdate.outMessage === undefined) {
+        if (childFold.toParentOutMessage === undefined ||
+            childUpdate.outMessage === undefined) {
             return update;
         }
         const parentOutMessage = childFold.toParentOutMessage(childUpdate.outMessage);
-        return withOutMessage(update, parentOutMessage);
+        return parentOutMessage === undefined
+            ? update
+            : { ...update, outMessage: parentOutMessage };
     },
 }));
 /** Folds a child entry point that takes nothing but the child Model, and
@@ -199,13 +197,19 @@ const runChildFold = (childFold, context, model, input) => pipe(model, childFold
  *  `liftCommands` bound to this config's `toParentMessage`, for a Command the
  *  Step returns whose result is the child's Message.
  *
- *  A parent that is itself a Submodel adds `toParentOutMessage` when it
- *  forwards at least one child OutMessage to its own parent and receives a
- *  {@link StepWithOutMessage}, just as the input-taking {@link foldChild}
- *  returns a {@link FoldWithOutMessage}. When no child OutMessage is
- *  forwarded, omit the lift and use the plain Step directly. Local handling
- *  through `foldOutMessage` is independent of forwarding. */
+ *  A parent that is itself a Submodel receives a
+ *  {@link StepWithOutMessage} when `foldOutMessage` emits a derived parent
+ *  OutMessage. Add `toParentOutMessage` only when at least one child OutMessage
+ *  should continue to the current Submodel's parent. When provided,
+ *  `foldOutMessage` still handles forwarded variants locally. A derived
+ *  OutMessage replaces the one-to-one lift for the dispatch. When the Step
+ *  emits nothing, the lift runs as usual. */
 export const foldChildStep = (childFold) => {
     const context = makeFoldContext(childFold.toParentMessage);
     return (model) => runChildFold(childFold, context, model, undefined);
 };
+const appendOutMessageStep = (foldOutMessage, outMessage, context, modelWithChild, mappedCommands) => {
+    const outMessageFold = foldOutMessage(outMessage, context)(modelWithChild);
+    const commands = [...mappedCommands, ...(outMessageFold.commands ?? [])];
+    return { ...outMessageFold, commands };
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "foldkit",
-  "version": "0.153.0",
+  "version": "0.154.0",
   "description": "A TypeScript frontend framework, built on Effect and architected like Elm",
   "type": "module",
   "main": "./dist/index.js",