drapcode-utility 1.7.6 → 1.7.8

package/build/encryption/index.d.ts

@@ -1,6 +1,6 @@
 import { AwsConfig, Encryption } from "./model";
-export declare const crypt: (data: any, fields: Array<object>, encryption: Encryption, decrypt: boolean, encrypedRefCollections?: Array<object>) => Promise<any>;
-export declare const processItemEncryptDecrypt: (item: any, fields: Array<object>, encryption: Encryption, decrypt: boolean, encrypedRefCollections?: Array<object>) => Promise<any>;
+export declare const crypt: (data: any, fields: Array<object>, encryption: Encryption, decrypt: boolean, encryptedRefCollections?: Array<object>) => Promise<any>;
+export declare const processItemEncryptDecrypt: (item: any, fields: Array<object>, encryption: Encryption, decrypt: boolean, encryptedRefCollections?: Array<object>) => Promise<any>;
 export declare const processDataEncryptionDecryption: (data: string, encryption: Encryption, decrypt: boolean) => Promise<string>;
 /**
  * This method is used to generate private KEY for KMS ARN

package/build/encryption/index.js

@@ -35,15 +35,6 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
         if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
     }
 };
-var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
-    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
-        if (ar || !(i in from)) {
-            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
-            ar[i] = from[i];
-        }
-    }
-    return to.concat(ar || Array.prototype.slice.call(from));
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processKMSDecryption = exports.cryptFile = exports.drapcodeEncryptDecrypt = exports.decryptDataWithKMS = exports.encryptDataWithKMS = exports.createKMSDataKey = exports.processDataEncryptionDecryption = exports.processItemEncryptDecrypt = exports.crypt = void 0;
 var client_kms_1 = require("@aws-sdk/client-kms");
@@ -51,8 +42,8 @@ var crypt_1 = require("./crypt");
 var file_1 = require("./file");
 var KMS_1 = require("./KMS");
 var drapcode_constant_1 = require("drapcode-constant");
-var crypt = function (data, fields, encryption, decrypt, encrypedRefCollections) {
-    if (encrypedRefCollections === void 0) { encrypedRefCollections = []; }
+var crypt = function (data, fields, encryption, decrypt, encryptedRefCollections) {
+    if (encryptedRefCollections === void 0) { encryptedRefCollections = []; }
     return __awaiter(void 0, void 0, void 0, function () {
         var _a, accessKeyId, secretAccessKey, region, config, plainTextData, promises;
         return __generator(this, function (_b) {
@@ -76,13 +67,13 @@ var crypt = function (data, fields, encryption, decrypt, encrypedRefCollections)
                 case 2:
                     if (!Array.isArray(data)) return [3 /*break*/, 4];
                     promises = data.map(function (item) {
-                        return (0, exports.processItemEncryptDecrypt)(item, fields, encryption, decrypt, encrypedRefCollections);
+                        return (0, exports.processItemEncryptDecrypt)(item, fields, encryption, decrypt, encryptedRefCollections);
                     });
                     return [4 /*yield*/, Promise.all(promises)];
                 case 3:
                     data = _b.sent();
                     return [3 /*break*/, 6];
-                case 4: return [4 /*yield*/, (0, exports.processItemEncryptDecrypt)(data, fields, encryption, decrypt, encrypedRefCollections)];
+                case 4: return [4 /*yield*/, (0, exports.processItemEncryptDecrypt)(data, fields, encryption, decrypt, encryptedRefCollections)];
                 case 5:
                     data = _b.sent();
                     _b.label = 6;
@@ -92,8 +83,8 @@ var crypt = function (data, fields, encryption, decrypt, encrypedRefCollections)
     });
 };
 exports.crypt = crypt;
