ref(utils): use test instead of indexof

Author: JonasBa

packages/node/src/module.ts

@@ -1,55 +1,40 @@
-import { posix, sep } from 'path';
-
-const isWindowsPlatform = sep === '\\';
+import { basename, dirname } from '@sentry/utils';
 
 /** normalizes Windows paths */
-function normalizeWindowsPath(path: string): string {
+function normalizePath(path: string): string {
   return path
     .replace(/^[A-Z]:/, '') // remove Windows-style prefix
     .replace(/\\/g, '/'); // replace all `\` instances with `/`
 }
 
 /** Gets the module from a filename */
-export function getModule(
-  filename: string | undefined,
-  normalizeWindowsPathSeparator: boolean = isWindowsPlatform,
-): string | undefined {
+export function getModule(filename: string | undefined): string | undefined {
   if (!filename) {
     return;
   }
 
-  const normalizedFilename = normalizeWindowsPathSeparator ? normalizeWindowsPath(filename) : filename;
-
-  // eslint-disable-next-line prefer-const
-  let { root, dir, base: basename, ext } = posix.parse(normalizedFilename);
+  const normalizedFilename = normalizePath(filename);
 
-  const base = (require && require.main && require.main.filename && dir) || global.process.cwd();
-
-  const normalizedBase = `${base}/`;
+  // We could use optional chaining here but webpack does like that mixed with require
+  const base = normalizePath(
+    `${(require && require.main && require.main.filename && dirname(require.main.filename)) || global.process.cwd()}/`,
+  );
 
   // It's specifically a module
-  let file = basename;
-
-  if (ext === '.js') {
-    file = file.slice(0, file.length - '.js'.length);
-  }
-
-  if (!root && !dir) {
-    // No dirname whatsoever
-    dir = '.';
-  }
+  const file = basename(normalizedFilename, '.js');
 
-  let n = dir.lastIndexOf('/node_modules/');
+  const path = dirname(normalizedFilename);
+  let n = path.lastIndexOf('/node_modules/');
   if (n > -1) {
     // /node_modules/ is 14 chars
-    return `${dir.slice(n + 14).replace(/\//g, '.')}:${file}`;
+    return `${path.slice(n + 14).replace(/\//g, '.')}:${file}`;
   }
   // Let's see if it's a part of the main module
   // To be a part of main module, it has to share the same base
-  n = `${dir}/`.lastIndexOf(normalizedBase, 0);
+  n = `${path}/`.lastIndexOf(base, 0);
 
   if (n === 0) {
-    let moduleName = dir.slice(normalizedBase.length).replace(/\//g, '.');
+    let moduleName = path.slice(base.length).replace(/\//g, '.');
     if (moduleName) {
       moduleName += ':';
     }

packages/utils/src/stacktrace.ts

@@ -64,28 +64,31 @@ export function stripSentryFramesAndReverse(stack: StackFrame[]): StackFrame[] {
 
   let localStack = stack;
 
-  const firstFrameFunction = localStack[0].function || '';
-  const lastFrameFunction = localStack[localStack.length - 1].function || '';
-
-  // If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)
-  if (firstFrameFunction.indexOf('captureMessage') !== -1 || firstFrameFunction.indexOf('captureException') !== -1) {
-    localStack = localStack.slice(1);
+  if (stack.length >= STACKTRACE_LIMIT) {
+    localStack.slice(0, STACKTRACE_LIMIT);
   }
 
+  const lastFrameFunction = localStack[localStack.length - 1].function;
   // If stack ends with one of our internal API calls, remove it (ends, meaning it's the bottom of the stack - aka top-most call)
-  if (lastFrameFunction.indexOf('sentryWrapped') !== -1) {
-    localStack = localStack.slice(0, -1);
+  if (lastFrameFunction && /sentryWrapped/.test(lastFrameFunction)) {
+    localStack.pop();
+  }
+
+  // Reversing in the middle of the procedure allows us to just pop the values off the stack
+  localStack = localStack.reverse();
+
+  const firstFrameFunction = localStack[localStack.length - 1].function;
+  // If stack starts with one of our API calls, remove it (starts, meaning it's the top of the stack - aka last call)
+  if (firstFrameFunction && /captureMessage|captureException/.test(firstFrameFunction)) {
+    localStack.pop();
   }
 
   // The frame where the crash happened, should be the last entry in the array
-  return localStack
-    .slice(0, STACKTRACE_LIMIT)
-    .map(frame => ({
-      ...frame,
-      filename: frame.filename || localStack[0].filename,
-      function: frame.function || '?',
-    }))
-    .reverse();
+  return localStack.map(frame => ({
+    ...frame,
+    filename: frame.filename || localStack[0].filename,
+    function: frame.function || '?',
+  }));
 }
 
 const defaultFunctionName = '<anonymous>';