@novely/core 0.22.1 → 0.23.0

package/dist/index.js

@@ -12,18 +12,60 @@ var AUDIO_ACTIONS = /* @__PURE__ */ new Set([
 ]);
 var EMPTY_SET = /* @__PURE__ */ new Set();
 var DEFAULT_TYPEWRITER_SPEED = "Medium";
+var HOWLER_SUPPORTED_FILE_FORMATS = /* @__PURE__ */ new Set([
+  "mp3",
+  "mpeg",
+  "opus",
+  "ogg",
+  "oga",
+  "wav",
+  "aac",
+  "caf",
+  "m4a",
+  "m4b",
+  "mp4",
+  "weba",
+  "webm",
+  "dolby",
+  "flac"
+]);
+var SUPPORTED_IMAGE_FILE_FORMATS = /* @__PURE__ */ new Set([
+  "apng",
+  "avif",
+  "gif",
+  "jpg",
+  "jpeg",
+  "jfif",
+  "pjpeg",
+  "pjp",
+  "png",
+  "svg",
+  "webp",
+  "bmp"
+]);
 var MAIN_CONTEXT_KEY = "$MAIN";
 
 // src/shared.ts
 var STACK_MAP = /* @__PURE__ */ new Map();
 
 // src/utils.ts
-var matchAction = (getContext, values) => {
+import { DEV } from "esm-env";
+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() {
+        if (context.meta.preview)
+          return;
+        push(context);
+      },
+      forward() {
+        if (context.meta.preview)
+          return;
+        forward(context);
+      }
     }, props);
   };
 };
