@contrast/cli 1.31.0 → 1.33.0

package/lib/config-diagnostics.js

@@ -20,6 +20,7 @@ const fs = require('fs');
 const { EOL } = require('os');
 const path = require('path');
 const { name: agentName, version: agentVersion } = require('../package.json');
+const { primordials: { JSONStringify } } = require('@contrast/common');
 
 if (require.main === module) {
   commander.program
@@ -33,7 +34,7 @@ if (require.main === module) {
 }
 
 async function action(entrypoint, options) {
-  const core = { agentName, agentVersion };
+  const core = { agentName, agentVersion, Perf: require('@contrast/perf') };
   require('@contrast/core/lib/messages')(core);
   require('@contrast/config')(core);
   require('@contrast/logger').default(core);
@@ -58,7 +59,7 @@ async function action(entrypoint, options) {
     Status = `Unable to connect to TeamServer. Remote settings are not included in output. Error: ${err.message}`;
   }
 
-  const content = JSON.stringify({ ...core.config.getReport({ redact: true }), Status }, null, 2) + EOL;
+  const content = JSONStringify({ ...core.config.getReport({ redact: true }), Status }, null, 2) + EOL;
 
   if (!options.quiet) {
     fs.writeFileSync(1, content, 'utf8');

package/lib/rewrite.js

@@ -24,11 +24,12 @@ const { Visitor } = require('@swc/core/Visitor');
 const { findPackageJson } = require('@contrast/find-package-json');
 const { program } = require('commander');
 const { version } = require('../package.json');
+const { primordials: { RegExpPrototypeTest, JSONParse } } = require('@contrast/common');
 
 const JS_FILE_REGEX = /\.[cm]?js$/;
 
 /** @type {any} */
-const core = {};
+const core = { Perf: require('@contrast/perf') };
 require('@contrast/core/lib/messages')(core);
 const config = require('@contrast/config')(core);
 if (core.config._errors?.length) throw core.config._errors[0];
@@ -66,7 +67,7 @@ async function isModuleFile(filename) {
   // check for type: 'module' in a file's package json, otherwise assume CJS.
   try {
     const pkg = await findPackageJson({ cwd: filename });
-    if (pkg && JSON.parse((await readFile(pkg)).toString()).type === 'module') {
+    if (pkg && JSONParse((await readFile(pkg)).toString()).type === 'module') {
       return true;
     }
   } catch {
@@ -134,7 +135,7 @@ class RewriteVisitor extends Visitor {
 
 /** @param {string} filename */
 async function rewriteFile(filename) {
-  if (!JS_FILE_REGEX.test(filename) || visited.has(filename)) return;
+  if (!RegExpPrototypeTest.call(JS_FILE_REGEX, filename) || visited.has(filename)) return;
 
   try {
     const content = (await readFile(filename)).toString();
@@ -145,7 +146,6 @@ async function rewriteFile(filename) {
       isModule,
       inject: true,
       wrap: !isModule,
-      trim: false,
     });
     rewriter.cache.write(filename, result);
 

package/lib/system-diagnostics.js

@@ -20,6 +20,7 @@ const fs = require('fs');
 const { EOL } = require('os');
 const path = require('path');
 const { name: agentName, version: agentVersion } = require('../package.json');
+const { primordials: { JSONStringify } } = require('@contrast/common');
 
 if (require.main === module) {
   commander.program
@@ -32,7 +33,7 @@ if (require.main === module) {
 }
 
 async function action(options) {
-  const core = { agentName, agentVersion };
+  const core = { agentName, agentVersion, Perf: require('@contrast/perf') };
   require('@contrast/config')(core);
   require('@contrast/logger').default(core, { level: 'silent' });
   require('@contrast/core/lib/app-info')(core);
@@ -43,7 +44,7 @@ async function action(options) {
   }
 
   const systemInfo = await core.getSystemInfo();
-  const content = JSON.stringify(systemInfo, null, 2) + EOL;
+  const content = JSONStringify(systemInfo, null, 2) + EOL;
 
   if (!options.quiet) {
     fs.writeFileSync(1, content, 'utf8');

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/cli",
-  "version": "1.31.0",
+  "version": "1.33.0",
   "description": "A collection of agent related CLI utilities",
   "license": "SEE LICENSE IN LICENSE",
   "author": "Contrast Security <nodejs@contrastsecurity.com> (https://www.contrastsecurity.com)",
@@ -21,12 +21,14 @@
   },
   "dependencies": {
     "@contrast/find-package-json": "^1.1.0",
-    "@contrast/rewriter": "1.12.0",
-    "@contrast/config": "1.32.0",
-    "@contrast/core": "1.36.0",
-    "@contrast/logger": "1.9.0",
-    "@contrast/reporter": "1.31.0",
-    "@contrast/scopes": "1.5.0",
+    "@contrast/rewriter": "1.14.0",
+    "@contrast/common": "1.26.0",
+    "@contrast/config": "1.34.0",
+    "@contrast/core": "1.38.0",
+    "@contrast/logger": "1.11.0",
+    "@contrast/perf": "1.1.0",
+    "@contrast/reporter": "1.33.0",
+    "@contrast/scopes": "1.7.0",
     "@swc/core": "1.5.29",
     "commander": "^9.4.1"
   }