bruce-models 1.3.7 → 1.3.9

package/dist/lib/client-file/client-file.js

@@ -21,16 +21,19 @@ var ClientFile;
         return `${api_1.Api.ECacheKey.ClientFile}${api_1.Api.ECacheKey.Id}${fileId}`;
     }
     ClientFile.GetCacheKey = GetCacheKey;
-    function GetUrl(api, fileId) {
+    function GetUrl(params) {
+        const { api, fileId } = params;
         return `${api.GetBaseUrl()}file/${fileId}`;
     }
     ClientFile.GetUrl = GetUrl;
-    function GetUrlWithExt(api, file) {
+    function GetUrlWithExt(params) {
+        const { api, file } = params;
         return `${api.GetBaseUrl()}file/${file.ID}${file.FileExt ? file.FileExt : ""}`;
     }
     ClientFile.GetUrlWithExt = GetUrlWithExt;
-    function Get(api, fileId, reqParams) {
+    function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, fileId, req: reqParams } = params;
             if (!fileId) {
                 throw ("File ID is required.");
             }
@@ -39,14 +42,25 @@ var ClientFile;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`file/${fileId}/details`, api_1.Api.PrepReqParams(reqParams));
-            api.Cache.Set(key, req, api_1.Api.DEFAULT_CACHE_DURATION);
-            return req;
+            const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const data = yield api.GET(`file/${fileId}/details`, api_1.Api.PrepReqParams(reqParams));
+                    res({
+                        clientFile: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            api.Cache.Set(key, prom, api_1.Api.DEFAULT_CACHE_DURATION);
+            return prom;
         });
     }
     ClientFile.Get = Get;
-    function Delete(api, fileIds, reqParams) {
+    function Delete(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, fileIds, req: reqParams } = params;
             if (!fileIds.length) {
                 throw ("File IDs are required.");
             }
@@ -61,8 +75,9 @@ var ClientFile;
         });
     }
     ClientFile.Delete = Delete;
-    function Upload(api, file, purpose, reqParams) {
+    function Upload(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, file, purpose, req } = params;
             if (!file) {
                 throw ("File is required.");
             }
@@ -72,30 +87,42 @@ var ClientFile;
                     "Purpose": purpose
                 };
             }
-            const params = api_1.Api.PrepReqParams(reqParams);
-            params.formData = formData;
-            return api.UPLOAD("file/uploadNew", file, params);
+            const reqParams = api_1.Api.PrepReqParams(req);
+            reqParams.formData = formData;
+            const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const data = yield api.UPLOAD("file/uploadNew", file, reqParams);
+                    res({
+                        clientFile: data
+                    });
+                }
+                catch (e) {
+                    rej(e);
+                }
+            }));
+            return prom;
         });
     }
     ClientFile.Upload = Upload;
     /**
      * Uploads a temp file.
      * This will return a temp file id which can be used in various endpoints.
-     * @param api
-     * @param file
-     * @param reqParams
+     * @param params
      * @returns
      */
