@kaspernj/api-maker 1.0.126 → 1.0.129

package/src/commands-pool.cjs

@@ -9,7 +9,7 @@ const ValidationError = require("./validation-error.cjs")
 const {ValidationErrors} = require("./validation-errors.cjs")
 
 module.exports = class ApiMakerCommandsPool {
-  static addCommand(data, args = {}) {
+  static addCommand (data, args = {}) {
     let pool
 
     if (args.instant) {
@@ -29,7 +29,7 @@ module.exports = class ApiMakerCommandsPool {
     return promiseResult
   }
 
-  static current() {
+  static current () {
     if (!global.currentApiMakerCommandsPool) {
       global.currentApiMakerCommandsPool = new ApiMakerCommandsPool()
     }
@@ -37,11 +37,11 @@ module.exports = class ApiMakerCommandsPool {
     return global.currentApiMakerCommandsPool
   }
 
-  static flush() {
+  static flush () {
     ApiMakerCommandsPool.current().flush()
   }
 
-  constructor() {
+  constructor () {
     this.flushCount = 0
     this.pool = {}
     this.poolData = {}
@@ -49,7 +49,7 @@ module.exports = class ApiMakerCommandsPool {
     this.globalRequestData = null
   }
 
-  addCommand(data) {
+  addCommand (data) {
     return new Promise((resolve, reject) => {
       const id = this.currentId
       this.currentId += 1
@@ -85,11 +85,11 @@ module.exports = class ApiMakerCommandsPool {
     })
   }
 
-  commandsCount() {
+  commandsCount () {
     return Object.keys(this.pool)
   }
 
-  async flush() {
+  async flush () {
     if (this.commandsCount() == 0) {
       return
     }
@@ -120,10 +120,10 @@ module.exports = class ApiMakerCommandsPool {
         response = await Api.requestLocal({path: url, method: "POST", data: commandSubmitData.getJsonData()})
       }
 
-      for(const commandId in response.responses) {
+      for (const commandId in response.responses) {
         const commandResponse = response.responses[commandId]
         const commandResponseData = Deserializer.parse(commandResponse.data)
-        const commandData = currentPool[parseInt(commandId)]
+        const commandData = currentPool[parseInt(commandId, 10)]
         const responseType = commandResponse.type
 
         if (commandResponseData) {
@@ -149,7 +149,7 @@ module.exports = class ApiMakerCommandsPool {
     }
   }
 
-  handleFailedResponse(commandData, commandResponseData) {
+  handleFailedResponse (commandData, commandResponseData) {
     let error
 
     if (commandResponseData.error_type == "validation_error") {
@@ -165,13 +165,13 @@ module.exports = class ApiMakerCommandsPool {
     commandData.reject(error)
   }
 
-  clearTimeout() {
+  clearTimeout () {
     if (this.flushTimeout) {
       clearTimeout(this.flushTimeout)
     }
   }
 
-  isActive() {
+  isActive () {
     if (this.commandsCount() > 0) {
       return true
     }
@@ -183,7 +183,7 @@ module.exports = class ApiMakerCommandsPool {
     return false
   }
 
-  setFlushTimeout() {
+  setFlushTimeout () {
     this.clearTimeout()
     this.flushTimeout = setTimeout(() => this.flush(), 0)
   }

package/src/custom-error.cjs

@@ -1,22 +1,26 @@
 const {dig, digg} = require("diggerize")
 
-function errorMessages(args) {
-  return digg(args, "response", "errors").map((error) => {
-    if (typeof error == "string") {
-      return error
-    }
+const errorMessages = (args) => {
+  if (typeof args.response == "object") {
+    return digg(args, "response", "errors").map((error) => {
+      if (typeof error == "string") {
+        return error
+      }
 
-    return digg(error, "message")
-  })
+      return digg(error, "message")
+    })
+  }
 }
 
 module.exports = class CustomError extends Error {
-  constructor(message, args = {}) {
-    if (dig(args, "response", "errors")) {
-      message = `${message}: ${errorMessages(args).join(". ")}`
+  constructor (message, args = {}) {
+    let messageToUse = message
+
+    if (typeof args.response == "object" && dig(args, "response", "errors")) {
+      messageToUse = `${messageToUse}: ${errorMessages(args).join(". ")}`
     }
 
-    super(message)
+    super(messageToUse)
     this.args = args
 
     // Maintains proper stack trace for where our error was thrown (only available on V8)
@@ -24,11 +28,13 @@ module.exports = class CustomError extends Error {
       Error.captureStackTrace(this, CustomError)
   }
 
-  errorMessages() {
+  errorMessages () {
     return errorMessages(this.args)
   }
 
-  errorTypes() {
-    return digg(this, "args", "response", "errors").map((error) => digg(error, "type"))
+  errorTypes () {
+    if (typeof this.args.response == "object") {
+      return digg(this, "args", "response", "errors").map((error) => digg(error, "type"))
+    }
   }
 }

package/src/deserializer.cjs

@@ -3,9 +3,9 @@ const inflection = require("inflection")
 const Money = require("js-money")
 
 module.exports = class ApiMakerDeserializer {
-  static parse(object) {
+  static parse (object) {
     if (Array.isArray(object)) {
-      return object.map(value => ApiMakerDeserializer.parse(value))
+      return object.map((value) => ApiMakerDeserializer.parse(value))
     } else if (object && typeof object == "object") {
       if (object.api_maker_type == "date" || object.api_maker_type == "time") {
         const date = new Date(digg(object, "value"))
@@ -18,20 +18,20 @@ 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 = digg(require("@kaspernj/api-maker/src/models"), modelClassName)
         const data = ApiMakerDeserializer.parse(digg(object, "serialized"))
-        const model = new modelClass({data, isNewRecord: false})
+        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 = digg(require("@kaspernj/api-maker/src/models"), modelClassName)
 
-        return modelClass
+        return ModelClass
       } else {
         const newObject = {}
 
-        for(const key in object) {
+        for (const key in object) {
           const value = object[key]
           newObject[key] = ApiMakerDeserializer.parse(value)
         }

package/src/devise.cjs

@@ -6,18 +6,18 @@ const inflection = require("inflection")
 const Services = require("./services.cjs")
 
 module.exports = class ApiMakerDevise {
-  static callSignOutEvent(args) {
+  static callSignOutEvent (args) {
     ApiMakerDevise.events().emit("onDeviseSignOut", {args})
   }
 
-  static current() {
+  static current () {
     if (!global.currentApiMakerDevise)
     global.currentApiMakerDevise = new ApiMakerDevise()
 
     return global.currentApiMakerDevise
   }
 
-  static events() {
+  static events () {
     if (!global.apiMakerDeviseEvents) {
       global.apiMakerDeviseEvents = new EventEmitter()
       global.apiMakerDeviseEvents.setMaxListeners(1000)
@@ -26,16 +26,16 @@ module.exports = class ApiMakerDevise {
     return global.apiMakerDeviseEvents
   }
 
-  static addUserScope(scope) {
+  static addUserScope (scope) {
     const currentMethodName = `current${inflection.camelize(scope)}`
 
-    ApiMakerDevise[currentMethodName] = function() {
+    ApiMakerDevise[currentMethodName] = function () {
       return ApiMakerDevise.current().getCurrentScope(scope)
     }
 
     const isSignedInMethodName = `is${inflection.camelize(scope)}SignedIn`
 
-    ApiMakerDevise[isSignedInMethodName] = function() {
+    ApiMakerDevise[isSignedInMethodName] = function () {
       if (ApiMakerDevise.current().getCurrentScope(scope)) {
         return true
       }
@@ -44,7 +44,7 @@ module.exports = class ApiMakerDevise {
     }
   }
 
-  static async signIn(username, password, args = {}) {
+  static async signIn (username, password, args = {}) {
     if (!args.scope)
       args.scope = "user"
 
@@ -61,18 +61,18 @@ module.exports = class ApiMakerDevise {
     return {model: modelInstance, response}
   }
 
-  static updateSession(model) {
+  static updateSession (model) {
     const scope = digg(model.modelClassData(), "name")
     const camelizedScopeName = inflection.camelize(scope, true)
 
     ApiMakerDevise.current().currents[camelizedScopeName] = model
   }
 
-  static setSignedOut(args) {
+  static setSignedOut (args) {
     ApiMakerDevise.current().currents[inflection.camelize(args.scope, true)] = null
   }
 
-  static async signOut(args = {}) {
+  static async signOut (args = {}) {
     if (!args.scope)
       args.scope = "user"
 
@@ -91,26 +91,26 @@ module.exports = class ApiMakerDevise {
     return response
   }
 
-  constructor() {
+  constructor () {
     this.currents = {}
   }
 
-  getCurrentScope(scope) {
+  getCurrentScope (scope) {
     if (!(scope in this.currents))
       this.currents[scope] = this.loadCurrentScope(scope)
 
     return this.currents[scope]
   }
 
-  loadCurrentScope(scope) {
+  loadCurrentScope (scope) {
     const scopeData = global.apiMakerDeviseCurrent[scope]
 
     if (!scopeData)
       return null
 
     const parsedScopeData = Deserializer.parse(scopeData)
-    const modelClass = digg(require("@kaspernj/api-maker/src/models"), inflection.camelize(scope))
-    const modelInstance = new modelClass({data: parsedScopeData})
+    const ModelClass = digg(require("@kaspernj/api-maker/src/models"), inflection.camelize(scope))
+    const modelInstance = new ModelClass({data: parsedScopeData})
 
     return modelInstance
   }

package/src/error-logger.cjs

@@ -1,7 +1,7 @@
 const SourceMapsLoader = require("./source-maps-loader.cjs")
 
 module.exports = class ErrorLogger {
-  constructor() {
+  constructor () {
     this.errors = []
     this.sourceMapsLoader = new SourceMapsLoader()
     this.sourceMapsLoader.loadSourceMapsForScriptTags((script) => {
@@ -14,16 +14,16 @@ module.exports = class ErrorLogger {
     })
   }
 
-  enable() {
+  enable () {
     this.connectOnError()
     this.connectUnhandledRejection()
   }
 
-  getErrors() {
+  getErrors () {
     return this.errors
   }
 
-  connectOnError() {
+  connectOnError () {
     global.addEventListener("error", (event) => {
       if (!this.isHandlingError) {
         this.isHandlingError = true
@@ -34,7 +34,7 @@ module.exports = class ErrorLogger {
     })
   }
 
-  connectUnhandledRejection() {
+  connectUnhandledRejection () {
     global.addEventListener("unhandledrejection", (event) => {
       if (!this.isHandlingError) {
         this.isHandlingError = true
@@ -45,7 +45,7 @@ module.exports = class ErrorLogger {
     })
   }
 
-  async onError(event) {
+  async onError (event) {
     await this.sourceMapsLoader.loadSourceMaps()
 
     if (event.error && event.error.stack) {
@@ -65,7 +65,7 @@ module.exports = class ErrorLogger {
     }
   }
 
-  async onUnhandledRejection(event) {
+  async onUnhandledRejection (event) {
     await this.sourceMapsLoader.loadSourceMaps()
 
     if (event.reason.stack) {
@@ -85,8 +85,8 @@ module.exports = class ErrorLogger {
     }
   }
 
-  testPromiseError() {
-    return new Promise(resolve => {
+  testPromiseError () {
+    return new Promise((_resolve) => {
       throw new Error("testPromiseError")
     })
   }

package/src/event-connection.jsx

@@ -1,6 +1,6 @@
 const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
-const PropTypesExact = require("prop-types-exact")
+const propTypesExact = require("prop-types-exact")
 const React = require("react")
 
 export default class ApiMakerEventConnection extends React.PureComponent {
@@ -8,28 +8,28 @@ export default class ApiMakerEventConnection extends React.PureComponent {
     active: true
   }
 
-  static propTypes = PropTypesExact({
+  static propTypes = propTypesExact({
     active: PropTypes.bool.isRequired,
     model: PropTypes.object.isRequired,
     event: PropTypes.string.isRequired,
     onCall: PropTypes.func.isRequired
   })
 
-  componentDidMount() {
+  componentDidMount () {
     this.subscription = ModelEvents.connect(this.props.model, this.props.event, (...args) => this.onCall(...args))
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     if (this.subscription) {
       this.subscription.unsubscribe()
     }
   }
 
-  render() {
+  render () {
     return null
   }
 
-  onCall(...args) {
+  onCall (...args) {
     if (this.props.active) {
       this.props.onCall(...args)
     }

package/src/event-created.jsx

@@ -1,7 +1,7 @@
 const debounce = require("debounce")
 const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
-const PropTypesExact = require("prop-types-exact")
+const propTypesExact = require("prop-types-exact")
 const React = require("react")
 
 export default class ApiMakerEventCreated extends React.PureComponent {
@@ -9,7 +9,7 @@ export default class ApiMakerEventCreated extends React.PureComponent {
     active: true
   }
 
-  static propTypes = PropTypesExact({
+  static propTypes = propTypesExact({
     active: PropTypes.bool.isRequired,
     debounce: PropTypes.oneOfType([
       PropTypes.bool,
@@ -19,21 +19,21 @@ export default class ApiMakerEventCreated extends React.PureComponent {
     onCreated: PropTypes.func.isRequired
   })
 
-  componentDidMount() {
+  componentDidMount () {
     this.connect()
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     if (this.connectCreated) {
       this.connectCreated.unsubscribe()
     }
   }
 
-  connect() {
+  connect () {
     this.connectCreated = ModelEvents.connectCreated(this.props.modelClass, (...args) => this.onCreated(...args))
   }
 
-  debounce() {
+  debounce () {
     if (!this.debounceInstance) {
       if (typeof this.props.debounce == "number") {
         this.debounceInstance = debounce(this.props.onCreated, this.props.debounce)
@@ -45,7 +45,7 @@ export default class ApiMakerEventCreated extends React.PureComponent {
     return this.debounceInstance
   }
 
-  onCreated(...args) {
+  onCreated (...args) {
     if (!this.props.active) {
       return
     }
@@ -57,7 +57,7 @@ export default class ApiMakerEventCreated extends React.PureComponent {
     }
   }
 
-  render() {
+  render () {
     return null
   }
 }

package/src/event-destroyed.jsx

@@ -1,29 +1,29 @@
 const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
-const PropTypesExact = require("prop-types-exact")
+const propTypesExact = require("prop-types-exact")
 const React = require("react")
 
 export default class ApiMakerEventDestroyed extends React.PureComponent {
-  static propTypes = PropTypesExact({
+  static propTypes = propTypesExact({
     model: PropTypes.object.isRequired,
     onDestroyed: PropTypes.func.isRequired
   })
 
-  componentDidMount() {
+  componentDidMount () {
     this.connect()
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     if (this.connectDestroyed) {
       this.connectDestroyed.unsubscribe()
     }
   }
 
-  connect() {
+  connect () {
     this.connectDestroyed = ModelEvents.connectDestroyed(this.props.model, this.props.onDestroyed)
   }
 
-  render() {
+  render () {
     return null
   }
 }

package/src/event-emitter-listener.jsx

@@ -4,29 +4,29 @@ const React = require("react")
 
 export default class ApiMakerEventEmitterListener extends React.PureComponent {
   static propTypes = {
-    events: PropTypes.instanceOf(EventEmitter).isRequired,
     event: PropTypes.string.isRequired,
+    events: PropTypes.instanceOf(EventEmitter).isRequired,
     onCalled: PropTypes.func.isRequired
   }
 
-  constructor(props) {
+  constructor (props) {
     super(props)
     this.onCalled = this.onCalled.bind(this)
   }
 
-  componentDidMount() {
+  componentDidMount () {
     this.props.events.addListener(this.props.event, this.onCalled)
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     this.props.events.removeListener(this.props.event, this.onCalled)
   }
 
-  onCalled(...args) {
+  onCalled (...args) {
     this.props.onCalled.apply(null, ...args)
   }
 
-  render() {
+  render () {
     return null
   }
 }

package/src/event-listener.jsx

@@ -1,38 +1,38 @@
 const PropTypes = require("prop-types")
-const PropTypesExact = require("prop-types-exact")
+const propTypesExact = require("prop-types-exact")
 const React = require("react")
 
 export default class ApiMakerEventListener extends React.PureComponent {
-  static callEvent(target, eventName, args = []) {
+  static callEvent (target, eventName, args = []) {
     let event = document.createEvent("Event")
     event.initEvent(eventName, false, true)
     target.dispatchEvent(event, args)
   }
 
-  static propTypes = PropTypesExact({
+  static propTypes = propTypesExact({
     event: PropTypes.string.isRequired,
     onCalled: PropTypes.func.isRequired,
     target: PropTypes.object.isRequired
   })
 
-  constructor(props) {
+  constructor (props) {
     super(props)
     this.onCalled = this.onCalled.bind(this)
   }
 
-  componentDidMount() {
+  componentDidMount () {
     this.props.target.addEventListener(this.props.event, this.onCalled)
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     this.props.target.removeEventListener(this.props.event, this.onCalled)
   }
 
-  onCalled(...args) {
+  onCalled (...args) {
     this.props.onCalled.apply(null, args)
   }
 
-  render() {
+  render () {
     return null
   }
 }

package/src/event-model-class.jsx

@@ -1,30 +1,30 @@
 const ModelEvents = require("./model-events.cjs")
 const PropTypes = require("prop-types")
-const PropTypesExact = require("prop-types-exact")
+const propTypesExact = require("prop-types-exact")
 const React = require("react")
 
 export default class ApiMakerEventModelClass extends React.PureComponent {
-  static propTypes = PropTypesExact({
+  static propTypes = propTypesExact({
     event: PropTypes.string.isRequired,
     modelClass: PropTypes.func.isRequired,
     onCall: PropTypes.func.isRequired
   })
 
-  componentDidMount() {
+  componentDidMount () {
     this.connect()
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     if (this.connection) {
       this.connection.unsubscribe()
     }
   }
 
-  connect() {
+  connect () {
     this.connection = ModelEvents.connectModelClass(this.props.modelClass, this.props.event, this.props.onCall)
   }
 
-  render() {
+  render () {
     return null
   }
 }