@kaspernj/api-maker 1.0.129 → 1.0.132

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.129",
+  "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")
@@ -416,6 +415,8 @@ module.exports = class BaseModel {
   }
 
   setNewModelData (model) {
+    if (!("modelData" in model)) throw new Error(`No modelData in model: ${JSON.stringify(model)}`)
+
     this.previousModelData = digg(this, "modelData")
     this.modelData = digg(model, "modelData")
   }
@@ -531,12 +532,18 @@ module.exports = class BaseModel {
   }
 
   _refreshModelFromResponse (response) {
-    const newModel = ModelsResponseReader.first(digg(response, "model"))
+    let newModel = digg(response, "model")
+
+    if (Array.isArray(newModel)) newModel = newModel[0]
+
     this.setNewModel(newModel)
   }
 
   _refreshModelDataFromResponse (response) {
-    const newModel = ModelsResponseReader.first(digg(response, "model"))
+    let newModel = digg(response, "model")
+
+    if (Array.isArray(newModel)) newModel = newModel[0]
+
     this.setNewModelData(newModel)
   }
 
@@ -669,7 +676,7 @@ module.exports = class BaseModel {
       if (attributeName in attributes) return null
     }
 
-    throw new AttributeNotLoadedError(`No such attribute: ${digg(this.modelClassData(), "name")}#${attributeName}`)
+    throw new AttributeNotLoadedError(`No such attribute: ${digg(this.modelClassData(), "name")}#${attributeName}: ${JSON.stringify(this.modelData)}`)
   }
 
   isAttributeLoaded (attributeName) {

package/src/collection.cjs

@@ -3,7 +3,6 @@ const CommandsPool = require("./commands-pool.cjs")
 const {digg} = require("diggerize")
 const inflection = require("inflection")
 const {merge} = require("./merge.cjs")
-const ModelsResponseReader = require("./models-response-reader.cjs")
 const Result = require("./result.cjs")
 
 module.exports = class ApiMakerCollection {
@@ -38,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,8 +145,12 @@ module.exports = class ApiMakerCollection {
 
   async result () {
     const response = await this._response()
-    const models = this._responseToModels(response)
+    const models = digg(response, "collection")
+
+    this._addCollectionToModels(models)
+
     const result = new Result({collection: this, models, response})
+
     return result
   }
 
@@ -199,7 +202,11 @@ module.exports = class ApiMakerCollection {
 
   async toArray () {
     const response = await this._response()
-    return this._responseToModels(response)
+    const models = digg(response, "collection")
+
+    this._addCollectionToModels(models)
+
+    return models
   }
 
   modelClass () {
@@ -214,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)
 
@@ -233,12 +247,4 @@ module.exports = class ApiMakerCollection {
       {}
     )
   }
-
-  _responseToModels (response) {
-    const modelsResponseReader = new ModelsResponseReader({
-      collection: this,
-      response
-    })
-    return modelsResponseReader.models()
-  }
 }

package/src/deserializer.cjs

@@ -1,5 +1,6 @@
 const {digg} = require("diggerize")
 const inflection = require("inflection")
+const ModelsResponseReader = require("./models-response-reader.cjs")
 const Money = require("js-money")
 
 module.exports = class ApiMakerDeserializer {
@@ -11,6 +12,11 @@ module.exports = class ApiMakerDeserializer {
         const date = new Date(digg(object, "value"))
 
         return date
+      } else if (object.api_maker_type == "collection") {
+        // Need to remove type to avoid circular error
+        const {api_maker_type, ...restObject} = object
+
+        return ModelsResponseReader.collection(ApiMakerDeserializer.parse(restObject))
       } else if (object.api_maker_type == "money") {
         const cents = digg(object, "amount")
         const currency = digg(object, "currency")

package/src/devise.cjs

@@ -45,20 +45,21 @@ module.exports = class ApiMakerDevise {
   }
 
   static async signIn (username, password, args = {}) {
-    if (!args.scope)
-      args.scope = "user"
+    if (!args.scope) args.scope = "user"
 
     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 = response.model
+
+    if (Array.isArray(model)) model = model[0]
 
     await CanCan.current().resetAbilities()
 
-    ApiMakerDevise.updateSession(modelInstance)
+    ApiMakerDevise.updateSession(model)
     ApiMakerDevise.events().emit("onDeviseSignIn", Object.assign({username}, args))
 
-    return {model: modelInstance, response}
+    return {model, response}
   }
 
   static updateSession (model) {
@@ -105,10 +106,13 @@ module.exports = class ApiMakerDevise {
   loadCurrentScope (scope) {
     const scopeData = global.apiMakerDeviseCurrent[scope]
 
-    if (!scopeData)
-      return null
+    if (!scopeData) return null
 
     const parsedScopeData = Deserializer.parse(scopeData)
+
+    // Might be a collection with preloaded relationships
+    if (Array.isArray(parsedScopeData)) return parsedScopeData[0]
+
     const ModelClass = digg(require("@kaspernj/api-maker/src/models"), inflection.camelize(scope))
     const modelInstance = new ModelClass({data: parsedScopeData})
 

package/src/serializer.cjs

@@ -38,6 +38,11 @@ module.exports = class Serializer {
       }
     } else if (Array.isArray(arg)) {
       return this.serializeArray(arg)
+    } else if (typeof arg == "object" && arg.constructor.name == "ApiMakerCollection") {
+      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 {