-    function UploadTemp(api, file, reqParams) {
+    function UploadTemp(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, file, req } = params;
             if (!file) {
                 throw ("File is required.");
             }
             const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const params = api_1.Api.PrepReqParams(reqParams);
-                    const data = yield api.UPLOAD("file/uploadTemp", file, params);
-                    res(data["TempFile.ID"]);
+                    const reqParams = api_1.Api.PrepReqParams(req);
+                    const data = yield api.UPLOAD("file/uploadTemp", file, reqParams);
+                    res({
+                        tempFileId: data["TempFile.ID"]
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -107,38 +134,37 @@ var ClientFile;
     ClientFile.UploadTemp = UploadTemp;
     let Filter;
     (function (Filter) {
-        let V1;
-        (function (V1) {
-            let EColumn;
-            (function (EColumn) {
-                EColumn["ID"] = "id";
-                EColumn["Name"] = "name";
-                EColumn["DateTime"] = "datetime";
-                EColumn["MIMEType"] = "mimeType";
-                EColumn["Size"] = "size";
-                EColumn["User"] = "user";
-                EColumn["Extension"] = "extension";
-            })(EColumn = V1.EColumn || (V1.EColumn = {}));
-            let ESortOrder;
-            (function (ESortOrder) {
-                ESortOrder["ASC"] = "asc";
-                ESortOrder["DEC"] = "desc";
-            })(ESortOrder = V1.ESortOrder || (V1.ESortOrder = {}));
-            let ERowOperator;
-            (function (ERowOperator) {
-                ERowOperator["AND"] = "AND";
-                ERowOperator["OR"] = "OR";
-            })(ERowOperator = V1.ERowOperator || (V1.ERowOperator = {}));
-            function GetList(api, filter, reqParams) {
-                return __awaiter(this, void 0, void 0, function* () {
-                    const data = yield api.POST("files/filtered", filter, api_1.Api.PrepReqParams(reqParams));
-                    return data.Items;
-                });
-            }
-            V1.GetList = GetList;
-        })(V1 = Filter.V1 || (Filter.V1 = {}));
-        // TODO: Helpers for constructing the filter.
+        let EColumn;
+        (function (EColumn) {
+            EColumn["ID"] = "id";
+            EColumn["Name"] = "name";
+            EColumn["DateTime"] = "datetime";
+            EColumn["MIMEType"] = "mimeType";
+            EColumn["Size"] = "size";
+            EColumn["User"] = "user";
+            EColumn["Extension"] = "extension";
+        })(EColumn = Filter.EColumn || (Filter.EColumn = {}));
+        let ESortOrder;
+        (function (ESortOrder) {
+            ESortOrder["ASC"] = "asc";
+            ESortOrder["DEC"] = "desc";
+        })(ESortOrder = Filter.ESortOrder || (Filter.ESortOrder = {}));
+        let ERowOperator;
+        (function (ERowOperator) {
+            ERowOperator["AND"] = "AND";
+            ERowOperator["OR"] = "OR";
+        })(ERowOperator = Filter.ERowOperator || (Filter.ERowOperator = {}));
     })(Filter = ClientFile.Filter || (ClientFile.Filter = {}));
+    function GetList(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { api, filter, req: reqParams } = params;
+            const data = yield api.POST("files/filtered", filter, api_1.Api.PrepReqParams(reqParams));
+            return {
+                clientFiles: data.Items
+            };
+        });
+    }
+    ClientFile.GetList = GetList;
     let Processor;
     (function (Processor) {
         let EConvertExt;
@@ -146,8 +172,9 @@ var ClientFile;
             EConvertExt["GLB"] = ".glb";
             EConvertExt["SKP"] = ".skp";
         })(EConvertExt = Processor.EConvertExt || (Processor.EConvertExt = {}));
-        function ConvertFormat(api, clientFileId, ext, reqParams) {
+        function ConvertFormat(params) {
             return __awaiter(this, void 0, void 0, function* () {
+                const { api, fileId: clientFileId, ext, req: reqParams } = params;
                 if (!clientFileId || !ext) {
                     throw ("Client File ID and extension are required.");
                 }

package/dist/lib/client-file/client-file.js.map

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

package/dist/lib/common/bruce-variable.js

@@ -30,7 +30,8 @@ var BruceVariable;
      * @param legacyParse
      * @returns
      */
-    function SwapValues(str, data, legacyParse) {
+    function SwapValues(params) {
+        let { str, entity: data, legacyParse } = params;
         if (!legacyParse) {
             legacyParse = false;
         }
@@ -40,7 +41,10 @@ var BruceVariable;
                 const path = legacyParse ? path_utils_1.PathUtils.ParseLegacy(variable.path) : path_utils_1.PathUtils.Parse(variable.path);
                 let value = "";
                 if (path.length > 0) {
-                    value = entity_1.Entity.GetValue(data, path);
+                    value = entity_1.Entity.GetValue({
+                        entity: data,
+                        path: path
+                    });
                 }
                 str = str.replace(variable.text, value);
             }

package/dist/lib/common/bruce-variable.js.map

@@ -1 +1 @@
-{"version":3,"file":"bruce-variable.js","sourceRoot":"","sources":["../../../src/common/bruce-variable.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,mDAA+C;AAE/C,SAAS,WAAW,CAAC,GAAW;IAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;QACZ,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE;YACV,IAAI,KAAK,GAAG,GAAG,EAAE;gBACb,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;aACnF;SACJ;KACJ;IACD,OAAY,IAAI,CAAC;AACrB,CAAC;AAED;;;;;GAKG;AACH,IAAiB,aAAa,CA4B7B;AA5BD,WAAiB,aAAa;IAC1B;;;;;;OAMG;IACH,SAAgB,UAAU,CAAC,GAAW,EAAE,IAAoB,EAAE,WAAqB;QAC/E,IAAI,CAAC,WAAW,EAAE;YACd,WAAW,GAAG,KAAK,CAAC;SACvB;QACD,OAAO,IAAI,EAAE;YACT,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,QAAQ,EAAE;gBACV,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,sBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,sBAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACjG,IAAI,KAAK,GAAG,EAAE,CAAC;gBACf,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjB,KAAK,GAAG,eAAM,CAAC,QAAQ,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;iBACvC;gBACD,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC3C;iBACI;gBACD,MAAM;aACT;SACJ;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IAnBe,wBAAU,aAmBzB,CAAA;AACL,CAAC,EA5BgB,aAAa,GAAb,qBAAa,KAAb,qBAAa,QA4B7B"}
+{"version":3,"file":"bruce-variable.js","sourceRoot":"","sources":["../../../src/common/bruce-variable.ts"],"names":[],"mappings":";;;AAAA,6CAA0C;AAC1C,mDAA+C;AAE/C,SAAS,WAAW,CAAC,GAAW;IAC5B,MAAM,KAAK,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;IAChC,IAAI,KAAK,GAAG,CAAC,CAAC,EAAE;QACZ,MAAM,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC7B,IAAI,GAAG,GAAG,CAAC,CAAC,EAAE;YACV,IAAI,KAAK,GAAG,GAAG,EAAE;gBACb,OAAO,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,GAAG,CAAC,EAAE,GAAG,CAAC,EAAE,IAAI,EAAE,GAAG,CAAC,SAAS,CAAC,KAAK,EAAE,GAAG,CAAC,EAAE,CAAC;aACnF;SACJ;KACJ;IACD,OAAY,IAAI,CAAC;AACrB,CAAC;AAED;;;;;GAKG;AACH,IAAiB,aAAa,CAoC7B;AApCD,WAAiB,aAAa;IAC1B;;;;;;OAMG;IACH,SAAgB,UAAU,CAAC,MAI1B;QACG,IAAI,EAAE,GAAG,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,GAAG,MAAM,CAAC;QAChD,IAAI,CAAC,WAAW,EAAE;YACd,WAAW,GAAG,KAAK,CAAC;SACvB;QACD,OAAO,IAAI,EAAE;YACT,MAAM,QAAQ,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC;YAClC,IAAI,QAAQ,EAAE;gBACV,MAAM,IAAI,GAAG,WAAW,CAAC,CAAC,CAAC,sBAAS,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,sBAAS,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,CAAC,CAAC;gBACjG,IAAI,KAAK,GAAG,EAAE,CAAC;gBACf,IAAI,IAAI,CAAC,MAAM,GAAG,CAAC,EAAE;oBACjB,KAAK,GAAG,eAAM,CAAC,QAAQ,CAAC;wBACpB,MAAM,EAAE,IAAI;wBACZ,IAAI,EAAE,IAAI;qBACb,CAAC,CAAC;iBACN;gBACD,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,EAAE,KAAK,CAAC,CAAC;aAC3C;iBACI;gBACD,MAAM;aACT;SACJ;QACD,OAAO,GAAG,CAAC;IACf,CAAC;IA3Be,wBAAU,aA2BzB,CAAA;AACL,CAAC,EApCgB,aAAa,GAAb,qBAAa,KAAb,qBAAa,QAoC7B"}

package/dist/lib/common/geometry.js

@@ -48,17 +48,17 @@ var Geometry;
         return filteredList;
     }
     Geometry.RemoveRepeatPoints = RemoveRepeatPoints;
-    function ParsePoints(data) {
-        data = data.replace(/[^\d.,-\s]/g, "");
+    function ParsePoints(pointsStr) {
+        pointsStr = pointsStr.replace(/[^\d.,-\s]/g, "");
         let splitterCoordinates = " ";
         let splitterAxis = ",";
-        const commaIndex = data.indexOf(",");
-        const spaceIndex = data.indexOf(" ");
+        const commaIndex = pointsStr.indexOf(",");
+        const spaceIndex = pointsStr.indexOf(" ");
         if ((spaceIndex > -1 && commaIndex > spaceIndex) || commaIndex <= -1) {
             splitterCoordinates = ",";
             splitterAxis = " ";
         }
-        let points = data.trim().split(splitterCoordinates);
+        let points = pointsStr.trim().split(splitterCoordinates);
         points = points.filter(a => a != "");
         const result = [];
         for (let i = 0; i < points.length; i++) {

package/dist/lib/common/geometry.js.map

@@ -1 +1 @@
-{"version":3,"file":"geometry.js","sourceRoot":"","sources":["../../../src/common/geometry.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"geometry.js","sourceRoot":"","sources":["../../../src/common/geometry.ts"],"names":[],"mappings":";;;AAEA;;GAEG;AACH,IAAiB,QAAQ,CAkIxB;AAlID,WAAiB,QAAQ;IAiBrB,IAAY,gBAGX;IAHD,WAAY,gBAAgB;QACxB,sCAAkB,CAAA;QAClB,+BAAW,CAAA;IACf,CAAC,EAHW,gBAAgB,GAAhB,yBAAgB,KAAhB,yBAAgB,QAG3B;IAED;;;;;OAKG;IACH,SAAgB,iBAAiB,CAAC,MAAsB;QACpD,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE;YAChB,MAAK,CAAC,kBAAkB,CAAC,CAAC;SAC7B;QACD,IAAI,KAAK,GAAiB,MAAM,CAAC,CAAC,CAAC,CAAC;QACpC,IAAI,UAAU,GAAG,GAAG,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;QAC/G,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,KAAK,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAClB,UAAU,IAAI,IAAI,KAAK,CAAC,SAAS,IAAI,KAAK,CAAC,QAAQ,EAAE,GAAG,CAAC,KAAK,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;SAChH;QACD,OAAO,UAAU,CAAC;IACtB,CAAC;IAXe,0BAAiB,oBAWhC,CAAA;IAED;;;;;OAKG;IACH,SAAgB,kBAAkB,CAAC,SAAyB;QACxD,MAAM,YAAY,GAAG,EAAE,CAAC;QACxB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACvC,MAAM,GAAG,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;YACzB,MAAM,OAAO,GAAG,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,YAAY,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC;YACvF,IAAI,CAAC,OAAO,IAAI,CAAC,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,IAAI,GAAG,CAAC,SAAS,IAAI,OAAO,CAAC,SAAS,IAAI,GAAG,CAAC,QAAQ,IAAI,OAAO,CAAC,QAAQ,CAAC,EAAE;gBAC1H,YAAY,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;aAC1B;SACJ;QACD,OAAO,YAAY,CAAC;IACxB,CAAC;IAVe,2BAAkB,qBAUjC,CAAA;IAED,SAAgB,WAAW,CAAC,SAAiB;QACzC,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC,CAAC;QAEjD,IAAI,mBAAmB,GAAG,GAAG,CAAC;QAC9B,IAAI,YAAY,GAAG,GAAG,CAAC;QACvB,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1C,MAAM,UAAU,GAAG,SAAS,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;QAC1C,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC,IAAI,UAAU,GAAG,UAAU,CAAC,IAAI,UAAU,IAAI,CAAC,CAAC,EAAE;YAClE,mBAAmB,GAAG,GAAG,CAAC;YAC1B,YAAY,GAAG,GAAG,CAAC;SACtB;QAED,IAAI,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;QACzD,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC;QAErC,MAAM,MAAM,GAAmB,EAAE,CAAC;QAClC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YACpC,MAAM,SAAS,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;YAC5B,MAAM,MAAM,GAAG,SAAS,CAAC,IAAI,EAAE,CAAC,KAAK,CAAC,YAAY,CAAC,CAAC;YACpD,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,IAAI,MAAM,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC1C,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBACpC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;gBACnC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,IAAI,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAC5D,IAAI,SAAS,IAAI,IAAI,IAAI,QAAQ,IAAI,IAAI,EAAE;oBACvC,MAAM,CAAC,IAAI,CAAC;wBACR,QAAQ,EAAE,QAAQ;wBAClB,QAAQ,EAAE,QAAQ;wBAClB,SAAS,EAAE,SAAS;qBACvB,CAAC,CAAC;iBACN;qBACI;oBACD,OAAO,CAAC,IAAI,CAAC,8BAA8B,EAAE,SAAS,CAAC,CAAC;iBAC3D;aACJ;SACJ;QACD,OAAO,MAAM,CAAC;IAClB,CAAC;IApCe,oBAAW,cAoC1B,CAAA;IAED;;;;;OAKG;IACH,SAAgB,aAAa,CAAC,QAAa;QACvC,IAAI,OAAO,QAAQ,IAAI,QAAQ,EAAE;YAC7B,IAAI,SAAS,GAAmB,EAAE,CAAC;YACnC,MAAM,cAAc,GAAa,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;YAC7D,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,cAAc,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;gBAC5C,MAAM,IAAI,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;gBAC/B,MAAM,MAAM,GAAG,WAAW,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,MAAM,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE;oBAC7B,SAAS,GAAG,SAAS,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;iBACxC;aACJ;YACD,SAAS,GAAG,kBAAkB,CAAC,SAAS,CAAC,CAAC;YAC1C,MAAM,WAAW,GAAc,EAAE,CAAC;YAClC,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gBACtB,MAAM,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC9B,WAAW,CAAC,KAAK,GAAG,GAAG,QAAQ,CAAC,QAAQ,IAAI,QAAQ,CAAC,SAAS,EAAE,GAAG,CAAC,QAAQ,CAAC,QAAQ,IAAI,IAAI,CAAC,CAAC,CAAC,IAAI,QAAQ,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;gBAC9H,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtB,WAAW,CAAC,OAAO,GAAG,CAAC,EAAE,MAAM,EAAE,gBAAgB,CAAC,UAAU,EAAE,UAAU,EAAE,iBAAiB,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;iBAC7G;gBACD,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;oBACtB,WAAW,CAAC,UAAU,GAAG,iBAAiB,CAAC,SAAS,CAAC,CAAC;iBACzD;aACJ;YACD,OAAO,WAAW,CAAC;SACtB;QACD,OAAO,QAAQ,CAAC;IACpB,CAAC;IA1Be,sBAAa,gBA0B5B,CAAA;AACL,CAAC,EAlIgB,QAAQ,GAAR,gBAAQ,KAAR,gBAAQ,QAkIxB"}

package/dist/lib/custom-form/custom-form.js

@@ -33,8 +33,9 @@ var CustomForm;
         EType["Form"] = "GENERIC";
         EType["Markup"] = "MARKUP";
     })(EType = CustomForm.EType || (CustomForm.EType = {}));
-    function Get(api, id, reqParams) {
+    function Get(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, formId: id, req: reqParams } = params;
             if (!id) {
                 throw ("Id is required.");
             }
@@ -42,14 +43,25 @@ var CustomForm;
             if (cacheData) {
                 return cacheData;
             }
-            const req = api.GET(`customForm/${id}`, api_1.Api.PrepReqParams(reqParams));
-            api.Cache.Set(GetCacheKey(id), req, api_1.Api.DEFAULT_CACHE_DURATION);
-            return req;
+            const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const data = yield api.GET(`customForm/${id}`, api_1.Api.PrepReqParams(reqParams));
+                    res({
+                        form: data
+                    });
+                }
+                catch (err) {
+                    rej(err);
+                }
+            }));
+            api.Cache.Set(GetCacheKey(id), prom, api_1.Api.DEFAULT_CACHE_DURATION);
+            return prom;
         });
     }
     CustomForm.Get = Get;
-    function Delete(api, id, reqParams) {
+    function Delete(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, formId: id, req: reqParams } = params;
             if (!id) {
                 throw ("Id is required.");
             }
@@ -58,8 +70,9 @@ var CustomForm;
         });
     }
     CustomForm.Delete = Delete;
-    function GetList(api, typeId, reqParams) {
+    function GetList(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, entityTypeId: typeId, req: reqParams } = params;
             const url = typeId ? `entityType/${typeId}/customForms` : "customForms";
             const cacheData = api.GetCacheItem(GetListCacheKey(typeId), reqParams);
             if (cacheData) {
@@ -67,21 +80,26 @@ var CustomForm;
             }
             const req = api.GET(url, api_1.Api.PrepReqParams(reqParams));
             const prom = req.then((data) => {
-                return data.Items;
+                return {
+                    forms: data.Items
+                };
             });
             api.Cache.Set(GetListCacheKey(typeId), prom, api_1.Api.DEFAULT_CACHE_DURATION);
             return prom;
         });
     }
     CustomForm.GetList = GetList;
