@kaspernj/api-maker 1.0.187 → 1.0.190

package/package.json

@@ -16,7 +16,7 @@
     ]
   },
   "name": "@kaspernj/api-maker",
-  "version": "1.0.187",
+  "version": "1.0.190",
   "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": {

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,22 +25,61 @@ module.exports = class SourceMapsLoader {
     this.sourceMapForSourceCallback = callback
   }
 
-  async loadSourceMaps () {
+  getSources(error) {
+    let sources = this.getSourcesFromScripts()
+
+    if (error) sources = sources.concat(this.getSourcesFromError(error))
+
+    return uniqunize(sources)
+  }
+
+  async loadSourceMaps (error) {
+    this.isLoadingSourceMaps = true
+
+    try {
+      const promises = []
+      const sources = this.getSources(error)
+
+      for(const src of sources) {
+        if (src && !this.srcLoaded[src]) {
+          this.srcLoaded[src] = true
+
+          const promise = this.loadSourceMapForSource(src)
+          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) {
+      sources.push(trace.file)
+    }
+
+    return sources
+  }
+
+  getSourcesFromScripts() {
     const scripts = document.querySelectorAll("script")
-    const promises = []
+    const sources = []
 
     for (const script of scripts) {
       const src = this.loadSourceMapsForScriptTagsCallback(script)
 
-      if (src && !this.srcLoaded[src]) {
+      if (src) {
         this.srcLoaded[src] = true
-
-        const promise = this.loadSourceMapForSource(src)
-        promises.push(promise)
+        sources.push(src)
       }
     }
 
-    await Promise.all(promises)
+    return sources
   }
 
   async loadSourceMapForSource (src) {
@@ -90,6 +132,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 +143,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) {