speedly 1.2.43 → 1.2.45

package/dist/cjs/db/db.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const strToObj_1 = __importDefault(require("../util/strToObj"));
 const getConfig_1 = __importDefault(require("../util/getConfig"));
 const translator_1 = __importDefault(require("../util/translator"));
+const utils_1 = require("./utils");
 let configs = {
     dbType: "mongodb",
     path: "../models",
@@ -349,14 +350,7 @@ const usingMongoDb = (collectionName, config = { type: "external" }) => {
                     break;
                 case "findOneAndUpdate":
                     req.document = await model.findOne(match);
-                    data = model?.[queryState.action]?.call(model, match, {
-                        $set: {
-                            ...req.body,
-                            ...(typeof queryState.body == "function"
-                                ? queryState.body(req)
-                                : queryState.body),
-                        },
-                    }, { new: true });
+                    data = model?.[queryState.action]?.call(model, match, (0, utils_1.createUpdateObject)(req, queryState.body || {}), { new: true });
                     break;
                 case "findOneAndDelete":
                     data = model?.[queryState.action]?.call(model, match);

package/dist/cjs/db/utils.d.ts

@@ -0,0 +1,3 @@
+import { Request } from "express";
+declare const createUpdateObject: (req: Request, additionalFields: Record<string, any> | ((req: Request) => Record<string, any>)) => Record<string, any>;
+export { createUpdateObject };

package/dist/cjs/db/utils.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUpdateObject = void 0;
+const createUpdateObject = (req, additionalFields) => {
+    let updateObject = { $set: { ...req.body } };
+    const additionalObject = typeof additionalFields === "function"
+        ? additionalFields(req)
+        : additionalFields;
+    if (Object.keys(additionalObject).find((key) => key.startsWith("$")))
+        updateObject = { ...updateObject, ...additionalObject };
+    else
+        updateObject.$set = { ...updateObject.$set, ...additionalObject };
+    return updateObject;
+};
+exports.createUpdateObject = createUpdateObject;

package/dist/cjs/modules/translation/translation.validator.js

@@ -7,14 +7,16 @@ exports.put = void 0;
 const makeOptional_1 = __importDefault(require("../../util/makeOptional"));
 const yup_1 = require("yup");
 const paramId = (0, yup_1.object)({
-    id: (0, yup_1.string)().required('id is required').matches(/^[0-9a-fA-F]{24}$/, 'id is invalid')
+    id: (0, yup_1.string)()
+        .required("id is required")
+        .matches(/^[0-9a-fA-F]{24}$/, "id is invalid"),
 });
 const schema = (0, yup_1.object)({
-    translatedText: (0, yup_1.string)().required('translatedText is required'),
+    translatedText: (0, yup_1.string)().required("translatedText is required"),
 });
 //? exports
 const put = {
     params: paramId,
-    body: (0, makeOptional_1.default)(schema)
+    body: (0, makeOptional_1.default)(schema),
 };
 exports.put = put;

package/dist/esm/db/db.js

@@ -8,6 +8,7 @@ const path_1 = __importDefault(require("path"));
 const strToObj_1 = __importDefault(require("../util/strToObj"));
 const getConfig_1 = __importDefault(require("../util/getConfig"));
 const translator_1 = __importDefault(require("../util/translator"));
+const utils_1 = require("./utils");
 let configs = {
     dbType: "mongodb",
     path: "../models",
@@ -349,14 +350,7 @@ const usingMongoDb = (collectionName, config = { type: "external" }) => {
                     break;
                 case "findOneAndUpdate":
                     req.document = await model.findOne(match);
-                    data = model?.[queryState.action]?.call(model, match, {
-                        $set: {
-                            ...req.body,
-                            ...(typeof queryState.body == "function"
-                                ? queryState.body(req)
-                                : queryState.body),
-                        },
-                    }, { new: true });
+                    data = model?.[queryState.action]?.call(model, match, (0, utils_1.createUpdateObject)(req, queryState.body || {}), { new: true });
                     break;
                 case "findOneAndDelete":
                     data = model?.[queryState.action]?.call(model, match);

package/dist/esm/db/utils.d.ts

@@ -0,0 +1,3 @@
+import { Request } from "express";
+declare const createUpdateObject: (req: Request, additionalFields: Record<string, any> | ((req: Request) => Record<string, any>)) => Record<string, any>;
+export { createUpdateObject };

package/dist/esm/db/utils.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createUpdateObject = void 0;
+const createUpdateObject = (req, additionalFields) => {
+    let updateObject = { $set: { ...req.body } };
+    const additionalObject = typeof additionalFields === "function"
+        ? additionalFields(req)
+        : additionalFields;
+    if (Object.keys(additionalObject).find((key) => key.startsWith("$")))
+        updateObject = { ...updateObject, ...additionalObject };
+    else
+        updateObject.$set = { ...updateObject.$set, ...additionalObject };
+    return updateObject;
+};
+exports.createUpdateObject = createUpdateObject;

package/dist/esm/modules/translation/translation.validator.js

@@ -7,14 +7,16 @@ exports.put = void 0;
 const makeOptional_1 = __importDefault(require("../../util/makeOptional"));
 const yup_1 = require("yup");
 const paramId = (0, yup_1.object)({
-    id: (0, yup_1.string)().required('id is required').matches(/^[0-9a-fA-F]{24}$/, 'id is invalid')
+    id: (0, yup_1.string)()
+        .required("id is required")
+        .matches(/^[0-9a-fA-F]{24}$/, "id is invalid"),
 });
 const schema = (0, yup_1.object)({
-    translatedText: (0, yup_1.string)().required('translatedText is required'),
+    translatedText: (0, yup_1.string)().required("translatedText is required"),
 });
 //? exports
 const put = {
     params: paramId,
-    body: (0, makeOptional_1.default)(schema)
+    body: (0, makeOptional_1.default)(schema),
 };
 exports.put = put;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "speedly",
-  "version": "1.2.43",
+  "version": "1.2.45",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",
   "types": "dist/esm/index.d.ts",