@contrast/rewriter 1.12.0 → 1.14.0

package/lib/cache.js

@@ -12,7 +12,7 @@
  * engineered, modified, repackaged, sold, redistributed or otherwise used in a
  * way not consistent with the End User License Agreement.
  */
-// @ts-check
+// @ts-nocheck
 'use strict';
 
 const fs = require('node:fs');
@@ -20,6 +20,7 @@ const fsPromises = require('node:fs/promises');
 const os = require('node:os');
 const path = require('node:path');
 const { version } = require('../package.json');
+const { primordials: { StringPrototypeReplace, StringPrototypeReplaceAll } } = require('@contrast/common');
 
 /**
  * Returns the modification time of a file as a number.
@@ -44,10 +45,10 @@ module.exports.Cache = class Cache {
     this.logger = core.logger.child({ name: 'contrast:rewriter:cache' });
     /** @type {Set<import('.').Mode>} */
     this.modes = new Set();
-    this.appDirRegex = new RegExp(`^${core.appInfo.app_dir.replaceAll('\\', '\\\\')}`);
+    this.appDirRegex = new RegExp(`^${StringPrototypeReplaceAll.call(core.appInfo.app_dir, '\\', '\\\\')}`);
     this.cacheDir = path.join(
       core.config.agent.node.rewrite.cache.path,
-      core.appInfo.name.replace('/', '_'),
+      StringPrototypeReplace.call(core.appInfo.name, '/', '_'),
       version,
     );
   }
@@ -73,10 +74,10 @@ module.exports.Cache = class Cache {
    * @returns {string}
    */
   getCachedFilename(filename) {
-    filename = filename.replace(this.appDirRegex, '_');
+    filename = StringPrototypeReplace.call(filename, this.appDirRegex, '_');
 
     if (os.platform() === 'win32') {
-      filename = filename.replace(/^([A-Za-z]):/, '$1_');
+      filename = StringPrototypeReplace.call(filename, /^([A-Za-z]):/, '$1_');
     }
 
     return path.join(

package/lib/index.js

@@ -18,6 +18,7 @@
 const Module = require('node:module');
 const { transform, transformSync } = require('@swc/core');
 const { Cache } = require('./cache');
+const { primordials: { StringPrototypeReplace, StringPrototypeSubstring } } = require('@contrast/common');
 
 /**
  * @typedef {Object} Core
@@ -39,10 +40,10 @@ const { Cache } = require('./cache');
 // @ts-expect-error `wrapper` is missing from @types/node
 const prefix = Module.wrapper[0];
 // @ts-expect-error `wrapper` is missing from @types/node
-const suffix = Module.wrapper[1].replace(/;$/, '.apply(this, arguments);');
+const suffix = StringPrototypeReplace.call(Module.wrapper[1], /;$/, '.apply(this, arguments);');
 
-const rewriterPath = require.resolve('@contrast/agent-swc-plugin');
-const unwriterPath = require.resolve('@contrast/agent-swc-plugin-unwrite');
+// @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.
@@ -58,7 +59,7 @@ const wrap = (content) => {
   // function body. swc doesn't include the commented shebang in the generated
   // code despite including comments otherwise.
   if (content.charAt(0) === '#') {
-    shebang = content.substring(0, content.indexOf('\n') + 1);
+    shebang = StringPrototypeSubstring.call(content, 0, content.indexOf('\n') + 1);
     content = `//${content}`;
   }
 
@@ -105,7 +106,7 @@ class Rewriter {
       },
       jsc: {
         experimental: {
-          plugins: [[rewriterPath, {
+          plugins: [[defaultRewriter, {
             assess: this.modes.has('assess'),
             inject: opts.inject,
           }]],
@@ -166,7 +167,7 @@ class Rewriter {
       },
       jsc: {
         experimental: {
-          plugins: [[unwriterPath, {}]],
+          plugins: [[defaultUnwriter, {}]],
         },
       },
       sourceMaps: false,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/rewriter",
-  "version": "1.12.0",
+  "version": "1.14.0",
   "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.1",
-    "@contrast/agent-swc-plugin-unwrite": "1.5.1",
-    "@contrast/common": "1.25.0",
-    "@contrast/config": "1.32.0",
-    "@contrast/core": "1.36.0",
+    "@contrast/agent-swc-plugin": "^2.0.0",
+    "@contrast/common": "1.26.0",
+    "@contrast/config": "1.34.0",
+    "@contrast/core": "1.38.0",
+    "@contrast/logger": "1.11.0",
     "@swc/core": "1.5.29"
   }
 }