@kaspernj/api-maker 1.0.204 → 1.0.207

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

@@ -1,7 +1,7 @@
-const {digg} = require("diggerize")
-const SourceMapsLoader = require("./source-maps-loader.cjs")
+import {digg} from "diggerize"
+import SourceMapsLoader from "./source-maps-loader.mjs"
 
-module.exports = class ErrorLogger {
+export default class ErrorLogger {
   constructor () {
     this.debug = true
     this.errorOccurred = false
@@ -40,7 +40,7 @@ module.exports = class ErrorLogger {
   }
 
   connectOnError () {
-    global.addEventListener("error", (event) => {
+    globalThis.addEventListener("error", (event) => {
       this.errorOccurred = true
 
       if (!this.isHandlingError) {
@@ -53,7 +53,7 @@ module.exports = class ErrorLogger {
   }
 
   connectUnhandledRejection () {
-    global.addEventListener("unhandledrejection", (event) => {
+    globalThis.addEventListener("unhandledrejection", (event) => {
       this.errorOccurred = true
 
       if (!this.isHandlingError) {

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

@@ -1,4 +1,4 @@
-const {digg} = require("diggerize")
+import {digg} from "diggerize"
 const errorMessages = (args) => {
   if (typeof args.response == "object") {
     return digg(args, "response", "errors").map((error) => {
@@ -11,4 +11,4 @@ const errorMessages = (args) => {
   }
 }
 
-module.exports = errorMessages
+export default errorMessages

package/src/event-connection.jsx

@@ -1,7 +1,7 @@
-const ModelEvents = require("./model-events.cjs")
-const PropTypes = require("prop-types")
-const propTypesExact = require("prop-types-exact")
-const React = require("react")
+import ModelEvents from "./model-events.mjs"
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerEventConnection extends React.PureComponent {
   static defaultProps = {

package/src/event-created.jsx

@@ -1,8 +1,8 @@
-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")
+import debounce from "debounce"
+import ModelEvents from "./model-events.mjs"
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerEventCreated extends React.PureComponent {
   static defaultProps = {

package/src/event-destroyed.jsx

@@ -1,7 +1,7 @@
-const ModelEvents = require("./model-events.cjs")
-const PropTypes = require("prop-types")
-const propTypesExact = require("prop-types-exact")
-const React = require("react")
+import ModelEvents from "./model-events.mjs"
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerEventDestroyed extends React.PureComponent {
   static propTypes = propTypesExact({

package/src/event-emitter-listener.jsx

@@ -1,6 +1,6 @@
-const EventEmitter = require("events")
-const PropTypes = require("prop-types")
-const React = require("react")
+import EventEmitter from "events"
+import PropTypes from "prop-types"
+import React from "react"
 
 export default class ApiMakerEventEmitterListener extends React.PureComponent {
   static propTypes = {

package/src/event-listener.jsx

@@ -1,6 +1,6 @@
-const PropTypes = require("prop-types")
-const propTypesExact = require("prop-types-exact")
-const React = require("react")
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerEventListener extends React.PureComponent {
   static callEvent (target, eventName, args = []) {

package/src/event-model-class.jsx

@@ -1,7 +1,7 @@
-const ModelEvents = require("./model-events.cjs")
-const PropTypes = require("prop-types")
-const propTypesExact = require("prop-types-exact")
-const React = require("react")
+import ModelEvents from "./model-events.mjs"
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerEventModelClass extends React.PureComponent {
   static propTypes = propTypesExact({

package/src/event-updated.jsx

@@ -1,8 +1,8 @@
-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")
+import debounce from "debounce"
+import ModelEvents from "./model-events.mjs"
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerEventUpdated extends React.PureComponent {
   static defaultProps = {

package/src/{instance-of-class-name.cjs → instance-of-class-name.mjs}

@@ -1,4 +1,4 @@
-const {digg} = require("diggerize")
+import {digg} from "diggerize"
 
 const propTypesValidator = (expectedClassName, args = {}) => (props, propName, componentName) => {
   const prop = digg(props, propName)
@@ -26,4 +26,4 @@ const instanceOfClassName = (expectedClassName) => {
   return validator
 }
 
-module.exports = instanceOfClassName
+export default instanceOfClassName

package/src/{key-value-store.cjs → key-value-store.mjs}

@@ -1,11 +1,12 @@
-const Params = require("./params.cjs")
+import Params from "./params.mjs"
 
-module.exports = class KeyValueStore {
+const shared = {}
+
+export default class KeyValueStore {
   static current () {
-    if (!global.currentKeyValueStore)
-      global.currentKeyValueStore = new KeyValueStore()
+    if (!shared.currentKeyValueStore) shared.currentKeyValueStore = new KeyValueStore()
 
-    return global.currentKeyValueStore
+    return shared.currentKeyValueStore
   }
 
   static get (key) {

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

@@ -1,11 +1,13 @@
-module.exports = class ApiMakerLogger {
+const shared = {}
+
+export default class ApiMakerLogger {
   static current () {
-    if (!global.apiMakerLogger) {
-      global.apiMakerLogger = new ApiMakerLogger()
-      // global.apiMakerLogger.setDebug(true)
+    if (!shared.apiMakerLogger) {
+      shared.apiMakerLogger = new ApiMakerLogger()
+      // shared.apiMakerLogger.setDebug(true)
     }
 
-    return global.apiMakerLogger
+    return shared.apiMakerLogger
   }
 
   static log (message) {

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

@@ -49,7 +49,7 @@ const mergeObjectsInto = (mergeInto, object) => {
   }
 }
 
-module.exports = {
+export {
   merge,
   mergeArraysInto,
   mergeObjectsInto

package/src/model-class-require.mjs

@@ -0,0 +1,10 @@
+import {digg} from "diggerize"
+import inflection from "inflection"
+import * as models from "@kaspernj/api-maker/src/models.mjs.erb"
+
+export default (modelName) => {
+  const requireName = inflection.camelize(modelName)
+  const ModelClass = digg(models, requireName)
+
+  return ModelClass
+}

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

@@ -1,7 +1,7 @@
-const CableConnectionPool = require("./cable-connection-pool.cjs")
-const {digg} = require("diggerize")
+import CableConnectionPool from "./cable-connection-pool.mjs"
+import {digg} from "diggerize"
 
-module.exports = class ModelEvents {
+export default class ModelEvents {
   static connect (model, eventName, callback) {
     const modelClassName = digg(model.modelClassData(), "name")
     const cableSubscription = CableConnectionPool.current().connectEvent(modelClassName, model.primaryKey(), eventName, callback)

package/src/model-load-wrapper.jsx

@@ -1,5 +1,5 @@
 import EventUpdated from "./event-updated"
-import Params from "./params.cjs"
+import Params from "./params.mjs"
 import React from "react"
 
 export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapper extends React.PureComponent {
@@ -8,7 +8,8 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
 
   state = {
     model: undefined,
-    modelId: this.props.match.params[this.paramsVariableName] || this.props.match.params.id
+    modelId: this.props.match.params[this.paramsVariableName] || this.props.match.params.id,
+    notFound: undefined
   }
 
   componentDidMount() {
@@ -37,7 +38,10 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
 
     const model = await query.first()
 
-    this.setState({model})
+    this.setState({
+      model,
+      notFound: !model
+    })
   }
 
   async loadNewModel() {
@@ -62,11 +66,12 @@ export default (WrappedComponent, ModelClass, args = {}) => class modelLoadWrapp
 
   render() {
     const {onUpdated, reloadModel} = digs(this, "onUpdated", "reloadModel")
-    const {model, modelId} = digs(this.state, "model", "modelId")
+    const {model, modelId, notFound} = digs(this.state, "model", "modelId", "notFound")
     const wrappedComponentProps = {}
 
     wrappedComponentProps[this.camelizedLower] = model
     wrappedComponentProps[`${this.camelizedLower}Id`] = modelId
+    wrappedComponentProps[`${this.camelizedLower}NotFound`] = notFound
 
     return (
       <>

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

@@ -1,7 +1,7 @@
-const Config = require("@kaspernj/api-maker/src/config").default
+import Config from "@kaspernj/api-maker/src/config.mjs"
 
-module.exports = class ModelName {
-  constructor (data) {
+export default class ModelName {
+  constructor(data) {
     this.data = data
   }
 
@@ -9,10 +9,10 @@ module.exports = class ModelName {
     return this.data.modelClassData.camelizedLower
   }
 
-  human (args) {
+  human(args) {
     let argsToUse = args
 
-    if (!argsToUse) argsToUse = {count: 1}
+    if (!argsToUse) argsToUse = { count: 1 }
 
     let countKey
 

package/src/{model-prop-type.cjs → model-prop-type.mjs}

@@ -1,7 +1,7 @@
-const {digg} = require("diggerize")
-const Inflection = require("inflection")
+import {digg} from "diggerize"
+import Inflection from "inflection"
 
-module.exports = class ApiMakerModelPropType {
+export default class ApiMakerModelPropType {
   static ofModel (modelClass) {
     const modelPropTypeInstance = new ApiMakerModelPropType()
 

package/src/model-recipes-model-loader.mjs

@@ -1,5 +1,5 @@
-import BaseModel from "./base-model.cjs"
-import Collection from "./collection.cjs"
+import BaseModel from "./base-model.mjs"
+import Collection from "./collection.mjs"
 import {digg, digs} from "diggerize"
 import inflection from "inflection"
 

package/src/{models-response-reader.cjs → models-response-reader.mjs}

@@ -1,9 +1,9 @@
-const {digg} = require("diggerize")
-const inflection = require("inflection")
-const modelClassRequire = require("./model-class-require.cjs")
-const Preloaded = require("./preloaded.cjs")
+import {digg} from "diggerize"
+import inflection from "inflection"
+import modelClassRequire from "./model-class-require.mjs"
+import Preloaded from "./preloaded.mjs"
 
-module.exports = class ModelsResponseReader {
+export default class ModelsResponseReader {
   static first (response) {
     return ModelsResponseReader.collection(response)[0]
   }

package/src/models.mjs.erb

@@ -0,0 +1,16 @@
+/* rails-erb-loader-dependencies api_maker/resources/ models/ */
+
+import {digg} from "diggerize"
+import ModelRecipesLoader from "./model-recipes-loader.mjs"
+
+const modelRecipes = <%= ApiMaker::ModelClassesJavaScriptGeneratorService.execute!.to_json %>
+const loader = new ModelRecipesLoader({recipes: modelRecipes})
+const result = loader.load()
+
+<% model_class_names = [] %>
+<% ApiMaker::ModelClassesJavaScriptGeneratorService.new.resources.each do |resource| %>
+  <% model_class_names << resource.short_name %>
+  const <%= resource.short_name %> = digg(result, "<%= resource.short_name %>")
+<% end %>
+
+export {<%= model_class_names.join(", ") %>}

package/src/{money-formatter.cjs → money-formatter.mjs}

@@ -1,8 +1,8 @@
-const Money = require("js-money")
-const formatNumber = require("format-number")
-const replaceall = require("replaceall")
+import Money from "js-money"
+import formatNumber from "format-number"
+import replaceall from "replaceall"
 
-module.exports = class MoneyFormatter {
+export default class MoneyFormatter {
   static fromMoney (money, args = {}) {
     return new MoneyFormatter(money, args)
   }

package/src/not-loaded-error.mjs

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

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

@@ -1,10 +1,10 @@
-const formSerialize = require("form-serialize")
-const {merge} = require("./merge.cjs")
-const qs = require("qs")
+import formSerialize from "form-serialize"
+import {merge} from "./merge.mjs"
+import qs from "qs"
 
-module.exports = class Params {
+export default class Params {
   static parse () {
-    return qs.parse(global.location.search.substr(1))
+    return qs.parse(globalThis.location.search.substr(1))
   }
 
   static change (given) {

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

@@ -1,7 +1,7 @@
-const inflection = require("inflection")
-const modelClassRequire = require("./model-class-require.cjs")
+import inflection from "inflection"
+import modelClassRequire from "./model-class-require.mjs"
 
-module.exports = class ApiMakerPreloaded {
+export default class ApiMakerPreloaded {
   constructor (response) {
     this.response = response
     this.loadPreloadedModels()

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

@@ -1,4 +1,4 @@
-module.exports = class ApiMakerResult {
+export default class ApiMakerResult {
   constructor (data) {
     this.data = data
   }

package/src/{routes-native.cjs → routes-native.mjs}

@@ -1,8 +1,8 @@
-const {dig, digg, digs} = require("diggerize")
-const inflection = require("inflection")
-const qs = require("qs")
+import {dig, digg, digs} from "diggerize"
+import inflection from "inflection"
+import qs from "qs"
 
-module.exports = class ApiMakerRoutesNative {
+export default class ApiMakerRoutesNative {
   constructor ({getLocale}) {
     this.getLocale = getLocale
     this.routeDefinitions = []
@@ -141,15 +141,15 @@ module.exports = class ApiMakerRoutesNative {
   addHostToRoute ({host, port, protocol, translatedRoute}) {
     let fullUrl = ""
 
-    const hostToUse = host || global.location && global.location.host
-    const portToUse = port || global.location && global.location.port
+    const hostToUse = host || globalThis.location && globalThis.location.host
+    const portToUse = port || globalThis.location && globalThis.location.port
 
     if (!hostToUse) throw new Error("Unable to detect host")
 
     if (protocol) {
       fullUrl += `${protocol}://`
-    } else if (global.location && global.location.protocol) {
-      fullUrl += `${global.location.protocol}//`
+    } else if (globalThis.location && globalThis.location.protocol) {
+      fullUrl += `${globalThis.location.protocol}//`
     } else {
       fullUrl += "https://"
     }

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

@@ -1,7 +1,7 @@
-const {digg} = require("diggerize")
-const inflection = require("inflection")
+import {digg} from "diggerize"
+import inflection from "inflection"
 
-module.exports = class ApiMakerRoutes {
+export default class ApiMakerRoutes {
   constructor ({jsRoutes, locale, routeDefinitions}) {
     if (!jsRoutes) throw new Error("'jsRoutes' wasn't given")
 

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

@@ -1,6 +1,6 @@
-const {digg} = require("diggerize")
+import {digg} from "diggerize"
 
-module.exports = class Serializer {
+export default class Serializer {
   static serialize (arg) {
     const serialize = new Serializer(arg)
 

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

@@ -1,12 +1,12 @@
-const CommandsPool = require("./commands-pool.cjs")
+import CommandsPool from "./commands-pool.mjs"
 
-module.exports = class ApiMakerServices {
+const shared = {}
+
+export default class ApiMakerServices {
   static current () {
-    if (!global.currentApiMakerService) {
-      global.currentApiMakerService = new ApiMakerServices()
-    }
+    if (!shared.currentApiMakerService) shared.currentApiMakerService = new ApiMakerServices()
 
-    return global.currentApiMakerService
+    return shared.currentApiMakerService
   }
 
   sendRequest (serviceName, args) {

package/src/{source-maps-loader.cjs → source-maps-loader.mjs}

@@ -1,6 +1,6 @@
-const stackTraceParser = require("stacktrace-parser")
-const {SourceMapConsumer} = require("source-map")
-const uniqunize = require("uniqunize")
+import * as stackTraceParser from "stacktrace-parser"
+import {SourceMapConsumer} from "source-map"
+import uniqunize from "uniqunize"
 
 // Sometimes this needs to be called and sometimes not
 if (SourceMapConsumer.initialize) {
@@ -9,7 +9,7 @@ if (SourceMapConsumer.initialize) {
   })
 }
 
-module.exports = class SourceMapsLoader {
+export default class SourceMapsLoader {
   constructor () {
     this.debug = false
     this.isLoadingSourceMaps = false

package/src/updated-attribute.jsx

@@ -1,8 +1,8 @@
-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")
+import {digg} from "diggerize"
+import ModelEvents from "./model-events.mjs"
+import PropTypes from "prop-types"
+import propTypesExact from "prop-types-exact"
+import React from "react"
 
 export default class ApiMakerUpdatedAttribute extends React.PureComponent {
   static propTypes = propTypesExact({

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

@@ -1,5 +1,5 @@
-const BaseError = require("./base-error.cjs")
-const inflection = require("inflection")
+import BaseError from "./base-error.mjs"
+import inflection from "inflection"
 
 class ValidationError extends BaseError {
   constructor (validationErrors, args) {
@@ -28,4 +28,4 @@ class ValidationError extends BaseError {
 
 ValidationError.apiMakerType = "ValidationError"
 
-module.exports = ValidationError
+export default ValidationError

package/src/{validation-errors.cjs → validation-errors.mjs}

@@ -1,6 +1,6 @@
-const {digg, digs} = require("diggerize")
-const inflection = require("inflection")
-const modelClassRequire = require("./model-class-require.cjs")
+import {digg, digs} from "diggerize"
+import inflection from "inflection"
+import modelClassRequire from "./model-class-require.mjs"
 
 class ValidationError {
   constructor (args) {
@@ -127,7 +127,7 @@ class ValidationErrors {
   }
 }
 
-module.exports = {
+export {
   ValidationError,
   ValidationErrors
 }

package/src/with-router.jsx

@@ -1,4 +1,4 @@
-import config from "./config"
+import config from "./config.mjs"
 import escapeStringRegexp from "escape-string-regexp"
 import inflection from "inflection"
 import PropTypes from "prop-types"

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

@@ -1 +0,0 @@
-module.exports = class AttributeNotLoadedError extends Error {}

package/src/channels-consumer.cjs

@@ -1,3 +0,0 @@
-const {createConsumer} = require("@rails/actioncable")
-
-module.exports = createConsumer()

package/src/model-class-require.cjs

@@ -1,9 +0,0 @@
-const {digg} = require("diggerize")
-const inflection = require("inflection")
-
-module.exports = (modelName) => {
-  const requireName = inflection.camelize(modelName)
-  const ModelClass = digg(require("@kaspernj/api-maker/src/models.cjs"), requireName)
-
-  return ModelClass
-}

package/src/model-recipes.mjs.erb

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

package/src/models.cjs

@@ -1,7 +0,0 @@
-const modelRecipes = require("./model-recipes.mjs.erb").default
-const ModelRecipesLoader = require("./model-recipes-loader.mjs").default
-
-const loader = new ModelRecipesLoader({recipes: modelRecipes})
-const result = loader.load()
-
-module.exports = result

package/src/not-loaded-error.cjs

@@ -1 +0,0 @@
-module.exports = class NotLoadedError extends Error {}