@novely/core 0.44.2 → 0.45.0

package/dist/index.d.ts

@@ -101,7 +101,7 @@ type Context = {
     character: (character: string) => CharacterHandle;
     background: (background: Record<string, string>) => void;
     dialog: (content: string, name: string, character: string | undefined, emotion: string | undefined, resolve: () => void) => void;
-    choices: (question: string, choices: [name: string, active: boolean, visible: boolean, image: string][], resolve: (selected: number) => void) => void;
+    choices: (question: string, choices: [name: string, active: Stored<boolean>, visible: Stored<boolean>, onselect: ChoiceOnSelectFunction, image: string][], resolve: (selected: number) => void) => void;
     input: (question: string, onInput: (meta: ActionInputOnInputMeta<Lang, State>) => void, setup: ActionInputSetup, resolve: () => void) => void;
     clear: (keep: Set<keyof DefaultActionProxy>, keepCharacters: Set<string>, keepAudio: {
         music: Set<string>;
@@ -707,7 +707,7 @@ interface ActionInputOnInputMeta<L extends string, S extends State> {
      */
     state: StateFunction<S>;
 }
-type FunctionActionProps<L extends string, S extends State> = {
+type FunctionActionProps<L extends Lang, S extends State> = {
     restoring: boolean;
     goingBack: boolean;
     preview: boolean;
@@ -720,7 +720,7 @@ type FunctionActionProps<L extends string, S extends State> = {
      */
     state: StateFunction<S>;
 };
-type ChoiceCheckFunctionProps<L extends string, S extends State> = {
+type ChoiceCheckFunctionProps<L extends Lang, S extends State> = {
     /**
      * Language
      */
@@ -730,25 +730,28 @@ type ChoiceCheckFunctionProps<L extends string, S extends State> = {
      */
     state: S;
 };
-type ChoiceCheckFunction<L extends string, S extends State> = (props: ChoiceCheckFunctionProps<L, S>) => boolean;
+type ChoiceCheckFunction<L extends Lang, S extends State> = (props: ChoiceCheckFunctionProps<L, S>) => boolean;
+type ChoiceOnSelectFunction = () => Thenable<void>;
 type ConditionCheckFunction<S extends State, R extends string | true | false> = (state: S) => R;
 type FunctionAction<L extends string, S extends State> = (props: FunctionActionProps<L, S>) => Thenable<void>;
 type ActionInputSetupCleanup = () => void;
 type ActionInputSetup = (input: HTMLInputElement) => ActionInputSetupCleanup | void;
 type BackgroundImage = Record<string, string | NovelyAsset>;
 type VoiceAction<L extends Lang> = (params: string | NovelyAsset | Partial<Record<L, string | NovelyAsset>>) => ValidAction;
-type ActionChoiceChoiceObject<Languages extends Lang, S extends State> = {
-    title: TextContent<Languages, S>;
+type ActionChoiceChoiceObject<L extends Lang, S extends State> = {
+    title: TextContent<L, S>;
     children: ValidAction[];
-    active?: ChoiceCheckFunction<Languages, S>;
-    visible?: ChoiceCheckFunction<Languages, S>;
+    active?: ChoiceCheckFunction<L, S>;
+    visible?: ChoiceCheckFunction<L, S>;
+    onSelect?: ChoiceOnSelectFunction;
     image?: string | NovelyAsset;
 };
-type ActionChoiceChoice<Languages extends Lang, S extends State> = [
-    title: TextContent<Languages, S>,
+type ActionChoiceChoice<L extends Lang, S extends State> = [
+    title: TextContent<L, S>,
     actions: ValidAction[],
-    active?: ChoiceCheckFunction<Languages, S>,
-    visible?: ChoiceCheckFunction<Languages, S>,
+    active?: ChoiceCheckFunction<L, S>,
+    visible?: ChoiceCheckFunction<L, S>,
+    onSelect?: ChoiceOnSelectFunction,
     image?: string | NovelyAsset
 ];
 type ActionProxy<Characters extends Record<string, Character>, Languages extends Lang, S extends State> = {
@@ -974,4 +977,4 @@ declare const extendAction: <Part0 extends Record<string, (...args: any[]) => Va
  */
 declare const asset: (...variants: string[]) => NovelyAsset;
 
-export { type ActionChoiceChoice, type ActionChoiceChoiceObject, type ActionInputOnInputMeta, type ActionInputSetup, type ActionInputSetupCleanup, type ActionProxy, type AllowedContent, type AudioHandle, type BackgroundImage, type BaseTranslationStrings, type Character, type CharacterAssetSizes, type CharacterHandle, type CharactersData, type ChoiceCheckFunction, type ChoiceParams, type ConditionParams, type Context, type CoreData, type CustomActionHandle, type CustomHandler, type CustomHandlerFunctionGetFn, type CustomHandlerFunctionParameters, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type Data, type DeepPartial, type DefaultActionProxy, EN, type Emotions, type FunctionParams, type FunctionableValue, type GetActionParameters, type InputHandler, JP, KK, type Lang, type NovelyInit, type NovelyScreen, type NovelyStorage, type Path, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type RendererInitPreviewReturn, type Save, type Stack, type StackHolder, type State, type StateFunction, type StorageData, type StorageMeta, type Stored, type Story, type TextContent, type Thenable, type TranslationActions, type TypeEssentials, type TypewriterSpeed, type ValidAction, asset, extendAction, localStorageStorage, novely };
+export { type ActionChoiceChoice, type ActionChoiceChoiceObject, type ActionInputOnInputMeta, type ActionInputSetup, type ActionInputSetupCleanup, type ActionProxy, type AllowedContent, type AudioHandle, type BackgroundImage, type BaseTranslationStrings, type Character, type CharacterAssetSizes, type CharacterHandle, type CharactersData, type ChoiceCheckFunction, type ChoiceCheckFunctionProps, type ChoiceOnSelectFunction, type ChoiceParams, type ConditionCheckFunction, type ConditionParams, type Context, type CoreData, type CustomActionHandle, type CustomHandler, type CustomHandlerFunction, type CustomHandlerFunctionGetFn, type CustomHandlerFunctionParameters, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type CustomHandlerInfo, type Data, type DeepPartial, type DefaultActionProxy, EN, type Emotions, type FunctionParams, type FunctionableValue, type GetActionParameters, type InputHandler, JP, KK, type Lang, type NovelyInit, type NovelyScreen, type NovelyStorage, type Path, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type RendererInitPreviewReturn, type Save, type Stack, type StackHolder, type State, type StateFunction, type StorageData, type StorageMeta, type Stored, type Story, type TextContent, type Thenable, type TranslationActions, type TypeEssentials, type TypewriterSpeed, type ValidAction, asset, extendAction, localStorageStorage, novely };

package/dist/index.global.js

@@ -364,16 +364,16 @@ var Novely = (() => {
   var isAction = (element) => {
     return Array.isArray(element) && isString(element[0]);
   };
+  var flatActions = (item) => {
+    return item.flatMap((data) => {
+      const type = data[0];
+      if (Array.isArray(type)) return flatActions(data);
+      return [data];
+    });
+  };
   var flattenStory = (story) => {
     const entries = Object.entries(story).map(([name, items]) => {
-      const flat = (item) => {
-        return item.flatMap((data) => {
-          const type = data[0];
-          if (Array.isArray(type)) return flat(data);
-          return [data];
-        });
-      };
-      return [name, flat(items)];
+      return [name, flatActions(items)];
     });
     return Object.fromEntries(entries);
   };
@@ -1441,9 +1441,10 @@ var Novely = (() => {
                 const choice = props[i];
                 props[i] = [
                   choice.title,
-                  choice.children,
+                  flatActions(choice.children),
                   choice.active,
                   choice.visible,
+                  choice.onSelect,
                   choice.image
                 ];
               }
@@ -1978,20 +1979,29 @@ var Novely = (() => {
           choices.unshift(question);
           question = "";
         }
-        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)
-          });
+        const transformedChoices = choices.map(([content, _children, active, visible, onSelect, image]) => {
+          const active$ = store(false);
+          const visible$ = store(false);
+          const update = () => {
+            const activeValue = !active || active({
+              lang: getLanguageFromStore(storageData),
+              state: getStateAtCtx(ctx)
+            });
+            const visibleValue = !visible || visible({
+              lang: getLanguageFromStore(storageData),
+              state: getStateAtCtx(ctx)
+            });
+            active$.set(activeValue);
+            visible$.set(visibleValue);
+          };
+          update();
+          const onSelectGuarded = onSelect || noop;
+          const onSelectWrapped = async () => {
+            await onSelectGuarded();
+            update();
+          };
           const imageValue = image ? handleImageAsset(image) : "";
-          if (DEV && 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), activeValue, visibleValue, imageValue];
+          return [templateReplace(content, data2), active$, visible$, onSelectWrapped, imageValue];
         });
         if (DEV && 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]`);