-    function Update(api, data, reqParams) {
+    function Update(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, form: data, reqParams } = params;
             if (!data.ID) {
                 data.ID = 0;
             }
-            data = yield api.POST(`customForm/${data.ID}`, data, api_1.Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`customForm/${data.ID}`, data, api_1.Api.PrepReqParams(reqParams));
             api.Cache.RemoveByStartsWith(api_1.Api.ECacheKey.CustomForm);
-            return data;
+            return {
+                form: res
+            };
         });
     }
     CustomForm.Update = Update;

package/dist/lib/custom-form/custom-form.js.map

@@ -1 +1 @@
-{"version":3,"file":"custom-form.js","sourceRoot":"","sources":["../../../src/custom-form/custom-form.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAKjC;;;GAGG;AACH,IAAiB,UAAU,CAoE1B;AApED,WAAiB,UAAU;IACvB,SAAgB,WAAW,CAAC,EAAU;QAClC,OAAO,SAAG,CAAC,SAAS,CAAC,UAAU,GAAG,SAAG,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAC5D,CAAC;IAFe,sBAAW,cAE1B,CAAA;IAED,SAAgB,eAAe,CAAC,MAAc;QAC1C,IAAI,MAAM,EAAE;YACR,OAAO,SAAG,CAAC,SAAS,CAAC,UAAU,GAAG,SAAG,CAAC,SAAS,CAAC,UAAU,GAAG,SAAG,CAAC,SAAS,CAAC,EAAE,GAAG,MAAM,CAAC;SAC1F;QACD,OAAO,SAAG,CAAC,SAAS,CAAC,UAAU,CAAC;IACpC,CAAC;IALe,0BAAe,kBAK9B,CAAA;IAUD,IAAY,KAGX;IAHD,WAAY,KAAK;QACb,yBAAgB,CAAA;QAChB,0BAAiB,CAAA;IACrB,CAAC,EAHW,KAAK,GAAL,gBAAK,KAAL,gBAAK,QAGhB;IAED,SAAsB,GAAG,CAAC,GAAiB,EAAE,EAAU,EAAE,SAA0B;;YAC/E,IAAI,CAAC,EAAE,EAAE;gBACL,MAAK,CAAC,iBAAiB,CAAC,CAAC;aAC5B;YACD,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,SAAS,CAAC,CAAC;YAC/D,IAAI,SAAS,EAAE;gBACX,OAAO,SAAS,CAAC;aACpB;YACD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,cAAc,EAAE,EAAE,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;YACtE,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,SAAG,CAAC,sBAAsB,CAAC,CAAC;YAChE,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAXqB,cAAG,MAWxB,CAAA;IAED,SAAsB,MAAM,CAAC,GAAiB,EAAE,EAAU,EAAE,SAA0B;;YAClF,IAAI,CAAC,EAAE,EAAE;gBACL,MAAK,CAAC,iBAAiB,CAAC,CAAC;aAC5B;YACD,MAAM,GAAG,CAAC,MAAM,CAAC,cAAc,EAAE,EAAE,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAA;YAClE,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;QAC3D,CAAC;KAAA;IANqB,iBAAM,SAM3B,CAAA;IAED,SAAsB,OAAO,CAAC,GAAiB,EAAE,MAAc,EAAE,SAA0B;;YACvF,MAAM,GAAG,GAAG,MAAM,CAAC,CAAC,CAAC,cAAc,MAAM,cAAc,CAAC,CAAC,CAAC,aAAa,CAAC;YACxE,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,SAAS,CAAC,CAAC;YACvE,IAAI,SAAS,EAAE;gBACX,OAAO,SAAS,CAAC;aACpB;YACD,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC,GAAG,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;YACvD,MAAM,IAAI,GAAG,GAAG,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE;gBAC3B,OAAO,IAAI,CAAC,KAAK,CAAC;YACtB,CAAC,CAAC,CAAC;YACH,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,SAAG,CAAC,sBAAsB,CAAC,CAAC;YACzE,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAZqB,kBAAO,UAY5B,CAAA;IAED,SAAsB,MAAM,CAAC,GAAiB,EAAE,IAAW,EAAE,SAA0B;;YACnF,IAAI,CAAC,IAAI,CAAC,EAAE,EAAE;gBACV,IAAI,CAAC,EAAE,GAAG,CAAC,CAAC;aACf;YACD,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,cAAc,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;YACnF,GAAG,CAAC,KAAK,CAAC,kBAAkB,CAAC,SAAG,CAAC,SAAS,CAAC,UAAU,CAAC,CAAC;YACvD,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IAPqB,iBAAM,SAO3B,CAAA;AACL,CAAC,EApEgB,UAAU,GAAV,kBAAU,KAAV,kBAAU,QAoE1B"}
+{"version":3,"file":"custom-form.js","sourceRoot":"","sources":["../../../src/custom-form/custom-form.ts"],"names":[],"mappings":"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"}

package/dist/lib/data-lab/data-lab.js

@@ -18,33 +18,33 @@ var DataLab;
         EReqKey["Primary"] = "PrimarySelection";
         EReqKey["Secondary"] = "SecondarySelection";
     })(EReqKey = DataLab.EReqKey || (DataLab.EReqKey = {}));
