@kaspernj/api-maker 1.0.203 → 1.0.206

package/__tests__/base-model.test.js

@@ -1,14 +1,16 @@
+import BaseModel from "../src/base-model.mjs"
+import CustomError from "../src/custom-error.mjs"
+import {jest} from "@jest/globals"
+import {JSDOM} from "jsdom"
+import ValidationError from "../src/validation-error.mjs"
+import User from "./support/user.mjs"
+
 jest.mock("@rails/actioncable", () => ({
   createConsumer: () => ({})
 }))
 
-const BaseModel = require("../src/base-model.cjs")
-const CustomError = require("../src/custom-error.cjs")
-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", () => {
@@ -48,20 +50,20 @@ describe("BaseModel", () => {
     const form = document.createElement("form")
     const model = new BaseModel()
     const dispatchEventSpy = jest.spyOn(form, "dispatchEvent").mockImplementation(() => "asd")
-    const newCustomEventSpy = jest.spyOn(model, "newCustomEvent").mockImplementation(() => "asd")
+    const newCustomEventSpy = jest.spyOn(BaseModel, "newCustomEvent").mockImplementation(() => "asd")
 
     it("throws the validation errors if no options are given", () => {
-      expect(() => model.parseValidationErrors(error)).toThrow(ValidationError)
+      expect(() => BaseModel.parseValidationErrors({error, model})).toThrow(ValidationError)
     })
 
     it("throws the validation errors and dispatches an event to the form", () => {
-      expect(() => model.parseValidationErrors(error, {form})).toThrow(ValidationError)
+      expect(() => BaseModel.parseValidationErrors({error, model, options: {form}})).toThrow(ValidationError)
       expect(dispatchEventSpy).toHaveBeenCalled()
       expect(newCustomEventSpy).toHaveBeenCalled()
     })
 
     it("doesnt throw validation errors if disabled", () => {
-      model.parseValidationErrors(error, {form, throwValidationError: false})
+      BaseModel.parseValidationErrors({error, model, options: {throwValidationError: false}})
       expect(dispatchEventSpy).toHaveBeenCalled()
       expect(newCustomEventSpy).toHaveBeenCalled()
     })

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

@@ -1,9 +1,11 @@
+import CableConnectionPool from "../src/cable-connection-pool.mjs"
+import CableSubscriptionPool from "../src/cable-subscription-pool.mjs"
+import {digg} from "diggerize"
+import {jest} from "@jest/globals"
+
 jest.mock("@rails/actioncable", () => ({
   createConsumer: () => ({})
 }))
-const CableConnectionPool = require("../src/cable-connection-pool.cjs")
-const CableSubscriptionPool = require("../src/cable-subscription-pool.cjs")
-const {digg} = require("diggerize")
 
 describe("CableConnectionPool", () => {
   describe("connectCreated", () => {

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

@@ -1,7 +1,7 @@
 jest.mock("@rails/actioncable", () => ({
   createConsumer: () => ({})
 }))
-const CableSubscriptionPool = require("../src/cable-subscription-pool.cjs")
+import CableSubscriptionPool from "../src/cable-subscription-pool.mjs"
 
 describe("CableSubscriptionPool", () => {
   describe("onUnsubscribe", () => {

package/__tests__/can-can.test.js

@@ -1,13 +1,14 @@
-const CanCan = require("../src/can-can.cjs")
+import CanCan from "../src/can-can.mjs"
+import {jest} from "@jest/globals"
 
-jest.mock("../src/services.cjs")
+jest.mock("../src/services.mjs")
 
 describe("CanCan", () => {
   const canCan = CanCan.current()
 
   describe("resetAbilities", () => {
     test("that reset abilities and load abilities not have concurrency issues", async () => {
-      const Services = require("../src/services.cjs")
+      import Services from "../src/services.mjs"
       const mockedCurrent = jest.fn().mockReturnValue({
         sendRequest: async () => ({abilities: ["loaded"]})
       })

package/__tests__/collection.test.js

@@ -1,4 +1,4 @@
-const Collection = require("../src/collection.cjs")
+import Collection from "../src/collection.mjs"
 
 describe("Collection", () => {
   describe("count", () => {

package/__tests__/custom-error.test.js

@@ -1,4 +1,4 @@
-const CustomError = require("../src/custom-error.cjs")
+import CustomError from "../src/custom-error.mjs"
 
 describe("CustomError", () => {
   it("handles when response is a string", () => {

package/__tests__/merge.test.js

@@ -1,4 +1,4 @@
-const {merge} = require("../src/merge.cjs")
+import {merge} from "../src/merge.mjs"
 
 describe("merge", () => {
   it("merges an empty object and changes nothing", () => {

package/__tests__/model-name.test.js

@@ -1,6 +1,7 @@
-const I18nOnSteroids = require("i18n-on-steroids")
+import I18nOnSteroids from "i18n-on-steroids"
+import ModelName from "../src/model-name.mjs"
+
 const i18n = new I18nOnSteroids()
-const ModelName = require("../src/model-name.cjs")
 
 const initializeI18n = () => {
   i18n.scanObject({

package/__tests__/model-prop-type.test.js

@@ -1,6 +1,6 @@
-const ModelPropType = require("../src/model-prop-type.cjs")
-const Task = require("./support/task")
-const User = require("./support/user")
+import ModelPropType from "../src/model-prop-type.mjs"
+import Task from "./support/task.mjs"
+import User from "./support/user.mjs"
 
 describe("ModelPropType", () => {
   describe("ofModel", () => {

package/__tests__/params.test.js

@@ -1,4 +1,4 @@
-const Params = require("../src/params.cjs")
+import Params from "../src/params.mjs"
 
 describe("Params", () => {
   describe("change", () => {

package/__tests__/routes-native.test.js

@@ -1,4 +1,4 @@
-const RoutesNative = require("../src/routes-native.cjs")
+import RoutesNative from "../src/routes-native.mjs"
 const testRoutes = () => ({
   routes: [
     {"name": "blank", "path": "/blank", "component": "blank"},
@@ -76,10 +76,10 @@ describe("RoutesNative", () => {
   })
 
   it("generates urls", () => {
-    if (!global.location) global.location = {} // eslint-disable-line jest/no-if
+    if (!globalThis.location) globalThis.location = {} // eslint-disable-line jest/no-if
 
-    global.location.host = "localhost"
-    global.location.protocol = "http:"
+    globalThis.location.host = "localhost"
+    globalThis.location.protocol = "http:"
 
     const test = routesNative({args: {localized: true}, currentLocale: "en"})
     const daRoute = test.editDrinkUrl(5, {drink: {name: "Pina Colada"}, locale: "da"})

package/__tests__/routes.test.js

@@ -1,4 +1,4 @@
-const Routes = require("../src/routes.cjs")
+import Routes from "../src/routes.mjs"
 const testRoutes = {
   routes: [
     {"name": "blank", "path": "/blank", "component": "blank"},

package/__tests__/serializer.test.js

@@ -1,5 +1,5 @@
-const Serializer = require("../src/serializer.cjs")
-const User = require("./support/user")
+import Serializer from "../src/serializer.mjs"
+import User from "./support/user.mjs"
 
 describe("Serializer", () => {
   test("it serializes model classes", () => {

package/__tests__/support/task.js

@@ -1,4 +1,4 @@
-module.exports = class Task {
+export default class Task {
   static modelClassData () {
     return {
       attributes: [],

package/__tests__/support/user.js

@@ -1,6 +1,6 @@
-const BaseModel = require("../../src/base-model.cjs")
+import BaseModel from "../../src/base-model.mjs"
 
-module.exports = class User extends BaseModel {
+export default class User extends BaseModel {
   static modelClassData () {
     return {
       attributes: [],

package/jest.config.js

@@ -1,3 +1,4 @@
-module.exports = {
-  testRegex: "__tests__/.*\.test\.js$" // eslint-disable-line no-useless-escape
+export default {
+  testRegex: "__tests__/.*\.test\.(m|)js$", // eslint-disable-line no-useless-escape
+  transform: {}
 }

package/package.json

@@ -16,7 +16,8 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.203",
+  "version": "1.0.206",
+  "type": "module",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -30,7 +31,7 @@
   },
   "homepage": "https://github.com/kaspernj/api_maker",
   "scripts": {
-    "eslint": "eslint --ext .cjs,.js,.jsx",
+    "eslint": "eslint --ext .mjs,.js,.jsx",
     "eslint-find-rules": "eslint-find-rules",
     "test": "jest"
   },

package/src/{api.js → api.mjs}

@@ -1,5 +1,5 @@
-import config from "./config.js"
-import CustomError from "./custom-error.cjs"
+import config from "./config.mjs"
+import CustomError from "./custom-error.mjs"
 import FormDataObjectizer from "form-data-objectizer"
 import qs from "qs"
 

package/src/attribute-not-loaded-error.mjs

@@ -0,0 +1 @@
+export default class AttributeNotLoadedError extends Error {}

package/src/{base-error.cjs → base-error.mjs}

@@ -1,5 +1,5 @@
-const {dig, digg} = require("diggerize")
-const errorMessages = require("./error-messages.cjs")
+import {dig, digg} from "diggerize"
+import errorMessages from "./error-messages.mjs"
 
 class BaseError extends Error {
   constructor (message, args = {}) {
@@ -37,4 +37,4 @@ class BaseError extends Error {
 
 BaseError.apiMakerType = "BaseError"
 
-module.exports = BaseError
+export default BaseError

package/src/{base-model.cjs → base-model.mjs}

@@ -1,35 +1,34 @@
-const AttributeNotLoadedError = require("./attribute-not-loaded-error.cjs")
-const Collection = require("./collection.cjs")
-const CommandsPool = require("./commands-pool.cjs")
-const CustomError = require("./custom-error.cjs")
-const {digg} = require("diggerize")
-const FormDataObjectizer = require("form-data-objectizer")
-const inflection = require("inflection")
-const ModelName = require("./model-name.cjs")
-const NotLoadedError = require("./not-loaded-error.cjs")
-const objectToFormData = require("object-to-formdata").serialize
-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})
-}
-
-const sendValidationErrorsEvent = (validationErrors, options) => {
-  if (options && options.form) {
-    const event = newCustomEvent(validationErrors)
-    options.form.dispatchEvent(event)
-  }
-}
+import AttributeNotLoadedError from "./attribute-not-loaded-error.mjs"
+import Collection from "./collection.mjs"
+import CommandsPool from "./commands-pool.mjs"
+import Config from "@kaspernj/api-maker/src/config.mjs"
+import CustomError from "./custom-error.mjs"
+import {digg} from "diggerize"
+import FormDataObjectizer from "form-data-objectizer"
+import inflection from "inflection"
+import ModelName from "./model-name.mjs"
+import NotLoadedError from "./not-loaded-error.mjs"
+import objectToFormData from "object-to-formdata"
+import Services from "./services.mjs"
+import ValidationError from "./validation-error.mjs"
+import {ValidationErrors} from "./validation-errors.mjs"
 
 class BaseModel {
   static modelClassData () {
     throw new Error("modelClassData should be overriden by child")
   }
 
+  static newCustomEvent = (validationErrors) => {
+    return new CustomEvent("validation-errors", {detail: validationErrors})
+  }
+
+  static sendValidationErrorsEvent = (validationErrors, options) => {
+    if (options && options.form) {
+      const event = BaseModel.newCustomEvent(validationErrors)
+      options.form.dispatchEvent(event)
+    }
+  }
+
   static async find (id) {
     const primaryKeyName = this.modelClassData().primaryKey
     const query = {}
@@ -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
@@ -319,7 +314,7 @@ class BaseModel {
       validationErrors: digg(error, "args", "response", "validation_errors")
     })
 
-    sendValidationErrorsEvent(validationErrors, options)
+    BaseModel.sendValidationErrorsEvent(validationErrors, options)
 
     if (!options || options.throwValidationError != false) {
       throw new ValidationError(validationErrors, digg(error, "args"))
@@ -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)
   }
@@ -660,7 +656,7 @@ class BaseModel {
       if (args instanceof FormData) {
         postData = args
       } else {
-        postData = objectToFormData(args, {}, null, "args")
+        postData = objectToFormData.serialize(args, {}, null, "args")
       }
     } else {
       postData = new FormData()
@@ -844,4 +840,4 @@ class BaseModel {
 
 BaseModel.apiMakerType = "BaseModel"
 
-module.exports = BaseModel
+export default BaseModel

package/src/{cable-connection-pool.cjs → cable-connection-pool.mjs}

@@ -1,13 +1,14 @@
-const CableSubscriptionPool = require("./cable-subscription-pool.cjs")
-const CableSubscription = require("./cable-subscription.cjs")
-const {dig} = require("diggerize")
+import CableSubscriptionPool from "./cable-subscription-pool.mjs"
+import CableSubscription from "./cable-subscription.mjs"
+import {dig} from "diggerize"
 
-module.exports = class ApiMakerCableConnectionPool {
+const shared = {}
+
+export default class ApiMakerCableConnectionPool {
   static current () {
-    if (!global.apiMakerCableConnectionPool)
-      global.apiMakerCableConnectionPool = new ApiMakerCableConnectionPool()
+    if (!shared.apiMakerCableConnectionPool) shared.apiMakerCableConnectionPool = new ApiMakerCableConnectionPool()
 
-    return global.apiMakerCableConnectionPool
+    return shared.apiMakerCableConnectionPool
   }
 
   constructor () {

package/src/{cable-subscription-pool.cjs → cable-subscription-pool.mjs}

@@ -1,11 +1,11 @@
-const ChannelsConsumer = require("./channels-consumer.cjs")
-const CommandsPool = require("./commands-pool.cjs")
-const Deserializer = require("./deserializer.cjs")
-const {digg} = require("diggerize")
-const inflection = require("inflection")
-const Logger = require("./logger.cjs")
-
-module.exports = class ApiMakerCableSubscriptionPool {
+import ChannelsConsumer from "./channels-consumer.mjs"
+import CommandsPool from "./commands-pool.mjs"
+import Deserializer from "./deserializer.mjs"
+import {digg} from "diggerize"
+import inflection from "inflection"
+import Logger from "./logger.mjs"
+
+export default class ApiMakerCableSubscriptionPool {
   constructor () {
     this.activeSubscriptions = 0
     this.connected = false

package/src/{cable-subscription.cjs → cable-subscription.mjs}

@@ -1,7 +1,7 @@
-const EventEmitter = require("events")
-const Logger = require("./logger.cjs")
+import EventEmitter from "events"
+import Logger from "./logger.mjs"
 
-module.exports = class ApiMakerCableSubscription {
+export default class ApiMakerCableSubscription {
   constructor () {
     this.events = new EventEmitter()
     this.subscribed = true

package/src/can-can-loader.jsx

@@ -1,9 +1,9 @@
 import ApiMakerEventEmitterListener from "./event-emitter-listener"
 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")
+import CanCan from "./can-can.mjs"
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerCanCanLoader extends React.PureComponent {
   static propTypes = propTypesExact({

package/src/{can-can.cjs → can-can.mjs}

@@ -1,16 +1,16 @@
-const {digg} = require("diggerize")
-const EventEmitter = require("events")
-const inflection = require("inflection")
-const {ReadersWriterLock} = require("epic-locks")
-const Services = require("./services.cjs")
+import {digg} from "diggerize"
+import EventEmitter from "events"
+import inflection from "inflection"
+import {ReadersWriterLock} from "epic-locks"
+import Services from "./services.mjs"
 
-module.exports = class ApiMakerCanCan {
+const shared = {}
+
+export default class ApiMakerCanCan {
   static current () {
-    if (!global.currentApiMakerCanCan) {
-      global.currentApiMakerCanCan = new ApiMakerCanCan()
-    }
+    if (!shared.currentApiMakerCanCan) shared.currentApiMakerCanCan = new ApiMakerCanCan()
 
-    return global.currentApiMakerCanCan
+    return shared.currentApiMakerCanCan
   }
 
   constructor () {

package/src/channels-consumer.mjs

@@ -0,0 +1,3 @@
+import {createConsumer} from "@rails/actioncable"
+
+export default createConsumer()

package/src/collection-loader.jsx

@@ -1,13 +1,13 @@
-const Collection = require("@kaspernj/api-maker/src/collection")
-const {debounce} = require("debounce")
-const {digg, digs} = require("diggerize")
-const EventCreated = require("@kaspernj/api-maker/src/event-created").default
-const EventDestroyed = require("@kaspernj/api-maker/src/event-destroyed").default
-const EventUpdated = require("@kaspernj/api-maker/src/event-updated").default
-const instanceOfClassName = require("@kaspernj/api-maker/src/instance-of-class-name")
-const Params = require("@kaspernj/api-maker/src/params")
-const PropTypes = require("prop-types")
-const React = require("react")
+import Collection from "@kaspernj/api-maker/src/collection"
+import {debounce} from "debounce"
+import {digg, digs} from "diggerize"
+import EventCreated from "@kaspernj/api-maker/src/event-created"
+import EventDestroyed from "@kaspernj/api-maker/src/event-destroyed"
+import EventUpdated from "@kaspernj/api-maker/src/event-updated"
+import instanceOfClassName from "@kaspernj/api-maker/src/instance-of-class-name"
+import Params from "@kaspernj/api-maker/src/params"
+import PropTypes from "prop-types"
+import React from "react"
 
 import {LocationChanged} from "on-location-changed/src/location-changed-component"
 

package/src/{collection.cjs → collection.mjs}

@@ -1,10 +1,10 @@
-const cloneDeep = require("clone-deep")
-const CommandsPool = require("./commands-pool.cjs")
-const {digg} = require("diggerize")
-const inflection = require("inflection")
-const {merge} = require("./merge.cjs")
-const modelClassRequire = require("./model-class-require.cjs")
-const Result = require("./result.cjs")
+import cloneDeep from "clone-deep"
+import CommandsPool from "./commands-pool.mjs"
+import {digg} from "diggerize"
+import inflection from "inflection"
+import {merge} from "./merge.mjs"
+import modelClassRequire from "./model-class-require.mjs"
+import Result from "./result.mjs"
 
 class ApiMakerCollection {
   constructor (args, queryArgs = {}) {
@@ -252,4 +252,4 @@ class ApiMakerCollection {
 
 ApiMakerCollection.apiMakerType = "Collection"
 
-module.exports = ApiMakerCollection
+export default ApiMakerCollection

package/src/{command-submit-data.cjs → command-submit-data.mjs}

@@ -1,6 +1,6 @@
-const objectToFormData = require("object-to-formdata").serialize
+import objectToFormData from "object-to-formdata"
 
-module.exports = class ApiMakerCommandSubmitData {
+export default class ApiMakerCommandSubmitData {
   constructor (data) {
     this.data = data
     this.filesCount = 0
@@ -28,7 +28,7 @@ module.exports = class ApiMakerCommandSubmitData {
 
     objectForFormData.json = JSON.stringify(this.getJsonData())
 
-    const formData = objectToFormData(objectForFormData)
+    const formData = objectToFormData.serialize(objectForFormData)
 
     return formData
   }

package/src/{commands-pool.cjs → commands-pool.mjs}

@@ -1,15 +1,17 @@
-const Api = require("./api.js").default
-const CommandSubmitData = require("./command-submit-data.cjs")
-const CustomError = require("./custom-error.cjs")
-const DestroyError = require("./destroy-error.cjs")
-const Deserializer = require("./deserializer.cjs")
-const {dig, digg} = require("diggerize")
-const FormDataObjectizer = require("form-data-objectizer")
-const Serializer = require("./serializer.cjs")
-const ValidationError = require("./validation-error.cjs")
-const {ValidationErrors} = require("./validation-errors.cjs")
-
-module.exports = class ApiMakerCommandsPool {
+import Api from "./api.mjs"
+import CommandSubmitData from "./command-submit-data.mjs"
+import CustomError from "./custom-error.mjs"
+import DestroyError from "./destroy-error.mjs"
+import Deserializer from "./deserializer.mjs"
+import {dig, digg} from "diggerize"
+import FormDataObjectizer from "form-data-objectizer"
+import Serializer from "./serializer.mjs"
+import ValidationError from "./validation-error.mjs"
+import {ValidationErrors} from "./validation-errors.mjs"
+
+const shared = {}
+
+export default class ApiMakerCommandsPool {
   static addCommand (data, args = {}) {
     let pool
 
@@ -31,11 +33,9 @@ module.exports = class ApiMakerCommandsPool {
   }
 
   static current () {
-    if (!global.currentApiMakerCommandsPool) {
-      global.currentApiMakerCommandsPool = new ApiMakerCommandsPool()
-    }
+    if (!shared.currentApiMakerCommandsPool) shared.currentApiMakerCommandsPool = new ApiMakerCommandsPool()
 
-    return global.currentApiMakerCommandsPool
+    return shared.currentApiMakerCommandsPool
   }
 
   static flush () {

package/src/{config.js → config.mjs}

@@ -15,15 +15,16 @@ const accessors = {
   currenciesCollection: {required: true},
   history: {required: false},
   host: {required: false},
+  i18n: {required: false},
   routes: {required: false},
   routeDefinitions: {required: false}
 }
 
 class ApiMakerConfig {
   constructor() {
-    if (!global.apiMakerConfigGlobal) global.apiMakerConfigGlobal = {}
+    if (!globalThis.apiMakerConfigGlobal) globalThis.apiMakerConfigGlobal = {}
 
-    this.global = global.apiMakerConfigGlobal
+    this.global = globalThis.apiMakerConfigGlobal
   }
 }
 

package/src/{custom-error.cjs → custom-error.mjs}

@@ -1,7 +1,7 @@
-const BaseError = require("./base-error.cjs")
+import BaseError from "./base-error.mjs"
 
 class CustomError extends BaseError {}
 
 CustomError.apiMakerType = "CustomError"
 
-module.exports = CustomError
+export default CustomError