@etsoo/appscript 1.6.0 → 1.6.1

package/__tests__/app/CoreApp.ts

@@ -22,10 +22,10 @@ const app = new appClass();
 await app.changeCulture(app.settings.cultures[0]);
 
 test("Test for domain substitution", () => {
-  expect(app.settings.endpoint).toBe("http://localhost:9000/api/");
+  expect(app.settings.endpoint).toBe("http://admin.etsoo.com:9000/api/");
 
   expect(app.settings.endpoints?.core.endpoint).toBe(
-    "https://localhost:9001/api/"
+    "https://core.etsoo.com:9001/api/"
   );
 });
 

package/__tests__/app/TestApp.ts

@@ -11,7 +11,6 @@ import {
   CoreApp,
   createClient,
   Culture,
-  ExternalSettings,
   IAppSettings,
   InitCallResultData,
   IUser
@@ -87,6 +86,8 @@ export class TestApp extends CoreApp<
           }
         },
 
+        hostname: "admin.etsoo.com",
+
         /**
          * App root url
          */
@@ -126,19 +127,6 @@ export class TestApp extends CoreApp<
     );
   }
 
-  // Example of local format settings
-  protected override formatSettings(settings: IAppSettings): IAppSettings {
-    const { endpoint, endpoints, ...rest } = settings;
-    return {
-      ...rest,
-      endpoint: ExternalSettings.formatHost(endpoint, "localhost"),
-      endpoints:
-        endpoints == null
-          ? undefined
-          : ExternalSettings.formatHost(endpoints, "localhost")
-    };
-  }
-
   freshCountdownUI(callback?: () => PromiseLike<unknown>): void {
     throw new Error("Method not implemented.");
   }

package/lib/cjs/app/CoreApp.js

@@ -189,17 +189,19 @@ class CoreApp {
             }
             return undefined;
         };
+        // Destruct the settings
+        const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
         if (api) {
             // Base URL of the API
-            api.baseUrl = this.settings.endpoint;
+            api.baseUrl = endpoint;
             api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         }
         else {
             this.api = this.createApi(systemApi, {
-                endpoint: settings.endpoint,
-                webUrl: settings.webUrl
+                endpoint,
+                webUrl
             }, refresh);
         }
         this.notifier = notifier;
@@ -220,7 +222,6 @@ class CoreApp {
         // Embedded
         this._embedded =
             this.storage.getData(this.fields.embedded) ?? false;
-        const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
             CJ = cj.default;

package/lib/mjs/app/CoreApp.js

@@ -186,17 +186,19 @@ export class CoreApp {
             }
             return undefined;
         };
+        // Destruct the settings
+        const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
         if (api) {
             // Base URL of the API
-            api.baseUrl = this.settings.endpoint;
+            api.baseUrl = endpoint;
             api.name = systemApi;
             this.setApi(api, refresh);
             this.api = api;
         }
         else {
             this.api = this.createApi(systemApi, {
-                endpoint: settings.endpoint,
-                webUrl: settings.webUrl
+                endpoint,
+                webUrl
             }, refresh);
         }
         this.notifier = notifier;
@@ -217,7 +219,6 @@ export class CoreApp {
         // Embedded
         this._embedded =
             this.storage.getData(this.fields.embedded) ?? false;
-        const { currentCulture, currentRegion } = settings;
         // Load resources
         Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(([cj, _resources]) => {
             CJ = cj.default;

package/package.json

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

package/src/app/CoreApp.ts

@@ -365,9 +365,12 @@ export abstract class CoreApp<
       return undefined;
     };
 
+    // Destruct the settings
+    const { currentCulture, currentRegion, endpoint, webUrl } = this.settings;
+
     if (api) {
       // Base URL of the API
-      api.baseUrl = this.settings.endpoint;
+      api.baseUrl = endpoint;
       api.name = systemApi;
       this.setApi(api, refresh);
       this.api = api;
@@ -375,8 +378,8 @@ export abstract class CoreApp<
       this.api = this.createApi(
         systemApi,
         {
-          endpoint: settings.endpoint,
-          webUrl: settings.webUrl
+          endpoint,
+          webUrl
         },
         refresh
       );
@@ -408,8 +411,6 @@ export abstract class CoreApp<
     this._embedded =
       this.storage.getData<boolean>(this.fields.embedded) ?? false;
 
-    const { currentCulture, currentRegion } = settings;
-
     // Load resources
     Promise.all([loadCrypto(), this.changeCulture(currentCulture)]).then(
       ([cj, _resources]) => {