@novely/core 0.33.0-beta.1 → 0.33.0

package/dist/index.d.ts

@@ -95,6 +95,11 @@ type Context = {
     }, resolve: () => void) => void;
     custom: (fn: CustomHandler<Lang, State>, push: () => void) => Thenable<void>;
     clearCustom: (fn: CustomHandler<Lang, State>) => void;
+    /**
+     * Clears all mentioned actions except for preserved one
+     * @param preserve Action that should not be cleared
+     */
+    clearBlockingActions: (preserve: 'dialog' | 'choice' | 'input' | 'text' | undefined) => void;
     text: (str: string, resolve: () => void) => void;
     vibrate: (pattern: VibratePattern) => void;
     audio: {

package/dist/index.global.js

@@ -215,6 +215,34 @@ var Novely = (() => {
   // ../../node_modules/.pnpm/esm-env@1.0.0/node_modules/esm-env/prod-ssr.js
   var DEV = false;
 
+  // ../../node_modules/.pnpm/klona@2.0.6/node_modules/klona/json/index.mjs
+  function klona(val) {
+    var k, out, tmp;
+    if (Array.isArray(val)) {
+      out = Array(k = val.length);
+      while (k--)
+        out[k] = (tmp = val[k]) && typeof tmp === "object" ? klona(tmp) : tmp;
+      return out;
+    }
+    if (Object.prototype.toString.call(val) === "[object Object]") {
+      out = {};
+      for (k in val) {
+        if (k === "__proto__") {
+          Object.defineProperty(out, k, {
+            value: klona(val[k]),
+            configurable: true,
+            enumerable: true,
+            writable: true
+          });
+        } else {
+          out[k] = (tmp = val[k]) && typeof tmp === "object" ? klona(tmp) : tmp;
+        }
+      }
+      return out;
+    }
+    return val;
+  }
+
   // src/utils.ts
   var matchAction = ({ getContext, push, forward }, values) => {
     return (action, props, { ctx, data }) => {
@@ -686,7 +714,7 @@ var Novely = (() => {
     if (isExitImpossible(path)) {
       const referred = refer(path);
       if (isAction(referred) && isSkippedDuringRestore(referred[0])) {
-        onExitImpossible();
+        onExitImpossible?.();
       }
       wasExitImpossible = true;
       return {
@@ -858,34 +886,6 @@ var Novely = (() => {
     }
   };
 
-  // ../../node_modules/.pnpm/klona@2.0.6/node_modules/klona/json/index.mjs
-  function klona(val) {
-    var k, out, tmp;
-    if (Array.isArray(val)) {
-      out = Array(k = val.length);
-      while (k--)
-        out[k] = (tmp = val[k]) && typeof tmp === "object" ? klona(tmp) : tmp;
-      return out;
-    }
-    if (Object.prototype.toString.call(val) === "[object Object]") {
-      out = {};
-      for (k in val) {
-        if (k === "__proto__") {
-          Object.defineProperty(out, k, {
-            value: klona(val[k]),
-            configurable: true,
-            enumerable: true,
-            writable: true
-          });
-        } else {
-          out[k] = (tmp = val[k]) && typeof tmp === "object" ? klona(tmp) : tmp;
-        }
-      }
-      return out;
-    }
-    return val;
-  }
-
   // src/translation.ts
   var RGX = /{{(.*?)}}/g;
   var split = (input, delimeters) => {
@@ -1274,8 +1274,11 @@ var Novely = (() => {
           data: latest[1]
         });
       });
-      context.meta.restoring = context.meta.goingBack = false;
+      if (!context.meta.goingBack) {
+        context.meta.restoring = false;
+      }
       render(context);
+      context.meta.restoring = context.meta.goingBack = false;
     };
     const refer = createReferFunction(story);
     const exit = (force = false, saving = true) => {
@@ -1407,7 +1410,7 @@ var Novely = (() => {
       const path = stack.value[0];
       nextPath(path);
     };
-    const matchActionInit = {
+    const matchActionOptions = {
       getContext: renderer.getContext,
       push(ctx) {
         if (ctx.meta.restoring)
@@ -1418,12 +1421,12 @@ var Novely = (() => {
       forward(ctx) {
         if (!ctx.meta.preview)
           enmemory(ctx);
-        matchActionInit.push(ctx);
+        matchActionOptions.push(ctx);
         if (!ctx.meta.preview)
           interactivity(true);
       }
     };
-    const match = matchAction(matchActionInit, {
+    const match = matchAction(matchActionOptions, {
       wait({ ctx, push }, [time]) {
         if (ctx.meta.restoring)
           return;
@@ -1505,6 +1508,7 @@ var Novely = (() => {
           }
           return c || "";
         })();
+        ctx.clearBlockingActions("dialog");
         ctx.dialog(
           templateReplace(content, data2),
           templateReplace(name, data2),
@@ -1555,6 +1559,7 @@ var Novely = (() => {
         if (DEV && transformedChoices.length === 0) {
           throw new Error(`Running choice without variants to choose from, look at how to use Choice action properly [https://novely.pages.dev/guide/actions/choice#usage]`);
         }
+        ctx.clearBlockingActions("choice");
         ctx.choices(templateReplace(question, data2), transformedChoices, (selected) => {
           if (!ctx.meta.preview) {
             enmemory(ctx);
@@ -1618,6 +1623,7 @@ var Novely = (() => {
         exit(true, false);
       },
       input({ ctx, data: data2, forward }, [question, onInput, setup]) {
+        ctx.clearBlockingActions("input");
         ctx.input(
           templateReplace(question, data2),
           onInput,
@@ -1626,6 +1632,9 @@ var Novely = (() => {
         );
       },
       custom({ ctx, push }, [handler]) {
+        if (handler.requireUserAction) {
+          ctx.clearBlockingActions(void 0);
+        }
         const result = ctx.custom(handler, () => {
           if (ctx.meta.restoring)
             return;
@@ -1661,6 +1670,7 @@ var Novely = (() => {
         if (DEV && string.length === 0) {
           throw new Error(`Action Text was called with empty string or array`);
         }
+        ctx.clearBlockingActions("text");
         ctx.text(string, forward);
       },
       exit({ ctx, data: data2 }) {