@novely/core 0.41.0 → 0.43.0

package/dist/index.js

@@ -1,5 +1,5 @@
 // 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 AUDIO_ACTIONS = /* @__PURE__ */ new Set([
@@ -190,13 +190,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,
@@ -1103,6 +1101,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
@@ -1179,6 +1185,26 @@ var novely = ({
         return renderer.actions[action2];
       }
       return (...props) => {
+        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 === "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,
+                choice.children,
+                choice.active,
+                choice.visible,
+                choice.image
+              ];
+            }
+          }
+        }
         if (preloadAssets === "blocking") {
           huntAssets({
             action: action2,
@@ -1688,15 +1714,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({
@@ -1717,15 +1734,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]`);