@mongoosejs/studio 0.0.128 → 0.0.129

package/backend/actions/Model/addField.js

@@ -0,0 +1,54 @@
+'use strict';
+
+const Archetype = require('archetype');
+const authorize = require('../../authorize');
+
+const AddFieldParams = new Archetype({
+  model: {
+    $type: 'string',
+    $required: true
+  },
+  _id: {
+    $type: Archetype.Any,
+    $required: true
+  },
+  fieldName: {
+    $type: 'string',
+    $required: true
+  },
+  fieldValue: {
+    $type: Archetype.Any,
+    $required: true
+  },
+  roles: {
+    $type: ['string']
+  }
+}).compile('AddFieldParams');
+
+module.exports = ({ db }) => async function addField(params) {
+  const { model, _id, fieldName, fieldValue, roles } = new AddFieldParams(params);
+
+  await authorize('Model.updateDocument', roles);
+
+  const Model = db.models[model];
+  if (Model == null) {
+    throw new Error(`Model ${model} not found`);
+  }
+
+  // Create update object with the new field
+  const update = { $set: { [fieldName]: fieldValue } };
+
+  const doc = await Model.findByIdAndUpdate(
+    _id, 
+    update, 
+    { 
+      sanitizeFilter: true, 
+      returnDocument: 'after', 
+      overwriteImmutable: true, 
+      runValidators: false,
+      strict: false
+    }
+  );
+
+  return { doc };
+};

package/backend/actions/Model/getDocument.js

@@ -42,5 +42,7 @@ module.exports = ({ db }) => async function getDocument(params) {
   }
   removeSpecifiedPaths(schemaPaths, '.$*');
 
-  return { doc: doc.toJSON({ virtuals: true, getters: false, transform: false }), schemaPaths };
+  const virtualPaths = Object.keys(Model.schema.virtuals);
+
+  return { doc: doc.toJSON({ virtuals: true, getters: false, transform: false }), schemaPaths, virtualPaths };
 };

package/backend/actions/Model/getDocuments.js

