@acorex/core 5.0.30 → 5.0.37

package/fesm2020/acorex-core.mjs

@@ -1,6 +1,7 @@
 import * as i0 from '@angular/core';
 import { Pipe, NgModule, Injectable, Inject } from '@angular/core';
 import * as i1 from '@angular/platform-browser';
+import _ from 'lodash';
 import { Subject } from 'rxjs';
 import { DOCUMENT } from '@angular/common';
 import { Observable } from 'rxjs/internal/Observable';
@@ -43,50 +44,6 @@ class AXObjectUtil {
         }
         throw new Error('Unable to copy obj! Its type isn\'t supported.');
     }
-    static fetchProp(obj, prop) {
-        if (typeof obj === 'undefined') {
-            return false;
-        }
-        const index = prop.indexOf('.');
-        if (index > -1) {
-            return AXObjectUtil.fetchProp(obj[prop.substring(0, index)], prop.substr(index + 1));
-        }
-        return obj[prop];
-    }
-    static getPropByPath(obj, path, defaultVal) {
-        path = path
-            .replace(/\[/g, '.')
-            .replace(/]/g, '')
-            .split('.');
-        path.forEach((level) => {
-            if (obj) {
-                obj = obj[level];
-            }
-        });
-        if (obj === undefined) {
-            return defaultVal;
-        }
-        return obj;
-    }
-    static setPropByPath(obj, path, value) {
-        if (Object(obj) !== obj) {
-            return obj;
-        } // When obj is not an object
-        // If not yet an array, get the keys from the string-path
-        if (!Array.isArray(path)) {
-            path = path.toString().match(/[^.[\]]+/g) || [];
-        }
-        path.slice(0, -1).reduce((a, c, i) => // Iterate all of them except the last one
-         Object(a[c]) === a[c] // Does the key exist and is its value an object?
-            // Yes: then follow that path
-            ? a[c]
-            // No: create the key. Is the next key a potential array-index?
-            : a[c] = Math.abs(path[i + 1]) >> 0 === +path[i + 1]
-                ? [] // Yes: assign a new array object
-                : {}, // No: assign a new plain object
-        obj)[path[path.length - 1]] = value; // Finally assign the value to the last key
-        return obj; // Return the top-level object to allow chaining
-    }
 }
 
 // @dynamic
@@ -184,13 +141,13 @@ class AXConfig {
     }
     static set(arg1, arg2) {
         if (arg1 && typeof arg1 == 'string') {
-            AXObjectUtil.setPropByPath(AXConfig.dataModel, arg1, arg2);
+            debugger;
+            _.set(AXConfig.dataModel, arg1, arg2);
             AXConfig.dataChangeSubject.next(AXConfig.dataModel);
             return;
         }
         if (arg1 && typeof arg1 == 'object') {
-            //TODO : fix override
-            Object.assign(AXConfig.dataModel, arg1);
+            _.merge(AXConfig.dataModel, arg1);
             AXConfig.dataChangeSubject.next(AXConfig.dataModel);
             return;
         }
@@ -199,7 +156,7 @@ class AXConfig {
         }
     }
     static get(path, defaultValue) {
-        return AXObjectUtil.getPropByPath(AXConfig.dataModel, path) || defaultValue;
+        return _.get(AXConfig.dataModel, path, defaultValue);
     }
 }
 AXConfig.dataModel = {};
@@ -207,11 +164,9 @@ AXConfig.dataChangeSubject = new Subject();
 
 // @dynamic
 class AXDateTime {
-    constructor(value = new Date(), calendar = AXConfig.get('dateTime.type') || 'gregorian') {
+    constructor(value = new Date(), calendar = AXConfig.get(`dateTime.calendar`)) {
+        debugger;
         this._calendar =
-            // typeof calendar == 'string'
-            //   ? eval(`new ${AX_CALENDARS.find((c) => c.name == calendar).type}()`)
-            //   : calendar;
             typeof calendar == 'string'
                 ? AXConfig.get(`dateTime.calendars.${calendar}`)
                 : calendar;
@@ -222,7 +177,7 @@ class AXDateTime {
             this._date = new Date(value);
         }
     }
-    static convert(value, calendar = AXConfig.get('dateTime.type') || 'gregorian') {
+    static convert(value, calendar = AXConfig.get('dateTime.calendar')) {
         let date;
         if (typeof value === 'string' || value instanceof String) {
             date = new AXDateTime(value, calendar);
@@ -290,8 +245,7 @@ class AXDateTime {
     endOf(unit = 'day') {
         return this._calendar.endOf(this.date, unit);
     }
-    format(format = AXConfig.get('dateTime.shortDateFormat') ||
-        'DDD, dd MMM yyyy') {
+    format(format = AXConfig.get('dateTime.shortDateFormat')) {
         format = format.replace('ss', this.pad(this.date.getSeconds(), 2));
         format = format.replace('s', this.date.getSeconds().toString());
         format = format.replace('dd', this.pad(this.calendar.dayOfMonth(this.date), 2));
@@ -472,7 +426,7 @@ class AXDateTimePipe {
         }
         const date = value instanceof AXDateTime ? value.clone() : AXDateTime.convert(value, calendar);
         if (!format) {
-            return date.toString();
+            return date.format(AXConfig.get('dateTime.shortDateFormat'));
         }
         else {
             return date.format(format);
@@ -1004,7 +958,9 @@ class AXDateTimeModule {
                 calendars: {
                     jalali: new JalaliCalendar(),
                     gregorian: new GeorgianCalendar()
-                }
+                },
+                calendar: 'gregorian',
+                shortDateFormat: 'DDD, dd MMM yyyy'
             }
         });
     }
@@ -1105,7 +1061,7 @@ class AXTranslator {
         AXTranslator.lang = lang;
     }
     static get(key, lang) {
-        return AXObjectUtil.getPropByPath(AXTranslator[`__data__${lang || AXTranslator.lang}`], key) || key;
+        return _.get(AXTranslator[`__data__${lang || AXTranslator.lang}`], key, key);
     }
 }
 AXTranslator.lang = 'en';
@@ -1271,5 +1227,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "13.1.1", ngImpor
  * Generated bundle index. Do not edit.
  */
 
-export { AXCalendarMonth, AXConfig, AXCoreModule, AXDateTime, AXDateTimeModule, AXDateTimePipe, AXDateTimeRange, AXDrawingUtil, AXEventService, AXHotkeysService, AXObjectUtil, AXPlatform, AXPlatformEvent, AXSafePipe, AXStringUtil, AXTranslationModule, AXTranslator, AXTranslatorPipe, GeorgianCalendar, testUserAgent };
+export { AXCalendarMonth, AXConfig, AXCoreModule, AXDateTime, AXDateTimeModule, AXDateTimePipe, AXDateTimeRange, AXDrawingUtil, AXEventService, AXHotkeysService, AXObjectUtil, AXPlatform, AXPlatformEvent, AXSafePipe, AXStringUtil, AXTranslationModule, AXTranslator, AXTranslatorPipe, GeorgianCalendar, JalaliCalendar, testUserAgent };
 //# sourceMappingURL=acorex-core.mjs.map