@novely/core 0.47.1 → 0.48.0

package/dist/index.d.ts

@@ -544,6 +544,10 @@ interface NovelyInit<$Language extends Lang, $Characters extends Record<string,
      * ```
      */
     startKey?: 'start' | (string & Record<never, never>);
+    /**
+     * Typewriter speed set by default
+     */
+    defaultTypewriterSpeed?: TypewriterSpeed;
 }
 type StateFunction<S extends State> = {
     (value: DeepPartial<S> | ((prev: S) => S)): void;
@@ -672,9 +676,9 @@ type CustomHandlerCalling = {
     callOnlyLatest?: boolean;
     /**
      * Manually check should be skipped or not during restore
-     * @param getNext Function which will return next actions in queue
+     * @param nextActions Next actions in the restoring queue
      */
-    skipOnRestore?: (getNext: () => Exclude<ValidAction, ValidAction[]>[]) => boolean;
+    skipOnRestore?: (nextActions: Exclude<ValidAction, ValidAction[]>[]) => boolean;
 };
 type CustomHandlerInfo = CustomHandlerCalling & {
     /**
@@ -854,7 +858,7 @@ type ChoiceParams<T> = T extends TypeEssentials<infer $Lang, infer $State, any,
 type FunctionParams<T> = T extends TypeEssentials<infer $Lang, infer $State, any, any> ? FunctionActionProps<$Lang, $State> : never;
 type InputHandler<T> = T extends TypeEssentials<infer $Lang, infer $State, any, any> ? ActionInputOnInputMeta<$Lang, $State> : never;
 
-declare const novely: <$Language extends string, $Characters extends Record<string, Character<$Language>>, $State extends State, $Data extends Data, $Actions extends Record<string, (...args: any[]) => ValidAction>>({ characters, characterAssetSizes, defaultEmotions, storage, storageDelay, renderer: createRenderer, initialScreen, translation, state: defaultState, data: defaultData, autosaves, migrations, throttleTimeout, getLanguage, overrideLanguage, askBeforeExit, preloadAssets, parallelAssetsDownloadLimit, fetch: request, cloneFunction: clone, saveOnUnload, startKey, }: NovelyInit<$Language, $Characters, $State, $Data, $Actions>) => {
+declare const novely: <$Language extends string, $Characters extends Record<string, Character<$Language>>, $State extends State, $Data extends Data, $Actions extends Record<string, (...args: any[]) => ValidAction>>({ characters, characterAssetSizes, defaultEmotions, storage, storageDelay, renderer: createRenderer, initialScreen, translation, state: defaultState, data: defaultData, autosaves, migrations, throttleTimeout, getLanguage, overrideLanguage, askBeforeExit, preloadAssets, parallelAssetsDownloadLimit, fetch: request, cloneFunction: clone, saveOnUnload, startKey, defaultTypewriterSpeed, }: NovelyInit<$Language, $Characters, $State, $Data, $Actions>) => {
     /**
      * Function to set game script
      *
@@ -882,7 +886,8 @@ declare const novely: <$Language extends string, $Characters extends Record<stri
      */
     action: $Actions & ActionProxy<$Characters, $Language, $State> & VirtualActions<$Characters, $Language, $State>;
     /**
-     * @deprecated Will be removed BUT replaced with state passed into actions as a parameter
+     * State bound to `$MAIN` game context
+     * @deprecated Use `state` function provided from action arguments
      */
     state: StateFunction<State>;
     /**
@@ -965,6 +970,7 @@ declare const novely: <$Language extends string, $Characters extends Record<stri
     setStorageData: (data: StorageData<$Language, $Data>) => void;
 };
 
+type Part = Record<string, (...args: any[]) => ValidAction>;
 /**
  * Extens core action with custom actions
  * @param base Actions object you will extend, `engine.action`
@@ -978,7 +984,7 @@ declare const novely: <$Language extends string, $Characters extends Record<stri
  * })
  * ```
  */
