@etsoo/appscript 1.2.94 → 1.2.95

package/lib/cjs/app/CoreApp.d.ts

@@ -8,7 +8,7 @@ import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
-import { IApp, IAppFields, IDetectIPCallback, RefreshTokenProps, RefreshTokenResult } from './IApp';
+import { IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
 /**
  * Core application interface
@@ -407,10 +407,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     hasPermission(roles: number | UserRole | number[] | UserRole[]): boolean;
     /**
-     * Navigate the Url
-     * @param url Url
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    navigate(url: string): void;
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
      * Callback where exit a page
      */

package/lib/cjs/app/CoreApp.js

@@ -979,11 +979,29 @@ class CoreApp {
         return false;
     }
     /**
-     * Navigate the Url
-     * @param url Url
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    navigate(url) {
-        globalThis.location.href = this.settings.homepage + url;
+    navigate(to, options) {
+        if (typeof to === 'number') {
+            globalThis.history.go(to);
+        }
+        else {
+            const { state, replace = false } = options !== null && options !== void 0 ? options : {};
+            if (replace) {
+                if (state)
+                    globalThis.history.replaceState(state, '', to);
+                else
+                    globalThis.location.replace(to);
+            }
+            else {
+                if (state)
+                    globalThis.history.pushState(state, '', to);
+                else
+                    globalThis.location.assign(to);
+            }
+        }
     }
     /**
      * Callback where exit a page

package/lib/cjs/app/IApp.d.ts

@@ -13,6 +13,13 @@ import { UserRole } from './UserRole';
 export interface IDetectIPCallback {
     (): void;
 }
+/**
+ * Navigate options
+ */
+export interface NavigateOptions {
+    replace?: boolean;
+    state?: any;
+}
 /**
  * Refresh token result type
  * true means success, false means failed but no any message
@@ -336,10 +343,11 @@ export interface IApp {
      */
     isValidPassword(password: string): boolean;
     /**
-     * Navigate the Url
-     * @param url Url
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    navigate(url: string): void;
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
      * Callback where exit a page
      */

package/lib/mjs/app/CoreApp.d.ts

@@ -8,7 +8,7 @@ import { IActionResult } from '../result/IActionResult';
 import { InitCallResult, InitCallResultData } from '../result/InitCallResult';
 import { IUser } from '../state/User';
 import { IAppSettings } from './AppSettings';
-import { IApp, IAppFields, IDetectIPCallback, RefreshTokenProps, RefreshTokenResult } from './IApp';
+import { IApp, IAppFields, IDetectIPCallback, NavigateOptions, RefreshTokenProps, RefreshTokenResult } from './IApp';
 import { UserRole } from './UserRole';
 /**
  * Core application interface
@@ -407,10 +407,11 @@ export declare abstract class CoreApp<U extends IUser, S extends IAppSettings, N
      */
     hasPermission(roles: number | UserRole | number[] | UserRole[]): boolean;
     /**
-     * Navigate the Url
-     * @param url Url
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    navigate(url: string): void;
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
      * Callback where exit a page
      */

package/lib/mjs/app/CoreApp.js

@@ -976,11 +976,29 @@ export class CoreApp {
         return false;
     }
     /**
-     * Navigate the Url
-     * @param url Url
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    navigate(url) {
-        globalThis.location.href = this.settings.homepage + url;
+    navigate(to, options) {
+        if (typeof to === 'number') {
+            globalThis.history.go(to);
+        }
+        else {
+            const { state, replace = false } = options !== null && options !== void 0 ? options : {};
+            if (replace) {
+                if (state)
+                    globalThis.history.replaceState(state, '', to);
+                else
+                    globalThis.location.replace(to);
+            }
+            else {
+                if (state)
+                    globalThis.history.pushState(state, '', to);
+                else
+                    globalThis.location.assign(to);
+            }
+        }
     }
     /**
      * Callback where exit a page

package/lib/mjs/app/IApp.d.ts

@@ -13,6 +13,13 @@ import { UserRole } from './UserRole';
 export interface IDetectIPCallback {
     (): void;
 }
+/**
+ * Navigate options
+ */
+export interface NavigateOptions {
+    replace?: boolean;
+    state?: any;
+}
 /**
  * Refresh token result type
  * true means success, false means failed but no any message
@@ -336,10 +343,11 @@ export interface IApp {
      */
     isValidPassword(password: string): boolean;
     /**
-     * Navigate the Url
-     * @param url Url
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    navigate(url: string): void;
+    navigate<T extends number | string | URL>(to: T, options?: T extends number ? never : NavigateOptions): void;
     /**
      * Callback where exit a page
      */

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@etsoo/appscript",
-    "version": "1.2.94",
+    "version": "1.2.95",
     "description": "Applications shared TypeScript framework",
     "main": "lib/cjs/index.js",
     "module": "lib/mjs/index.js",

package/src/app/CoreApp.ts

@@ -46,6 +46,7 @@ import {
     IApp,
     IAppFields,
     IDetectIPCallback,
+    NavigateOptions,
     RefreshTokenProps,
     RefreshTokenResult
 } from './IApp';
@@ -1304,11 +1305,27 @@ export abstract class CoreApp<
     }
 
     /**
-     * Navigate the Url
-     * @param url Url
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    navigate(url: string): void {
-        globalThis.location.href = this.settings.homepage + url;
+    navigate<T extends number | string | URL>(
+        to: T,
+        options?: T extends number ? never : NavigateOptions
+    ) {
+        if (typeof to === 'number') {
+            globalThis.history.go(to);
+        } else {
+            const { state, replace = false } = options ?? {};
+
+            if (replace) {
+                if (state) globalThis.history.replaceState(state, '', to);
+                else globalThis.location.replace(to);
+            } else {
+                if (state) globalThis.history.pushState(state, '', to);
+                else globalThis.location.assign(to);
+            }
+        }
     }
 
     /**

package/src/app/IApp.ts

@@ -21,6 +21,14 @@ export interface IDetectIPCallback {
     (): void;
 }
 
+/**
+ * Navigate options
+ */
+export interface NavigateOptions {
+    replace?: boolean;
+    state?: any;
+}
+
 /**
  * Refresh token result type
  * true means success, false means failed but no any message
@@ -438,10 +446,14 @@ export interface IApp {
     isValidPassword(password: string): boolean;
 
     /**
-     * Navigate the Url
-     * @param url Url
+     * Navigate to Url or delta
+     * @param url Url or delta
+     * @param options Options
      */
-    navigate(url: string): void;
+    navigate<T extends number | string | URL>(
+        to: T,
+        options?: T extends number ? never : NavigateOptions
+    ): void;
 
     /**
      * Callback where exit a page