@novely/core 0.25.0 → 0.27.0

package/dist/index.js

@@ -683,9 +683,8 @@ var novely = ({
   const story = {};
   const times = /* @__PURE__ */ new Set();
   const ASSETS_TO_PRELOAD = /* @__PURE__ */ new Set();
-  const assetsLoaded = createControlledPromise();
   const dataLoaded = createControlledPromise();
-  let scriptCalled = false;
+  let initialScreenWasShown = false;
   defaultData ||= {};
   defaultState ||= {};
   const intime = (value) => {
@@ -693,8 +692,15 @@ var novely = ({
   };
   const scriptBase = async (part) => {
     Object.assign(story, flattenStory(part));
+    let loadingIsShown = false;
+    if (!initialScreenWasShown) {
+      renderer.ui.showLoading();
+      loadingIsShown = true;
+    }
     if (preloadAssets === "blocking" && ASSETS_TO_PRELOAD.size > 0) {
-      renderer.ui.showScreen("loading");
+      if (!loadingIsShown) {
+        renderer.ui.showLoading();
+      }
       const { preloadAudioBlocking, preloadImageBlocking } = renderer.misc;
       const list = mapSet(ASSETS_TO_PRELOAD, (asset) => {
         return limitAssetsDownload(async () => {
@@ -713,20 +719,17 @@ var novely = ({
       });
       await Promise.allSettled(list);
     }
-    const screen = renderer.ui.getScreen();
-    const nextScreen = scriptCalled ? screen : initialScreen;
     ASSETS_TO_PRELOAD.clear();
-    assetsLoaded.resolve();
-    if (nextScreen === "game") {
-      await assetsLoaded.promise;
-      await dataLoaded.promise;
-      if (!scriptCalled) {
+    await dataLoaded.promise;
+    renderer.ui.hideLoading();
+    if (!initialScreenWasShown) {
+      initialScreenWasShown = true;
+      if (initialScreen === "game") {
         restore();
+      } else {
+        renderer.ui.showScreen(initialScreen);
       }
-    } else {
-      renderer.ui.showScreen(nextScreen);
     }
-    scriptCalled = true;
   };
   const script = (part) => {
     return limitScript(() => scriptBase(part));
@@ -790,7 +793,7 @@ var novely = ({
     data: klona(defaultData),
     meta: [getLanguageWithoutParameters(), DEFAULT_TYPEWRITER_SPEED, 1, 1, 1]
   };
-  const $ = store(initialData);
+  const storageData = store(initialData);
   const coreData = store({
     dataLoaded: false
   });
@@ -812,10 +815,10 @@ var novely = ({
   const throttledOnStorageDataChange = throttle(onStorageDataChange, throttleTimeout);
   const throttledEmergencyOnStorageDataChange = throttle(() => {
     if (saveOnUnload === true || saveOnUnload === "prod" && !DEV2) {
-      onStorageDataChange($.get());
+      onStorageDataChange(storageData.get());
     }
   }, 10);
-  $.subscribe(throttledOnStorageDataChange);
+  storageData.subscribe(throttledOnStorageDataChange);
   const getStoredData = async () => {
     let stored = await storage.get();
     for (const migration of migrations) {
@@ -832,7 +835,7 @@ var novely = ({
       stored.data = defaultData;
     }
     dataLoaded.resolve();
-    $.set(stored);
+    storageData.set(stored);
   };
   storageDelay.then(getStoredData);
   const initial = getDefaultSave(klona(defaultState));
@@ -850,7 +853,7 @@ var novely = ({
       return;
     const stack = useStack(MAIN_CONTEXT_KEY);
     const current = klona(stack.value);
-    $.update((prev) => {
+    storageData.update((prev) => {
       const isLatest = findLastIndex(prev.saves, (value) => times.has(value[2][0])) === prev.saves.length - 1;
       current[2][0] = intime(Date.now());
       current[2][1] = type;
@@ -872,7 +875,7 @@ var novely = ({
       return;
     const save2 = getDefaultSave(klona(defaultState));
     if (autosaves) {
-      $.update((prev) => {
+      storageData.update((prev) => {
         return prev.saves.push(save2), prev;
       });
     }
@@ -887,10 +890,10 @@ var novely = ({
   const restore = async (save2) => {
     if (!coreData.get().dataLoaded)
       return;
-    let latest = save2 || $.get().saves.at(-1);
+    let latest = save2 || storageData.get().saves.at(-1);
     if (!latest) {
       latest = klona(initial);
-      $.update((prev) => {
+      storageData.update((prev) => {
         prev.saves.push(latest);
         return prev;
       });
@@ -974,7 +977,7 @@ var novely = ({
     ctx.audio.destroy();
     const [time, type] = current[2];
     if (type === "auto" && interacted <= 1 && times.has(time)) {
-      $.update((prev) => {
+      storageData.update((prev) => {
         prev.saves = prev.saves.filter((save2) => save2 !== current);
         return prev;
       });
@@ -1045,8 +1048,8 @@ var novely = ({
     removeContext,
     getStateFunction,
     languages,
-    $,
-    $$: coreData
+    storageData,
+    coreData
   });
   const useStack = createUseStackFunction(renderer);
   useStack(MAIN_CONTEXT_KEY).push(initial);
@@ -1140,7 +1143,7 @@ var novely = ({
       const name = (() => {
         const c = character;
         const cs = characters;
-        const [lang] = $.get().meta;
+        const [lang] = storageData.get().meta;
         if (c && c in cs) {
           const block = cs[c].name;
           if (typeof block === "string") {
@@ -1172,7 +1175,7 @@ var novely = ({
     function({ ctx, push }, [fn]) {
       const { restoring, goingBack, preview: preview2 } = ctx.meta;
       const result = fn({
-        lang: $.get().meta[0],
+        lang: storageData.get().meta[0],
         goingBack,
         restoring,
         preview: preview2,
@@ -1191,13 +1194,13 @@ var novely = ({
       }
       const transformedChoices = choices.map(([content, action2, visible]) => {
         const shown = !visible || visible({
-          lang: $.get().meta[0],
+          lang: storageData.get().meta[0],
           state: getStateAtCtx(ctx)
         });
         if (DEV2 && action2.length === 0 && !shown) {
           console.warn(`Choice children should not be empty, either add content there or make item not selectable`);
         }
-        return [templateReplace(content, data2), action2, shown];
+        return [templateReplace(content, data2), shown];
       });
       if (DEV2 && transformedChoices.length === 0) {
         throw new Error(`Running choice without variants to choose from, look at how to use Choice action properly [https://novely.pages.dev/guide/actions/choice#usage]`);
@@ -1404,7 +1407,7 @@ var novely = ({
     const {
       data: data2,
       meta: [lang]
-    } = $.get();
+    } = storageData.get();
     const obj = values || data2;
     const cnt = isFunction(content) ? content(obj) : typeof content === "string" ? content : content[lang];
     const str2 = flattenAllowedContent(
@@ -1422,11 +1425,11 @@ var novely = ({
     );
   };
   const data = (value) => {
-    const _data = $.get().data;
+    const _data = storageData.get().data;
     if (!value)
       return _data;
     const val = isFunction(value) ? value(_data) : deepmerge(_data, value);
-    $.update((prev) => {
+    storageData.update((prev) => {
       prev.data = val;
       return prev;
     });