@contrast/cli 1.55.0 → 1.57.0

package/bin/rewrite.mjs

@@ -1,4 +1,4 @@
-#!/usr/bin/env node --experimental-import-meta-resolve
+#!/usr/bin/env node
 /*
  * Copyright: 2025 Contrast Security, Inc
  * Contact: support@contrastsecurity.com
@@ -14,16 +14,15 @@
  * way not consistent with the End User License Agreement.
  */
 
-import { program } from 'commander';
-import path from 'node:path';
-import { action, version } from '../lib/rewrite.mjs';
+import { execFileSync } from 'node:child_process';
+import { fileURLToPath } from 'node:url';
 
-program
-  .name('npx -p @contrast/cli rewrite')
-  .version(version)
-  .description('Rewrites application files, caching them so that rewriting does not need to occur when the application runs.')
-  .argument('<entrypoint>', 'The entrypoint for the application', entrypoint => path.resolve(entrypoint))
-  .option('-a, --assess', 'rewrite in assess mode')
-  .option('-p, --protect', 'rewrite in protect mode')
-  .action(action)
-  .parse(process.argv);
+execFileSync(
+  process.argv[0],
+  [
+    '--experimental-import-meta-resolve',
+    fileURLToPath(new URL('../lib/rewrite/program.mjs', import.meta.url)),
+    ...process.argv.slice(2),
+  ],
+  { stdio: 'inherit' },
+);

package/lib/{rewrite.mjs → rewrite/index.mjs}

@@ -17,7 +17,6 @@ import { primordials } from '@contrast/common';
 import configInit from '@contrast/config';
 import appInfoInit from '@contrast/core/lib/app-info.js';
 import coreMessagesInit from '@contrast/core/lib/messages.js';
-import { findPackageJson } from '@contrast/find-package-json';
 import loggerInit from '@contrast/logger';
 import Perf from '@contrast/perf';
 import rewriterInit from '@contrast/rewriter';
@@ -29,10 +28,10 @@ import { createRequire } from 'node:module';
 import path from 'node:path';
 import { fileURLToPath, pathToFileURL } from 'node:url';
 
-const { RegExpPrototypeTest, JSONParse } = primordials;
+const { RegExpPrototypeTest } = primordials;
 const JS_FILE_REGEX = /\.[cm]?js$/;
 
-const packageJson = JSON.parse((await readFile(new URL('../package.json', import.meta.url))).toString());
+const packageJson = JSON.parse((await readFile(new URL('../../package.json', import.meta.url))).toString());
 const { name: agentName, version: agentVersion } = packageJson;
 
 /** @type {any} */
@@ -59,31 +58,6 @@ const rewriter = rewriterInit(core);
  */
 const visited = new Set();
 
-/** @param {string} filename absolute path */
-async function isModuleFile(filename) {
-  // if the file extension specifies the type, there's no need to do extra IO
-  const ext = path.extname(filename);
-  if (ext === '.mjs') {
-    return true;
-  }
-
-  if (ext === '.cjs') {
-    return false;
-  }
-
-  // check for type: 'module' in a file's package json, otherwise assume CJS.
-  try {
-    const pkg = await findPackageJson({ cwd: filename });
-    if (pkg && JSONParse((await readFile(pkg)).toString()).type === 'module') {
-      return true;
-    }
-  } catch {
-    return false;
-  }
-
-  return false;
-}
-
 class RewriteVisitor extends Visitor {
   /** @param {string} filename */
   constructor(filename) {
@@ -172,20 +146,16 @@ async function rewriteFile(filename) {
 
   try {
     const content = (await readFile(filename)).toString();
-    const isModule = await isModuleFile(filename);
 
     const result = await rewriter.rewrite(content, {
       filename,
-      isModule,
       inject: true,
-      wrap: !isModule,
       minify: true,
     });
     rewriter.cache.write(filename, result);
 
     /** @type {swc.Module | swc.Script} */
-    // @ts-expect-error SWC types expect `isModule` to be a `false` literal.
-    const program = await swc.parse(content, { isModule });
+    const program = await swc.parse(content);
     const visitor = new RewriteVisitor(filename);
     visitor.visitProgram(program);
   } catch (err) {

package/lib/rewrite/program.mjs

@@ -0,0 +1,28 @@
+/*
+ * Copyright: 2025 Contrast Security, Inc
+ * Contact: support@contrastsecurity.com
+ * License: Commercial
+
+ * NOTICE: This Software and the patented inventions embodied within may only be
+ * used as part of Contrast Security’s commercial offerings. Even though it is
+ * made available through public repositories, use of this Software is subject to
+ * the applicable End User Licensing Agreement found at
+ * https://www.contrastsecurity.com/enduser-terms-0317a or as otherwise agreed
+ * between Contrast Security and the End User. The Software may not be reverse
+ * engineered, modified, repackaged, sold, redistributed or otherwise used in a
+ * way not consistent with the End User License Agreement.
+ */
+
+import { program } from 'commander';
+import path from 'node:path';
+import { action, version } from './index.mjs';
+
+program
+  .name('npx -p @contrast/cli rewrite')
+  .version(version)
+  .description('Rewrites application files, caching them so that rewriting does not need to occur when the application runs.')
+  .argument('<entrypoint>', 'The entrypoint for the application', entrypoint => path.resolve(entrypoint))
+  .option('-a, --assess', 'rewrite in assess mode')
+  .option('-p, --protect', 'rewrite in protect mode')
+  .action(action)
+  .parse(process.argv);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@contrast/cli",
-  "version": "1.55.0",
+  "version": "1.57.0",
   "type": "module",
   "description": "A collection of agent related CLI utilities",
   "license": "SEE LICENSE IN LICENSE",
@@ -26,14 +26,14 @@
   },
   "dependencies": {
     "@contrast/find-package-json": "^1.1.0",
-    "@contrast/rewriter": "1.33.0",
+    "@contrast/rewriter": "1.35.0",
     "@contrast/common": "1.37.0",
-    "@contrast/config": "1.52.0",
-    "@contrast/core": "1.57.0",
-    "@contrast/logger": "1.30.0",
+    "@contrast/config": "1.53.0",
+    "@contrast/core": "1.58.0",
+    "@contrast/logger": "1.31.0",
     "@contrast/perf": "1.4.0",
-    "@contrast/reporter": "1.55.0",
-    "@contrast/scopes": "1.27.0",
+    "@contrast/reporter": "1.56.0",
+    "@contrast/scopes": "1.28.0",
     "@swc/core": "1.13.3",
     "commander": "^9.4.1"
   }