@novely/core 0.40.3 → 0.42.0

package/dist/index.js

@@ -1,7 +1,8 @@
 // src/constants.ts
-var SKIPPED_DURING_RESTORE = /* @__PURE__ */ new Set(["dialog", "say", "choice", "input", "vibrate", "text"]);
+var SKIPPED_DURING_RESTORE = /* @__PURE__ */ new Set(["dialog", "choice", "input", "vibrate", "text"]);
 var BLOCK_EXIT_STATEMENTS = /* @__PURE__ */ new Set(["choice:exit", "condition:exit", "block:exit"]);
 var BLOCK_STATEMENTS = /* @__PURE__ */ new Set(["choice", "condition", "block"]);
+var VIRTUAL_ACTIONS = /* @__PURE__ */ new Set(["say", "choiceExtended"]);
 var AUDIO_ACTIONS = /* @__PURE__ */ new Set([
   "playMusic",
   "stopMusic",
@@ -53,55 +54,6 @@ var ASSETS_TO_PRELOAD = /* @__PURE__ */ new Set();
 
 // src/utils.ts
 import { DEV as DEV2 } from "esm-env";
-
-// ../../node_modules/.pnpm/klona@2.0.6/node_modules/klona/full/index.mjs
-function set(obj, key, val) {
-  if (typeof val.value === "object") val.value = klona(val.value);
-  if (!val.enumerable || val.get || val.set || !val.configurable || !val.writable || key === "__proto__") {
-    Object.defineProperty(obj, key, val);
-  } else obj[key] = val.value;
-}
-function klona(x) {
-  if (typeof x !== "object") return x;
-  var i = 0, k, list, tmp, str2 = Object.prototype.toString.call(x);
-  if (str2 === "[object Object]") {
-    tmp = Object.create(x.__proto__ || null);
-  } else if (str2 === "[object Array]") {
-    tmp = Array(x.length);
-  } else if (str2 === "[object Set]") {
-    tmp = /* @__PURE__ */ new Set();
-    x.forEach(function(val) {
-      tmp.add(klona(val));
-    });
-  } else if (str2 === "[object Map]") {
-    tmp = /* @__PURE__ */ new Map();
-    x.forEach(function(val, key) {
-      tmp.set(klona(key), klona(val));
-    });
-  } else if (str2 === "[object Date]") {
-    tmp = /* @__PURE__ */ new Date(+x);
-  } else if (str2 === "[object RegExp]") {
-    tmp = new RegExp(x.source, x.flags);
-  } else if (str2 === "[object DataView]") {
-    tmp = new x.constructor(klona(x.buffer));
-  } else if (str2 === "[object ArrayBuffer]") {
-    tmp = x.slice(0);
-  } else if (str2.slice(-6) === "Array]") {
-    tmp = new x.constructor(x);
-  }
-  if (tmp) {
-    for (list = Object.getOwnPropertySymbols(x); i < list.length; i++) {
-      set(tmp, list[i], Object.getOwnPropertyDescriptor(x, list[i]));
-    }
-    for (i = 0, list = Object.getOwnPropertyNames(x); i < list.length; i++) {
-      if (Object.hasOwnProperty.call(tmp, k = list[i]) && tmp[k] === x[k]) continue;
-      set(tmp, k, Object.getOwnPropertyDescriptor(x, k));
-    }
-  }
-  return tmp || x;
-}
-
-// src/utils.ts
 import { memoize as memoize2 } from "es-toolkit/function";
 
 // src/asset.ts
@@ -239,13 +191,11 @@ var isAsset = (suspect) => {
 var matchAction = ({ getContext, onBeforeActionCall, push, forward }, values) => {
   return (action, props, { ctx, data }) => {
     const context = typeof ctx === "string" ? getContext(ctx) : ctx;
-    if (action !== "say") {
-      onBeforeActionCall({
-        action,
-        props,
-        ctx: context
-      });
-    }
+    onBeforeActionCall({
+      action,
+      props,
+      ctx: context
+    });
     return values[action]({
       ctx: context,
       data,
@@ -733,7 +683,7 @@ var nextPath = (path) => {
 var isBlockingAction = (action) => {
   return isUserRequiredAction(action) || isSkippedDuringRestore(action[0]) && action[0] !== "vibrate";
 };
-var collectActionsBeforeBlockingAction = ({ path, refer }) => {
+var collectActionsBeforeBlockingAction = ({ path, refer, clone }) => {
   const collection = [];
   let action = refer(path);
   while (true) {
@@ -756,11 +706,12 @@ var collectActionsBeforeBlockingAction = ({ path, refer }) => {
         for (let i = 0; i < choiceProps.length; i++) {
           const branchContent = choiceProps[i];
           if (!Array.isArray(branchContent)) continue;
-          const virtualPath = klona(path);
+          const virtualPath = clone(path);
           virtualPath.push(["choice", i], [null, 0]);
           const innerActions = collectActionsBeforeBlockingAction({
             path: virtualPath,
-            refer
+            refer,
+            clone
           });
           collection.push(...innerActions);
         }
@@ -768,11 +719,12 @@ var collectActionsBeforeBlockingAction = ({ path, refer }) => {
         const conditionProps = props;
         const conditions = Object.keys(conditionProps[1]);
         for (const condition of conditions) {
-          const virtualPath = klona(path);
+          const virtualPath = clone(path);
           virtualPath.push(["condition", condition], [null, 0]);
           const innerActions = collectActionsBeforeBlockingAction({
             path: virtualPath,
-            refer
+            refer,
+            clone
           });
           collection.push(...innerActions);
         }
@@ -854,6 +806,53 @@ var store = (current, subscribers = /* @__PURE__ */ new Set()) => {
   return { subscribe, update, set: set2, get };
 };
 
+// ../../node_modules/.pnpm/klona@2.0.6/node_modules/klona/full/index.mjs
+function set(obj, key, val) {
+  if (typeof val.value === "object") val.value = klona(val.value);
+  if (!val.enumerable || val.get || val.set || !val.configurable || !val.writable || key === "__proto__") {
+    Object.defineProperty(obj, key, val);
+  } else obj[key] = val.value;
+}
+function klona(x) {
+  if (typeof x !== "object") return x;
+  var i = 0, k, list, tmp, str2 = Object.prototype.toString.call(x);
+  if (str2 === "[object Object]") {
+    tmp = Object.create(x.__proto__ || null);
+  } else if (str2 === "[object Array]") {
+    tmp = Array(x.length);
+  } else if (str2 === "[object Set]") {
+    tmp = /* @__PURE__ */ new Set();
+    x.forEach(function(val) {
+      tmp.add(klona(val));
+    });
+  } else if (str2 === "[object Map]") {
+    tmp = /* @__PURE__ */ new Map();
+    x.forEach(function(val, key) {
+      tmp.set(klona(key), klona(val));
+    });
+  } else if (str2 === "[object Date]") {
+    tmp = /* @__PURE__ */ new Date(+x);
+  } else if (str2 === "[object RegExp]") {
+    tmp = new RegExp(x.source, x.flags);
+  } else if (str2 === "[object DataView]") {
+    tmp = new x.constructor(klona(x.buffer));
+  } else if (str2 === "[object ArrayBuffer]") {
+    tmp = x.slice(0);
+  } else if (str2.slice(-6) === "Array]") {
+    tmp = new x.constructor(x);
+  }
+  if (tmp) {
+    for (list = Object.getOwnPropertySymbols(x); i < list.length; i++) {
+      set(tmp, list[i], Object.getOwnPropertyDescriptor(x, list[i]));
+    }
+    for (i = 0, list = Object.getOwnPropertyNames(x); i < list.length; i++) {
+      if (Object.hasOwnProperty.call(tmp, k = list[i]) && tmp[k] === x[k]) continue;
+      set(tmp, k, Object.getOwnPropertyDescriptor(x, k));
+    }
+  }
+  return tmp || x;
+}
+
 // src/translation.ts
 var RGX = /{{(.*?)}}/g;
 var split = (input, delimeters) => {
@@ -1103,6 +1102,14 @@ var huntAssets = ({ volume, lang, mode, characters, action, props, handle }) =>
     }
     return;
   }
+  if (action === "choice") {
+    for (let i = 1; i < props.length; i++) {
+      const data = props[i];
+      if (Array.isArray(data)) {
+        handle(handleImageAsset(data[4]));
+      }
+    }
+  }
 };
 
 // src/novely.ts
@@ -1126,6 +1133,7 @@ var novely = ({
   preloadAssets = "lazy",
   parallelAssetsDownloadLimit = 15,
   fetch: request = fetch,
+  cloneFunction: clone = klona,
   saveOnUnload = true,
   startKey = "start"
 }) => {
@@ -1178,6 +1186,28 @@ var novely = ({
         return renderer.actions[action2];
       }
       return (...props) => {
+        if (VIRTUAL_ACTIONS.has(action2)) {
+          if (action2 === "say") {
+            action2 = "dialog";
+            const [character] = props;
+            if (DEV3 && !characters[character]) {
+              throw new Error(`Attempt to call Say action with unknown character "${character}"`);
+            }
+          } else if (action2 === "choiceExtended") {
+            action2 = "choice";
+            const choices = props[1];
+            const mappedChoices = choices.map((choice) => [
+              choice.title,
+              choice.children,
+              choice.active,
+              choice.visible,
+              choice.image
+            ]);
+            for (let i = 0; i < mappedChoices.length; i++) {
+              props[i + 1] = mappedChoices[i];
+            }
+          }
+        }
         if (preloadAssets === "blocking") {
           huntAssets({
             action: action2,
@@ -1193,7 +1223,7 @@ var novely = ({
       };
     }
   });
-  const getDefaultSave = (state = {}) => {
+  const getDefaultSave = (state) => {
     return [
       [
         ["jump", startKey],
@@ -1215,7 +1245,7 @@ var novely = ({
   };
   const initialData = {
     saves: [],
-    data: klona(defaultData),
+    data: clone(defaultData),
     meta: [getLanguageWithoutParameters(), DEFAULT_TYPEWRITER_SPEED, 1, 1, 1]
   };
   const storageData = store(initialData);
@@ -1265,7 +1295,7 @@ var novely = ({
     storageData.set(stored);
   };
   storageDelay.then(getStoredData);
-  const initial = getDefaultSave(klona(defaultState));
+  const initial = getDefaultSave(clone(defaultState));
   const unsubscribeFromBrowserVisibilityChange = setupBrowserVisibilityChangeListeners({
     onChange: throttledEmergencyOnStorageDataChange
   });
@@ -1273,7 +1303,7 @@ var novely = ({
     if (!coreData.get().dataLoaded) return;
     if (!autosaves && type === "auto") return;
     const stack = useStack(MAIN_CONTEXT_KEY);
-    const current = klona(stack.value);
+    const current = clone(stack.value);
     storageData.update((prev) => {
       const replace2 = () => {
         prev.saves[prev.saves.length - 1] = current;
@@ -1303,7 +1333,7 @@ var novely = ({
   };
   const newGame = () => {
     if (!coreData.get().dataLoaded) return;
-    const save2 = getDefaultSave(klona(defaultState));
+    const save2 = getDefaultSave(clone(defaultState));
     if (autosaves) {
       storageData.update((prev) => {
         return prev.saves.push(save2), prev;
@@ -1332,7 +1362,7 @@ var novely = ({
     if (!coreData.get().dataLoaded) return;
     let latest = save2 || storageData.get().saves.at(-1);
     if (!latest) {
-      latest = klona(initial);
+      latest = clone(initial);
       storageData.update((prev) => {
         prev.saves.push(latest);
         return prev;
@@ -1444,7 +1474,7 @@ var novely = ({
     const processor = createQueueProcessor(queue, {
       skip: EMPTY_SET
     });
-    useStack(ctx).push(klona(save2));
+    useStack(ctx).push(clone(save2));
     const assets = [];
     await processor.run(([action2, ...props]) => {
       if (isAudioAction(action2)) return;
@@ -1539,7 +1569,7 @@ var novely = ({
   const enmemory = (ctx) => {
     if (ctx.meta.restoring) return;
     const stack = useStack(ctx);
-    const current = klona(stack.value);
+    const current = clone(stack.value);
     current[2][1] = "auto";
     stack.push(current);
     save("auto");
@@ -1567,8 +1597,9 @@ var novely = ({
       if (!isBlockingAction([action2, ...props])) return;
       try {
         const collection = collectActionsBeforeBlockingAction({
-          path: nextPath(klona(useStack(ctx).value[0])),
-          refer
+          path: nextPath(clone(useStack(ctx).value[0])),
+          refer,
+          clone
         });
         for (const [action3, ...props2] of collection) {
           huntAssets({
@@ -1686,15 +1717,6 @@ var novely = ({
         forward
       );
     },
-    say({ ctx, data: data2 }, [character, content]) {
-      if (DEV3 && !characters[character]) {
-        throw new Error(`Attempt to call Say action with unknown character "${character}"`);
-      }
-      match("dialog", [character, content], {
-        ctx,
-        data: data2
-      });
-    },
     function({ ctx, push }, [fn]) {
       const { restoring, goingBack, preview: preview2 } = ctx.meta;
       const result = fn({
@@ -1715,15 +1737,20 @@ var novely = ({
         choices.unshift(question);
         question = "";
       }
-      const transformedChoices = choices.map(([content, action2, visible]) => {
-        const shown = !visible || visible({
+      const transformedChoices = choices.map(([content, action2, active, visible, image]) => {
+        const activeValue = !active || active({
+          lang: getLanguageFromStore(storageData),
+          state: getStateAtCtx(ctx)
+        });
+        const visibleValue = !visible || visible({
           lang: getLanguageFromStore(storageData),
           state: getStateAtCtx(ctx)
         });
-        if (DEV3 && action2.length === 0 && !shown) {
+        const imageValue = image ? handleImageAsset(image) : "";
+        if (DEV3 && action2.length === 0 && (!activeValue && !visibleValue)) {
           console.warn(`Choice children should not be empty, either add content there or make item not selectable`);
         }
-        return [templateReplace(content, data2), shown];
+        return [templateReplace(content, data2), activeValue, visibleValue, imageValue];
       });
       if (DEV3 && transformedChoices.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]`);
@@ -1950,7 +1977,7 @@ var novely = ({
     c: null
   };
   const getCurrentStorageData = () => {
-    return coreData.get().dataLoaded ? klona(storageData.get()) : null;
+    return coreData.get().dataLoaded ? clone(storageData.get()) : null;
   };
   const setStorageData = (data2) => {
     if (destroyed) {