Merge pull request #95 from NarraLeaf/dev_nomen

narraleaf-react-0.8.1

Author: helloyork

CHANGELOG.md

@@ -1,5 +1,12 @@
 # Changelog
 
+## [0.8.1]
+
+### Fixed
+
+- Default value of `Transform.propToCSSTransform#optional` is not respected
+- Fixed an issue where the top-of-stack action might be executed repeatedly during undo operations.
+
 ## [0.8.0]
 
 ### _Feature_

package.json

@@ -1,6 +1,6 @@
 {
   "name": "narraleaf-react",
-  "version": "0.8.0",
+  "version": "0.8.1",
   "description": "A React visual novel player framework",
   "main": "./dist/main.js",
   "types": "./dist/index.d.ts",

src/game/nlcore/action/actionHistory.ts

@@ -43,7 +43,7 @@ export class ActionHistoryManager {
     public push<T extends Array<any> = Array<any>>(props: ActionHistoryPushOptions, onUndo?: (...args: T) => void, args?: T): {id: string} {
         const id = randId(6);
         const { action, timeline, stackModel } = props;
-        const snapshot = this.liveGame.getStackModelForce().serialize();
+        const snapshot = this.liveGame.getStackModelForce().serialize(false);
         this.history.push({action, id, args: args || [], undo: onUndo, timeline, rootStackSnapshot: snapshot, stackModel});
 
         // Check if the history size exceeds the limit

src/game/nlcore/action/stackModel.ts

@@ -370,7 +370,22 @@ export class StackModel {
         return false;
     }
 
-    serialize(): StackModelRawData {
+    /**
+     * Serialize current StackModel into a plain JSON-serialisable structure.
+     *
+     * @param frozen - When true (default), the snapshot also contains the
+     *                 action currently executing at the top of the stack
+     *                 (waitingAction). This is required by save/load so that
+     *                 reloading a save resumes exactly at the current dialog or
+     *                 async node, keeping the runtime state self-consistent.
+     *                 When false, waitingAction is excluded and the snapshot
+     *                 reflects the state *before* the current action started.
+     *                 The undo/history system will then re-insert the action
+     *                 manually (see LiveGame.undo) to avoid having two copies
+     *                 of the same action after deserialisation.
+     * @returns Snapshot that can be passed to {@link StackModel.deserialize}.
+     */
+    serialize(frozen: boolean = true): StackModelRawData {
         const toData = (item: CalledActionResult | Awaitable<CalledActionResult>): ArrayValue<StackModelRawData> | null => {
             if (StackModel.isCalledActionResult(item)) {
                 const actionId = item.node?.action?.getId() ?? null;
@@ -392,7 +407,7 @@ export class StackModel {
         const data = this.stack.map(toData).filter(function (item): item is Exclude<ArrayValue<StackModelRawData> | null, null> {
             return item !== null;
         });
-        if (this.waitingAction) {
+        if (frozen && this.waitingAction) {
             const actionData = toData(this.waitingAction);
             if (actionData) {
                 data.push(actionData);

src/game/nlcore/elements/transform/transform.ts

@@ -321,7 +321,7 @@ export class Transform<T extends TransformDefinitions.Types = CommonDisplayableC
             defaultValue?: T | undefined
         ): string {
             if (typeof value === "undefined") {
-                return defaultValue ? transformer(defaultValue) : "";
+                return typeof defaultValue !== "undefined" ? transformer(defaultValue) : "";
             }
             return transformer(value);
         };

src/game/nlcore/game/liveGame.ts

@@ -176,6 +176,11 @@ export class LiveGame {
      * After calling this method, the current game state will be lost, and the stage will trigger force reset
      */
     public deserialize(savedGame: SavedGame) {
+        // This check is to prevent invalid usage
+        if (!savedGame) {
+            throw new Error("No saved game provided when trying to deserialize game state");
+        }
+
         this.assertGameState();
         const gameState = this.gameState;