@alfalab/bridge-to-native 1.3.2-beta.0828f8f → 1.3.2-beta.16c7b6a

package/client/services-and-utils/native-navigation-and-title-service.js

@@ -1,5 +1,5 @@
 "use strict";
-/* eslint max-lines: ["error", {"max": 360, "skipComments": true}] */
+/* eslint max-lines: ["error", {"max": 400, "skipComments": true}] */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.NativeNavigationAndTitleService = void 0;
 const query_and_headers_keys_1 = require("../../query-and-headers-keys");
@@ -148,22 +148,38 @@ class NativeNavigationAndTitleService {
     initializeNativeHistoryStack() {
         const { nextPageId, title } = this.nativeParamsService;
         const hasSS = this.hasSavedHistoryStack();
-        if (nextPageId && !hasSS) {
-            // есть nextPageId + нет SS → на этом origin ранее не были.
-            this.nativeHistoryStack = this.initializeForNewOrigin(nextPageId, title);
-        }
-        else if (nextPageId && hasSS) {
-            // есть nextPageId + есть SS → forward навигация.
-            this.nativeHistoryStack = this.initializeForForward(nextPageId, title);
-        }
-        else if (!nextPageId && hasSS) {
-            // нет nextPageId + есть SS → back-навигация или reload.
-            this.nativeHistoryStack = this.initializeFromBackwardOrReload(title);
+        console.log('⬇️⬇️⬇️⬇️⬇️');
+        console.log('Инициализируюсь');
+        try {
+            if (nextPageId && !hasSS) {
+                console.log(`Есть nextPageId (${nextPageId}) + нет SS → на этом origin ранее не были.`);
+                this.nativeHistoryStack = this.initializeForNewOrigin(nextPageId, title);
+            }
+            else if (nextPageId && hasSS) {
+                const savedStack = this.readSavedHistoryStack();
+                if (savedStack.length > nextPageId) {
+                    console.log(`Есть nextPageId (${nextPageId}) + есть SS длиннее nextPageId → back навигация.`);
+                    this.nativeHistoryStack = this.initializeFromBackwardOrReload(title);
+                }
+                else {
+                    console.log(`Есть nextPageId (${nextPageId}) + есть SS равный или короче nextPageId → forward навигация.`);
+                    this.nativeHistoryStack = this.initializeForForward(nextPageId, title);
+                }
+            }
+            else if (!nextPageId && hasSS) {
+                console.log('Нет nextPageId + есть SS → back-навигация или reload.');
+                this.nativeHistoryStack = this.initializeFromBackwardOrReload(title);
+            }
+            else {
+                console.log('Нет nextPageId + нет SS → старт нового WV, назад идти некуда.');
+                this.nativeHistoryStack = [title];
+            }
         }
-        else {
-            // нет nextPageId + нет SS → старт нового WV, назад идти некуда.
+        catch (_a) {
             this.nativeHistoryStack = [title];
         }
+        console.log('this.nativeHistoryStack', '➡️', this.nativeHistoryStack);
+        console.log('⬆️⬆️⬆️⬆️⬆️');
         this.saveNativeHistoryStack();
         this.syncHistoryWithNative();
     }
@@ -174,51 +190,33 @@ class NativeNavigationAndTitleService {
         return stack;
     }
     initializeForForward(nextPageId, title) {
-        try {
-            const savedStack = this.readSavedHistoryStack();
-            const lastSaved = savedStack[savedStack.length - 1];
-            if (lastSaved === 2 /* NativeHistoryStackSpecialValues.ServerSideNavigationNextOrigin */ &&
-                savedStack.length < nextPageId) {
-                const stack = new Array(nextPageId).fill(0 /* NativeHistoryStackSpecialValues.ServerSideNavigationStub */);
-                for (let i = 0; i < savedStack.length; i++) {
-                    stack[i] = savedStack[i];
-                }
-                stack[stack.length - 1] = title;
-                return stack;
+        const savedStack = this.readSavedHistoryStack();
+        const lastSaved = savedStack[savedStack.length - 1];
+        if (lastSaved === 2 /* NativeHistoryStackSpecialValues.ServerSideNavigationNextOrigin */ &&
+            savedStack.length < nextPageId) {
+            const stack = new Array(nextPageId).fill(0 /* NativeHistoryStackSpecialValues.ServerSideNavigationStub */);
+            for (let i = 0; i < savedStack.length; i++) {
+                stack[i] = savedStack[i];
             }
-            if (savedStack.length === nextPageId) {
-                savedStack[savedStack.length - 1] = title;
-                return savedStack;
-            }
-            return this.initializeForNewOrigin(nextPageId, title);
+            stack[stack.length - 1] = title;
+            return stack;
         }
-        catch (_a) {
-            return this.initializeForNewOrigin(nextPageId, title);
+        if (savedStack.length === nextPageId) {
+            savedStack[savedStack.length - 1] = title;
+            return savedStack;
         }
+        return this.initializeForNewOrigin(nextPageId, title);
     }
     initializeFromBackwardOrReload(title) {
-        try {
-            const savedStack = this.readSavedHistoryStack();
-            const lastEntry = savedStack[savedStack.length - 1];
-            if (lastEntry === 1 /* NativeHistoryStackSpecialValues.TemporaryReloadStub */) {
-                savedStack.pop();
-                if (savedStack.length === 0) {
-                    return [title];
-                }
-                return savedStack;
-            }
-            if (this.stackContainsCrossOriginMarker(savedStack)) {
-                return this.truncateToLastCrossOriginMarker(savedStack);
-            }
-            savedStack.pop();
-            if (savedStack.length === 0) {
-                return [title];
-            }
-            return savedStack;
-        }
-        catch (_a) {
+        const savedStack = this.readSavedHistoryStack();
+        savedStack.pop();
+        if (savedStack.length === 0) {
             return [title];
         }
+        if (typeof savedStack[savedStack.length - 1] !== 'string') {
+            return this.truncateToLastCrossOriginMarker(savedStack);
+        }
+        return savedStack;
     }
     // eslint-disable-next-line class-methods-use-this -- удобней использовать метод в контексте экземпляра.
     stackContainsCrossOriginMarker(stack) {
@@ -239,6 +237,10 @@ class NativeNavigationAndTitleService {
      */
     readSavedHistoryStack() {
         const serialized = sessionStorage.getItem(query_and_headers_keys_1.SS_KEY_BRIDGE_TO_NATIVE_HISTORY_STACK);
+        console.log('⬇️⬇️⬇️⬇️⬇️');
+        console.log('Читаю стек из SessionStorage');
+        console.log('SessionStorage', '➡️', serialized);
+        console.log('⬆️⬆️⬆️⬆️⬆️');
         try {
             if (!serialized) {
                 throw new Error(`${query_and_headers_keys_1.SS_KEY_BRIDGE_TO_NATIVE_HISTORY_STACK} sessionStorage expected not to be null`);
@@ -282,6 +284,10 @@ class NativeNavigationAndTitleService {
      */
     saveNativeHistoryStack() {
         const serializedNativeHistoryStack = JSON.stringify(this.nativeHistoryStack);
+        console.log('⬇️⬇️⬇️⬇️⬇️');
+        console.log('Сохраняю стек в SessionStorage');
+        console.log(this.nativeHistoryStack, '➡️', serializedNativeHistoryStack);
+        console.log('⬆️⬆️⬆️⬆️⬆️');
         sessionStorage.setItem(query_and_headers_keys_1.SS_KEY_BRIDGE_TO_NATIVE_HISTORY_STACK, serializedNativeHistoryStack);
     }
     /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@alfalab/bridge-to-native",
-  "version": "1.3.2-beta.0828f8f",
+  "version": "1.3.2-beta.16c7b6a",
   "license": "MIT",
   "description": "Утилита для удобной работы веб приложения внутри нативного приложения и коммуникации с ним.",
   "engines": {