@@ -23,8 +23,11 @@ const GetDocumentsParams = new Archetype({
   searchText: {
     $type: 'string'
   },
-  sort: {
-    $type: Archetype.Any
+  sortKey: {
+    $type: 'string'
+  },
+  sortDirection: {
+    $type: 'number'
   },
   roles: {
     $type: ['string']
@@ -36,7 +39,7 @@ module.exports = ({ db }) => async function getDocuments(params) {
   const { roles } = params;
   await authorize('Model.getDocuments', roles);
 
-  const { model, limit, skip, sort, searchText } = params;
+  const { model, limit, skip, sortKey, sortDirection, searchText } = params;
 
   const Model = db.models[model];
   if (Model == null) {
@@ -46,8 +49,14 @@ module.exports = ({ db }) => async function getDocuments(params) {
   const parsedFilter = evaluateFilter(searchText);
   const filter = parsedFilter == null ? {} : parsedFilter;
 
-  const hasSort = typeof sort === 'object' && sort != null && Object.keys(sort).length > 0;
-  const sortObj = hasSort ? { ...sort } : {};
+  const sortObj = {};
+
+  if (typeof sortKey === 'string' && sortKey.trim().length > 0) {
+    if (sortDirection !== 1 && sortDirection !== -1) {
+      throw new Error('Invalid sortDirection. Must be 1 or -1');
+    }
+    sortObj[sortKey.trim()] = sortDirection;
+  }
   if (!sortObj.hasOwnProperty('_id')) {
     sortObj._id = -1;
   }

package/backend/actions/Model/getDocumentsStream.js

@@ -23,8 +23,11 @@ const GetDocumentsParams = new Archetype({
   searchText: {
     $type: 'string'
   },
-  sort: {
-    $type: Archetype.Any
+  sortKey: {
+    $type: 'string'
+  },
+  sortDirection: {
+    $type: 'number'
   },
   roles: {
     $type: ['string']
@@ -36,7 +39,7 @@ module.exports = ({ db }) => async function* getDocumentsStream(params) {
   const { roles } = params;
   await authorize('Model.getDocumentsStream', roles);
 
-  const { model, limit, skip, sort, searchText } = params;
+  const { model, limit, skip, sortKey, sortDirection, searchText } = params;
 
   const Model = db.models[model];
   if (Model == null) {
@@ -46,8 +49,14 @@ module.exports = ({ db }) => async function* getDocumentsStream(params) {
   const parsedFilter = evaluateFilter(searchText);
   const filter = parsedFilter == null ? {} : parsedFilter;
 
-  const hasSort = typeof sort === 'object' && sort != null && Object.keys(sort).length > 0;
-  const sortObj = hasSort ? { ...sort } : {};
+  const sortObj = {};
+
+  if (typeof sortKey === 'string' && sortKey.trim().length > 0) {
+    if (sortDirection !== 1 && sortDirection !== -1) {
+      throw new Error('Invalid sortDirection. Must be 1 or -1');
+    }
+    sortObj[sortKey.trim()] = sortDirection;
+  }
   if (!sortObj.hasOwnProperty('_id')) {
     sortObj._id = -1;
   }

package/backend/actions/Model/index.js

@@ -1,5 +1,6 @@
 'use strict';
 
+exports.addField = require('./addField');
 exports.createDocument = require('./createDocument');
 exports.deleteDocument = require('./deleteDocument');
 exports.deleteDocuments = require('./deleteDocuments');

package/backend/actions/Model/updateDocument.js

@@ -31,15 +31,32 @@ module.exports = ({ db }) => async function updateDocument(params) {
     throw new Error(`Model ${model} not found`);
   }
 
-  let processedUpdate = update;
+  let setFields = {};
+  let unsetFields = {};
+  
   if (Object.keys(update).length > 0) {
-    processedUpdate = Object.fromEntries(
-      Object.entries(update).map(([key, value]) => [key, value === 'null' ? null : value === 'undefined' ? undefined : value])
-    );
+    Object.entries(update).forEach(([key, value]) => {
+      if (value === 'null') {
+        setFields[key] = null;
+      } else if (value === 'undefined') {
+        // Use $unset to remove the field for undefined values
+        unsetFields[key] = 1;
+      } else {
+        setFields[key] = value;
+      }
+    });
   }
 
-  const doc = await Model.
-    findByIdAndUpdate(_id, processedUpdate, { sanitizeFilter: true, returnDocument: 'after', overwriteImmutable: true, runValidators: false });
+  // Build the update operation with both $set and $unset
+  const updateOperation = {};
+  if (Object.keys(setFields).length > 0) {
+    updateOperation.$set = setFields;
+  }
+  if (Object.keys(unsetFields).length > 0) {
+    updateOperation.$unset = unsetFields;
+  }
 
+  const doc = await Model.
+    findByIdAndUpdate(_id, updateOperation, { sanitizeFilter: true, returnDocument: 'after', overwriteImmutable: true, runValidators: false });
   return { doc };
 };

package/backend/actions/Model/updateDocuments.js

@@ -31,15 +31,33 @@ module.exports = ({ db }) => async function updateDocuments(params) {
     throw new Error(`Model ${model} not found`);
   }
 
-  let processedUpdate = update;
+  let setFields = {};
+  let unsetFields = {};
+  
   if (Object.keys(update).length > 0) {
-    processedUpdate = Object.fromEntries(
-      Object.entries(update).map(([key, value]) => [key, value === 'null' ? null : value === 'undefined' ? undefined : value])
-    );
+    Object.entries(update).forEach(([key, value]) => {
+      if (value === 'null') {
+        setFields[key] = null;
+      } else if (value === 'undefined') {
+        // Use $unset to remove the field for undefined values
+        unsetFields[key] = 1;
+      } else {
+        setFields[key] = value;
+      }
+    });
+  }
+
+  // Build the update operation with both $set and $unset
+  const updateOperation = {};
+  if (Object.keys(setFields).length > 0) {
+    updateOperation.$set = setFields;
+  }
+  if (Object.keys(unsetFields).length > 0) {
+    updateOperation.$unset = unsetFields;
   }
 
   const result = await Model.
-    updateMany({ _id: { $in: _id } }, processedUpdate, { overwriteImmutable: true, runValidators: false });
+    updateMany({ _id: { $in: _id } }, updateOperation, { overwriteImmutable: true, runValidators: false });
 
   return { result };
 };