@kaspernj/api-maker 1.0.142 → 1.0.145

package/.eslintrc.js

@@ -112,6 +112,7 @@ module.exports = {
     "no-bitwise": "error",
     "no-caller": "error",
     "no-confusing-arrow": "error",
+    "no-constant-binary-expression": "error",
     "no-constructor-return": "error",
     "no-continue": "error",
     "no-div-regex": "error",

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.142",
+  "version": "1.0.145",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -65,13 +65,13 @@
     "@babel/eslint-parser": "^7.16.3",
     "@babel/preset-env": "^7.12.11",
     "@babel/preset-react": "^7.12.10",
-    "babel-jest": "^27.0.6",
+    "babel-jest": "^28.0.3",
     "eslint": "^8.2.0",
     "eslint-find-rules": "^4.0.0",
     "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/base-model.cjs

@@ -366,8 +366,8 @@ class BaseModel {
   }
 
   isNewRecord () {
-    if (this.newRecord === false) {
-      return false
+    if (this.newRecord !== undefined) {
+      return this.newRecord
     } else if ("id" in this.modelData && this.modelData.id) {
       return false
     } else {
@@ -676,7 +676,9 @@ class BaseModel {
       if (attributeName in attributes) return null
     }
 
-    throw new AttributeNotLoadedError(`No such attribute: ${digg(this.modelClassData(), "name")}#${attributeName}: ${JSON.stringify(this.modelData)}`)
+    if (this.isPersisted()) {
+      throw new AttributeNotLoadedError(`No such attribute: ${digg(this.modelClassData(), "name")}#${attributeName}: ${JSON.stringify(this.modelData)}`)
+    }
   }
 
   isAttributeLoaded (attributeName) {

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/money-formatter.cjs

@@ -57,7 +57,7 @@ module.exports = class MoneyFormatter {
   static isMoney(value) {
     if (value instanceof Money) return true
 
-    if (typeof value == "object" && value && Object.keys(value).length == 2 && value.amount && value.currency)
+    if (typeof value == "object" && value && Object.keys(value).length == 2 && "amount" in value && "currency" in value)
       return true
 
     return false