@novely/core 0.42.0 → 0.44.0

package/dist/index.d.ts

@@ -602,6 +602,10 @@ type CustomHandlerFunctionParameters<L extends string, S extends State> = {
      * Renderer Context
      */
     rendererContext: Context;
+    /**
+     * Context key in which action is running
+     */
+    contextKey: string;
     /**
      * Function to work with custom action's state
      */
@@ -809,7 +813,7 @@ type ActionProxy<Characters extends Record<string, Character>, Languages extends
 type DefaultActionProxy = ActionProxy<Record<string, Character>, Lang, State>;
 type GetActionParameters<T extends Capitalize<keyof DefaultActionProxy>> = Parameters<DefaultActionProxy[Uncapitalize<T>]>;
 type VirtualActions<Characters extends Record<string, Character>, Languages extends Lang, S extends State> = {
-    choiceExtended: (question: TextContent<Languages, S>, choices: ActionChoiceExtendedChoice<Languages, State>[]) => ValidAction;
+    choice: (question: TextContent<Languages, S>, ...choices: ActionChoiceExtendedChoice<Languages, State>[]) => ValidAction;
     say: (character: keyof Characters, content: TextContent<Languages, S>) => ValidAction;
 };
 

package/dist/index.global.js

@@ -35,7 +35,6 @@ var Novely = (() => {
   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",
@@ -1081,7 +1080,8 @@ var Novely = (() => {
       remove,
       rendererContext: ctx,
       getDomNodes,
-      getPath
+      getPath,
+      contextKey: ctx.id
     });
   };
 
@@ -1429,25 +1429,23 @@ var Novely = (() => {
           return renderer.actions[action2];
         }
         return (...props) => {
-          if (VIRTUAL_ACTIONS.has(action2)) {
-            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 === "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 (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") {
+            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
+                ];
               }
             }
           }