-var processItemEncryptDecrypt = function (item, fields, encryption, decrypt, encrypedRefCollections) {
-    if (encrypedRefCollections === void 0) { encrypedRefCollections = []; }
+var processItemEncryptDecrypt = function (item, fields, encryption, decrypt, encryptedRefCollections) {
+    if (encryptedRefCollections === void 0) { encryptedRefCollections = []; }
     return __awaiter(void 0, void 0, void 0, function () {
         var _loop_1, _i, _a, fieldName;
         return __generator(this, function (_b) {
@@ -101,35 +92,33 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt, enc
                 case 0:
                     if (!(item && typeof item === "object")) return [3 /*break*/, 4];
                     _loop_1 = function (fieldName) {
-                        var field, promises, _c, _d, _e, _f, refField, _g, _h, _j, _k;
-                        return __generator(this, function (_l) {
-                            switch (_l.label) {
+                        var field, promises, _c, _d, _e, _f, refField, _g, _h;
+                        return __generator(this, function (_j) {
+                            switch (_j.label) {
                                 case 0:
                                     field = fields.find(function (field) { return field.fieldName === fieldName; });
                                     if (!(field && field.encrypted)) return [3 /*break*/, 4];
-                                    if (!(Array.isArray(item[fieldName]) && (field === null || field === void 0 ? void 0 : field.type) === drapcode_constant_1.FieldTypes.static_option.id)) return [3 /*break*/, 2];
+                                    if (!(Array.isArray(item[fieldName]) &&
+                                        drapcode_constant_1.OptionTypeFields.includes(field.type))) return [3 /*break*/, 2];
                                     promises = item[fieldName].map(function (value) {
-                                        return item[fieldName] = (0, exports.processDataEncryptionDecryption)(value, encryption, decrypt);
+                                        return (item[fieldName] = (0, exports.processDataEncryptionDecryption)(value, encryption, decrypt));
                                     });
                                     _c = item;
                                     _d = fieldName;
                                     return [4 /*yield*/, Promise.all(promises)];
                                 case 1:
-                                    _c[_d] = _l.sent();
+                                    _c[_d] = _j.sent();
                                     return [3 /*break*/, 4];
                                 case 2:
                                     _e = item;
                                     _f = fieldName;
                                     return [4 /*yield*/, (0, exports.processDataEncryptionDecryption)(item[fieldName], encryption, decrypt)];
                                 case 3:
-                                    _e[_f] = _l.sent();
-                                    _l.label = 4;
+                                    _e[_f] = _j.sent();
+                                    _j.label = 4;
                                 case 4:
-                                    if (!decrypt) return [3 /*break*/, 8];
-                                    if (!__spreadArray(__spreadArray([], drapcode_constant_1.onlyReferenceField, true), [
-                                        drapcode_constant_1.FieldTypes.createdBy.id,
-                                        drapcode_constant_1.FieldTypes.belongsTo.id,
-                                    ], false).includes(field === null || field === void 0 ? void 0 : field.type)) return [3 /*break*/, 6];
+                                    if (!decrypt) return [3 /*break*/, 6];
+                                    if (!drapcode_constant_1.BelongsCreatedByRefField.includes(field === null || field === void 0 ? void 0 : field.type)) return [3 /*break*/, 6];
                                     refField = field;
                                     if (!refField.refCollection &&
                                         field.type === drapcode_constant_1.FieldTypes.createdBy.id) {
@@ -140,19 +129,11 @@ var processItemEncryptDecrypt = function (item, fields, encryption, decrypt, enc
                                     }
                                     _g = item;
                                     _h = fieldName;
-                                    return [4 /*yield*/, processReferenceItemDecrypt(item[fieldName], encryption, decrypt, refField, encrypedRefCollections)];
+                                    return [4 /*yield*/, processReferenceItemDecrypt(item[fieldName], encryption, decrypt, refField, encryptedRefCollections)];
                                 case 5:
-                                    _g[_h] = _l.sent();
-                                    return [3 /*break*/, 8];
-                                case 6:
-                                    if (!((field === null || field === void 0 ? void 0 : field.type) === drapcode_constant_1.FieldTypes.dynamic_option.id)) return [3 /*break*/, 8];
-                                    _j = item;
-                                    _k = fieldName;
-                                    return [4 /*yield*/, processDynamicFieldDecrypt(item[fieldName], encryption, decrypt, field, encrypedRefCollections)];
-                                case 7:
-                                    _j[_k] = _l.sent();
-                                    _l.label = 8;
-                                case 8: return [2 /*return*/];
+                                    _g[_h] = _j.sent();
+                                    _j.label = 6;
+                                case 6: return [2 /*return*/];
                             }
                         });
                     };
@@ -205,12 +186,12 @@ var processDataEncryptionDecryption = function (data, encryption, decrypt) { ret
     });
 }); };
 exports.processDataEncryptionDecryption = processDataEncryptionDecryption;
-var processReferenceItemDecrypt = function (data, encryption, decrypt, refField, encrypedRefCollections) { return __awaiter(void 0, void 0, void 0, function () {
+var processReferenceItemDecrypt = function (data, encryption, decrypt, refField, encryptedRefCollections) { return __awaiter(void 0, void 0, void 0, function () {
     var refCollection, promises;
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                refCollection = getEncryptedReferenceCollection(encrypedRefCollections, refField).refCollection;
+                refCollection = getEncryptedReferenceCollection(encryptedRefCollections, refField).refCollection;
                 if (!refCollection) return [3 /*break*/, 2];
                 if (!Array.isArray(data)) return [3 /*break*/, 2];
                 promises = data.map(function (item) {
@@ -224,33 +205,12 @@ var processReferenceItemDecrypt = function (data, encryption, decrypt, refField,
         }
     });
 }); };
-var processDynamicFieldDecrypt = function (data, encryption, decrypt, refField, encrypedRefCollections) { return __awaiter(void 0, void 0, void 0, function () {
-    var _a, refCollectionFieldName, refCollection, refCollectionField, promises;
-    return __generator(this, function (_b) {
-        switch (_b.label) {
-            case 0:
-                _a = getEncryptedReferenceCollection(encrypedRefCollections, refField), refCollectionFieldName = _a.refCollectionFieldName, refCollection = _a.refCollection;
-                if (!refCollection) return [3 /*break*/, 2];
-                refCollectionField = refCollection.fields.find(function (field) { return field.fieldName === refCollectionFieldName; });
-                if (!(refCollectionField && refCollectionField.encrypted)) return [3 /*break*/, 2];
-                if (!Array.isArray(data)) return [3 /*break*/, 2];
-                promises = data.map(function (item) {
-                    return (0, exports.processDataEncryptionDecryption)(item, encryption, decrypt);
-                });
-                return [4 /*yield*/, Promise.all(promises)];
-            case 1:
-                data = _b.sent();
-                _b.label = 2;
-            case 2: return [2 /*return*/, data];
-        }
-    });
-}); };
-var getEncryptedReferenceCollection = function (encrypedRefCollections, refField) {
+var getEncryptedReferenceCollection = function (encryptedRefCollections, refField) {
     var _a = refField === null || refField === void 0 ? void 0 : refField.refCollection, refCollectionName = _a.collectionName, refCollectionFieldName = _a.collectionField;
     var refCollection;
-    if (encrypedRefCollections.length) {
+    if (encryptedRefCollections.length) {
         if (refCollectionName) {
-            refCollection = encrypedRefCollections.find(function (encColl) { return encColl.collectionName === refCollectionName; });
+            refCollection = encryptedRefCollections.find(function (encColl) { return encColl.collectionName === refCollectionName; });
         }
     }
     return { refCollectionName: refCollectionName, refCollectionFieldName: refCollectionFieldName, refCollection: refCollection };

package/build/encryption/utility.d.ts

@@ -1 +1,2 @@
 export declare const getEncryptedReferenceFieldsQuery: (collectionFields: any, projectId: any) => any;
+export declare const prepareDBQuery: (projectId: string, collections: any) => any;

package/build/encryption/utility.js

@@ -9,30 +9,31 @@ var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
     return to.concat(ar || Array.prototype.slice.call(from));
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getEncryptedReferenceFieldsQuery = void 0;
+exports.prepareDBQuery = exports.getEncryptedReferenceFieldsQuery = void 0;
 var drapcode_constant_1 = require("drapcode-constant");
 var getEncryptedReferenceFieldsQuery = function (collectionFields, projectId) {
     var collectionsNamesArr = [];
-    collectionFields.map(function (field) {
-        if (__spreadArray(__spreadArray([], drapcode_constant_1.onlyReferenceField, true), [
-            drapcode_constant_1.FieldTypes.dynamic_option.id,
-            drapcode_constant_1.FieldTypes.createdBy.id,
-            drapcode_constant_1.FieldTypes.belongsTo.id,
-        ], false).includes(field.type)) {
-            if (!field.refCollection && field.type === drapcode_constant_1.FieldTypes.createdBy.id) {
-                collectionsNamesArr.push("user");
-            }
-            else {
-                var collectionName = field.refCollection.collectionName;
-                collectionsNamesArr.push(collectionName);
-            }
+    collectionFields = collectionFields.filter(function (field) {
+        return drapcode_constant_1.BelongsCreatedByRefField.includes(field.type);
+    });
+    collectionFields.forEach(function (field) {
+        if (!field.refCollection && field.type === drapcode_constant_1.FieldTypes.createdBy.id) {
+            collectionsNamesArr.push("user");
+        }
+        else {
+            var collectionName = field.refCollection.collectionName;
+            collectionsNamesArr.push(collectionName);
         }
     });
+    return (0, exports.prepareDBQuery)(projectId, collectionsNamesArr);
+};
+exports.getEncryptedReferenceFieldsQuery = getEncryptedReferenceFieldsQuery;
+var prepareDBQuery = function (projectId, collections) {
     var query = [
         {
             $match: {
                 projectId: projectId,
-                collectionName: { $in: __spreadArray([], collectionsNamesArr, true) },
+                collectionName: { $in: __spreadArray([], collections, true) },
                 fields: { $elemMatch: { encrypted: true } },
             },
         },
@@ -52,4 +53,4 @@ var getEncryptedReferenceFieldsQuery = function (collectionFields, projectId) {
     ];
     return query;
 };
-exports.getEncryptedReferenceFieldsQuery = getEncryptedReferenceFieldsQuery;
+exports.prepareDBQuery = prepareDBQuery;

package/build/format-fields/index.js

@@ -1,4 +1,13 @@
 "use strict";
+var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
+    if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
+        if (ar || !(i in from)) {
+            if (!ar) ar = Array.prototype.slice.call(from, 0, i);
+            ar[i] = from[i];
+        }
+    }
+    return to.concat(ar || Array.prototype.slice.call(from));
+};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
@@ -55,13 +64,7 @@ var getFormatFieldData = function (fieldData, fieldType) {
         markdown.id,
     ];
     var numberType = [number.id, unix_timestamp.id];
-    var arrayType = [
-        reference.id,
-        belongsTo.id,
-        multi_reference.id,
-        dynamic_option.id,
-        static_option.id,
-    ];
+    var arrayType = __spreadArray(__spreadArray([], drapcode_constant_1.NonBelongsSelectOptionFields, true), [belongsTo.id], false);
     if (stringType.includes(fieldType)) {
         if (typeof fieldData !== "string")
             fieldData = String(fieldData);

package/build/utils/query-parser.js

@@ -167,7 +167,7 @@ var queryParser = function (collectionName, query, constants, externalParams, cu
                     }
                     console.log("==> aggregateQuery", aggregateQuery);
                     console.log("==> aggregateQuery", JSON.stringify(aggregateQuery));
-                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
+                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" }, allowDiskUse: true })");
                     str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
                     str += ".toArray()";
                     return [2 /*return*/, str];

package/build/utils/query-paser-new.js

@@ -256,7 +256,7 @@ var queryParserNew = function (collectionName, query, constants, externalParams,
                     if (finder != "COUNT" && limit) {
                         aggregateQuery.push({ $skip: +offset }, { $limit: +limit });
                     }
-                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" } })");
+                    queryStr = ".aggregate(".concat(JSON.stringify(aggregateQuery), ", { collation: { locale: \"en\" }, allowDiskUse: true })");
                     str = "req.db.collection('".concat(collectionName, "')").concat(queryStr);
                     str += ".toArray()";
                     return [2 /*return*/, str];

package/build/utils/util.js

@@ -586,14 +586,8 @@ var replaceValueFromTenant = function (variableName, tenant) {
     return lodash_1.default.get(tenant, variableName);
 };
 var fillDefaultValues = function (collection, itemdata) {
-    var filledItemdata = __assign({}, itemdata);
-    var fieldsToSkip = [
-        drapcode_constant_1.FieldTypes.isDeleted.id,
-        drapcode_constant_1.FieldTypes.uuid.id,
-        drapcode_constant_1.FieldTypes.createdBy.id,
-        drapcode_constant_1.FieldTypes.updatedAt.id,
-        drapcode_constant_1.FieldTypes.createdAt.id,
-    ];
+    var filledItemData = __assign({}, itemdata);
+    var fieldsToSkip = drapcode_constant_1.hiddenFormField;
     var fieldTypesToSkip = [drapcode_constant_1.FieldTypes.boolean.id];
     var allFields = collection.fields.filter(function (field) {
         return !fieldsToSkip.includes(field.fieldName) &&
@@ -601,18 +595,18 @@ var fillDefaultValues = function (collection, itemdata) {
     });
     allFields.forEach(function (field) {
         var fieldName = field.fieldName;
-        if (!(fieldName in filledItemdata) ||
-            filledItemdata[fieldName] === "" ||
-            filledItemdata[fieldName] === 0 ||
-            filledItemdata[fieldName] === false) {
+        if (!(fieldName in filledItemData) ||
+            filledItemData[fieldName] === "" ||
+            filledItemData[fieldName] === 0 ||
+            filledItemData[fieldName] === false) {
             var formattedField = JSON.parse(JSON.stringify(field));
             if (field.extraFieldSetting &&
                 "defaultValue" in formattedField.extraFieldSetting) {
-                filledItemdata[fieldName] = assignFieldValue(formattedField, field, fieldName, filledItemdata);
+                filledItemData[fieldName] = assignFieldValue(formattedField, field, fieldName, filledItemData);
             }
         }
     });
-    return filledItemdata;
+    return filledItemData;
 };
 exports.fillDefaultValues = fillDefaultValues;
 var assignFieldValue = function (formattedField, field, fieldName, filledItemdata) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "drapcode-utility",
-  "version": "1.7.6",
+  "version": "1.7.8",
   "description": "",
   "main": "build/index.js",
   "types": "build/index.d.ts",
@@ -37,9 +37,9 @@
     "@types/voca": "^1.4.2",
     "axios": "^1.1.2",
     "dompurify": "^3.1.7",
-    "drapcode-constant": "^1.6.0",
-    "drapcode-logger": "^1.2.7",
-    "drapcode-redis": "^1.1.6",
+    "drapcode-constant": "^1.6.1",
+    "drapcode-logger": "^1.2.8",
+    "drapcode-redis": "^1.1.7",
     "exiftool-vendored": "^28.2.1",
     "express": "^4.17.1",
     "gm": "^1.25.0",