@kaspernj/api-maker 1.0.131 → 1.0.134

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.131",
+  "version": "1.0.134",
   "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/model-load-wrapper.jsx

@@ -0,0 +1,57 @@
+import Params from "./params.cjs"
+import React from "react"
+
+export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapper extends React.PureComponent {
+  camelizedLower = ModelClass.modelName().camelizedLower()
+  paramsVariableName = `${ModelClass.modelName().paramKey()}_id`
+
+  state = {
+    model: undefined,
+    modelId: this.props.match.params[this.paramsVariableName] || this.props.match.params.id
+  }
+
+  componentDidMount() {
+    if (args.newIfNoId && !this.getModelId()) {
+      this.loadNewModel()
+    } else if (!args.optional || this.getModelId()) {
+      this.loadExistingModel()
+    }
+  }
+
+  getModelId() {
+    return this.props.match.params[this.paramsVariableName] || this.props.match.params.id
+  }
+
+  async loadExistingModel() {
+    const {modelId} = digs(this.shape, "modelId")
+    const query = await ModelClass.ransack({id_eq: modelId})
+
+    if (args.preload) query.preload(args.preload)
+    if (args.select) query.select(args.select)
+
+    const model = await query.first()
+
+    this.setState({model})
+  }
+
+  loadNewModel() {
+    const params = Params.parse()
+    const paramKey = ModelClass.modelName().paramKey()
+    const modelData = params[paramKey] || {}
+    const model = new ModelClass(modelData)
+
+    this.setState({model})
+  }
+
+  render() {
+    const {model, modelId} = digs(this.state, "model", "modelId")
+    const wrappedComponentProps = {}
+
+    wrappedComponentProps[this.camelizedLower] = model
+    wrappedComponentProps[`${this.camelizedLower}Id`] = modelId
+
+    return (
+      <WrappedComponent {...wrappedComponentProps} {...this.props} />
+    )
+  }
+}

package/src/model-name.cjs

@@ -3,6 +3,10 @@ module.exports = class ModelName {
     this.data = data
   }
 
+  camelizedLower() {
+    return this.data.modelClassData.camelizedLower
+  }
+
   human (args) {
     let argsToUse = args
 
@@ -20,4 +24,8 @@ module.exports = class ModelName {
 
     return this.data.i18n.t(key)
   }
+
+  paramKey() {
+    return this.data.modelClassData.paramKey
+  }
 }

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