socket 1.1.26 → 1.1.28

package/CHANGELOG.md

@@ -4,6 +4,16 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.1.0/).
 
+## [1.1.28](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.28) - 2025-11-13
+
+### Added
+- Backported `socket fix` with `--json` improvements
+
+## [1.1.27](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.27) - 2025-11-12
+
+### Added
+- Backported `--exclude` and `--include` flags for `socket fix` command from v2
+
 ## [1.1.26](https://github.com/SocketDev/socket-cli/releases/tag/v1.1.26) - 2025-11-08
 
 ### Added

package/dist/cli.js

@@ -18,6 +18,7 @@ var prompts = require('../external/@socketsecurity/registry/lib/prompts');
 var spawn = require('../external/@socketsecurity/registry/lib/spawn');
 var fs$2 = require('../external/@socketsecurity/registry/lib/fs');
 var strings = require('../external/@socketsecurity/registry/lib/strings');
+var os = require('node:os');
 var path$1 = require('../external/@socketsecurity/registry/lib/path');
 var require$$11 = require('../external/@socketsecurity/registry/lib/objects');
 var registry = require('../external/@socketsecurity/registry');
@@ -26,7 +27,6 @@ var require$$12 = require('../external/@socketsecurity/registry/lib/promises');
 var regexps = require('../external/@socketsecurity/registry/lib/regexps');
 var require$$0$1 = require('node:crypto');
 var require$$1 = require('node:util');
-var os = require('node:os');
 var promises = require('node:stream/promises');
 
 var _documentCurrentScript = typeof document !== 'undefined' ? document.currentScript : null;
@@ -3559,8 +3559,9 @@ async function coanaFix(fixConfig) {
     autopilot,
     cwd,
     disableMajorUpdates,
+    exclude,
     ghsas,
-    glob,
+    include,
     limit,
     minimumReleaseAge,
     orgSlug,
@@ -3630,18 +3631,47 @@ async function coanaFix(fixConfig) {
         }
       };
     }
-    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...(isAll ? ['all'] : ghsas), ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(glob ? ['--glob', glob] : []), ...(!applyFixes ? [constants.FLAG_DRY_RUN] : []), ...(outputFile ? ['--output-file', outputFile] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
-      cwd,
-      spinner,
-      stdio: 'inherit'
-    });
-    spinner?.stop();
-    return fixCResult.ok ? {
-      ok: true,
-      data: {
-        fixed: true
+
+    // Create a temporary file for the output.
+    const tmpDir = os.tmpdir();
+    const tmpFile = path.join(tmpDir, `socket-fix-${Date.now()}.json`);
+    try {
+      const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ...(isAll ? ['all'] : ghsas), ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(include.length ? ['--include', ...include] : []), ...(exclude.length ? ['--exclude', ...exclude] : []), ...(!applyFixes ? [constants.FLAG_DRY_RUN] : []), '--output-file', tmpFile, ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+        cwd,
+        spinner,
+        stdio: 'inherit'
+      });
+      spinner?.stop();
+      if (!fixCResult.ok) {
+        return fixCResult;
       }
-    } : fixCResult;
+
+      // Read the temporary file to get the actual fixes result.
+      const fixesResultJson = fs$2.readJsonSync(tmpFile, {
+        throws: false
+      });
+
+      // Copy to outputFile if provided.
+      if (outputFile) {
+        logger.logger.info(`Copying fixes result to ${outputFile}`);
+        const tmpContent = await fs$1.promises.readFile(tmpFile, 'utf8');
+        await fs$1.promises.writeFile(outputFile, tmpContent, 'utf8');
+      }
+      return {
+        ok: true,
+        data: {
+          data: fixesResultJson,
+          fixed: true
+        }
+      };
+    } finally {
+      // Clean up the temporary file.
+      try {
+        await fs$1.promises.unlink(tmpFile);
+      } catch (e) {
+        // Ignore cleanup errors.
+      }
+    }
   }
 
   // Adjust limit based on open Socket Fix PRs.
