@novely/core 0.13.0 → 0.14.0

package/dist/index.d.ts

@@ -10,7 +10,7 @@ type Character<LanguageKeys extends string = string> = {
 };
 
 type Thenable<T> = T | Promise<T>;
-type PathItem = [null, number | string] | ['choice', number] | ['choice:exit'] | ['condition', string] | ['condition:exit'] | ['exit'] | ['block', string] | ['block:exit'];
+type PathItem = [null, number | string] | ['jump', string] | ['choice', number] | ['choice:exit'] | ['condition', string] | ['condition:exit'] | ['exit'] | ['block', string] | ['block:exit'];
 type Path = PathItem[];
 type State = Record<string, any>;
 type Data = Record<string, any>;
@@ -45,9 +45,9 @@ type CoreData = {
     dataLoaded: boolean;
 };
 
-type ValidAction = ['choice', [number]] | ['clear', [Set<keyof DefaultActionProxyProvider>?, Set<string>?]] | ['condition', [() => boolean, Record<string, ValidAction[]>]] | ['dialog', [string | undefined, Unwrappable, string | undefined]] | ['end', []] | ['showBackground', [string | NonEmptyRecord<BackgroundImage>]] | ['playMusic', [string]] | ['stopMusic', [string]] | ['jump', [string]] | ['showCharacter', [string, keyof Character['emotions'], string?, string?]] | ['hideCharacter', [string, string?, string?, number?]] | ['animateCharacter', [string, number, ...string[]]] | ['wait', [FunctionableValue<number>]] | ['function', [() => Thenable<void>]] | ['input', [string, (meta: ActionInputOnInputMeta) => void, ActionInputSetup?]] | ['custom', [CustomHandler]] | ['vibrate', [...number[]]] | ['next', []] | ['text', [...string[]]] | ['exit', []] | ['preload', [string]] | ['block', [string]] | ValidAction[];
+type ValidAction = ['choice', [number]] | ['clear', [Set<keyof DefaultActionProxyProvider>?, Set<string>?]] | ['condition', [() => boolean, Record<string, ValidAction[]>]] | ['dialog', [string | undefined, Unwrappable<string>, string | undefined]] | ['end', []] | ['showBackground', [string | NonEmptyRecord<BackgroundImage>]] | ['playMusic', [string]] | ['stopMusic', [string]] | ['jump', [string]] | ['showCharacter', [string, keyof Character['emotions'], string?, string?]] | ['hideCharacter', [string, string?, string?, number?]] | ['animateCharacter', [string, number, ...string[]]] | ['wait', [FunctionableValue<number>]] | ['function', [() => Thenable<void>]] | ['input', [string, (meta: ActionInputOnInputMeta) => void, ActionInputSetup?]] | ['custom', [CustomHandler]] | ['vibrate', [...number[]]] | ['next', []] | ['text', [...string[]]] | ['exit', []] | ['preload', [string]] | ['block', [string]] | ValidAction[];
 type Story = Record<string, ValidAction[]>;
