@contrast/rewriter 1.37.1 → 1.37.2

package/lib/index.js

@@ -15,15 +15,17 @@
 // @ts-check
 'use strict';
 const { arch, platform } = require('node:os');
-const path = require('node:path');
 // @ts-expect-error
 const { SourceMapConsumer: SourceMapConsumerSync } = require('@contrast/synchronous-source-maps');
 const { parseSync, transform, transformSync } = require('@swc/core');
 // @ts-expect-error `@contrast/agent-swc-plugin` .d.ts file doesn't exist.
 const { defaultRewriter, defaultUnwriter } = require('@contrast/agent-swc-plugin');
 const { funcInfo } = require('@contrast/fn-inspect');
+const { primordials } = require('@contrast/common');
 const { Cache } = require('./cache');
 
+const MAGIC_COMMENT_PREFIX = '//# sourceMappingURL=';
+
 /**
  * @typedef {Object} Core
  * @prop {import('@contrast/common').AppInfo} appInfo
@@ -39,7 +41,6 @@ const { Cache } = require('./cache');
  * @prop {boolean=} inject if true, injects ContrastMethods on the global object
  * @prop {boolean=} minify if true, minifies the output when source maps are enabled
  */
-
 class Rewriter {
   /**
    * @param {Core} core
@@ -67,7 +68,7 @@ class Rewriter {
    * @param {RewriteOpts} opts
    * @returns {import('@swc/core').Options}
    */
-  rewriteConfig(opts) {
+  swcOptions(opts) {
     const nodeCfg = this.core.config.agent.node;
     const sourceMaps = nodeCfg.source_maps.enable;
     const minify = opts.minify && nodeCfg.source_maps.enable && nodeCfg.rewrite.minify;
@@ -85,7 +86,7 @@ class Rewriter {
             assess: this.modes.has('assess'),
             inject: opts.inject,
           }]],
-          cacheRoot: path.join(nodeCfg.rewrite.cache.path, '.swc'),
+          cacheRoot: primordials.PathJoin(nodeCfg.rewrite.cache.path, '.swc'),
         },
         parser: {
           syntax: 'ecmascript',
@@ -101,6 +102,45 @@ class Rewriter {
     };
   }
 
+  /**
+   * Make all of the source map paths absolute.
+   * Mutates Output result:
+   * - magic sourceMappingURL comment in result.code
+   * - result.map.sources array
+   * @param {RewriteOpts} rewriteOpts
+   * @param {import('@swc/core').Output} result
+   */
+  adjustMap(rewriteOpts, result) {
+    if (rewriteOpts.filename && result.map) {
+      const map = JSON.parse(result.map);
+      const cachedFilename = this.cache.getCachedFilename(rewriteOpts.filename);
+      const absoluteCachedMapName = `${cachedFilename}.map`;
+      const origMapURL = `${primordials.PathBasename(rewriteOpts.filename)}.map`;
+      const comment = `${MAGIC_COMMENT_PREFIX}${origMapURL}`;
+
+      // 1) magic comment
+      // https://github.com/nodejs/node/blob/main/lib/internal/source_map/source_map_cache.js#L134-L136
+      const i = result.code.lastIndexOf(comment);
+      if (i >= 0) {
+        let code = primordials.StringPrototypeSubstr.call(result.code, 0, i);
+        code += `${MAGIC_COMMENT_PREFIX}${absoluteCachedMapName}`;
+        result.code = code;
+      }
+      // 2) map.sources array
+      for (let i = 0; i < map.sources?.length; i++) {
+        const resolved = primordials.PathResolve(rewriteOpts.filename, '..', map.sources[i]);
+        map.sources[i] = resolved;
+      }
+      // 3) map.file
+      if (map.file) {
+        map.file = cachedFilename;
+      }
+
+      // reasign modified map
+      result.map = primordials.JSONStringify(map);
+    }
+  }
+
   /**
    * Rewrites the provided source code string asynchronously. this is used in an ESM
    * context. CJS cannot use this because `require` is synchronous.
@@ -111,7 +151,10 @@ class Rewriter {
    */
   async rewrite(content, opts = {}) {
     this.logger.trace({ opts }, 'rewriting %s', opts.filename);
-    return transform(content, this.rewriteConfig(opts));
+    const rewriteOpts = this.swcOptions(opts);
+    const ret = await transform(content, rewriteOpts);
+    this.adjustMap(rewriteOpts, ret);
+    return ret;
   }
 
   /**
@@ -125,7 +168,10 @@ class Rewriter {
    */
   rewriteSync(content, opts = {}) {
     this.logger.trace({ opts }, 'rewriting %s', opts.filename);
-    return transformSync(content, this.rewriteConfig(opts));
+    const rewriteOpts = this.swcOptions(opts);
+    const result = transformSync(content, rewriteOpts);
+    this.adjustMap(rewriteOpts, result);
+    return result;
   }
 
   /**
@@ -180,7 +226,7 @@ class Rewriter {
       column: fnInfo.column,
     });
     if (orig) {
-      fnInfo.file = orig.source ? path.resolve(fnInfo.file, '..', orig.source) : fnInfo.file;
+      fnInfo.file = orig.source ? primordials.PathResolve(fnInfo.file, '..', orig.source) : fnInfo.file;
       fnInfo.lineNumber = orig.line;
       fnInfo.column = orig.column;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/rewriter",
-  "version": "1.37.1",
+  "version": "1.37.2",
   "description": "A transpilation tool mainly used for instrumentation",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -21,11 +21,11 @@
   },
   "dependencies": {
     "@contrast/agent-swc-plugin": "3.2.0",
-    "@contrast/common": "1.39.0",
-    "@contrast/config": "1.55.0",
-    "@contrast/core": "1.60.0",
+    "@contrast/common": "1.39.1",
+    "@contrast/config": "1.55.1",
+    "@contrast/core": "1.60.1",
     "@contrast/fn-inspect": "^5.0.2",
-    "@contrast/logger": "1.33.0",
+    "@contrast/logger": "1.33.1",
     "@contrast/synchronous-source-maps": "^1.1.5",
     "@swc/core": "1.13.3"
   }