-    let Entity;
-    (function (Entity) {
-        function GetList(api, query, key, skip, load, reqParams) {
-            return __awaiter(this, void 0, void 0, function* () {
-                if (!key) {
-                    key = EReqKey.Primary;
+    function Run(params) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let { api, query, key, skip, load, req: reqParams } = params;
+            if (!key) {
+                key = EReqKey.Primary;
+            }
+            if (!skip) {
+                skip = 0;
+            }
+            if (!load) {
+                load = 50;
+            }
+            const req = api.POST(`entities/datalab/getMatchingEntities/${key}?skip=${skip}&load=${load}`, query, api_1.Api.PrepReqParams(reqParams));
+            const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const data = yield req;
+                    res({
+                        entities: data.Items
+                    });
                 }
-                if (!skip) {
-                    skip = 0;
+                catch (e) {
+                    rej(e);
                 }
-                if (!load) {
-                    load = 50;
-                }
-                const req = api.POST(`entities/datalab/getMatchingEntities/${key}?skip=${skip}&load=${load}`, query, api_1.Api.PrepReqParams(reqParams));
-                const prom = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
-                    try {
-                        const data = yield req;
-                        res(data.Items);
-                    }
-                    catch (e) {
-                        rej(e);
-                    }
-                }));
-                return prom;
-            });
-        }
-        Entity.GetList = GetList;
-    })(Entity = DataLab.Entity || (DataLab.Entity = {}));
+            }));
+            return prom;
+        });
+    }
+    DataLab.Run = Run;
 })(DataLab = exports.DataLab || (exports.DataLab = {}));
 //# sourceMappingURL=data-lab.js.map

