monastery 3.0.19 → 3.0.21

package/changelog.md

@@ -2,6 +2,10 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [3.0.21](https://github.com/boycce/monastery/compare/3.0.20...3.0.21) (2024-05-07)
+
+### [3.0.20](https://github.com/boycce/monastery/compare/3.0.19...3.0.20) (2024-05-05)
+
 ### [3.0.19](https://github.com/boycce/monastery/compare/3.0.18...3.0.19) (2024-05-05)
 
 ### [3.0.18](https://github.com/boycce/monastery/compare/3.0.16...3.0.18) (2024-05-02)

package/lib/model-crud.js

@@ -175,7 +175,7 @@ Model.prototype.find = async function (opts, _one) {
       let aggregate = [
         { $match: opts.query },
         { $sort: opts.sort },
-        ...(util.isDefined(opts.skip) ? [{ $limit: opts.skip }] : []),
+        ...(util.isDefined(opts.skip) ? [{ $skip: opts.skip }] : []),
         ...(util.isDefined(opts.limit) ? [{ $limit: opts.limit }] : []),
         ...lookups,
         ...(opts.addFields? [{ $addFields: opts.addFields }] : []),

package/lib/util.js

@@ -193,7 +193,8 @@ module.exports = {
      * @param {object}
      * @return promise(data)
      */
-    return this.parseFormData(this.parseDotNotation(obj))
+    let data = this.parseDotNotation(obj)
+    return this.parseFormData(data)
   },
 
   parseDotNotation: function(obj) {
@@ -201,18 +202,20 @@ module.exports = {
      * Mutates dot notation objects into a deep object
      * @param {object}
      */
-    let original = this.deepCopy(obj)
+    if (!Object.keys(obj).find(o => o.indexOf('.') !== -1)) return obj
+    let objCopy = this.deepCopy(obj) // maybe convert to JSON.parse(JSON.stringify(obj))
+
     for (let key in obj) {
       if (key.indexOf('.') !== -1) {
-        recurse(key, obj[key], obj)
+        setup(key, obj[key], obj)
       } else {
         // Ordinary values may of been updated by the bracket notation values, we are
         // reassigning, trying to preserve the order of keys (not always guaranteed in for loops)
-        obj[key] = original[key]
+        obj[key] = objCopy[key]
       }
     }
     return obj
-    function recurse(str, val, obj) {
+    function setup(str, val, obj) {
       let parentObj = obj
       let grandparentObj = obj
       let keys = str.split(/\./)
@@ -233,7 +236,6 @@ module.exports = {
   },
 
   parseFormData: function(obj) {
-    let original = this.deepCopy(obj)
     /**
      * Mutates FormData (bracket notation) objects into a deep object
      * @param {object}
@@ -242,21 +244,22 @@ module.exports = {
      * E.g. ['user']['petnames'][0]
      * E.g. ['users'][0]['name']
      */
-    return new Promise(res => {
-      for (let key in obj) {
-        if (key.match(/\[\]\[/i)) {
-          throw `Array items in bracket notation need array indexes "${key}", e.g. users[0][name]`
-        }
-        if (key.indexOf('[') !== -1) {
-          setup(key)
-        } else {
-          // Ordinary values may of been updated by the bracket notation values, we are
-          // reassigning, trying to preserve the order of keys (not always guaranteed in for loops)
-          obj[key] = original[key]
-        }
+    if (!Object.keys(obj).find(o => o.indexOf('[') !== -1)) return obj
+    let objCopy = this.deepCopy(obj) // maybe convert to JSON.parse(JSON.stringify(obj))
+
+    for (let key in obj) {
+      if (key.match(/\[\]\[/i)) {
+        throw new Error(`Monastery: Array items in bracket notation need array indexes "${key}", e.g. users[0][name]`)
       }
-      res(obj)
-    })
+      if (key.indexOf('[') !== -1) {
+        setup(key)
+      } else {
+        // Ordinary values may of been updated by the bracket notation values, we are
+        // reassigning, trying to preserve the order of keys (not always guaranteed in for loops)
+        obj[key] = objCopy[key]
+      }
+    }
+    return obj
     function setup(path) {
       let parent = obj
       let grandparent = obj

package/package.json

@@ -2,7 +2,7 @@
   "name": "monastery",
   "description": "⛪ A simple, straightforward MongoDB ODM",
   "author": "Ricky Boyce",
-  "version": "3.0.19",
+  "version": "3.0.21",
   "license": "MIT",
   "repository": "github:boycce/monastery",
   "homepage": "https://boycce.github.io/monastery/",

package/test/util.js

@@ -26,8 +26,9 @@ test('util > formdata', async () => {
       { 'first': 'Bruce', 'last': 'Lee' },
     ],
   })
-  expect(util.parseFormData({ 'users[][\'name\']': 'Martin' })).rejects
-    .toEqual('Array items in bracket notation need array indexes "users[][\'name\']", e.g. users[0][name]')
+  expect(() => util.parseFormData({ 'users[][\'name\']': 'Martin' })).toThrow(
+    'Monastery: Array items in bracket notation need array indexes "users[][\'name\']", e.g. users[0][name]'
+  )
 })
 
 test('util > isId', async () => {