mongoose 7.0.1 → 7.0.3

package/lib/aggregate.js

@@ -1127,7 +1127,7 @@ Aggregate.prototype.catch = function(reject) {
  * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
  * support async iterators.
  *
- * @method Symbol.asyncIterator
+ * @method [Symbol.asyncIterator]
  * @memberOf Aggregate
  * @instance
  * @api public

package/lib/connection.js

@@ -1057,6 +1057,16 @@ Connection.prototype._close = async function _close(force, destroy) {
   return this;
 };
 
+/**
+ * Abstract method that drivers must implement.
+ *
+ * @api private
+ */
+
+Connection.prototype.doClose = function() {
+  throw new Error('Connection#doClose unimplemented by driver');
+};
+
 /**
  * Called when the connection closes
  *

package/lib/cursor/AggregationCursor.js

@@ -263,7 +263,7 @@ AggregationCursor.prototype.eachAsync = function(fn, opts, callback) {
  * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
  * support async iterators.
  *
- * @method Symbol.asyncIterator
+ * @method [Symbol.asyncIterator]
  * @memberOf AggregationCursor
  * @instance
  * @api public

package/lib/cursor/QueryCursor.js

@@ -347,7 +347,7 @@ QueryCursor.prototype._transformForAsyncIterator = function() {
  * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
  * support async iterators.
  *
- * @method Symbol.asyncIterator
+ * @method [Symbol.asyncIterator]
  * @memberOf QueryCursor
  * @instance
  * @api public

package/lib/document.js

@@ -17,7 +17,6 @@ const ValidationError = require('./error/validation');
 const ValidatorError = require('./error/validator');
 const VirtualType = require('./virtualtype');
 const $__hasIncludedChildren = require('./helpers/projection/hasIncludedChildren');
-const castNumber = require('./cast/number');
 const applyDefaults = require('./helpers/document/applyDefaults');
 const cleanModifiedSubpaths = require('./helpers/document/cleanModifiedSubpaths');
 const clone = require('./helpers/clone');
@@ -1747,18 +1746,26 @@ Document.prototype.$inc = function $inc(path, val) {
     return this;
   }
 
+  const currentValue = this.$__getValue(path) || 0;
+  let shouldSet = false;
+  let valToSet = null;
+  let valToInc = val;
+
   try {
-    val = castNumber(val);
+    val = schemaType.cast(val);
+    valToSet = schemaType.applySetters(currentValue + val, this);
+    valToInc = valToSet - currentValue;
+    shouldSet = true;
   } catch (err) {
     this.invalidate(path, new MongooseError.CastError('number', val, path, err));
   }
 
-  const currentValue = this.$__getValue(path) || 0;
-
-  this.$__.primitiveAtomics = this.$__.primitiveAtomics || {};
-  this.$__.primitiveAtomics[path] = { $inc: val };
-  this.markModified(path);
-  this.$__setValue(path, currentValue + val);
+  if (shouldSet) {
+    this.$__.primitiveAtomics = this.$__.primitiveAtomics || {};
+    this.$__.primitiveAtomics[path] = { $inc: valToInc };
+    this.markModified(path);
+    this.$__setValue(path, valToSet);
+  }
 
   return this;
 };
@@ -2557,7 +2564,7 @@ function _evaluateRequiredFunctions(doc) {
  * ignore
  */
 
-function _getPathsToValidate(doc) {
+function _getPathsToValidate(doc, pathsToValidate, pathsToSkip) {
   const skipSchemaValidators = {};
 
   _evaluateRequiredFunctions(doc);
@@ -2628,6 +2635,22 @@ function _getPathsToValidate(doc) {
     }
   }
 
+  for (const path of paths) {
+    // Single nested paths (paths embedded under single nested subdocs) will
+    // be validated on their own when we call `validate()` on the subdoc itself.
+    // Re: gh-8468
+    if (doc.$__schema.singleNestedPaths.hasOwnProperty(path)) {
+      paths.delete(path);
+      continue;
+    }
+  }
+
+  if (Array.isArray(pathsToValidate)) {
+    paths = _handlePathsToValidate(paths, pathsToValidate);
+  } else if (Array.isArray(pathsToSkip)) {
+    paths = _handlePathsToSkip(paths, pathsToSkip);
+  }
+
   // from here on we're not removing items from paths
 
   // gh-661: if a whole array is modified, make sure to run validation on all
@@ -2687,13 +2710,6 @@ function _getPathsToValidate(doc) {
   }
 
   for (const path of paths) {
-    // Single nested paths (paths embedded under single nested subdocs) will
-    // be validated on their own when we call `validate()` on the subdoc itself.
-    // Re: gh-8468
-    if (doc.$__schema.singleNestedPaths.hasOwnProperty(path)) {
-      paths.delete(path);
-      continue;
-    }
     const _pathType = doc.$__schema.path(path);
     if (!_pathType || !_pathType.$isSchemaMap) {
       continue;
@@ -2776,19 +2792,14 @@ Document.prototype.$__validate = function(pathsToValidate, options, callback) {
   };
 
   // only validate required fields when necessary
-  const pathDetails = _getPathsToValidate(this);
-  let paths = shouldValidateModifiedOnly ?
+  const pathDetails = _getPathsToValidate(this, pathsToValidate, pathsToSkip);
+  const paths = shouldValidateModifiedOnly ?
     pathDetails[0].filter((path) => this.$isModified(path)) :
     pathDetails[0];
   const skipSchemaValidators = pathDetails[1];
   if (typeof pathsToValidate === 'string') {
     pathsToValidate = pathsToValidate.split(' ');
   }
-  if (Array.isArray(pathsToValidate)) {
-    paths = _handlePathsToValidate(paths, pathsToValidate);
-  } else if (pathsToSkip) {
-    paths = _handlePathsToSkip(paths, pathsToSkip);
-  }
 
   if (paths.length === 0) {
     return immediate(function() {
@@ -2907,12 +2918,12 @@ function _handlePathsToValidate(paths, pathsToValidate) {
     }
   }
 
-  const ret = [];
+  const ret = new Set();
   for (const path of paths) {
     if (_pathsToValidate.has(path)) {
-      ret.push(path);
+      ret.add(path);
     } else if (parentPaths.has(path)) {
-      ret.push(parentPaths.get(path));
+      ret.add(parentPaths.get(path));
     }
   }
   return ret;
@@ -2924,8 +2935,8 @@ function _handlePathsToValidate(paths, pathsToValidate) {
 
 function _handlePathsToSkip(paths, pathsToSkip) {
   pathsToSkip = new Set(pathsToSkip);
-  paths = paths.filter(p => !pathsToSkip.has(p));
-  return paths;
+  paths = Array.from(paths).filter(p => !pathsToSkip.has(p));
+  return new Set(paths);
 }
 
 /**
@@ -2981,17 +2992,12 @@ Document.prototype.validateSync = function(pathsToValidate, options) {
   }
 
   // only validate required fields when necessary
-  const pathDetails = _getPathsToValidate(this);
-  let paths = shouldValidateModifiedOnly ?
+  const pathDetails = _getPathsToValidate(this, pathsToValidate, pathsToSkip);
+  const paths = shouldValidateModifiedOnly ?
     pathDetails[0].filter((path) => this.$isModified(path)) :
     pathDetails[0];
   const skipSchemaValidators = pathDetails[1];
 
-  if (Array.isArray(pathsToValidate)) {
-    paths = _handlePathsToValidate(paths, pathsToValidate);
-  } else if (Array.isArray(pathsToSkip)) {
-    paths = _handlePathsToSkip(paths, pathsToSkip);
-  }
   const validating = {};
 
   for (let i = 0, len = paths.length; i < len; ++i) {

package/lib/helpers/document/applyDefaults.js

@@ -32,7 +32,7 @@ module.exports = function applyDefaults(doc, fields, exclude, hasIncludedChildre
         }
       } else if (exclude === false && fields && !included) {
         const hasSubpaths = type.$isSingleNested || type.$isMongooseDocumentArray;
-        if (curPath in fields || (hasSubpaths && hasIncludedChildren != null && hasIncludedChildren[curPath])) {
+        if (curPath in fields || (j === len - 1 && hasSubpaths && hasIncludedChildren != null && hasIncludedChildren[curPath])) {
           included = true;
         } else if (hasIncludedChildren != null && !hasIncludedChildren[curPath]) {
           break;

package/lib/helpers/timestamps/setupTimestamps.js

@@ -7,6 +7,11 @@ const handleTimestampOption = require('../schema/handleTimestampOption');
 const setDocumentTimestamps = require('./setDocumentTimestamps');
 const symbols = require('../../schema/symbols');
 
+const replaceOps = new Set([
+  'replaceOne',
+  'findOneAndReplace'
+]);
+
 module.exports = function setupTimestamps(schema, timestamps) {
   const childHasTimestamp = schema.childSchemas.find(withTimestamp);
   function withTimestamp(s) {
@@ -90,7 +95,7 @@ module.exports = function setupTimestamps(schema, timestamps) {
       currentTime() :
       this.model.base.now();
     // Replacing with null update should still trigger timestamps
-    if (this.op === 'findOneAndReplace' && this.getUpdate() == null) {
+    if (replaceOps.has(this.op) && this.getUpdate() == null) {
       this.setUpdate({});
     }
     applyTimestampsToUpdate(now, createdAt, updatedAt, this.getUpdate(),

package/lib/model.js

@@ -1252,9 +1252,11 @@ for (const i in EventEmitter.prototype) {
  * Mongoose calls this function automatically when a model is created using
  * [`mongoose.model()`](/docs/api/mongoose.html#mongoose_Mongoose-model) or
  * [`connection.model()`](/docs/api/connection.html#connection_Connection-model), so you
- * don't need to call it. This function is also idempotent, so you may call it
- * to get back a promise that will resolve when your indexes are finished
- * building as an alternative to [`MyModel.on('index')`](/docs/guide.html#indexes)
+ * don't need to call `init()` to trigger index builds.
+ *
+ * However, you _may_ need to call `init()`  to get back a promise that will resolve when your indexes are finished.
+ * Calling `await Model.init()` is helpful if you need to wait for indexes to build before continuing.
+ * For example, if you want to wait for unique indexes to build before continuing with a test case.
  *
  * #### Example:
  *
@@ -1263,11 +1265,8 @@ for (const i in EventEmitter.prototype) {
  *     // `Event.init()` on your own.
  *     const Event = mongoose.model('Event', eventSchema);
  *
- *     Event.init().then(function(Event) {
- *       // You can also use `Event.on('index')` if you prefer event emitters
- *       // over promises.
- *       console.log('Indexes are done building!');
- *     });
+ *     await Event.init();
+ *     console.log('Indexes are done building!');
  *
  * @api public
  * @returns {Promise}
@@ -2952,7 +2951,7 @@ Model.startSession = function() {
  * @param {Array|Object|*} doc(s)
  * @param {Object} [options] see the [mongodb driver options](https://mongodb.github.io/node-mongodb-native/4.9/classes/Collection.html#insertMany)
  * @param {Boolean} [options.ordered=true] if true, will fail fast on the first error encountered. If false, will insert all the documents it can and report errors later. An `insertMany()` with `ordered = false` is called an "unordered" `insertMany()`.
- * @param {Boolean} [options.rawResult=false] if false, the returned promise resolves to the documents that passed mongoose document validation. If `true`, will return the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/InsertManyResult.html) with a `mongoose` property that contains `validationErrors` if this is an unordered `insertMany`.
+ * @param {Boolean} [options.rawResult=false] if false, the returned promise resolves to the documents that passed mongoose document validation. If `true`, will return the [raw result from the MongoDB driver](https://mongodb.github.io/node-mongodb-native/4.9/interfaces/InsertManyResult.html) with a `mongoose` property that contains `validationErrors` and `results` if this is an unordered `insertMany`.
  * @param {Boolean} [options.lean=false] if `true`, skips hydrating and validating the documents. This option is useful if you need the extra performance, but Mongoose won't validate the documents before inserting.
  * @param {Number} [options.limit=null] this limits the number of documents being processed (validation/casting) by mongoose in parallel, this does **NOT** send the documents in batches to MongoDB. Use this option if you're processing a large number of documents and your app is running out of memory.
  * @param {String|Object|Array} [options.populate=null] populates the result documents. This option is a no-op if `rawResult` is set.
@@ -3009,6 +3008,7 @@ Model.$__insertMany = function(arr, options, callback) {
 
   const validationErrors = [];
   const validationErrorsToOriginalOrder = new Map();
+  const results = ordered ? null : new Array(arr.length);
   const toExecute = arr.map((doc, index) =>
     callback => {
       if (!(doc instanceof _this)) {
@@ -3034,8 +3034,8 @@ Model.$__insertMany = function(arr, options, callback) {
           if (ordered === false) {
             validationErrors.push(error);
             validationErrorsToOriginalOrder.set(error, index);
-            callback(null, null);
-            return;
+            results[index] = error;
+            return callback(null, null);
           }
           callback(error);
         }
@@ -3108,10 +3108,17 @@ Model.$__insertMany = function(arr, options, callback) {
 
         if (rawResult) {
           if (ordered === false) {
+            for (let i = 0; i < results.length; ++i) {
+              if (results[i] === void 0) {
+                results[i] = docs[i];
+              }
+            }
+
             // Decorate with mongoose validation errors in case of unordered,
             // because then still do `insertMany()`
             res.mongoose = {
-              validationErrors: validationErrors
+              validationErrors: validationErrors,
+              results: results
             };
           }
           return callback(null, res);
@@ -3143,10 +3150,24 @@ Model.$__insertMany = function(arr, options, callback) {
         const erroredIndexes = new Set((error && error.writeErrors || []).map(err => err.index));
 
         for (let i = 0; i < error.writeErrors.length; ++i) {
+          const originalIndex = validDocIndexToOriginalIndex.get(error.writeErrors[i].index);
           error.writeErrors[i] = {
             ...error.writeErrors[i],
-            index: validDocIndexToOriginalIndex.get(error.writeErrors[i].index)
+            index: originalIndex
           };
+          if (!ordered) {
+            results[originalIndex] = error.writeErrors[i];
+          }
+        }
+
+        if (!ordered) {
+          for (let i = 0; i < results.length; ++i) {
+            if (results[i] === void 0) {
+              results[i] = docs[i];
+            }
+          }
+
+          error.results = results;
         }
 
         let firstErroredIndex = -1;
@@ -3174,7 +3195,8 @@ Model.$__insertMany = function(arr, options, callback) {
 
         if (rawResult && ordered === false) {
           error.mongoose = {
-            validationErrors: validationErrors
+            validationErrors: validationErrors,
+            results: results
           };
         }
 

package/lib/query.js

@@ -4319,6 +4319,10 @@ Query.prototype.exec = async function exec(op) {
   try {
     await _executePreHooks(this);
     res = await this[thunk]();
+
+    for (const fn of this._transforms) {
+      res = fn(res);
+    }
   } catch (err) {
     if (err instanceof Kareem.skipWrappedFunction) {
       res = err.args[0];
@@ -4327,10 +4331,6 @@ Query.prototype.exec = async function exec(op) {
     }
   }
 
-  for (const fn of this._transforms) {
-    res = fn(res);
-  }
-
   res = await _executePostHooks(this, res, error);
 
   await _executePostExecHooks(this);
@@ -4482,7 +4482,8 @@ Query.prototype.finally = function(onFinally) {
  *
  * @return {String}
  * @api public
- * @method toStringTag
+ * @method [Symbol.toStringTag]
+ * @memberOf Query
  */
 
 Query.prototype[Symbol.toStringTag] = function toString() {
@@ -5192,7 +5193,7 @@ Query.prototype.nearSphere = function() {
  * `Symbol.asyncIterator` is undefined, that means your Node.js version does not
  * support async iterators.
  *
- * @method Symbol.asyncIterator
+ * @method [Symbol.asyncIterator]
  * @memberOf Query
  * @instance
  * @api public

package/lib/schema/documentarray.js

@@ -416,6 +416,8 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
 
   options = options || {};
 
+  const path = options.path || this.path;
+
   if (!Array.isArray(value)) {
     if (!init && !DocumentArrayPath.options.castNonArrays) {
       throw new CastError('DocumentArray', value, this.path, null, this);
@@ -423,7 +425,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
     // gh-2442 mark whole array as modified if we're initializing a doc from
     // the db and the path isn't an array in the document
     if (!!doc && init) {
-      doc.markModified(this.path);
+      doc.markModified(path);
     }
     return this.cast([value], doc, init, prev, options);
   }
@@ -431,7 +433,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
   // We need to create a new array, otherwise change tracking will
   // update the old doc (gh-4449)
   if (!options.skipDocumentArrayCast || utils.isMongooseDocumentArray(value)) {
-    value = new MongooseDocumentArray(value, this.path, doc);
+    value = new MongooseDocumentArray(value, path, doc);
   }
 
   if (prev != null) {
@@ -439,7 +441,7 @@ DocumentArrayPath.prototype.cast = function(value, doc, init, prev, options) {
   }
 
   if (options.arrayPathIndex != null) {
-    value[arrayPathSymbol] = this.path + '.' + options.arrayPathIndex;
+    value[arrayPathSymbol] = path + '.' + options.arrayPathIndex;
   }
 
   const rawArray = utils.isMongooseDocumentArray(value) ? value.__array : value;

package/lib/schema.js

@@ -734,8 +734,15 @@ Schema.prototype.add = function add(obj, prefix) {
         if (prefix) {
           this.nested[prefix.substring(0, prefix.length - 1)] = true;
         }
-        const _schema = new Schema(_typeDef);
-        const schemaWrappedPath = Object.assign({}, val, { type: _schema });
+
+        const childSchemaOptions = {};
+        if (this._userProvidedOptions.typeKey) {
+          childSchemaOptions.typeKey = this._userProvidedOptions.typeKey;
+        }
+
+        const _schema = new Schema(_typeDef, childSchemaOptions);
+        _schema.$implicitlyCreated = true;
+        const schemaWrappedPath = Object.assign({}, val, { [typeKey]: _schema });
         this.path(prefix + key, schemaWrappedPath);
       } else {
         // Either the type is non-POJO or we interpret it as Mixed anyway
@@ -1322,6 +1329,7 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
         } else if (Schema.Types.DocumentArray.defaultOptions._id != null) {
           childSchemaOptions._id = Schema.Types.DocumentArray.defaultOptions._id;
         }
+
         const childSchema = new Schema(castFromTypeKey, childSchemaOptions);
         childSchema.$implicitlyCreated = true;
         return new MongooseTypes.DocumentArray(path, childSchema, obj);
@@ -1365,7 +1373,6 @@ Schema.prototype.interpretAsType = function(path, obj, options) {
   }
 
   if (type && type.instanceOfSchema) {
-
     return new MongooseTypes.Subdocument(type, path, obj);
   }
 
@@ -2210,11 +2217,15 @@ Schema.prototype.virtual = function(name, options) {
     }
 
     // Workaround for gh-8198: if virtual is under document array, make a fake
-    // virtual. See gh-8210
+    // virtual. See gh-8210, gh-13189
     const parts = name.split('.');
     let cur = parts[0];
     for (let i = 0; i < parts.length - 1; ++i) {
-      if (this.paths[cur] != null && this.paths[cur].$isMongooseDocumentArray) {
+      if (this.paths[cur] == null) {
+        continue;
+      }
+
+      if (this.paths[cur].$isMongooseDocumentArray || this.paths[cur].$isSingleNested) {
         const remnant = parts.slice(i + 1).join('.');
         this.paths[cur].schema.virtual(remnant, options);
         break;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "mongoose",
   "description": "Mongoose MongoDB ODM",
-  "version": "7.0.1",
+  "version": "7.0.3",
   "author": "Guillermo Rauch <guillermo@learnboost.com>",
   "keywords": [
     "mongodb",
@@ -46,6 +46,7 @@
     "dotenv": "16.0.3",
     "dox": "1.0.0",
     "eslint": "8.35.0",
+    "eslint-plugin-markdown": "^3.0.0",
     "eslint-plugin-mocha-no-only": "1.1.1",
     "express": "^4.18.1",
     "highlight.js": "11.7.0",
@@ -75,7 +76,7 @@
     "docs:clean:stable": "rimraf index.html && rimraf -rf ./docs/*.html  && rimraf -rf ./docs/api && rimraf -rf ./docs/tutorials/*.html && rimraf -rf ./docs/typescript/*.html && rimraf -rf ./docs/*.html && rimraf -rf ./docs/source/_docs && rimraf -rf ./tmp",
     "docs:clean:5x": "rimraf index.html && rimraf -rf ./docs/5.x && rimraf -rf ./docs/source/_docs && rimraf -rf ./tmp",
     "docs:clean:6x": "rimraf index.html && rimraf -rf ./docs/6.x && rimraf -rf ./docs/source/_docs && rimraf -rf ./tmp",
-    "docs:copy:tmp": "mkdirp ./tmp/docs/css && mkdirp ./tmp/docs/js && mkdirp ./tmp/docs/images && mkdirp ./tmp/docs/tutorials && mkdirp ./tmp/docs/typescript && ncp ./docs/css ./tmp/docs/css --filter=.css$ && ncp ./docs/js ./tmp/docs/js --filter=.js$ && ncp ./docs/images ./tmp/docs/images && ncp ./docs/tutorials ./tmp/docs/tutorials && ncp ./docs/typescript ./tmp/docs/typescript && cp index.html ./tmp && cp docs/*.html ./tmp/docs/",
+    "docs:copy:tmp": "mkdirp ./tmp/docs/css && mkdirp ./tmp/docs/js && mkdirp ./tmp/docs/images && mkdirp ./tmp/docs/tutorials && mkdirp ./tmp/docs/typescript && mkdirp ./tmp/docs/api && ncp ./docs/css ./tmp/docs/css --filter=.css$ && ncp ./docs/js ./tmp/docs/js --filter=.js$ && ncp ./docs/images ./tmp/docs/images && ncp ./docs/tutorials ./tmp/docs/tutorials && ncp ./docs/typescript ./tmp/docs/typescript && ncp ./docs/api ./tmp/docs/api && cp index.html ./tmp && cp docs/*.html ./tmp/docs/",
     "docs:copy:tmp:5x": "rimraf ./docs/5.x && ncp ./tmp ./docs/5.x",
     "docs:copy:tmp:6x": "rimraf ./docs/6.x && ncp ./tmp ./docs/6.x",
     "docs:checkout:gh-pages": "git checkout gh-pages",
@@ -83,6 +84,7 @@
     "docs:checkout:6x": "git checkout 6.x",
     "docs:generate": "node ./scripts/website.js",
     "docs:generate:search": "node ./scripts/generateSearch.js",
+    "docs:generate:sponsorData": "node ./scripts/loadSponsorData.js",
     "docs:merge:stable": "git merge master",
     "docs:merge:5x": "git merge 5.x",
     "docs:merge:6x": "git merge 6.x",
@@ -95,6 +97,7 @@
     "lint": "eslint .",
     "lint-js": "eslint . --ext .js",
     "lint-ts": "eslint . --ext .ts",
+    "lint-md": "eslint . --ext .md",
     "build-browser": "(rm ./dist/* || true) && node ./scripts/build-browser.js",
     "prepublishOnly": "npm run build-browser",
     "release": "git pull && git push origin master --tags && npm publish",

package/scripts/generateSearch.js

@@ -1,6 +1,14 @@
 'use strict';
 
-const config = require('../.config');
+let config;
+try {
+  config = require('../.config.js');
+} finally {
+  if (!config || !config.uri) {
+    console.error('No Config or config.URI given, please create a .config.js file with those values in the root of the repository');
+    process.exit(-1);
+  }
+}
 const cheerio = require('cheerio');
 const filemap = require('../docs/source');
 const fs = require('fs');
@@ -30,25 +38,27 @@ const Content = mongoose.model('Content', contentSchema, 'Content');
 
 const contents = [];
 
-for (const [filename, file] of Object.entries(filemap)) {
-  if (file.api) {
-    // API docs are special, raw content is in the `docs` property
-    for (const _class of file.docs) {
-      for (const prop of _class.props) {
-        const content = new Content({
-          title: `API: ${prop.string}`,
-          body: prop.description,
-          url: `api/${_class.fileName}.html#${prop.anchorId}`
-        });
-        const err = content.validateSync();
-        if (err != null) {
-          console.error(content);
-          throw err;
-        }
-        contents.push(content);
-      }
+const api = require('../docs/source/api');
+
+// API docs are special, because they are not added to the file-map individually currently and use different properties
+for (const _class of api.docs) {
+  for (const prop of _class.props) {
+    const content = new Content({
+      title: `API: ${prop.name}`,
+      body: prop.description,
+      url: `api/${_class.fileName}.html#${prop.anchorId}`
+    });
+    const err = content.validateSync();
+    if (err != null) {
+      console.error(content);
+      throw err;
     }
-  } else if (file.markdown) {
+    contents.push(content);
+  }
+}
+
+for (const [filename, file] of Object.entries(filemap)) {
+  if (file.markdown) {
     let text = fs.readFileSync(filename, 'utf8');
     text = markdown.parse(text);
 
@@ -120,11 +130,6 @@ run().catch(async error => {
 });
 
 async function run() {
-  if (!config || !config.uri) {
-    console.error('No Config or config.URI given, please create a .config.js file with those values');
-    process.exit(-1);
-  }
-
   await mongoose.connect(config.uri, { dbName: 'mongoose', serverSelectionTimeoutMS: 5000 });
 
   // wait for the index to be created
@@ -152,5 +157,7 @@ async function run() {
 
   console.log(results.map(res => res.url));
 
+  console.log(`Added ${contents.length} Content`);
+
   process.exit(0);
 }