@novely/core 0.29.1 → 0.29.2

package/dist/index.js

@@ -47,6 +47,7 @@ var MAIN_CONTEXT_KEY = "$MAIN";
 
 // src/shared.ts
 var STACK_MAP = /* @__PURE__ */ new Map();
+var PRELOADED_ASSETS = /* @__PURE__ */ new Set();
 
 // src/utils.ts
 import { DEV } from "esm-env";
@@ -464,13 +465,23 @@ var getResourseType = async (request, url) => {
   }
   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;
+  }
+};
 
 // src/novely.ts
 import { dequal } from "dequal/lite";
 
-// src/global.ts
-var PRELOADED_ASSETS = /* @__PURE__ */ new Set();
-
 // src/store.ts
 var store = (current, subscribers = /* @__PURE__ */ new Set()) => {
   const subscribe = (cb) => {
@@ -506,7 +517,9 @@ var propertyIsOnObject = (object, property) => {
   }
 };
 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)
@@ -618,10 +631,10 @@ var flattenAllowedContent = (c, state) => {
   }
   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 "";
@@ -632,7 +645,7 @@ var replace = (str2, obj, pluralization, actions, pr) => {
     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;
@@ -660,6 +673,23 @@ var localStorageStorage = (options) => {
   };
 };
 
+// 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
 import pLimit from "p-limit";
 import { DEV as DEV2 } from "esm-env";
@@ -681,7 +711,8 @@ var novely = ({
   preloadAssets = "lazy",
   parallelAssetsDownloadLimit = 15,
   fetch: request = fetch,
-  saveOnUnload = true
+  saveOnUnload = true,
+  startKey = "start"
 }) => {
   const languages = Object.keys(translation);
   const limitScript = pLimit(1);
@@ -777,7 +808,7 @@ var novely = ({
   const getDefaultSave = (state = {}) => {
     return [
       [
-        ["jump", "start"],
+        ["jump", startKey],
         [null, 0]
       ],
       state,
@@ -845,13 +876,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;
@@ -1014,7 +1041,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) => {
@@ -1027,7 +1058,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]) => {
@@ -1063,6 +1094,13 @@ var novely = ({
     };
     return state;
   };
+  const getLanguageDisplayName = (lang) => {
+    const language = translation[lang];
+    if (DEV2 && !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,
@@ -1078,7 +1116,8 @@ var novely = ({
     getStateFunction,
     languages,
     storageData,
-    coreData
+    coreData,
+    getLanguageDisplayName
   });
   const useStack = createUseStackFunction(renderer);
   useStack(MAIN_CONTEXT_KEY).push(initial);
@@ -1430,6 +1469,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,
@@ -1441,14 +1485,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];
@@ -1548,8 +1588,7 @@ var novely = ({
     destroy() {
       dataLoaded.cancel();
       UIInstance.unmount();
-      removeEventListener("visibilitychange", onVisibilityChange);
-      removeEventListener("beforeunload", throttledEmergencyOnStorageDataChange);
+      unsubscribeFromBrowserVisibilityChange();
     }
   };
 };