@kaspernj/api-maker 1.0.140 → 1.0.143

package/.eslintrc.js

@@ -68,15 +68,20 @@ module.exports = {
     "init-declarations": "off",
     "jest/max-nested-describe": "error",
     "jest/no-alias-methods": "error",
+    "jest/no-conditional-in-test": "error",
     "jest/no-duplicate-hooks": "error",
     "jest/no-hooks": "off",
     "jest/no-if": "error",
     "jest/no-large-snapshots": "error",
     "jest/no-restricted-matchers": "error",
     "jest/no-test-return-statement": "error",
+    "jest/prefer-comparison-matcher": "error",
+    "jest/prefer-equality-matcher": "error",
     "jest/prefer-expect-resolves": "off", // Needs configuration and no documentation could be found?
     "jest/prefer-hooks-on-top": "error",
     "jest/prefer-lowercase-title": "off",
+    "prefer-object-has-own": "error",
+    "jest/prefer-snapshot-hint": "error",
     "jest/prefer-to-be": "off", // Needs configuration and no documentation could be found?
     "jest/prefer-spy-on": "error",
     "jest/prefer-to-contain": "error",
@@ -212,6 +217,8 @@ module.exports = {
     "react/forbid-foreign-prop-types": "error",
     "react/forbid-prop-types": "off",
     "react/function-component-definition": "error",
+    "react/hook-use-state": "error",
+    "react/iframe-missing-sandbox": "error",
     "react/jsx-boolean-value": "error",
     "react/jsx-child-element-spacing": "error",
     "react/jsx-closing-bracket-location": "error",

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.140",
+  "version": "1.0.143",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -71,7 +71,7 @@
     "eslint-plugin-jest": "^26.0.0",
     "eslint-plugin-react": "^7.23.2",
     "i18n-on-steroids": "^1.0.2",
-    "jest": "^27.0.6",
+    "jest": "^28.0.3",
     "jsdom": "^19.0.0"
   }
 }

package/src/config.js

@@ -1,12 +1,18 @@
 class ApiMakerConfig {
+  constructor() {
+    if (!global.apiMakerConfigGlobal) global.apiMakerConfigGlobal = {}
+
+    this.global = global.apiMakerConfigGlobal
+  }
+
   getCurrenciesCollection() {
-    if (!this._currenciesCollection) throw new Error("Currencies collection hasn't been set")
+    if (!this.global.currenciesCollection) throw new Error("Currencies collection hasn't been set")
 
-    return this._currenciesCollection
+    return this.global.currenciesCollection
   }
 
   setCurrenciesCollection(newCurrenciesCollection) {
-    this._currenciesCollection = newCurrenciesCollection
+    this.global.currenciesCollection = newCurrenciesCollection
   }
 }
 

package/src/model-load-wrapper.jsx

@@ -36,11 +36,18 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
     this.setState({model})
   }
 
-  loadNewModel() {
+  async loadNewModel() {
     const params = Params.parse()
     const paramKey = ModelClass.modelName().paramKey()
     const modelDataFromParams = params[paramKey] || {}
-    const modelData = Object.assign({}, args.newAttributes, modelDataFromParams)
+
+    let defaults = {}
+
+    if (args.newIfNoId?.defaults) {
+      defaults = await args.newIfNoId.defaults()
+    }
+
+    const modelData = Object.assign(defaults, args.newAttributes, modelDataFromParams)
     const model = new ModelClass(modelData)
 
     this.setState({model})

package/src/model-recipes.cjs.erb

@@ -1 +1,3 @@
+/* rails-erb-loader-dependencies api_maker/resources/ models/ */
+
 module.exports = <%= ApiMaker::ModelClassesJavaScriptGeneratorService.execute!.to_json %>

package/src/models.cjs

@@ -1,5 +1,3 @@
-/* rails-erb-loader-dependencies api_maker/resources/ */
-
 const modelRecipes = require("./model-recipes.cjs.erb")
 const ModelRecipesLoader = require("./model-recipes-loader.cjs")
 

package/src/routes-native.cjs

@@ -97,7 +97,8 @@ module.exports = class ApiMakerRoutesNative {
           if (pathPart.type == "pathPart") {
             return pathPart.name
           } else if (pathPart.type == "variable") {
-            return digg(args, digg(pathPart, "count"))
+            // Args might not contain the right amount of variables, so dont change this to 'digg'
+            return dig(args, digg(pathPart, "count"))
           } else {
             throw new Error(`Unhandled path part type: ${pathPart.type}`)
           }