package/dist/lib/data-lab/data-lab.js.map

@@ -1 +1 @@
-{"version":3,"file":"data-lab.js","sourceRoot":"","sources":["../../../src/data-lab/data-lab.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAIjC,IAAiB,OAAO,CAoDvB;AApDD,WAAiB,OAAO;IACpB,IAAY,OAGX;IAHD,WAAY,OAAO;QACf,uCAA4B,CAAA;QAC5B,2CAAgC,CAAA;IACpC,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;IAaD,IAAiB,MAAM,CAkCtB;IAlCD,WAAiB,MAAM;QACnB,SAAsB,OAAO,CACrB,GAAiB,EACjB,KAAa,EACb,GAAa,EACb,IAAa,EACb,IAAa,EACb,SAA0B;;gBAE9B,IAAI,CAAC,GAAG,EAAE;oBACN,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;iBACzB;gBACD,IAAI,CAAC,IAAI,EAAE;oBACP,IAAI,GAAG,CAAC,CAAC;iBACZ;gBACD,IAAI,CAAC,IAAI,EAAE;oBACP,IAAI,GAAG,EAAE,CAAC;iBACb;gBAED,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,wCAAwC,GAAG,SAAS,IAAI,SAAS,IAAI,EAAE,EACxF,KAAK,EACL,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAC/B,CAAC;gBACF,MAAM,IAAI,GAAyB,IAAI,OAAO,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;oBAC9D,IAAI;wBACA,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC;wBACvB,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;qBACnB;oBACD,OAAO,CAAC,EAAE;wBACN,GAAG,CAAC,CAAC,CAAC,CAAC;qBACV;gBACL,CAAC,CAAA,CAAC,CAAC;gBACH,OAAO,IAAI,CAAC;YAChB,CAAC;SAAA;QAhCqB,cAAO,UAgC5B,CAAA;IACL,CAAC,EAlCgB,MAAM,GAAN,cAAM,KAAN,cAAM,QAkCtB;AACL,CAAC,EApDgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAoDvB"}
+{"version":3,"file":"data-lab.js","sourceRoot":"","sources":["../../../src/data-lab/data-lab.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAIjC,IAAiB,OAAO,CAuDvB;AAvDD,WAAiB,OAAO;IACpB,IAAY,OAGX;IAHD,WAAY,OAAO;QACf,uCAA4B,CAAA;QAC5B,2CAAgC,CAAA;IACpC,CAAC,EAHW,OAAO,GAAP,eAAO,KAAP,eAAO,QAGlB;IAaD,SAAsB,GAAG,CAAC,MAOzB;;YAIG,IAAI,EAAE,GAAG,EAAE,KAAK,EAAE,GAAG,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,EAAE,SAAS,EAAE,GAAG,MAAM,CAAC;YAC7D,IAAI,CAAC,GAAG,EAAE;gBACN,GAAG,GAAG,OAAO,CAAC,OAAO,CAAC;aACzB;YACD,IAAI,CAAC,IAAI,EAAE;gBACP,IAAI,GAAG,CAAC,CAAC;aACZ;YACD,IAAI,CAAC,IAAI,EAAE;gBACP,IAAI,GAAG,EAAE,CAAC;aACb;YACD,MAAM,GAAG,GAAG,GAAG,CAAC,IAAI,CAAC,wCAAwC,GAAG,SAAS,IAAI,SAAS,IAAI,EAAE,EACxF,KAAK,EACL,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAC/B,CAAC;YACF,MAAM,IAAI,GAAiB,IAAI,OAAO,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;gBACtD,IAAI;oBACA,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC;oBACvB,GAAG,CAAC;wBACA,QAAQ,EAAE,IAAI,CAAC,KAAK;qBACvB,CAAC,CAAC;iBACN;gBACD,OAAO,CAAC,EAAE;oBACN,GAAG,CAAC,CAAC,CAAC,CAAC;iBACV;YACL,CAAC,CAAA,CAAC,CAAC;YACH,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IArCqB,WAAG,MAqCxB,CAAA;AACL,CAAC,EAvDgB,OAAO,GAAP,eAAO,KAAP,eAAO,QAuDvB"}

package/dist/lib/entity/entity-attachment-type.js

@@ -30,8 +30,9 @@ var EntityAttachmentType;
         EType["Photo"] = "photo";
         EType["Document"] = "document";
     })(EType = EntityAttachmentType.EType || (EntityAttachmentType.EType = {}));
