@kaspernj/api-maker 1.0.116 → 1.0.120

package/.eslintrc.js

@@ -73,7 +73,9 @@ module.exports = {
     "jest/no-large-snapshots": "error",
     "jest/no-restricted-matchers": "error",
     "jest/no-test-return-statement": "error",
+    "jest/prefer-expect-resolves": "off", // Needs configuration and no documentation could be found?
     "jest/prefer-hooks-on-top": "error",
+    "jest/prefer-to-be": "off", // Needs configuration and no documentation could be found?
     "jest/prefer-spy-on": "error",
     "jest/prefer-to-be-null": "error",
     "jest/prefer-to-be-undefined": "error",
@@ -86,7 +88,7 @@ module.exports = {
     "key-spacing": "error",
     "keyword-spacing": "error",
     "linebreak-style": ["error", "unix"],
-    "line-comment-position": "error",
+    "line-comment-position": "off",
     "lines-around-comment": "error",
     "lines-between-class-members": "error",
     "max-classes-per-file": "error",
@@ -118,7 +120,7 @@ module.exports = {
     "no-implicit-coercion": "error",
     "no-implicit-globals": "error",
     "no-implied-eval": "error",
-    "no-inline-comments": "error",
+    "no-inline-comments": "off",
     "no-invalid-this": "error",
     "no-iterator": "error",
     "no-label-var": "error",
@@ -244,6 +246,7 @@ module.exports = {
     "react/no-did-mount-set-state": "error",
     "react/no-did-update-set-state": "error",
     "react/no-multi-comp": "error",
+    "react/no-namespace": "error",
     "react/no-redundant-should-component-update": "error",
     "react/no-set-state": "error",
     "react/no-this-in-sfc": "error",

package/__tests__/base-model.test.js

@@ -8,8 +8,25 @@ const {JSDOM} = require("jsdom")
 const {window} = new JSDOM()
 const document = window.document
 const ValidationError = require("../src/validation-error.cjs")
+const User = require("./support/user")
 
 describe("BaseModel", () => {
+  describe("identifierKey", () => {
+    it("returns the id when persisted", () => {
+      const user = new User({a: {id: 5}})
+
+      expect(user.identifierKey()).toEqual(5)
+    })
+
+    it("returns the unique key when new record", () => {
+      const user = new User({isNewRecord: true})
+
+      user.uniqueKey = () => 45
+
+      expect(user.identifierKey()).toEqual(45)
+    })
+  })
+
   describe("update", () => {
     it("aborts if no changes", async () => {
       const model = new BaseModel()

package/__tests__/cable-connection-pool.test.js

@@ -3,7 +3,7 @@ jest.mock("@rails/actioncable", () => ({
 }))
 const CableConnectionPool = require("../src/cable-connection-pool.cjs")
 const CableSubscriptionPool = require("../src/cable-subscription-pool.cjs")
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 
 describe("CableConnectionPool", () => {
   describe("connectCreated", () => {

package/__tests__/support/task.js

@@ -2,7 +2,7 @@ module.exports = class Task {
   static modelClassData() {
     return {
       attributes: [],
-      name: "User"
+      name: "Task"
     }
   }
 

package/__tests__/support/user.js

@@ -1,8 +1,11 @@
-module.exports = class User {
+const BaseModel = require("../../src/base-model.cjs")
+
+module.exports = class User extends BaseModel {
   static modelClassData() {
     return {
       attributes: [],
-      name: "User"
+      name: "User",
+      primaryKey: "id"
     }
   }
 
@@ -11,6 +14,8 @@ module.exports = class User {
   }
 
   constructor({a, b, isNewRecord = false, r}) {
+    super({a})
+
     this.abilities = b
     this._isNewRecord = isNewRecord
     this.modelData = a

package/index.js

@@ -16,6 +16,7 @@ const EventCreated = require("./src/event-created").default
 const EventDestroyed = require("./src/event-destroyed").default
 const EventEmitterListener = require("./src/event-emitter-listener").default
 const EventListener = require("./src/event-listener").default
+const EventLocationChanged = require("./src/event-location-changed").default
 const EventModelClass = require("./src/event-model-class").default
 const EventUpdated = require("./src/event-updated").default
 const HistoryListener = require("./src/history-listener").default
@@ -61,6 +62,7 @@ export {
   EventDestroyed,
   EventEmitterListener,
   EventListener,
+  EventLocationChanged,
   EventModelClass,
   EventUpdated,
   HistoryListener,

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.116",
+  "version": "1.0.120",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -51,15 +51,15 @@
     "eslint-find-rules": "^3.6.1",
     "eslint-plugin-jest": "^24.3.6",
     "eslint-plugin-react": "^7.23.2",
-    "i18n-on-steroids": "^1.0.0",
+    "i18n-on-steroids": "^1.0.2",
     "jest": "^27.0.6",
-    "jsdom": "^17.0.0"
+    "jsdom": "^18.0.0"
   },
   "dependencies": {
-    "@kaspernj/object-digger": ">= 1.0.2",
     "@rails/actioncable": ">= 6.1.0",
     "clone-deep": ">= 4.0.1",
     "debounce": ">= 1.2.1",
+    "diggerize": ">= 1.0.3",
     "epic-locks": ">= 1.0.1",
     "form-data-objectizer": ">= 1.0.0",
     "form-serialize": ">= 0.7.2",

package/src/base-model.cjs

@@ -1,9 +1,8 @@
 const AttributeNotLoadedError = require("./attribute-not-loaded-error.cjs")
-const CableConnectionPool = require("./cable-connection-pool.cjs")
 const Collection = require("./collection.cjs")
 const CommandsPool = require("./commands-pool.cjs")
 const CustomError = require("./custom-error.cjs")
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const FormDataObjectizer = require("form-data-objectizer")
 const inflection = require("inflection")
 const ModelName = require("./model-name.cjs")
@@ -128,31 +127,6 @@ module.exports = class BaseModel {
     return clone
   }
 
-  connect(eventName, callback) {
-    const cableSubscription = CableConnectionPool.current().connectEvent(digg(this.modelClassData(), "name"), this.primaryKey(), eventName, callback)
-    return cableSubscription
-  }
-
-  static connect(eventName, callback) {
-    const cableSubscription = CableConnectionPool.current().connectModelClassEvent(digg(this.modelClassData(), "name"), eventName, callback)
-    return cableSubscription
-  }
-
-  static connectCreated(callback) {
-    const cableSubscription = CableConnectionPool.current().connectCreated(digg(this.modelClassData(), "name"), callback)
-    return cableSubscription
-  }
-
-  connectDestroyed(callback) {
-    const cableSubscription = CableConnectionPool.current().connectDestroyed(digg(this.modelClassData(), "name"), this.primaryKey(), callback)
-    return cableSubscription
-  }
-
-  connectUpdated(callback) {
-    const cableSubscription = CableConnectionPool.current().connectUpdate(digg(this.modelClassData(), "name"), this.primaryKey(), callback)
-    return cableSubscription
-  }
-
   cacheKey() {
     if (this.isPersisted()) {
       const keyParts = [
@@ -310,6 +284,12 @@ module.exports = class BaseModel {
     throw new new CustomError("Response wasn't successful", {model: this, response})
   }
 
+  identifierKey() {
+    if (!this._identifierKey) this._identifierKey = this.isPersisted() ? this.primaryKey() : this.uniqueKey()
+
+    return this._identifierKey
+  }
+
   isAssociationLoaded(associationName) {
     if (associationName in this.relationshipsCache) return true
     return false

package/src/cable-connection-pool.cjs

@@ -1,6 +1,6 @@
 const CableSubscriptionPool = require("./cable-subscription-pool.cjs")
 const CableSubscription = require("./cable-subscription.cjs")
-const {dig} = require("@kaspernj/object-digger")
+const {dig} = require("diggerize")
 
 module.exports = class ApiMakerCableConnectionPool {
   static current() {

package/src/cable-subscription-pool.cjs

@@ -1,7 +1,7 @@
 const ChannelsConsumer = require("./channels-consumer.cjs")
 const CommandsPool = require("./commands-pool.cjs")
 const Deserializer = require("./deserializer.cjs")
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const inflection = require("inflection")
 const Logger = require("./logger.cjs")
 

package/src/can-can-loader.jsx

@@ -1,11 +1,11 @@
 import ApiMakerEventEmitterListener from "./event-emitter-listener"
-import {digg, digs} from "@kaspernj/object-digger"
+import {digg, digs} from "diggerize"
 const CanCan = require("./can-can.cjs")
 const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 const React = require("react")
 
-export default class ApiMakerCanCanLoader extends React.Component {
+export default class ApiMakerCanCanLoader extends React.PureComponent {
   static propTypes = PropTypesExact({
     abilities: PropTypes.array.isRequired,
     component: PropTypes.object.isRequired
@@ -32,12 +32,12 @@ export default class ApiMakerCanCanLoader extends React.Component {
       <ApiMakerEventEmitterListener
         events={events}
         event="onResetAbilities"
-        onCalled={() => this.onResetAbilities()}
+        onCalled={this.onResetAbilities}
       />
     )
   }
 
-  onResetAbilities() {
+  onResetAbilities = () => {
     this.updateComponent({canCan: undefined})
     this.loadAbilities()
   }

package/src/can-can.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const EventEmitter = require("events")
 const inflection = require("inflection")
 const {ReadersWriterLock} = require("epic-locks")

package/src/collection.cjs

@@ -1,6 +1,6 @@
 const cloneDeep = require("clone-deep")
 const CommandsPool = require("./commands-pool.cjs")
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const inflection = require("inflection")
 const {merge} = require("./merge.cjs")
 const ModelsResponseReader = require("./models-response-reader.cjs")
@@ -205,7 +205,7 @@ module.exports = class ApiMakerCollection {
   modelClass() {
     const modelName = digg(this.args.modelClass.modelClassData(), "name")
 
-    return digg(require("api-maker/models"), modelName)
+    return digg(require("@kaspernj/api-maker/src/models"), modelName)
   }
 
   clone() {

package/src/commands-pool.cjs

@@ -2,7 +2,7 @@ const Api = require("./api.cjs")
 const CommandSubmitData = require("./command-submit-data.cjs")
 const CustomError = require("./custom-error.cjs")
 const Deserializer = require("./deserializer.cjs")
-const {dig, digg} = require("@kaspernj/object-digger")
+const {dig, digg} = require("diggerize")
 const FormDataObjectizer = require("form-data-objectizer")
 const Serializer = require("./serializer.cjs")
 const ValidationError = require("./validation-error.cjs")

package/src/custom-error.cjs

@@ -1,4 +1,4 @@
-const {dig, digg} = require("@kaspernj/object-digger")
+const {dig, digg} = require("diggerize")
 
 function errorMessages(args) {
   return digg(args, "response", "errors").map((error) => {

package/src/deserializer.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const inflection = require("inflection")
 const Money = require("js-money")
 
@@ -18,14 +18,14 @@ module.exports = class ApiMakerDeserializer {
         return Money.fromInteger(cents, currency)
       } else if (object.api_maker_type == "model") {
         const modelClassName = inflection.classify(digg(object, "model_name"))
-        const modelClass = digg(require("api-maker/models"), modelClassName)
+        const modelClass = digg(require("@kaspernj/api-maker/src/models"), modelClassName)
         const data = ApiMakerDeserializer.parse(digg(object, "serialized"))
         const model = new modelClass({data, isNewRecord: false})
 
         return model
       } else if (object.api_maker_type == "resource") {
         const modelClassName = inflection.classify(digg(object, "name"))
-        const modelClass = digg(require("api-maker/models"), modelClassName)
+        const modelClass = digg(require("@kaspernj/api-maker/src/models"), modelClassName)
 
         return modelClass
       } else {

package/src/devise.cjs

@@ -1,6 +1,6 @@
 const CanCan = require("./can-can.cjs")
 const Deserializer = require("./deserializer.cjs")
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const EventEmitter = require("events")
 const inflection = require("inflection")
 const Services = require("./services.cjs")
@@ -50,7 +50,7 @@ module.exports = class ApiMakerDevise {
 
     const postData = {username, password, args}
     const response = await Services.current().sendRequest("Devise::SignIn", postData)
-    const modelClass = digg(require("api-maker/models"), inflection.camelize(args.scope))
+    const modelClass = digg(require("@kaspernj/api-maker/src/models"), inflection.camelize(args.scope))
     const modelInstance = new modelClass(digg(response, "model_data"))
 
     await CanCan.current().resetAbilities()
@@ -109,7 +109,7 @@ module.exports = class ApiMakerDevise {
       return null
 
     const parsedScopeData = Deserializer.parse(scopeData)
-    const modelClass = digg(require("api-maker/models"), inflection.camelize(scope))
+    const modelClass = digg(require("@kaspernj/api-maker/src/models"), inflection.camelize(scope))
     const modelInstance = new modelClass({data: parsedScopeData})
 
     return modelInstance

package/src/event-connection.jsx

@@ -1,8 +1,9 @@
+const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 const React = require("react")
 
-export default class ApiMakerEventConnection extends React.Component {
+export default class ApiMakerEventConnection extends React.PureComponent {
   static defaultProps = {
     active: true
   }
@@ -15,7 +16,7 @@ export default class ApiMakerEventConnection extends React.Component {
   })
 
   componentDidMount() {
-    this.subscription = this.props.model.connect(this.props.event, (...args) => this.onCall(...args))
+    this.subscription = ModelEvents.connect(this.props.model, this.props.event, (...args) => this.onCall(...args))
   }
 
   componentWillUnmount() {

package/src/event-created.jsx

@@ -1,9 +1,10 @@
 const debounce = require("debounce")
+const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 const React = require("react")
 
-export default class ApiMakerEventCreated extends React.Component {
+export default class ApiMakerEventCreated extends React.PureComponent {
   static defaultProps = {
     active: true
   }
@@ -29,7 +30,7 @@ export default class ApiMakerEventCreated extends React.Component {
   }
 
   connect() {
-    this.connectCreated = this.props.modelClass.connectCreated((...args) => this.onCreated(...args))
+    this.connectCreated = ModelEvents.connectCreated(this.props.modelClass, (...args) => this.onCreated(...args))
   }
 
   debounce() {

package/src/event-destroyed.jsx

@@ -1,8 +1,9 @@
+const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 const React = require("react")
 
-export default class ApiMakerEventDestroyed extends React.Component {
+export default class ApiMakerEventDestroyed extends React.PureComponent {
   static propTypes = PropTypesExact({
     model: PropTypes.object.isRequired,
     onDestroyed: PropTypes.func.isRequired
@@ -19,7 +20,7 @@ export default class ApiMakerEventDestroyed extends React.Component {
   }
 
   connect() {
-    this.connectDestroyed = this.props.model.connectDestroyed(this.props.onDestroyed)
+    this.connectDestroyed = ModelEvents.connectDestroyed(this.props.model, this.props.onDestroyed)
   }
 
   render() {

package/src/event-emitter-listener.jsx

@@ -2,7 +2,7 @@ const EventEmitter = require("events")
 const PropTypes = require("prop-types")
 const React = require("react")
 
-export default class ApiMakerEventEmitterListener extends React.Component {
+export default class ApiMakerEventEmitterListener extends React.PureComponent {
   static propTypes = {
     events: PropTypes.instanceOf(EventEmitter).isRequired,
     event: PropTypes.string.isRequired,

package/src/event-listener.jsx

@@ -2,7 +2,7 @@ const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 const React = require("react")
 
-export default class ApiMakerEventListener extends React.Component {
+export default class ApiMakerEventListener extends React.PureComponent {
   static callEvent(target, eventName, args = []) {
     let event = document.createEvent("Event")
     event.initEvent(eventName, false, true)

package/src/event-location-changed.jsx

@@ -0,0 +1,21 @@
+import PropTypes from "prop-types"
+import React from "react"
+
+export default class EventLocationChanged extends React.PureComponent {
+  static propTypes = {
+    history: PropTypes.object.isRequired,
+    onChanged: PropTypes.func.isRequired
+  }
+
+  componentDidMount() {
+    this.appHistoryUnlisten = this.props.history.listen(this.props.onChanged)
+  }
+
+  componentWillUnmount() {
+    this.appHistoryUnlisten()
+  }
+
+  render() {
+    return null
+  }
+}

package/src/event-model-class.jsx

@@ -1,8 +1,9 @@
+const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 const React = require("react")
 
-export default class ApiMakerEventModelClass extends React.Component {
+export default class ApiMakerEventModelClass extends React.PureComponent {
   static propTypes = PropTypesExact({
     event: PropTypes.string.isRequired,
     modelClass: PropTypes.func.isRequired,
@@ -20,7 +21,7 @@ export default class ApiMakerEventModelClass extends React.Component {
   }
 
   connect() {
-    this.connection = this.props.modelClass.connect(this.props.event, this.props.onCall)
+    this.connection = ModelEvents.connectModelClass(this.props.modelClass, this.props.event, this.props.onCall)
   }
 
   render() {

package/src/event-updated.jsx

@@ -1,9 +1,10 @@
 const debounce = require("debounce")
+const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 const React = require("react")
 
-export default class ApiMakerEventUpdated extends React.Component {
+export default class ApiMakerEventUpdated extends React.PureComponent {
   static defaultProps = {
     active: true
   }
@@ -41,7 +42,7 @@ export default class ApiMakerEventUpdated extends React.Component {
   connect() {
     const {model, onConnected} = this.props
 
-    this.connectUpdated = model.connectUpdated((...args) => this.onUpdated(...args))
+    this.connectUpdated = ModelEvents.connectUpdated(model, (...args) => this.onUpdated(...args))
 
     if (onConnected) {
       this.connectUpdated.events.addListener("connected", this.onConnected)

package/src/history-listener.jsx

@@ -1,7 +1,7 @@
 const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 
-export default class ApiMakerHistoryListener extends React.Component {
+export default class ApiMakerHistoryListener extends React.PureComponent {
   static propTypes = PropTypesExact({
     onChanged: PropTypes.func.isRequired
   })

package/src/instance-of-class-name.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 
 const instanceOfClassName = (expectedClassName) => {
   return (props, propName, componentName) => {

package/src/model-events.cjs

@@ -0,0 +1,38 @@
+const CableConnectionPool = require("./cable-connection-pool.cjs")
+
+module.exports = class ModelEvents {
+  static connect(model, eventName, callback) {
+    const modelClassName = digg(model.modelClassData(), "name")
+    const cableSubscription = CableConnectionPool.current().connectEvent(modelClassName, model.primaryKey(), eventName, callback)
+
+    return cableSubscription
+  }
+
+  static connectModelClass(modelClass, eventName, callback) {
+    const modelClassName = digg(modelClass.modelClassData(), "name")
+    const cableSubscription = CableConnectionPool.current().connectModelClassEvent(modelClassName, eventName, callback)
+
+    return cableSubscription
+  }
+
+  static connectCreated(modelClass, callback) {
+    const modelClassName = digg(modelClass.modelClassData(), "name")
+    const cableSubscription = CableConnectionPool.current().connectCreated(modelClassName, callback)
+
+    return cableSubscription
+  }
+
+  static connectDestroyed(model, callback) {
+    const modelClassName = digg(model.modelClassData(), "name")
+    const cableSubscription = CableConnectionPool.current().connectDestroyed(modelClassName, model.primaryKey(), callback)
+
+    return cableSubscription
+  }
+
+  static connectUpdated(model, callback) {
+    const modelClassName = digg(model.modelClassData(), "name")
+    const cableSubscription = CableConnectionPool.current().connectUpdate(modelClassName, model.primaryKey(), callback)
+
+    return cableSubscription
+  }
+}

package/src/model-prop-type.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const Inflection = require("inflection")
 
 module.exports = class ApiMakerModelPropType {

package/src/models-response-reader.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const inflection = require("inflection")
 const Preloaded = require("./preloaded.cjs")
 
@@ -23,7 +23,7 @@ module.exports = class ModelsResponseReader {
 
     for(const modelType in this.response.data) {
       const modelClassName = inflection.classify(modelType)
-      const modelClass = digg(require("api-maker/models"), modelClassName)
+      const modelClass = digg(require("@kaspernj/api-maker/src/models"), modelClassName)
       const collectionName = modelClass.modelClassData().collectionName
 
       for(const modelId of this.response.data[modelType]) {

package/src/models.js.erb

@@ -0,0 +1,6 @@
+/* rails-erb-loader-dependencies api_maker/resources/ */
+
+import {BaseModel, Collection} from "@kaspernj/api-maker"
+import {digg} from "diggerize"
+
+<%= ApiMaker::ModelClassesJavaScriptGeneratorService.execute! %>

package/src/preloaded.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ApiMakerPreloaded {
@@ -12,7 +12,7 @@ module.exports = class ApiMakerPreloaded {
 
     for (const preloadedType in this.response.preloaded) {
       const modelClassName = inflection.classify(preloadedType)
-      const modelClass = digg(require("api-maker/models"), modelClassName)
+      const modelClass = digg(require("@kaspernj/api-maker/src/models"), modelClassName)
 
       for(const preloadedId in this.response.preloaded[preloadedType]) {
         const preloadedData = this.response.preloaded[preloadedType][preloadedId]

package/src/resource-route.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ApiMakerResourceRoute {

package/src/resource-routes.jsx

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const React = require("react")
 const ResourceRoute = require("./resource-route.cjs")
 const {Route} = require("react-router-dom")

package/src/routes-native.cjs

@@ -1,4 +1,4 @@
-const {dig, digg, digs} = require("@kaspernj/object-digger")
+const {dig, digg, digs} = require("diggerize")
 const inflection = require("inflection")
 const qs = require("qs")
 

package/src/routes.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ApiMakerRoutes {

package/src/serializer.cjs

@@ -1,4 +1,4 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 
 module.exports = class Serializer {
   static serialize(arg) {

package/src/translated-collections-data.js.erb

@@ -0,0 +1,5 @@
+/* rails-erb-loader-dependencies models/ */
+
+const translatedCollections = <%= ApiMaker::TranslatedCollections.translated_collections.to_json %>
+
+export default translatedCollections

package/src/translated-collections.cjs

@@ -0,0 +1,11 @@
+const translatedCollectionsData = require("./translated-collections-data").default
+
+export default class ApiMakerTranslatedCollections {
+  static get(modelClass, collectionName) {
+    const locale = I18n.locale
+    const modelClassName = digg(modelClass.modelClassData(), "name")
+    const collection = digg(translatedCollectionsData, modelClassName, collectionName, locale, "collection_array")
+
+    return collection
+  }
+}

package/src/updated-attribute.jsx

@@ -1,9 +1,10 @@
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
+const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
 const PropTypesExact = require("prop-types-exact")
 const React = require("react")
 
-export default class ApiMakerUpdatedAttribute extends React.Component {
+export default class ApiMakerUpdatedAttribute extends React.PureComponent {
   static propTypes = PropTypesExact({
     attribute: PropTypes.string,
     model: PropTypes.object.isRequired,
@@ -30,7 +31,7 @@ export default class ApiMakerUpdatedAttribute extends React.Component {
   }
 
   connect() {
-    this.connectUpdated = this.props.model.connectUpdated(args => {
+    this.connectUpdated = ModelEvents.connectUpdated(this.props.model, args => {
       if (!this.props.attribute || args.model.isAttributeLoaded(this.props.attribute)) {
         this.setState(
           {model: args.model},

package/src/validation-error.cjs

@@ -1,5 +1,5 @@
 const CustomError = require("./custom-error.cjs")
-const {digg} = require("@kaspernj/object-digger")
+const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ValidationError extends CustomError {

package/src/validation-errors.cjs

@@ -1,4 +1,4 @@
-const {digg, digs} = require("@kaspernj/object-digger")
+const {digg, digs} = require("diggerize")
 const inflection = require("inflection")
 
 class ValidationError {
@@ -65,7 +65,7 @@ class ValidationError {
   getModelClass() {
     const modelName = inflection.classify(digg(this, "modelName"))
 
-    return digg(require("api-maker/models"), modelName)
+    return digg(require("@kaspernj/api-maker/src/models"), modelName)
   }
 
   setHandled() {