Sort keys in updates with multiple

Author: thomas4019

test/update.js

@@ -28,7 +28,7 @@ describe('update: ', function() {
       assert.equal(convertUpdate('data', { $set: { field: 'value' } }), 'jsonb_set(data,\'{field}\',\'"value"\')')
     })
     it('$set multiple', function() {
-      assert.equal(convertUpdate('data', { $set: { field: 'value', second: 2 } }), 'jsonb_set(jsonb_set(data,\'{second}\',\'2\'::jsonb),\'{field}\',\'"value"\')')
+      assert.equal(convertUpdate('data', { $set: { field: 'value', second: 2 } }), 'jsonb_set(jsonb_set(data,\'{field}\',\'"value"\'),\'{second}\',\'2\'::jsonb)')
     })
     it('$set deep', function() {
       assert.equal(convertUpdate('data', { $set: { 'a.b': 2 } }), 'jsonb_set(jsonb_set(data,\'{a}\',COALESCE(data->\'a\', \'{}\'::jsonb)),\'{a,b}\',\'2\'::jsonb)')
@@ -47,7 +47,7 @@ describe('update: ', function() {
       assert.equal(convertUpdate('data', { $unset: { 'field.inner': 1 } }), 'data #- \'{field,inner}\'')
     })
     it('$unset multiple', function() {
-      assert.equal(convertUpdate('data', { $unset: { field: 1, second: 1 } }), 'data #- \'{second}\' #- \'{field}\'')
+      assert.equal(convertUpdate('data', { $unset: { field: 1, second: 1 } }), 'data #- \'{field}\' #- \'{second}\'')
     })
 
     it('$inc', function() {
@@ -87,4 +87,17 @@ describe('update: ', function() {
       assert.equal(convertUpdate('data', { $set: { active: true }, $unset: { field: 'value' }, $inc: { purchases: 2 } }), 'jsonb_set(jsonb_set(data,\'{active}\',\'true\'::jsonb) #- \'{field}\',\'{purchases}\',to_jsonb(COALESCE(Cast(data->>\'purchases\' as numeric),0)+2))')
     })
   })
+
+  describe('array by index', function () {
+    it('$set', function() {
+      assert.equal(convertUpdate('data', { $set: {
+        'Items.0': { test: 0 },
+        'Items.2': { test: 2 },
+        'Items.1': { test: 1 },
+      }}),
+          'jsonb_set(jsonb_set(jsonb_set(jsonb_set(data,\'{Items}\',COALESCE(data->\'Items\', ' +
+          '\'{}\'::jsonb)),\'{Items,0}\',\'{"test":0}\'::jsonb),\'{Items,1}\',\'{"test":1}\'::jsonb)' +
+          ',\'{Items,2}\',\'{"test":2}\'::jsonb)')
+    })
+  })
 })

update.js

@@ -2,7 +2,7 @@ const util = require('./util.js')
 const convertWhere = require('./index.js')
 
 function convertOp(input, op, data, fieldName, upsert) {
-  const pathText = Object.keys(data)[0]
+  const pathText = util.getPathSortedArray(Object.keys(data))[0]
   const value = data[pathText]
   delete data[pathText]
   if (Object.keys(data).length > 0) {

util.js

@@ -92,4 +92,36 @@ exports.getPostgresTypeName = function(type) {
     throw { errmsg: 'argument to $type is not a number or a string', code: 14 }
   }
   return typeMapping[type] || type
+}
+
+function isIntegerStrict(val) {
+  return val != 'NaN' && parseInt(val).toString() == val
+}
+
+exports.getPathSortedArray = function(keys) {
+  return keys.sort((a, b) => {
+    if (a == b) {
+      return 0
+    }
+
+    var aArr = a.split('.')
+    var bArr = b.split('.')
+
+    for (var i = 0; i < aArr.length; i++) {
+      if (i >= bArr.length) {
+        return -1
+      }
+
+      if (aArr[i] == bArr[i]) {
+        continue
+      }
+
+      var aItem = isIntegerStrict(aArr[i]) ? parseInt(aArr[i]) : aArr[i]
+      var bItem = isIntegerStrict(bArr[i]) ? parseInt(bArr[i]) : bArr[i]
+
+      return aItem > bItem ? -1 : 1
+    }
+
+    return 1
+  })
 }