@@ -130,6 +172,9 @@ var isBlockExitStatement = (statement) => {
 var isSkippedDuringRestore = (item) => {
   return SKIPPED_DURING_RESTORE.has(item);
 };
+var isAudioAction = (action) => {
+  return AUDIO_ACTIONS.has(action);
+};
 var noop = () => {
 };
 var isAction = (element) => {
@@ -352,6 +397,53 @@ var createUseStackFunction = (renderer) => {
   };
   return useStack;
 };
+var mapSet = (set, fn) => {
+  return [...set].map(fn);
+};
+var isImageAsset = (asset) => {
+  return isString(asset) && isCSSImage(asset);
+};
+var getUrlFileExtension = (address) => {
+  try {
+    const { pathname } = new URL(address, location.href);
+    return pathname.split(".").at(-1).split("!")[0].split(":")[0];
+  } catch (error) {
+    if (DEV) {
+      console.error(new Error(`Could not construct URL "${address}".`, { cause: error }));
+    }
+    return "";
+  }
+};
+var fetchContentType = async (request, url) => {
+  try {
+    const response = await request(url, {
+      method: "HEAD"
+    });
+    return response.headers.get("Content-Type") || "";
+  } catch (error) {
+    if (DEV) {
+      console.error(new Error(`Failed to fetch file at "${url}"`, { cause: error }));
+    }
+    return "";
+  }
+};
+var getResourseType = async (request, url) => {
+  const extension = getUrlFileExtension(url);
+  if (HOWLER_SUPPORTED_FILE_FORMATS.has(extension)) {
+    return "audio";
+  }
+  if (SUPPORTED_IMAGE_FILE_FORMATS.has(extension)) {
+    return "image";
+  }
+  const contentType = await fetchContentType(request, url);
+  if (contentType.includes("audio")) {
+    return "audio";
+  }
+  if (contentType.includes("image")) {
+    return "image";
+  }
+  return "other";
+};
 
 // src/global.ts
 var PRELOADED_ASSETS = /* @__PURE__ */ new Set();
@@ -547,7 +639,7 @@ var localStorageStorage = (options) => {
 
 // src/novely.ts
 import pLimit from "p-limit";
-import { DEV } from "esm-env";
+import { DEV as DEV2 } from "esm-env";
 var novely = ({
   characters,
   storage = localStorageStorage({ key: "novely-game-storage" }),
@@ -564,9 +656,12 @@ var novely = ({
   getLanguage: getLanguage2 = getLanguage,
   overrideLanguage = false,
   askBeforeExit = true,
-  preloadAssets = "lazy"
+  preloadAssets = "lazy",
+  parallelAssetsDownloadLimit = 15,
+  fetch: request = fetch
 }) => {
   const limitScript = pLimit(1);
+  const limitAssetsDownload = pLimit(parallelAssetsDownloadLimit);
   const story = {};
   const times = /* @__PURE__ */ new Set();
   const ASSETS_TO_PRELOAD = /* @__PURE__ */ new Set();
@@ -582,7 +677,23 @@ var novely = ({
     Object.assign(story, flattenStory(part));
     if (preloadAssets === "blocking" && ASSETS_TO_PRELOAD.size > 0) {
       renderer.ui.showScreen("loading");
-      await renderer.misc.preloadImagesBlocking(ASSETS_TO_PRELOAD);
+      const { preloadAudioBlocking, preloadImageBlocking } = renderer.misc;
+      const list = mapSet(ASSETS_TO_PRELOAD, (asset) => {
+        return limitAssetsDownload(async () => {
+          const type = await getResourseType(request, asset);
+          switch (type) {
+            case "audio": {
+              await preloadAudioBlocking(asset);
+              break;
+            }
+            case "image": {
+              await preloadImageBlocking(asset);
+              break;
+            }
+          }
+        });
+      });
+      await Promise.allSettled(list);
     }
     const screen = renderer.ui.getScreen();
     const nextScreen = scriptCalled ? screen : initialScreen;
@@ -603,13 +714,25 @@ var novely = ({
     return limitScript(() => scriptBase(part));
   };
   const action = new Proxy({}, {
-    get(_, prop) {
+    get(_, action2) {
       return (...props) => {
         if (preloadAssets === "blocking") {
-          if (prop === "showBackground" && typeof props[0] === "string" && isCSSImage(props[0])) {
+          if (action2 === "showBackground") {
+            if (isImageAsset(props[0])) {
+              ASSETS_TO_PRELOAD.add(props[0]);
+            }
+            if (props[0] && typeof props[0] === "object") {
+              for (const value of Object.values(props[0])) {
+                if (!isImageAsset(value))
+                  continue;
+                ASSETS_TO_PRELOAD.add(value);
+              }
+            }
+          }
+          if (isAudioAction(action2) && isString(props[0])) {
             ASSETS_TO_PRELOAD.add(props[0]);
           }
-          if (prop === "showCharacter" && typeof props[0] === "string" && typeof props[1] === "string") {
+          if (action2 === "showCharacter" && isString(props[0]) && isString(props[1])) {
             const images = characters[props[0]].emotions[props[1]];
             if (Array.isArray(images)) {
               for (const asset of images) {
@@ -620,7 +743,7 @@ var novely = ({
             }
           }
         }
-        return [prop, ...props];
+        return [action2, ...props];
       };
     }
   });
@@ -687,11 +810,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)
@@ -739,12 +863,11 @@ var novely = ({
       return;
     let latest = save2 || $.get().saves.at(-1);
     if (!latest) {
-      $.set({
-        saves: [initial],
-        data: klona(defaultData),
-        meta: [getLanguageWithoutParameters(), DEFAULT_TYPEWRITER_SPEED, 1, 1, 1]
-      });
       latest = klona(initial);
+      $.update((prev) => {
+        prev.saves.push(latest);
+        return prev;
+      });
     }
     const context = renderer.getContext(MAIN_CONTEXT_KEY);
     const stack = useStack(context);
@@ -780,7 +903,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) => {
@@ -848,7 +971,7 @@ var novely = ({
     ctx.meta.preview = true;
     const processor = createQueueProcessor(queue);
     await processor.run((action2, props) => {
-      if (AUDIO_ACTIONS.has(action2))
+      if (isAudioAction(action2))
         return;
       if (action2 === "vibrate")
         return;
@@ -881,55 +1004,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);
     },
-    showBackground({ ctx }, [background]) {
+    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, 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]) {
-      if (DEV && !characters[character].emotions[emotion]) {
+    showCharacter({ ctx, push }, [character, emotion, className, style]) {
+      if (DEV2 && !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 +1107,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;
     },
@@ -967,12 +1124,12 @@ var novely = ({
         question = "";
       }
       const unwrappedChoices = choices.map(([content, action2, visible]) => {
-        if (DEV && action2.length === 0 && (!visible || visible())) {
+        if (DEV2 && action2.length === 0 && (!visible || visible())) {
           console.warn(`Choice children should not be empty, either add content there or make item not selectable`);
         }
         return [unwrap2(content, data2), action2, visible];
       });
-      if (DEV && unwrappedChoices.length === 0) {
+      if (DEV2 && unwrappedChoices.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.choices(unwrap2(question, data2), unwrappedChoices, (selected) => {
@@ -981,7 +1138,7 @@ var novely = ({
         }
         const stack = useStack(ctx);
         const offset = isWithoutQuestion ? 0 : 1;
-        if (DEV && !unwrappedChoices[selected]) {
+        if (DEV2 && !unwrappedChoices[selected]) {
           throw new Error("Choice children is empty, either add content there or make item not selectable");
         }
         stack.value[0].push(["choice", selected + offset], [null, 0]);
@@ -990,10 +1147,10 @@ var novely = ({
       });
     },
     jump({ ctx, data: data2 }, [scene]) {
-      if (DEV && !story[scene]) {
+      if (DEV2 && !story[scene]) {
         throw new Error(`Attempt to jump to unknown scene "${scene}"`);
       }
-      if (DEV && story[scene].length === 0) {
+      if (DEV2 && story[scene].length === 0) {
         throw new Error(`Attempt to jump to empty scene "${scene}"`);
       }
       const stack = useStack(ctx);
@@ -1006,25 +1163,25 @@ 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]) {
-      if (DEV && Object.values(variants).length === 0) {
+      if (DEV2 && Object.values(variants).length === 0) {
         throw new Error(`Attempt to use Condition action with empty variants object`);
       }
       if (!ctx.meta.restoring) {
         const val = String(condition());
-        if (DEV && !variants[val]) {
+        if (DEV2 && !variants[val]) {
           throw new Error(`Attempt to go to unknown variant "${val}"`);
         }
-        if (DEV && variants[val].length === 0) {
+        if (DEV2 && variants[val].length === 0) {
           throw new Error(`Attempt to go to empty variant "${val}"`);
         }
         const stack = useStack(MAIN_CONTEXT_KEY);
@@ -1041,15 +1198,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,56 +1214,35 @@ 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({ push }) {
+      push();
     },
-    animateCharacter({ ctx, data: data2 }, [character, timeout, ...classes]) {
-      if (DEV && classes.length === 0) {
+    animateCharacter({ ctx, push }, [character, timeout, ...classes]) {
+      if (DEV2 && classes.length === 0) {
         throw new Error("Attempt to use AnimateCharacter without classes. Classes should be provided [https://novely.pages.dev/guide/actions/animateCharacter.html]");
       }
-      if (DEV && (timeout <= 0 || !Number.isFinite(timeout) || Number.isNaN(timeout))) {
+      if (DEV2 && (timeout <= 0 || !Number.isFinite(timeout) || Number.isNaN(timeout))) {
         throw new Error("Attempt to use AnimateCharacter with unacceptable timeout. It should be finite and greater than zero");
       }
       if (ctx.meta.preview)
         return;
-      const handler = ({ get }) => {
-        const { clear } = get(false);
-        const char = ctx.getCharacter(character);
-        if (!char)
-          return;
-        const target = char.canvas;
-        if (!target)
-          return;
-        const classNames = classes.filter((className) => !target.classList.contains(className));
-        target.classList.add(...classNames);
-        const timeoutId = setTimeout(() => {
-          target.classList.remove(...classNames);
-        }, timeout);
-        clear(() => {
-          target.classList.remove(...classNames);
-          clearTimeout(timeoutId);
-        });
-      };
-      handler.key = "@@internal-animate-character";
-      match("custom", [handler], {
-        ctx,
-        data: data2
-      });
+      ctx.character(character).animate(timeout, classes);
+      push();
     },
-    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) {
+      if (DEV2 && 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,17 +1291,17 @@ 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]) {
+      if (DEV2 && !story[scene]) {
         throw new Error(`Attempt to call Block action with unknown scene "${scene}"`);
       }
-      if (DEV && story[scene].length === 0) {
+      if (DEV2 && story[scene].length === 0) {
         throw new Error(`Attempt to call Block action with empty scene "${scene}"`);
       }
       if (!ctx.meta.restoring) {
@@ -1175,25 +1311,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 +1327,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 +1376,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);
     }
   };
 };