-declare const extendAction: <Part0 extends Record<string, (...args: any[]) => ValidAction>, Part1 extends Record<string, (...args: any[]) => ValidAction>>(base: Part0, extension: Part1) => Readonly<Assign<Part0, Part1>>;
+declare const extendAction: <Part0 extends Part, Part1 extends Part>(base: Part0, extension: Part1) => Readonly<Assign<Part0, Part1>>;
 
 /**
  * Memoizes and returns an asset selection object based on provided file variants.

package/dist/index.global.js

@@ -494,7 +494,7 @@ var Novely = (() => {
   // src/utilities/match-action.ts
   var matchAction = (callbacks, values) => {
     const { getContext, onBeforeActionCall, push, forward } = callbacks;
-    return (action, props, { ctx, data }) => {
+    const match = (action, props, { ctx, data }) => {
       const context = typeof ctx === "string" ? getContext(ctx) : ctx;
       onBeforeActionCall({
         action,
@@ -517,6 +517,10 @@ var Novely = (() => {
         props
       );
     };
+    return {
+      match,
+      nativeActions: Object.keys(values)
+    };
   };
 
   // src/utilities/ungrupped.ts
@@ -834,7 +838,7 @@ var Novely = (() => {
     const characters = /* @__PURE__ */ new Set();
     const audio2 = {
       music: /* @__PURE__ */ new Set(),
-      sound: /* @__PURE__ */ new Set()
+      sounds: /* @__PURE__ */ new Set()
     };
     const next = (i) => queue.slice(i + 1);
     for (const [i, item] of queue.entries()) {
@@ -847,39 +851,50 @@ var Novely = (() => {
         if (action === "custom") {
           const fn = params[0];
           if ("callOnlyLatest" in fn && fn.callOnlyLatest) {
-            const notLatest = next(i).some(([, func]) => {
-              if (!isFunction(func)) return false;
-              const c0 = func;
-              const c1 = fn;
-              const isIdenticalID = Boolean(c0.id && c1.id && c0.id === c1.id);
-              const isIdenticalByReference = c0 === c1;
-              return isIdenticalID || isIdenticalByReference || String(c0) === String(c1);
+            const notLatest = next(i).some(([name, func]) => {
+              if (name !== "custom") return;
+              const isIdenticalId = Boolean(func.id && fn.id && func.id === fn.id);
+              const isIdenticalByReference = func === fn;
+              const isIdenticalByCode = String(func) === String(fn);
+              return isIdenticalId || isIdenticalByReference || isIdenticalByCode;
             });
             if (notLatest) continue;
           } else if ("skipOnRestore" in fn && fn.skipOnRestore) {
-            if (fn.skipOnRestore(() => next(i))) {
+            if (fn.skipOnRestore(next(i))) {
               continue;
             }
           }
         }
         processedQueue.push(item);
-      } else if (action === "showCharacter" || action === "playSound" || action === "playMusic" || action === "voice") {
+      } else if (action === "playSound") {
+        const closing = getOppositeAction(action);
+        const skip = next(i).some((item2) => {
+          if (isUserRequiredAction(item2) || isSkippedDuringRestore(item2[0])) {
+            return true;
+          }
+          const [_action, target] = item2;
+          if (target !== params[0]) {
+            return false;
+          }
+          return _action === closing || _action === action;
+        });
+        if (skip) continue;
+        audio2.sounds.add(unwrapAsset(params[0]));
+        processedQueue.push(item);
+      } else if (action === "showCharacter" || action === "playMusic" || action === "voice") {
         const closing = getOppositeAction(action);
         const skip = next(i).some(([_action, target]) => {
           if (target !== params[0] && action !== "voice") {
             return false;
           }
-          const musicGonnaBePaused = action === "playMusic" && _action === "pauseMusic";
-          const soundGonnaBePaused = action === "playSound" && _action === "pauseSound";
-          return musicGonnaBePaused || soundGonnaBePaused || _action === closing || _action === action;
+          const musicWillBePaused = action === "playMusic" && _action === "pauseMusic";
+          return musicWillBePaused || _action === closing || _action === action;
         });
         if (skip) continue;
         if (action === "showCharacter") {
           characters.add(params[0]);
         } else if (action === "playMusic") {
           audio2.music.add(unwrapAsset(params[0]));
-        } else if (action === "playSound") {
-          audio2.sound.add(unwrapAsset(params[0]));
         }
         processedQueue.push(item);
       } else if (action === "showBackground" || action === "preload") {
@@ -894,7 +909,8 @@ var Novely = (() => {
           const next2 = array.slice(j);
           const characterWillAnimate = next2.some(([__action, __character]) => action === __action);
           const hasBlockingActions = next2.some((item2) => options.skip.has(item2));
-          return characterWillAnimate && hasBlockingActions;
+          const differentCharacterWillAnimate = !hasBlockingActions && next2.some(([__action, __character]) => __action === action && __character !== params[0]);
+          return characterWillAnimate && hasBlockingActions || differentCharacterWillAnimate;
         });
         if (skip) continue;
         processedQueue.push(item);
@@ -1353,6 +1369,69 @@ var Novely = (() => {
     });
   };
 
+  // src/utilities/actions.ts
+  var VIRTUAL_ACTIONS = ["say"];
+  var buildActionObject = ({
+    rendererActions,
+    nativeActions,
+    characters,
+    preloadAssets,
+    storageData
+  }) => {
+    const allActions = [...nativeActions, ...VIRTUAL_ACTIONS];
+    const object = { ...rendererActions };
+    for (let action of allActions) {
+      object[action] = (...props) => {
+        if (action === "say") {
+          action = "dialog";
+          const [character] = props;
+          if (DEV && !characters[character]) {
+            throw new Error(`Attempt to call Say action with unknown character "${character}"`);
+          }
+        } else if (action === "choice") {
+          if (props.slice(1).every((choice) => !Array.isArray(choice))) {
+            for (let i = 1; i < props.length; i++) {
+              const choice = props[i];
+              props[i] = [
+                choice.title,
+                flatActions(choice.children),
+                choice.active,
+                choice.visible,
+                choice.onSelect,
+                choice.image
+              ];
+            }
+          } else {
+            for (let i = 1; i < props.length; i++) {
+              const choice = props[i];
+              if (Array.isArray(choice)) {
+                choice[1] = flatActions(choice[1]);
+              }
+            }
+          }
+        } else if (action === "condition") {
+          const actions = props[1];
+          for (const key in actions) {
+            actions[key] = flatActions(actions[key]);
+          }
+        }
+        if (preloadAssets === "blocking") {
+          huntAssets({
+            action,
+            props,
+            mode: preloadAssets,
+            characters,
+            lang: getLanguageFromStore(storageData),
+            volume: getVolumeFromStore(storageData),
+            handle: enqueueAssetForPreloading
+          });
+        }
+        return [action, ...props];
+      };
+    }
+    return object;
+  };
+
   // src/novely.ts
   var novely = ({
     characters,
@@ -1376,7 +1455,8 @@ var Novely = (() => {
     fetch: request = fetch,
     cloneFunction: clone = klona,
     saveOnUnload = true,
-    startKey = "start"
+    startKey = "start",
+    defaultTypewriterSpeed = DEFAULT_TYPEWRITER_SPEED
   }) => {
     const languages = Object.keys(translation);
     const limitScript = pLimit(1);
@@ -1421,61 +1501,6 @@ var Novely = (() => {
     const script = (part) => {
       return limitScript(() => scriptBase(part));
     };
-    const action = new Proxy({}, {
-      get(_, action2) {
-        if (action2 in renderer.actions) {
-          return renderer.actions[action2];
-        }
-        return (...props) => {
-          if (action2 === "say") {
-            action2 = "dialog";
-            const [character] = props;
-            if (DEV && !characters[character]) {
-              throw new Error(`Attempt to call Say action with unknown character "${character}"`);
-            }
-          } else if (action2 === "choice") {
-            const actions = props.slice(1);
-            if (actions.every((choice) => !Array.isArray(choice))) {
-              for (let i = 1; i < props.length; i++) {
-                const choice = props[i];
-                props[i] = [
-                  choice.title,
-                  flatActions(choice.children),
-                  choice.active,
-                  choice.visible,
-                  choice.onSelect,
-                  choice.image
-                ];
-              }
-            } else {
-              for (let i = 1; i < props.length; i++) {
-                const choice = props[i];
-                if (Array.isArray(choice)) {
-                  choice[1] = flatActions(choice[1]);
-                }
-              }
-            }
-          } else if (action2 === "condition") {
-            const actions = props[1];
-            for (const key in actions) {
-              actions[key] = flatActions(actions[key]);
-            }
-          }
-          if (preloadAssets === "blocking") {
-            huntAssets({
-              action: action2,
-              props,
-              mode: preloadAssets,
-              characters,
-              lang: getLanguageFromStore(storageData),
-              volume: getVolumeFromStore(storageData),
-              handle: enqueueAssetForPreloading
-            });
-          }
-          return [action2, ...props];
-        };
-      }
-    });
     const getDefaultSave = (state) => {
       return [
         [
@@ -1545,7 +1570,7 @@ var Novely = (() => {
       if (overrideLanguage || !stored.meta[0]) {
         stored.meta[0] = getLanguageWithoutParameters();
       }
-      stored.meta[1] ||= DEFAULT_TYPEWRITER_SPEED;
+      stored.meta[1] ||= defaultTypewriterSpeed;
       stored.meta[2] ??= 1;
       stored.meta[3] ??= 1;
       stored.meta[4] ??= 1;
@@ -1953,7 +1978,7 @@ var Novely = (() => {
         }
       }
     };
-    const match = matchAction(matchActionOptions, {
+    const { match, nativeActions } = matchAction(matchActionOptions, {
       wait({ ctx, data: data2, push }, [time]) {
         if (ctx.meta.restoring) return;
         setTimeout(push, isFunction(time) ? time(data2) : time);
@@ -2251,6 +2276,13 @@ var Novely = (() => {
         }
       }
     });
+    const action = buildActionObject({
+      rendererActions: renderer.actions,
+      nativeActions,
+      characters,
+      preloadAssets,
+      storageData
+    });
     const render = (ctx) => {
       const stack = useStack(ctx);
       const [path, state] = stack.value;
@@ -2345,7 +2377,8 @@ var Novely = (() => {
        */
       action,
       /**
-       * @deprecated Will be removed BUT replaced with state passed into actions as a parameter
+       * State bound to `$MAIN` game context
+       * @deprecated Use `state` function provided from action arguments
        */
       state: getStateFunction(MAIN_CONTEXT_KEY),
       /**
@@ -2440,11 +2473,10 @@ var Novely = (() => {
 
   // src/extend-actions.ts
   var extendAction = (base, extension) => {
-    return new Proxy({}, {
-      get(_, key, receiver) {
-        return Reflect.get(key in extension ? extension : base, key, receiver);
-      }
-    });
+    return {
+      ...extension,
+      ...base
+    };
   };
 
   // src/translations.ts