@novely/core 0.30.3 → 0.31.1

package/dist/index.d.ts

@@ -176,18 +176,19 @@ type Renderer = {
             unmount(): void;
         };
     };
+    actions: Record<string, (...args: any[]) => ValidAction>;
     getContext: (context: string) => Context;
     removeContext: (context: string) => void;
 };
-type RendererInit = {
-    characters: Record<string, Character<Lang>>;
+type RendererInit<$Language extends Lang, $Characters extends Record<string, Character<$Language>>> = {
+    characters: $Characters;
     set: (save: Save<State>) => Promise<void>;
     restore: (save?: Save<State>) => Promise<void>;
     save: (type: Save<State>[2][1]) => void;
     newGame: () => void;
     exit: (force?: boolean) => void;
     back: () => Promise<void>;
-    languages: Lang[];
+    languages: $Language[];
     /**
      * Translation function
      */
@@ -275,7 +276,10 @@ type TranslationDescription = {
     plural?: Record<string, Pluralization>;
     actions?: TranslationActions;
 };
-interface NovelyInit<$Language extends Lang, Characters extends Record<string, Character<NoInfer<$Language>>>, StateScheme extends State, DataScheme extends Data> {
+type DefaultEmotions<$Characters extends Record<string, Character<Lang>>> = {
+    [Character in keyof $Characters]?: (keyof $Characters[Character]['emotions'] & string);
+};
+interface NovelyInit<$Language extends Lang, $Characters extends Record<string, Character<NoInfer<$Language>>>, $State extends State, $Data extends Data, $Actions extends Record<string, (...args: any[]) => ValidAction>> {
     /**
      * An object containing the characters in the game.
      * @example
@@ -294,7 +298,7 @@ interface NovelyInit<$Language extends Lang, Characters extends Record<string, C
      * })
      * ```
      */
-    characters: Characters;
+    characters: $Characters;
     /**
      * Define default emotions for characters
      * @example
@@ -322,9 +326,7 @@ interface NovelyInit<$Language extends Lang, Characters extends Record<string, C
      * })
      * ```
      */
-    defaultEmotions?: {
-        [Character in keyof NoInfer<Characters>]?: (keyof NoInfer<Characters>[Character]['emotions'] & string);
-    };
+    defaultEmotions?: DefaultEmotions<NoInfer<$Characters>>;
     /**
      * An object that provides access to the game's storage system.
      * @default localStorage // at key `novely-game-storage`
@@ -337,7 +339,9 @@ interface NovelyInit<$Language extends Lang, Characters extends Record<string, C
     /**
      * A function that returns a Renderer object used to display the game's content
      */
-    renderer: (initializationData: RendererInit) => Renderer;
+    renderer: (initializationData: RendererInit<NoInfer<$Language>, NoInfer<$Characters>>) => Renderer & {
+        actions: $Actions;
+    };
     /**
      * An optional property that specifies the initial screen to display when the game starts
      */
@@ -370,13 +374,13 @@ interface NovelyInit<$Language extends Lang, Characters extends Record<string, C
      *
      * State is a local value bound to one save
      */
-    state?: StateScheme;
+    state?: $State;
     /**
      * Initial data value
      *
      * Data is a global value shared between saves
      */
-    data?: DataScheme;
+    data?: $Data;
     /**
      * Enable autosaves or disable
      * @default true
@@ -461,6 +465,12 @@ type StateFunction<S extends State> = {
     (value: DeepPartial<S> | ((prev: S) => S)): void;
     (): S;
 };
+type TypeEssentials<$Lang extends Lang, $State extends State, $Data extends Data, $Characters extends Record<string, Character<$Lang>>> = {
+    readonly l: $Lang | null;
+    readonly s: $State | null;
+    readonly d: $Data | null;
+    readonly c: $Characters | null;
+};
 
 type Name<$Lang extends Lang> = string | Record<$Lang, string>;
 type Emotions<Emotion extends string = string> = Record<Emotion, string | string[]>;
@@ -479,7 +489,10 @@ type TextContent<L extends string, S extends State> = string | ((state: S) => st
 type FunctionableValue<T> = T | (() => T);
 type CustomHandlerGetResultDataFunction = (data?: Record<string, unknown>) => Record<string, unknown>;
 type CustomHandlerGetResult<I extends boolean> = {
-    delete: () => void;
+    /**
+     * Remove's custom handler instance
+     */
+    remove: () => void;
     /**
      * Данные
      */
@@ -496,6 +509,9 @@ type CustomHandlerGetResult<I extends boolean> = {
      * Устанавливает обработчик очистки
      */
     clear: (fn: () => void) => void;
+    __internals: {
+        ctx: Context;
+    };
 };
 type CustomHandlerFunctionGetFn = <I extends boolean = true>(insert?: I) => CustomHandlerGetResult<I>;
 type CustomHandlerFunctionParameters<L extends string, S extends State> = {
@@ -621,9 +637,9 @@ 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 ConditionParams<T> = T extends ActionProxy<Record<string, Character>, Lang, infer $State> ? Parameters<ConditionCheckFunction<$State, string | boolean>>[0] : never;
+type ConditionParams<T> = T extends TypeEssentials<any, infer $State, any, any> ? $State : never;
 
-declare const novely: <$Language extends string, Characters extends Record<string, Character<$Language>>, StateScheme extends State, DataScheme extends Data>({ characters, defaultEmotions, 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>) => {
+declare const novely: <$Language extends string, $Characters extends Record<string, Character<$Language>>, $State extends State, $Data extends Data, $Actions extends Record<string, (...args: any[]) => ValidAction>>({ characters, defaultEmotions, 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, $State, $Data, $Actions>) => {
     /**
      * Function to set game script
      *
@@ -649,7 +665,7 @@ declare const novely: <$Language extends string, Characters extends Record<strin
      * })
      * ```
      */
-    action: ActionProxy<Characters, $Language, StateScheme>;
+    action: $Actions & ActionProxy<$Characters, $Language, $State>;
     /**
      * @deprecated Will be removed BUT replaced with state passed into actions as a parameter
      */
@@ -670,11 +686,20 @@ declare const novely: <$Language extends string, Characters extends Record<strin
      * })
      * ```
      */
-    data: StateFunction<DataScheme>;
+    data: StateFunction<$Data>;
     /**
-     * @deprecated Renamed into `templateReplace`
+     * Used in combination with type utilities
+     *
+     * @example
+     * ```ts
+     * import type { ConditionParams, StateFunction } from '@novely/core';
+ *
+     * const conditionCheck = (state: StateFunction<ConditionParams<typeof engine.typeEssintials>>) => {
+     *   return state.age >= 18;
+     * }
+     * ```
      */
-    unwrap(content: TextContent<$Language, DataScheme>): string;
+    typeEssentials: TypeEssentials<$Language, $State, $Data, $Characters>;
     /**
      * Replaces content inside {{braces}} with using global data
      * @example
@@ -687,7 +712,7 @@ declare const novely: <$Language extends string, Characters extends Record<strin
      * })
      * ```
      */
-    templateReplace(content: TextContent<$Language, DataScheme>): string;
+    templateReplace(content: TextContent<$Language, $Data>): string;
     /**
      * Cancel data loading, hide UI, ignore page change events
      * Data updates still will work in case Novely already was loaded

package/dist/index.global.js

@@ -462,7 +462,9 @@ var Novely = (() => {
     const next = (i) => queue.slice(i + 1);
     for (const [i, item] of queue.entries()) {
       const [action, ...params] = item;
-      keep.add(action);
+      if (isUserRequiredAction(item) && !queue.slice(0, i + 1).some((action2) => isUserRequiredAction(action2))) {
+        keep.add(action);
+      }
       if (options.skip.has(item) && item !== options.skipPreserve) {
         continue;
       }
@@ -699,7 +701,7 @@ var Novely = (() => {
     return { subscribe, update, set, get };
   };
 
-  // ../../node_modules/.pnpm/@novely+deepmerge@0.0.0/node_modules/@novely/deepmerge/dist/index.js
+  // ../deepmerge/dist/index.js
   var { isArray } = Array;
   var { hasOwnProperty, propertyIsEnumerable, getOwnPropertySymbols } = Object;
   var propertyIsOnObject = (object, property) => {
@@ -710,7 +712,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)
@@ -962,6 +966,9 @@ var Novely = (() => {
     };
     const action = new Proxy({}, {
       get(_, action2) {
+        if (action2 in renderer.actions) {
+          return renderer.actions[action2];
+        }
         return (...props) => {
           if (preloadAssets === "blocking") {
             if (action2 === "showBackground") {
@@ -1144,11 +1151,10 @@ var Novely = (() => {
       const [path] = stack.value = latest;
       renderer.ui.showScreen("game");
       const { queue, skip, skipPreserve } = getActionsFromPath(story, path, false);
-      const processor = createQueueProcessor(queue, {
+      const { run, keep: { keep, characters: characters2, audio } } = createQueueProcessor(queue, {
         skip,
         skipPreserve
       });
-      const { keep, characters: characters2, audio } = processor.keep;
       if (previous) {
         const { queue: prevQueue } = getActionsFromPath(story, previous[0], false);
         for (let i = prevQueue.length - 1; i > queue.length - 1; i--) {
@@ -1168,7 +1174,7 @@ var Novely = (() => {
       });
       const lastQueueItem = queue.at(-1) || [];
       const lastQueueItemRequiresUserAction = isSkippedDuringRestore(lastQueueItem[0]) || isUserRequiredAction(lastQueueItem);
-      await processor.run((item) => {
+      await run((item) => {
         if (!latest)
           return;
         if (lastQueueItem === item && lastQueueItemRequiresUserAction) {
@@ -1711,6 +1717,12 @@ var Novely = (() => {
       });
       return void 0;
     };
+    const typeEssentials = {
+      l: null,
+      s: null,
+      d: null,
+      c: null
+    };
     return {
       /**
        * Function to set game script
@@ -1760,11 +1772,18 @@ var Novely = (() => {
        */
       data,
       /**
-       * @deprecated Renamed into `templateReplace`
+       * Used in combination with type utilities
+       *
+       * @example
+       * ```ts
+       * import type { ConditionParams, StateFunction } from '@novely/core';
+         *
+       * const conditionCheck = (state: StateFunction<ConditionParams<typeof engine.typeEssintials>>) => {
+       *   return state.age >= 18;
+       * }
+       * ```
        */
-      unwrap(content) {
-        return templateReplace(content);
-      },
+      typeEssentials,
       /**
        * Replaces content inside {{braces}} with using global data
        * @example