From 9df6adeada3e33c6f4fb53263ffab064b260b280 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 10 Jul 2023 22:35:49 +0100 Subject: [PATCH 1/2] feat(node): Export `getModule` --- packages/node/src/index.ts | 1 + 1 file changed, 1 insertion(+) diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index 0e57936a02a9..87524699936f 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -60,6 +60,7 @@ export { makeNodeTransport } from './transports'; export { defaultIntegrations, init, defaultStackParser, lastEventId, flush, close, getSentryRelease } from './sdk'; export { addRequestDataToEvent, DEFAULT_USER_INCLUDES, extractRequestData } from './requestdata'; export { deepReadDirSync } from './utils'; +export { getModule } from './module'; import { Integrations as CoreIntegrations } from '@sentry/core'; From 1300db05e6075aa6bed2b34c8f2da0d4dd4fcbb6 Mon Sep 17 00:00:00 2001 From: Tim Fish Date: Mon, 10 Jul 2023 22:53:09 +0100 Subject: [PATCH 2/2] Rename to `getModuleFromFilename` --- packages/node/src/index.ts | 2 +- packages/node/src/module.ts | 2 +- packages/node/src/sdk.ts | 4 ++-- packages/node/test/module.test.ts | 8 ++++---- 4 files changed, 8 insertions(+), 8 deletions(-) diff --git a/packages/node/src/index.ts b/packages/node/src/index.ts index 87524699936f..1dd778e21199 100644 --- a/packages/node/src/index.ts +++ b/packages/node/src/index.ts @@ -60,7 +60,7 @@ export { makeNodeTransport } from './transports'; export { defaultIntegrations, init, defaultStackParser, lastEventId, flush, close, getSentryRelease } from './sdk'; export { addRequestDataToEvent, DEFAULT_USER_INCLUDES, extractRequestData } from './requestdata'; export { deepReadDirSync } from './utils'; -export { getModule } from './module'; +export { getModuleFromFilename } from './module'; import { Integrations as CoreIntegrations } from '@sentry/core'; diff --git a/packages/node/src/module.ts b/packages/node/src/module.ts index 595ee09bbe49..44bff87a02d2 100644 --- a/packages/node/src/module.ts +++ b/packages/node/src/module.ts @@ -10,7 +10,7 @@ function normalizeWindowsPath(path: string): string { } /** Gets the module from a filename */ -export function getModule( +export function getModuleFromFilename( filename: string | undefined, normalizeWindowsPathSeparator: boolean = isWindowsPlatform, ): string | undefined { diff --git a/packages/node/src/sdk.ts b/packages/node/src/sdk.ts index fee681921bb3..06be10d848b6 100644 --- a/packages/node/src/sdk.ts +++ b/packages/node/src/sdk.ts @@ -31,7 +31,7 @@ import { RequestData, Undici, } from './integrations'; -import { getModule } from './module'; +import { getModuleFromFilename } from './module'; import { makeNodeTransport } from './transports'; import type { NodeClientOptions, NodeOptions } from './types'; @@ -267,7 +267,7 @@ export function getSentryRelease(fallback?: string): string | undefined { } /** Node.js stack parser */ -export const defaultStackParser: StackParser = createStackParser(nodeStackLineParser(getModule)); +export const defaultStackParser: StackParser = createStackParser(nodeStackLineParser(getModuleFromFilename)); /** * Enable automatic Session Tracking for the node process. diff --git a/packages/node/test/module.test.ts b/packages/node/test/module.test.ts index 39f1e9758f46..e27f1482ff90 100644 --- a/packages/node/test/module.test.ts +++ b/packages/node/test/module.test.ts @@ -1,4 +1,4 @@ -import { getModule } from '../src/module'; +import { getModuleFromFilename } from '../src/module'; function withFilename(fn: () => void, filename: string) { const prevFilename = require.main?.filename; @@ -15,16 +15,16 @@ function withFilename(fn: () => void, filename: string) { } } -describe('getModule', () => { +describe('getModuleFromFilename', () => { test('Windows', () => { withFilename(() => { - expect(getModule('C:\\Users\\users\\Tim\\Desktop\\node_modules\\module.js', true)).toEqual('module'); + expect(getModuleFromFilename('C:\\Users\\users\\Tim\\Desktop\\node_modules\\module.js', true)).toEqual('module'); }, 'C:\\Users\\Tim\\app.js'); }); test('POSIX', () => { withFilename(() => { - expect(getModule('/Users/users/Tim/Desktop/node_modules/module.js')).toEqual('module'); + expect(getModuleFromFilename('/Users/users/Tim/Desktop/node_modules/module.js')).toEqual('module'); }, '/Users/Tim/app.js'); }); });