@kaspernj/api-maker 1.0.207 → 1.0.210

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.207",
+  "version": "1.0.210",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -44,6 +44,7 @@
     "form-data-objectizer": ">= 1.0.0",
     "form-serialize": ">= 0.7.2",
     "format-number": ">= 3.0.0",
+    "incorporator": ">= 1.0.2",
     "inflection": ">= 1.12.0",
     "js-money": ">= 0.6.3",
     "numberable": ">= 1.0.0",

package/src/collection.mjs

@@ -2,7 +2,7 @@ import cloneDeep from "clone-deep"
 import CommandsPool from "./commands-pool.mjs"
 import {digg} from "diggerize"
 import inflection from "inflection"
-import {merge} from "./merge.mjs"
+import {incorporate} from "incorporator"
 import modelClassRequire from "./model-class-require.mjs"
 import Result from "./result.mjs"
 
@@ -111,7 +111,7 @@ class ApiMakerCollection {
   params () {
     let params = {}
 
-    if (this.queryArgs.params) params = merge(params, this.queryArgs.params)
+    if (this.queryArgs.params) params = incorporate(params, this.queryArgs.params)
     if (this.queryArgs.abilities) params.abilities = this.queryArgs.abilities
     if (this.queryArgs.accessibleBy) params.accessible_by = inflection.underscore(this.queryArgs.accessibleBy)
     if (this.queryArgs.count) params.count = this.queryArgs.count
@@ -230,7 +230,7 @@ class ApiMakerCollection {
   }
 
   _merge (newQueryArgs) {
-    merge(this.queryArgs, newQueryArgs)
+    incorporate(this.queryArgs, newQueryArgs)
 
     return this
   }

package/src/model-load-wrapper.jsx

@@ -8,7 +8,7 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
 
   state = {
     model: undefined,
-    modelId: this.props.match.params[this.paramsVariableName] || this.props.match.params.id,
+    modelId: this.getModelId(),
     notFound: undefined
   }
 
@@ -16,6 +16,16 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
     this.loadModel()
   }
 
+  componentDidUpdate() {
+    const newModelId = this.getModelId()
+
+    // The model ID was changed in the URL and a different model should be loaded
+    if (newModelId != this.state.modelId) {
+      this.setState({model: undefined, modelId: newModelId})
+      this.loadExistingModel()
+    }
+  }
+
   loadModel = async () => {
     if (args.newIfNoId && !this.getModelId()) {
       return await this.loadNewModel()
@@ -29,7 +39,7 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
   }
 
   loadExistingModel = async () => {
-    const {modelId} = digs(this.state, "modelId")
+    const modelId = this.getModelId()
     const query = await ModelClass.ransack({id_eq: modelId})
 
     if (args.abilities) query.abilities(args.abilities)

package/src/params.mjs

@@ -1,5 +1,5 @@
 import formSerialize from "form-serialize"
-import {merge} from "./merge.mjs"
+import Incorporator from "incorporator"
 import qs from "qs"
 
 export default class Params {
@@ -8,7 +8,11 @@ export default class Params {
   }
 
   static change (given) {
-    return merge(Params.parse(), given)
+    const incorporator = new Incorporator({objects: [Params.parse(), given]})
+
+    incorporator.replaceArrayIfExists(true)
+
+    return incorporator.merge()
   }
 
   static changeParams (given, opts = {}) {

package/__tests__/merge.test.js

@@ -1,25 +0,0 @@
-import {merge} from "../src/merge.mjs"
-
-describe("merge", () => {
-  it("merges an empty object and changes nothing", () => {
-    const object = {
-      firstName: "Kasper",
-      age: 35
-    }
-
-    merge(object, {})
-
-    expect(object).toEqual({
-      firstName: "Kasper",
-      age: 35
-    })
-  })
-
-  it("merges an empty object into a nested object", () => {
-    const object = {ransack: {account_id_eq: 1}}
-
-    merge(object, {})
-
-    expect(object).toEqual({ransack: {account_id_eq: 1}})
-  })
-})

package/src/merge.mjs

@@ -1,56 +0,0 @@
-const isPlainObject = (input) => {
-  if (input && typeof input === "object" && !Array.isArray(input)) {
-    return true
-  }
-
-  return false
-}
-
-const merge = (firstObject, ...objects) => {
-  for (const object of objects) {
-    mergeObjectsInto(firstObject, object)
-  }
-
-  return firstObject
-}
-
-const mergeArraysInto = (mergeIntoValue, ...arrays) => {
-  for (const array of arrays) {
-    for (const value of array) {
-      if (!mergeIntoValue.includes(value)) {
-        mergeIntoValue.push(value)
-      }
-    }
-  }
-}
-
-const mergeObjectsInto = (mergeInto, object) => {
-  for (const key in object) {
-    const value = object[key]
-
-    if (key in mergeInto) {
-      const mergeIntoValue = mergeInto[key]
-
-      if (Array.isArray(value)) {
-        // Current value isn't an array - turn into array and then merge into that
-        if (!Array.isArray(mergeIntoValue)) {
-          mergeInto[key] = [mergeIntoValue]
-        }
-
-        mergeArraysInto(mergeInto[key], value)
-      } else if (isPlainObject(mergeIntoValue) && isPlainObject(value)) {
-        mergeObjectsInto(mergeIntoValue, value)
-      } else {
-        mergeInto[key] = value
-      }
-    } else {
-      mergeInto[key] = value
-    }
-  }
-}
-
-export {
-  merge,
-  mergeArraysInto,
-  mergeObjectsInto
-}