mongoose 6.2.0 → 6.2.1

package/lib/types/array/index.js

@@ -27,9 +27,12 @@ const arraySchemaSymbol = require('../../helpers/symbols').arraySchemaSymbol;
  * @inherits Array
  * @see http://bit.ly/f6CnZU
  */
+const _basePush = Array.prototype.push;
+const numberRE = /^\d+$/;
 
 function MongooseArray(values, path, doc, schematype) {
-  let arr;
+  let __array;
+
   if (Array.isArray(values)) {
     const len = values.length;
 
@@ -38,21 +41,21 @@ function MongooseArray(values, path, doc, schematype) {
     // modifying the array is faster. Seems small, but adds up when you have a document
     // with thousands of nested arrays.
     if (len === 0) {
-      arr = new Array();
+      __array = new Array();
     } else if (len === 1) {
-      arr = new Array(1);
-      arr[0] = values[0];
+      __array = new Array(1);
+      __array[0] = values[0];
     } else if (len < 10000) {
-      arr = new Array();
-      arr.push.apply(arr, values);
+      __array = new Array();
+      _basePush.apply(__array, values);
     } else {
-      arr = new Array();
+      __array = new Array();
       for (let i = 0; i < len; ++i) {
-        arr.push(values[i]);
+        _basePush.apply(__array, values[i]);
       }
     }
   } else {
-    arr = [];
+    __array = [];
   }
 
   const internals = {
@@ -63,10 +66,10 @@ function MongooseArray(values, path, doc, schematype) {
     [arrayParentSymbol]: void 0,
     isMongooseArray: true,
     isMongooseArrayProxy: true,
-    __array: arr
+    __array: __array
   };
 
-  if (values[arrayAtomicsSymbol] != null) {
+  if (values && values[arrayAtomicsSymbol] != null) {
     internals[arrayAtomicsSymbol] = values[arrayAtomicsSymbol];
   }
 
@@ -79,7 +82,7 @@ function MongooseArray(values, path, doc, schematype) {
     internals[arraySchemaSymbol] = schematype || doc.schema.path(path);
   }
 
-  const proxy = new Proxy(arr, {
+  const proxy = new Proxy(__array, {
     get: function(target, prop) {
       if (internals.hasOwnProperty(prop)) {
         return internals[prop];
@@ -88,17 +91,15 @@ function MongooseArray(values, path, doc, schematype) {
         return mongooseArrayMethods[prop];
       }
 
-      return arr[prop];
+      return __array[prop];
     },
-    set: function(target, prop, val) {
-      if (typeof prop === 'string' && /^\d+$/.test(prop)) {
-        const value = mongooseArrayMethods._cast.call(proxy, val, prop);
-        arr[prop] = value;
-        mongooseArrayMethods._markModified.call(proxy, prop);
+    set: function(target, prop, value) {
+      if (typeof prop === 'string' && numberRE.test(prop)) {
+        mongooseArrayMethods.set.call(proxy, prop, value, false);
       } else if (internals.hasOwnProperty(prop)) {
-        internals[prop] = val;
+        internals[prop] = value;
       } else {
-        arr[prop] = val;
+        __array[prop] = value;
       }
 
       return true;

package/lib/types/array/isMongooseArray.js

@@ -0,0 +1,5 @@
+'use strict';
+
+exports.isMongooseArray = function(mongooseArray) {
+  return Array.isArray(mongooseArray) && mongooseArray.isMongooseArray;
+};

package/lib/types/array/methods/index.js

@@ -285,7 +285,7 @@ const methods = {
         return this;
       }
 
-      parent.markModified(dirtyPath, arguments.length > 0 ? elem : parent);
+      parent.markModified(dirtyPath, arguments.length !== 0 ? elem : parent);
     }
 
     return this;
@@ -393,8 +393,8 @@ const methods = {
       type = 'date';
     }
 
-    const rawValues = values.isMongooseArrayProxy ? values.__array : this;
-    const rawArray = this.isMongooseArrayProxy ? this.__array : this;
+    const rawValues = utils.isMongooseArray(values) ? values.__array : this;
+    const rawArray = utils.isMongooseArray(this) ? this.__array : this;
 
     rawValues.forEach(function(v) {
       let found;
@@ -520,7 +520,7 @@ const methods = {
    *
    * ####Note:
    *
-   * _marks the entire array as modified which will pass the entire thing to $set potentially overwritting any changes that happen between when you retrieved the object and when you save it._
+   * _marks the entire array as modified which will pass the entire thing to $set potentially overwriting any changes that happen between when you retrieved the object and when you save it._
    *
    * @see MongooseArray#$pop #types_array_MongooseArray-%24pop
    * @api public
@@ -638,7 +638,7 @@ const methods = {
     let atomic = values;
     const isOverwrite = values[0] != null &&
       utils.hasUserDefinedProperty(values[0], '$each');
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     if (isOverwrite) {
       atomic = values[0];
       values = values[0].$each;
@@ -761,7 +761,7 @@ const methods = {
    */
 
   shift() {
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     const ret = [].shift.call(arr);
     this._registerAtomic('$set', this);
     this._markModified();
@@ -782,7 +782,7 @@ const methods = {
    */
 
   sort() {
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     const ret = [].sort.apply(arr, arguments);
     this._registerAtomic('$set', this);
     return ret;
@@ -803,7 +803,7 @@ const methods = {
 
   splice() {
     let ret;
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
 
     _checkManualPopulation(this, Array.prototype.slice.call(arguments, 2));
 
@@ -846,7 +846,7 @@ const methods = {
    */
 
   toObject(options) {
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     if (options && options.depopulate) {
       options = utils.clone(options);
       options._isNested = true;
@@ -888,7 +888,7 @@ const methods = {
       values = this[arraySchemaSymbol].applySetters(values, this[arrayParentSymbol]);
     }
 
-    const arr = this.isMongooseArrayProxy ? this.__array : this;
+    const arr = utils.isMongooseArray(this) ? this.__array : this;
     [].unshift.apply(arr, values);
     this._registerAtomic('$set', this);
     this._markModified();
@@ -928,7 +928,7 @@ function _checkManualPopulation(arr, docs) {
     null :
     get(arr[arraySchemaSymbol], 'caster.options.ref', null);
   if (arr.length === 0 &&
-      docs.length > 0) {
+      docs.length !== 0) {
     if (_isAllSubdocs(docs, ref)) {
       arr[arrayParentSymbol].$populated(arr[arrayPathSymbol], [], {
         [populateModelSymbol]: docs[0].constructor
@@ -950,7 +950,7 @@ for (const method of returnVanillaArrayMethods) {
   }
 
   methods[method] = function() {
-    const _arr = this.isMongooseArrayProxy ? this.__array : this;
+    const _arr = utils.isMongooseArray(this) ? this.__array : this;
     const arr = [].concat(_arr);
 
     return arr[method].apply(arr, arguments);

package/lib/utils.js

@@ -12,6 +12,8 @@ const PopulateOptions = require('./options/PopulateOptions');
 const clone = require('./helpers/clone');
 const immediate = require('./helpers/immediate');
 const isObject = require('./helpers/isObject');
+const isMongooseArray = require('./types/array/isMongooseArray');
+const isMongooseDocumentArray = require('./types/DocumentArray/isMongooseDocumentArray');
 const isBsonType = require('./helpers/isBsonType');
 const getFunctionName = require('./helpers/getFunctionName');
 const isMongooseObject = require('./helpers/isMongooseObject');
@@ -24,6 +26,11 @@ let Document;
 
 exports.specialProperties = specialProperties;
 
+exports.isMongooseArray = isMongooseArray.isMongooseArray;
+exports.isMongooseDocumentArray = isMongooseDocumentArray.isMongooseDocumentArray;
+exports.registerMongooseArray = isMongooseArray.registerMongooseArray;
+exports.registerMongooseDocumentArray = isMongooseDocumentArray.registerMongooseDocumentArray;
+
 /*!
  * Produces a collection name from model `name`. By default, just returns
  * the model name

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "6.2.0",
+  "version": "6.2.1",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -25,7 +25,6 @@
     "mpath": "0.8.4",
     "mquery": "4.0.2",
     "ms": "2.1.2",
-    "regexp-clone": "1.0.0",
     "sift": "13.5.2"
   },
   "devDependencies": {
@@ -57,6 +56,7 @@
     "q": "1.5.1",
     "rimraf": "2.6.3",
     "serve-handler": "6.1.3",
+    "tsd": "0.19.1",
     "typescript": "4.5.3",
     "uuid": "8.3.2",
     "webpack": "4.44.1"
@@ -71,12 +71,14 @@
     "release": "git pull && git push origin master --tags && npm publish",
     "release-legacy": "git pull origin 5.x && git push origin 5.x --tags && npm publish --tag legacy",
     "mongo": "node ./tools/repl.js",
-    "test": "mocha --exit ./test/*.test.js ./test/typescript/main.test.js",
+    "test": "mocha --exit ./test/*.test.js",
+    "test-tsd": "tsd",
+    "sym-link-mongoose": "npm link && npm link mongoose",
     "tdd": "mocha ./test/*.test.js ./test/typescript/main.test.js --inspect --watch --recursive --watch-files ./**/*.js",
     "test-coverage": "nyc --reporter=html --reporter=text npm test"
   },
   "main": "./index.js",
-  "types": "./index.d.ts",
+  "types": "./types/index.d.ts",
   "engines": {
     "node": ">=12.0.0"
   },
@@ -97,149 +99,6 @@
       "test/**/*.js"
     ]
   },
-  "eslintConfig": {
-    "extends": [
-      "eslint:recommended"
-    ],
-    "overrides": [
-      {
-        "files": [
-          "**/*.{ts,tsx}"
-        ],
-        "extends": [
-          "plugin:@typescript-eslint/eslint-recommended",
-          "plugin:@typescript-eslint/recommended"
-        ],
-        "plugins": [
-          "@typescript-eslint"
-        ],
-        "rules": {
-          "@typescript-eslint/no-explicit-any": "off",
-          "@typescript-eslint/ban-types": "off",
-          "@typescript-eslint/no-unused-vars": "off",
-          "@typescript-eslint/explicit-module-boundary-types": "off"
-        }
-      }
-    ],
-    "plugins": [
-      "mocha-no-only"
-    ],
-    "parserOptions": {
-      "ecmaVersion": 2020
-    },
-    "env": {
-      "node": true,
-      "es6": true
-    },
-    "rules": {
-      "comma-style": "error",
-      "indent": [
-        "error",
-        2,
-        {
-          "SwitchCase": 1,
-          "VariableDeclarator": 2
-        }
-      ],
-      "keyword-spacing": "error",
-      "no-whitespace-before-property": "error",
-      "no-buffer-constructor": "warn",
-      "no-console": "off",
-      "no-constant-condition": "off",
-      "no-multi-spaces": "error",
-      "func-call-spacing": "error",
-      "no-trailing-spaces": "error",
-      "no-undef": "error",
-      "no-unneeded-ternary": "error",
-      "no-const-assign": "error",
-      "no-useless-rename": "error",
-      "no-dupe-keys": "error",
-      "space-in-parens": [
-        "error",
-        "never"
-      ],
-      "spaced-comment": [
-        "error",
-        "always",
-        {
-          "block": {
-            "markers": [
-              "!"
-            ],
-            "balanced": true
-          }
-        }
-      ],
-      "key-spacing": [
-        "error",
-        {
-          "beforeColon": false,
-          "afterColon": true
-        }
-      ],
-      "comma-spacing": [
-        "error",
-        {
-          "before": false,
-          "after": true
-        }
-      ],
-      "array-bracket-spacing": 1,
-      "arrow-spacing": [
-        "error",
-        {
-          "before": true,
-          "after": true
-        }
-      ],
-      "object-curly-spacing": [
-        "error",
-        "always"
-      ],
-      "comma-dangle": [
-        "error",
-        "never"
-      ],
-      "no-unreachable": "error",
-      "quotes": [
-        "error",
-        "single"
-      ],
-      "quote-props": [
-        "error",
-        "as-needed"
-      ],
-      "semi": "error",
-      "no-extra-semi": "error",
-      "semi-spacing": "error",
-      "no-spaced-func": "error",
-      "no-throw-literal": "error",
-      "space-before-blocks": "error",
-      "space-before-function-paren": [
-        "error",
-        "never"
-      ],
-      "space-infix-ops": "error",
-      "space-unary-ops": "error",
-      "no-var": "warn",
-      "prefer-const": "warn",
-      "strict": [
-        "error",
-        "global"
-      ],
-      "no-restricted-globals": [
-        "error",
-        {
-          "name": "context",
-          "message": "Don't use Mocha's global context"
-        }
-      ],
-      "no-prototype-builtins": "off",
-      "mocha-no-only/mocha-no-only": [
-        "error"
-      ]
-    }
-  },
   "config": {
     "mongodbMemoryServer": {
       "disablePostinstall": true
@@ -248,5 +107,17 @@
   "funding": {
     "type": "opencollective",
     "url": "https://opencollective.com/mongoose"
+  },
+  "tsd": {
+    "directory": "test/types",
+    "compilerOptions": {
+      "esModuleInterop": false,
+      "strict": true,
+      "allowSyntheticDefaultImports": true,
+      "strictPropertyInitialization": false,
+      "noImplicitAny": false,
+      "module": "commonjs",
+      "target": "ES2017"
+    }
   }
 }

package/tools/repl.js

@@ -11,7 +11,7 @@ async function run () {
   // Create new instance
   const replSet = new ReplSet({
     binary: {
-      version: process.argv[3]
+      version: process.argv[2]
     },
     instanceOpts: [
       // Set the expiry job in MongoDB to run every second

package/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "compilerOptions": {
+    "allowSyntheticDefaultImports": true,
+    "paths": {
+      "mongoose" : ["./types/index.d.ts"]
+    }
+  },
+  "esModuleInterop": true,
+  "strictNullChecks": true
+}