@contrast/rewriter 1.8.2 → 1.8.4

package/lib/index.js

@@ -16,9 +16,9 @@
 'use strict';
 
 const Module = require('node:module');
-const fs = require('node:fs');
-const fsp = fs.promises;
-const { transfer } = require('multi-stage-sourcemap');
+//const fs = require('node:fs');
+//const fsp = fs.promises;
+//const { transfer } = require('multi-stage-sourcemap');
 const { transform, transformSync } = require('@swc/core');
 const { Cache } = require('./cache');
 
@@ -135,9 +135,10 @@ class Rewriter {
 
     const result = await transform(content, this.rewriteConfig(opts));
 
-    if (result.map) {
-      result.map = await this.ifSourceMapExistsChainIt(`${opts.filename}.map`, result.map);
-    }
+    // not used with new version of swc; it chains source maps.
+    // if (result.map) {
+    //   result.map = await this.ifSourceMapExistsChainIt(`${opts.filename}.map`, result.map);
+    // }
 
     return result;
   }
@@ -160,9 +161,10 @@ class Rewriter {
 
     const result = transformSync(content, this.rewriteConfig(opts));
 
-    if (result.map) {
-      result.map = this.ifSourceMapExistsChainItSync(`${opts.filename}.map`, result.map);
-    }
+    // not used with new version of swc; it chains source maps.
+    // if (result.map) {
+    //   result.map = this.ifSourceMapExistsChainItSync(`${opts.filename}.map`, result.map);
+    // }
 
     return result;
   }
@@ -188,7 +190,7 @@ class Rewriter {
     }).code;
   }
 
-
+  // not used with new version of swc; it chains source maps.
   /**
    * If there is a .map file in the same directory as the code being rewritten
    * then chain the two maps together. This is an async function because there
@@ -205,24 +207,25 @@ class Rewriter {
    * the input contrast source-map.
    */
   // @ts-ignore
-  async ifSourceMapExistsChainIt(possibleMapPath, contrastMap) {
-    try {
-      const data = await fsp.readFile(possibleMapPath, 'utf8');
-      const existingMap = JSON.parse(data);
-      contrastMap = transfer({ fromSourceMap: contrastMap, toSourceMap: existingMap });
-      this.logger.trace({ existingMap: possibleMapPath }, 'merged source-map');
-    } catch (err) {
-      // if the map file isn't found, it's not an error, otherwise log it.
-      // @ts-ignore
-      if (err.code !== 'ENOENT') {
-        this.logger.debug({ existingMap: possibleMapPath, err }, 'failed to read');
-      }
-    }
+  // async ifSourceMapExistsChainIt(possibleMapPath, contrastMap) {
+  //   try {
+  //     const data = await fsp.readFile(possibleMapPath, 'utf8');
+  //     const existingMap = JSON.parse(data);
+  //     contrastMap = transfer({ fromSourceMap: contrastMap, toSourceMap: existingMap });
+  //     this.logger.trace({ existingMap: possibleMapPath }, 'merged source-map');
+  //   } catch (err) {
+  //     // if the map file isn't found, it's not an error, otherwise log it.
+  //     // @ts-ignore
+  //     if (err.code !== 'ENOENT') {
+  //       this.logger.debug({ existingMap: possibleMapPath, err }, 'failed to read');
+  //     }
+  //   }
 
-    // return the merged map or the original contrast map
-    return contrastMap;
-  }
+  //   // return the merged map or the original contrast map
+  //   return contrastMap;
+  // }
 
+  // not used with new version of swc; it chains source maps.
   /**
    * @param {string} possibleMapPath the absolute path to a possibly pre-existing source map.
    * @param {string} contrastMap the source map generated by the agent
@@ -230,23 +233,23 @@ class Rewriter {
    * the input contrast source-map.
    */
   // @ts-ignore
-  ifSourceMapExistsChainItSync(possibleMapPath, contrastMap) {
-    try {
-      const data = fs.readFileSync(possibleMapPath, 'utf8');
-      const existingMap = JSON.parse(data);
-      contrastMap = transfer({ fromSourceMap: contrastMap, toSourceMap: existingMap });
-      this.logger.trace({ existingMap: possibleMapPath }, 'merged source-map');
-    } catch (err) {
-      // if the map file isn't found, it's not an error, otherwise log it.
-      // @ts-ignore
-      if (err.code !== 'ENOENT') {
-        this.logger.debug({ existingMap: possibleMapPath, err }, 'failed to read');
-      }
-    }
+  // ifSourceMapExistsChainItSync(possibleMapPath, contrastMap) {
+  //   try {
+  //     const data = fs.readFileSync(possibleMapPath, 'utf8');
+  //     const existingMap = JSON.parse(data);
+  //     contrastMap = transfer({ fromSourceMap: contrastMap, toSourceMap: existingMap });
+  //     this.logger.trace({ existingMap: possibleMapPath }, 'merged source-map');
+  //   } catch (err) {
+  //     // if the map file isn't found, it's not an error, otherwise log it.
+  //     // @ts-ignore
+  //     if (err.code !== 'ENOENT') {
+  //       this.logger.debug({ existingMap: possibleMapPath, err }, 'failed to read');
+  //     }
+  //   }
 
-    // return the merged map or the original contrast map
-    return contrastMap;
-  }
+  //   // return the merged map or the original contrast map
+  //   return contrastMap;
+  // }
 }
 
 /**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/rewriter",
-  "version": "1.8.2",
+  "version": "1.8.4",
   "description": "A transpilation tool mainly used for instrumentation",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -14,11 +14,11 @@
     "test": "../scripts/test.sh"
   },
   "dependencies": {
-    "@contrast/agent-swc-plugin": "1.5.0",
-    "@contrast/agent-swc-plugin-unwrite": "1.5.0",
-    "@contrast/common": "1.21.2",
+    "@contrast/agent-swc-plugin": "^1.5.1",
+    "@contrast/agent-swc-plugin-unwrite": "^1.5.1",
+    "@contrast/common": "1.21.3",
     "@contrast/synchronous-source-maps": "^1.1.3",
-    "@swc/core": "1.3.39",
+    "@swc/core": "^1.5.29",
     "multi-stage-sourcemap": "^0.3.1"
   }
 }