From 7283df33bef93b95a77dbfb1c66e61f23479b852 Mon Sep 17 00:00:00 2001 From: Joshua Melville Date: Wed, 8 Jul 2015 13:00:20 +0100 Subject: [PATCH] fix for safari --- lib/model.js | 21 +++++++++++++-------- 1 file changed, 13 insertions(+), 8 deletions(-) diff --git a/lib/model.js b/lib/model.js index 9638af5..cdc0ff1 100644 --- a/lib/model.js +++ b/lib/model.js @@ -24,6 +24,11 @@ var util = require('util') * But you really need to want it to trigger such behaviour, even when warned not to use '$' at the beginning of the field names... */ function checkKey (k, v) { + + if (typeof k === 'number') { + k = k.toString(); + } + if (k[0] === '$' && !(k === '$$date' && typeof v === 'number') && !(k === '$$deleted' && v === true) && !(k === '$$indexCreated') && !(k === '$$indexRemoved')) { throw 'Field names cannot begin with the $ character'; } @@ -64,10 +69,10 @@ function checkObject (obj) { */ function serialize (obj) { var res; - + res = JSON.stringify(obj, function (k, v) { checkKey(k, v); - + if (v === undefined) { return undefined; } if (v === null) { return null; } @@ -327,7 +332,7 @@ lastStepModifierFunctions.$pop = function (obj, field, value) { */ lastStepModifierFunctions.$pull = function (obj, field, value) { var arr, i; - + if (!util.isArray(obj[field])) { throw "Can't $pull an element from non-array values"; } arr = obj[field]; @@ -419,7 +424,7 @@ function modify (obj, updateQuery) { // Check result is valid and return it checkObject(newDoc); - + if (obj._id !== newDoc._id) { throw "You can't change a document's _id"; } return newDoc; }; @@ -443,7 +448,7 @@ function getDotValue (obj, field) { if (fieldParts.length === 0) { return obj; } if (fieldParts.length === 1) { return obj[fieldParts[0]]; } - + if (util.isArray(obj[fieldParts[0]])) { // If the next field is an integer, return only this item of the array i = parseInt(fieldParts[1], 10); @@ -671,13 +676,13 @@ function match (obj, query) { if (isPrimitiveType(obj) || isPrimitiveType(query)) { return matchQueryPart({ needAKey: obj }, 'needAKey', query); } - + // Normal query queryKeys = Object.keys(query); for (i = 0; i < queryKeys.length; i += 1) { queryKey = queryKeys[i]; queryValue = query[queryKey]; - + if (queryKey[0] === '$') { if (!logicalOperators[queryKey]) { throw "Unknown logical operator " + queryKey; } if (!logicalOperators[queryKey](obj, queryValue)) { return false; } @@ -702,7 +707,7 @@ function matchQueryPart (obj, queryKey, queryValue, treatObjAsValue) { if (util.isArray(objValue) && !treatObjAsValue) { // Check if we are using an array-specific comparison function if (queryValue !== null && typeof queryValue === 'object' && !util.isRegExp(queryValue)) { - keys = Object.keys(queryValue); + keys = Object.keys(queryValue); for (i = 0; i < keys.length; i += 1) { if (arrayComparisonFunctions[keys[i]]) { return matchQueryPart(obj, queryKey, queryValue, true); } }