@socketsecurity/cli-with-sentry 1.0.10 → 1.0.12

package/dist/utils.js

@@ -158,7 +158,7 @@ async function globWithGitIgnore(patterns, options) {
     cwd,
     expandDirectories: true
   });
-  const ignores = [...ignoredDirPatterns, ...(Array.isArray(projectIgnorePaths) ? ignoreFileLinesToGlobPatterns(projectIgnorePaths, path.join(cwd, '.gitignore'), cwd) : []), ...(await Promise.all(ignoreFiles.map(async filepath => ignoreFileToGlobPatterns(await fs.promises.readFile(filepath, 'utf8'), filepath, cwd)))).flat()];
+  const ignores = [...ignoredDirPatterns, ...(Array.isArray(projectIgnorePaths) ? ignoreFileLinesToGlobPatterns(projectIgnorePaths, path.join(cwd, '.gitignore'), cwd) : []), ...(await Promise.all(ignoreFiles.map(async filepath => ignoreFileToGlobPatterns((await safeReadFile(filepath)) ?? '', filepath, cwd)))).flat()];
   const hasNegatedPattern = ignores.some(p => p.charCodeAt(0) === 33 /*'!'*/);
   const globOptions = {
     absolute: true,
@@ -277,6 +277,15 @@ function safeReadFileSync(filepath, options) {
   } catch {}
   return undefined;
 }
+function safeStatsSync(filepath, options) {
+  try {
+    return fs.statSync(filepath, {
+      throwIfNoEntry: false,
+      ...options
+    });
+  } catch {}
+  return undefined;
+}
 
 const sensitiveConfigKeys = new Set(['apiToken']);
 const supportedConfigKeys = new Map([['apiBaseUrl', 'Base URL of the API endpoint'], ['apiProxy', 'A proxy through which to access the API'], ['apiToken', 'The API token required to access most API endpoints'], ['defaultOrg', 'The default org slug to use; usually the org your API token has access to. When set, all orgSlug arguments are implied to be this value.'], ['enforcedOrgs', 'Orgs in this list have their security policies enforced on this machine'], ['skipAskToPersistDefaultOrg', 'This flag prevents the CLI from asking you to persist the org slug when you selected one interactively'], ['org', 'Alias for defaultOrg']]);
@@ -1668,9 +1677,7 @@ function findNpmPathSync(npmBinPath) {
     // Use existsSync here because statsSync, even with { throwIfNoEntry: false },
     // will throw an ENOTDIR error for paths like ./a-file-that-exists/a-directory-that-does-not.
     // See https://github.com/nodejs/node/issues/56993.
-    fs.existsSync(libNmNpmPath) && fs.statSync(libNmNpmPath, {
-      throwIfNoEntry: false
-    })?.isDirectory()) {
+    fs.existsSync(libNmNpmPath) && safeStatsSync(libNmNpmPath)?.isDirectory()) {
       thePath = path.join(libNmNpmPath, NPM$4);
     }
     const nmPath = path.join(thePath, NODE_MODULES$1);