-type Unwrappable = string | Record<string, string | (() => string)>;
+type Unwrappable<L extends string> = string | (() => string) | Record<L, string | (() => string)>;
 type FunctionableValue<T> = T | (() => T);
 type CustomHandlerGetResultDataFunction = {
     (data?: Record<string, unknown>): Record<string, unknown>;
@@ -101,18 +101,18 @@ interface ActionInputOnInputMeta {
 }
 type ActionInputSetup = (input: HTMLInputElement, cleanup: (cb: () => void) => void) => void;
 type BackgroundImage = Partial<Record<"portrait" | "landscape" | "all", string>> & Record<(string), string>;
-type ActionProxyProvider<Characters extends Record<string, Character>> = {
+type ActionProxyProvider<Characters extends Record<string, Character>, Languages extends string> = {
     choice: {
-        (...choices: ([Unwrappable, ValidAction[]] | [Unwrappable, ValidAction[], () => boolean])[]): ValidAction;
-        (question: Unwrappable, ...choices: ([Unwrappable, ValidAction[]] | [Unwrappable, ValidAction[], () => boolean])[]): ValidAction;
+        (...choices: ([Unwrappable<Languages>, ValidAction[]] | [Unwrappable<Languages>, ValidAction[], () => boolean])[]): ValidAction;
+        (question: Unwrappable<Languages>, ...choices: ([Unwrappable<Languages>, ValidAction[]] | [Unwrappable<Languages>, ValidAction[], () => boolean])[]): ValidAction;
     };
     clear: (keep?: Set<keyof DefaultActionProxyProvider>, keepCharacters?: Set<string>) => ValidAction;
     condition: <T extends string | true | false>(condition: () => T, variants: Record<T extends true ? 'true' : T extends false ? 'false' : T, ValidAction[]>) => ValidAction;
     exit: () => ValidAction;
     dialog: {
-        <C extends keyof Characters>(person: C, content: Unwrappable, emotion?: keyof Characters[C]['emotions']): ValidAction;
-        (person: undefined, content: Unwrappable, emotion?: undefined): ValidAction;
-        (person: string, content: Unwrappable, emotion?: undefined): ValidAction;
+        <C extends keyof Characters>(person: C, content: Unwrappable<Languages>, emotion?: keyof Characters[C]['emotions']): ValidAction;
+        (person: undefined, content: Unwrappable<Languages>, emotion?: undefined): ValidAction;
+        (person: string, content: Unwrappable<Languages>, emotion?: undefined): ValidAction;
     };
     end: () => ValidAction;
     showBackground: <T extends string | BackgroundImage>(background: T extends string ? T : T extends Record<PropertyKey, unknown> ? NonEmptyRecord<T> : never) => ValidAction;
@@ -126,15 +126,15 @@ type ActionProxyProvider<Characters extends Record<string, Character>> = {
     animateCharacter: (character: keyof Characters, timeout: number, ...classes: string[]) => ValidAction;
     wait: (time: FunctionableValue<number>) => ValidAction;
     function: (fn: (restoring: boolean, goingBack: boolean) => Thenable<void>) => ValidAction;
-    input: (question: Unwrappable, onInput: (meta: ActionInputOnInputMeta) => void, setup?: ActionInputSetup) => ValidAction;
+    input: (question: Unwrappable<Languages>, onInput: (meta: ActionInputOnInputMeta) => void, setup?: ActionInputSetup) => ValidAction;
     custom: (handler: CustomHandler) => ValidAction;
     vibrate: (...pattern: number[]) => ValidAction;
     next: () => ValidAction;
-    text: (...text: Unwrappable[]) => ValidAction;
+    text: (...text: Unwrappable<Languages>[]) => ValidAction;
     preload: (source: string) => ValidAction;
     block: (scene: string) => ValidAction;
 };
-type DefaultActionProxyProvider = ActionProxyProvider<Record<string, Character>>;
+type DefaultActionProxyProvider = ActionProxyProvider<Record<string, Character>, string>;
 type GetActionParameters<T extends Capitalize<keyof DefaultActionProxyProvider>> = Parameters<DefaultActionProxyProvider[Uncapitalize<T>]>;
 
 declare const RU: {
@@ -234,7 +234,11 @@ type Renderer = {
         /**
          * Shows the screen
          */
-        showScreen(name: 'mainmenu' | 'game' | 'saves' | 'settings' | 'loading'): void;
+        showScreen(name: NovelyScreen | 'loading'): void;
+        /**
+         * Returns current screen
+         */
+        getScreen(): NovelyScreen | 'loading' | (string & Record<never, never>);
         /**
          * Shows prompt to exit
          */
@@ -382,11 +386,11 @@ declare const novely: <Languages extends string, Characters extends Record<strin
     /**
      * Function to set story
      */
-    withStory: (s: Story) => Promise<void>;
+    withStory: (story: Story) => Promise<void>;
     /**
      * Function to get actions
      */
-    action: ActionProxyProvider<Characters>;
+    action: ActionProxyProvider<Characters, Languages>;
     /**
      * State that belongs to games
      */
@@ -404,7 +408,7 @@ declare const novely: <Languages extends string, Characters extends Record<strin
     /**
      * Unwraps translatable content to a string value
      */
-    unwrap(content: Unwrappable | Record<Languages, string>): string;
+    unwrap(content: string | (() => string) | Record<Languages, string> | Exclude<Record<Languages, string | (() => string)>, Record<string, string>>): string;
 };
 
-export { ActionProxyProvider, AllowedContent, AudioHandle, BaseTranslationStrings, Character, CharacterHandle, CoreData, CustomHandler, CustomHandlerGetResult, CustomHandlerGetResultDataFunction, DefaultActionProxyProvider, EN, Emotions, FunctionableValue, GetActionParameters, JP, KK, Lang, NovelyScreen, Path, PluralType, Pluralization, RU, Renderer, RendererInit, RendererStore, Storage, StorageData, StorageMeta, Stored, Story, Thenable, TranslationActions, TypewriterSpeed, Unwrappable, ValidAction, localStorageStorage, novely };
+export { type ActionProxyProvider, type AllowedContent, type AudioHandle, type BaseTranslationStrings, type Character, type CharacterHandle, type CoreData, type CustomHandler, type CustomHandlerGetResult, type CustomHandlerGetResultDataFunction, type DefaultActionProxyProvider, EN, type Emotions, type FunctionableValue, type GetActionParameters, JP, KK, type Lang, type NovelyScreen, type Path, type PluralType, type Pluralization, RU, type Renderer, type RendererInit, type RendererStore, type Storage, type StorageData, type StorageMeta, type Stored, type Story, type Thenable, type TranslationActions, type TypewriterSpeed, type Unwrappable, type ValidAction, localStorageStorage, novely };

package/dist/index.global.js

@@ -107,13 +107,20 @@ var Novely = (() => {
     }
     return -1;
   };
-  var createDeferredPromise = () => {
+  var createControlledPromise = () => {
     let resolve, reject;
     const promise = new Promise((res, rej) => {
       resolve = res;
       reject = rej;
     });
-    return { resolve, reject, promise };
+    return {
+      resolve,
+      reject,
+      promise,
+      reset() {
+        Object.assign(this, createControlledPromise());
+      }
+    };
   };
   var findLastPathItemBeforeItemOfType = (path, name) => {
     const index = findLastIndex(path, ([_name, _value], next) => {
@@ -135,6 +142,20 @@ var Novely = (() => {
   var isAction = (element) => {
     return Array.isArray(element) && isString(element[0]);
   };
+  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 Object.fromEntries(entries);
+  };
 
   // src/global.ts
   var PRELOADED_ASSETS = /* @__PURE__ */ new Set();
@@ -344,29 +365,20 @@ var Novely = (() => {
     askBeforeExit = true,
     preloadAssets = "lazy"
   }) => {
-    let story;
+    const story = {};
     const times = /* @__PURE__ */ new Set();
     const ASSETS_TO_PRELOAD = /* @__PURE__ */ new Set();
-    const assetsLoaded = createDeferredPromise();
+    const assetsLoaded = createControlledPromise();
     defaultData ||= {};
     defaultState ||= {};
     const intime = (value) => {
       return times.add(value), value;
     };
-    const withStory = async (s) => {
-      story = Object.fromEntries(
-        Object.entries(s).map(([name, items]) => {
-          const flat = (item) => {
-            return item.flatMap((data2) => {
-              const type = data2[0];
-              if (Array.isArray(type))
-                return flat(data2);
-              return [data2];
-            });
-          };
-          return [name, flat(items)];
-        })
-      );
+    const script = (part) => {
+      Object.assign(story, flattenStory(part));
+    };
+    const withStory = async (story2) => {
+      script(story2);
       if (preloadAssets === "blocking" && ASSETS_TO_PRELOAD.size > 0) {
         renderer.ui.showScreen("loading");
         await renderer.misc.preloadImagesBlocking(ASSETS_TO_PRELOAD);
@@ -408,7 +420,7 @@ var Novely = (() => {
     const getDefaultSave = (state2 = {}) => {
       return [
         [
-          [null, "start"],
+          ["jump", "start"],
           [null, 0]
         ],
         state2,
@@ -557,7 +569,10 @@ var Novely = (() => {
       const characters2 = /* @__PURE__ */ new Set();
       const blocks = [];
       for (const [type, val] of path) {
-        if (type === null) {
+        if (type === "jump") {
+          precurrent = story;
+          current = current[val];
+        } else if (type === null) {
           precurrent = current;
           if (isNumber(val)) {
             index++;
@@ -654,7 +669,11 @@ var Novely = (() => {
       let precurrent = story;
       const blocks = [];
       for (const [type, val] of path) {
-        if (type === null) {
+        console.log(type, val);
+        if (type === "jump") {
+          precurrent = story;
+          current = current[val];
+        } else if (type === null) {
           precurrent = current;
           current = current[val];
         } else if (type === "choice") {
@@ -785,7 +804,7 @@ var Novely = (() => {
       },
       jump([scene]) {
         stack.value[0] = [
-          [null, scene],
+          ["jump", scene],
           [null, -1]
         ];
         match("clear", []);
@@ -916,7 +935,7 @@ var Novely = (() => {
     const next = () => {
       const path = stack.value[0];
       const last = path.at(-1);
-      if (last && isNull(last[0]) && isNumber(last[1])) {
+      if (last && (isNull(last[0]) || last[0] === "jump") && isNumber(last[1])) {
         last[1]++;
       } else {
         path.push([null, 0]);
@@ -949,7 +968,7 @@ var Novely = (() => {
         meta: [lang]
       } = $.get();
       const obj = global ? data2 : state();
-      const cnt = isFunction(content) ? content(lang, obj) : typeof content === "string" ? content : content[lang];
+      const cnt = isFunction(content) ? content() : typeof content === "string" ? content : content[lang];
       const str2 = isFunction(cnt) ? cnt() : cnt;
       const trans = translation[lang];
       if (trans.actions || trans.plural) {