@contrast/rewriter 1.32.0 → 1.34.0

package/lib/index.js

@@ -15,11 +15,9 @@
 // @ts-check
 'use strict';
 
-const Module = require('node:module');
 const { arch, platform } = require('node:os');
 const path = require('node:path');
 const { parseSync, transform, transformSync } = require('@swc/core');
-const { primordials: { StringPrototypeReplace, StringPrototypeSubstring } } = require('@contrast/common');
 const { Cache } = require('./cache');
 
 /**
@@ -34,43 +32,13 @@ const { Cache } = require('./cache');
 /**
  * @typedef {Object} RewriteOpts
  * @prop {string=} filename e.g. 'index.js'
- * @prop {boolean=} isModule if true, file is parsed as an ES module instead of a CJS script
  * @prop {boolean=} inject if true, injects ContrastMethods on the global object
- * @prop {boolean=} wrap if true, wraps the content with a modified module wrapper IIFE
  * @prop {boolean=} minify if true, minifies the output when source maps are enabled
  */
 
-// @ts-expect-error `wrapper` is missing from @types/node.
-const prefix = Module.wrapper[0];
-// @ts-expect-error `wrapper` is missing from @types/node, primordials overloads are poorly handled.
-const suffix = StringPrototypeReplace.call(Module.wrapper[1], /;$/, '.apply(this, arguments);');
-
 // @ts-expect-error `@contrast/agent-swc-plugin` .d.ts file doesn't exist.
 const { defaultRewriter, defaultUnwriter } = require('@contrast/agent-swc-plugin');
 
-/**
- * Wraps the source content as necessary to support rewriting.
- * Wrapping must occur before rewriting since the underlying rewriter cannot
- * parse certain valid statements such as `return` statements in a CJS script.
- * @param {string} content
- * @returns {string}
- */
-const wrap = (content) => {
-  let shebang = '';
-
-  // The shebang will be commented out since it cannot be present in a
-  // function body. swc doesn't include the commented shebang in the generated
-  // code despite including comments otherwise.
-  if (content.charAt(0) === '#') {
-    shebang = StringPrototypeSubstring.call(content, 0, content.indexOf('\n') + 1);
-    content = `//${content}`;
-  }
-
-  content = `${shebang}${prefix}${content}${suffix}`;
-
-  return content;
-};
-
 class Rewriter {
   /**
    * @param {Core} core
@@ -106,7 +74,6 @@ class Rewriter {
     return {
       swcrc: false,
       filename: opts.filename,
-      isModule: opts.isModule,
       env: {
         targets: {
           node: process.versions.node,
@@ -120,6 +87,11 @@ class Rewriter {
           }]],
           cacheRoot: path.join(nodeCfg.rewrite.cache.path, '.swc'),
         },
+        parser: {
+          syntax: 'ecmascript',
+          // prevents the parser from throwing without wrapping when encountering `return`.
+          allowReturnOutsideFunction: true,
+        },
         // disable most of the more invasive options.
         // see: https://terser.org/docs/options/#compress-options
         minify: minify ? { compress: { defaults: false } } : undefined
@@ -139,11 +111,6 @@ class Rewriter {
    */
   async rewrite(content, opts = {}) {
     this.logger.trace({ opts }, 'rewriting %s', opts.filename);
-
-    if (opts.wrap) {
-      content = wrap(content);
-    }
-
     return transform(content, this.rewriteConfig(opts));
   }
 
@@ -158,11 +125,6 @@ class Rewriter {
    */
   rewriteSync(content, opts = {}) {
     this.logger.trace({ opts }, 'rewriting %s', opts.filename);
-
-    if (opts.wrap) {
-      content = wrap(content);
-    }
-
     return transformSync(content, this.rewriteConfig(opts));
   }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/rewriter",
-  "version": "1.32.0",
+  "version": "1.34.0",
   "description": "A transpilation tool mainly used for instrumentation",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -21,10 +21,10 @@
   },
   "dependencies": {
     "@contrast/agent-swc-plugin": "3.2.0",
-    "@contrast/common": "1.36.0",
-    "@contrast/config": "1.51.0",
-    "@contrast/core": "1.56.0",
-    "@contrast/logger": "1.29.0",
+    "@contrast/common": "1.37.0",
+    "@contrast/config": "1.52.1",
+    "@contrast/core": "1.57.1",
+    "@contrast/logger": "1.30.1",
     "@swc/core": "1.13.3"
   }
 }