@@ -1685,9 +1692,7 @@ function findNpmPathSync(npmBinPath) {
     // In practically all cases the npm path contains a node_modules folder:
     //   /usr/local/share/npm/bin/npm/node_modules
     //   C:\Program Files\nodejs\node_modules
-    fs.existsSync(nmPath) && fs.statSync(nmPath, {
-      throwIfNoEntry: false
-    })?.isDirectory() && (
+    fs.existsSync(nmPath) && safeStatsSync(nmPath)?.isDirectory() && (
     // Optimistically look for the default location.
     path.basename(thePath) === NPM$4 ||
     // Chocolatey installs npm bins in the same directory as node bins.
@@ -1745,9 +1750,9 @@ function getDefaultSocketJson() {
   };
 }
 async function readSocketJson(cwd, defaultOnError = false) {
-  const filepath = path.join(cwd, 'socket.json');
-  if (!fs.existsSync(filepath)) {
-    debug.debugLog(`[DEBUG] File not found: ${filepath}`);
+  const sockJsonPath = path.join(cwd, 'socket.json');
+  if (!fs.existsSync(sockJsonPath)) {
+    debug.debugFn(`miss: file not found ${sockJsonPath}`);
     return {
       ok: true,
       data: getDefaultSocketJson()
@@ -1755,12 +1760,12 @@ async function readSocketJson(cwd, defaultOnError = false) {
   }
   let json = null;
   try {
-    json = await fs.promises.readFile(filepath, 'utf8');
+    json = await fs.promises.readFile(sockJsonPath, 'utf8');
   } catch (e) {
     debug.debugLog('[DEBUG] Raw error:');
     debug.debugLog(e);
     if (defaultOnError) {
-      logger.logger.warn('Warning: failed to parse file, using default');
+      logger.logger.warn('Warning: failed to read file, using default');
       return {
         ok: true,
         data: getDefaultSocketJson()
@@ -1777,11 +1782,9 @@ async function readSocketJson(cwd, defaultOnError = false) {
   try {
     obj = JSON.parse(json);
   } catch {
-    debug.debugLog('[DEBUG] Failed to parse content as JSON');
-    debug.debugLog(`[DEBUG] File contents ${json?.length ?? 0}:`);
-    debug.debugLog(json);
+    debug.debugFn('fail: parse JSON\n', json);
     if (defaultOnError) {
-      logger.logger.warn('Warning: failed to read file, using default');
+      logger.logger.warn('Warning: failed to parse file, using default');
       return {
         ok: true,
         data: getDefaultSocketJson()
@@ -1790,7 +1793,7 @@ async function readSocketJson(cwd, defaultOnError = false) {
     return {
       ok: false,
       message: 'Failed to parse socket.json',
-      cause: 'It seems your socket.json did not contain valid JSON, please verify'
+      cause: 'socket.json does not contain valid JSON, please verify'
     };
   }
   if (!obj) {
@@ -1809,15 +1812,13 @@ async function readSocketJson(cwd, defaultOnError = false) {
     data: obj
   };
 }
-async function writeSocketJson(cwd, socketJson) {
+async function writeSocketJson(cwd, sockJson) {
   let json = '';
   try {
-    json = JSON.stringify(socketJson, null, 2);
+    json = JSON.stringify(sockJson, null, 2);
   } catch (e) {
-    debug.debugLog('[DEBUG] JSON.stringify failed:');
-    debug.debugLog(e);
-    debug.debugLog('[DEBUG] Object:');
-    debug.debugLog(socketJson);
+    debug.debugFn('fail: stringify JSON\n', e);
+    debug.debugLog('[DEBUG] Object:\n', sockJson);
     return {
       ok: false,
       message: 'Failed to serialize to JSON',
@@ -2818,11 +2819,11 @@ async function spawnCoana(args, options, extra) {
     }, extra);
     return {
       ok: true,
-      data: strings.stripAnsi(output.stdout.trim())
+      data: output.stdout
     };
   } catch (e) {
     const stderr = e?.stderr;
-    const message = stderr ? strings.stripAnsi(stderr.trim()) : e?.message;
+    const message = stderr ? stderr : e?.message;
     return {
       ok: false,
       data: e,
@@ -2873,11 +2874,11 @@ const readLockFileByAgent = (() => {
       // To print a Yarn lockfile to your console without writing it to disk
       // use `bun bun.lockb`.
       // https://bun.sh/guides/install/yarnlock
-      return strings.stripAnsi((await spawn.spawn(agentExecPath, [lockPath], {
+      return (await spawn.spawn(agentExecPath, [lockPath], {
         cwd,
         // Lazily access constants.WIN32.
         shell: constants.WIN32
-      })).stdout.trim());
+      })).stdout;
     }
     return undefined;
   })], [NPM, defaultReader], [PNPM, defaultReader], [VLT, defaultReader], [YARN_BERRY, defaultReader], [YARN_CLASSIC, defaultReader]]);
@@ -2923,11 +2924,12 @@ async function getAgentVersion(agentExecPath, cwd) {
     // and tildes (~).
     vendor.semverExports.coerce(
     // All package managers support the "--version" flag.
-    strings.stripAnsi((await spawn.spawn(agentExecPath, ['--version'], {
+
+    (await spawn.spawn(agentExecPath, ['--version'], {
       cwd,
       // Lazily access constants.WIN32.
       shell: constants.WIN32
-    })).stdout.trim())) ?? undefined;
+    })).stdout) ?? undefined;
   } catch (e) {
     debug.debugFn('catch: unexpected\n', e);
   }
@@ -3286,6 +3288,8 @@ exports.readSocketJson = readSocketJson;
 exports.removeNodeModules = removeNodeModules;
 exports.runAgentInstall = runAgentInstall;
 exports.safeReadFile = safeReadFile;
+exports.safeReadFileSync = safeReadFileSync;
+exports.safeStatsSync = safeStatsSync;
 exports.sensitiveConfigKeys = sensitiveConfigKeys;
 exports.serializeResultJson = serializeResultJson;
 exports.setupSdk = setupSdk;
@@ -3296,5 +3300,5 @@ exports.tildify = tildify;
 exports.updateConfigValue = updateConfigValue;
 exports.walkNestedMap = walkNestedMap;
 exports.writeSocketJson = writeSocketJson;
-//# debugId=8f15309d-d08e-48ed-be22-b7f674429aeb
+//# debugId=b0db9c52-0a2c-4d67-9463-52ca8c06ff74
 //# sourceMappingURL=utils.js.map