-    function Delete(api, id, reqParams) {
+    function Delete(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, attachmentTypeId: id, req: reqParams } = params;
             if (!id) {
                 throw ("Type ID is required.");
             }
@@ -41,20 +42,24 @@ var EntityAttachmentType;
         });
     }
     EntityAttachmentType.Delete = Delete;
-    function Update(api, data, reqParams) {
+    function Update(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, attachmentType: data, req: reqParams } = params;
             if (!(data === null || data === void 0 ? void 0 : data.ID)) {
                 throw ("Type ID is required.");
             }
-            data = yield api.POST(`entityAttachmentType/${data.ID}`, data, api_1.Api.PrepReqParams(reqParams));
+            const res = yield api.POST(`entityAttachmentType/${data.ID}`, data, api_1.Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data.ID));
             api.Cache.Remove(GetListCacheKey());
-            return data;
+            return {
+                attachmentType: res
+            };
         });
     }
     EntityAttachmentType.Update = Update;
-    function GetList(api, reqParams) {
+    function GetList(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, reqParams } = params;
             const cacheData = api.GetCacheItem(GetListCacheKey(), reqParams);
             if (cacheData) {
                 return cacheData;
@@ -62,7 +67,9 @@ var EntityAttachmentType;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET(`entityAttachmentTypes`, api_1.Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        attachmentTypes: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);

package/dist/lib/entity/entity-attachment-type.js.map

@@ -1 +1 @@
-{"version":3,"file":"entity-attachment-type.js","sourceRoot":"","sources":["../../../src/entity/entity-attachment-type.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oCAAiC;AAKjC;;;GAGG;AACH,IAAiB,oBAAoB,CAwDpC;AAxDD,WAAiB,oBAAoB;IACjC,SAAgB,WAAW,CAAC,EAAQ;QAChC,OAAO,SAAG,CAAC,SAAS,CAAC,cAAc,GAAG,SAAG,CAAC,SAAS,CAAC,EAAE,GAAG,EAAE,CAAC;IAChE,CAAC;IAFe,gCAAW,cAE1B,CAAA;IAED,SAAgB,eAAe;QAC3B,OAAO,SAAG,CAAC,SAAS,CAAC,cAAc,CAAC;IACxC,CAAC;IAFe,oCAAe,kBAE9B,CAAA;IAQD,IAAY,KAGX;IAHD,WAAY,KAAK;QACb,wBAAe,CAAA;QACf,8BAAqB,CAAA;IACzB,CAAC,EAHW,KAAK,GAAL,0BAAK,KAAL,0BAAK,QAGhB;IAED,SAAsB,MAAM,CAAC,GAAiB,EAAE,EAAQ,EAAE,SAA0B;;YAChF,IAAI,CAAC,EAAE,EAAE;gBACL,MAAK,CAAC,sBAAsB,CAAC,CAAC;aACjC;YACD,MAAM,GAAG,CAAC,MAAM,CAAC,wBAAwB,EAAE,EAAE,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7E,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,EAAE,CAAC,CAAC,CAAC;YAClC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;QACxC,CAAC;KAAA;IAPqB,2BAAM,SAO3B,CAAA;IAED,SAAsB,MAAM,CAAC,GAAiB,EAAE,IAAW,EAAE,SAA0B;;YACnF,IAAI,EAAC,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,EAAE,CAAA,EAAE;gBACX,MAAK,CAAC,sBAAsB,CAAC,CAAC;aACjC;YACD,IAAI,GAAG,MAAM,GAAG,CAAC,IAAI,CAAC,wBAAwB,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;YAC7F,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,WAAW,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YACvC,GAAG,CAAC,KAAK,CAAC,MAAM,CAAC,eAAe,EAAE,CAAC,CAAC;YACpC,OAAO,IAAI,CAAC;QAChB,CAAC;KAAA;IARqB,2BAAM,SAQ3B,CAAA;IAED,SAAsB,OAAO,CAAC,GAAiB,EAAE,SAA0B;;YACvE,MAAM,SAAS,GAAG,GAAG,CAAC,YAAY,CAAC,eAAe,EAAE,EAAE,SAAS,CAAC,CAAC;YACjE,IAAI,SAAS,EAAE;gBACX,OAAO,SAAS,CAAC;aACpB;YACD,MAAM,GAAG,GAAqB,IAAI,OAAO,CAAC,CAAO,GAAG,EAAE,GAAG,EAAE,EAAE;gBACzD,IAAI;oBACA,MAAM,IAAI,GAAG,MAAM,GAAG,CAAC,GAAG,CAAC,uBAAuB,EAAE,SAAG,CAAC,aAAa,CAAC,SAAS,CAAC,CAAC,CAAC;oBAClF,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;iBACnB;gBACD,OAAO,CAAC,EAAE;oBACN,GAAG,CAAC,CAAC,CAAC,CAAC;iBACV;YACL,CAAC,CAAA,CAAC,CAAC;YACH,GAAG,CAAC,KAAK,CAAC,GAAG,CAAC,eAAe,EAAE,EAAE,GAAG,CAAC,CAAC;YACtC,OAAO,GAAG,CAAC;QACf,CAAC;KAAA;IAhBqB,4BAAO,UAgB5B,CAAA;AACL,CAAC,EAxDgB,oBAAoB,GAApB,4BAAoB,KAApB,4BAAoB,QAwDpC"}
+{"version":3,"file":"entity-attachment-type.js","sourceRoot":"","sources":["../../../src/entity/entity-attachment-type.ts"],"names":[],"mappings":"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"}

package/dist/lib/entity/entity-attachment.js

@@ -26,21 +26,25 @@ var EntityAttachment;
         return api_1.Api.ECacheKey.Attachment + api_1.Api.ECacheKey.Entity + api_1.Api.ECacheKey.Id + entityId;
     }
     EntityAttachment.GetListCacheKey = GetListCacheKey;
-    function Update(api, data, reqParams) {
+    function Update(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, attachment: data, req: reqParams } = params;
             if (!(data === null || data === void 0 ? void 0 : data["Entity.ID"]) || !(data === null || data === void 0 ? void 0 : data["EntityAttachmentType.ID"]) || !(data === null || data === void 0 ? void 0 : data["ClientFile.ID"])) {
                 throw ("Entity ID, Type ID, and File ID are required.");
             }
             const url = `entity/${data["Entity.ID"]}/attachment/${data.oldAttachmentTypeId}/${data["ClientFile.ID"]}`;
-            data = yield api.PUT(url, data, api_1.Api.PrepReqParams(reqParams));
+            const res = yield api.PUT(url, data, api_1.Api.PrepReqParams(reqParams));
             api.Cache.Remove(GetCacheKey(data["Entity.ID"], data["EntityAttachmentType.ID"], data["ClientFile.ID"]));
             api.Cache.RemoveByStartsWith(GetListCacheKey(data["Entity.ID"]));
-            return data;
+            return {
+                attachment: res
+            };
         });
     }
     EntityAttachment.Update = Update;
