@kaspernj/api-maker 1.0.130 → 1.0.133

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.130",
+  "version": "1.0.133",
   "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")
@@ -15,7 +14,7 @@ const {ValidationErrors} = require("./validation-errors.cjs")
 
 const shared = {}
 
-module.exports = class BaseModel {
+class BaseModel {
   static modelClassData () {
     throw new Error("modelClassData should be overriden by child")
   }
@@ -826,3 +825,7 @@ module.exports = class BaseModel {
     }
   }
 }
+
+BaseModel.apiMakerType = "BaseModel"
+
+module.exports = BaseModel

package/src/collection.cjs

@@ -5,7 +5,7 @@ const inflection = require("inflection")
 const {merge} = require("./merge.cjs")
 const Result = require("./result.cjs")
 
-module.exports = class ApiMakerCollection {
+class ApiMakerCollection {
   constructor (args, queryArgs = {}) {
     this.queryArgs = queryArgs
     this.args = args
@@ -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)
 
@@ -240,3 +248,7 @@ module.exports = class ApiMakerCollection {
     )
   }
 }
+
+ApiMakerCollection.apiMakerType = "Collection"
+
+module.exports = ApiMakerCollection

package/src/devise.cjs

@@ -49,18 +49,10 @@ module.exports = class ApiMakerDevise {
 
     const postData = {username, password, args}
     const response = await Services.current().sendRequest("Devise::SignIn", postData)
-    const modelClass = digg(require("@kaspernj/api-maker/src/models"), inflection.camelize(args.scope))
-    const modelInstance = new modelClass(digg(response, "model_data"))
 
-    let model
+    let model = response.model
 
-    if (args.loadQuery) {
-      model = await args.loadQuery.clone().ransack({id_eq: modelInstance.id()}).first()
-
-      if (!model) throw new Error(`Couldn't read user with ID ${modelInstance.id()}`)
-    } else {
-      model = modelInstance
-    }
+    if (Array.isArray(model)) model = model[0]
 
     await CanCan.current().resetAbilities()
 

package/src/serializer.cjs

@@ -16,7 +16,7 @@ module.exports = class Serializer {
   }
 
   serializeArgument (arg) {
-    if (typeof arg == "function" && arg.modelClassData && arg.modelName) {
+    if (typeof arg == "function" && arg.apiMakerType == "BaseModel") {
       return {
         api_maker_type: "resource",
         name: digg(arg.modelClassData(), "name")
@@ -38,6 +38,11 @@ module.exports = class Serializer {
       }
     } else if (Array.isArray(arg)) {
       return this.serializeArray(arg)
+    } else if (typeof arg == "object" && arg.constructor && arg.constructor.apiMakerType == "Collection") {
+      return {
+        api_maker_type: "collection",
+        value: this.serializeObject(arg)
+      }
     } else if (typeof arg == "object" && arg !== null && arg.constructor.name == "Object") {
       return this.serializeObject(arg)
     } else {