@singularsystems/neo-core 0.10.38 → 0.10.42

package/dist/Data/ApiDataSource.d.ts

@@ -2,12 +2,13 @@ import { AsyncDataSource, IAsyncDataSource } from './AsyncDataSource';
 import { AxiosPromise } from 'axios';
 import List from '../Model/List';
 export interface IApiDataSource<T> extends IAsyncDataSource<T> {
-    copy(): IApiDataSource<T>;
 }
 export declare class CallbackDataSource<T> extends AsyncDataSource<T> {
     private callBack;
+    private defaultData;
     constructor(callBack: () => Promise<any>, defaultData: T);
     protected getDataAsync(): Promise<any>;
+    copy(): IAsyncDataSource<T>;
 }
 /**
  * Allows an api endpoint to be used directly by a consumer such as a drop down element.

package/dist/Data/ApiDataSource.js

@@ -9,12 +9,18 @@ var CallbackDataSource = /** @class */ (function (_super) {
     function CallbackDataSource(callBack, defaultData) {
         var _this = _super.call(this, defaultData) || this;
         _this.callBack = callBack;
+        _this.defaultData = defaultData;
         return _this;
     }
+    CallbackDataSource_1 = CallbackDataSource;
     CallbackDataSource.prototype.getDataAsync = function () {
         return this.callBack();
     };
-    CallbackDataSource = __decorate([
+    CallbackDataSource.prototype.copy = function () {
+        return new CallbackDataSource_1(this.callBack, this.defaultData);
+    };
+    var CallbackDataSource_1;
+    CallbackDataSource = CallbackDataSource_1 = __decorate([
         NeoModel,
         __metadata("design:paramtypes", [Function, Object])
     ], CallbackDataSource);

package/dist/Data/ApiDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"ApiDataSource.js","sourceRoot":"","sources":["../../src/Data/ApiDataSource.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"ApiDataSource.js","sourceRoot":"","sources":["../../src/Data/ApiDataSource.ts"],"names":[],"mappings":"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"}

package/dist/Data/AsyncDataSource.d.ts

@@ -17,6 +17,7 @@ export interface IAsyncDataSource<T> {
     readonly fetchError: string | null;
     /** Current promise created as a result of fetchData being called. */
     readonly promise: Promise<T> | null;
+    copy(): IAsyncDataSource<T>;
 }
 export declare abstract class AsyncDataSource<T> implements IAsyncDataSource<T> {
     isLoading: boolean;
@@ -30,4 +31,5 @@ export declare abstract class AsyncDataSource<T> implements IAsyncDataSource<T>
     private executeFetchAsync;
     fetchDataAsync(clearPreviousError?: boolean): Promise<T>;
     fetchInitial(): Promise<T>;
+    abstract copy(): IAsyncDataSource<T>;
 }

package/dist/Data/AsyncDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"AsyncDataSource.js","sourceRoot":"","sources":["../../src/Data/AsyncDataSource.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAgCjD;IAkBI,yBAAY,WAAc;QAhB1B,cAAS,GAAY,KAAK,CAAC;QAU3B,eAAU,GAAkB,IAAI,CAAC;QAEjC,YAAO,GAAsB,IAAI,CAAC;QAExB,eAAU,GAAG,KAAK,CAAC;QAGzB,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;IAC5B,CAAC;IAhBD,sBAAW,qCAAQ;aAAnB;YACI,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;QAC9C,CAAC;;;OAAA;IAkBa,2CAAiB,GAA/B;;;;;;;6BACQ,CAAA,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA,EAAnC,wBAAmC;wBACnC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;wBAEtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;;;;wBAGlB,qBAAM,IAAI,CAAC,OAAO,EAAA;;wBAAzB,SAAO,SAAkB;wBAC/B,KAAK,CAAC,WAAW,CAAC;4BACd,KAAI,CAAC,IAAI,GAAG,MAAI,CAAC;4BACjB,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;wBAC3B,CAAC,CAAC,CAAC;wBACH,sBAAO,MAAI,EAAC;;;wBAEZ,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;wBACvB,IAAI,CAAC,UAAU,GAAG,GAAC,CAAC;wBACpB,OAAO,CAAC,GAAG,CAAC,GAAC,CAAC,CAAC;wBACf,MAAM,GAAC,CAAC;4BAGhB,sBAAO,IAAI,CAAC,OAAO,EAAC;;;;KACvB;IAEM,wCAAc,GAArB,UAAsB,kBAAmC;QAAnC,mCAAA,EAAA,0BAAmC;QACrD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,kBAAkB,EAAE;YACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;SAC1B;QACD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,OAAQ,CAAC;IACzB,CAAC;IAEM,sCAAY,GAAnB;QACI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,IAAI,CAAC,cAAc,EAAE,CAAC;SACzB;QACD,OAAO,IAAI,CAAC,OAAQ,CAAC;IACzB,CAAC;IA3DD;QADC,UAAU,EAAE;;sDACc;IAO3B;QADC,UAAU,EAAE;;iDACL;IAGR;QADC,UAAU,EAAE;;uDACoB;IAkDrC,sBAAC;CAAA,AA9DD,IA8DC;SA9DqB,eAAe"}
+{"version":3,"file":"AsyncDataSource.js","sourceRoot":"","sources":["../../src/Data/AsyncDataSource.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,KAAK,EAAE,MAAM,UAAU,CAAC;AACjC,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAkCjD;IAkBI,yBAAY,WAAc;QAhB1B,cAAS,GAAY,KAAK,CAAC;QAU3B,eAAU,GAAkB,IAAI,CAAC;QAEjC,YAAO,GAAsB,IAAI,CAAC;QAExB,eAAU,GAAG,KAAK,CAAC;QAGzB,IAAI,CAAC,IAAI,GAAG,WAAW,CAAC;IAC5B,CAAC;IAhBD,sBAAW,qCAAQ;aAAnB;YACI,OAAO,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAC;QAC9C,CAAC;;;OAAA;IAkBa,2CAAiB,GAA/B;;;;;;;6BACQ,CAAA,CAAC,IAAI,CAAC,SAAS,IAAI,CAAC,IAAI,CAAC,UAAU,CAAA,EAAnC,wBAAmC;wBACnC,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC;wBAEtB,IAAI,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,EAAE,CAAC;;;;wBAGlB,qBAAM,IAAI,CAAC,OAAO,EAAA;;wBAAzB,SAAO,SAAkB;wBAC/B,KAAK,CAAC,WAAW,CAAC;4BACd,KAAI,CAAC,IAAI,GAAG,MAAI,CAAC;4BACjB,KAAI,CAAC,SAAS,GAAG,KAAK,CAAC;wBAC3B,CAAC,CAAC,CAAC;wBACH,sBAAO,MAAI,EAAC;;;wBAEZ,IAAI,CAAC,SAAS,GAAG,KAAK,CAAC;wBACvB,IAAI,CAAC,UAAU,GAAG,GAAC,CAAC;wBACpB,OAAO,CAAC,GAAG,CAAC,GAAC,CAAC,CAAC;wBACf,MAAM,GAAC,CAAC;4BAGhB,sBAAO,IAAI,CAAC,OAAO,EAAC;;;;KACvB;IAEM,wCAAc,GAArB,UAAsB,kBAAmC;QAAnC,mCAAA,EAAA,0BAAmC;QACrD,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;QACvB,IAAI,kBAAkB,EAAE;YACpB,IAAI,CAAC,UAAU,GAAG,IAAI,CAAC;SAC1B;QACD,IAAI,CAAC,iBAAiB,EAAE,CAAC;QACzB,OAAO,IAAI,CAAC,OAAQ,CAAC;IACzB,CAAC;IAEM,sCAAY,GAAnB;QACI,IAAI,CAAC,IAAI,CAAC,UAAU,EAAE;YAClB,IAAI,CAAC,cAAc,EAAE,CAAC;SACzB;QACD,OAAO,IAAI,CAAC,OAAQ,CAAC;IACzB,CAAC;IA3DD;QADC,UAAU,EAAE;;sDACc;IAO3B;QADC,UAAU,EAAE;;iDACL;IAGR;QADC,UAAU,EAAE;;uDACoB;IAoDrC,sBAAC;CAAA,AAhED,IAgEC;SAhEqB,eAAe"}

package/dist/Data/CacheService.d.ts

@@ -1,3 +1,4 @@
+import { IAsyncDataSource } from './AsyncDataSource';
 import { AxiosPromise } from 'axios';
 import { DataCacheEntry } from './DataCacheEntry';
 import { PlainObject } from '../Model/IModelBase';
@@ -11,18 +12,22 @@ export declare class CachedDataService implements ICachedDataService {
     constructor(base?: CachedDataService);
     /**
      * Registers an api datasource.
-     * @param key Unique key used for later retrieval.
      * @param apiEndpoint Api endpoint from which to get data.
      * @param lifeTimeMinutes No of minutes from the data retrieval time that the cache is valid for.
      */
     protected register<T>(apiEndpoint: string, lifeTimeMinutes: number, defaultData?: T): DataCacheEntry<T>;
     /**
      * Registers an api datasource.
-     * @param key Unique key used for later retrieval.
      * @param apiEndpoint ClientApi method from which to get data.
      * @param lifeTimeMinutes No of minutes from the data retrieval time that the cache is valid for.
      */
     protected register<T>(apiMethod: () => AxiosPromise<T>, lifeTimeMinutes: number, defaultData?: T): DataCacheEntry<T>;
+    /**
+     * Registers a datasource.
+     * @param dataSource An async data source.
+     * @param lifeTimeMinutes No of minutes from the data retrieval time that the cache is valid for.
+     */
+    protected register<T>(dataSource: IAsyncDataSource<T>, lifeTimeMinutes: number): DataCacheEntry<T>;
     /**
      * Registers an api datasource which contains a list of data. The data from the api endpoint will be deserialised into models of the provided child type.
      * @param childType Child type to create when deserialising data.

package/dist/Data/CacheService.js

@@ -11,14 +11,17 @@ var CachedDataService = /** @class */ (function () {
             base.children.push(this);
         }
     }
-    CachedDataService.prototype.register = function (apiEndpoint, lifeTimeMinutes, defaultData) {
+    CachedDataService.prototype.register = function (apiEndpointOrDataSource, lifeTimeMinutes, defaultData) {
         if (defaultData === void 0) { defaultData = []; }
         var apiSource;
-        if (apiEndpoint instanceof Function) {
-            apiSource = new ApiClientDataSource(apiEndpoint, defaultData);
+        if (apiEndpointOrDataSource.fetchDataAsync !== undefined) {
+            apiSource = apiEndpointOrDataSource;
+        }
+        else if (apiEndpointOrDataSource instanceof Function) {
+            apiSource = new ApiClientDataSource(apiEndpointOrDataSource, defaultData);
         }
         else {
-            apiSource = new ApiDataSource(apiEndpoint, defaultData);
+            apiSource = new ApiDataSource(apiEndpointOrDataSource, defaultData);
         }
         var cacheEntry = new DataCacheEntry(apiSource, lifeTimeMinutes);
         ;

package/dist/Data/CacheService.js.map

@@ -1 +1 @@
-{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../../src/Data/CacheService.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,aAAa,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAChH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAmB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAOnE,wCAAwC;AAExC;IAKI,2BAAY,IAAwB;QAH5B,gBAAW,GAAsB,EAAE,CAAC;QACpC,aAAQ,GAAyB,EAAE,CAAC;QAGxC,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC5B;IACL,CAAC;IAkBS,oCAAQ,GAAlB,UAAsB,WAA6C,EAAE,eAAuB,EAAE,WAAgC;QAAhC,4BAAA,EAAA,cAAc,EAAkB;QAE1H,IAAI,SAA4B,CAAC;QACjC,IAAI,WAAW,YAAY,QAAQ,EAAE;YACjC,SAAS,GAAG,IAAI,mBAAmB,CAAI,WAAW,EAAE,WAAW,CAAC,CAAC;SACpE;aAAM;YACH,SAAS,GAAG,IAAI,aAAa,CAAI,WAAW,EAAE,WAAW,CAAC,CAAC;SAC9D;QAED,IAAM,UAAU,GAAG,IAAI,cAAc,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAAA,CAAC;QACnE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,UAAU,CAAC;IACtB,CAAC;IAED;;;;;OAKG;IACO,wCAAY,GAAtB,UAA0B,SAAwB,EAAE,SAA+C,EAAE,eAAuB;QAExH,IAAI,UAAU,GAAG,IAAI,yBAAyB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAErE,IAAM,UAAU,GAAG,IAAI,cAAc,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAAA,CAAC;QACpE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,uBAAuB;IAChB,qCAAS,GAAhB,UAAiB,iBAAyB;QAAzB,kCAAA,EAAA,yBAAyB;QACtC,KAAyB,UAAgB,EAAhB,KAAA,IAAI,CAAC,WAAW,EAAhB,cAAgB,EAAhB,IAAgB,EAAE;YAAtC,IAAM,UAAU,SAAA;YACjB,UAAU,CAAC,MAAM,EAAE,CAAC;SACvB;QACD,IAAI,iBAAiB,EAAE;YACnB,KAAwB,UAAa,EAAb,KAAA,IAAI,CAAC,QAAQ,EAAb,cAAa,EAAb,IAAa,EAAE;gBAAlC,IAAM,SAAS,SAAA;gBAChB,SAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;aAC1C;SACJ;IACL,CAAC;IAlEQ,iBAAiB;QAD7B,UAAU,EAAE;yCAMU,iBAAiB;OAL3B,iBAAiB,CAmE7B;IAAD,wBAAC;CAAA,AAnED,IAmEC;SAnEY,iBAAiB"}
+{"version":3,"file":"CacheService.js","sourceRoot":"","sources":["../../src/Data/CacheService.ts"],"names":[],"mappings":";AAAA,OAAO,EAAkB,aAAa,EAAE,mBAAmB,EAAE,yBAAyB,EAAE,MAAM,iBAAiB,CAAC;AAEhH,OAAO,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAEvC,OAAO,EAAmB,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAOnE,wCAAwC;AAExC;IAKI,2BAAY,IAAwB;QAH5B,gBAAW,GAAsB,EAAE,CAAC;QACpC,aAAQ,GAAyB,EAAE,CAAC;QAGxC,IAAI,IAAI,EAAE;YACN,IAAI,CAAC,QAAQ,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;SAC5B;IACL,CAAC;IAuBS,oCAAQ,GAAlB,UAAsB,uBAA+E,EAAE,eAAuB,EAAE,WAAgC;QAAhC,4BAAA,EAAA,cAAc,EAAkB;QAE5J,IAAI,SAA8B,CAAC;QACnC,IAAK,uBAA+C,CAAC,cAAc,KAAK,SAAS,EAAE;YAC/E,SAAS,GAAG,uBAA8C,CAAC;SAC9D;aAAM,IAAI,uBAAuB,YAAY,QAAQ,EAAE;YACpD,SAAS,GAAG,IAAI,mBAAmB,CAAI,uBAAuB,EAAE,WAAW,CAAC,CAAC;SAChF;aAAM;YACH,SAAS,GAAG,IAAI,aAAa,CAAI,uBAAiC,EAAE,WAAW,CAAC,CAAC;SACpF;QAED,IAAM,UAAU,GAAG,IAAI,cAAc,CAAC,SAAS,EAAE,eAAe,CAAC,CAAC;QAAA,CAAC;QACnE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,UAAU,CAAC;IACtB,CAAC;IAED;;;;;OAKG;IACO,wCAAY,GAAtB,UAA0B,SAAwB,EAAE,SAA+C,EAAE,eAAuB;QAExH,IAAI,UAAU,GAAG,IAAI,yBAAyB,CAAC,SAAS,EAAE,SAAS,CAAC,CAAC;QAErE,IAAM,UAAU,GAAG,IAAI,cAAc,CAAC,UAAU,EAAE,eAAe,CAAC,CAAC;QAAA,CAAC;QACpE,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;QAClC,OAAO,UAAU,CAAC;IACtB,CAAC;IAED,uBAAuB;IAChB,qCAAS,GAAhB,UAAiB,iBAAyB;QAAzB,kCAAA,EAAA,yBAAyB;QACtC,KAAyB,UAAgB,EAAhB,KAAA,IAAI,CAAC,WAAW,EAAhB,cAAgB,EAAhB,IAAgB,EAAE;YAAtC,IAAM,UAAU,SAAA;YACjB,UAAU,CAAC,MAAM,EAAE,CAAC;SACvB;QACD,IAAI,iBAAiB,EAAE;YACnB,KAAwB,UAAa,EAAb,KAAA,IAAI,CAAC,QAAQ,EAAb,cAAa,EAAb,IAAa,EAAE;gBAAlC,IAAM,SAAS,SAAA;gBAChB,SAAS,CAAC,SAAS,CAAC,iBAAiB,CAAC,CAAC;aAC1C;SACJ;IACL,CAAC;IAzEQ,iBAAiB;QAD7B,UAAU,EAAE;yCAMU,iBAAiB;OAL3B,iBAAiB,CA0E7B;IAAD,wBAAC;CAAA,AA1ED,IA0EC;SA1EY,iBAAiB"}

package/dist/Data/DataCacheEntry.d.ts

@@ -1,7 +1,7 @@
-import { IApiDataSource } from "./ApiDataSource";
+import { IAsyncDataSource } from "./AsyncDataSource";
 export interface IDataCacheEntry {
     expire(refetch?: boolean): void;
-    get(): IApiDataSource<any>;
+    get(): IAsyncDataSource<any>;
     /**
      * Will return true if the data has expired, or the data source is loading.
      */
@@ -12,13 +12,13 @@ export declare class DataCacheEntry<T> implements IDataCacheEntry {
     private dataSource;
     private lifeTimeMinutes;
     private expiryDate;
-    constructor(dataSource: IApiDataSource<T>, lifeTimeMinutes: number);
+    constructor(dataSource: IAsyncDataSource<T>, lifeTimeMinutes: number);
     get isExpired(): boolean;
     get willLoad(): boolean;
     /**
      * Gets an api datasource which was previously registered. Datasource will re-fetch its data if the data lifetime has been exceeded.
      */
-    get(clearPreviousError?: boolean): IApiDataSource<T>;
+    get(clearPreviousError?: boolean): IAsyncDataSource<T>;
     /**
      * Returns a promise from which data can be obtained. Data will be re-fetched if the lifetime has been exceeded.
      */
@@ -26,7 +26,7 @@ export declare class DataCacheEntry<T> implements IDataCacheEntry {
     /**
      * Returns a new instance of the api datasource which is not cached. Fetch will not be initiated.
      */
-    getNew(): IApiDataSource<T>;
+    getNew(): IAsyncDataSource<T>;
     /**
      * Expires the datasource.
      * @param refetch True if the datasource must be refetched. This will cause any consumers of this datasource to rebind to the updated data.

package/dist/Data/DataCacheEntry.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataCacheEntry.js","sourceRoot":"","sources":["../../src/Data/DataCacheEntry.ts"],"names":[],"mappings":"AAcA;IAII,wBAAoB,UAA6B,EAAU,eAAuB;QAA9D,eAAU,GAAV,UAAU,CAAmB;QAAU,oBAAe,GAAf,eAAe,CAAQ;QAF1E,eAAU,GAAU,IAAI,IAAI,EAAE,CAAC;IAIvC,CAAC;IAED,sBAAW,qCAAS;aAApB;YACI,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACnD,CAAC;;;OAAA;IAED,sBAAW,oCAAQ;aAAnB;YACI,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC;QACtD,CAAC;;;OAAA;IAED;;OAEG;IACI,4BAAG,GAAV,UAAW,kBAA0B;QAA1B,mCAAA,EAAA,0BAA0B;QACjC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED;;OAEG;IACI,qCAAY,GAAnB;QACI,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAQ,CAAC;IACnC,CAAC;IAED;;OAEG;IACI,+BAAM,GAAb;QACI,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IAED;;;OAGG;IACI,+BAAM,GAAb,UAAe,OAAe;QAAf,wBAAA,EAAA,eAAe;QAC1B,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,cAAc,EAAE,CAAC;SACzB;IACL,CAAC;IAEO,kCAAS,GAAjB;QACI,IAAI,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;IACjC,CAAC;IAEO,uCAAc,GAAtB,UAAuB,kBAAmC;QAA1D,iBASC;QATsB,mCAAA,EAAA,0BAAmC;QACtD,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YAChF,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,UAAA,CAAC;gBACtD,KAAI,CAAC,SAAS,EAAE,CAAA;gBAChB,sDAAsD;YAC1D,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IACL,qBAAC;AAAD,CAAC,AA/DD,IA+DC"}
+{"version":3,"file":"DataCacheEntry.js","sourceRoot":"","sources":["../../src/Data/DataCacheEntry.ts"],"names":[],"mappings":"AAcA;IAII,wBAAoB,UAA+B,EAAU,eAAuB;QAAhE,eAAU,GAAV,UAAU,CAAqB;QAAU,oBAAe,GAAf,eAAe,CAAQ;QAF5E,eAAU,GAAU,IAAI,IAAI,EAAE,CAAC;IAIvC,CAAC;IAED,sBAAW,qCAAS;aAApB;YACI,OAAO,IAAI,CAAC,GAAG,EAAE,IAAI,IAAI,CAAC,UAAU,CAAC,OAAO,EAAE,CAAC;QACnD,CAAC;;;OAAA;IAED,sBAAW,oCAAQ;aAAnB;YACI,OAAO,IAAI,CAAC,UAAU,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC;QACtD,CAAC;;;OAAA;IAED;;OAEG;IACI,4BAAG,GAAV,UAAW,kBAA0B;QAA1B,mCAAA,EAAA,0BAA0B;QACjC,IAAI,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC;QACxC,OAAO,IAAI,CAAC,UAAU,CAAC;IAC3B,CAAC;IAED;;OAEG;IACI,qCAAY,GAAnB;QACI,OAAO,IAAI,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAQ,CAAC;IACnC,CAAC;IAED;;OAEG;IACI,+BAAM,GAAb;QACI,OAAO,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,CAAC;IAClC,CAAC;IAED;;;OAGG;IACI,+BAAM,GAAb,UAAe,OAAe;QAAf,wBAAA,EAAA,eAAe;QAC1B,IAAI,CAAC,SAAS,EAAE,CAAC;QACjB,IAAI,OAAO,EAAE;YACT,IAAI,CAAC,cAAc,EAAE,CAAC;SACzB;IACL,CAAC;IAEO,kCAAS,GAAjB;QACI,IAAI,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;IACjC,CAAC;IAEO,uCAAc,GAAtB,UAAuB,kBAAmC;QAA1D,iBASC;QATsB,mCAAA,EAAA,0BAAmC;QACtD,IAAI,IAAI,CAAC,SAAS,EAAE;YAChB,IAAI,CAAC,UAAU,GAAG,IAAI,IAAI,EAAE,CAAC;YAC7B,IAAI,CAAC,UAAU,CAAC,UAAU,CAAC,IAAI,CAAC,UAAU,CAAC,UAAU,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC;YAChF,IAAI,CAAC,UAAU,CAAC,cAAc,CAAC,kBAAkB,CAAC,CAAC,KAAK,CAAC,UAAA,CAAC;gBACtD,KAAI,CAAC,SAAS,EAAE,CAAA;gBAChB,sDAAsD;YAC1D,CAAC,CAAC,CAAC;SACN;IACL,CAAC;IACL,qBAAC;AAAD,CAAC,AA/DD,IA+DC"}

package/dist/Data/DataView.js

@@ -101,22 +101,22 @@ var DataViewBase = /** @class */ (function () {
                 for (var _i = 0, sortInfo_1 = sortInfo; _i < sortInfo_1.length; _i++) {
                     var sortColumn = sortInfo_1[_i];
                     var valueFn = void 0;
-                    var propertyKey = sortColumn.column.propertyName;
+                    var property = sortColumn.column;
                     if (sortColumn.column.hasSortValue) {
-                        valueFn = DataViewBase.getSortValueSortFn(propertyKey);
+                        valueFn = DataViewBase.getSortValueSortFn(property.propertyName);
                     }
                     else {
-                        if (DataViewBase.useFrameworkSortCompareFn(filtered[0], propertyKey)) {
-                            valueFn = DataViewBase.frameworkSortValueFn(propertyKey);
+                        if (DataViewBase.useFrameworkSortCompareFn(filtered[0], property.propertyName)) {
+                            valueFn = DataViewBase.frameworkSortValueFn(property.propertyName);
                         }
                         else {
-                            valueFn = DataViewBase.getDefaultSortValueFn(propertyKey);
+                            valueFn = DataViewBase.getDefaultSortValueFn(property.propertyName);
                         }
                     }
-                    sortFns.push({ valueFn: valueFn, direction: sortColumn.sortAscending ? "asc" : "desc" });
+                    sortFns.push({ property: property, valueFn: valueFn, direction: sortColumn.sortAscending ? "asc" : "desc" });
                 }
                 for (var i = sortFns.length - 1; i >= 0; i--) {
-                    itemsToSort.sortBy(sortFns[i].valueFn, sortFns[i].direction);
+                    itemsToSort.sortBy(sortFns[i].valueFn, sortFns[i].direction, sortFns[i].property.propertyType);
                 }
                 return __spreadArrays(itemsToSort, endItems);
             }

package/dist/Data/DataView.js.map

@@ -1 +1 @@
-{"version":3,"file":"DataView.js","sourceRoot":"","sources":["../../src/Data/DataView.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"DataView.js","sourceRoot":"","sources":["../../src/Data/DataView.ts"],"names":[],"mappings":"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"}

package/dist/Data/Deserialiser.js

@@ -1,5 +1,6 @@
 import { TrackingState, SerialiseType, DataType, RelationType } from '../Model/Misc';
 import { Utils } from '../Utils';
+import Decimal from 'decimal.js-light';
 var Deserialiser = /** @class */ (function () {
     function Deserialiser() {
         this.objectRefs = {};
@@ -163,11 +164,10 @@ var Deserialiser = /** @class */ (function () {
                         var fromValue = from[key];
                         if (propertyInfo) {
                             if (fromValue && propertyInfo.propertyType === DataType.Date) {
-                                var dateValue = new Date(fromValue);
-                                to[key] = dateValue;
-                                if (to.meta) {
-                                    to.meta[key].sortValue = dateValue.getTime();
-                                }
+                                to[key] = new Date(fromValue);
+                            }
+                            else if (fromValue !== null && propertyInfo.propertyType === DataType.Decimal) {
+                                to[key] = new Decimal(fromValue);
                             }
                             else {
                                 if (fromValue instanceof Array && !propertyInfo.assignOnDeserialise) {

package/dist/Data/Deserialiser.js.map

@@ -1 +1 @@
-{"version":3,"file":"Deserialiser.js","sourceRoot":"","sources":["../../src/Data/Deserialiser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Deserialiser.js","sourceRoot":"","sources":["../../src/Data/Deserialiser.ts"],"names":[],"mappings":"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"}

package/dist/Data/Serialiser.js

@@ -1,7 +1,8 @@
-import { TrackingState, SerialiseType, RelationType, TimeZoneFormat } from '../Model/Misc';
+import { TrackingState, SerialiseType, RelationType, TimeZoneFormat, DataType } from '../Model/Misc';
 import { Deserialiser } from './Deserialiser';
 import ValueObject from '../Model/ValueObject';
 import DateUtils from '../Dates/DateUtils';
+import Decimal from 'decimal.js-light';
 var JSFormatter = /** @class */ (function () {
     function JSFormatter() {
     }
@@ -104,7 +105,7 @@ var Serialiser = /** @class */ (function () {
                         propertyInfo.serialise !== SerialiseType.MappingOnly &&
                         (propertyInfo.serialise !== SerialiseType.FullOnly || this.options.includeClean)) {
                         var fromValue = from[key];
-                        var isChildObject = (fromValue && fromValue instanceof Object && !(fromValue instanceof Date)) || propertyInfo.relationType === RelationType.ChildObject;
+                        var isChildObject = (fromValue && fromValue instanceof Object && !(fromValue instanceof Date) && !(fromValue instanceof Decimal)) || propertyInfo.relationType === RelationType.ChildObject;
                         if (fromValue instanceof Array) {
                             // Arrays of simple types are always included.
                             if (!this.options.suppressChildren || (fromValue.length > 0 && !(fromValue[0] instanceof Object))) {
@@ -131,7 +132,10 @@ var Serialiser = /** @class */ (function () {
                         else {
                             // Simple values and dates
                             if (fromValue !== null || propertyInfo.serialise !== SerialiseType.NotNull) {
-                                if (propertyInfo.timeZoneSerialisation === TimeZoneFormat.None && fromValue instanceof Date) {
+                                if (fromValue !== null && propertyInfo.propertyType === DataType.Decimal) {
+                                    to[key] = fromValue.toNumber();
+                                }
+                                else if (propertyInfo.timeZoneSerialisation === TimeZoneFormat.None && fromValue instanceof Date) {
                                     to[key] = DateUtils.format(fromValue, "yyyy-MM-dd") + "T00:00:00";
                                 }
                                 else {

package/dist/Data/Serialiser.js.map

@@ -1 +1 @@
-{"version":3,"file":"Serialiser.js","sourceRoot":"","sources":["../../src/Data/Serialiser.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Serialiser.js","sourceRoot":"","sources":["../../src/Data/Serialiser.ts"],"names":[],"mappings":"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"}

package/dist/Data/StaticDataSource.d.ts

@@ -1,8 +1,9 @@
-import { AsyncDataSource } from './AsyncDataSource';
+import { AsyncDataSource, IAsyncDataSource } from './AsyncDataSource';
 import { IEnumItem } from '../Model/EnumHelper';
 export declare class StaticDataSource<T> extends AsyncDataSource<T> {
     constructor(staticData: T);
     static fromEnum(enumObject: any): StaticDataSource<IEnumItem[]>;
     getDataAsync(): Promise<T>;
     get willLoad(): boolean;
+    copy(): IAsyncDataSource<T>;
 }

package/dist/Data/StaticDataSource.js

@@ -19,6 +19,9 @@ var StaticDataSource = /** @class */ (function (_super) {
         enumerable: true,
         configurable: true
     });
+    StaticDataSource.prototype.copy = function () {
+        return new StaticDataSource(this.data);
+    };
     return StaticDataSource;
 }(AsyncDataSource));
 export { StaticDataSource };

package/dist/Data/StaticDataSource.js.map

@@ -1 +1 @@
-{"version":3,"file":"StaticDataSource.js","sourceRoot":"","sources":["../../src/Data/StaticDataSource.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAa,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE5D;IAAyC,oCAAkB;IAEvD,0BAAY,UAAa;eACrB,kBAAM,UAAU,CAAC;IACrB,CAAC;IAEM,yBAAQ,GAAf,UAAgB,UAAe;QAC3B,OAAO,IAAI,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,uCAAY,GAAZ;QACI,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,sBAAW,sCAAQ;aAAnB;YACI,OAAO,KAAK,CAAC;QACjB,CAAC;;;OAAA;IACL,uBAAC;AAAD,CAAC,AAjBD,CAAyC,eAAe,GAiBvD"}
+{"version":3,"file":"StaticDataSource.js","sourceRoot":"","sources":["../../src/Data/StaticDataSource.ts"],"names":[],"mappings":";AAAA,OAAO,EAAE,eAAe,EAAoB,MAAM,mBAAmB,CAAC;AACtE,OAAO,EAAa,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAE5D;IAAyC,oCAAkB;IAEvD,0BAAY,UAAa;eACrB,kBAAM,UAAU,CAAC;IACrB,CAAC;IAEM,yBAAQ,GAAf,UAAgB,UAAe;QAC3B,OAAO,IAAI,gBAAgB,CAAC,UAAU,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC;IAC/D,CAAC;IAED,uCAAY,GAAZ;QACI,OAAO,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IACtC,CAAC;IAED,sBAAW,sCAAQ;aAAnB;YACI,OAAO,KAAK,CAAC;QACjB,CAAC;;;OAAA;IAEM,+BAAI,GAAX;QACI,OAAO,IAAI,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC3C,CAAC;IACL,uBAAC;AAAD,CAAC,AArBD,CAAyC,eAAe,GAqBvD"}

package/dist/Extensions.d.ts

@@ -1,5 +1,7 @@
 import { IPropertyInstance } from './Model/PropertyInstance';
 import PropertyInfo from './Model/PropertyInfo';
+import { DataType } from './Misc';
+import Decimal from 'decimal.js-light';
 declare type Group<T> = {
     item: T;
     details: T[];
@@ -24,15 +26,19 @@ declare global {
     }
     interface Array<T> {
         /** Sorts an array by the property name. */
-        sortBy(propertyName: keyof T, direction?: "asc" | "desc"): Array<T>;
+        sortBy(propertyName: keyof T, direction?: "asc" | "desc", dataType?: DataType): Array<T>;
         /** Sorts an array using the value returned for each item by valueFn. */
-        sortBy(valueFn: (item: T) => any, direction?: "asc" | "desc"): Array<T>;
+        sortBy(valueFn: (item: T) => any, direction?: "asc" | "desc", dataType?: DataType): Array<T>;
         /** Removes the item if found in the array. */
         remove(item: T): void;
         /**
          * Returns the sum for a given property.
          */
-        sum(propertyName: keyof T | IPropertyInstance | PropertyInfo | ((item: T) => number)): number;
+        sum<V extends number | Decimal = number>(propertyName: keyof T | IPropertyInstance<V> | PropertyInfo | ((item: T) => number)): V;
+        /**
+         * Returns the sum for a given property.
+         */
+        sumDecimal(propertyName: keyof T | IPropertyInstance<Decimal> | PropertyInfo | ((item: T) => Decimal)): Decimal;
         /**
          * Returns the average for a given property.
          */

package/dist/Extensions.js

@@ -1,4 +1,6 @@
 import { __spreadArrays } from "tslib";
+import { DataType } from './Misc';
+import Decimal from 'decimal.js-light';
 //#region Strings
 String.prototype.format = function () {
     var args = [];
@@ -47,23 +49,46 @@ Number.prototype.compareNE = function CompareNE(y) {
 };
 //#endregion
 //#region Arrays
-Array.prototype.sortBy = function (valueFnOrKey, direction) {
+Array.prototype.sortBy = function (valueFnOrKey, direction, dataType) {
     if (direction === void 0) { direction = "asc"; }
     var delta = direction === "asc" ? -1 : 1;
+    var valueFn;
+    var comparer;
     if (valueFnOrKey instanceof Function) {
-        return this.sort(function (a, b) {
+        valueFn = valueFnOrKey;
+        comparer = function (a, b) {
             var aValue = valueFnOrKey(a);
             var bValue = valueFnOrKey(b);
             return aValue < bValue ? delta : (aValue > bValue ? -delta : 0);
-        });
+        };
     }
     else {
-        return this.sort(function (a, b) {
+        valueFn = function (item) { return item[valueFnOrKey]; };
+        comparer = function (a, b) {
             var aValue = a[valueFnOrKey];
             var bValue = b[valueFnOrKey];
             return aValue < bValue ? delta : (aValue > bValue ? -delta : 0);
-        });
+        };
     }
+    if (dataType === DataType.Decimal) {
+        comparer = function (a, b) {
+            var aValue = valueFn(a);
+            var bValue = valueFn(b);
+            if (aValue === null && bValue === null) {
+                return 0;
+            }
+            else if (aValue === null && bValue !== null) {
+                return -delta;
+            }
+            else if (aValue !== null && bValue === null) {
+                return delta;
+            }
+            else {
+                return bValue.comparedTo(aValue) * delta;
+            }
+        };
+    }
+    return this.sort(comparer);
 };
 Array.prototype.remove = function (item) {
     var index = this.indexOf(item);
@@ -72,19 +97,43 @@ Array.prototype.remove = function (item) {
     }
 };
 function getPropertyName(property) {
-    return property instanceof String ? property :
-        property.propertyInfo ? property.propertyInfo.propertyName :
-            property.propertyName;
+    if (property instanceof String) {
+        return { key: property };
+    }
+    else {
+        var propertyInfo = property;
+        if (property.propertyInfo) {
+            propertyInfo = property.propertyInfo;
+        }
+        return { key: propertyInfo.propertyName, isDecimal: propertyInfo.propertyType === DataType.Decimal };
+    }
 }
 Array.prototype.sum = function (property) {
     if (property instanceof Function) {
         return this.reduce(function (total, item) { return total + property(item); }, 0);
     }
     else {
-        var propertyName_1 = getPropertyName(property);
-        return this.reduce(function (total, item) { return total + item[propertyName_1]; }, 0);
+        var propertyInfo_1 = getPropertyName(property);
+        if (propertyInfo_1.isDecimal) {
+            return sumDecimal(this, propertyInfo_1.key);
+        }
+        else {
+            return this.reduce(function (total, item) { return total + item[propertyInfo_1.key]; }, 0);
+        }
+    }
+};
+Array.prototype.sumDecimal = function (property) {
+    if (property instanceof Function) {
+        return this.reduce(function (total, item) { return total.add(property(item)); }, new Decimal(0));
+    }
+    else {
+        var propertyInfo = getPropertyName(property);
+        return sumDecimal(this, propertyInfo.key);
     }
 };
+function sumDecimal(items, propertyName) {
+    return items.reduce(function (total, item) { return total.add(item[propertyName]); }, new Decimal(0));
+}
 Array.prototype.average = function (property) {
     return this.length === 0 ? 0 : this.sum(property) / this.length;
 };

package/dist/Extensions.js.map

@@ -1 +1 @@
-{"version":3,"file":"Extensions.js","sourceRoot":"","sources":["../src/Extensions.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Extensions.js","sourceRoot":"","sources":["../src/Extensions.ts"],"names":[],"mappings":"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"}

package/dist/FileUtils.js

@@ -8,13 +8,14 @@ var FileUtils = /** @class */ (function () {
             fileName = this.getAttachmentFileNameFromResponse(response);
             blobData = response.data;
         }
-        var blobReference = window.URL.createObjectURL(new Blob([blobData]));
+        var blobReference = window.URL.createObjectURL(blobData);
         var link = document.createElement('a');
         link.href = blobReference;
         link.setAttribute('download', fileName);
         document.body.appendChild(link);
         link.click();
         document.body.removeChild(link);
+        window.URL.revokeObjectURL(blobReference);
     };
     FileUtils.getAttachmentFileNameFromResponse = function (response) {
         var disposition = response.headers["content-disposition"];
@@ -25,11 +26,11 @@ var FileUtils = /** @class */ (function () {
                 return matches[1].replace(/['"]/g, '');
             }
         }
-        var fileNameValue = response.headers["X_FILENAME"];
+        var fileNameValue = response.headers["x_filename"];
         if (fileNameValue) {
             return fileNameValue;
         }
-        throw Error("Filename not found. Make sure the response contains a content-disposition header, and that your CORS policy exposes this header.");
+        throw Error("Filename not found. Make sure the response contains a content-disposition / x_filename header, and that your CORS policy exposes this header.");
     };
     return FileUtils;
 }());

package/dist/FileUtils.js.map

@@ -1 +1 @@
-{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../src/FileUtils.ts"],"names":[],"mappings":"AAEA;IAAA;IAyCA,CAAC;IArCiB,sBAAY,GAA1B,UAA2B,cAA0C,EAAE,QAAiB;QAEpF,IAAI,QAAQ,GAAG,cAAsB,CAAC;QAEtC,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,IAAM,QAAQ,GAAG,cAAqC,CAAC;YACvD,QAAQ,GAAG,IAAI,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;YAC5D,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;SAC5B;QAED,IAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,IAAI,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC;QACvE,IAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;IACpC,CAAC;IAEa,2CAAiC,GAA/C,UAAgD,QAAuB;QAEnE,IAAM,WAAW,GAAW,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACpE,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YACrD,IAAM,aAAa,GAAG,wCAAwC,CAAC;YAC/D,IAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChD,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC/B,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;aAC1C;SACJ;QAED,IAAM,aAAa,GAAW,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7D,IAAI,aAAa,EAAE;YACf,OAAO,aAAa,CAAC;SACxB;QAED,MAAM,KAAK,CAAC,kIAAkI,CAAC,CAAC;IACpJ,CAAC;IACL,gBAAC;AAAD,CAAC,AAzCD,IAyCC"}
+{"version":3,"file":"FileUtils.js","sourceRoot":"","sources":["../src/FileUtils.ts"],"names":[],"mappings":"AAEA;IAAA;IA2CA,CAAC;IAvCiB,sBAAY,GAA1B,UAA2B,cAA0C,EAAE,QAAiB;QAEpF,IAAI,QAAQ,GAAG,cAAsB,CAAC;QAEtC,IAAI,QAAQ,KAAK,SAAS,EAAE;YACxB,IAAM,QAAQ,GAAG,cAAqC,CAAC;YACvD,QAAQ,GAAG,IAAI,CAAC,iCAAiC,CAAC,QAAQ,CAAC,CAAC;YAC5D,QAAQ,GAAG,QAAQ,CAAC,IAAI,CAAC;SAC5B;QAED,IAAM,aAAa,GAAG,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,QAAQ,CAAC,CAAC;QAC3D,IAAM,IAAI,GAAG,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC;QACzC,IAAI,CAAC,IAAI,GAAG,aAAa,CAAC;QAC1B,IAAI,CAAC,YAAY,CAAC,UAAU,EAAE,QAAQ,CAAC,CAAC;QACxC,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAChC,IAAI,CAAC,KAAK,EAAE,CAAC;QACb,QAAQ,CAAC,IAAI,CAAC,WAAW,CAAC,IAAI,CAAC,CAAC;QAEhC,MAAM,CAAC,GAAG,CAAC,eAAe,CAAC,aAAa,CAAC,CAAC;IAC9C,CAAC;IAEa,2CAAiC,GAA/C,UAAgD,QAAuB;QAEnE,IAAM,WAAW,GAAW,QAAQ,CAAC,OAAO,CAAC,qBAAqB,CAAC,CAAC;QACpE,IAAI,WAAW,IAAI,WAAW,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE;YACrD,IAAM,aAAa,GAAG,wCAAwC,CAAC;YAC/D,IAAM,OAAO,GAAG,aAAa,CAAC,IAAI,CAAC,WAAW,CAAC,CAAC;YAChD,IAAI,OAAO,IAAI,IAAI,IAAI,OAAO,CAAC,CAAC,CAAC,EAAE;gBAC/B,OAAO,OAAO,CAAC,CAAC,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC;aAC1C;SACJ;QAED,IAAM,aAAa,GAAW,QAAQ,CAAC,OAAO,CAAC,YAAY,CAAC,CAAC;QAC7D,IAAI,aAAa,EAAE;YACf,OAAO,aAAa,CAAC;SACxB;QAED,MAAM,KAAK,CAAC,+IAA+I,CAAC,CAAC;IACjK,CAAC;IACL,gBAAC;AAAD,CAAC,AA3CD,IA2CC"}