@novely/core 0.29.0 → 0.29.2

package/dist/index.d.ts

@@ -17,7 +17,7 @@ declare const localStorageStorage: (options: LocalStorageStorageSettings) => Sto
 
 type PluralType = Intl.LDMLPluralRule;
 type Pluralization = Partial<Record<PluralType, string>>;
-type AllowedContent = string | ((state: State) => string | string[]) | string[] | (string | ((state: State) => string | string[]))[];
+type AllowedContent = string | ((state: State | Data) => string | string[]) | string[] | (string | ((state: State | Data) => string | string[]))[];
 type TranslationActions = Partial<Record<string, (str: string) => string>>;
 
 declare const RU: {
@@ -215,6 +215,7 @@ type RendererInit = {
     preview: (save: Save<State>, name: string) => Promise<void>;
     removeContext: (name: string) => void;
     getStateFunction: (context: string) => StateFunction<State>;
+    getLanguageDisplayName: (lang: Lang) => string;
 };
 
 declare const getLanguage: (languages: string[]) => string;
@@ -275,6 +276,10 @@ type TranslationDescription = {
      * IETF BCP 47 language tag
      */
     tag?: string;
+    /**
+     * Custom name
+     */
+    nameOverride?: string;
     plural?: Record<string, Pluralization>;
     actions?: TranslationActions;
 };
@@ -409,6 +414,26 @@ interface NovelyInit<$Language extends Lang, Characters extends Record<string, C
      * @default true
      */
     saveOnUnload?: boolean | 'prod';
+    /**
+     * The key that signifies the start of the game. It is not recommended to override this parameter.
+     *
+     * @default 'start'
+     * @example
+     * ```ts
+     * const engine = novely({
+     *   ...,
+     *   startKey: 'PART_1'
+     * })
+     *
+     * engine.script({
+     *   // now game will start from here
+     *   PART_1: [
+     *
+     *   ]
+     * })
+     * ```
+     */
+    startKey?: 'start' | (string & Record<never, never>);
 }
 type StateFunction<S extends State> = {
     (value: DeepPartial<S> | ((prev: S) => S)): void;
@@ -515,10 +540,11 @@ type ChoiceCheckFunctionProps<L extends string, S extends State> = {
 type ChoiceCheckFunction<L extends string, S extends State> = {
     (props: ChoiceCheckFunctionProps<L, S>): boolean;
 };
+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 ActionInputSetup = (input: HTMLInputElement, cleanup: (cb: () => void) => void) => void;
 type BackgroundImage = Partial<Record<'portrait' | 'landscape' | 'all', string>> & Record<string, string>;
-type ActionProxy<Characters extends Record<string, Character>, Languages extends string, S extends State> = {
+type ActionProxy<Characters extends Record<string, Character>, Languages extends Lang, S extends State> = {
     choice: {
         (...choices: [name: TextContent<Languages, S>, actions: ValidAction[], active?: ChoiceCheckFunction<Languages, S>][]): ValidAction;
         (question: TextContent<Languages, S>, ...choices: [name: TextContent<Languages, S>, actions: ValidAction[], active?: ChoiceCheckFunction<Languages, S>][]): ValidAction;
@@ -527,7 +553,7 @@ type ActionProxy<Characters extends Record<string, Character>, Languages extends
         music: Set<string>;
         sounds: Set<string>;
     }) => ValidAction;
-    condition: <T extends string | true | false>(condition: (state: S) => T, variants: Record<T extends true ? 'true' : T extends false ? 'false' : T, ValidAction[]>) => ValidAction;
+    condition: <T extends string | true | false>(condition: ConditionCheckFunction<S, T>, variants: Record<T extends true ? 'true' : T extends false ? 'false' : T, ValidAction[]>) => ValidAction;
     exit: () => ValidAction;
     dialog: {
         <C extends keyof Characters>(character: C, content: TextContent<Languages, S>, emotion?: keyof Characters[C]['emotions']): ValidAction;
@@ -567,10 +593,12 @@ type ActionProxy<Characters extends Record<string, Character>, Languages extends
     preload: (source: string) => ValidAction;
     block: (scene: string) => ValidAction;
 };
-type DefaultActionProxy = ActionProxy<Record<string, Character>, string, State>;
+type DefaultActionProxy = ActionProxy<Record<string, Character>, Lang, State>;
 type GetActionParameters<T extends Capitalize<keyof DefaultActionProxy>> = Parameters<DefaultActionProxy[Uncapitalize<T>]>;
 
-declare const novely: <Languages extends string, Characters extends Record<string, Character<Languages>>, StateScheme extends State, DataScheme extends Data>({ characters, storage, storageDelay, renderer: createRenderer, initialScreen, translation, state: defaultState, data: defaultData, autosaves, migrations, throttleTimeout, getLanguage, overrideLanguage, askBeforeExit, preloadAssets, parallelAssetsDownloadLimit, fetch: request, saveOnUnload }: NovelyInit<Languages, Characters, StateScheme, DataScheme>) => {
+type ConditionParams<T> = T extends ActionProxy<Record<string, Character>, Lang, infer $State> ? Parameters<ConditionCheckFunction<$State, string | boolean>>[0] : never;
+
+declare const novely: <$Language extends string, Characters extends Record<string, Character<$Language>>, StateScheme extends State, DataScheme extends Data>({ characters, storage, storageDelay, renderer: createRenderer, initialScreen, translation, state: defaultState, data: defaultData, autosaves, migrations, throttleTimeout, getLanguage, overrideLanguage, askBeforeExit, preloadAssets, parallelAssetsDownloadLimit, fetch: request, saveOnUnload, startKey }: NovelyInit<$Language, Characters, StateScheme, DataScheme>) => {
     /**
      * Function to set game script
      *
@@ -596,7 +624,7 @@ declare const novely: <Languages extends string, Characters extends Record<strin
      * })
      * ```
      */
-    action: ActionProxy<Characters, Languages, StateScheme>;
+    action: ActionProxy<Characters, $Language, StateScheme>;
     /**
      * @deprecated Will be removed BUT replaced with state passed into actions as a parameter
      */
@@ -621,7 +649,7 @@ declare const novely: <Languages extends string, Characters extends Record<strin
     /**
      * @deprecated Renamed into `templateReplace`
      */
-    unwrap(content: TextContent<Languages, DataScheme>): string;
+    unwrap(content: TextContent<$Language, DataScheme>): string;
     /**
      * Replaces content inside {{braces}} with using global data
      * @example
@@ -634,7 +662,7 @@ declare const novely: <Languages extends string, Characters extends Record<strin
      * })
      * ```
      */
-    templateReplace(content: TextContent<Languages, DataScheme>): string;
+    templateReplace(content: TextContent<$Language, DataScheme>): string;
     /**
      * Cancel data loading, hide UI, ignore page change events
      * Data updates still will work in case Novely already was loaded
@@ -642,4 +670,4 @@ declare const novely: <Languages extends string, Characters extends Record<strin
     destroy(): void;
 };
 
-export { type ActionInputOnInputMeta, type ActionInputSetup, type ActionProxy, type AllowedContent, type AudioHandle, type BackgroundImage, type BaseTranslationStrings, type Character, type CharacterHandle, type Context, type CoreData, type CustomHandler, type CustomHandlerFunctionGetFn, type CustomHandlerFunctionParameters, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type Data, type DeepPartial, type DefaultActionProxy, EN, type Emotions, type FunctionableValue, type GetActionParameters, JP, KK, type Lang, type NovelyInit, type NovelyScreen, type Path, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type Save, type Stack, type StackHolder, type State, type StateFunction, type Storage, type StorageData, type StorageMeta, type Stored, type Story, type TextContent, type Thenable, type TranslationActions, type TypewriterSpeed, type ValidAction, localStorageStorage, novely };
+export { type ActionInputOnInputMeta, type ActionInputSetup, type ActionProxy, type AllowedContent, type AudioHandle, type BackgroundImage, type BaseTranslationStrings, type Character, type CharacterHandle, type ConditionParams, type Context, type CoreData, type CustomHandler, type CustomHandlerFunctionGetFn, type CustomHandlerFunctionParameters, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type Data, type DeepPartial, type DefaultActionProxy, EN, type Emotions, type FunctionableValue, type GetActionParameters, JP, KK, type Lang, type NovelyInit, type NovelyScreen, type Path, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type Save, type Stack, type StackHolder, type State, type StateFunction, type Storage, type StorageData, type StorageMeta, type Stored, type Story, type TextContent, type Thenable, type TranslationActions, type TypewriterSpeed, type ValidAction, localStorageStorage, novely };

package/dist/index.global.js

@@ -209,6 +209,7 @@ var Novely = (() => {
 
   // src/shared.ts
   var STACK_MAP = /* @__PURE__ */ new Map();
+  var PRELOADED_ASSETS = /* @__PURE__ */ new Set();
 
   // ../../node_modules/.pnpm/esm-env@1.0.0/node_modules/esm-env/prod-ssr.js
   var DEV = false;
@@ -486,7 +487,9 @@ var Novely = (() => {
           if (target !== params[0]) {
             return false;
           }
-          return _action === closing || _action === action;
+          const musicGonnaBePaused = action === "playMusic" && _action === "pauseMusic";
+          const soundGonnaBePaused = action === "playSound" && _action === "pauseSound";
+          return musicGonnaBePaused || soundGonnaBePaused || _action === closing || _action === action;
         });
         if (skip)
           continue;
@@ -626,6 +629,19 @@ var Novely = (() => {
     }
     return "other";
   };
+  var capitalize = (str2) => {
+    return str2[0].toUpperCase() + str2.slice(1);
+  };
+  var getIntlLanguageDisplayName = (lang) => {
+    try {
+      const intl = new Intl.DisplayNames([lang], {
+        type: "language"
+      });
+      return intl.of(lang) || lang;
+    } catch {
+      return lang;
+    }
+  };
 
   // ../../node_modules/.pnpm/dequal@2.0.3/node_modules/dequal/lite/index.mjs
   var has = Object.prototype.hasOwnProperty;
@@ -659,9 +675,6 @@ var Novely = (() => {
     return foo !== foo && bar !== bar;
   }
 
-  // src/global.ts
-  var PRELOADED_ASSETS = /* @__PURE__ */ new Set();
-
   // src/store.ts
   var store = (current, subscribers = /* @__PURE__ */ new Set()) => {
     const subscribe = (cb) => {
@@ -697,7 +710,9 @@ var Novely = (() => {
     }
   };
   var propertyIsUnsafe = (target, key) => {
-    return propertyIsOnObject(target, key) && !(hasOwnProperty.call(target, key) && propertyIsEnumerable.call(target, key));
+    return propertyIsOnObject(target, key) && // Properties are safe to merge if they don't exist in the target yet,
+    !(hasOwnProperty.call(target, key) && // unsafe if they exist up the prototype chain,
+    propertyIsEnumerable.call(target, key));
   };
   var getEnumerableOwnPropertySymbols = (target) => {
     if (!getOwnPropertySymbols)
@@ -809,10 +824,10 @@ var Novely = (() => {
     }
     return c;
   };
-  var replace = (str2, obj, pluralization, actions, pr) => {
-    return str2.replaceAll(RGX, (x, key, y) => {
+  var replace = (input, data, pluralization, actions, pr) => {
+    return input.replaceAll(RGX, (x, key, y) => {
       x = 0;
-      y = obj;
+      y = data;
       const [pathstr, plural, action] = split(key.trim(), ["@", "%"]);
       if (!pathstr) {
         return "";
@@ -823,7 +838,7 @@ var Novely = (() => {
       if (plural && pluralization && y && pr) {
         y = pluralization[plural][pr.select(y)];
       }
-      const actionHandler = actions && action && actions[action];
+      const actionHandler = actions && action ? actions[action] : void 0;
       if (actionHandler)
         y = actionHandler(y);
       return y == null ? "" : y;
@@ -851,6 +866,23 @@ var Novely = (() => {
     };
   };
 
+  // src/browser.ts
+  var setupBrowserVisibilityChangeListeners = ({ onChange }) => {
+    if (typeof document === "undefined")
+      return noop;
+    const onVisibilityChange = () => {
+      if (document.visibilityState === "hidden") {
+        onChange();
+      }
+    };
+    addEventListener("visibilitychange", onVisibilityChange);
+    addEventListener("beforeunload", onChange);
+    return () => {
+      removeEventListener("visibilitychange", onVisibilityChange);
+      removeEventListener("beforeunload", onChange);
+    };
+  };
+
   // src/novely.ts
   var import_p_limit = __toESM(require_p_limit(), 1);
   var novely = ({
@@ -871,7 +903,8 @@ var Novely = (() => {
     preloadAssets = "lazy",
     parallelAssetsDownloadLimit = 15,
     fetch: request = fetch,
-    saveOnUnload = true
+    saveOnUnload = true,
+    startKey = "start"
   }) => {
     const languages = Object.keys(translation);
     const limitScript = (0, import_p_limit.default)(1);
@@ -967,7 +1000,7 @@ var Novely = (() => {
     const getDefaultSave = (state = {}) => {
       return [
         [
-          ["jump", "start"],
+          ["jump", startKey],
           [null, 0]
         ],
         state,
@@ -1035,13 +1068,9 @@ var Novely = (() => {
     };
     storageDelay.then(getStoredData);
     const initial = getDefaultSave(klona(defaultState));
-    const onVisibilityChange = () => {
-      if (document.visibilityState === "hidden") {
-        throttledEmergencyOnStorageDataChange();
-      }
-    };
-    addEventListener("visibilitychange", onVisibilityChange);
-    addEventListener("beforeunload", throttledEmergencyOnStorageDataChange);
+    const unsubscribeFromBrowserVisibilityChange = setupBrowserVisibilityChangeListeners({
+      onChange: throttledEmergencyOnStorageDataChange
+    });
     const save = (type) => {
       if (!coreData.get().dataLoaded)
         return;
@@ -1204,7 +1233,11 @@ var Novely = (() => {
     };
     const back = async () => {
       const stack = useStack(MAIN_CONTEXT_KEY);
+      const valueBeforeBack = stack.value;
       stack.back();
+      if (dequal(valueBeforeBack, stack.value) && !stack.previous) {
+        return;
+      }
       await restore(stack.value);
     };
     const t = (key, lang) => {
@@ -1217,7 +1250,7 @@ var Novely = (() => {
       ctx.meta.restoring = true;
       ctx.meta.preview = true;
       const processor = createQueueProcessor(queue, {
-        skip: /* @__PURE__ */ new Set()
+        skip: EMPTY_SET
       });
       useStack(ctx).push(klona(save2));
       await processor.run(([action2, ...props]) => {
@@ -1253,6 +1286,13 @@ var Novely = (() => {
       };
       return state;
     };
+    const getLanguageDisplayName = (lang) => {
+      const language = translation[lang];
+      if (DEV && !language) {
+        throw new Error(`Attempt to use unsupported language "${language}". Supported languages: ${languages.join(", ")}.`);
+      }
+      return capitalize(language.nameOverride || getIntlLanguageDisplayName(lang));
+    };
     const renderer = createRenderer({
       mainContextKey: MAIN_CONTEXT_KEY,
       characters,
@@ -1268,7 +1308,8 @@ var Novely = (() => {
       getStateFunction,
       languages,
       storageData,
-      coreData
+      coreData,
+      getLanguageDisplayName
     });
     const useStack = createUseStackFunction(renderer);
     useStack(MAIN_CONTEXT_KEY).push(initial);
@@ -1620,6 +1661,11 @@ var Novely = (() => {
           ctx,
           data: stack.value[1]
         });
+      } else if (Object.values(story).some((branch) => branch === referred)) {
+        match("end", [], {
+          ctx,
+          data: stack.value[1]
+        });
       } else {
         match("exit", [], {
           ctx,
@@ -1631,14 +1677,10 @@ var Novely = (() => {
       interacted = value ? interacted + 1 : 0;
     };
     const templateReplace = (content, values) => {
-      const {
-        data: data2,
-        meta: [lang]
-      } = storageData.get();
+      const { data: data2, meta: [lang] } = storageData.get();
       const obj = values || data2;
-      const cnt = isFunction(content) ? content(obj) : typeof content === "string" ? content : content[lang];
       const str2 = flattenAllowedContent(
-        isFunction(cnt) ? cnt(obj) : cnt,
+        !isFunction(content) && !isString(content) ? content[lang] : content,
         obj
       );
       const t2 = translation[lang];
@@ -1738,8 +1780,7 @@ var Novely = (() => {
       destroy() {
         dataLoaded.cancel();
         UIInstance.unmount();
-        removeEventListener("visibilitychange", onVisibilityChange);
-        removeEventListener("beforeunload", throttledEmergencyOnStorageDataChange);
+        unsubscribeFromBrowserVisibilityChange();
       }
     };
   };