ref: Enable noUncheckedIndexedAccess TS config#12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
mydea merged 8 commits into from
Jun 14, 2024
Merged

ref: Enable noUncheckedIndexedAccess TS config #12461

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
911b3f0
ref: Enable `noUncheckedIndexedAccess ` TS config
mydea Jun 13, 2024
11d55ad
fix remix
mydea Jun 13, 2024
255e0d5
try-fix-test?
mydea Jun 13, 2024
2a518a7
ref: Fix ts version properly for tests
mydea Jun 14, 2024
686a898
fix remix test
mydea Jun 14, 2024
e088a14
fix script path, oops
mydea Jun 14, 2024
0ee08f7
oops, remove again
mydea Jun 14, 2024
e22cffd
fix prepack script
mydea Jun 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions .github/workflows/build.yml
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -896,15 +896,15 @@ jobs:

- name: Overwrite typescript version
if: matrix.typescript
run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
working-directory: dev-packages/node-integration-tests

- name: Run integration tests
env:
NODE_VERSION: ${{ matrix.node }}
TS_VERSION: ${{ matrix.typescript }}
run: |
cd dev-packages/node-integration-tests
yarn test
working-directory: dev-packages/node-integration-tests
run: yarn test

job_remix_integration_tests:
name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
Expand Down
23 changes: 23 additions & 0 deletions dev-packages/node-integration-tests/scripts/use-ts-version.js
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');
const { writeFileSync } = require('fs');

const cwd = join(__dirname, '../../..');

const tsVersion = process.argv[2] || '3.8';

console.log(`Installing typescript@${tsVersion}...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion}`, { stdio: 'inherit', cwd });

Check warning

Code scanning / CodeQL

Indirect uncontrolled command line

This command depends on an unsanitized [command-line argument](1).

console.log('Removing unsupported tsconfig options...');

const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');

const tsConfig = require(baseTscConfigPath);

// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;

writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));
6 changes: 3 additions & 3 deletions dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('complex-router', () => {
test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
// parse node.js major version
const [major] = process.versions.node.split('.').map(Number);
const [major = 0] = process.versions.node.split('.').map(Number);
// Split test result base on major node version because regex d flag is support from node 16+

const EXPECTED_TRANSACTION =
Expand All@@ -36,7 +36,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
// parse node.js major version
const [major] = process.versions.node.split('.').map(Number);
const [major = 0] = process.versions.node.split('.').map(Number);
// Split test result base on major node version because regex d flag is support from node 16+
const EXPECTED_TRANSACTION =
major >= 16
Expand All@@ -62,7 +62,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
// parse node.js major version
const [major] = process.versions.node.split('.').map(Number);
const [major = 0] = process.versions.node.split('.').map(Number);
// Split test result base on major node version because regex d flag is support from node 16+
const EXPECTED_TRANSACTION =
major >= 16
Expand Down
2 changes: 1 addition & 1 deletion ...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
// parse node.js major version
const [major] = process.versions.node.split('.').map(Number);
const [major = 0] = process.versions.node.split('.').map(Number);
// Split test result base on major node version because regex d flag is support from node 16+
const EXPECTED_TRANSACTION =
major >= 16
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
.ignore('session')
.expect({
event: event => {
for (const frame of event.exception?.values?.[0].stacktrace?.frames || []) {
for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
expect(frame.vars).toBeUndefined();
}
},
Expand Down
2 changes: 1 addition & 1 deletion dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ test('should report finished spans as children of the root transaction.', done =
.expect({
transaction: transaction => {
const rootSpanId = transaction.contexts?.trace?.span_id;
const span3Id = transaction.spans?.[1].span_id;
const span3Id = transaction.spans?.[1]?.span_id;

expect(rootSpanId).toEqual(expect.any(String));
expect(span3Id).toEqual(expect.any(String));
Expand Down
3 changes: 3 additions & 0 deletions dev-packages/node-integration-tests/suites/tsconfig.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
"extends": "../tsconfig.test.json",
}
12 changes: 9 additions & 3 deletions dev-packages/node-integration-tests/utils/index.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -196,7 +196,13 @@ export class TestEnv {
* @returns The extracted envelope.
*/
public async getEnvelopeRequest(options?: DataCollectorOptions): Promise<Array<Record<string, unknown>>> {
return (await this.getMultipleEnvelopeRequest({ ...options, count: 1 }))[0];
const requests = await this.getMultipleEnvelopeRequest({ ...options, count: 1 });

if (!requests[0]) {
throw new Error('No requests found');
}

return requests[0];
}

/**
Expand DownExpand Up@@ -239,7 +245,7 @@ export class TestEnv {
.post('/api/1337/envelope/', body => {
const envelope = parseEnvelope(body);

if (envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
if (envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
envelopes.push(envelope);
} else {
return false;
Expand DownExpand Up@@ -296,7 +302,7 @@ export class TestEnv {
.post('/api/1337/envelope/', body => {
const envelope = parseEnvelope(body);

if (options.envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
if (options.envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
reqCount++;
return true;
}
Expand Down
21 changes: 9 additions & 12 deletions dev-packages/overhead-metrics/src/util/github.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ const octokit = new Octokit({
// log: console,
});

const [, owner, repo] = (await Git.repository).split('/');
const [, owner, repo] = (await Git.repository).split('/') as [string, string, string];
const defaultArgs = { owner, repo };

async function downloadArtifact(url: string, path: string): Promise<void> {
Expand DownExpand Up@@ -51,15 +51,10 @@ async function tryAddOrUpdateComment(commentBuilder: PrCommentBuilder): Promise<
For example, refs/heads/feature-branch-1.
*/
let prNumber: number | undefined;
if (
typeof process.env.GITHUB_REF == 'string' &&
process.env.GITHUB_REF.length > 0 &&
process.env.GITHUB_REF.startsWith('refs/pull/')
) {
prNumber = parseInt(process.env.GITHUB_REF.split('/')[2]);
console.log(
`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${process.env.GITHUB_REF}'`,
);
const githubRef = process.env.GITHUB_REF;
if (typeof githubRef == 'string' && githubRef.length > 0 && githubRef.startsWith('refs/pull/')) {
prNumber = parseInt(githubRef.split('/')[2] as string);
console.log(`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${githubRef}'`);
} else if (!(await Git.branchIsBase)) {
prNumber = (
await octokit.rest.pulls.list({
Expand DownExpand Up@@ -155,15 +150,17 @@ export const GitHub = {
status: 'success',
});

if (workflowRuns.data.total_count == 0) {
const firstRun = workflowRuns.data.workflow_runs[0];

if (workflowRuns.data.total_count == 0 || !firstRun) {
console.warn(`Couldn't find any successful run for workflow '${workflow.name}'`);
return;
}

const artifact = (
await octokit.actions.listWorkflowRunArtifacts({
...defaultArgs,
run_id: workflowRuns.data.workflow_runs[0].id,
run_id: firstRun.id,
})
).data.artifacts.find(it => it.name == artifactName);

Expand Down
2 changes: 1 addition & 1 deletion dev-packages/test-utils/src/event-proxy-server.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
: Buffer.concat(proxyRequestChunks).toString();

const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0]);
const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);

const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;

Expand Down
2 changes: 1 addition & 1 deletion packages/aws-serverless/src/sdk.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ export function tryPatchHandler(taskRoot: string, handlerPath: string): void {
return;
}

const [, handlerMod, handlerName] = match;
const [, handlerMod = '', handlerName = ''] = match;

let obj: HandlerBag;
try {
Expand Down
2 changes: 1 addition & 1 deletion packages/aws-serverless/test/sdk.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -502,7 +502,7 @@ describe('AWSLambda', () => {

expect(evtProcessor).toBeInstanceOf(Function);
// @ts-expect-error just mocking around...
expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
handled: false,
type: 'generic',
});
Expand Down
11 changes: 6 additions & 5 deletions packages/browser-utils/src/metrics/browserMetrics.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -282,21 +282,22 @@ export function addPerformanceEntries(span: Span): void {
_addTtfbRequestTimeToMeasurements(_measurements);

['fcp', 'fp', 'lcp'].forEach(name => {
if (!_measurements[name] || !transactionStartTime || timeOrigin >= transactionStartTime) {
const measurement = _measurements[name];
if (!measurement || !transactionStartTime || timeOrigin >= transactionStartTime) {
return;
}
// The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
// Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
// to be adjusted to be relative to span.startTimestamp.
const oldValue = _measurements[name].value;
const oldValue = measurement.value;
const measurementTimestamp = timeOrigin + msToSec(oldValue);

// normalizedValue should be in milliseconds
const normalizedValue = Math.abs((measurementTimestamp - transactionStartTime) * 1000);
const delta = normalizedValue - oldValue;

DEBUG_BUILD && logger.log(`[Measurements] Normalized ${name} from ${oldValue} to ${normalizedValue} (${delta})`);
_measurements[name].value = normalizedValue;
measurement.value = normalizedValue;
});

const fidMark = _measurements['mark.fid'];
Expand All@@ -320,8 +321,8 @@ export function addPerformanceEntries(span: Span): void {
delete _measurements.cls;
}

Object.keys(_measurements).forEach(measurementName => {
setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
Object.entries(_measurements).forEach(([measurementName, measurement]) => {
setMeasurement(measurementName, measurement.value, measurement.unit);
});

_tagMetricInfo(span);
Expand Down
2 changes: 2 additions & 0 deletions packages/browser-utils/src/metrics/web-vitals/getCLS.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,8 @@ export const onCLS = (onReport: CLSReportCallback, opts: ReportOpts = {}): void
// session.
if (
sessionValue &&
firstSessionEntry &&
lastSessionEntry &&
entry.startTime - lastSessionEntry.startTime < 1000 &&
entry.startTime - firstSessionEntry.startTime < 5000
) {
Expand Down
2 changes: 1 addition & 1 deletion packages/browser-utils/src/metrics/web-vitals/getINP.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ const processEntry = (entry: PerformanceEventTiming) => {
if (
existingInteraction ||
longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
entry.duration > minLongestInteraction.latency
(minLongestInteraction && entry.duration > minLongestInteraction.latency)
) {
// If the interaction already exists, update it. Otherwise create one.
if (existingInteraction) {
Expand Down
8 changes: 4 additions & 4 deletions packages/browser-utils/test/browser/browserMetrics.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ describe('_addResourceSpans', () => {
},
];
for (let i = 0; i < table.length; i++) {
const { initiatorType, op } = table[i];
const { initiatorType, op } = table[i]!;
const entry: ResourceEntry = {
initiatorType,
};
Expand DownExpand Up@@ -250,7 +250,7 @@ describe('_addResourceSpans', () => {
_addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

expect(spans).toHaveLength(1);
expect(spanToJSON(spans[0])).toEqual(
expect(spanToJSON(spans[0]!)).toEqual(
expect.objectContaining({
data: {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -284,7 +284,7 @@ describe('_addResourceSpans', () => {
_addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

expect(spans).toHaveLength(1);
expect(spanToJSON(spans[0])).toEqual(
expect(spanToJSON(spans[0]!)).toEqual(
expect.objectContaining({
data: {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -321,7 +321,7 @@ describe('_addResourceSpans', () => {
_addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

expect(spans).toHaveLength(1);
expect(spanToJSON(spans[0])).toEqual(
expect(spanToJSON(spans[0]!)).toEqual(
expect.objectContaining({
data: {
[SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand Down
3 changes: 2 additions & 1 deletion packages/browser/src/eventbuilder.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,8 @@ function eventFromPlainObject(
const frames = parseStackFrames(stackParser, syntheticException);
if (frames.length) {
// event.exception.values[0] has been set above
event.exception.values[0].stacktrace = { frames };
// eslint-disable-next-line @typescript-eslint/no-non-null-assertion
event.exception.values[0]!.stacktrace = { frames };
}
}

Expand Down
52 changes: 28 additions & 24 deletions packages/browser/src/integrations/httpclient.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -77,28 +77,8 @@ function _fetchResponseHandler(
let requestHeaders, responseHeaders, requestCookies, responseCookies;

if (_shouldSendDefaultPii()) {
[{ headers: requestHeaders, cookies: requestCookies }, { headers: responseHeaders, cookies: responseCookies }] = [
{ cookieHeader: 'Cookie', obj: request },
{ cookieHeader: 'Set-Cookie', obj: response },
].map(({ cookieHeader, obj }) => {
const headers = _extractFetchHeaders(obj.headers);
let cookies;

try {
const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

if (cookieString) {
cookies = _parseCookieString(cookieString);
}
} catch (e) {
DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
}

return {
headers,
cookies,
};
});
[requestHeaders, requestCookies] = _parseCookieHeaders('Cookie', request);
[responseHeaders, responseCookies] = _parseCookieHeaders('Set-Cookie', response);
Comment on lines +80 to +81

@s1gr1ds1gr1dJun 12, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!

}

const event = _createEvent({
Expand All@@ -115,6 +95,26 @@ function _fetchResponseHandler(
}
}

function _parseCookieHeaders(
cookieHeader: string,
obj: Request | Response,
): [Record<string, string>, Record<string, string> | undefined] {
const headers = _extractFetchHeaders(obj.headers);
let cookies;

try {
const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

if (cookieString) {
cookies = _parseCookieString(cookieString);
}
} catch (e) {
DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
}

return [headers, cookies];
}

/**
* Interceptor function for XHR requests
*
Expand DownExpand Up@@ -192,7 +192,9 @@ function _getResponseSizeFromHeaders(headers?: Record<string, string>): number |
function _parseCookieString(cookieString: string): Record<string, string> {
return cookieString.split('; ').reduce((acc: Record<string, string>, cookie: string) => {
const [key, value] = cookie.split('=');
acc[key] = value;
if (key && value) {
acc[key] = value;
}
return acc;
}, {});
}
Expand DownExpand Up@@ -228,7 +230,9 @@ function _getXHRResponseHeaders(xhr: XMLHttpRequest): Record<string, string> {

return headers.split('\r\n').reduce((acc: Record<string, string>, line: string) => {
const [key, value] = line.split(': ');
acc[key] = value;
if (key && value) {
acc[key] = value;
}
return acc;
}, {});
}
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
ref: Enable noUncheckedIndexedAccess  TS config#12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 8 commits into

from

Jun 14, 2024
 Merged


ref: Enable noUncheckedIndexedAccess  TS config
#12461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
911b3f0

ref: Enable `noUncheckedIndexedAccess ` TS config


mydea Jun 13, 2024
11d55ad

fix remix


mydea Jun 13, 2024
255e0d5

try-fix-test?


mydea Jun 13, 2024
2a518a7

ref: Fix ts version properly for tests


mydea Jun 14, 2024
686a898

fix remix test


mydea Jun 14, 2024
e088a14

fix script path, oops


mydea Jun 14, 2024
0ee08f7

oops, remove again


mydea Jun 14, 2024
e22cffd

fix prepack script


mydea Jun 14, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -896,15 +896,15 @@ jobs:

 - name: Overwrite typescript version
 if: matrix.typescript
 run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
 run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
 working-directory: dev-packages/node-integration-tests

 - name: Run integration tests
 env:
 NODE_VERSION: ${{ matrix.node }}
 TS_VERSION: ${{ matrix.typescript }}
 run: |
 cd dev-packages/node-integration-tests
 yarn test
 working-directory: dev-packages/node-integration-tests
 run: yarn test

 job_remix_integration_tests:
 name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
Expand Down

23 changes: 23 additions & 0 deletions
dev-packages/node-integration-tests/scripts/use-ts-version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');
const { writeFileSync } = require('fs');

const cwd = join(__dirname, '../../..');

const tsVersion = process.argv[2] || '3.8';

console.log(`Installing typescript@${tsVersion}...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion}`, { stdio: 'inherit', cwd });

Check warning

Code scanning / CodeQL


Indirect uncontrolled command line


This command depends on an unsanitized [command-line argument](1).


console.log('Removing unsupported tsconfig options...');

const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');

const tsConfig = require(baseTscConfigPath);

// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;

writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

6 changes: 3 additions & 3 deletions
dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('complex-router', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+

 const EXPECTED_TRANSACTION =
Expand All@@ -36,7 +36,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand All@@ -62,7 +62,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
 .ignore('session')
 .expect({
 event: event => {
 for (const frame of event.exception?.values?.[0].stacktrace?.frames || []) {
 for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
 expect(frame.vars).toBeUndefined();
 }
 },
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ test('should report finished spans as children of the root transaction.', done =
 .expect({
 transaction: transaction => {
 const rootSpanId = transaction.contexts?.trace?.span_id;
 const span3Id = transaction.spans?.[1].span_id;
 const span3Id = transaction.spans?.[1]?.span_id;

 expect(rootSpanId).toEqual(expect.any(String));
 expect(span3Id).toEqual(expect.any(String));
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.test.json",
}

12 changes: 9 additions & 3 deletions
dev-packages/node-integration-tests/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,7 +196,13 @@ export class TestEnv {
 * @returns The extracted envelope.
 */
 public async getEnvelopeRequest(options?: DataCollectorOptions): Promise<Array<Record<string, unknown>>> {
 return (await this.getMultipleEnvelopeRequest({ ...options, count: 1 }))[0];
 const requests = await this.getMultipleEnvelopeRequest({ ...options, count: 1 });

 if (!requests[0]) {
 throw new Error('No requests found');
 }

 return requests[0];
 }

 /**
Expand DownExpand Up@@ -239,7 +245,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 envelopes.push(envelope);
 } else {
 return false;
Expand DownExpand Up@@ -296,7 +302,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (options.envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (options.envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 reqCount++;
 return true;
 }
Expand Down

21 changes: 9 additions & 12 deletions
dev-packages/overhead-metrics/src/util/github.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ const octokit = new Octokit({
 // log: console,
});

const [, owner, repo] = (await Git.repository).split('/');
const [, owner, repo] = (await Git.repository).split('/') as [string, string, string];
const defaultArgs = { owner, repo };

async function downloadArtifact(url: string, path: string): Promise<void> {
Expand DownExpand Up@@ -51,15 +51,10 @@ async function tryAddOrUpdateComment(commentBuilder: PrCommentBuilder): Promise<
 For example, refs/heads/feature-branch-1.
 */
 let prNumber: number | undefined;
 if (
 typeof process.env.GITHUB_REF == 'string' &&
 process.env.GITHUB_REF.length > 0 &&
 process.env.GITHUB_REF.startsWith('refs/pull/')
 ) {
 prNumber = parseInt(process.env.GITHUB_REF.split('/')[2]);
 console.log(
 `Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${process.env.GITHUB_REF}'`,
 );
 const githubRef = process.env.GITHUB_REF;
 if (typeof githubRef == 'string' && githubRef.length > 0 && githubRef.startsWith('refs/pull/')) {
 prNumber = parseInt(githubRef.split('/')[2] as string);
 console.log(`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${githubRef}'`);
 } else if (!(await Git.branchIsBase)) {
 prNumber = (
 await octokit.rest.pulls.list({
Expand DownExpand Up@@ -155,15 +150,17 @@ export const GitHub = {
 status: 'success',
 });

 if (workflowRuns.data.total_count == 0) {
 const firstRun = workflowRuns.data.workflow_runs[0];

 if (workflowRuns.data.total_count == 0 || !firstRun) {
 console.warn(`Couldn't find any successful run for workflow '${workflow.name}'`);
 return;
 }

 const artifact = (
 await octokit.actions.listWorkflowRunArtifacts({
 ...defaultArgs,
 run_id: workflowRuns.data.workflow_runs[0].id,
 run_id: firstRun.id,
 })
 ).data.artifacts.find(it => it.name == artifactName);

Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/test-utils/src/event-proxy-server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
 ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
 : Buffer.concat(proxyRequestChunks).toString();

 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0]);
 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);

 const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;

Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/src/sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ export function tryPatchHandler(taskRoot: string, handlerPath: string): void {
 return;
 }

 const [, handlerMod, handlerName] = match;
 const [, handlerMod = '', handlerName = ''] = match;

 let obj: HandlerBag;
 try {
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/test/sdk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -502,7 +502,7 @@ describe('AWSLambda', () => {

 expect(evtProcessor).toBeInstanceOf(Function);
 // @ts-expect-error just mocking around...
 expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
 expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
 handled: false,
 type: 'generic',
 });
Expand Down

11 changes: 6 additions & 5 deletions
packages/browser-utils/src/metrics/browserMetrics.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -282,21 +282,22 @@ export function addPerformanceEntries(span: Span): void {
 _addTtfbRequestTimeToMeasurements(_measurements);

 ['fcp', 'fp', 'lcp'].forEach(name => {
 if (!_measurements[name] || !transactionStartTime || timeOrigin >= transactionStartTime) {
 const measurement = _measurements[name];
 if (!measurement || !transactionStartTime || timeOrigin >= transactionStartTime) {
 return;
 }
 // The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
 // Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
 // to be adjusted to be relative to span.startTimestamp.
 const oldValue = _measurements[name].value;
 const oldValue = measurement.value;
 const measurementTimestamp = timeOrigin + msToSec(oldValue);

 // normalizedValue should be in milliseconds
 const normalizedValue = Math.abs((measurementTimestamp - transactionStartTime) * 1000);
 const delta = normalizedValue - oldValue;

 DEBUG_BUILD && logger.log(`[Measurements] Normalized ${name} from ${oldValue} to ${normalizedValue} (${delta})`);
_measurements[name].value = normalizedValue;
measurement.value = normalizedValue;
 });

 const fidMark = _measurements['mark.fid'];
Expand All@@ -320,8 +321,8 @@ export function addPerformanceEntries(span: Span): void {
 delete _measurements.cls;
 }

 Object.keys(_measurements).forEach(measurementName => {
 setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
 Object.entries(_measurements).forEach(([measurementName, measurement]) => {
 setMeasurement(measurementName, measurement.value, measurement.unit);
 });

 _tagMetricInfo(span);
Expand Down

2 changes: 2 additions & 0 deletions
packages/browser-utils/src/metrics/web-vitals/getCLS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,8 @@ export const onCLS = (onReport: CLSReportCallback, opts: ReportOpts = {}): void
 // session.
 if (
 sessionValue &&
 firstSessionEntry &&
 lastSessionEntry &&
 entry.startTime - lastSessionEntry.startTime < 1000 &&
 entry.startTime - firstSessionEntry.startTime < 5000
 ) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/browser-utils/src/metrics/web-vitals/getINP.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ const processEntry = (entry: PerformanceEventTiming) => {
 if (
 existingInteraction ||
 longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
 entry.duration > minLongestInteraction.latency
(minLongestInteraction && entry.duration > minLongestInteraction.latency)
 ) {
 // If the interaction already exists, update it. Otherwise create one.
 if (existingInteraction) {
Expand Down

8 changes: 4 additions & 4 deletions
packages/browser-utils/test/browser/browserMetrics.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ describe('_addResourceSpans', () => {
 },
 ];
 for (let i = 0; i < table.length; i++) {
 const { initiatorType, op } = table[i];
 const { initiatorType, op } = table[i]!;
 const entry: ResourceEntry = {
 initiatorType,
 };
Expand DownExpand Up@@ -250,7 +250,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -284,7 +284,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -321,7 +321,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand Down

3 changes: 2 additions & 1 deletion
packages/browser/src/eventbuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,8 @@ function eventFromPlainObject(
 const frames = parseStackFrames(stackParser, syntheticException);
 if (frames.length) {
 // event.exception.values[0] has been set above
 event.exception.values[0].stacktrace = { frames };
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 event.exception.values[0]!.stacktrace = { frames };
 }
 }

Expand Down

52 changes: 28 additions & 24 deletions
packages/browser/src/integrations/httpclient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,28 +77,8 @@ function _fetchResponseHandler(
 let requestHeaders, responseHeaders, requestCookies, responseCookies;

 if (_shouldSendDefaultPii()) {
 [{ headers: requestHeaders, cookies: requestCookies }, { headers: responseHeaders, cookies: responseCookies }] = [
 { cookieHeader: 'Cookie', obj: request },
 { cookieHeader: 'Set-Cookie', obj: response },
 ].map(({ cookieHeader, obj }) => {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return {
 headers,
 cookies,
 };
 });
 [requestHeaders, requestCookies] = _parseCookieHeaders('Cookie', request);
 [responseHeaders, responseCookies] = _parseCookieHeaders('Set-Cookie', response);

Comment on lines

+80
 to 
+81

@s1gr1ds1gr1dJun 12, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!
 }

 const event = _createEvent({
Expand All@@ -115,6 +95,26 @@ function _fetchResponseHandler(
 }
}

function _parseCookieHeaders(
 cookieHeader: string,
 obj: Request | Response,
): [Record<string, string>, Record<string, string> | undefined] {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return [headers, cookies];
}

/**
 * Interceptor function for XHR requests
 *
Expand DownExpand Up@@ -192,7 +192,9 @@ function _getResponseSizeFromHeaders(headers?: Record<string, string>): number |
function _parseCookieString(cookieString: string): Record<string, string> {
 return cookieString.split('; ').reduce((acc: Record<string, string>, cookie: string) => {
 const [key, value] = cookie.split('=');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand DownExpand Up@@ -228,7 +230,9 @@ function _getXHRResponseHeaders(xhr: XMLHttpRequest): Record<string, string> {

 return headers.split('\r\n').reduce((acc: Record<string, string>, line: string) => {
 const [key, value] = line.split(': ');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref: Enable noUncheckedIndexedAccess  TS config#12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 8 commits into

from

Jun 14, 2024
 Merged


ref: Enable noUncheckedIndexedAccess  TS config
#12461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
911b3f0

ref: Enable `noUncheckedIndexedAccess ` TS config


mydea Jun 13, 2024
11d55ad

fix remix


mydea Jun 13, 2024
255e0d5

try-fix-test?


mydea Jun 13, 2024
2a518a7

ref: Fix ts version properly for tests


mydea Jun 14, 2024
686a898

fix remix test


mydea Jun 14, 2024
e088a14

fix script path, oops


mydea Jun 14, 2024
0ee08f7

oops, remove again


mydea Jun 14, 2024
e22cffd

fix prepack script


mydea Jun 14, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -896,15 +896,15 @@ jobs:

 - name: Overwrite typescript version
 if: matrix.typescript
 run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
 run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
 working-directory: dev-packages/node-integration-tests

 - name: Run integration tests
 env:
 NODE_VERSION: ${{ matrix.node }}
 TS_VERSION: ${{ matrix.typescript }}
 run: |
 cd dev-packages/node-integration-tests
 yarn test
 working-directory: dev-packages/node-integration-tests
 run: yarn test

 job_remix_integration_tests:
 name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
Expand Down

23 changes: 23 additions & 0 deletions
dev-packages/node-integration-tests/scripts/use-ts-version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');
const { writeFileSync } = require('fs');

const cwd = join(__dirname, '../../..');

const tsVersion = process.argv[2] || '3.8';

console.log(`Installing typescript@${tsVersion}...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion}`, { stdio: 'inherit', cwd });

Check warning

Code scanning / CodeQL


Indirect uncontrolled command line


This command depends on an unsanitized [command-line argument](1).


console.log('Removing unsupported tsconfig options...');

const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');

const tsConfig = require(baseTscConfigPath);

// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;

writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

6 changes: 3 additions & 3 deletions
dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('complex-router', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+

 const EXPECTED_TRANSACTION =
Expand All@@ -36,7 +36,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand All@@ -62,7 +62,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
 .ignore('session')
 .expect({
 event: event => {
 for (const frame of event.exception?.values?.[0].stacktrace?.frames || []) {
 for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
 expect(frame.vars).toBeUndefined();
 }
 },
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ test('should report finished spans as children of the root transaction.', done =
 .expect({
 transaction: transaction => {
 const rootSpanId = transaction.contexts?.trace?.span_id;
 const span3Id = transaction.spans?.[1].span_id;
 const span3Id = transaction.spans?.[1]?.span_id;

 expect(rootSpanId).toEqual(expect.any(String));
 expect(span3Id).toEqual(expect.any(String));
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.test.json",
}

12 changes: 9 additions & 3 deletions
dev-packages/node-integration-tests/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,7 +196,13 @@ export class TestEnv {
 * @returns The extracted envelope.
 */
 public async getEnvelopeRequest(options?: DataCollectorOptions): Promise<Array<Record<string, unknown>>> {
 return (await this.getMultipleEnvelopeRequest({ ...options, count: 1 }))[0];
 const requests = await this.getMultipleEnvelopeRequest({ ...options, count: 1 });

 if (!requests[0]) {
 throw new Error('No requests found');
 }

 return requests[0];
 }

 /**
Expand DownExpand Up@@ -239,7 +245,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 envelopes.push(envelope);
 } else {
 return false;
Expand DownExpand Up@@ -296,7 +302,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (options.envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (options.envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 reqCount++;
 return true;
 }
Expand Down

21 changes: 9 additions & 12 deletions
dev-packages/overhead-metrics/src/util/github.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ const octokit = new Octokit({
 // log: console,
});

const [, owner, repo] = (await Git.repository).split('/');
const [, owner, repo] = (await Git.repository).split('/') as [string, string, string];
const defaultArgs = { owner, repo };

async function downloadArtifact(url: string, path: string): Promise<void> {
Expand DownExpand Up@@ -51,15 +51,10 @@ async function tryAddOrUpdateComment(commentBuilder: PrCommentBuilder): Promise<
 For example, refs/heads/feature-branch-1.
 */
 let prNumber: number | undefined;
 if (
 typeof process.env.GITHUB_REF == 'string' &&
 process.env.GITHUB_REF.length > 0 &&
 process.env.GITHUB_REF.startsWith('refs/pull/')
 ) {
 prNumber = parseInt(process.env.GITHUB_REF.split('/')[2]);
 console.log(
 `Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${process.env.GITHUB_REF}'`,
 );
 const githubRef = process.env.GITHUB_REF;
 if (typeof githubRef == 'string' && githubRef.length > 0 && githubRef.startsWith('refs/pull/')) {
 prNumber = parseInt(githubRef.split('/')[2] as string);
 console.log(`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${githubRef}'`);
 } else if (!(await Git.branchIsBase)) {
 prNumber = (
 await octokit.rest.pulls.list({
Expand DownExpand Up@@ -155,15 +150,17 @@ export const GitHub = {
 status: 'success',
 });

 if (workflowRuns.data.total_count == 0) {
 const firstRun = workflowRuns.data.workflow_runs[0];

 if (workflowRuns.data.total_count == 0 || !firstRun) {
 console.warn(`Couldn't find any successful run for workflow '${workflow.name}'`);
 return;
 }

 const artifact = (
 await octokit.actions.listWorkflowRunArtifacts({
 ...defaultArgs,
 run_id: workflowRuns.data.workflow_runs[0].id,
 run_id: firstRun.id,
 })
 ).data.artifacts.find(it => it.name == artifactName);

Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/test-utils/src/event-proxy-server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
 ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
 : Buffer.concat(proxyRequestChunks).toString();

 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0]);
 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);

 const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;

Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/src/sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ export function tryPatchHandler(taskRoot: string, handlerPath: string): void {
 return;
 }

 const [, handlerMod, handlerName] = match;
 const [, handlerMod = '', handlerName = ''] = match;

 let obj: HandlerBag;
 try {
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/test/sdk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -502,7 +502,7 @@ describe('AWSLambda', () => {

 expect(evtProcessor).toBeInstanceOf(Function);
 // @ts-expect-error just mocking around...
 expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
 expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
 handled: false,
 type: 'generic',
 });
Expand Down

11 changes: 6 additions & 5 deletions
packages/browser-utils/src/metrics/browserMetrics.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -282,21 +282,22 @@ export function addPerformanceEntries(span: Span): void {
 _addTtfbRequestTimeToMeasurements(_measurements);

 ['fcp', 'fp', 'lcp'].forEach(name => {
 if (!_measurements[name] || !transactionStartTime || timeOrigin >= transactionStartTime) {
 const measurement = _measurements[name];
 if (!measurement || !transactionStartTime || timeOrigin >= transactionStartTime) {
 return;
 }
 // The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
 // Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
 // to be adjusted to be relative to span.startTimestamp.
 const oldValue = _measurements[name].value;
 const oldValue = measurement.value;
 const measurementTimestamp = timeOrigin + msToSec(oldValue);

 // normalizedValue should be in milliseconds
 const normalizedValue = Math.abs((measurementTimestamp - transactionStartTime) * 1000);
 const delta = normalizedValue - oldValue;

 DEBUG_BUILD && logger.log(`[Measurements] Normalized ${name} from ${oldValue} to ${normalizedValue} (${delta})`);
_measurements[name].value = normalizedValue;
measurement.value = normalizedValue;
 });

 const fidMark = _measurements['mark.fid'];
Expand All@@ -320,8 +321,8 @@ export function addPerformanceEntries(span: Span): void {
 delete _measurements.cls;
 }

 Object.keys(_measurements).forEach(measurementName => {
 setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
 Object.entries(_measurements).forEach(([measurementName, measurement]) => {
 setMeasurement(measurementName, measurement.value, measurement.unit);
 });

 _tagMetricInfo(span);
Expand Down

2 changes: 2 additions & 0 deletions
packages/browser-utils/src/metrics/web-vitals/getCLS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,8 @@ export const onCLS = (onReport: CLSReportCallback, opts: ReportOpts = {}): void
 // session.
 if (
 sessionValue &&
 firstSessionEntry &&
 lastSessionEntry &&
 entry.startTime - lastSessionEntry.startTime < 1000 &&
 entry.startTime - firstSessionEntry.startTime < 5000
 ) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/browser-utils/src/metrics/web-vitals/getINP.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ const processEntry = (entry: PerformanceEventTiming) => {
 if (
 existingInteraction ||
 longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
 entry.duration > minLongestInteraction.latency
(minLongestInteraction && entry.duration > minLongestInteraction.latency)
 ) {
 // If the interaction already exists, update it. Otherwise create one.
 if (existingInteraction) {
Expand Down

8 changes: 4 additions & 4 deletions
packages/browser-utils/test/browser/browserMetrics.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ describe('_addResourceSpans', () => {
 },
 ];
 for (let i = 0; i < table.length; i++) {
 const { initiatorType, op } = table[i];
 const { initiatorType, op } = table[i]!;
 const entry: ResourceEntry = {
 initiatorType,
 };
Expand DownExpand Up@@ -250,7 +250,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -284,7 +284,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -321,7 +321,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand Down

3 changes: 2 additions & 1 deletion
packages/browser/src/eventbuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,8 @@ function eventFromPlainObject(
 const frames = parseStackFrames(stackParser, syntheticException);
 if (frames.length) {
 // event.exception.values[0] has been set above
 event.exception.values[0].stacktrace = { frames };
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 event.exception.values[0]!.stacktrace = { frames };
 }
 }

Expand Down

52 changes: 28 additions & 24 deletions
packages/browser/src/integrations/httpclient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,28 +77,8 @@ function _fetchResponseHandler(
 let requestHeaders, responseHeaders, requestCookies, responseCookies;

 if (_shouldSendDefaultPii()) {
 [{ headers: requestHeaders, cookies: requestCookies }, { headers: responseHeaders, cookies: responseCookies }] = [
 { cookieHeader: 'Cookie', obj: request },
 { cookieHeader: 'Set-Cookie', obj: response },
 ].map(({ cookieHeader, obj }) => {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return {
 headers,
 cookies,
 };
 });
 [requestHeaders, requestCookies] = _parseCookieHeaders('Cookie', request);
 [responseHeaders, responseCookies] = _parseCookieHeaders('Set-Cookie', response);

Comment on lines

+80
 to 
+81

@s1gr1ds1gr1dJun 12, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!
 }

 const event = _createEvent({
Expand All@@ -115,6 +95,26 @@ function _fetchResponseHandler(
 }
}

function _parseCookieHeaders(
 cookieHeader: string,
 obj: Request | Response,
): [Record<string, string>, Record<string, string> | undefined] {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return [headers, cookies];
}

/**
 * Interceptor function for XHR requests
 *
Expand DownExpand Up@@ -192,7 +192,9 @@ function _getResponseSizeFromHeaders(headers?: Record<string, string>): number |
function _parseCookieString(cookieString: string): Record<string, string> {
 return cookieString.split('; ').reduce((acc: Record<string, string>, cookie: string) => {
 const [key, value] = cookie.split('=');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand DownExpand Up@@ -228,7 +230,9 @@ function _getXHRResponseHeaders(xhr: XMLHttpRequest): Record<string, string> {

 return headers.split('\r\n').reduce((acc: Record<string, string>, line: string) => {
 const [key, value] = line.split(': ');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref: Enable noUncheckedIndexedAccess  TS config#12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 8 commits into

from

Jun 14, 2024
 Merged


ref: Enable noUncheckedIndexedAccess  TS config
#12461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
911b3f0

ref: Enable `noUncheckedIndexedAccess ` TS config


mydea Jun 13, 2024
11d55ad

fix remix


mydea Jun 13, 2024
255e0d5

try-fix-test?


mydea Jun 13, 2024
2a518a7

ref: Fix ts version properly for tests


mydea Jun 14, 2024
686a898

fix remix test


mydea Jun 14, 2024
e088a14

fix script path, oops


mydea Jun 14, 2024
0ee08f7

oops, remove again


mydea Jun 14, 2024
e22cffd

fix prepack script


mydea Jun 14, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -896,15 +896,15 @@ jobs:

 - name: Overwrite typescript version
 if: matrix.typescript
 run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
 run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
 working-directory: dev-packages/node-integration-tests

 - name: Run integration tests
 env:
 NODE_VERSION: ${{ matrix.node }}
 TS_VERSION: ${{ matrix.typescript }}
 run: |
 cd dev-packages/node-integration-tests
 yarn test
 working-directory: dev-packages/node-integration-tests
 run: yarn test

 job_remix_integration_tests:
 name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
Expand Down

23 changes: 23 additions & 0 deletions
dev-packages/node-integration-tests/scripts/use-ts-version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');
const { writeFileSync } = require('fs');

const cwd = join(__dirname, '../../..');

const tsVersion = process.argv[2] || '3.8';

console.log(`Installing typescript@${tsVersion}...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion}`, { stdio: 'inherit', cwd });

Check warning

Code scanning / CodeQL


Indirect uncontrolled command line


This command depends on an unsanitized [command-line argument](1).


console.log('Removing unsupported tsconfig options...');

const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');

const tsConfig = require(baseTscConfigPath);

// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;

writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

6 changes: 3 additions & 3 deletions
dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('complex-router', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+

 const EXPECTED_TRANSACTION =
Expand All@@ -36,7 +36,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand All@@ -62,7 +62,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
 .ignore('session')
 .expect({
 event: event => {
 for (const frame of event.exception?.values?.[0].stacktrace?.frames || []) {
 for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
 expect(frame.vars).toBeUndefined();
 }
 },
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ test('should report finished spans as children of the root transaction.', done =
 .expect({
 transaction: transaction => {
 const rootSpanId = transaction.contexts?.trace?.span_id;
 const span3Id = transaction.spans?.[1].span_id;
 const span3Id = transaction.spans?.[1]?.span_id;

 expect(rootSpanId).toEqual(expect.any(String));
 expect(span3Id).toEqual(expect.any(String));
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.test.json",
}

12 changes: 9 additions & 3 deletions
dev-packages/node-integration-tests/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,7 +196,13 @@ export class TestEnv {
 * @returns The extracted envelope.
 */
 public async getEnvelopeRequest(options?: DataCollectorOptions): Promise<Array<Record<string, unknown>>> {
 return (await this.getMultipleEnvelopeRequest({ ...options, count: 1 }))[0];
 const requests = await this.getMultipleEnvelopeRequest({ ...options, count: 1 });

 if (!requests[0]) {
 throw new Error('No requests found');
 }

 return requests[0];
 }

 /**
Expand DownExpand Up@@ -239,7 +245,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 envelopes.push(envelope);
 } else {
 return false;
Expand DownExpand Up@@ -296,7 +302,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (options.envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (options.envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 reqCount++;
 return true;
 }
Expand Down

21 changes: 9 additions & 12 deletions
dev-packages/overhead-metrics/src/util/github.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ const octokit = new Octokit({
 // log: console,
});

const [, owner, repo] = (await Git.repository).split('/');
const [, owner, repo] = (await Git.repository).split('/') as [string, string, string];
const defaultArgs = { owner, repo };

async function downloadArtifact(url: string, path: string): Promise<void> {
Expand DownExpand Up@@ -51,15 +51,10 @@ async function tryAddOrUpdateComment(commentBuilder: PrCommentBuilder): Promise<
 For example, refs/heads/feature-branch-1.
 */
 let prNumber: number | undefined;
 if (
 typeof process.env.GITHUB_REF == 'string' &&
 process.env.GITHUB_REF.length > 0 &&
 process.env.GITHUB_REF.startsWith('refs/pull/')
 ) {
 prNumber = parseInt(process.env.GITHUB_REF.split('/')[2]);
 console.log(
 `Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${process.env.GITHUB_REF}'`,
 );
 const githubRef = process.env.GITHUB_REF;
 if (typeof githubRef == 'string' && githubRef.length > 0 && githubRef.startsWith('refs/pull/')) {
 prNumber = parseInt(githubRef.split('/')[2] as string);
 console.log(`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${githubRef}'`);
 } else if (!(await Git.branchIsBase)) {
 prNumber = (
 await octokit.rest.pulls.list({
Expand DownExpand Up@@ -155,15 +150,17 @@ export const GitHub = {
 status: 'success',
 });

 if (workflowRuns.data.total_count == 0) {
 const firstRun = workflowRuns.data.workflow_runs[0];

 if (workflowRuns.data.total_count == 0 || !firstRun) {
 console.warn(`Couldn't find any successful run for workflow '${workflow.name}'`);
 return;
 }

 const artifact = (
 await octokit.actions.listWorkflowRunArtifacts({
 ...defaultArgs,
 run_id: workflowRuns.data.workflow_runs[0].id,
 run_id: firstRun.id,
 })
 ).data.artifacts.find(it => it.name == artifactName);

Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/test-utils/src/event-proxy-server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
 ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
 : Buffer.concat(proxyRequestChunks).toString();

 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0]);
 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);

 const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;

Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/src/sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ export function tryPatchHandler(taskRoot: string, handlerPath: string): void {
 return;
 }

 const [, handlerMod, handlerName] = match;
 const [, handlerMod = '', handlerName = ''] = match;

 let obj: HandlerBag;
 try {
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/test/sdk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -502,7 +502,7 @@ describe('AWSLambda', () => {

 expect(evtProcessor).toBeInstanceOf(Function);
 // @ts-expect-error just mocking around...
 expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
 expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
 handled: false,
 type: 'generic',
 });
Expand Down

11 changes: 6 additions & 5 deletions
packages/browser-utils/src/metrics/browserMetrics.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -282,21 +282,22 @@ export function addPerformanceEntries(span: Span): void {
 _addTtfbRequestTimeToMeasurements(_measurements);

 ['fcp', 'fp', 'lcp'].forEach(name => {
 if (!_measurements[name] || !transactionStartTime || timeOrigin >= transactionStartTime) {
 const measurement = _measurements[name];
 if (!measurement || !transactionStartTime || timeOrigin >= transactionStartTime) {
 return;
 }
 // The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
 // Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
 // to be adjusted to be relative to span.startTimestamp.
 const oldValue = _measurements[name].value;
 const oldValue = measurement.value;
 const measurementTimestamp = timeOrigin + msToSec(oldValue);

 // normalizedValue should be in milliseconds
 const normalizedValue = Math.abs((measurementTimestamp - transactionStartTime) * 1000);
 const delta = normalizedValue - oldValue;

 DEBUG_BUILD && logger.log(`[Measurements] Normalized ${name} from ${oldValue} to ${normalizedValue} (${delta})`);
_measurements[name].value = normalizedValue;
measurement.value = normalizedValue;
 });

 const fidMark = _measurements['mark.fid'];
Expand All@@ -320,8 +321,8 @@ export function addPerformanceEntries(span: Span): void {
 delete _measurements.cls;
 }

 Object.keys(_measurements).forEach(measurementName => {
 setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
 Object.entries(_measurements).forEach(([measurementName, measurement]) => {
 setMeasurement(measurementName, measurement.value, measurement.unit);
 });

 _tagMetricInfo(span);
Expand Down

2 changes: 2 additions & 0 deletions
packages/browser-utils/src/metrics/web-vitals/getCLS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,8 @@ export const onCLS = (onReport: CLSReportCallback, opts: ReportOpts = {}): void
 // session.
 if (
 sessionValue &&
 firstSessionEntry &&
 lastSessionEntry &&
 entry.startTime - lastSessionEntry.startTime < 1000 &&
 entry.startTime - firstSessionEntry.startTime < 5000
 ) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/browser-utils/src/metrics/web-vitals/getINP.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ const processEntry = (entry: PerformanceEventTiming) => {
 if (
 existingInteraction ||
 longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
 entry.duration > minLongestInteraction.latency
(minLongestInteraction && entry.duration > minLongestInteraction.latency)
 ) {
 // If the interaction already exists, update it. Otherwise create one.
 if (existingInteraction) {
Expand Down

8 changes: 4 additions & 4 deletions
packages/browser-utils/test/browser/browserMetrics.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ describe('_addResourceSpans', () => {
 },
 ];
 for (let i = 0; i < table.length; i++) {
 const { initiatorType, op } = table[i];
 const { initiatorType, op } = table[i]!;
 const entry: ResourceEntry = {
 initiatorType,
 };
Expand DownExpand Up@@ -250,7 +250,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -284,7 +284,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -321,7 +321,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand Down

3 changes: 2 additions & 1 deletion
packages/browser/src/eventbuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,8 @@ function eventFromPlainObject(
 const frames = parseStackFrames(stackParser, syntheticException);
 if (frames.length) {
 // event.exception.values[0] has been set above
 event.exception.values[0].stacktrace = { frames };
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 event.exception.values[0]!.stacktrace = { frames };
 }
 }

Expand Down

52 changes: 28 additions & 24 deletions
packages/browser/src/integrations/httpclient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,28 +77,8 @@ function _fetchResponseHandler(
 let requestHeaders, responseHeaders, requestCookies, responseCookies;

 if (_shouldSendDefaultPii()) {
 [{ headers: requestHeaders, cookies: requestCookies }, { headers: responseHeaders, cookies: responseCookies }] = [
 { cookieHeader: 'Cookie', obj: request },
 { cookieHeader: 'Set-Cookie', obj: response },
 ].map(({ cookieHeader, obj }) => {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return {
 headers,
 cookies,
 };
 });
 [requestHeaders, requestCookies] = _parseCookieHeaders('Cookie', request);
 [responseHeaders, responseCookies] = _parseCookieHeaders('Set-Cookie', response);

Comment on lines

+80
 to 
+81

@s1gr1ds1gr1dJun 12, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!
 }

 const event = _createEvent({
Expand All@@ -115,6 +95,26 @@ function _fetchResponseHandler(
 }
}

function _parseCookieHeaders(
 cookieHeader: string,
 obj: Request | Response,
): [Record<string, string>, Record<string, string> | undefined] {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return [headers, cookies];
}

/**
 * Interceptor function for XHR requests
 *
Expand DownExpand Up@@ -192,7 +192,9 @@ function _getResponseSizeFromHeaders(headers?: Record<string, string>): number |
function _parseCookieString(cookieString: string): Record<string, string> {
 return cookieString.split('; ').reduce((acc: Record<string, string>, cookie: string) => {
 const [key, value] = cookie.split('=');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand DownExpand Up@@ -228,7 +230,9 @@ function _getXHRResponseHeaders(xhr: XMLHttpRequest): Record<string, string> {

 return headers.split('\r\n').reduce((acc: Record<string, string>, line: string) => {
 const [key, value] = line.split(': ');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
ref: Enable noUncheckedIndexedAccess  TS config#12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 8 commits into

from

Jun 14, 2024
 Merged


ref: Enable noUncheckedIndexedAccess  TS config
#12461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
911b3f0

ref: Enable `noUncheckedIndexedAccess ` TS config


mydea Jun 13, 2024
11d55ad

fix remix


mydea Jun 13, 2024
255e0d5

try-fix-test?


mydea Jun 13, 2024
2a518a7

ref: Fix ts version properly for tests


mydea Jun 14, 2024
686a898

fix remix test


mydea Jun 14, 2024
e088a14

fix script path, oops


mydea Jun 14, 2024
0ee08f7

oops, remove again


mydea Jun 14, 2024
e22cffd

fix prepack script


mydea Jun 14, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -896,15 +896,15 @@ jobs:

 - name: Overwrite typescript version
 if: matrix.typescript
 run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
 run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
 working-directory: dev-packages/node-integration-tests

 - name: Run integration tests
 env:
 NODE_VERSION: ${{ matrix.node }}
 TS_VERSION: ${{ matrix.typescript }}
 run: |
 cd dev-packages/node-integration-tests
 yarn test
 working-directory: dev-packages/node-integration-tests
 run: yarn test

 job_remix_integration_tests:
 name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
Expand Down

23 changes: 23 additions & 0 deletions
dev-packages/node-integration-tests/scripts/use-ts-version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');
const { writeFileSync } = require('fs');

const cwd = join(__dirname, '../../..');

const tsVersion = process.argv[2] || '3.8';

console.log(`Installing typescript@${tsVersion}...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion}`, { stdio: 'inherit', cwd });

Check warning

Code scanning / CodeQL


Indirect uncontrolled command line


This command depends on an unsanitized [command-line argument](1).


console.log('Removing unsupported tsconfig options...');

const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');

const tsConfig = require(baseTscConfigPath);

// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;

writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

6 changes: 3 additions & 3 deletions
dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('complex-router', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+

 const EXPECTED_TRANSACTION =
Expand All@@ -36,7 +36,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand All@@ -62,7 +62,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
 .ignore('session')
 .expect({
 event: event => {
 for (const frame of event.exception?.values?.[0].stacktrace?.frames || []) {
 for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
 expect(frame.vars).toBeUndefined();
 }
 },
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ test('should report finished spans as children of the root transaction.', done =
 .expect({
 transaction: transaction => {
 const rootSpanId = transaction.contexts?.trace?.span_id;
 const span3Id = transaction.spans?.[1].span_id;
 const span3Id = transaction.spans?.[1]?.span_id;

 expect(rootSpanId).toEqual(expect.any(String));
 expect(span3Id).toEqual(expect.any(String));
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.test.json",
}

12 changes: 9 additions & 3 deletions
dev-packages/node-integration-tests/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,7 +196,13 @@ export class TestEnv {
 * @returns The extracted envelope.
 */
 public async getEnvelopeRequest(options?: DataCollectorOptions): Promise<Array<Record<string, unknown>>> {
 return (await this.getMultipleEnvelopeRequest({ ...options, count: 1 }))[0];
 const requests = await this.getMultipleEnvelopeRequest({ ...options, count: 1 });

 if (!requests[0]) {
 throw new Error('No requests found');
 }

 return requests[0];
 }

 /**
Expand DownExpand Up@@ -239,7 +245,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 envelopes.push(envelope);
 } else {
 return false;
Expand DownExpand Up@@ -296,7 +302,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (options.envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (options.envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 reqCount++;
 return true;
 }
Expand Down

21 changes: 9 additions & 12 deletions
dev-packages/overhead-metrics/src/util/github.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ const octokit = new Octokit({
 // log: console,
});

const [, owner, repo] = (await Git.repository).split('/');
const [, owner, repo] = (await Git.repository).split('/') as [string, string, string];
const defaultArgs = { owner, repo };

async function downloadArtifact(url: string, path: string): Promise<void> {
Expand DownExpand Up@@ -51,15 +51,10 @@ async function tryAddOrUpdateComment(commentBuilder: PrCommentBuilder): Promise<
 For example, refs/heads/feature-branch-1.
 */
 let prNumber: number | undefined;
 if (
 typeof process.env.GITHUB_REF == 'string' &&
 process.env.GITHUB_REF.length > 0 &&
 process.env.GITHUB_REF.startsWith('refs/pull/')
 ) {
 prNumber = parseInt(process.env.GITHUB_REF.split('/')[2]);
 console.log(
 `Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${process.env.GITHUB_REF}'`,
 );
 const githubRef = process.env.GITHUB_REF;
 if (typeof githubRef == 'string' && githubRef.length > 0 && githubRef.startsWith('refs/pull/')) {
 prNumber = parseInt(githubRef.split('/')[2] as string);
 console.log(`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${githubRef}'`);
 } else if (!(await Git.branchIsBase)) {
 prNumber = (
 await octokit.rest.pulls.list({
Expand DownExpand Up@@ -155,15 +150,17 @@ export const GitHub = {
 status: 'success',
 });

 if (workflowRuns.data.total_count == 0) {
 const firstRun = workflowRuns.data.workflow_runs[0];

 if (workflowRuns.data.total_count == 0 || !firstRun) {
 console.warn(`Couldn't find any successful run for workflow '${workflow.name}'`);
 return;
 }

 const artifact = (
 await octokit.actions.listWorkflowRunArtifacts({
 ...defaultArgs,
 run_id: workflowRuns.data.workflow_runs[0].id,
 run_id: firstRun.id,
 })
 ).data.artifacts.find(it => it.name == artifactName);

Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/test-utils/src/event-proxy-server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
 ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
 : Buffer.concat(proxyRequestChunks).toString();

 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0]);
 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);

 const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;

Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/src/sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ export function tryPatchHandler(taskRoot: string, handlerPath: string): void {
 return;
 }

 const [, handlerMod, handlerName] = match;
 const [, handlerMod = '', handlerName = ''] = match;

 let obj: HandlerBag;
 try {
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/test/sdk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -502,7 +502,7 @@ describe('AWSLambda', () => {

 expect(evtProcessor).toBeInstanceOf(Function);
 // @ts-expect-error just mocking around...
 expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
 expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
 handled: false,
 type: 'generic',
 });
Expand Down

11 changes: 6 additions & 5 deletions
packages/browser-utils/src/metrics/browserMetrics.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -282,21 +282,22 @@ export function addPerformanceEntries(span: Span): void {
 _addTtfbRequestTimeToMeasurements(_measurements);

 ['fcp', 'fp', 'lcp'].forEach(name => {
 if (!_measurements[name] || !transactionStartTime || timeOrigin >= transactionStartTime) {
 const measurement = _measurements[name];
 if (!measurement || !transactionStartTime || timeOrigin >= transactionStartTime) {
 return;
 }
 // The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
 // Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
 // to be adjusted to be relative to span.startTimestamp.
 const oldValue = _measurements[name].value;
 const oldValue = measurement.value;
 const measurementTimestamp = timeOrigin + msToSec(oldValue);

 // normalizedValue should be in milliseconds
 const normalizedValue = Math.abs((measurementTimestamp - transactionStartTime) * 1000);
 const delta = normalizedValue - oldValue;

 DEBUG_BUILD && logger.log(`[Measurements] Normalized ${name} from ${oldValue} to ${normalizedValue} (${delta})`);
_measurements[name].value = normalizedValue;
measurement.value = normalizedValue;
 });

 const fidMark = _measurements['mark.fid'];
Expand All@@ -320,8 +321,8 @@ export function addPerformanceEntries(span: Span): void {
 delete _measurements.cls;
 }

 Object.keys(_measurements).forEach(measurementName => {
 setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
 Object.entries(_measurements).forEach(([measurementName, measurement]) => {
 setMeasurement(measurementName, measurement.value, measurement.unit);
 });

 _tagMetricInfo(span);
Expand Down

2 changes: 2 additions & 0 deletions
packages/browser-utils/src/metrics/web-vitals/getCLS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,8 @@ export const onCLS = (onReport: CLSReportCallback, opts: ReportOpts = {}): void
 // session.
 if (
 sessionValue &&
 firstSessionEntry &&
 lastSessionEntry &&
 entry.startTime - lastSessionEntry.startTime < 1000 &&
 entry.startTime - firstSessionEntry.startTime < 5000
 ) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/browser-utils/src/metrics/web-vitals/getINP.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ const processEntry = (entry: PerformanceEventTiming) => {
 if (
 existingInteraction ||
 longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
 entry.duration > minLongestInteraction.latency
(minLongestInteraction && entry.duration > minLongestInteraction.latency)
 ) {
 // If the interaction already exists, update it. Otherwise create one.
 if (existingInteraction) {
Expand Down

8 changes: 4 additions & 4 deletions
packages/browser-utils/test/browser/browserMetrics.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ describe('_addResourceSpans', () => {
 },
 ];
 for (let i = 0; i < table.length; i++) {
 const { initiatorType, op } = table[i];
 const { initiatorType, op } = table[i]!;
 const entry: ResourceEntry = {
 initiatorType,
 };
Expand DownExpand Up@@ -250,7 +250,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -284,7 +284,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -321,7 +321,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand Down

3 changes: 2 additions & 1 deletion
packages/browser/src/eventbuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,8 @@ function eventFromPlainObject(
 const frames = parseStackFrames(stackParser, syntheticException);
 if (frames.length) {
 // event.exception.values[0] has been set above
 event.exception.values[0].stacktrace = { frames };
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 event.exception.values[0]!.stacktrace = { frames };
 }
 }

Expand Down

52 changes: 28 additions & 24 deletions
packages/browser/src/integrations/httpclient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,28 +77,8 @@ function _fetchResponseHandler(
 let requestHeaders, responseHeaders, requestCookies, responseCookies;

 if (_shouldSendDefaultPii()) {
 [{ headers: requestHeaders, cookies: requestCookies }, { headers: responseHeaders, cookies: responseCookies }] = [
 { cookieHeader: 'Cookie', obj: request },
 { cookieHeader: 'Set-Cookie', obj: response },
 ].map(({ cookieHeader, obj }) => {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return {
 headers,
 cookies,
 };
 });
 [requestHeaders, requestCookies] = _parseCookieHeaders('Cookie', request);
 [responseHeaders, responseCookies] = _parseCookieHeaders('Set-Cookie', response);

Comment on lines

+80
 to 
+81

@s1gr1ds1gr1dJun 12, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!
 }

 const event = _createEvent({
Expand All@@ -115,6 +95,26 @@ function _fetchResponseHandler(
 }
}

function _parseCookieHeaders(
 cookieHeader: string,
 obj: Request | Response,
): [Record<string, string>, Record<string, string> | undefined] {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return [headers, cookies];
}

/**
 * Interceptor function for XHR requests
 *
Expand DownExpand Up@@ -192,7 +192,9 @@ function _getResponseSizeFromHeaders(headers?: Record<string, string>): number |
function _parseCookieString(cookieString: string): Record<string, string> {
 return cookieString.split('; ').reduce((acc: Record<string, string>, cookie: string) => {
 const [key, value] = cookie.split('=');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand DownExpand Up@@ -228,7 +230,9 @@ function _getXHRResponseHeaders(xhr: XMLHttpRequest): Record<string, string> {

 return headers.split('\r\n').reduce((acc: Record<string, string>, line: string) => {
 const [key, value] = line.split(': ');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref: Enable noUncheckedIndexedAccess  TS config#12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 8 commits into

from

Jun 14, 2024
 Merged


ref: Enable noUncheckedIndexedAccess  TS config
#12461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
911b3f0

ref: Enable `noUncheckedIndexedAccess ` TS config


mydea Jun 13, 2024
11d55ad

fix remix


mydea Jun 13, 2024
255e0d5

try-fix-test?


mydea Jun 13, 2024
2a518a7

ref: Fix ts version properly for tests


mydea Jun 14, 2024
686a898

fix remix test


mydea Jun 14, 2024
e088a14

fix script path, oops


mydea Jun 14, 2024
0ee08f7

oops, remove again


mydea Jun 14, 2024
e22cffd

fix prepack script


mydea Jun 14, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -896,15 +896,15 @@ jobs:

 - name: Overwrite typescript version
 if: matrix.typescript
 run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
 run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
 working-directory: dev-packages/node-integration-tests

 - name: Run integration tests
 env:
 NODE_VERSION: ${{ matrix.node }}
 TS_VERSION: ${{ matrix.typescript }}
 run: |
 cd dev-packages/node-integration-tests
 yarn test
 working-directory: dev-packages/node-integration-tests
 run: yarn test

 job_remix_integration_tests:
 name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
Expand Down

23 changes: 23 additions & 0 deletions
dev-packages/node-integration-tests/scripts/use-ts-version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');
const { writeFileSync } = require('fs');

const cwd = join(__dirname, '../../..');

const tsVersion = process.argv[2] || '3.8';

console.log(`Installing typescript@${tsVersion}...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion}`, { stdio: 'inherit', cwd });

Check warning

Code scanning / CodeQL


Indirect uncontrolled command line


This command depends on an unsanitized [command-line argument](1).


console.log('Removing unsupported tsconfig options...');

const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');

const tsConfig = require(baseTscConfigPath);

// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;

writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

6 changes: 3 additions & 3 deletions
dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('complex-router', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+

 const EXPECTED_TRANSACTION =
Expand All@@ -36,7 +36,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand All@@ -62,7 +62,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
 .ignore('session')
 .expect({
 event: event => {
 for (const frame of event.exception?.values?.[0].stacktrace?.frames || []) {
 for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
 expect(frame.vars).toBeUndefined();
 }
 },
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ test('should report finished spans as children of the root transaction.', done =
 .expect({
 transaction: transaction => {
 const rootSpanId = transaction.contexts?.trace?.span_id;
 const span3Id = transaction.spans?.[1].span_id;
 const span3Id = transaction.spans?.[1]?.span_id;

 expect(rootSpanId).toEqual(expect.any(String));
 expect(span3Id).toEqual(expect.any(String));
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.test.json",
}

12 changes: 9 additions & 3 deletions
dev-packages/node-integration-tests/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,7 +196,13 @@ export class TestEnv {
 * @returns The extracted envelope.
 */
 public async getEnvelopeRequest(options?: DataCollectorOptions): Promise<Array<Record<string, unknown>>> {
 return (await this.getMultipleEnvelopeRequest({ ...options, count: 1 }))[0];
 const requests = await this.getMultipleEnvelopeRequest({ ...options, count: 1 });

 if (!requests[0]) {
 throw new Error('No requests found');
 }

 return requests[0];
 }

 /**
Expand DownExpand Up@@ -239,7 +245,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 envelopes.push(envelope);
 } else {
 return false;
Expand DownExpand Up@@ -296,7 +302,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (options.envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (options.envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 reqCount++;
 return true;
 }
Expand Down

21 changes: 9 additions & 12 deletions
dev-packages/overhead-metrics/src/util/github.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ const octokit = new Octokit({
 // log: console,
});

const [, owner, repo] = (await Git.repository).split('/');
const [, owner, repo] = (await Git.repository).split('/') as [string, string, string];
const defaultArgs = { owner, repo };

async function downloadArtifact(url: string, path: string): Promise<void> {
Expand DownExpand Up@@ -51,15 +51,10 @@ async function tryAddOrUpdateComment(commentBuilder: PrCommentBuilder): Promise<
 For example, refs/heads/feature-branch-1.
 */
 let prNumber: number | undefined;
 if (
 typeof process.env.GITHUB_REF == 'string' &&
 process.env.GITHUB_REF.length > 0 &&
 process.env.GITHUB_REF.startsWith('refs/pull/')
 ) {
 prNumber = parseInt(process.env.GITHUB_REF.split('/')[2]);
 console.log(
 `Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${process.env.GITHUB_REF}'`,
 );
 const githubRef = process.env.GITHUB_REF;
 if (typeof githubRef == 'string' && githubRef.length > 0 && githubRef.startsWith('refs/pull/')) {
 prNumber = parseInt(githubRef.split('/')[2] as string);
 console.log(`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${githubRef}'`);
 } else if (!(await Git.branchIsBase)) {
 prNumber = (
 await octokit.rest.pulls.list({
Expand DownExpand Up@@ -155,15 +150,17 @@ export const GitHub = {
 status: 'success',
 });

 if (workflowRuns.data.total_count == 0) {
 const firstRun = workflowRuns.data.workflow_runs[0];

 if (workflowRuns.data.total_count == 0 || !firstRun) {
 console.warn(`Couldn't find any successful run for workflow '${workflow.name}'`);
 return;
 }

 const artifact = (
 await octokit.actions.listWorkflowRunArtifacts({
 ...defaultArgs,
 run_id: workflowRuns.data.workflow_runs[0].id,
 run_id: firstRun.id,
 })
 ).data.artifacts.find(it => it.name == artifactName);

Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/test-utils/src/event-proxy-server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
 ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
 : Buffer.concat(proxyRequestChunks).toString();

 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0]);
 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);

 const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;

Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/src/sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ export function tryPatchHandler(taskRoot: string, handlerPath: string): void {
 return;
 }

 const [, handlerMod, handlerName] = match;
 const [, handlerMod = '', handlerName = ''] = match;

 let obj: HandlerBag;
 try {
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/test/sdk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -502,7 +502,7 @@ describe('AWSLambda', () => {

 expect(evtProcessor).toBeInstanceOf(Function);
 // @ts-expect-error just mocking around...
 expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
 expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
 handled: false,
 type: 'generic',
 });
Expand Down

11 changes: 6 additions & 5 deletions
packages/browser-utils/src/metrics/browserMetrics.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -282,21 +282,22 @@ export function addPerformanceEntries(span: Span): void {
 _addTtfbRequestTimeToMeasurements(_measurements);

 ['fcp', 'fp', 'lcp'].forEach(name => {
 if (!_measurements[name] || !transactionStartTime || timeOrigin >= transactionStartTime) {
 const measurement = _measurements[name];
 if (!measurement || !transactionStartTime || timeOrigin >= transactionStartTime) {
 return;
 }
 // The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
 // Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
 // to be adjusted to be relative to span.startTimestamp.
 const oldValue = _measurements[name].value;
 const oldValue = measurement.value;
 const measurementTimestamp = timeOrigin + msToSec(oldValue);

 // normalizedValue should be in milliseconds
 const normalizedValue = Math.abs((measurementTimestamp - transactionStartTime) * 1000);
 const delta = normalizedValue - oldValue;

 DEBUG_BUILD && logger.log(`[Measurements] Normalized ${name} from ${oldValue} to ${normalizedValue} (${delta})`);
_measurements[name].value = normalizedValue;
measurement.value = normalizedValue;
 });

 const fidMark = _measurements['mark.fid'];
Expand All@@ -320,8 +321,8 @@ export function addPerformanceEntries(span: Span): void {
 delete _measurements.cls;
 }

 Object.keys(_measurements).forEach(measurementName => {
 setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
 Object.entries(_measurements).forEach(([measurementName, measurement]) => {
 setMeasurement(measurementName, measurement.value, measurement.unit);
 });

 _tagMetricInfo(span);
Expand Down

2 changes: 2 additions & 0 deletions
packages/browser-utils/src/metrics/web-vitals/getCLS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,8 @@ export const onCLS = (onReport: CLSReportCallback, opts: ReportOpts = {}): void
 // session.
 if (
 sessionValue &&
 firstSessionEntry &&
 lastSessionEntry &&
 entry.startTime - lastSessionEntry.startTime < 1000 &&
 entry.startTime - firstSessionEntry.startTime < 5000
 ) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/browser-utils/src/metrics/web-vitals/getINP.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ const processEntry = (entry: PerformanceEventTiming) => {
 if (
 existingInteraction ||
 longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
 entry.duration > minLongestInteraction.latency
(minLongestInteraction && entry.duration > minLongestInteraction.latency)
 ) {
 // If the interaction already exists, update it. Otherwise create one.
 if (existingInteraction) {
Expand Down

8 changes: 4 additions & 4 deletions
packages/browser-utils/test/browser/browserMetrics.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ describe('_addResourceSpans', () => {
 },
 ];
 for (let i = 0; i < table.length; i++) {
 const { initiatorType, op } = table[i];
 const { initiatorType, op } = table[i]!;
 const entry: ResourceEntry = {
 initiatorType,
 };
Expand DownExpand Up@@ -250,7 +250,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -284,7 +284,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -321,7 +321,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand Down

3 changes: 2 additions & 1 deletion
packages/browser/src/eventbuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,8 @@ function eventFromPlainObject(
 const frames = parseStackFrames(stackParser, syntheticException);
 if (frames.length) {
 // event.exception.values[0] has been set above
 event.exception.values[0].stacktrace = { frames };
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 event.exception.values[0]!.stacktrace = { frames };
 }
 }

Expand Down

52 changes: 28 additions & 24 deletions
packages/browser/src/integrations/httpclient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,28 +77,8 @@ function _fetchResponseHandler(
 let requestHeaders, responseHeaders, requestCookies, responseCookies;

 if (_shouldSendDefaultPii()) {
 [{ headers: requestHeaders, cookies: requestCookies }, { headers: responseHeaders, cookies: responseCookies }] = [
 { cookieHeader: 'Cookie', obj: request },
 { cookieHeader: 'Set-Cookie', obj: response },
 ].map(({ cookieHeader, obj }) => {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return {
 headers,
 cookies,
 };
 });
 [requestHeaders, requestCookies] = _parseCookieHeaders('Cookie', request);
 [responseHeaders, responseCookies] = _parseCookieHeaders('Set-Cookie', response);

Comment on lines

+80
 to 
+81

@s1gr1ds1gr1dJun 12, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!
 }

 const event = _createEvent({
Expand All@@ -115,6 +95,26 @@ function _fetchResponseHandler(
 }
}

function _parseCookieHeaders(
 cookieHeader: string,
 obj: Request | Response,
): [Record<string, string>, Record<string, string> | undefined] {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return [headers, cookies];
}

/**
 * Interceptor function for XHR requests
 *
Expand DownExpand Up@@ -192,7 +192,9 @@ function _getResponseSizeFromHeaders(headers?: Record<string, string>): number |
function _parseCookieString(cookieString: string): Record<string, string> {
 return cookieString.split('; ').reduce((acc: Record<string, string>, cookie: string) => {
 const [key, value] = cookie.split('=');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand DownExpand Up@@ -228,7 +230,9 @@ function _getXHRResponseHeaders(xhr: XMLHttpRequest): Record<string, string> {

 return headers.split('\r\n').reduce((acc: Record<string, string>, line: string) => {
 const [key, value] = line.split(': ');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
ref: Enable noUncheckedIndexedAccess  TS config#12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 8 commits into

from

Jun 14, 2024
 Merged


ref: Enable noUncheckedIndexedAccess  TS config
#12461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
911b3f0

ref: Enable `noUncheckedIndexedAccess ` TS config


mydea Jun 13, 2024
11d55ad

fix remix


mydea Jun 13, 2024
255e0d5

try-fix-test?


mydea Jun 13, 2024
2a518a7

ref: Fix ts version properly for tests


mydea Jun 14, 2024
686a898

fix remix test


mydea Jun 14, 2024
e088a14

fix script path, oops


mydea Jun 14, 2024
0ee08f7

oops, remove again


mydea Jun 14, 2024
e22cffd

fix prepack script


mydea Jun 14, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -896,15 +896,15 @@ jobs:

 - name: Overwrite typescript version
 if: matrix.typescript
 run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
 run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
 working-directory: dev-packages/node-integration-tests

 - name: Run integration tests
 env:
 NODE_VERSION: ${{ matrix.node }}
 TS_VERSION: ${{ matrix.typescript }}
 run: |
 cd dev-packages/node-integration-tests
 yarn test
 working-directory: dev-packages/node-integration-tests
 run: yarn test

 job_remix_integration_tests:
 name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
Expand Down

23 changes: 23 additions & 0 deletions
dev-packages/node-integration-tests/scripts/use-ts-version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');
const { writeFileSync } = require('fs');

const cwd = join(__dirname, '../../..');

const tsVersion = process.argv[2] || '3.8';

console.log(`Installing typescript@${tsVersion}...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion}`, { stdio: 'inherit', cwd });

Check warning

Code scanning / CodeQL


Indirect uncontrolled command line


This command depends on an unsanitized [command-line argument](1).


console.log('Removing unsupported tsconfig options...');

const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');

const tsConfig = require(baseTscConfigPath);

// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;

writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

6 changes: 3 additions & 3 deletions
dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('complex-router', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+

 const EXPECTED_TRANSACTION =
Expand All@@ -36,7 +36,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand All@@ -62,7 +62,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
 .ignore('session')
 .expect({
 event: event => {
 for (const frame of event.exception?.values?.[0].stacktrace?.frames || []) {
 for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
 expect(frame.vars).toBeUndefined();
 }
 },
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ test('should report finished spans as children of the root transaction.', done =
 .expect({
 transaction: transaction => {
 const rootSpanId = transaction.contexts?.trace?.span_id;
 const span3Id = transaction.spans?.[1].span_id;
 const span3Id = transaction.spans?.[1]?.span_id;

 expect(rootSpanId).toEqual(expect.any(String));
 expect(span3Id).toEqual(expect.any(String));
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.test.json",
}

12 changes: 9 additions & 3 deletions
dev-packages/node-integration-tests/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,7 +196,13 @@ export class TestEnv {
 * @returns The extracted envelope.
 */
 public async getEnvelopeRequest(options?: DataCollectorOptions): Promise<Array<Record<string, unknown>>> {
 return (await this.getMultipleEnvelopeRequest({ ...options, count: 1 }))[0];
 const requests = await this.getMultipleEnvelopeRequest({ ...options, count: 1 });

 if (!requests[0]) {
 throw new Error('No requests found');
 }

 return requests[0];
 }

 /**
Expand DownExpand Up@@ -239,7 +245,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 envelopes.push(envelope);
 } else {
 return false;
Expand DownExpand Up@@ -296,7 +302,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (options.envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (options.envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 reqCount++;
 return true;
 }
Expand Down

21 changes: 9 additions & 12 deletions
dev-packages/overhead-metrics/src/util/github.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ const octokit = new Octokit({
 // log: console,
});

const [, owner, repo] = (await Git.repository).split('/');
const [, owner, repo] = (await Git.repository).split('/') as [string, string, string];
const defaultArgs = { owner, repo };

async function downloadArtifact(url: string, path: string): Promise<void> {
Expand DownExpand Up@@ -51,15 +51,10 @@ async function tryAddOrUpdateComment(commentBuilder: PrCommentBuilder): Promise<
 For example, refs/heads/feature-branch-1.
 */
 let prNumber: number | undefined;
 if (
 typeof process.env.GITHUB_REF == 'string' &&
 process.env.GITHUB_REF.length > 0 &&
 process.env.GITHUB_REF.startsWith('refs/pull/')
 ) {
 prNumber = parseInt(process.env.GITHUB_REF.split('/')[2]);
 console.log(
 `Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${process.env.GITHUB_REF}'`,
 );
 const githubRef = process.env.GITHUB_REF;
 if (typeof githubRef == 'string' && githubRef.length > 0 && githubRef.startsWith('refs/pull/')) {
 prNumber = parseInt(githubRef.split('/')[2] as string);
 console.log(`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${githubRef}'`);
 } else if (!(await Git.branchIsBase)) {
 prNumber = (
 await octokit.rest.pulls.list({
Expand DownExpand Up@@ -155,15 +150,17 @@ export const GitHub = {
 status: 'success',
 });

 if (workflowRuns.data.total_count == 0) {
 const firstRun = workflowRuns.data.workflow_runs[0];

 if (workflowRuns.data.total_count == 0 || !firstRun) {
 console.warn(`Couldn't find any successful run for workflow '${workflow.name}'`);
 return;
 }

 const artifact = (
 await octokit.actions.listWorkflowRunArtifacts({
 ...defaultArgs,
 run_id: workflowRuns.data.workflow_runs[0].id,
 run_id: firstRun.id,
 })
 ).data.artifacts.find(it => it.name == artifactName);

Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/test-utils/src/event-proxy-server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
 ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
 : Buffer.concat(proxyRequestChunks).toString();

 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0]);
 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);

 const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;

Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/src/sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ export function tryPatchHandler(taskRoot: string, handlerPath: string): void {
 return;
 }

 const [, handlerMod, handlerName] = match;
 const [, handlerMod = '', handlerName = ''] = match;

 let obj: HandlerBag;
 try {
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/test/sdk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -502,7 +502,7 @@ describe('AWSLambda', () => {

 expect(evtProcessor).toBeInstanceOf(Function);
 // @ts-expect-error just mocking around...
 expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
 expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
 handled: false,
 type: 'generic',
 });
Expand Down

11 changes: 6 additions & 5 deletions
packages/browser-utils/src/metrics/browserMetrics.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -282,21 +282,22 @@ export function addPerformanceEntries(span: Span): void {
 _addTtfbRequestTimeToMeasurements(_measurements);

 ['fcp', 'fp', 'lcp'].forEach(name => {
 if (!_measurements[name] || !transactionStartTime || timeOrigin >= transactionStartTime) {
 const measurement = _measurements[name];
 if (!measurement || !transactionStartTime || timeOrigin >= transactionStartTime) {
 return;
 }
 // The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
 // Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
 // to be adjusted to be relative to span.startTimestamp.
 const oldValue = _measurements[name].value;
 const oldValue = measurement.value;
 const measurementTimestamp = timeOrigin + msToSec(oldValue);

 // normalizedValue should be in milliseconds
 const normalizedValue = Math.abs((measurementTimestamp - transactionStartTime) * 1000);
 const delta = normalizedValue - oldValue;

 DEBUG_BUILD && logger.log(`[Measurements] Normalized ${name} from ${oldValue} to ${normalizedValue} (${delta})`);
_measurements[name].value = normalizedValue;
measurement.value = normalizedValue;
 });

 const fidMark = _measurements['mark.fid'];
Expand All@@ -320,8 +321,8 @@ export function addPerformanceEntries(span: Span): void {
 delete _measurements.cls;
 }

 Object.keys(_measurements).forEach(measurementName => {
 setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
 Object.entries(_measurements).forEach(([measurementName, measurement]) => {
 setMeasurement(measurementName, measurement.value, measurement.unit);
 });

 _tagMetricInfo(span);
Expand Down

2 changes: 2 additions & 0 deletions
packages/browser-utils/src/metrics/web-vitals/getCLS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,8 @@ export const onCLS = (onReport: CLSReportCallback, opts: ReportOpts = {}): void
 // session.
 if (
 sessionValue &&
 firstSessionEntry &&
 lastSessionEntry &&
 entry.startTime - lastSessionEntry.startTime < 1000 &&
 entry.startTime - firstSessionEntry.startTime < 5000
 ) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/browser-utils/src/metrics/web-vitals/getINP.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ const processEntry = (entry: PerformanceEventTiming) => {
 if (
 existingInteraction ||
 longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
 entry.duration > minLongestInteraction.latency
(minLongestInteraction && entry.duration > minLongestInteraction.latency)
 ) {
 // If the interaction already exists, update it. Otherwise create one.
 if (existingInteraction) {
Expand Down

8 changes: 4 additions & 4 deletions
packages/browser-utils/test/browser/browserMetrics.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ describe('_addResourceSpans', () => {
 },
 ];
 for (let i = 0; i < table.length; i++) {
 const { initiatorType, op } = table[i];
 const { initiatorType, op } = table[i]!;
 const entry: ResourceEntry = {
 initiatorType,
 };
Expand DownExpand Up@@ -250,7 +250,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -284,7 +284,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -321,7 +321,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand Down

3 changes: 2 additions & 1 deletion
packages/browser/src/eventbuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,8 @@ function eventFromPlainObject(
 const frames = parseStackFrames(stackParser, syntheticException);
 if (frames.length) {
 // event.exception.values[0] has been set above
 event.exception.values[0].stacktrace = { frames };
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 event.exception.values[0]!.stacktrace = { frames };
 }
 }

Expand Down

52 changes: 28 additions & 24 deletions
packages/browser/src/integrations/httpclient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,28 +77,8 @@ function _fetchResponseHandler(
 let requestHeaders, responseHeaders, requestCookies, responseCookies;

 if (_shouldSendDefaultPii()) {
 [{ headers: requestHeaders, cookies: requestCookies }, { headers: responseHeaders, cookies: responseCookies }] = [
 { cookieHeader: 'Cookie', obj: request },
 { cookieHeader: 'Set-Cookie', obj: response },
 ].map(({ cookieHeader, obj }) => {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return {
 headers,
 cookies,
 };
 });
 [requestHeaders, requestCookies] = _parseCookieHeaders('Cookie', request);
 [responseHeaders, responseCookies] = _parseCookieHeaders('Set-Cookie', response);

Comment on lines

+80
 to 
+81

@s1gr1ds1gr1dJun 12, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!
 }

 const event = _createEvent({
Expand All@@ -115,6 +95,26 @@ function _fetchResponseHandler(
 }
}

function _parseCookieHeaders(
 cookieHeader: string,
 obj: Request | Response,
): [Record<string, string>, Record<string, string> | undefined] {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return [headers, cookies];
}

/**
 * Interceptor function for XHR requests
 *
Expand DownExpand Up@@ -192,7 +192,9 @@ function _getResponseSizeFromHeaders(headers?: Record<string, string>): number |
function _parseCookieString(cookieString: string): Record<string, string> {
 return cookieString.split('; ').reduce((acc: Record<string, string>, cookie: string) => {
 const [key, value] = cookie.split('=');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand DownExpand Up@@ -228,7 +230,9 @@ function _getXHRResponseHeaders(xhr: XMLHttpRequest): Record<string, string> {

 return headers.split('\r\n').reduce((acc: Record<string, string>, line: string) => {
 const [key, value] = line.split(': ');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
ref: Enable noUncheckedIndexedAccess  TS config#12461

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

mydea
merged 8 commits into

from

Jun 14, 2024
 Merged


ref: Enable noUncheckedIndexedAccess  TS config
#12461
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


8 commits


Select commit
Hold shift + click to select a range
911b3f0

ref: Enable `noUncheckedIndexedAccess ` TS config


mydea Jun 13, 2024
11d55ad

fix remix


mydea Jun 13, 2024
255e0d5

try-fix-test?


mydea Jun 13, 2024
2a518a7

ref: Fix ts version properly for tests


mydea Jun 14, 2024
686a898

fix remix test


mydea Jun 14, 2024
e088a14

fix script path, oops


mydea Jun 14, 2024
0ee08f7

oops, remove again


mydea Jun 14, 2024
e22cffd

fix prepack script


mydea Jun 14, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


8 changes: 4 additions & 4 deletions
.github/workflows/build.yml

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -896,15 +896,15 @@ jobs:

 - name: Overwrite typescript version
 if: matrix.typescript
 run: yarn add --dev --ignore-workspace-root-check typescript@${{ matrix.typescript }}
 run: node ./scripts/use-ts-version.js ${{ matrix.typescript }}
 working-directory: dev-packages/node-integration-tests

 - name: Run integration tests
 env:
 NODE_VERSION: ${{ matrix.node }}
 TS_VERSION: ${{ matrix.typescript }}
 run: |
 cd dev-packages/node-integration-tests
 yarn test
 working-directory: dev-packages/node-integration-tests
 run: yarn test

 job_remix_integration_tests:
 name: Remix v${{ matrix.remix }} (Node ${{ matrix.node }}) Tests
Expand Down

23 changes: 23 additions & 0 deletions
dev-packages/node-integration-tests/scripts/use-ts-version.js

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
/* eslint-disable no-console */
const { execSync } = require('child_process');
const { join } = require('path');
const { writeFileSync } = require('fs');

const cwd = join(__dirname, '../../..');

const tsVersion = process.argv[2] || '3.8';

console.log(`Installing typescript@${tsVersion}...`);

execSync(`yarn add --dev --ignore-workspace-root-check typescript@${tsVersion}`, { stdio: 'inherit', cwd });

Check warning

Code scanning / CodeQL


Indirect uncontrolled command line


This command depends on an unsanitized [command-line argument](1).


console.log('Removing unsupported tsconfig options...');

const baseTscConfigPath = join(cwd, 'packages/typescript/tsconfig.json');

const tsConfig = require(baseTscConfigPath);

// TS 3.8 fails build when it encounteres a config option it does not understand, so we remove it :(
delete tsConfig.compilerOptions.noUncheckedIndexedAccess;

writeFileSync(baseTscConfigPath, JSON.stringify(tsConfig, null, 2));

6 changes: 3 additions & 3 deletions
dev-packages/node-integration-tests/suites/express/multiple-routers/complex-router/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('complex-router', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+

 const EXPECTED_TRANSACTION =
Expand All@@ -36,7 +36,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand All@@ -62,7 +62,7 @@ conditionalTest({ min: 16 })('complex-router', () => {

 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route and express used multiple middlewares with route and original url ends with trailing slash and has query params', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
...node-integration-tests/suites/express/multiple-routers/middle-layer-parameterized/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,7 +9,7 @@ afterAll(() => {
conditionalTest({ min: 16 })('middle-layer-parameterized', () => {
 test('should construct correct url with multiple parameterized routers, when param is also contain in middle layer route', done => {
 // parse node.js major version
 const [major] = process.versions.node.split('.').map(Number);
 const [major = 0] = process.versions.node.split('.').map(Number);
 // Split test result base on major node version because regex d flag is support from node 16+
 const EXPECTED_TRANSACTION =
 major >= 16
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/LocalVariables/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,7 +44,7 @@ conditionalTest({ min: 18 })('LocalVariables integration', () => {
 .ignore('session')
 .expect({
 event: event => {
 for (const frame of event.exception?.values?.[0].stacktrace?.frames || []) {
 for (const frame of event.exception?.values?.[0]?.stacktrace?.frames || []) {
 expect(frame.vars).toBeUndefined();
 }
 },
Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/node-integration-tests/suites/public-api/startSpan/with-nested-spans/test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -10,7 +10,7 @@ test('should report finished spans as children of the root transaction.', done =
 .expect({
 transaction: transaction => {
 const rootSpanId = transaction.contexts?.trace?.span_id;
 const span3Id = transaction.spans?.[1].span_id;
 const span3Id = transaction.spans?.[1]?.span_id;

 expect(rootSpanId).toEqual(expect.any(String));
 expect(span3Id).toEqual(expect.any(String));
Expand Down

3 changes: 3 additions & 0 deletions
dev-packages/node-integration-tests/suites/tsconfig.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
{
 "extends": "../tsconfig.test.json",
}

12 changes: 9 additions & 3 deletions
dev-packages/node-integration-tests/utils/index.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -196,7 +196,13 @@ export class TestEnv {
 * @returns The extracted envelope.
 */
 public async getEnvelopeRequest(options?: DataCollectorOptions): Promise<Array<Record<string, unknown>>> {
 return (await this.getMultipleEnvelopeRequest({ ...options, count: 1 }))[0];
 const requests = await this.getMultipleEnvelopeRequest({ ...options, count: 1 });

 if (!requests[0]) {
 throw new Error('No requests found');
 }

 return requests[0];
 }

 /**
Expand DownExpand Up@@ -239,7 +245,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 envelopes.push(envelope);
 } else {
 return false;
Expand DownExpand Up@@ -296,7 +302,7 @@ export class TestEnv {
 .post('/api/1337/envelope/', body => {
 const envelope = parseEnvelope(body);

 if (options.envelopeType.includes(envelope[1].type as EnvelopeItemType)) {
 if (options.envelopeType.includes(envelope[1]?.type as EnvelopeItemType)) {
 reqCount++;
 return true;
 }
Expand Down

21 changes: 9 additions & 12 deletions
dev-packages/overhead-metrics/src/util/github.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -13,7 +13,7 @@ const octokit = new Octokit({
 // log: console,
});

const [, owner, repo] = (await Git.repository).split('/');
const [, owner, repo] = (await Git.repository).split('/') as [string, string, string];
const defaultArgs = { owner, repo };

async function downloadArtifact(url: string, path: string): Promise<void> {
Expand DownExpand Up@@ -51,15 +51,10 @@ async function tryAddOrUpdateComment(commentBuilder: PrCommentBuilder): Promise<
 For example, refs/heads/feature-branch-1.
 */
 let prNumber: number | undefined;
 if (
 typeof process.env.GITHUB_REF == 'string' &&
 process.env.GITHUB_REF.length > 0 &&
 process.env.GITHUB_REF.startsWith('refs/pull/')
 ) {
 prNumber = parseInt(process.env.GITHUB_REF.split('/')[2]);
 console.log(
 `Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${process.env.GITHUB_REF}'`,
 );
 const githubRef = process.env.GITHUB_REF;
 if (typeof githubRef == 'string' && githubRef.length > 0 && githubRef.startsWith('refs/pull/')) {
 prNumber = parseInt(githubRef.split('/')[2] as string);
 console.log(`Determined PR number ${prNumber} based on GITHUB_REF environment variable: '${githubRef}'`);
 } else if (!(await Git.branchIsBase)) {
 prNumber = (
 await octokit.rest.pulls.list({
Expand DownExpand Up@@ -155,15 +150,17 @@ export const GitHub = {
 status: 'success',
 });

 if (workflowRuns.data.total_count == 0) {
 const firstRun = workflowRuns.data.workflow_runs[0];

 if (workflowRuns.data.total_count == 0 || !firstRun) {
 console.warn(`Couldn't find any successful run for workflow '${workflow.name}'`);
 return;
 }

 const artifact = (
 await octokit.actions.listWorkflowRunArtifacts({
 ...defaultArgs,
 run_id: workflowRuns.data.workflow_runs[0].id,
 run_id: firstRun.id,
 })
 ).data.artifacts.find(it => it.name == artifactName);

Expand Down

2 changes: 1 addition & 1 deletion
dev-packages/test-utils/src/event-proxy-server.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -59,7 +59,7 @@ export async function startEventProxyServer(options: EventProxyServerOptions): P
 ? zlib.gunzipSync(Buffer.concat(proxyRequestChunks)).toString()
 : Buffer.concat(proxyRequestChunks).toString();

 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0]);
 const envelopeHeader: EnvelopeItem[0] = JSON.parse(proxyRequestBody.split('\n')[0] as string);

 const shouldForwardEventToSentry = options.forwardToSentry != null ? options.forwardToSentry : true;

Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/src/sdk.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -141,7 +141,7 @@ export function tryPatchHandler(taskRoot: string, handlerPath: string): void {
 return;
 }

 const [, handlerMod, handlerName] = match;
 const [, handlerMod = '', handlerName = ''] = match;

 let obj: HandlerBag;
 try {
Expand Down

2 changes: 1 addition & 1 deletion
packages/aws-serverless/test/sdk.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -502,7 +502,7 @@ describe('AWSLambda', () => {

 expect(evtProcessor).toBeInstanceOf(Function);
 // @ts-expect-error just mocking around...
 expect(evtProcessor(event).exception.values[0].mechanism).toEqual({
 expect(evtProcessor(event).exception.values[0]?.mechanism).toEqual({
 handled: false,
 type: 'generic',
 });
Expand Down

11 changes: 6 additions & 5 deletions
packages/browser-utils/src/metrics/browserMetrics.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -282,21 +282,22 @@ export function addPerformanceEntries(span: Span): void {
 _addTtfbRequestTimeToMeasurements(_measurements);

 ['fcp', 'fp', 'lcp'].forEach(name => {
 if (!_measurements[name] || !transactionStartTime || timeOrigin >= transactionStartTime) {
 const measurement = _measurements[name];
 if (!measurement || !transactionStartTime || timeOrigin >= transactionStartTime) {
 return;
 }
 // The web vitals, fcp, fp, lcp, and ttfb, all measure relative to timeOrigin.
 // Unfortunately, timeOrigin is not captured within the span span data, so these web vitals will need
 // to be adjusted to be relative to span.startTimestamp.
 const oldValue = _measurements[name].value;
 const oldValue = measurement.value;
 const measurementTimestamp = timeOrigin + msToSec(oldValue);

 // normalizedValue should be in milliseconds
 const normalizedValue = Math.abs((measurementTimestamp - transactionStartTime) * 1000);
 const delta = normalizedValue - oldValue;

 DEBUG_BUILD && logger.log(`[Measurements] Normalized ${name} from ${oldValue} to ${normalizedValue} (${delta})`);
_measurements[name].value = normalizedValue;
measurement.value = normalizedValue;
 });

 const fidMark = _measurements['mark.fid'];
Expand All@@ -320,8 +321,8 @@ export function addPerformanceEntries(span: Span): void {
 delete _measurements.cls;
 }

 Object.keys(_measurements).forEach(measurementName => {
 setMeasurement(measurementName, _measurements[measurementName].value, _measurements[measurementName].unit);
 Object.entries(_measurements).forEach(([measurementName, measurement]) => {
 setMeasurement(measurementName, measurement.value, measurement.unit);
 });

 _tagMetricInfo(span);
Expand Down

2 changes: 2 additions & 0 deletions
packages/browser-utils/src/metrics/web-vitals/getCLS.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -70,6 +70,8 @@ export const onCLS = (onReport: CLSReportCallback, opts: ReportOpts = {}): void
 // session.
 if (
 sessionValue &&
 firstSessionEntry &&
 lastSessionEntry &&
 entry.startTime - lastSessionEntry.startTime < 1000 &&
 entry.startTime - firstSessionEntry.startTime < 5000
 ) {
Expand Down

2 changes: 1 addition & 1 deletion
packages/browser-utils/src/metrics/web-vitals/getINP.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -74,7 +74,7 @@ const processEntry = (entry: PerformanceEventTiming) => {
 if (
 existingInteraction ||
 longestInteractionList.length < MAX_INTERACTIONS_TO_CONSIDER ||
 entry.duration > minLongestInteraction.latency
(minLongestInteraction && entry.duration > minLongestInteraction.latency)
 ) {
 // If the interaction already exists, update it. Otherwise create one.
 if (existingInteraction) {
Expand Down

8 changes: 4 additions & 4 deletions
packages/browser-utils/test/browser/browserMetrics.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -221,7 +221,7 @@ describe('_addResourceSpans', () => {
 },
 ];
 for (let i = 0; i < table.length; i++) {
 const { initiatorType, op } = table[i];
 const { initiatorType, op } = table[i]!;
 const entry: ResourceEntry = {
 initiatorType,
 };
Expand DownExpand Up@@ -250,7 +250,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -284,7 +284,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand DownExpand Up@@ -321,7 +321,7 @@ describe('_addResourceSpans', () => {
 _addResourceSpans(span, entry, resourceEntryName, 100, 23, 345);

 expect(spans).toHaveLength(1);
 expect(spanToJSON(spans[0])).toEqual(
 expect(spanToJSON(spans[0]!)).toEqual(
 expect.objectContaining({
 data: {
 [SEMANTIC_ATTRIBUTE_SENTRY_OP]: 'resource.css',
Expand Down

3 changes: 2 additions & 1 deletion
packages/browser/src/eventbuilder.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -89,7 +89,8 @@ function eventFromPlainObject(
 const frames = parseStackFrames(stackParser, syntheticException);
 if (frames.length) {
 // event.exception.values[0] has been set above
 event.exception.values[0].stacktrace = { frames };
 // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
 event.exception.values[0]!.stacktrace = { frames };
 }
 }

Expand Down

52 changes: 28 additions & 24 deletions
packages/browser/src/integrations/httpclient.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -77,28 +77,8 @@ function _fetchResponseHandler(
 let requestHeaders, responseHeaders, requestCookies, responseCookies;

 if (_shouldSendDefaultPii()) {
 [{ headers: requestHeaders, cookies: requestCookies }, { headers: responseHeaders, cookies: responseCookies }] = [
 { cookieHeader: 'Cookie', obj: request },
 { cookieHeader: 'Set-Cookie', obj: response },
 ].map(({ cookieHeader, obj }) => {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return {
 headers,
 cookies,
 };
 });
 [requestHeaders, requestCookies] = _parseCookieHeaders('Cookie', request);
 [responseHeaders, responseCookies] = _parseCookieHeaders('Set-Cookie', response);

Comment on lines

+80
 to 
+81

@s1gr1ds1gr1dJun 12, 2024

Copy link


Copy Markdown

Member
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Nice refactor!
 }

 const event = _createEvent({
Expand All@@ -115,6 +95,26 @@ function _fetchResponseHandler(
 }
}

function _parseCookieHeaders(
 cookieHeader: string,
 obj: Request | Response,
): [Record<string, string>, Record<string, string> | undefined] {
 const headers = _extractFetchHeaders(obj.headers);
 let cookies;

 try {
 const cookieString = headers[cookieHeader] || headers[cookieHeader.toLowerCase()] || undefined;

 if (cookieString) {
 cookies = _parseCookieString(cookieString);
 }
 } catch (e) {
 DEBUG_BUILD && logger.log(`Could not extract cookies from header ${cookieHeader}`);
 }

 return [headers, cookies];
}

/**
 * Interceptor function for XHR requests
 *
Expand DownExpand Up@@ -192,7 +192,9 @@ function _getResponseSizeFromHeaders(headers?: Record<string, string>): number |
function _parseCookieString(cookieString: string): Record<string, string> {
 return cookieString.split('; ').reduce((acc: Record<string, string>, cookie: string) => {
 const [key, value] = cookie.split('=');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand DownExpand Up@@ -228,7 +230,9 @@ function _getXHRResponseHeaders(xhr: XMLHttpRequest): Record<string, string> {

 return headers.split('\r\n').reduce((acc: Record<string, string>, line: string) => {
 const [key, value] = line.split(': ');
 acc[key] = value;
 if (key && value) {
 acc[key] = value;
 }
 return acc;
 }, {});
}
Expand Down
Loading