@stemy/ngx-utils 13.1.0 → 13.1.1

package/fesm2020/stemy-ngx-utils.mjs

@@ -8,7 +8,7 @@ import { Invokable } from 'invokable';
 import * as i2 from '@angular/router';
 import { ActivatedRouteSnapshot, NavigationEnd, DefaultUrlSerializer, UrlTree, UrlSegmentGroup, UrlSegment, UrlSerializer } from '@angular/router';
 import * as i1$3 from '@angular/common';
-import { isPlatformBrowser, isPlatformServer, APP_BASE_HREF, DOCUMENT, CommonModule } from '@angular/common';
+import { isPlatformBrowser, isPlatformServer, DOCUMENT, APP_BASE_HREF, CommonModule } from '@angular/common';
 import * as i1 from 'ngx-device-detector';
 import { DeviceDetectorService } from 'ngx-device-detector';
 import * as i1$1 from '@angular/common/http';
@@ -413,6 +413,7 @@ const API_SERVICE = new InjectionToken("api-service");
 class ResourceIfContext {
 }
 // --- ConfigService ---
+const APP_BASE_URL = new InjectionToken("app-base-url");
 class IConfiguration {
 }
 const CONFIG_SERVICE = new InjectionToken("config-service");
@@ -1753,6 +1754,16 @@ class StringUtils {
     static ucFirst(str) {
         return str ? str.charAt(0).toUpperCase() + str.substring(1) : "";
     }
+    static parseDomain(baseUrl) {
+        try {
+            const url = new URL(baseUrl);
+            const port = url.port && url.port !== "443" && url.port !== "80" ? `:${url.port}` : ``;
+            return `${url.protocol}//${url.hostname}${port}/`;
+        }
+        catch {
+            return "/";
+        }
+    }
 }
 
 class ArrayUtils {
@@ -2469,18 +2480,18 @@ class StaticAuthService {
 }
 
 class ConfigService {
-    constructor(http, universal, rootElement, baseHref, baseConfig = null, scriptParams = null) {
+    constructor(http, universal, rootElement, baseUrl, baseConfig = null, scriptParams = null) {
         this.http = http;
         this.universal = universal;
         this.rootElement = rootElement;
-        this.baseHref = baseHref;
+        this.baseUrl = baseUrl;
         for (const key in []) {
             Object.defineProperty(Array.prototype, key, {
                 enumerable: false
             });
         }
         this.baseConfig = baseConfig || {};
-        this.loadedConfig = Object.assign(!this.baseHref ? {} : { baseUrl: this.baseHref, baseDomain: this.parseDomain(this.baseHref) }, this.baseConfig);
+        this.loadedConfig = Object.assign(!this.baseUrl ? {} : { baseUrl: this.baseUrl, baseDomain: StringUtils.parseDomain(this.baseUrl) }, this.baseConfig);
         this.scriptParameters = scriptParams || {};
         this.loaderFunc = () => {
             this.loader = this.loader || new Promise((resolve, reject) => {
@@ -2506,16 +2517,6 @@ class ConfigService {
     get configUrl() {
         return `${this.loadedConfig.baseUrl}config/config.json`;
     }
-    parseDomain(baseUrl) {
-        try {
-            const url = new URL(baseUrl);
-            const port = url.port && url.port !== "443" && url.port !== "80" ? `:${url.port}` : ``;
-            return `${url.protocol}//${url.hostname}${port}/`;
-        }
-        catch {
-            return "/";
-        }
-    }
     initService() {
     }
     async loadJson() {
@@ -2562,7 +2563,7 @@ class ConfigService {
         return decodeURIComponent(results[2].replace(/\+/g, " "));
     }
 }
-ConfigService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: ConfigService, deps: [{ token: i1$1.HttpClient }, { token: UniversalService }, { token: ROOT_ELEMENT }, { token: APP_BASE_HREF }, { token: BASE_CONFIG, optional: true }, { token: SCRIPT_PARAMS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
+ConfigService.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: ConfigService, deps: [{ token: i1$1.HttpClient }, { token: UniversalService }, { token: ROOT_ELEMENT }, { token: APP_BASE_URL }, { token: BASE_CONFIG, optional: true }, { token: SCRIPT_PARAMS, optional: true }], target: i0.ɵɵFactoryTarget.Injectable });
 ConfigService.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: ConfigService });
 i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImport: i0, type: ConfigService, decorators: [{
             type: Injectable
@@ -2571,7 +2572,7 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImpor
                     args: [ROOT_ELEMENT]
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
-                    args: [APP_BASE_HREF]
+                    args: [APP_BASE_URL]
                 }] }, { type: IConfiguration, decorators: [{
                     type: Optional
                 }, {
@@ -4964,7 +4965,7 @@ function loadConfig(config) {
     return config.load;
 }
 
-function loadBaseHref() {
+function loadBaseUrl() {
     if (typeof (document) === "undefined" || typeof (location) === "undefined")
         return "/";
     const currentScript = document.currentScript;
@@ -4975,7 +4976,8 @@ function loadBaseHref() {
         }
         catch (e) {
             const qualifiedUrl = location.protocol + "//" + location.host;
-            const srcUrl = (e.stack || "").match(new RegExp(qualifiedUrl + ".*?\\.js", "g")) || e.stack.match(/http([A-Z:\/\-\.]+)\.js/gi).shift();
+            const stack = (e.stack || "");
+            const srcUrl = (stack.match(new RegExp(qualifiedUrl + ".*?\\.js", "g")) || stack.match(/http([A-Z:\/\-.]+)\.js/gi)).shift();
             const lastIndex = srcUrl.lastIndexOf("/");
             return lastIndex < 0 ? "/" : srcUrl.substring(0, lastIndex + 1);
         }
@@ -4984,6 +4986,15 @@ function loadBaseHref() {
     const lastIndex = scriptSrc.lastIndexOf("/");
     return lastIndex < 0 ? "/" : scriptSrc.substring(0, lastIndex + 1);
 }
+function loadBaseHref(baseUrl) {
+    try {
+        return new URL(baseUrl).pathname;
+    }
+    catch (e) {
+        console.log(e);
+        return "/";
+    }
+}
 class NgxUtilsModule {
     constructor() {
     }
@@ -5024,6 +5035,11 @@ class NgxUtilsModule {
                     provide: GLOBAL_TEMPLATES,
                     useExisting: (!config ? null : config.globalTemplates) || GlobalTemplateService
                 },
+                {
+                    provide: APP_BASE_URL,
+                    useFactory: (!config ? null : config.baseUrl) || loadBaseUrl,
+                    deps: [Injector]
+                },
                 {
                     provide: ROOT_ELEMENT,
                     useValue: null
@@ -5036,8 +5052,8 @@ class NgxUtilsModule {
                 },
                 {
                     provide: APP_BASE_HREF,
-                    useFactory: (!config ? null : config.baseHref) || loadBaseHref,
-                    deps: [Injector]
+                    useFactory: loadBaseHref,
+                    deps: [APP_BASE_URL]
                 }
             ]
         };
@@ -5076,5 +5092,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.3.8", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { API_SERVICE, AUTH_SERVICE, AclService, AjaxRequestHandler, ApiService, ArrayUtils, AsyncMethodBase, AsyncMethodDirective, AuthGuard, BASE_CONFIG, BackgroundDirective, BaseHttpClient, BaseHttpService, CONFIG_SERVICE, CanvasColor, CanvasUtils, ChunkPipe, Circle, ConfigService, ConsoleToasterService, DateUtils, DynamicTableComponent, DynamicTableTemplateDirective, ERROR_HANDLER, EXPRESS_REQUEST, EntriesPipe, ErrorHandlerService, EventsService, ExtraItemPropertiesPipe, FactoryDependencies, FileUtils, FilterPipe, FindPipe, FormatNumberPipe, FormatterService, GLOBAL_TEMPLATES, GenericValue, GetOffsetPipe, GetTypePipe, GlobalTemplateDirective, GlobalTemplatePipe, GlobalTemplateService, GroupByPipe, HttpPromise, ICON_SERVICE, IConfiguration, IconDirective, IconService, Initializer, IsTypePipe, JoinPipe, KeysPipe, LANGUAGE_SERVICE, LanguageService, LoaderUtils, MapPipe, MathUtils, MaxPipe, MinPipe, NgxTemplateOutletDirective, NgxUtilsModule, ObjectUtils, ObservableUtils, OpenApiService, PROMISE_SERVICE, PaginationDirective, PaginationItemContext, PaginationItemDirective, PaginationMenuComponent, Point, PromiseService, ROOT_ELEMENT, Rect, ReducePipe, ReflectUtils, RemapPipe, ReplacePipe, ResizeEventPlugin, ResourceIfContext, ResourceIfDirective, ReversePipe, RoundPipe, SCRIPT_PARAMS, SafeHtmlPipe, ScrollEventPlugin, SetUtils, StateService, StaticAuthService, StaticLanguageService, StickyClassDirective, StickyDirective, StorageMode, StorageService, StringUtils, TOASTER_SERVICE, TimerUtils, TranslatePipe, TranslatedUrlSerializer, UniqueUtils, UniversalService, UnorderedListComponent, UnorderedListItemDirective, UnorderedListTemplateDirective, UnorederedListTemplate, ValuedPromise, ValuesPipe, Vector };
+export { API_SERVICE, APP_BASE_URL, AUTH_SERVICE, AclService, AjaxRequestHandler, ApiService, ArrayUtils, AsyncMethodBase, AsyncMethodDirective, AuthGuard, BASE_CONFIG, BackgroundDirective, BaseHttpClient, BaseHttpService, CONFIG_SERVICE, CanvasColor, CanvasUtils, ChunkPipe, Circle, ConfigService, ConsoleToasterService, DateUtils, DynamicTableComponent, DynamicTableTemplateDirective, ERROR_HANDLER, EXPRESS_REQUEST, EntriesPipe, ErrorHandlerService, EventsService, ExtraItemPropertiesPipe, FactoryDependencies, FileUtils, FilterPipe, FindPipe, FormatNumberPipe, FormatterService, GLOBAL_TEMPLATES, GenericValue, GetOffsetPipe, GetTypePipe, GlobalTemplateDirective, GlobalTemplatePipe, GlobalTemplateService, GroupByPipe, HttpPromise, ICON_SERVICE, IConfiguration, IconDirective, IconService, Initializer, IsTypePipe, JoinPipe, KeysPipe, LANGUAGE_SERVICE, LanguageService, LoaderUtils, MapPipe, MathUtils, MaxPipe, MinPipe, NgxTemplateOutletDirective, NgxUtilsModule, ObjectUtils, ObservableUtils, OpenApiService, PROMISE_SERVICE, PaginationDirective, PaginationItemContext, PaginationItemDirective, PaginationMenuComponent, Point, PromiseService, ROOT_ELEMENT, Rect, ReducePipe, ReflectUtils, RemapPipe, ReplacePipe, ResizeEventPlugin, ResourceIfContext, ResourceIfDirective, ReversePipe, RoundPipe, SCRIPT_PARAMS, SafeHtmlPipe, ScrollEventPlugin, SetUtils, StateService, StaticAuthService, StaticLanguageService, StickyClassDirective, StickyDirective, StorageMode, StorageService, StringUtils, TOASTER_SERVICE, TimerUtils, TranslatePipe, TranslatedUrlSerializer, UniqueUtils, UniversalService, UnorderedListComponent, UnorderedListItemDirective, UnorderedListTemplateDirective, UnorederedListTemplate, ValuedPromise, ValuesPipe, Vector };
 //# sourceMappingURL=stemy-ngx-utils.mjs.map