@kaspernj/api-maker 1.0.131 → 1.0.132

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.131",
+  "version": "1.0.132",
   "description": "",
   "main": "index.js",
   "repository": {

package/src/base-model.cjs

@@ -6,7 +6,6 @@ const {digg} = require("diggerize")
 const FormDataObjectizer = require("form-data-objectizer")
 const inflection = require("inflection")
 const ModelName = require("./model-name.cjs")
-const ModelsResponseReader = require("./models-response-reader.cjs")
 const NotLoadedError = require("./not-loaded-error.cjs")
 const objectToFormData = require("object-to-formdata").serialize
 const Services = require("./services.cjs")

package/src/collection.cjs

@@ -37,7 +37,7 @@ module.exports = class ApiMakerCollection {
   async count () {
     const response = await this.clone()._merge({count: true})._response()
 
-    return response.count
+    return digg(response, "count")
   }
 
   distinct () {
@@ -146,7 +146,11 @@ module.exports = class ApiMakerCollection {
   async result () {
     const response = await this._response()
     const models = digg(response, "collection")
+
+    this._addCollectionToModels(models)
+
     const result = new Result({collection: this, models, response})
+
     return result
   }
 
@@ -200,10 +204,7 @@ module.exports = class ApiMakerCollection {
     const response = await this._response()
     const models = digg(response, "collection")
 
-    // This is needed when reloading a version of the model with the same selected attributes and preloads
-    for(const model of models) {
-      model.collection = this
-    }
+    this._addCollectionToModels(models)
 
     return models
   }
@@ -220,6 +221,13 @@ module.exports = class ApiMakerCollection {
     return new ApiMakerCollection(this.args, clonedQueryArgs)
   }
 
+  // This is needed when reloading a version of the model with the same selected attributes and preloads
+  _addCollectionToModels(models) {
+    for(const model of models) {
+      model.collection = this
+    }
+  }
+
   _merge (newQueryArgs) {
     merge(this.queryArgs, newQueryArgs)