@kaspernj/api-maker 1.0.201 → 1.0.204

package/package.json

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

package/src/base-model.cjs

@@ -1,6 +1,7 @@
 const AttributeNotLoadedError = require("./attribute-not-loaded-error.cjs")
 const Collection = require("./collection.cjs")
 const CommandsPool = require("./commands-pool.cjs")
+const Config = require("@kaspernj/api-maker/src/config").default
 const CustomError = require("./custom-error.cjs")
 const {digg} = require("diggerize")
 const FormDataObjectizer = require("form-data-objectizer")
@@ -12,8 +13,6 @@ const Services = require("./services.cjs")
 const ValidationError = require("./validation-error.cjs")
 const {ValidationErrors} = require("./validation-errors.cjs")
 
-const shared = {}
-
 const newCustomEvent = (validationErrors) => {
   return new CustomEvent("validation-errors", {detail: validationErrors})
 }
@@ -56,17 +55,13 @@ class BaseModel {
   }
 
   static modelName () {
-    return new ModelName({i18n: shared.i18n, modelClassData: this.modelClassData()})
+    return new ModelName({modelClassData: this.modelClassData()})
   }
 
   static ransack (query = {}) {
     return new Collection({modelClass: this}, {ransack: query})
   }
 
-  static setI18n (i18n) {
-    shared.i18n = i18n
-  }
-
   constructor (args = {}) {
     this.changes = {}
     this.newRecord = args.isNewRecord
@@ -328,8 +323,9 @@ class BaseModel {
 
   static humanAttributeName (attributeName) {
     const keyName = digg(this.modelClassData(), "i18nKey")
+    const i18n = Config.getI18n()
 
-    if (shared.i18n) return shared.i18n.t(`activerecord.attributes.${keyName}.${BaseModel.snakeCase(attributeName)}`, {defaultValue: attributeName})
+    if (i18n) return i18n.t(`activerecord.attributes.${keyName}.${BaseModel.snakeCase(attributeName)}`, {defaultValue: attributeName})
 
     return inflection.humanize(attributeName)
   }

package/src/config.js

@@ -15,6 +15,7 @@ const accessors = {
   currenciesCollection: {required: true},
   history: {required: false},
   host: {required: false},
+  i18n: {required: false},
   routes: {required: false},
   routeDefinitions: {required: false}
 }

package/src/model-name.cjs

@@ -1,3 +1,5 @@
+const Config = require("@kaspernj/api-maker/src/config").default
+
 module.exports = class ModelName {
   constructor (data) {
     this.data = data
@@ -22,7 +24,7 @@ module.exports = class ModelName {
 
     const key = `activerecord.models.${this.data.modelClassData.i18nKey}.${countKey}`
 
-    return this.data.i18n.t(key)
+    return Config.getI18n().t(key)
   }
 
   paramKey() {