@@ -3665,7 +3695,7 @@ async function coanaFix(fixConfig) {
   const shouldSpawnCoana = adjustedLimit > 0;
   let ids;
   if (shouldSpawnCoana && isAll) {
-    const foundCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(glob ? ['--glob', glob] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const foundCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(include.length ? ['--include', ...include] : []), ...(exclude.length ? ['--exclude', ...exclude] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner
     });
@@ -3707,7 +3737,7 @@ async function coanaFix(fixConfig) {
 
     // Apply fix for single GHSA ID.
     // eslint-disable-next-line no-await-in-loop
-    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ghsaId, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(glob ? ['--glob', glob] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
+    const fixCResult = await utils.spawnCoanaDlx(['compute-fixes-and-upgrade-purls', cwd, '--manifests-tar-hash', tarHash, '--apply-fixes-to', ghsaId, ...(fixConfig.rangeStyle ? ['--range-style', fixConfig.rangeStyle] : []), ...(minimumReleaseAge ? ['--minimum-release-age', minimumReleaseAge] : []), ...(include.length ? ['--include', ...include] : []), ...(exclude.length ? ['--exclude', ...exclude] : []), ...(disableMajorUpdates ? ['--disable-major-updates'] : []), ...(showAffectedDirectDependencies ? ['--show-affected-direct-dependencies'] : []), ...fixConfig.unknownFlags], fixConfig.orgSlug, {
       cwd,
       spinner,
       stdio: 'inherit'
@@ -3921,8 +3951,9 @@ async function handleFix({
   autopilot,
   cwd,
   disableMajorUpdates,
+  exclude,
   ghsas,
-  glob,
+  include,
   limit,
   minSatisfying,
   minimumReleaseAge,
@@ -3937,14 +3968,16 @@ async function handleFix({
 }) {
   require$$9.debugFn('notice', `Starting fix command for ${orgSlug}`);
   require$$9.debugDir('inspect', {
+    applyFixes,
     autopilot,
     cwd,
     disableMajorUpdates,
+    exclude,
     ghsas,
-    glob,
+    include,
     limit,
     minSatisfying,
-    applyFixes,
+    minimumReleaseAge,
     outputFile,
     outputKind,
     prCheck,
@@ -3953,21 +3986,24 @@ async function handleFix({
     unknownFlags
   });
   await outputFixResult(await coanaFix({
-    autopilot,
     applyFixes,
+    autopilot,
     cwd,
     disableMajorUpdates,
-    // Convert mixed CVE/GHSA/PURL inputs to GHSA IDs only
+    exclude,
+    // Convert mixed CVE/GHSA/PURL inputs to GHSA IDs only.
     ghsas: await convertIdsToGhsas(ghsas),
-    glob,
+    include,
     limit,
     minimumReleaseAge,
+    minSatisfying,
     orgSlug,
+    outputFile,
+    prCheck,
     rangeStyle,
     showAffectedDirectDependencies,
     spinner,
-    unknownFlags,
-    outputFile
+    unknownFlags
   }), outputKind);
 }
 
@@ -3994,6 +4030,20 @@ const generalFlags$2 = {
     // Hidden to allow custom documenting of the negated `--no-apply-fixes` variant.
     hidden: true
   },
+  exclude: {
+    type: 'string',
+    default: [],
+    description: 'Exclude workspaces matching these glob patterns. Can be provided as comma separated values or as multiple flags',
+    isMultiple: true,
+    hidden: false
+  },
+  include: {
+    type: 'string',
+    default: [],
+    description: 'Include workspaces matching these glob patterns. Can be provided as comma separated values or as multiple flags',
+    isMultiple: true,
+    hidden: false
+  },
   majorUpdates: {
     type: 'boolean',
     default: true,
@@ -4051,12 +4101,6 @@ const hiddenFlags = {
     ...generalFlags$2['id'],
     hidden: true
   },
-  glob: {
-    type: 'string',
-    default: '',
-    description: 'Glob pattern to filter workspaces by',
-    hidden: true
-  },
   maxSatisfying: {
     type: 'boolean',
     default: true,
@@ -4155,7 +4199,8 @@ async function run$K(argv, importMeta, {
   const {
     applyFixes,
     autopilot,
-    glob,
+    exclude,
+    include,
     json,
     limit,
     majorUpdates,
@@ -4206,24 +4251,27 @@ async function run$K(argv, importMeta, {
     spinner
   } = constants.default;
   const ghsas = arrays.arrayUnique([...utils.cmdFlagValueToArray(cli.flags['id']), ...utils.cmdFlagValueToArray(cli.flags['ghsa']), ...utils.cmdFlagValueToArray(cli.flags['purl'])]);
+  const includePatterns = utils.cmdFlagValueToArray(include);
+  const excludePatterns = utils.cmdFlagValueToArray(exclude);
   await handleFix({
-    autopilot,
     applyFixes,
+    autopilot,
     cwd,
     disableMajorUpdates,
+    exclude: excludePatterns,
     ghsas,
-    glob,
+    include: includePatterns,
     limit,
     minimumReleaseAge,
     minSatisfying,
-    prCheck,
     orgSlug,
+    outputFile,
     outputKind,
+    prCheck,
     rangeStyle,
     showAffectedDirectDependencies,
     spinner,
-    unknownFlags,
-    outputFile
+    unknownFlags
   });
 }
 
@@ -15043,5 +15091,5 @@ void (async () => {
     await utils.captureException(e);
   }
 })();
-//# debugId=6efb19e5-82e5-4a78-9747-dd32059707f5
+//# debugId=13d5a945-42af-4203-b65f-268cf102639c
 //# sourceMappingURL=cli.js.map