@novely/core 0.22.1 → 0.22.2

package/dist/index.js

@@ -18,12 +18,18 @@ var MAIN_CONTEXT_KEY = "$MAIN";
 var STACK_MAP = /* @__PURE__ */ new Map();
 
 // src/utils.ts
-var matchAction = (getContext, values) => {
+var matchAction = ({ getContext, push, forward }, values) => {
   return (action, props, { ctx, data }) => {
     const context = typeof ctx === "string" ? getContext(ctx) : ctx;
     return values[action]({
       ctx: context,
-      data
+      data,
+      push() {
+        push(context);
+      },
+      forward() {
+        forward(context);
+      }
     }, props);
   };
 };
@@ -687,11 +693,12 @@ var novely = ({
   };
   storageDelay.then(getStoredData);
   const initial = getDefaultSave(klona(defaultState));
-  addEventListener("visibilitychange", () => {
+  const onVisibilityChange = () => {
     if (document.visibilityState === "hidden") {
       throttledEmergencyOnStorageDataChange();
     }
-  });
+  };
+  addEventListener("visibilitychange", onVisibilityChange);
   addEventListener("beforeunload", throttledEmergencyOnStorageDataChange);
   const save = (override = false, type = override ? "auto" : "manual") => {
     if (!$$.get().dataLoaded)
@@ -780,7 +787,7 @@ var novely = ({
         data: latest[1]
       });
     });
-    context.meta.restoring = context.meta.restoring = false;
+    context.meta.restoring = context.meta.goingBack = false;
     render(context);
   };
   const refer = (path) => {
@@ -881,55 +888,89 @@ var novely = ({
   });
   const useStack = createUseStackFunction(renderer);
   useStack(MAIN_CONTEXT_KEY).push(initial);
-  renderer.ui.start();
-  const match = matchAction(renderer.getContext, {
-    wait({ ctx }, [time]) {
-      if (!ctx.meta.restoring)
-        setTimeout(push, isFunction(time) ? time() : time);
+  const UIInstance = renderer.ui.start();
+  const enmemory = (ctx) => {
+    if (ctx.meta.restoring)
+      return;
+    const stack = useStack(ctx);
+    const current = klona(stack.value);
+    current[2][1] = "auto";
+    stack.push(current);
+    save(true, "auto");
+  };
+  const next = (ctx) => {
+    const stack = useStack(ctx);
+    const path = stack.value[0];
+    const last = path.at(-1);
+    if (last && (isNull(last[0]) || last[0] === "jump") && isNumber(last[1])) {
+      last[1]++;
+    } else {
+      path.push([null, 0]);
+    }
+  };
+  const matchActionInit = {
+    getContext: renderer.getContext,
+    push(ctx) {
+      if (ctx.meta.restoring)
+        return;
+      next(ctx);
+      render(ctx);
+    },
+    forward(ctx) {
+      if (!ctx.meta.preview)
+        enmemory(ctx);
+      matchActionInit.push(ctx);
+      if (!ctx.meta.preview)
+        interactivity(true);
+    }
+  };
+  const match = matchAction(matchActionInit, {
+    wait({ ctx, push }, [time]) {
+      if (ctx.meta.restoring)
+        return;
+      setTimeout(push, isFunction(time) ? time() : time);
     },
-    showBackground({ ctx }, [background]) {
+    showBackground({ ctx, push }, [background]) {
       ctx.background(background);
-      push(ctx);
+      push();
     },
-    playMusic({ ctx }, [source]) {
+    playMusic({ ctx, push }, [source]) {
       ctx.audio.music(source, "music", true).play();
-      push(ctx);
+      push();
     },
-    stopMusic({ ctx }, [source]) {
+    stopMusic({ ctx, push }, [source]) {
       ctx.audio.music(source, "music").stop();
-      push(ctx);
+      push();
     },
-    playSound({ ctx }, [source, loop]) {
+    playSound({ ctx, push }, [source, loop]) {
       ctx.audio.music(source, "sound", loop || false).play();
-      push(ctx);
+      push();
     },
-    stopSound({ ctx }, [source]) {
+    stopSound({ ctx, push }, [source]) {
       ctx.audio.music(source, "sound").stop();
-      push(ctx);
+      push();
     },
-    voice({ ctx }, [source]) {
+    voice({ ctx, push }, [source]) {
       ctx.audio.voice(source);
-      push(ctx);
+      push();
     },
-    stopVoice({ ctx }) {
+    stopVoice({ ctx, push }) {
       ctx.audio.voiceStop();
-      push(ctx);
+      push();
     },
-    showCharacter({ ctx }, [character, emotion, className, style]) {
+    showCharacter({ ctx, push }, [character, emotion, className, style]) {
       if (DEV && !characters[character].emotions[emotion]) {
         throw new Error(`Attempt to show character "${character}" with unknown emotion "${emotion}"`);
       }
       const handle = ctx.character(character);
       handle.append(className, style, ctx.meta.restoring);
       handle.emotion(emotion, true);
-      push(ctx);
+      push();
     },
-    hideCharacter({ ctx }, [character, className, style, duration]) {
-      ctx.character(character).remove(className, style, duration, ctx.meta.restoring).then(() => {
-        push(ctx);
-      });
+    hideCharacter({ ctx, push }, [character, className, style, duration]) {
+      ctx.character(character).remove(className, style, duration, ctx.meta.restoring).then(push);
     },
-    dialog({ ctx, data: data2 }, [character, content, emotion]) {
+    dialog({ ctx, data: data2, forward }, [character, content, emotion]) {
       const name = (() => {
         const c = character;
         const cs = characters;
@@ -950,13 +991,13 @@ var novely = ({
         unwrap2(name, data2),
         character,
         emotion,
-        () => forward(ctx)
+        forward
       );
     },
-    function({ ctx }, [fn]) {
+    function({ ctx, push }, [fn]) {
       const result = fn(ctx.meta.restoring, ctx.meta.goingBack, ctx.meta.preview);
       if (!ctx.meta.restoring) {
-        result ? result.then(() => push(ctx)) : push(ctx);
+        result ? result.then(push) : push();
       }
       return result;
     },
@@ -1006,13 +1047,13 @@ var novely = ({
         data: data2
       });
     },
-    clear({ ctx }, [keep, characters2, audio]) {
+    clear({ ctx, push }, [keep, characters2, audio]) {
       ctx.vibrate(0);
       ctx.clear(
         keep || EMPTY_SET,
         characters2 || EMPTY_SET,
         audio || { music: EMPTY_SET, sounds: EMPTY_SET },
-        () => push(ctx)
+        push
       );
     },
     condition({ ctx }, [condition, variants]) {
@@ -1041,15 +1082,15 @@ var novely = ({
       interactivity(false);
       times.clear();
     },
-    input({ ctx, data: data2 }, [question, onInput, setup]) {
+    input({ ctx, data: data2, forward }, [question, onInput, setup]) {
       ctx.input(
         unwrap2(question, data2),
         onInput,
         setup || noop,
-        () => forward(ctx)
+        forward
       );
     },
-    custom({ ctx }, [handler]) {
+    custom({ ctx, push }, [handler]) {
       const result = ctx.custom(handler, () => {
         if (ctx.meta.restoring)
           return;
@@ -1057,16 +1098,16 @@ var novely = ({
           enmemory(ctx);
           interactivity(true);
         }
-        push(ctx);
+        push();
       });
       return result;
     },
-    vibrate({ ctx }, pattern) {
+    vibrate({ ctx, push }, pattern) {
       ctx.vibrate(pattern);
-      push(ctx);
+      push();
     },
-    next({ ctx }) {
-      push(ctx);
+    next({ ctx, push }) {
+      push();
     },
     animateCharacter({ ctx, data: data2 }, [character, timeout, ...classes]) {
       if (DEV && classes.length === 0) {
@@ -1087,11 +1128,12 @@ var novely = ({
           return;
         const classNames = classes.filter((className) => !target.classList.contains(className));
         target.classList.add(...classNames);
-        const timeoutId = setTimeout(() => {
+        const removeClassNames = () => {
           target.classList.remove(...classNames);
-        }, timeout);
+        };
+        const timeoutId = setTimeout(removeClassNames, timeout);
         clear(() => {
-          target.classList.remove(...classNames);
+          removeClassNames();
           clearTimeout(timeoutId);
         });
       };
@@ -1101,12 +1143,12 @@ var novely = ({
         data: data2
       });
     },
-    text({ ctx, data: data2 }, text) {
+    text({ ctx, data: data2, forward }, text) {
       const string = text.map((content) => unwrap2(content, data2)).join(" ");
       if (DEV && string.length === 0) {
         throw new Error(`Action Text was called with empty string or array`);
       }
-      ctx.text(string, () => forward(ctx));
+      ctx.text(string, forward);
     },
     exit({ ctx, data: data2 }) {
       if (ctx.meta.restoring)
@@ -1155,11 +1197,11 @@ var novely = ({
       }
       render(ctx);
     },
-    preload({ ctx }, [source]) {
+    preload({ ctx, push }, [source]) {
       if (!ctx.meta.goingBack && !ctx.meta.restoring && !PRELOADED_ASSETS.has(source)) {
         PRELOADED_ASSETS.add(renderer.misc.preloadImage(source));
       }
-      push(ctx);
+      push();
     },
     block({ ctx }, [scene]) {
       if (DEV && !story[scene]) {
@@ -1175,25 +1217,6 @@ var novely = ({
       }
     }
   });
-  const enmemory = (ctx) => {
-    if (ctx.meta.restoring)
-      return;
-    const stack = useStack(ctx);
-    const current = klona(stack.value);
-    current[2][1] = "auto";
-    stack.push(current);
-    save(true, "auto");
-  };
-  const next = (ctx) => {
-    const stack = useStack(ctx);
-    const path = stack.value[0];
-    const last = path.at(-1);
-    if (last && (isNull(last[0]) || last[0] === "jump") && isNumber(last[1])) {
-      last[1]++;
-    } else {
-      path.push([null, 0]);
-    }
-  };
   const render = (ctx) => {
     const stack = useStack(ctx);
     const referred = refer(stack.value[0]);
@@ -1210,17 +1233,6 @@ var novely = ({
       });
     }
   };
-  const push = (ctx) => {
-    if (!ctx.meta.restoring)
-      next(ctx), render(ctx);
-  };
-  const forward = (ctx) => {
-    if (!ctx.meta.preview)
-      enmemory(ctx);
-    push(ctx);
-    if (!ctx.meta.preview)
-      interactivity(true);
-  };
   const interactivity = (value = false) => {
     interacted = value ? interacted + 1 : 0;
   };
@@ -1270,6 +1282,16 @@ var novely = ({
      */
     unwrap(content) {
       return unwrap2(content, $.get().data);
+    },
+    /**
+     * Cancel data loading, hide UI, ignore page change events
+     * Data updates still will work in case Novely already was loaded
+     */
+    destroy() {
+      dataLoaded.cancel();
+      UIInstance.unmount();
+      removeEventListener("visibilitychange", onVisibilityChange);
+      removeEventListener("beforeunload", throttledEmergencyOnStorageDataChange);
     }
   };
 };