@kaspernj/api-maker 1.0.126 → 1.0.127

package/src/params.cjs

@@ -3,15 +3,15 @@ const {merge} = require("./merge.cjs")
 const qs = require("qs")
 
 module.exports = class Params {
-  static parse() {
+  static parse () {
     return qs.parse(global.location.search.substr(1))
   }
 
-  static change(given) {
+  static change (given) {
     return merge(Params.parse(), given)
   }
 
-  static changeParams(given, opts = {}) {
+  static changeParams (given, opts = {}) {
     const params = Params.change(given)
     const newParams = qs.stringify(params)
     const newPath = `${location.pathname}?${newParams}`
@@ -21,24 +21,24 @@ module.exports = class Params {
     appHistory.push(newPath)
   }
 
-  static serializeForm(form) {
+  static serializeForm (form) {
     const hash = formSerialize(form, {empty: true, hash: true})
     return Params.setUndefined(hash)
   }
 
   // This is used to set all empty values to 'undefined' which makes qs removed those elements from the query string
-  static setUndefined(given) {
+  static setUndefined (given) {
     if (Array.isArray(given)) {
       if (given.length == 0)
         return undefined
 
-      return given.map(givenI => Params.setUndefined(givenI))
+      return given.map((givenI) => Params.setUndefined(givenI))
     } else if (typeof given === "object") {
       if (Object.keys(given).length == 0)
         return undefined
 
       const newGiven = {}
-      for(const key in given) {
+      for (const key in given) {
         newGiven[key] = Params.setUndefined(given[key])
       }
 

package/src/preloaded.cjs

@@ -2,21 +2,21 @@ const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ApiMakerPreloaded {
-  constructor(response) {
+  constructor (response) {
     this.response = response
     this.loadPreloadedModels()
   }
 
-  loadPreloadedModels() {
+  loadPreloadedModels () {
     this.preloaded = {}
 
     for (const preloadedType in this.response.preloaded) {
       const modelClassName = inflection.classify(preloadedType)
-      const modelClass = digg(require("@kaspernj/api-maker/src/models"), modelClassName)
+      const ModelClass = digg(require("@kaspernj/api-maker/src/models"), modelClassName)
 
-      for(const preloadedId in this.response.preloaded[preloadedType]) {
+      for (const preloadedId in this.response.preloaded[preloadedType]) {
         const preloadedData = this.response.preloaded[preloadedType][preloadedId]
-        const model = new modelClass({data: preloadedData, isNewRecord: false})
+        const model = new ModelClass({data: preloadedData, isNewRecord: false})
 
         if (!this.preloaded[preloadedType]) {
           this.preloaded[preloadedType] = {}
@@ -33,7 +33,7 @@ module.exports = class ApiMakerPreloaded {
     }
   }
 
-  getModel(type, id) {
+  getModel (type, id) {
     if (!this.preloaded[type] || !this.preloaded[type][id]) {
       throw new Error(`Could not find a ${type} by that ID: ${id}`)
     }

package/src/resource-route.cjs

@@ -2,7 +2,7 @@ const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ApiMakerResourceRoute {
-  constructor({jsRoutes, locales, requireComponent, routeDefinition}) {
+  constructor ({jsRoutes, locales, requireComponent, routeDefinition}) {
     this.jsRoutes = jsRoutes
     this.locales = locales
     this.requireComponent = requireComponent
@@ -13,7 +13,7 @@ module.exports = class ApiMakerResourceRoute {
     }
   }
 
-  routesResult() {
+  routesResult () {
     if (digg(this, "locales")) {
       return this.withLocale()
     } else {
@@ -21,11 +21,11 @@ module.exports = class ApiMakerResourceRoute {
     }
   }
 
-  findRouteParams() {
+  findRouteParams () {
     const result = []
     const parts = digg(this, "routeDefinition", "path").split("/")
 
-    for(const part of parts) {
+    for (const part of parts) {
       if (part.match(/^:([a-z_]+)$/))
         result.push(part)
     }
@@ -33,18 +33,18 @@ module.exports = class ApiMakerResourceRoute {
     return result
   }
 
-  requireComponentFromCaller() {
+  requireComponentFromCaller () {
     return this.requireComponent({
       routeDefinition: digg(this, "routeDefinition")
     })
   }
 
-  withLocale() {
+  withLocale () {
     const component = this.requireComponentFromCaller()
     const Locales = require("shared/locales").default
     const routes = []
 
-    for(const locale of Locales.availableLocales()) {
+    for (const locale of Locales.availableLocales()) {
       const routePathName = `${inflection.camelize(digg(this, "routeDefinition", "name"), true)}Path`
       const params = this.findRouteParams()
 
@@ -62,7 +62,7 @@ module.exports = class ApiMakerResourceRoute {
     return routes
   }
 
-  withoutLocale() {
+  withoutLocale () {
     const routePathName = inflection.camelize(digg(this, "routeDefinition", "name"), true)
     const routePathMethod = this.jsRoutes[`${routePathName}Path`]
 
@@ -72,9 +72,11 @@ module.exports = class ApiMakerResourceRoute {
     const path = routePathMethod.apply(null, this.findRouteParams())
     const component = this.requireComponentFromCaller()
 
-    return [{
-      path,
-      component
-    }]
+    return [
+      {
+        path,
+        component
+      }
+    ]
   }
 }

package/src/resource-routes.jsx

@@ -4,18 +4,23 @@ const ResourceRoute = require("./resource-route.cjs")
 const {Route} = require("react-router-dom")
 
 export default class ApiMakerResourceRoutes {
-  static readRoutes({jsRoutes, locales, requireComponent, routeDefinitions}) {
+  static readRoutes ({jsRoutes, locales, requireComponent, routeDefinitions}) {
     if (!routeDefinitions)
       throw new Error("Please pass 'routeDefinitions' to this method")
 
     const routes = []
 
-    for(const routeDefinition of routeDefinitions.routes) {
+    for (const routeDefinition of routeDefinitions.routes) {
       const resourceRoute = new ResourceRoute({jsRoutes, locales, requireComponent, routeDefinition})
 
-      for(const newRoute of resourceRoute.routesResult()) {
+      for (const newRoute of resourceRoute.routesResult()) {
         routes.push(
-          <Route exact key={`route-${digg(newRoute, "path")}`} path={digg(newRoute, "path")} component={digg(newRoute, "component")} />
+          <Route
+            component={digg(newRoute, "component")}
+            exact
+            key={`route-${digg(newRoute, "path")}`}
+            path={digg(newRoute, "path")}
+          />
         )
       }
     }

package/src/result.cjs

@@ -1,29 +1,29 @@
 module.exports = class ApiMakerResult {
-  constructor(data) {
+  constructor (data) {
     this.data = data
   }
 
-  currentPage() {
+  currentPage () {
     return this.data.response.meta.currentPage
   }
 
-  models() {
+  models () {
     return this.data.models
   }
 
-  modelClass() {
+  modelClass () {
     return this.data.collection.modelClass()
   }
 
-  perPage() {
+  perPage () {
     return this.data.response.meta.perPage
   }
 
-  totalCount() {
+  totalCount () {
     return this.data.response.meta.totalCount
   }
 
-  totalPages() {
+  totalPages () {
     return this.data.response.meta.totalPages
   }
 }

package/src/routes-native.cjs

@@ -3,13 +3,13 @@ const inflection = require("inflection")
 const qs = require("qs")
 
 module.exports = class ApiMakerRoutesNative {
-  constructor({getLocale}) {
+  constructor ({getLocale}) {
     this.getLocale = getLocale
     this.routeDefinitions = []
     this.routeTranslationParts = {}
   }
 
-  loadRouteDefinitions(routeDefinitions, routeDefinitionArgs) {
+  loadRouteDefinitions (routeDefinitions, routeDefinitionArgs) {
     for (const routeDefinition of digg(routeDefinitions, "routes")) {
       const {name, path} = digs(routeDefinition, "name", "path")
       const rawPathParts = path.split("/")
@@ -62,7 +62,7 @@ module.exports = class ApiMakerRoutesNative {
     }
   }
 
-  loadRouteTranslations(i18n) {
+  loadRouteTranslations (i18n) {
     const locales = digg(i18n, "locales")
 
     for (const locale in locales) {
@@ -77,7 +77,7 @@ module.exports = class ApiMakerRoutesNative {
     }
   }
 
-  translateRoute({args, localizedRoutes, pathParts, url}) {
+  translateRoute ({args, localizedRoutes, pathParts, url}) {
     let options
 
     // Extract options from args if any
@@ -137,7 +137,7 @@ module.exports = class ApiMakerRoutesNative {
     throw new Error("Unhandled state")
   }
 
-  addHostToRoute({host, port, protocol, translatedRoute}) {
+  addHostToRoute ({host, port, protocol, translatedRoute}) {
     let fullUrl = ""
 
     const hostToUse = host || global.location && global.location.host
@@ -150,7 +150,7 @@ module.exports = class ApiMakerRoutesNative {
     } else if (global.location && global.location.protocol) {
       fullUrl += `${global.location.protocol}//`
     } else {
-      fullUrl += `https://`
+      fullUrl += "https://"
     }
 
     fullUrl += hostToUse

package/src/routes.cjs

@@ -2,7 +2,7 @@ const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ApiMakerRoutes {
-  constructor({jsRoutes, locale, routeDefinitions}) {
+  constructor ({jsRoutes, locale, routeDefinitions}) {
     this.jsRoutes = jsRoutes
     this.routeDefinitions = routeDefinitions
 

package/src/serializer.cjs

@@ -1,34 +1,34 @@
 const {digg} = require("diggerize")
 
 module.exports = class Serializer {
-  static serialize(arg) {
+  static serialize (arg) {
     const serialize = new Serializer(arg)
 
     return serialize.serialize()
   }
 
-  constructor(arg) {
+  constructor (arg) {
     this.arg = arg
   }
 
-  serialize() {
+  serialize () {
     return this.serializeArgument(this.arg)
   }
 
-  serializeArgument(arg) {
-    if (typeof arg == "function" && arg["modelClassData"] && arg["modelName"]) {
+  serializeArgument (arg) {
+    if (typeof arg == "function" && arg.modelClassData && arg.modelName) {
       return {
         api_maker_type: "resource",
         name: digg(arg.modelClassData(), "name")
       }
     } else if (arg instanceof Date) {
-      let offsetNumber = parseInt((arg.getTimezoneOffset() / 60) * 100)
+      let offsetNumber = parseInt((arg.getTimezoneOffset() / 60) * 100, 10)
 
       offsetNumber = -offsetNumber
 
       let offset = `${offsetNumber}`
 
-      while(offset.length < 4) {
+      while (offset.length < 4) {
         offset = `0${offset}`
       }
 
@@ -45,11 +45,11 @@ module.exports = class Serializer {
     }
   }
 
-  serializeArray(arg) {
+  serializeArray (arg) {
     return arg.map((value) => this.serializeArgument(value))
   }
 
-  serializeObject(arg) {
+  serializeObject (arg) {
     const newObject = {}
 
     for (const key in arg) {

package/src/services.cjs

@@ -1,7 +1,7 @@
 const CommandsPool = require("./commands-pool.cjs")
 
 module.exports = class ApiMakerServices {
-  static current() {
+  static current () {
     if (!global.currentApiMakerService) {
       global.currentApiMakerService = new ApiMakerServices()
     }
@@ -9,8 +9,8 @@ module.exports = class ApiMakerServices {
     return global.currentApiMakerService
   }
 
-  async sendRequest(serviceName, args) {
-    return await CommandsPool.addCommand({
+  sendRequest (serviceName, args) {
+    return CommandsPool.addCommand({
       args: {
         service_args: args,
         service_name: serviceName

package/src/session-status-updater.cjs

@@ -3,14 +3,14 @@ const inflection = require("inflection")
 const wakeEvent = require("wake-event")
 
 module.exports = class ApiMakerSessionStatusUpdater {
-  static current() {
+  static current () {
     if (!global.apiMakerSessionStatusUpdater)
       global.apiMakerSessionStatusUpdater = new ApiMakerSessionStatusUpdater()
 
     return global.apiMakerSessionStatusUpdater
   }
 
-  constructor(args = {}) {
+  constructor (args = {}) {
     this.debugging = args.debug || false
     this.events = {}
     this.timeout = args.timeout || 600000
@@ -19,20 +19,20 @@ module.exports = class ApiMakerSessionStatusUpdater {
     this.connectWakeEvent()
   }
 
-  connectOnlineEvent() {
+  connectOnlineEvent () {
     global.addEventListener("online", () => this.updateSessionStatus(), false)
   }
 
-  connectWakeEvent() {
+  connectWakeEvent () {
     wakeEvent(() => this.updateSessionStatus())
   }
 
-  debug(message) {
+  debug (message) {
     if (this.debugging)
       console.log(`ApiMakerSessionStatusUpdater: ${message}`)
   }
 
-  async sessionStatus() {
+  async sessionStatus () {
     return new Promise((resolve) => {
       const xhr = new XMLHttpRequest()
       xhr.open("POST", "/api_maker/session_statuses", true)
@@ -44,11 +44,11 @@ module.exports = class ApiMakerSessionStatusUpdater {
     })
   }
 
-  onSignedOut(callback) {
+  onSignedOut (callback) {
     this.addEvent("onSignedOut", callback)
   }
 
-  startTimeout() {
+  startTimeout () {
     this.debug("startTimeout")
 
     if (this.updateTimeout)
@@ -63,12 +63,12 @@ module.exports = class ApiMakerSessionStatusUpdater {
     )
   }
 
-  stopTimeout() {
+  stopTimeout () {
     if (this.updateTimeout)
       clearTimeout(this.updateTimeout)
   }
 
-  async updateSessionStatus() {
+  async updateSessionStatus () {
     this.debug("updateSessionStatus")
 
     const result = await this.sessionStatus()
@@ -78,7 +78,7 @@ module.exports = class ApiMakerSessionStatusUpdater {
     this.updateUserSessionsFromResult(result)
   }
 
-  updateMetaElementsFromResult(result) {
+  updateMetaElementsFromResult (result) {
     this.debug("updateMetaElementsFromResult")
     const csrfTokenElement = document.querySelector("meta[name='csrf-token']")
 
@@ -90,13 +90,13 @@ module.exports = class ApiMakerSessionStatusUpdater {
     }
   }
 
-  updateUserSessionsFromResult(result) {
-    for(const scopeName in result.scopes) {
+  updateUserSessionsFromResult (result) {
+    for (const scopeName in result.scopes) {
       this.updateUserSessionScopeFromResult(scopeName, result.scopes[scopeName])
     }
   }
 
-  updateUserSessionScopeFromResult(scopeName, scope) {
+  updateUserSessionScopeFromResult (scopeName, scope) {
     const deviseIsSignedInMethodName = `is${inflection.camelize(scopeName)}SignedIn`
 
     if (!(deviseIsSignedInMethodName in Devise)) {

package/src/source-maps-loader.cjs

@@ -9,24 +9,24 @@ if (SourceMapConsumer.initialize) {
 }
 
 module.exports = class SourceMapsLoader {
-  constructor() {
+  constructor () {
     this.sourceMaps = []
     this.srcLoaded = {}
   }
 
-  loadSourceMapsForScriptTags(callback) {
+  loadSourceMapsForScriptTags (callback) {
     this.loadSourceMapsForScriptTagsCallback = callback
   }
 
-  sourceMapForSource(callback) {
+  sourceMapForSource (callback) {
     this.sourceMapForSourceCallback = callback
   }
 
-  async loadSourceMaps() {
+  async loadSourceMaps () {
     const scripts = document.querySelectorAll("script")
     const promises = []
 
-    for(const script of scripts) {
+    for (const script of scripts) {
       const src = this.loadSourceMapsForScriptTagsCallback(script)
 
       if (src && !this.srcLoaded[src]) {
@@ -40,7 +40,7 @@ module.exports = class SourceMapsLoader {
     await Promise.all(promises)
   }
 
-  async loadSourceMapForSource(src) {
+  async loadSourceMapForSource (src) {
     const url = this.loadUrl(src)
     const originalUrl = `${url.origin}${url.pathname}`
 
@@ -65,30 +65,30 @@ module.exports = class SourceMapsLoader {
     this.sourceMaps.push({consumer, originalUrl, src})
   }
 
-  loadUrl(url) {
+  loadUrl (url) {
     const parser = document.createElement("a")
     parser.href = url
 
     return parser
   }
 
-  loadXhr(xhr, postData) {
+  loadXhr (xhr, postData) {
     return new Promise((resolve) => {
       xhr.onload = () => resolve()
       xhr.send(postData)
     })
   }
 
-  parseStackTrace(stackTrace) {
+  parseStackTrace (stackTrace) {
     return this.getStackTraceData(stackTrace)
       .map((traceData) => `at ${traceData.methodName} (${traceData.fileString})`)
   }
 
-  getStackTraceData(stackTrace) {
+  getStackTraceData (stackTrace) {
     const stack = stackTraceParser.parse(stackTrace)
     const newSourceMap = []
 
-    for(const trace of stack) {
+    for (const trace of stack) {
       const sourceMapData = this.sourceMaps.find((sourceMapData) => sourceMapData.originalUrl == trace.file)
       let filePath, fileString, original
 

package/src/translated-collections.cjs

@@ -1,7 +1,8 @@
+const {digg} = require("diggerize")
 const translatedCollectionsData = require("./translated-collections-data").default
 
 export default class ApiMakerTranslatedCollections {
-  static get(modelClass, collectionName) {
+  static get (modelClass, collectionName) {
     const locale = I18n.locale
     const modelClassName = digg(modelClass.modelClassData(), "name")
     const collection = digg(translatedCollectionsData, modelClassName, collectionName, locale, "collection_array")

package/src/updated-attribute.jsx

@@ -1,37 +1,37 @@
 const {digg} = require("diggerize")
 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 ApiMakerUpdatedAttribute extends React.PureComponent {
-  static propTypes = PropTypesExact({
+  static propTypes = propTypesExact({
     attribute: PropTypes.string,
     model: PropTypes.object.isRequired,
     onValue: PropTypes.func
   })
 
-  constructor(props) {
+  constructor (props) {
     super(props)
     this.state = {
       model: this.props.model
     }
   }
 
-  componentDidMount() {
+  componentDidMount () {
     this.setAttribute()
     this.connect()
   }
 
-  componentWillUnmount() {
+  componentWillUnmount () {
     // Apparently 'componentWillUnmount' can be called without 'componentDidMount' was called. Several bug reports on this.
     if (this.connectUpdated) {
       this.connectUpdated.unsubscribe()
     }
   }
 
-  connect() {
-    this.connectUpdated = ModelEvents.connectUpdated(this.props.model, args => {
+  connect () {
+    this.connectUpdated = ModelEvents.connectUpdated(this.props.model, (args) => {
       if (!this.props.attribute || args.model.isAttributeLoaded(this.props.attribute)) {
         this.setState(
           {model: args.model},
@@ -44,7 +44,7 @@ export default class ApiMakerUpdatedAttribute extends React.PureComponent {
   }
 
   // This loads the model from the backend with the primary key and the attribute and calls setAttribute
-  async loadModelWithAttribute() {
+  async loadModelWithAttribute () {
     const id = this.props.model.primaryKey()
     const modelClass = this.props.model.modelClass()
     const modelName = digg(modelClass.modelClassData(), "name")
@@ -56,7 +56,10 @@ export default class ApiMakerUpdatedAttribute extends React.PureComponent {
     const select = {}
     select[modelName] = [primaryKey, this.props.attribute]
 
-    const model = await modelClass.ransack(args).select(select).first()
+    const model = await modelClass
+      .ransack(args)
+      .select(select)
+      .first()
 
     this.setState(
       {model},
@@ -64,14 +67,15 @@ export default class ApiMakerUpdatedAttribute extends React.PureComponent {
     )
   }
 
-  setAttribute() {
+  setAttribute () {
     let newValue
 
     if (this.props.onValue) {
       newValue = this.props.onValue.apply(null, [{model: this.state.model}])
     } else {
-      if (!this.state.model[this.props.attribute])
+      if (!this.state.model[this.props.attribute]) {
         throw new Error(`No such method: ${digg(this.state.model.modelClassData(), "name")}#${this.props.attribute}()`)
+      }
 
       newValue = this.state.model[this.props.attribute].apply(this.state.model)
     }
@@ -81,9 +85,8 @@ export default class ApiMakerUpdatedAttribute extends React.PureComponent {
     })
   }
 
-  render() {
-    if (this.state.value === undefined)
-      return null
+  render () {
+    if (this.state.value === undefined) return null
 
     return this.state.value
   }

package/src/validation-error.cjs

@@ -1,25 +1,22 @@
 const CustomError = require("./custom-error.cjs")
-const {digg} = require("diggerize")
 const inflection = require("inflection")
 
 module.exports = class ValidationError extends CustomError {
-  constructor(validationErrors, args) {
+  constructor (validationErrors, args) {
     super(validationErrors.getUnhandledErrorMessage() || validationErrors.getErrorMessage(), args)
     this.validationErrors = validationErrors
   }
 
-  hasUnhandledErrors() {
-    const unhandledError = this.validationErrors.getValidationErrors().find(validationError => !validationError.getHandled())
+  hasUnhandledErrors () {
+    const unhandledError = this.validationErrors.getValidationErrors().find((validationError) => !validationError.getHandled())
     return Boolean(unhandledError)
   }
 
-  hasValidationErrorForAttribute(attributeName) {
+  hasValidationErrorForAttribute (attributeName) {
     const underscoredAttributeName = inflection.underscore(attributeName)
     const foundAttribute = this.validationErrors.getValidationErrors().find((validationError) => validationError.getAttributeName() == underscoredAttributeName)
 
-    if (foundAttribute) {
-      return true
-    }
+    if (foundAttribute) return true
 
     return false
   }