smipper 34.0.0 → 36.0.0

package/dist/loadUri.js

@@ -8,6 +8,9 @@ const load_1 = require("./load");
 const assert_1 = __importDefault(require("assert"));
 const source_map_1 = __importDefault(require("source-map"));
 function loadUri(smipper, path) {
+    if (path[0] === "/") {
+        path = "file://" + path;
+    }
     return new Promise((resolve, reject) => {
         smipper.verbose("loading", path);
         if (!(path in smipper.sourceMaps)) {
@@ -19,25 +22,20 @@ function loadUri(smipper, path) {
                 .then((jsData) => {
                 const idx = jsData.lastIndexOf("//# sourceMappingURL=");
                 smipper.verbose("Got the file", jsData.length, idx);
-                if (idx === -1) {
+                if (idx == -1) {
                     return path + ".map";
                 }
-                const mapUrl = jsData.substring(idx + 21).trim();
+                const mapUrl = jsData.substring(idx + 21);
                 const match = /^(data:.+\/.+;)base64,/.exec(mapUrl);
                 if (match) {
                     (0, assert_1.default)(match[1] !== undefined);
                     return mapUrl.substring(match[1].length);
                 }
-                if (mapUrl.indexOf("://") !== -1) {
-                    return mapUrl;
-                }
-                try {
-                    return new URL(mapUrl, path).href;
-                }
-                catch (err) {
-                    smipper.verbose("Got error parsing url", err.message);
+                if (mapUrl.indexOf("://") != -1) {
                     return mapUrl;
                 }
+                // console.log(mapUrl);
+                return new URL(mapUrl, path).href;
             })
                 .then((mapUrl) => {
                 // console.log(mapUrl.substring(0, 20));

package/dist/processFrame.js

@@ -1,8 +1,12 @@
 "use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.processFrame = void 0;
 const loadUri_1 = require("./loadUri");
 const buildStackLine_1 = require("./buildStackLine");
+const fs_1 = __importDefault(require("fs"));
 function processFrame(smipper, functionName, url, line, column) {
     smipper.verbose("got frame", functionName, url, line, column);
     if (functionName.endsWith("@")) {
@@ -11,6 +15,9 @@ function processFrame(smipper, functionName, url, line, column) {
     return new Promise((resolve) => {
         let newUrl, newLine, newColumn;
         smipper.verbose("calling loadUri", url);
+        if (!url.includes("://") && url[0] !== "/" && fs_1.default.existsSync(url)) {
+            url = `file://${process.cwd()}/${url}`;
+        }
         return (0, loadUri_1.loadUri)(smipper, url)
             .then((smap) => {
             smipper.verbose("got map", url, Object.keys(smap));

package/dist/rewriteLocalControl.js

@@ -10,7 +10,7 @@ function findFile(dir, fn) {
     const list = fs_1.default.readdirSync(dir);
     for (let file of list) {
         const match = file === fn;
-        file = path_1.default.join(dir, file);
+        file = dir + "/" + file;
         const stat = fs_1.default.statSync(file);
         if (stat && stat.isDirectory()) {
             const ret = findFile(file, fn);
@@ -25,18 +25,13 @@ function findFile(dir, fn) {
     return undefined;
 }
 function rewriteLocalControl(smipper, url) {
-    let file;
-    if (url.startsWith("http://")) {
-        file = url.substring(7);
+    let file = path_1.default.basename(url.substring(6));
+    const q = file.indexOf("?");
+    if (q !== -1) {
+        file = file.substring(0, q);
     }
-    else if (url.startsWith("https://")) {
-        file = url.substring(8);
-    }
-    else {
-        file = url;
-    }
-    const found = findFile(process.cwd(), path_1.default.basename(file));
-    smipper.verbose("Rewriting", url, "in", process.cwd(), "=>", found);
+    const found = findFile(process.cwd(), file);
+    smipper.verbose(`Rewriting ${url} in ${process.cwd()} (${file}) => ${found}`);
     if (found) {
         return found;
     }

package/package.json

@@ -1,10 +1,10 @@
 {
     "name": "smipper",
-    "version": "34.0.0",
+    "version": "36.0.0",
     "description": "",
     "main": "./index.js",
     "bin": {
-        "smipper": "./dist/index.js"
+        "smipper": "dist/index.js"
     },
     "files": [
         "dist"