@novely/core 0.40.0-next → 0.40.0-next.1

package/dist/index.d.ts

@@ -327,6 +327,7 @@ type CharactersData<$Characters extends Record<string, Character<Lang>>> = {
         emotions: Array<keyof $Characters[Character]['emotions']>;
     };
 };
+type AssetsPreloading = 'lazy' | 'blocking' | 'automatic';
 interface NovelyInit<$Language extends Lang, $Characters extends Record<string, Character<NoInfer<$Language>>>, $State extends State, $Data extends Data, $Actions extends Record<string, (...args: any[]) => ValidAction>> {
     /**
      * An object containing the characters in the game.
@@ -503,7 +504,7 @@ interface NovelyInit<$Language extends Lang, $Characters extends Record<string,
     /**
      * @default "lazy"
      */
-    preloadAssets?: 'lazy' | 'blocking' | 'automatic';
+    preloadAssets?: AssetsPreloading;
     /**
      * Fetching function
      */

package/dist/index.global.js

@@ -655,26 +655,31 @@ var Novely = (() => {
       return "";
     }
   };
-  var getResourseType = memoize(async (url, request) => {
-    if (!isCSSImage(url)) {
+  var getResourseType = memoize(
+    async ({ url, request }) => {
+      if (!isCSSImage(url)) {
+        return "other";
+      }
+      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(url, request);
+      if (contentType.includes("audio")) {
+        return "audio";
+      }
+      if (contentType.includes("image")) {
+        return "image";
+      }
       return "other";
+    },
+    {
+      getCacheKey: ({ url }) => 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(url, request);
-    if (contentType.includes("audio")) {
-      return "audio";
-    }
-    if (contentType.includes("image")) {
-      return "image";
-    }
-    return "other";
-  });
+  );
   var capitalize = (str2) => {
     return str2[0].toUpperCase() + str2.slice(1);
   };
@@ -854,6 +859,17 @@ var Novely = (() => {
   var toArray = (target) => {
     return Array.isArray(target) ? target : [target];
   };
+  var getLanguageFromStore = (store2) => {
+    return store2.get().meta[0];
+  };
+  var getVolumeFromStore = (store2) => {
+    const { meta } = store2.get();
+    return {
+      music: meta[2],
+      sound: meta[3],
+      voice: meta[4]
+    };
+  };
 
   // ../../node_modules/.pnpm/es-toolkit@1.16.0/node_modules/es-toolkit/dist/compat/predicate/isObjectLike.mjs
   function isObjectLike(value) {
@@ -1207,6 +1223,11 @@ var Novely = (() => {
   }
 
   // src/preloading.ts
+  var ACTION_NAME_TO_VOLUME_MAP = {
+    "playMusic": "music",
+    "playSound": "sound",
+    "voice": "voice"
+  };
   var enqueueAssetForPreloading = (asset2) => {
     if (!PRELOADED_ASSETS.has(asset2)) {
       ASSETS_TO_PRELOAD.add(asset2);
@@ -1215,7 +1236,10 @@ var Novely = (() => {
   var handleAssetsPreloading = async ({ request, limiter, preloadAudioBlocking, preloadImageBlocking }) => {
     const list = mapSet(ASSETS_TO_PRELOAD, (asset2) => {
       return limiter(async () => {
-        const type = await getResourseType(request, asset2);
+        const type = await getResourseType({
+          url: asset2,
+          request
+        });
         switch (type) {
           case "audio": {
             await preloadAudioBlocking(asset2);
@@ -1233,7 +1257,7 @@ var Novely = (() => {
     await Promise.allSettled(list);
     ASSETS_TO_PRELOAD.clear();
   };
-  var huntAssets = ({ characters, action, props, handle }) => {
+  var huntAssets = ({ volume, lang, mode, characters, action, props, handle }) => {
     if (action === "showBackground") {
       if (isString(props[0])) {
         handle(handleAudioAsset(props[0]));
@@ -1242,13 +1266,39 @@ var Novely = (() => {
         for (const value of Object.values(props[0])) {
           if (isImageAsset(value)) {
             handle(value);
+          } else if (isAsset(value)) {
+            const unwrapped = handleImageAsset(value);
+            if (isImageAsset(unwrapped)) {
+              handle(unwrapped);
+            }
           }
         }
       }
       return;
     }
+    const getVolumeFor = (action2) => {
+      if (action2 in ACTION_NAME_TO_VOLUME_MAP) {
+        return volume[ACTION_NAME_TO_VOLUME_MAP[action2]];
+      }
+      return 0;
+    };
     if (isAudioAction(action) && isString(props[0])) {
-      handle(handleAudioAsset(props[0]));
+      if (getVolumeFor(action) > 0) {
+        handle(handleAudioAsset(props[0]));
+      }
+      return;
+    }
+    if (action === "voice" && typeof props[0] === "object") {
+      if (getVolumeFor("voice") == 0) {
+        return;
+      }
+      for (const [language, value] of Object.entries(props[0])) {
+        if (mode === "blocking") {
+          value && handle(handleAudioAsset(value));
+        } else if (language === lang) {
+          value && handle(handleAudioAsset(value));
+        }
+      }
       return;
     }
     if (action === "showCharacter" && isString(props[0]) && isString(props[1])) {
@@ -1340,7 +1390,15 @@ var Novely = (() => {
         }
         return (...props) => {
           if (preloadAssets === "blocking") {
-            huntAssets({ characters, action: action2, props, handle: enqueueAssetForPreloading });
+            huntAssets({
+              action: action2,
+              props,
+              mode: preloadAssets,
+              characters,
+              lang: getLanguageFromStore(storageData),
+              volume: getVolumeFromStore(storageData),
+              handle: enqueueAssetForPreloading
+            });
           }
           return [action2, ...props];
         };
@@ -1603,7 +1661,15 @@ var Novely = (() => {
         if (isAudioAction(action2)) return;
         if (action2 === "vibrate") return;
         if (action2 === "end") return;
-        huntAssets({ characters, action: action2, props, handle: assets.push.bind(assets) });
+        huntAssets({
+          action: action2,
+          props,
+          mode: preloadAssets,
+          characters,
+          lang: getLanguageFromStore(storageData),
+          volume: getVolumeFromStore(storageData),
+          handle: assets.push.bind(assets)
+        });
         return match(action2, props, {
           ctx,
           data: data2
@@ -1644,7 +1710,10 @@ var Novely = (() => {
       getCustomActionHolder(ctx, fn).cleanup();
     };
     const getResourseTypeForRenderer = (url) => {
-      return getResourseType(url, request);
+      return getResourseType({
+        url,
+        request
+      });
     };
     const getCharacterColor = (c) => {
       return c in characters ? characters[c].color : "#000000";
@@ -1713,7 +1782,15 @@ var Novely = (() => {
             refer
           });
           for (const [action3, ...props2] of collection) {
-            huntAssets({ characters, action: action3, props: props2, handle: enqueueAssetForPreloading });
+            huntAssets({
+              action: action3,
+              props: props2,
+              mode: preloadAssets,
+              characters,
+              lang: getLanguageFromStore(storageData),
+              volume: getVolumeFromStore(storageData),
+              handle: enqueueAssetForPreloading
+            });
           }
           handleAssetsPreloading({
             ...renderer.misc,
@@ -1832,7 +1909,7 @@ var Novely = (() => {
       function({ ctx, push }, [fn]) {
         const { restoring, goingBack, preview: preview2 } = ctx.meta;
         const result = fn({
-          lang: storageData.get().meta[0],
+          lang: getLanguageFromStore(storageData),
           goingBack,
           restoring,
           preview: preview2,
@@ -1851,7 +1928,7 @@ var Novely = (() => {
         }
         const transformedChoices = choices.map(([content, action2, visible]) => {
           const shown = !visible || visible({
-            lang: storageData.get().meta[0],
+            lang: getLanguageFromStore(storageData),
             state: getStateAtCtx(ctx)
           });
           if (DEV && action2.length === 0 && !shown) {
@@ -1938,7 +2015,7 @@ var Novely = (() => {
           ctx.clearBlockingActions(void 0);
         }
         const state = getStateFunction(ctx);
-        const lang = storageData.get().meta[0];
+        const lang = getLanguageFromStore(storageData);
         const result = handleCustomAction(ctx, fn, {
           ...ctx.custom(fn),
           state,