@kaspernj/api-maker 1.0.188 → 1.0.191

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.188",
+  "version": "1.0.191",
   "description": "",
   "main": "index.js",
   "repository": {
@@ -50,6 +50,7 @@
     "qs": ">= 6.9.3",
     "replaceall": ">= 0.1.6",
     "strftime": ">= 0.10.0",
+    "uniqunize": "^1.0.1",
     "wake-event": ">= 0.0.1"
   },
   "peerDependencies": {
@@ -71,6 +72,6 @@
     "eslint-plugin-react": "^7.23.2",
     "i18n-on-steroids": "^1.0.2",
     "jest": "^28.0.3",
-    "jsdom": "^19.0.0"
+    "jsdom": "^20.0.0"
   }
 }

package/src/base-model.cjs

@@ -14,6 +14,17 @@ const {ValidationErrors} = require("./validation-errors.cjs")
 
 const shared = {}
 
+const newCustomEvent = (validationErrors) => {
+  return new CustomEvent("validation-errors", {detail: validationErrors})
+}
+
+const sendValidationErrorsEvent = (validationErrors, options) => {
+  if (options && options.form) {
+    const event = newCustomEvent(validationErrors)
+    options.form.dispatchEvent(event)
+  }
+}
+
 class BaseModel {
   static modelClassData () {
     throw new Error("modelClassData should be overriden by child")
@@ -177,7 +188,7 @@ class BaseModel {
         {}
       )
     } catch (error) {
-      this.parseValidationErrors(error, options)
+      BaseModel.parseValidationErrors({error, model: this, options})
       throw error
     }
 
@@ -190,7 +201,7 @@ class BaseModel {
   }
 
   async createRaw (rawData, options = {}) {
-    const objectData = this._objectDataFromGivenRawData(rawData, options)
+    const objectData = BaseModel._objectDataFromGivenRawData(rawData, options)
 
     let response
 
@@ -208,7 +219,7 @@ class BaseModel {
         {}
       )
     } catch (error) {
-      this.parseValidationErrors(error, options)
+      BaseModel.parseValidationErrors({error, model: this, options})
       throw error
     }
 
@@ -284,7 +295,7 @@ class BaseModel {
   }
 
   handleResponseError (response) {
-    this.parseValidationErrors(response)
+    BaseModel.parseValidationErrors({model: this, response})
     throw new new CustomError("Response wasn't successful", {model: this, response})
   }
 
@@ -299,33 +310,22 @@ class BaseModel {
     return false
   }
 
-  parseValidationErrors (error, options) {
+  static parseValidationErrors ({error, model, options}) {
     if (!(error instanceof CustomError)) return
     if (!error.args.response.validation_errors) return
 
     const validationErrors = new ValidationErrors({
-      model: this,
+      model,
       validationErrors: digg(error, "args", "response", "validation_errors")
     })
 
-    this.sendValidationErrorsEvent(validationErrors, options)
+    sendValidationErrorsEvent(validationErrors, options)
 
     if (!options || options.throwValidationError != false) {
       throw new ValidationError(validationErrors, digg(error, "args"))
     }
   }
 
-  sendValidationErrorsEvent (validationErrors, options) {
-    if (options && options.form) {
-      const event = this.newCustomEvent(validationErrors)
-      options.form.dispatchEvent(event)
-    }
-  }
-
-  newCustomEvent (validationErrors) {
-    return new CustomEvent("validation-errors", {detail: validationErrors})
-  }
-
   static humanAttributeName (attributeName) {
     const keyName = digg(this.modelClassData(), "i18nKey")
 
@@ -517,7 +517,7 @@ class BaseModel {
         {}
       )
     } catch (error) {
-      this.parseValidationErrors(error, options)
+      BaseModel.parseValidationErrors({error, model: this, options})
       throw error
     }
 
@@ -549,7 +549,7 @@ class BaseModel {
     this.setNewModelData(newModel)
   }
 
-  _objectDataFromGivenRawData (rawData, options) {
+  static _objectDataFromGivenRawData (rawData, options) {
     if (rawData instanceof FormData || rawData.nodeName == "FORM") {
       const formData = FormDataObjectizer.formDataFromObject(rawData, options)
 
@@ -560,8 +560,7 @@ class BaseModel {
   }
 
   async updateRaw (rawData, options = {}) {
-    const objectData = this._objectDataFromGivenRawData(rawData, options)
-
+    const objectData = BaseModel._objectDataFromGivenRawData(rawData, options)
     let response
 
     try {
@@ -579,7 +578,7 @@ class BaseModel {
         {}
       )
     } catch (error) {
-      this.parseValidationErrors(error, options)
+      BaseModel.parseValidationErrors({error, model: this, options})
       throw error
     }
 
@@ -636,8 +635,18 @@ class BaseModel {
     return this.uniqueKeyValue
   }
 
-  static _callCollectionCommand (args, commandArgs) {
-    return CommandsPool.addCommand(args, commandArgs)
+  static async _callCollectionCommand (args, commandArgs) {
+    const formOrDataObject = args.args
+
+    try {
+      return await CommandsPool.addCommand(args, commandArgs)
+    } catch (error) {
+      if (formOrDataObject.nodeName == "FORM") {
+        BaseModel.parseValidationErrors({error, options: {form: formOrDataObject}})
+      }
+
+      throw error
+    }
   }
 
   _callMemberCommand (args, commandArgs) {

package/src/commands-pool.cjs

@@ -61,18 +61,17 @@ module.exports = class ApiMakerCommandsPool {
 
       this.pool[id] = {resolve, reject}
 
-      if (!this.poolData[commandType])
-        this.poolData[commandType] = {}
-
-      if (!this.poolData[commandType][collectionName])
-        this.poolData[commandType][collectionName] = {}
-
-      if (!this.poolData[commandType][collectionName][commandName])
-        this.poolData[commandType][collectionName][commandName] = {}
+      if (!this.poolData[commandType]) this.poolData[commandType] = {}
+      if (!this.poolData[commandType][collectionName]) this.poolData[commandType][collectionName] = {}
+      if (!this.poolData[commandType][collectionName][commandName]) this.poolData[commandType][collectionName][commandName] = {}
 
       let args
 
-      if (data.args instanceof FormData) {
+      if (data.args?.nodeName == "FORM") {
+        const formData = new FormData(data.args)
+
+        args = FormDataObjectizer.toObject(formData)
+      } else if (data.args instanceof FormData) {
         args = FormDataObjectizer.toObject(data.args)
       } else {
         args = Serializer.serialize(data.args)

package/src/error-logger.cjs

@@ -1,8 +1,12 @@
+const {digg} = require("diggerize")
 const SourceMapsLoader = require("./source-maps-loader.cjs")
 
 module.exports = class ErrorLogger {
   constructor () {
+    this.debug = true
+    this.errorOccurred = false
     this.errors = []
+    this.isHandlingError = false
     this.sourceMapsLoader = new SourceMapsLoader()
     this.sourceMapsLoader.loadSourceMapsForScriptTags((script) => {
       const src = script.getAttribute("src")
@@ -23,8 +27,22 @@ module.exports = class ErrorLogger {
     return this.errors
   }
 
+  hasErrorOccurred() {
+    return digg(this, "errorOccurred")
+  }
+
+  isLoadingSourceMaps() {
+    return digg(this, "sourceMapsLoader", "isLoadingSourceMaps")
+  }
+
+  isWorkingOnError() {
+    return digg(this, "isHandlingError") || this.isLoadingSourceMaps()
+  }
+
   connectOnError () {
     global.addEventListener("error", (event) => {
+      this.errorOccurred = true
+
       if (!this.isHandlingError) {
         this.isHandlingError = true
         this.onError(event).finally(() => {
@@ -36,6 +54,8 @@ module.exports = class ErrorLogger {
 
   connectUnhandledRejection () {
     global.addEventListener("unhandledrejection", (event) => {
+      this.errorOccurred = true
+
       if (!this.isHandlingError) {
         this.isHandlingError = true
         this.onUnhandledRejection(event).finally(() => {
@@ -46,7 +66,8 @@ module.exports = class ErrorLogger {
   }
 
   async onError (event) {
-    await this.sourceMapsLoader.loadSourceMaps()
+    this.errorOccurred = true
+    await this.sourceMapsLoader.loadSourceMaps(event.error)
 
     if (event.error && event.error.stack) {
       const backtrace = this.sourceMapsLoader.parseStackTrace(event.error.stack)
@@ -66,7 +87,7 @@ module.exports = class ErrorLogger {
   }
 
   async onUnhandledRejection (event) {
-    await this.sourceMapsLoader.loadSourceMaps()
+    await this.sourceMapsLoader.loadSourceMaps(event.reason)
 
     if (event.reason.stack) {
       const backtrace = this.sourceMapsLoader.parseStackTrace(event.reason.stack)
@@ -74,7 +95,7 @@ module.exports = class ErrorLogger {
       this.errors.push({
         errorClass: "UnhandledRejection",
         message: event.reason.message || "Unhandled promise rejection",
-        backtrace: backtrace
+        backtrace
       })
     } else {
       this.errors.push({

package/src/link.jsx

@@ -14,7 +14,7 @@ export default class Link extends React.PureComponent {
 
     if (onClick) onClick(e, ...restArgs)
 
-    if (!e.defaultPrevented) {
+    if (!e.defaultPrevented && !e.ctrlKey && !e.metaKey) {
       e.preventDefault()
 
       const history = global.apiMakerConfigGlobal?.history

package/src/source-maps-loader.cjs

@@ -1,5 +1,6 @@
 const stackTraceParser = require("stacktrace-parser")
 const {SourceMapConsumer} = require("source-map")
+const uniqunize = require("uniqunize")
 
 // Sometimes this needs to be called and sometimes not
 if (SourceMapConsumer.initialize) {
@@ -10,6 +11,8 @@ if (SourceMapConsumer.initialize) {
 
 module.exports = class SourceMapsLoader {
   constructor () {
+    this.debug = false
+    this.isLoadingSourceMaps = false
     this.sourceMaps = []
     this.srcLoaded = {}
   }
@@ -22,47 +25,93 @@ module.exports = class SourceMapsLoader {
     this.sourceMapForSourceCallback = callback
   }
 
-  async loadSourceMaps () {
-    const scripts = document.querySelectorAll("script")
-    const promises = []
+  getSources(error) {
+    let sources = this.getSourcesFromScripts()
 
-    for (const script of scripts) {
-      const src = this.loadSourceMapsForScriptTagsCallback(script)
+    if (error) sources = sources.concat(this.getSourcesFromError(error))
+
+    return uniqunize(sources, (source) => source.originalUrl)
+  }
 
-      if (src && !this.srcLoaded[src]) {
-        this.srcLoaded[src] = true
+  async loadSourceMaps (error) {
+    this.isLoadingSourceMaps = true
 
-        const promise = this.loadSourceMapForSource(src)
-        promises.push(promise)
+    try {
+      const promises = []
+      const sources = this.getSources(error)
+
+      for(const source of sources) {
+        if (source.originalUrl && !this.srcLoaded[source.originalUrl]) {
+          this.srcLoaded[source.originalUrl] = true
+
+          const promise = this.loadSourceMapForSource(source)
+          promises.push(promise)
+        }
       }
+
+      await Promise.all(promises)
+    } finally {
+      this.isLoadingSourceMaps = false
     }
+  }
+
+  getSourcesFromError(error) {
+    const stack = stackTraceParser.parse(error.stack)
+    const sources = []
+
+    for (const trace of stack) {
+      const file = trace.file
 
-    await Promise.all(promises)
+      if (file != "\u003Canonymous>") {
+        const sourceMapUrl = this.getMapURL({src: file})
+
+        if (sourceMapUrl) sources.push({originalUrl: file, sourceMapUrl})
+      }
+    }
+
+    return sources
+  }
+
+  getSourcesFromScripts() {
+    const scripts = document.querySelectorAll("script")
+    const sources = []
+
+    for (const script of scripts) {
+      const sourceMapUrl = this.getMapURL({script, src: script.src})
+
+      if (sourceMapUrl) sources.push({originalUrl: script.src, sourceMapUrl})
+    }
+
+    return sources
   }
 
-  async loadSourceMapForSource (src) {
+  getMapURL({script, src}) {
     const url = this.loadUrl(src)
     const originalUrl = `${url.origin}${url.pathname}`
 
-    let mapUrl
-
     if (this.sourceMapForSourceCallback) {
       // Use custom callback to resolve which map-file to download
-      mapUrl = this.sourceMapForSourceCallback({src, url})
-    } else {
+      return this.sourceMapForSourceCallback({originalUrl, script, src, url})
+    } else if (this.includeMapURL(src)) {
       // Default to original URL with '.map' appended
-      mapUrl = `${originalUrl}.map`
+      return `${originalUrl}.map`
     }
+  }
 
+  includeMapURL(src) {
+    return src.includes("/packs/") || src.includes("/assets/")
+  }
+
+  async loadSourceMapForSource ({originalUrl, sourceMapUrl}) {
     const xhr = new XMLHttpRequest()
 
-    xhr.open("GET", mapUrl, true)
+    xhr.open("GET", sourceMapUrl, true)
 
     await this.loadXhr(xhr)
 
     const consumer = await new SourceMapConsumer(xhr.responseText)
 
-    this.sourceMaps.push({consumer, originalUrl, src})
+    this.sourceMaps.push({consumer, originalUrl})
   }
 
   loadUrl (url) {
@@ -90,6 +139,7 @@ module.exports = class SourceMapsLoader {
 
     for (const trace of stack) {
       const sourceMapData = this.sourceMaps.find((sourceMapData) => sourceMapData.originalUrl == trace.file)
+
       let filePath, fileString, original
 
       if (sourceMapData) {
@@ -100,7 +150,7 @@ module.exports = class SourceMapsLoader {
       }
 
       if (original && original.source) {
-        filePath = original.source.replace(/^webpack:\/\/\//, "")
+        filePath = original.source.replace(/^webpack:\/\/(app|)\//, "")
         fileString = `${filePath}:${original.line}`
 
         if (original.column) {