-    function UpdateOrder(api, entityId, typeId, fileIds, reqParams) {
+    function UpdateOrder(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, entityId, attachmentTypeId: typeId, fileIds, req: reqParams } = params;
             if (!entityId || !typeId || !(fileIds === null || fileIds === void 0 ? void 0 : fileIds.length)) {
                 throw ("Entity ID, Type ID, and File IDs are required.");
             }
@@ -56,8 +60,9 @@ var EntityAttachment;
         });
     }
     EntityAttachment.UpdateOrder = UpdateOrder;
-    function Delete(api, data, reqParams) {
+    function Delete(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, attachment: data, req: reqParams } = params;
             if (!(data === null || data === void 0 ? void 0 : data["Entity.ID"]) || !(data === null || data === void 0 ? void 0 : data["EntityAttachmentType.ID"]) || !(data === null || data === void 0 ? void 0 : data["ClientFile.ID"])) {
                 throw ("Entity ID, Type ID, and File ID are required.");
             }
@@ -70,8 +75,9 @@ var EntityAttachment;
         });
     }
     EntityAttachment.Delete = Delete;
-    function DeleteByFileIds(api, entityId, typeId, fileIds, reqParams) {
+    function DeleteByFileIds(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, entityId, attachmentTypeId: typeId, fileIds, req: reqParams } = params;
             if (!entityId || !typeId || !(fileIds === null || fileIds === void 0 ? void 0 : fileIds.length)) {
                 throw ("Entity ID, Type ID, and File IDs are required.");
             }
@@ -86,8 +92,9 @@ var EntityAttachment;
         });
     }
     EntityAttachment.DeleteByFileIds = DeleteByFileIds;
