@kaspernj/api-maker 1.0.134 → 1.0.137

package/package.json

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

package/src/commands-pool.cjs

@@ -126,7 +126,7 @@ module.exports = class ApiMakerCommandsPool {
         const commandData = currentPool[parseInt(commandId, 10)]
         const responseType = commandResponse.type
 
-        if (commandResponseData) {
+        if (commandResponseData && typeof commandResponseData == "object") {
           const bugReportUrl = dig(commandResponseData, "bug_report_url")
 
           if (bugReportUrl) {

package/src/model-load-wrapper.jsx

@@ -1,3 +1,4 @@
+import EventUpdated from "./event-updated"
 import Params from "./params.cjs"
 import React from "react"
 
@@ -23,9 +24,10 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
   }
 
   async loadExistingModel() {
-    const {modelId} = digs(this.shape, "modelId")
+    const {modelId} = digs(this.state, "modelId")
     const query = await ModelClass.ransack({id_eq: modelId})
 
+    if (args.abilities) query.abilities(args.abilities)
     if (args.preload) query.preload(args.preload)
     if (args.select) query.select(args.select)
 
@@ -37,7 +39,8 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
   loadNewModel() {
     const params = Params.parse()
     const paramKey = ModelClass.modelName().paramKey()
-    const modelData = params[paramKey] || {}
+    const modelDataFromParams = params[paramKey] || {}
+    const modelData = Object.assign({}, args.newAttributes, modelDataFromParams)
     const model = new ModelClass(modelData)
 
     this.setState({model})
@@ -51,7 +54,14 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
     wrappedComponentProps[`${this.camelizedLower}Id`] = modelId
 
     return (
-      <WrappedComponent {...wrappedComponentProps} {...this.props} />
+      <>
+        {model && args.eventUpdated &&
+          <EventUpdated model={model} onUpdated={digg(this, "onUpdated")} />
+        }
+        <WrappedComponent {...wrappedComponentProps} {...this.props} />
+      </>
     )
   }
+
+  onUpdated = ({model}) => this.setState({model})
 }

package/src/serializer.cjs

@@ -16,7 +16,13 @@ module.exports = class Serializer {
   }
 
   serializeArgument (arg) {
-    if (typeof arg == "function" && arg.apiMakerType == "BaseModel") {
+    if (typeof arg == "object" && arg.constructor.apiMakerType == "BaseModel") {
+      return {
+        api_maker_type: "model",
+        model_class_name: digg(arg.modelClassData(), "name"),
+        model_id: arg.id()
+      }
+    } else if (typeof arg == "function" && arg.apiMakerType == "BaseModel") {
       return {
         api_maker_type: "resource",
         name: digg(arg.modelClassData(), "name")