@kaspernj/api-maker 1.0.166 → 1.0.169

package/package.json

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

package/src/collection.cjs

@@ -3,6 +3,7 @@ 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")
 
 class ApiMakerCollection {
@@ -212,7 +213,7 @@ class ApiMakerCollection {
   modelClass () {
     const modelName = digg(this.args.modelClass.modelClassData(), "name")
 
-    return digg(require("@kaspernj/api-maker/src/models"), modelName)
+    return modelClassRequire(modelName)
   }
 
   clone () {

package/src/deserializer.cjs

@@ -1,5 +1,6 @@
 const {digg} = require("diggerize")
 const inflection = require("inflection")
+const modelClassRequire = require("./model-class-require.cjs")
 const ModelsResponseReader = require("./models-response-reader.cjs")
 const Money = require("js-money")
 
@@ -32,14 +33,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("@kaspernj/api-maker/src/models"), modelClassName)
+        const ModelClass = modelClassRequire(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("@kaspernj/api-maker/src/models"), modelClassName)
+        const ModelClass = modelClassRequire(modelClassName)
 
         return ModelClass
       } else {

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

@@ -1,29 +1,30 @@
-const CanCan = require("./can-can.cjs")
-const Deserializer = require("./deserializer.cjs")
-const {digg} = require("diggerize")
-const EventEmitter = require("events")
-const inflection = require("inflection")
-const Services = require("./services.cjs")
-
-module.exports = class ApiMakerDevise {
+import CanCan from "./can-can.cjs"
+import Deserializer from "./deserializer.cjs"
+import {digg} from "diggerize"
+import EventEmitter from "events"
+import inflection from "inflection"
+import modelClassRequire from "./model-class-require.cjs"
+import Services from "./services.cjs"
+
+export default class ApiMakerDevise {
   static callSignOutEvent (args) {
     ApiMakerDevise.events().emit("onDeviseSignOut", {args})
   }
 
   static current () {
-    if (!global.currentApiMakerDevise)
-    global.currentApiMakerDevise = new ApiMakerDevise()
+    if (!globalThis.currentApiMakerDevise)
+    globalThis.currentApiMakerDevise = new ApiMakerDevise()
 
-    return global.currentApiMakerDevise
+    return globalThis.currentApiMakerDevise
   }
 
   static events () {
-    if (!global.apiMakerDeviseEvents) {
-      global.apiMakerDeviseEvents = new EventEmitter()
-      global.apiMakerDeviseEvents.setMaxListeners(1000)
+    if (!globalThis.apiMakerDeviseEvents) {
+      globalThis.apiMakerDeviseEvents = new EventEmitter()
+      globalThis.apiMakerDeviseEvents.setMaxListeners(1000)
     }
 
-    return global.apiMakerDeviseEvents
+    return globalThis.apiMakerDeviseEvents
   }
 
   static addUserScope (scope) {
@@ -82,8 +83,8 @@ module.exports = class ApiMakerDevise {
     await CanCan.current().resetAbilities()
 
     // Cannot use the class because they would both import each other
-    if (global.apiMakerSessionStatusUpdater) {
-      global.apiMakerSessionStatusUpdater.updateSessionStatus()
+    if (globalThis.apiMakerSessionStatusUpdater) {
+      globalThis.apiMakerSessionStatusUpdater.updateSessionStatus()
     }
 
     ApiMakerDevise.setSignedOut(args)
@@ -104,7 +105,7 @@ module.exports = class ApiMakerDevise {
   }
 
   loadCurrentScope (scope) {
-    const scopeData = global.apiMakerDeviseCurrent[scope]
+    const scopeData = globalThis.apiMakerDeviseCurrent[scope]
 
     if (!scopeData) return null
 
@@ -113,7 +114,7 @@ module.exports = class ApiMakerDevise {
     // Might be a collection with preloaded relationships
     if (Array.isArray(parsedScopeData)) return parsedScopeData[0]
 
-    const ModelClass = digg(require("@kaspernj/api-maker/src/models"), inflection.camelize(scope))
+    const ModelClass = modelClassRequire(scope)
     const modelInstance = new ModelClass({data: parsedScopeData})
 
     return modelInstance

package/src/model-class-require.cjs

@@ -0,0 +1,9 @@
+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-loader.cjs → model-recipes-loader.mjs}

@@ -1,7 +1,7 @@
-const {digg, digs} = require("diggerize")
-const ModelRecipesModelLoader = require("./model-recipes-model-loader.cjs")
+import {digg, digs} from "diggerize"
+import ModelRecipesModelLoader from "./model-recipes-model-loader.mjs"
 
-module.exports = class ModelRecipesLoader {
+export default class ModelRecipesLoader {
   constructor ({recipes}) {
     this.modelClasses = {}
     this.recipes = recipes

package/src/{model-recipes-model-loader.cjs → model-recipes-model-loader.mjs}

@@ -1,9 +1,9 @@
-const BaseModel = require("./base-model.cjs")
-const Collection = require("./collection.cjs")
-const {digg, digs} = require("diggerize")
-const inflection = require("inflection")
+import BaseModel from "./base-model.cjs"
+import Collection from "./collection.cjs"
+import {digg, digs} from "diggerize"
+import inflection from "inflection"
 
-module.exports = class ApiMakerModelRecipesModelLoader {
+export default class ApiMakerModelRecipesModelLoader {
   constructor ({modelRecipe, modelRecipesLoader}) {
     if (!modelRecipe) throw new Error("No 'modelRecipe' was given")
 

package/src/model-recipes.mjs.erb

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

package/src/models-response-reader.cjs

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

package/src/models.cjs

@@ -1,5 +1,5 @@
-const modelRecipes = require("./model-recipes.cjs.erb")
-const ModelRecipesLoader = require("./model-recipes-loader.cjs")
+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()

package/src/preloaded.cjs

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

package/src/router.jsx

@@ -24,7 +24,7 @@ class ApiMakerRouter extends React.Component {
 
         return (
           <Suspense fallback={<div />}>
-            <NotFoundComponent />
+            <NotFoundComponent match={match} />
           </Suspense>
         )
       } else {

package/src/{session-status-updater.cjs → session-status-updater.mjs}

@@ -1,13 +1,13 @@
-const Devise = require("./devise.cjs")
-const inflection = require("inflection")
-const wakeEvent = require("wake-event")
+import Devise from "./devise.mjs"
+import inflection from "inflection"
+import wakeEvent from "wake-event"
 
-module.exports = class ApiMakerSessionStatusUpdater {
+export default class ApiMakerSessionStatusUpdater {
   static current () {
-    if (!global.apiMakerSessionStatusUpdater)
-      global.apiMakerSessionStatusUpdater = new ApiMakerSessionStatusUpdater()
+    if (!globalThis.apiMakerSessionStatusUpdater)
+      globalThis.apiMakerSessionStatusUpdater = new ApiMakerSessionStatusUpdater()
 
-    return global.apiMakerSessionStatusUpdater
+    return globalThis.apiMakerSessionStatusUpdater
   }
 
   constructor (args = {}) {
@@ -20,7 +20,7 @@ module.exports = class ApiMakerSessionStatusUpdater {
   }
 
   connectOnlineEvent () {
-    global.addEventListener("online", () => this.updateSessionStatus(), false)
+    window.addEventListener("online", () => this.updateSessionStatus(), false)
   }
 
   connectWakeEvent () {

package/src/{translated-collections.cjs → translated-collections.mjs}

@@ -1,5 +1,5 @@
-const {digg} = require("diggerize")
-const translatedCollectionsData = require("./translated-collections-data").default
+import {digg} from "diggerize"
+import translatedCollectionsData from "./translated-collections-data.mjs.erb"
 
 export default class ApiMakerTranslatedCollections {
   static get (modelClass, collectionName) {

package/src/validation-errors.cjs

@@ -1,5 +1,6 @@
 const {digg, digs} = require("diggerize")
 const inflection = require("inflection")
+const modelClassRequire = require("./model-class-require.cjs")
 
 class ValidationError {
   constructor (args) {
@@ -65,7 +66,7 @@ class ValidationError {
   getModelClass () {
     const modelName = inflection.classify(digg(this, "modelName"))
 
-    return digg(require("@kaspernj/api-maker/src/models"), modelName)
+    return modelClassRequire(modelName)
   }
 
   setHandled () {

package/src/with-router.jsx

@@ -116,9 +116,10 @@ export default (WrapperComponent) => class WithRouter extends React.Component {
   render() {
     const {path, routes, routeDefinitions, ...restProps} = this.props
     const matchingRoute = this.findMatchingRoute()
+    const params = matchingRoute?.params || {}
     const match = {
       matchingRoute,
-      params: matchingRoute?.params
+      params
     }
 
     return (

package/src/model-recipes.cjs.erb

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