@novely/core 0.22.2 → 0.24.0

package/dist/index.js

@@ -12,12 +12,44 @@ 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
+import { DEV } from "esm-env";
 var matchAction = ({ getContext, push, forward }, values) => {
   return (action, props, { ctx, data }) => {
     const context = typeof ctx === "string" ? getContext(ctx) : ctx;
@@ -25,9 +57,13 @@ var matchAction = ({ getContext, push, forward }, values) => {
       ctx: context,
       data,
       push() {
+        if (context.meta.preview)
+          return;
         push(context);
       },
       forward() {
+        if (context.meta.preview)
+          return;
         forward(context);
       }
     }, props);
@@ -136,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) => {
@@ -358,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();
@@ -553,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" }),
@@ -561,7 +647,6 @@ var novely = ({
   renderer: createRenderer,
   initialScreen = "mainmenu",
   translation,
-  languages,
   state: defaultState,
   data: defaultData,
   autosaves = true,
@@ -570,9 +655,13 @@ var novely = ({
   getLanguage: getLanguage2 = getLanguage,
   overrideLanguage = false,
   askBeforeExit = true,
-  preloadAssets = "lazy"
+  preloadAssets = "lazy",
+  parallelAssetsDownloadLimit = 15,
+  fetch: request = fetch
 }) => {
+  const languages = Object.keys(translation);
   const limitScript = pLimit(1);
+  const limitAssetsDownload = pLimit(parallelAssetsDownloadLimit);
   const story = {};
   const times = /* @__PURE__ */ new Set();
   const ASSETS_TO_PRELOAD = /* @__PURE__ */ new Set();
@@ -588,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;
@@ -609,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) {
@@ -626,7 +743,7 @@ var novely = ({
             }
           }
         }
-        return [prop, ...props];
+        return [action2, ...props];
       };
     }
   });
@@ -675,12 +792,10 @@ var novely = ({
     for (const migration of migrations) {
       stored = migration(stored);
     }
-    stored.meta[1] ||= DEFAULT_TYPEWRITER_SPEED;
-    if (overrideLanguage) {
+    if (overrideLanguage || !stored.meta[0]) {
       stored.meta[0] = getLanguageWithoutParameters();
-    } else {
-      stored.meta[0] ||= getLanguageWithoutParameters();
     }
+    stored.meta[1] ||= DEFAULT_TYPEWRITER_SPEED;
     stored.meta[2] ??= 1;
     stored.meta[3] ??= 1;
     stored.meta[4] ??= 1;
@@ -746,12 +861,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);
@@ -855,7 +969,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;
@@ -959,7 +1073,7 @@ var novely = ({
       push();
     },
     showCharacter({ ctx, push }, [character, emotion, className, style]) {
-      if (DEV && !characters[character].emotions[emotion]) {
+      if (DEV2 && !characters[character].emotions[emotion]) {
         throw new Error(`Attempt to show character "${character}" with unknown emotion "${emotion}"`);
       }
       const handle = ctx.character(character);
@@ -1008,12 +1122,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) => {
@@ -1022,7 +1136,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]);
@@ -1031,10 +1145,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);
@@ -1057,15 +1171,15 @@ var novely = ({
       );
     },
     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);
@@ -1106,46 +1220,24 @@ var novely = ({
       ctx.vibrate(pattern);
       push();
     },
-    next({ ctx, push }) {
+    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 removeClassNames = () => {
-          target.classList.remove(...classNames);
-        };
-        const timeoutId = setTimeout(removeClassNames, timeout);
-        clear(() => {
-          removeClassNames();
-          clearTimeout(timeoutId);
-        });
-      };
-      handler.key = "@@internal-animate-character";
-      match("custom", [handler], {
-        ctx,
-        data: data2
-      });
+      ctx.character(character).animate(timeout, classes);
+      push();
     },
     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);
@@ -1204,10 +1296,10 @@ var novely = ({
       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) {