@novely/core 0.32.0 → 0.33.0-beta.0

package/dist/index.js

@@ -478,6 +478,90 @@ var getIntlLanguageDisplayName = (lang) => {
     return lang;
   }
 };
+var createReferFunction = (story) => {
+  const refer = (path) => {
+    let current = story;
+    let precurrent = story;
+    const blocks = [];
+    for (const [type, val] of path) {
+      if (type === "jump") {
+        precurrent = story;
+        current = current[val];
+      } else if (type === null) {
+        precurrent = current;
+        current = current[val];
+      } else if (type === "choice") {
+        blocks.push(precurrent);
+        current = current[val + 1][1];
+      } else if (type === "condition") {
+        blocks.push(precurrent);
+        current = current[2][val];
+      } else if (type === "block") {
+        blocks.push(precurrent);
+        current = story[val];
+      } else if (type === "block:exit" || type === "choice:exit" || type === "condition:exit") {
+        current = blocks.pop();
+      }
+    }
+    return current;
+  };
+  return refer;
+};
+var exitPath = ({ path, refer, onExitImpossible }) => {
+  const last = path.at(-1);
+  const ignore = [];
+  let wasExitImpossible = false;
+  if (!isAction(refer(path))) {
+    if (last && isNull(last[0]) && isNumber(last[1])) {
+      last[1]--;
+    } else {
+      path.pop();
+    }
+  }
+  if (isExitImpossible(path)) {
+    const referred = refer(path);
+    if (isAction(referred) && isSkippedDuringRestore(referred[0])) {
+      onExitImpossible();
+    }
+    wasExitImpossible = true;
+    return {
+      exitImpossible: wasExitImpossible
+    };
+  }
+  for (let i = path.length - 1; i > 0; i--) {
+    const [name] = path[i];
+    if (isBlockExitStatement(name)) {
+      ignore.push(name);
+    }
+    if (!isBlockStatement(name))
+      continue;
+    if (ignore.at(-1)?.startsWith(name)) {
+      ignore.pop();
+      continue;
+    }
+    path.push([`${name}:exit`]);
+    const prev = findLastPathItemBeforeItemOfType(path.slice(0, i + 1), name);
+    if (prev)
+      path.push([null, prev[1] + 1]);
+    if (!isAction(refer(path))) {
+      path.pop();
+      continue;
+    }
+    break;
+  }
+  return {
+    exitImpossible: wasExitImpossible
+  };
+};
+var nextPath = (path) => {
+  const last = path.at(-1);
+  if (last && (isNull(last[0]) || last[0] === "jump") && isNumber(last[1])) {
+    last[1]++;
+  } else {
+    path.push([null, 0]);
+  }
+  return path;
+};
 
 // src/novely.ts
 import { dequal } from "dequal/lite";
@@ -977,10 +1061,12 @@ var novely = ({
         }
       }
     }
-    match("clear", [keep, characters2, audio], {
-      ctx: context,
-      data: latest[1]
-    });
+    if (context.meta.goingBack) {
+      match("clear", [keep, characters2, audio], {
+        ctx: context,
+        data: latest[1]
+      });
+    }
     const lastQueueItem = queue.at(-1) || [];
     const lastQueueItemRequiresUserAction = isSkippedDuringRestore(lastQueueItem[0]) || isUserRequiredAction(lastQueueItem);
     await run((item) => {
@@ -998,32 +1084,7 @@ var novely = ({
     context.meta.restoring = context.meta.goingBack = false;
     render(context);
   };
-  const refer = (path) => {
-    let current = story;
-    let precurrent = story;
-    const blocks = [];
-    for (const [type, val] of path) {
-      if (type === "jump") {
-        precurrent = story;
-        current = current[val];
-      } else if (type === null) {
-        precurrent = current;
-        current = current[val];
-      } else if (type === "choice") {
-        blocks.push(precurrent);
-        current = current[val + 1][1];
-      } else if (type === "condition") {
-        blocks.push(precurrent);
-        current = current[2][val];
-      } else if (type === "block") {
-        blocks.push(precurrent);
-        current = story[val];
-      } else if (type === "block:exit" || type === "choice:exit" || type === "condition:exit") {
-        current = blocks.pop();
-      }
-    }
-    return current;
-  };
+  const refer = createReferFunction(story);
   const exit = (force = false, saving = true) => {
     const ctx = renderer.getContext(MAIN_CONTEXT_KEY);
     const stack = useStack(ctx);
@@ -1148,15 +1209,6 @@ var novely = ({
     stack.push(current);
     save("auto");
   };
-  const nextPath = (path) => {
-    const last = path.at(-1);
-    if (last && (isNull(last[0]) || last[0] === "jump") && isNumber(last[1])) {
-      last[1]++;
-    } else {
-      path.push([null, 0]);
-    }
-    return path;
-  };
   const next = (ctx) => {
     const stack = useStack(ctx);
     const path = stack.value[0];
@@ -1421,49 +1473,19 @@ var novely = ({
     exit({ ctx, data: data2 }) {
       if (ctx.meta.restoring)
         return;
-      const stack = useStack(ctx);
-      const path = stack.value[0];
-      const last = path.at(-1);
-      const ignore = [];
-      if (!isAction(refer(path))) {
-        if (last && isNull(last[0]) && isNumber(last[1])) {
-          last[1]--;
-        } else {
-          path.pop();
-        }
-      }
-      if (isExitImpossible(path)) {
-        const referred = refer(path);
-        if (isAction(referred) && isSkippedDuringRestore(referred[0])) {
+      const { exitImpossible } = exitPath({
+        path: useStack(ctx).value[0],
+        refer,
+        onExitImpossible: () => {
           match("end", [], {
             ctx,
             data: data2
           });
         }
-        return;
-      }
-      for (let i = path.length - 1; i > 0; i--) {
-        const [name] = path[i];
-        if (isBlockExitStatement(name)) {
-          ignore.push(name);
-        }
-        if (!isBlockStatement(name))
-          continue;
-        if (ignore.at(-1)?.startsWith(name)) {
-          ignore.pop();
-          continue;
-        }
-        path.push([`${name}:exit`]);
-        const prev = findLastPathItemBeforeItemOfType(path.slice(0, i + 1), name);
-        if (prev)
-          path.push([null, prev[1] + 1]);
-        if (!isAction(refer(path))) {
-          path.pop();
-          continue;
-        }
-        break;
+      });
+      if (!exitImpossible) {
+        render(ctx);
       }
-      render(ctx);
     },
     preload({ ctx, push }, [source]) {
       if (!ctx.meta.goingBack && !ctx.meta.restoring && !PRELOADED_ASSETS.has(source)) {