@novely/core 0.12.5 → 0.14.0

package/dist/index.global.js

@@ -21,6 +21,10 @@ var Novely = (() => {
   // src/index.ts
   var src_exports = {};
   __export(src_exports, {
+    EN: () => EN,
+    JP: () => JP,
+    KK: () => KK,
+    RU: () => RU,
     localStorageStorage: () => localStorageStorage,
     novely: () => novely
   });
@@ -103,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) => {
@@ -131,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();
@@ -256,40 +281,79 @@ var Novely = (() => {
     return val;
   }
 
-  // ../t9n/dist/index.js
-  var g = (e, r) => {
-    let o = [];
-    for (let a of r) {
-      if (!e)
+  // src/translation.ts
+  var RGX = /{{(.*?)}}/g;
+  var split = (input, delimeters) => {
+    const output = [];
+    for (const delimeter of delimeters) {
+      if (!input)
         break;
-      let [n, i] = e.split(a, 2);
-      o.push(n), e = i;
+      const [start, end] = input.split(delimeter, 2);
+      output.push(start);
+      input = end;
     }
-    return o.push(e), o;
-  };
-  var c = /{{(.*?)}}/g;
-  var l = (e) => Array.isArray(e) ? e.map((r) => l(r)).join("<br>") : typeof e == "function" ? l(e()) : e;
-  var x = (e, r, o, a, n) => l(e).replaceAll(c, (i, s, t) => {
-    i = 0, t = r;
-    let [u, S, p] = g(s.trim(), ["@", "%"]);
-    if (!u)
-      return "";
-    let m = u.split(".");
-    for (; t && i < m.length; )
-      t = t[m[i++]];
-    S && o && t && n && (t = o[S][n.select(t)]);
-    let d = a && p && a[p];
-    return d && (t = d(t)), t ?? "";
-  });
+    output.push(input);
+    return output;
+  };
+  var unwrap = (c) => {
+    if (Array.isArray(c)) {
+      return c.map((item) => unwrap(item)).join("<br>");
+    }
+    if (typeof c === "function") {
+      return unwrap(c());
+    }
+    return c;
+  };
+  var replace = (str2, obj, pluralization, actions, pr) => {
+    return unwrap(str2).replaceAll(RGX, (x, key, y) => {
+      x = 0;
+      y = obj;
+      const [pathstr, plural, action] = split(key.trim(), ["@", "%"]);
+      if (!pathstr) {
+        return "";
+      }
+      const path = pathstr.split(".");
+      while (y && x < path.length)
+        y = y[path[x++]];
+      if (plural && pluralization && y && pr) {
+        y = pluralization[plural][pr.select(y)];
+      }
+      const actionHandler = actions && action && actions[action];
+      if (actionHandler)
+        y = actionHandler(y);
+      return y == null ? "" : y;
+    });
+  };
+
+  // src/storage.ts
+  var localStorageStorage = (options) => {
+    return {
+      async get() {
+        const fallback = { saves: [], data: {}, meta: [] };
+        try {
+          const value = localStorage.getItem(options.key);
+          return value ? JSON.parse(value) : fallback;
+        } catch {
+          return fallback;
+        }
+      },
+      async set(data) {
+        try {
+          localStorage.setItem(options.key, JSON.stringify(data));
+        } catch {
+        }
+      }
+    };
+  };
 
   // src/novely.ts
   var novely = ({
     characters,
-    storage,
+    storage = localStorageStorage({ key: "novely-game-storage" }),
     storageDelay = Promise.resolve(),
     renderer: createRenderer,
     initialScreen = "mainmenu",
-    t9n,
+    translation,
     languages,
     state: defaultState,
     data: defaultData,
@@ -301,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);
@@ -365,7 +420,7 @@ var Novely = (() => {
     const getDefaultSave = (state2 = {}) => {
       return [
         [
-          [null, "start"],
+          ["jump", "start"],
           [null, 0]
         ],
         state2,
@@ -410,6 +465,9 @@ var Novely = (() => {
         storage.set(value);
     };
     const throttledOnStorageDataChange = throttle(onStorageDataChange, throttleTimeout);
+    const throttledEmergencyOnStorageDataChange = throttle(() => {
+      onStorageDataChange($.get());
+    }, 10);
     $.subscribe(throttledOnStorageDataChange);
     const getStoredData = async () => {
       let stored = await storage.get();
@@ -437,12 +495,10 @@ var Novely = (() => {
     const stack = createStack(initial);
     addEventListener("visibilitychange", () => {
       if (document.visibilityState === "hidden") {
-        onStorageDataChange($.get());
+        throttledEmergencyOnStorageDataChange();
       }
     });
-    addEventListener("beforeunload", () => {
-      onStorageDataChange($.get());
-    });
+    addEventListener("beforeunload", throttledEmergencyOnStorageDataChange);
     const save = (override = false, type = override ? "auto" : "manual") => {
       if (!$$.get().dataLoaded)
         return;
@@ -513,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++;
@@ -610,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") {
@@ -649,6 +712,9 @@ var Novely = (() => {
     const back = () => {
       return stack.back(), restore(stack.value);
     };
+    const t = (key, lang) => {
+      return translation[lang].internal[key];
+    };
     const renderer = createRenderer({
       characters,
       set,
@@ -657,9 +723,9 @@ var Novely = (() => {
       newGame,
       exit,
       back,
+      t,
       stack,
       languages,
-      t: t9n.i,
       $,
       $$
     });
@@ -692,11 +758,11 @@ var Novely = (() => {
       },
       dialog([character, content, emotion]) {
         const name = (() => {
-          const c2 = character;
+          const c = character;
           const cs = characters;
           const lang = $.get().meta[0];
-          if (c2 && c2 in cs) {
-            const block = cs[c2].name;
+          if (c && c in cs) {
+            const block = cs[c].name;
             if (typeof block === "string") {
               return block;
             }
@@ -704,9 +770,9 @@ var Novely = (() => {
               return block[lang];
             }
           }
-          return c2 || "";
+          return c || "";
         })();
-        const run = renderer.dialog(unwrap(content), unwrap(name), character, emotion);
+        const run = renderer.dialog(unwrap2(content), unwrap2(name), character, emotion);
         run(forward, goingBack);
       },
       function([fn]) {
@@ -722,10 +788,10 @@ var Novely = (() => {
           question = "";
         }
         const unwrapped = choices.map(([content, action2, visible]) => {
-          return [unwrap(content), action2, visible];
+          return [unwrap2(content), action2, visible];
         });
         const run = renderer.choices(
-          unwrap(question),
+          unwrap2(question),
           unwrapped
         );
         run((selected) => {
@@ -738,7 +804,7 @@ var Novely = (() => {
       },
       jump([scene]) {
         stack.value[0] = [
-          [null, scene],
+          ["jump", scene],
           [null, -1]
         ];
         match("clear", []);
@@ -764,7 +830,7 @@ var Novely = (() => {
         times.clear();
       },
       input([question, onInput, setup]) {
-        renderer.input(unwrap(question), onInput, setup)(forward);
+        renderer.input(unwrap2(question), onInput, setup)(forward);
       },
       custom([handler]) {
         const result = renderer.custom(handler, goingBack, () => {
@@ -804,7 +870,7 @@ var Novely = (() => {
         match("custom", [handler]);
       },
       text(text) {
-        renderer.text(text.map((content) => unwrap(content)).join(" "), forward, goingBack);
+        renderer.text(text.map((content) => unwrap2(content)).join(" "), forward, goingBack);
       },
       exit() {
         if (restoring)
@@ -869,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]);
@@ -896,15 +962,19 @@ var Novely = (() => {
     const interactivity = (value = false) => {
       interacted = value ? interacted + 1 : 0;
     };
-    const unwrap = (content, global = false) => {
+    const unwrap2 = (content, global = false) => {
       const {
         data: data2,
         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;
-      return x(str2, obj);
+      const trans = translation[lang];
+      if (trans.actions || trans.plural) {
+        return replace(str2, obj, trans.plural, trans.actions, new Intl.PluralRules(trans.tag || lang));
+      }
+      return replace(str2, obj);
     };
     function data(value) {
       if (!value)
@@ -937,26 +1007,143 @@ var Novely = (() => {
        * Unwraps translatable content to a string value
        */
       unwrap(content) {
-        return unwrap(content, true);
-      },
-      /**
-       * Function that is used for translation
-       */
-      t: t9n.t
+        return unwrap2(content, true);
+      }
     };
   };
 
-  // src/storage.ts
-  var localStorageStorage = (options) => {
-    return {
-      async get() {
-        const value = localStorage.getItem(options.key);
-        return value ? JSON.parse(value) : { saves: [], data: {}, meta: [] };
-      },
-      async set(data) {
-        localStorage.setItem(options.key, JSON.stringify(data));
-      }
-    };
+  // src/translations.ts
+  var RU = {
+    NewGame: "\u041D\u043E\u0432\u0430\u044F \u0438\u0433\u0440\u0430",
+    HomeScreen: "\u0413\u043B\u0430\u0432\u043D\u044B\u0439 \u044D\u043A\u0440\u0430\u043D",
+    ToTheGame: "\u041A \u0438\u0433\u0440\u0435",
+    Language: "\u042F\u0437\u044B\u043A",
+    NoSaves: "\u0421\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0439 \u043D\u0435\u0442",
+    LoadSave: "\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C",
+    Saves: "\u0421\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u044F",
+    Settings: "\u041D\u0430\u0441\u0442\u0440\u043E\u0439\u043A\u0438",
+    Sumbit: "\u041F\u043E\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u044C",
+    GoBack: "\u041D\u0430\u0437\u0430\u0434",
+    DoSave: "\u0421\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435",
+    Auto: "\u0410\u0432\u0442\u043E",
+    Stop: "\u0421\u0442\u043E\u043F",
+    Exit: "\u0412\u044B\u0445\u043E\u0434",
+    Automatic: "\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u043E\u0435",
+    Manual: "\u0420\u0443\u0447\u043D\u043E\u0435",
+    Remove: "\u0423\u0434\u0430\u043B\u0438\u0442\u044C",
+    LoadASaveFrom: "\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044C \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435 \u043E\u0442",
+    DeleteASaveFrom: "\u0423\u0434\u0430\u043B\u0438\u0442\u044C \u0441\u043E\u0445\u0440\u0430\u043D\u0435\u043D\u0438\u0435 \u043E\u0442",
+    TextSpeed: "\u0421\u043A\u043E\u0440\u043E\u0441\u0442\u044C \u0422\u0435\u043A\u0441\u0442\u0430",
+    TextSpeedSlow: "\u041C\u0435\u0434\u043B\u0435\u043D\u043D\u0430\u044F",
+    TextSpeedMedium: "\u0421\u0440\u0435\u0434\u043D\u044F\u044F",
+    TextSpeedFast: "\u0411\u044B\u0441\u0442\u0440\u0430\u044F",
+    TextSpeedAuto: "\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0438\u0447\u0435\u0441\u043A\u0430\u044F",
+    CompleteText: "\u0417\u0430\u0432\u0435\u0440\u0448\u0438\u0442\u044C \u0442\u0435\u043A\u0441\u0442",
+    GoForward: "\u041F\u0435\u0440\u0435\u0439\u0442\u0438 \u0432\u043F\u0435\u0440\u0451\u0434",
+    ExitDialogWarning: "\u0412\u044B \u0443\u0432\u0435\u0440\u0435\u043D\u044B, \u0447\u0442\u043E \u0445\u043E\u0442\u0438\u0442\u0435 \u0432\u044B\u0439\u0442\u0438? \u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441 \u0431\u0443\u0434\u0435\u0442 \u0441\u043E\u0445\u0440\u0430\u043D\u0451\u043D.",
+    ExitDialogExit: "\u0412\u044B\u0439\u0442\u0438",
+    ExitDialogBack: "\u0412\u0435\u0440\u043D\u0443\u0442\u044C\u0441\u044F \u0432 \u0438\u0433\u0440\u0443",
+    OpenMenu: "\u041E\u0442\u043A\u0440\u044B\u0442\u044C \u043C\u0435\u043D\u044E",
+    CloseMenu: "\u0417\u0430\u043A\u0440\u044B\u0442\u044C \u043C\u0435\u043D\u044E"
+  };
+  var EN = {
+    NewGame: "New Game",
+    HomeScreen: "Home Screen",
+    ToTheGame: "To the Game",
+    Language: "Language",
+    NoSaves: "No saves",
+    LoadSave: "Load",
+    Saves: "Saves",
+    Settings: "Settings",
+    Sumbit: "Submit",
+    GoBack: "Go back",
+    DoSave: "Save",
+    Auto: "Auto",
+    Stop: "Stop",
+    Exit: "Exit",
+    Automatic: "Automatic",
+    Manual: "Manual",
+    Remove: "Remove",
+    LoadASaveFrom: "Load a save from",
+    DeleteASaveFrom: "Delete a save from",
+    TextSpeed: "Text Speed",
+    TextSpeedSlow: "Slow",
+    TextSpeedMedium: "Medium",
+    TextSpeedFast: "Fast",
+    TextSpeedAuto: "Auto",
+    CompleteText: "Complete text",
+    GoForward: "Go forward",
+    ExitDialogWarning: "Are you sure you want to exit? Progress will be saved.",
+    ExitDialogExit: "Exit",
+    ExitDialogBack: "Return to game",
+    OpenMenu: "Open menu",
+    CloseMenu: "Close menu"
+  };
+  var KK = {
+    NewGame: "\u0416\u0430\u04A3\u0430 \u043E\u0439\u044B\u043D",
+    HomeScreen: "\u041D\u0435\u0433\u0456\u0437\u0433\u0456 \u044D\u043A\u0440\u0430\u043D",
+    ToTheGame: "\u041E\u0439\u044B\u043D\u0493\u0430",
+    Language: "\u0422\u0456\u043B",
+    NoSaves: "\u0421\u0430\u049B\u0442\u0430\u0443 \u0436\u043E\u049B",
+    LoadSave: "\u0416\u04AF\u043A\u0442\u0435\u0443",
+    Saves: "\u0421\u0430\u049B\u0442\u0430\u0443",
+    Settings: "\u041F\u0430\u0440\u0430\u043C\u0435\u0442\u0440\u043B\u0435\u0440",
+    Sumbit: "\u0420\u0430\u0441\u0442\u0430\u0443",
+    GoBack: "\u0410\u0440\u0442\u049B\u0430",
+    DoSave: "\u0421\u0430\u049B\u0442\u0430\u0443",
+    Auto: "\u0410\u0432\u0442\u043E",
+    Stop: "\u0422\u043E\u049B\u0442\u0430",
+    Exit: "\u0428\u044B\u0493\u0443",
+    Automatic: "\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0442\u044B",
+    Manual: "\u049A\u043E\u043B\u043C\u0435\u043D",
+    Remove: "\u0416\u043E\u044E",
+    LoadASaveFrom: "\u0421\u0430\u049B\u0442\u0430\u0443\u0434\u044B \u0436\u04AF\u043A\u0442\u0435\u0443",
+    DeleteASaveFrom: "\u0421\u0430\u049B\u0442\u0430\u0443\u0434\u044B \u0436\u043E\u044E",
+    TextSpeed: "\u041C\u04D9\u0442\u0456\u043D \u0416\u044B\u043B\u0434\u0430\u043C\u0434\u044B\u0493\u044B",
+    TextSpeedSlow: "\u0411\u0430\u044F\u0443",
+    TextSpeedMedium: "\u041E\u0440\u0442\u0430\u0448\u0430",
+    TextSpeedFast: "\u0416\u044B\u043B\u0434\u0430\u043C",
+    TextSpeedAuto: "\u0410\u0432\u0442\u043E\u043C\u0430\u0442\u0442\u044B",
+    CompleteText: "\u041C\u04D9\u0442\u0456\u043D\u0434\u0456 \u0430\u044F\u049B\u0442\u0430\u0443",
+    GoForward: "\u0410\u043B\u0493\u0430 \u0436\u044B\u043B\u0436\u0443",
+    ExitDialogWarning: "\u0421\u0456\u0437 \u0448\u044B\u049B\u049B\u044B\u04A3\u044B\u0437 \u043A\u0435\u043B\u0435\u0442\u0456\u043D\u0456\u043D\u0435 \u0441\u0435\u043D\u0456\u043C\u0434\u0456\u0441\u0456\u0437 \u0431\u0435? \u041F\u0440\u043E\u0433\u0440\u0435\u0441\u0441 \u0441\u0430\u049B\u0442\u0430\u043B\u0430\u0434\u044B",
+    ExitDialogExit: "\u0428\u044B\u0493\u0443",
+    ExitDialogBack: "\u041E\u0439\u044B\u043D\u0493\u0430 \u043E\u0440\u0430\u043B\u0443",
+    OpenMenu: "\u041C\u04D9\u0437\u0456\u0440\u0434\u0456 \u0430\u0448\u044B\u04A3\u044B\u0437",
+    CloseMenu: "\u041C\u04D9\u0437\u0456\u0440\u0434\u0456 \u0436\u0430\u0431\u0443"
+  };
+  var JP = {
+    NewGame: "\u300C\u65B0\u3057\u3044\u30B2\u30FC\u30E0\u300D",
+    HomeScreen: "\u30DB\u30FC\u30E0\u753B\u9762",
+    ToTheGame: "\u300C\u30B2\u30FC\u30E0\u306B\u623B\u308B\u300D",
+    Language: "\u8A00\u8A9E",
+    NoSaves: "\u30CE\u30FC\u30BB\u30FC\u30D6",
+    LoadSave: "\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9",
+    Saves: "\u4FDD\u5B58",
+    Settings: "\u8A2D\u5B9A",
+    Sumbit: "\u78BA\u8A8D",
+    GoBack: "\u300C\u623B\u308B\u300D",
+    DoSave: "\u4FDD\u5B58",
+    Auto: "\u30AA\u30FC\u30C8",
+    Stop: "\u6B62\u307E\u308C",
+    Exit: "\u51FA\u53E3",
+    Automatic: "\u81EA\u52D5",
+    Manual: "\u30DE\u30CB\u30E5\u30A2\u30EB",
+    Remove: "\u524A\u9664",
+    LoadASaveFrom: "\u30ED\u30FC\u30C9\u30BB\u30FC\u30D6\u304B\u3089",
+    DeleteASaveFrom: "\u304B\u3089\u4FDD\u5B58\u3092\u524A\u9664",
+    TextSpeed: "\u30C6\u30AD\u30B9\u30C8\u30B9\u30D4\u30FC\u30C9",
+    TextSpeedSlow: "\u300C\u9045\u3044\u300D",
+    TextSpeedMedium: "\u30DF\u30C7\u30A3\u30A2\u30E0",
+    TextSpeedFast: "\u300C\u901F\u3044\u300D",
+    TextSpeedAuto: "\u81EA\u52D5",
+    CompleteText: "\u30C6\u30AD\u30B9\u30C8\u3092\u5B8C\u6210\u3055\u305B\u308B",
+    GoForward: "\u5148\u306B\u884C\u304F",
+    ExitDialogWarning: "\u672C\u5F53\u306B\u7D42\u4E86\u3057\u307E\u3059\u304B\uFF1F\u9032\u884C\u72B6\u6CC1\u306F\u4FDD\u5B58\u3055\u308C\u307E\u3059",
+    ExitDialogExit: "\u7D42\u4E86",
+    ExitDialogBack: "\u30B2\u30FC\u30E0\u306B\u623B\u308B",
+    OpenMenu: "\u30E1\u30CB\u30E5\u30FC\u3092\u958B\u304F",
+    CloseMenu: "\u30E1\u30CB\u30E5\u30FC\u3092\u9589\u3058\u308B"
   };
   return __toCommonJS(src_exports);
 })();