-    function GetListByEntityId(api, entityId, reqParams) {
+    function GetListByEntityId(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, entityId, req: reqParams } = params;
             if (!entityId) {
                 throw ("Entity ID is required.");
             }
@@ -98,7 +105,9 @@ var EntityAttachment;
             const req = new Promise((res, rej) => __awaiter(this, void 0, void 0, function* () {
                 try {
                     const data = yield api.GET(`entity/${entityId}/attachments`, api_1.Api.PrepReqParams(reqParams));
-                    res(data.Items);
+                    res({
+                        attachments: data.Items
+                    });
                 }
                 catch (e) {
                     rej(e);
@@ -109,15 +118,18 @@ var EntityAttachment;
         });
     }
     EntityAttachment.GetListByEntityId = GetListByEntityId;
-    function Upload(api, file, entityId, typeId, reqParams) {
+    function Upload(params) {
         return __awaiter(this, void 0, void 0, function* () {
+            const { api, file, entityId, attachmentTypeId: typeId, req: reqParams } = params;
             if (!entityId || !typeId || !file) {
                 throw ("Entity ID, Type ID, and File are required.");
             }
             const url = `entity/${entityId}/attachment/${typeId}`;
-            const req = yield api.UPLOAD(url, file, reqParams);
+            const res = yield api.UPLOAD(url, file, reqParams);
             api.Cache.RemoveByStartsWith(GetListCacheKey(entityId));
-            return req;
+            return {
+                attachment: res
+            };
         });
     }
     EntityAttachment.Upload = Upload;