@kaspernj/api-maker 1.0.271 → 1.0.273

package/__tests__/{cable-subscription-pool.test.js → cable-subscription-pool.test.mjs}

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

package/__tests__/{can-can.test.js → can-can.test.mjs}

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

package/__tests__/{routes-native.test.js → routes-native.test.mjs}

@@ -1,4 +1,5 @@
 import RoutesNative from "../src/routes-native.mjs"
+
 const testRoutes = () => ({
   routes: [
     {"name": "blank", "path": "/blank", "component": "blank"},

package/__tests__/{routes.test.js → routes.test.mjs}

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

package/jest.config.js

@@ -1,4 +1,9 @@
 export default {
   testRegex: "__tests__/.*\.test\.(m|)js$", // eslint-disable-line no-useless-escape
-  transform: {}
+  "transformIgnorePatterns": [
+    "node_modules/(?!variables/.*)"
+  ],
+  "transform": {
+    "^.+\\.mjs?$": "babel-jest"
+  }
 }

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.271",
+  "version": "1.0.273",
   "type": "module",
   "description": "",
   "main": "index.js",
@@ -33,14 +33,14 @@
   "scripts": {
     "eslint": "eslint --ext .mjs,.js,.jsx",
     "eslint-find-rules": "eslint-find-rules",
-    "test": "jest"
+    "test": "node --experimental-vm-modules ./node_modules/.bin/jest"
   },
   "dependencies": {
     "@rails/actioncable": ">= 6.1.0",
     "clone-deep": ">= 4.0.1",
     "debounce": ">= 1.2.1",
     "diggerize": ">= 1.0.5",
-    "epic-locks": ">= 1.0.1",
+    "epic-locks": ">= 1.0.2",
     "form-data-objectizer": ">= 1.0.0",
     "form-serialize": ">= 0.7.2",
     "format-number": ">= 3.0.0",

package/src/base-model.mjs

@@ -153,6 +153,14 @@ export default class BaseModel {
     return foundReflection
   }
 
+  static _token () {
+    const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
+
+    if (csrfTokenElement) {
+      return csrfTokenElement.getAttribute("content")
+    }
+  }
+
   constructor (args = {}) {
     this.changes = {}
     this.newRecord = args.isNewRecord
@@ -718,9 +726,7 @@ export default class BaseModel {
     return {valid: response.valid, errors: response.errors}
   }
 
-  modelClass () {
-    return this.constructor
-  }
+  modelClass = () => this.constructor
 
   preloadRelationship (relationshipName, model) {
     this.relationshipsCache[BaseModel.snakeCase(relationshipName)] = model
@@ -731,9 +737,7 @@ export default class BaseModel {
     this._markedForDestruction = true
   }
 
-  markedForDestruction() {
-    return this._markedForDestruction
-  }
+  markedForDestruction = () => this._markedForDestruction
 
   uniqueKey () {
     if (!this.uniqueKeyValue) {
@@ -766,9 +770,7 @@ export default class BaseModel {
     }
   }
 
-  _callMemberCommand (args, commandArgs) {
-    return CommandsPool.addCommand(args, commandArgs)
-  }
+  _callMemberCommand = (args, commandArgs) => CommandsPool.addCommand(args, commandArgs)
 
   static _postDataFromArgs (args) {
     let postData
@@ -959,15 +961,5 @@ export default class BaseModel {
     }
   }
 
-  primaryKey () {
-    return this.readAttributeUnderscore(this.constructor.primaryKey())
-  }
-
-  static _token () {
-    const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
-
-    if (csrfTokenElement) {
-      return csrfTokenElement.getAttribute("content")
-    }
-  }
+  primaryKey = () => this.readAttributeUnderscore(this.constructor.primaryKey())
 }

package/src/cable-connection-pool.mjs

@@ -5,19 +5,17 @@ import {dig} from "diggerize"
 const shared = {}
 
 export default class ApiMakerCableConnectionPool {
+  cableSubscriptionPools = []
+  connections = {}
+  upcomingSubscriptionData = {}
+  upcomingSubscriptions = {}
+
   static current () {
     if (!shared.apiMakerCableConnectionPool) shared.apiMakerCableConnectionPool = new ApiMakerCableConnectionPool()
 
     return shared.apiMakerCableConnectionPool
   }
 
-  constructor () {
-    this.cableSubscriptionPools = []
-    this.connections = {}
-    this.upcomingSubscriptionData = {}
-    this.upcomingSubscriptions = {}
-  }
-
   connectEventToExistingSubscription ({path, subscription, value}) {
     for (const cableSubscriptionPool of this.cableSubscriptionPools) {
       if (!cableSubscriptionPool.isConnected()) {
@@ -103,27 +101,13 @@ export default class ApiMakerCableConnectionPool {
     return subscription
   }
 
-  connectCreated (modelName, callback) {
-    return this.connectModelEvent({callback, value: true, path: [modelName, "creates"]})
-  }
-
-  connectEvent (modelName, modelId, eventName, callback) {
-    return this.connectModelEvent({callback, value: modelId, path: [modelName, "events", eventName]})
-  }
-
-  connectDestroyed (modelName, modelId, callback) {
-    return this.connectModelEvent({callback, value: modelId, path: [modelName, "destroys"]})
-  }
-
-  connectModelClassEvent (modelName, eventName, callback) {
-    return this.connectModelEvent({callback, value: eventName, path: [modelName, "model_class_events"]})
-  }
-
-  connectUpdate (modelName, modelId, callback) {
-    return this.connectModelEvent({callback, value: modelId, path: [modelName, "updates"]})
-  }
+  connectCreated = (modelName, callback) => this.connectModelEvent({callback, value: true, path: [modelName, "creates"]})
+  connectEvent = (modelName, modelId, eventName, callback) => this.connectModelEvent({callback, value: modelId, path: [modelName, "events", eventName]})
+  connectDestroyed = (modelName, modelId, callback) => this.connectModelEvent({callback, value: modelId, path: [modelName, "destroys"]})
+  connectModelClassEvent = (modelName, eventName, callback) => this.connectModelEvent({callback, value: eventName, path: [modelName, "model_class_events"]})
+  connectUpdate = (modelName, modelId, callback) => this.connectModelEvent({callback, value: modelId, path: [modelName, "updates"]})
 
-  connectUpcoming () {
+  connectUpcoming = () => {
     const subscriptionData = this.upcomingSubscriptionData
     const subscriptions = this.upcomingSubscriptions
 
@@ -142,6 +126,6 @@ export default class ApiMakerCableConnectionPool {
     if (this.scheduleConnectUpcomingTimeout)
       clearTimeout(this.scheduleConnectUpcomingTimeout)
 
-    this.scheduleConnectUpcomingTimeout = setTimeout(() => this.connectUpcoming(), 0)
+    this.scheduleConnectUpcomingTimeout = setTimeout(this.connectUpcoming, 0)
   }
 }

package/src/cable-subscription-pool.mjs

@@ -5,6 +5,8 @@ import {digg} from "diggerize"
 import * as inflection from "inflection"
 import Logger from "./logger.mjs"
 
+const logger = new Logger({name: "ApiMaker / CableSubscriptionPool"})
+
 export default class ApiMakerCableSubscriptionPool {
   constructor () {
     this.activeSubscriptions = 0
@@ -14,6 +16,8 @@ export default class ApiMakerCableSubscriptionPool {
   connect (subscriptionData) {
     const globalData = CommandsPool.current().globalRequestData
 
+    logger.log(() => ["Creating subscription", {subscriptionData}])
+
     this.subscription = ChannelsConsumer.subscriptions.create(
       {
         channel: "ApiMaker::SubscriptionsChannel",
@@ -21,8 +25,9 @@ export default class ApiMakerCableSubscriptionPool {
         subscription_data: subscriptionData
       },
       {
-        connected: () => this.onConnected(),
-        received: (data) => this.onReceived(data)
+        connected: this.onConnected,
+        received: this.onReceived,
+        subscribed: this.onSubscribed
       }
     )
     this.connected = true
@@ -69,17 +74,15 @@ export default class ApiMakerCableSubscriptionPool {
     }
   }
 
-  isConnected () {
-    return digg(this, "connected")
-  }
+  isConnected = () => digg(this, "connected")
 
-  onConnected () {
+  onConnected = () => {
     this.forEachSubscription(({subscription}) => {
       subscription.events.emit("connected")
     })
   }
 
-  onReceived (rawData) {
+  onReceived = (rawData) => {
     const data = Deserializer.parse(rawData)
     const {a: args, e: eventName, m: model, mi: modelId, mt: modelType, t: type} = data
     const subscriptions = digg(this, "subscriptions")
@@ -124,13 +127,17 @@ export default class ApiMakerCableSubscriptionPool {
     }
   }
 
+  onSubscribed = () => {
+    logger.log("onSubscribed")
+  }
+
   onUnsubscribe () {
-    Logger.log(`activeSubscriptions before unsub: ${this.activeSubscriptions}`)
+    logger.log(() => `activeSubscriptions before unsub: ${this.activeSubscriptions}`)
     this.activeSubscriptions -= 1
-    Logger.log(`activeSubscriptions after unsub: ${this.activeSubscriptions}`)
+    logger.log(() => `activeSubscriptions after unsub: ${this.activeSubscriptions}`)
 
     if (this.activeSubscriptions <= 0) {
-      Logger.log("Unsubscribe from ActionCable subscription")
+      logger.log("Unsubscribe from ActionCable subscription")
       this.subscription.unsubscribe()
       this.connected = false
     }
@@ -139,8 +146,7 @@ export default class ApiMakerCableSubscriptionPool {
   registerSubscriptions (subscriptions) {
     this.subscriptions = subscriptions
 
-    Logger.log(`registerSubscriptions: ${subscriptions.length}`)
-    Logger.log(subscriptions)
+    logger.log(() => ["registerSubscriptions", {subscriptions}])
 
     for (const modelName in subscriptions) {
       if (subscriptions[modelName].creates) {
@@ -170,13 +176,12 @@ export default class ApiMakerCableSubscriptionPool {
   }
 
   connectUnsubscriptionForSubscription (subscription) {
-    Logger.log("Connecting to unsubscribe on subscription")
-    Logger.log({subscription})
+    logger.log(() => ["Connecting to unsubscribe on subscription", {subscription}])
 
     this.activeSubscriptions += 1
 
     subscription.events.addListener("unsubscribed", () => {
-      Logger.log("Call onUnsubscribe on self")
+      logger.log("Call onUnsubscribe on self")
 
       this.onUnsubscribe(subscription)
     })

package/src/cable-subscription.mjs

@@ -1,6 +1,8 @@
 import EventEmitter from "events"
 import Logger from "./logger.mjs"
 
+const logger = new Logger({name: "ApiMaker / CableSubscription"})
+
 export default class ApiMakerCableSubscription {
   constructor () {
     this.events = new EventEmitter()
@@ -9,13 +11,13 @@ export default class ApiMakerCableSubscription {
 
   unsubscribe () {
     if (!this.subscribed) {
-      Logger.log("Unsubscribed already called")
+      logger.log("Unsubscribed already called")
       return
     }
 
-    Logger.log("Unsubscribe called for subscription")
+    logger.log("Unsubscribe called for subscription")
 
-    this.events.emit("unsubscribed")
     this.subscribed = false
+    this.events.emit("unsubscribed")
   }
 }

package/src/cache-key-generator.mjs

@@ -45,17 +45,22 @@ export default class CacheKeyGenerator {
     const md5 = new SparkMD5()
 
     for (const model of this.allModels) {
-      md5.append("-model-")
+      md5.append("--model--")
       md5.append(model.modelClassData().name)
-      md5.append("-unique-key-")
+      md5.append("--unique-key--")
       md5.append(model.id() || model.uniqueKey())
+
+      if (model.markedForDestruction()) {
+        md5.append("--marked-for-destruction--")
+      }
+
       md5.append("-attributes-")
 
       const attributes = model.attributes()
 
       for (const attributeName in attributes) {
         md5.append(attributeName)
-        md5.append("-attribute-")
+        md5.append("--attribute--")
         md5.append(`${model.readAttributeUnderscore(attributeName)}`)
       }
     }

package/src/can-can.mjs

@@ -7,20 +7,18 @@ import Services from "./services.mjs"
 const shared = {}
 
 export default class ApiMakerCanCan {
+  abilities = []
+  abilitiesToLoad = []
+  abilitiesToLoadData = []
+  events = new EventEmitter()
+  lock = new ReadersWriterLock()
+
   static current () {
     if (!shared.currentApiMakerCanCan) shared.currentApiMakerCanCan = new ApiMakerCanCan()
 
     return shared.currentApiMakerCanCan
   }
 
-  constructor () {
-    this.abilities = []
-    this.abilitiesToLoad = []
-    this.abilitiesToLoadData = []
-    this.events = new EventEmitter()
-    this.lock = new ReadersWriterLock()
-  }
-
   can (ability, subject) {
     let abilityToUse = inflection.underscore(ability)
     const foundAbility = this.findAbility(abilityToUse, subject)

package/src/command-submit-data.mjs

@@ -7,13 +7,8 @@ export default class ApiMakerCommandSubmitData {
     this.jsonData = this.traverseObject(this.data, "json")
   }
 
-  getFilesCount () {
-    return this.filesCount
-  }
-
-  getJsonData () {
-    return this.jsonData
-  }
+  getFilesCount = () => this.filesCount
+  getJsonData = () => this.jsonData
 
   getRawData () {
     if (!this.rawData) {

package/src/error-logger.mjs

@@ -28,9 +28,7 @@ export default class ErrorLogger {
     this.connectUnhandledRejection()
   }
 
-  getErrors () {
-    return this.errors
-  }
+  getErrors = () => this.errors
 
   hasErrorOccurred() {
     return digg(this, "errorOccurred")

package/src/error-messages.mjs

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

package/src/event-destroyed.jsx

@@ -23,7 +23,5 @@ export default class ApiMakerEventDestroyed extends React.PureComponent {
     this.connectDestroyed = ModelEvents.connectDestroyed(this.props.model, this.props.onDestroyed)
   }
 
-  render () {
-    return null
-  }
+  render = () => null
 }

package/src/event-emitter-listener.jsx

@@ -26,7 +26,5 @@ export default class ApiMakerEventEmitterListener extends React.PureComponent {
     this.props.onCalled.apply(null, ...args)
   }
 
-  render () {
-    return null
-  }
+  render = () => null
 }

package/src/event-listener.jsx

@@ -32,7 +32,5 @@ export default class ApiMakerEventListener extends React.PureComponent {
     this.props.onCalled.apply(null, args)
   }
 
-  render () {
-    return null
-  }
+  render = () => null
 }

package/src/event-model-class.jsx

@@ -24,7 +24,5 @@ export default class ApiMakerEventModelClass extends React.PureComponent {
     this.connection = ModelEvents.connectModelClass(this.props.modelClass, this.props.event, this.props.onCall)
   }
 
-  render () {
-    return null
-  }
+  render = () => null
 }

package/src/event-updated.jsx

@@ -68,7 +68,5 @@ export default class ApiMakerEventUpdated extends React.PureComponent {
     }
   }
 
-  render () {
-    return null
-  }
+  render = () => null
 }

package/src/logger.mjs

@@ -1,29 +1,32 @@
 const shared = {}
 
 export default class ApiMakerLogger {
-  static current() {
-    if (!shared.apiMakerLogger) {
-      shared.apiMakerLogger = new ApiMakerLogger()
-      // shared.apiMakerLogger.setDebug(true)
-    }
+  static getGlobalDebug = () => shared.isDebugging
 
-    return shared.apiMakerLogger
+  static setGlobalDebug(newValue) {
+    shared.isDebugging = newValue
   }
 
-  static log(message) {
-    ApiMakerLogger.current().log(message)
+  constructor(args = {}) {
+    this.name = args.name
   }
 
-  log(message) {
-    if (this.debug)
-      console.log("ApiMaker", message)
+  debug(message) {
+    if (this.getDebug()) this.log(message)
   }
 
-  getDebug() {
-    return this.debug
+  log(message) {
+    if (!this.debug && !ApiMakerLogger.getGlobalDebug()) return
+    if (typeof message == "function") message = message()
+    if (!Array.isArray(message)) message = [message]
+    if (this.name) message.unshift(`${this.name}:`)
+
+    console.log(...message)
   }
 
+  getDebug = () => this.isDebugging
+
   setDebug(value) {
-    this.debug = value
+    this.isDebugging = value
   }
 }

package/src/session-status-updater.mjs

@@ -3,6 +3,8 @@ import * as inflection from "inflection"
 import Logger from "./logger.mjs"
 import wakeEvent from "wake-event"
 
+const logger = new Logger({name: "ApiMaker / SessionStatusUpdater"})
+
 export default class ApiMakerSessionStatusUpdater {
   static current () {
     if (!globalThis.apiMakerSessionStatusUpdater)
@@ -27,9 +29,7 @@ export default class ApiMakerSessionStatusUpdater {
     wakeEvent(() => this.updateSessionStatus())
   }
 
-  debug (message) {
-    Logger.log(`API maker / SessionStatusUpdater: ${message}`)
-  }
+  debug = (message) => logger.log(() => message)
 
   async sessionStatus () {
     return new Promise((resolve) => {

package/src/source-maps-loader.mjs

@@ -10,6 +10,8 @@ if (SourceMapConsumer.initialize) {
   })
 }
 
+const logger = new Logger({name: "ApiMaker / SourceMapsLoader"})
+
 export default class SourceMapsLoader {
   constructor () {
     this.isLoadingSourceMaps = false
@@ -17,10 +19,6 @@ export default class SourceMapsLoader {
     this.srcLoaded = {}
   }
 
-  debug(messageCallback) {
-    if (Logger.current().getDebug()) Logger.log(`API maker / SourceMapsLoader: ${messageCallback.call()}`)
-  }
-
   loadSourceMapsForScriptTags (callback) {
     this.loadSourceMapsForScriptTagsCallback = callback
   }
@@ -72,11 +70,11 @@ export default class SourceMapsLoader {
         const sourceMapUrl = this.getMapURL({src: file})
 
         if (sourceMapUrl) {
-          this.debug(() => `Found source map from error: ${sourceMapUrl}`)
+          logger.debug(() => `Found source map from error: ${sourceMapUrl}`)
 
           sources.push({originalUrl: file, sourceMapUrl})
         } else {
-          this.debug(() => `Coudn't get source map from: ${file}`)
+          logger.debug(() => `Coudn't get source map from: ${file}`)
         }
       }
     }
@@ -92,7 +90,7 @@ export default class SourceMapsLoader {
       const sourceMapUrl = this.getMapURL({script, src: script.src})
 
       if (sourceMapUrl) {
-        this.debug(() => `Found source map from script: ${sourceMapUrl}`)
+        logger.debug(() => `Found source map from script: ${sourceMapUrl}`)
         sources.push({originalUrl: script.src, sourceMapUrl})
       }
     }

package/src/table/table-settings.js

@@ -2,13 +2,28 @@ import columnIdentifier from "./column-identifier.mjs"
 import columnVisible from "./column-visible.mjs"
 import {digg} from "diggerize"
 import * as inflection from "inflection"
+import {ReadersWriterLock} from "epic-locks"
 import {serialize as objectToFormData} from "object-to-formdata"
 import {TableSetting} from "../models.mjs.erb"
 import {v4 as uuidv4} from "uuid"
 
+// Have a lock for each unique table identifier
+const tableSettingsLocks = {}
+
 export default class ApiMakerTableSettings {
   constructor({table}) {
     this.table = table
+    this.setTableSettingsLock()
+  }
+
+  setTableSettingsLock() {
+    const identifier = this.identifier()
+
+    if (!(identifier in tableSettingsLocks)) {
+      tableSettingsLocks[identifier] = new ReadersWriterLock()
+    }
+
+    this.tableSettingsLock = digg(tableSettingsLocks, identifier)
   }
 
   columns = () => digg(this, "table", "columnsAsArray")()
@@ -51,15 +66,17 @@ export default class ApiMakerTableSettings {
   }
 
   loadExistingOrCreateTableSettings = async () => {
-    let tableSetting = await this.loadTableSetting()
+    return await this.tableSettingsLock.write(async () => {
+      let tableSetting = await this.loadTableSetting()
 
-    if (tableSetting) {
-      tableSetting = await this.updateTableSetting(tableSetting)
-    } else {
-      tableSetting = await this.createInitialTableSetting()
-    }
+      if (tableSetting) {
+        tableSetting = await this.updateTableSetting(tableSetting)
+      } else {
+        tableSetting = await this.createInitialTableSetting()
+      }
 
-    return tableSetting
+      return tableSetting
+    })
   }
 
   loadTableSetting = async () => {