@kaspernj/api-maker 1.0.195 → 1.0.198

package/package.json

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

package/src/config.js

@@ -1,50 +1,48 @@
+import inflection from "inflection"
+
+const accessors = {
+  breakPoints: {
+    default: [
+      ["xxl", 1400],
+      ["xl", 1200],
+      ["lg", 992],
+      ["md", 768],
+      ["sm", 576],
+      ["xs", 0]
+    ],
+    required: true
+  },
+  currenciesCollection: {required: true},
+  history: {required: false},
+  host: {required: false},
+  routes: {required: false},
+  routeDefinitions: {required: false}
+}
+
 class ApiMakerConfig {
   constructor() {
     if (!global.apiMakerConfigGlobal) global.apiMakerConfigGlobal = {}
 
     this.global = global.apiMakerConfigGlobal
   }
+}
 
-  getCurrenciesCollection() {
-    if (!this.global.currenciesCollection) throw new Error("Currencies collection hasn't been set")
-
-    return this.global.currenciesCollection
-  }
-
-  getHost() {
-    const host = this.global.host
-
-    if (typeof host == "function") return host()
-
-    return host
-  }
-
-  getRouteDefinitions() {
-    return this.global.routeDefinitions
-  }
+for (const accessorName in accessors) {
+  const accessorData = accessors[accessorName]
+  const camelizedAccessor = inflection.camelize(accessorName)
 
-  getRoutes() {
-    return this.global.routes
-  }
+  ApiMakerConfig.prototype[`set${camelizedAccessor}`] = function (newValue) { this.global[accessorName] = newValue }
+  ApiMakerConfig.prototype[`get${camelizedAccessor}`] = function (...args) {
+    if (!this.global[accessorName]) {
+      if (accessorData.default) return accessorData.default
+      if (accessorData.required) throw new Error(`${accessorName} hasn't been set`)
+    }
 
-  setCurrenciesCollection(newCurrenciesCollection) {
-    this.global.currenciesCollection = newCurrenciesCollection
-  }
+    const value = this.global[accessorName]
 
-  setHistory(history) {
-    this.global.history = history
-  }
-
-  setHost(host) {
-    this.global.host = host
-  }
-
-  setRouteDefinitions(routeDefinitions) {
-    this.global.routeDefinitions = routeDefinitions
-  }
+    if (typeof value == "function") return value(...args)
 
-  setRoutes(routes) {
-    this.global.routes = routes
+    return value
   }
 }
 

package/src/model-load-wrapper.jsx

@@ -12,10 +12,14 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
   }
 
   componentDidMount() {
+    this.loadModel()
+  }
+
+  loadModel = async () => {
     if (args.newIfNoId && !this.getModelId()) {
-      this.loadNewModel()
+      return await this.loadNewModel()
     } else if (!args.optional || this.getModelId()) {
-      this.loadExistingModel()
+      return await this.loadExistingModel()
     }
   }
 
@@ -23,7 +27,7 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
     return this.props.match.params[this.paramsVariableName] || this.props.match.params.id
   }
 
-  async loadExistingModel() {
+  loadExistingModel = async () => {
     const {modelId} = digs(this.state, "modelId")
     const query = await ModelClass.ransack({id_eq: modelId})
 
@@ -57,6 +61,7 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
   }
 
   render() {
+    const {onUpdated, reloadModel} = digs(this, "onUpdated", "reloadModel")
     const {model, modelId} = digs(this.state, "model", "modelId")
     const wrappedComponentProps = {}
 
@@ -65,13 +70,17 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
 
     return (
       <>
+        {args.events &&
+          <EventEmitterListener event="reloadModel" events={args.events} onCalled={reloadModel} />
+        }
         {model && args.eventUpdated &&
-          <EventUpdated model={model} onUpdated={digg(this, "onUpdated")} />
+          <EventUpdated model={model} onUpdated={onUpdated} />
         }
         <WrappedComponent {...wrappedComponentProps} {...this.props} />
       </>
     )
   }
 
-  onUpdated = () => this.loadExistingModel()
+  reloadModel = () => this.loadModel()
+  onUpdated = this.loadExistingModel
 }

package/src/source-maps-loader.cjs

@@ -99,7 +99,7 @@ module.exports = class SourceMapsLoader {
   }
 
   includeMapURL(src) {
-    return src.includes("/packs/") || src.includes("/assets/")
+    return src.includes("/packs/")
   }
 
   async loadSourceMapForSource ({originalUrl, sourceMapUrl}) {