Skip to content

fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation#15578

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
Lms24 merged 6 commits into from
Mar 11, 2025
Merged

fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation #15578

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
d71e6ad
fix(sveltekit): Correctly parse angle bracket type assertions for aut…
Lms24 Mar 4, 2025
90685e2
cleanup
Lms24 Mar 4, 2025
9f33bae
extract recast parser config into extra file, add vendor information …
Lms24 Mar 4, 2025
25a39d2
fix type error
Lms24 Mar 4, 2025
0ec758b
add remaining options
Lms24 Mar 4, 2025
62f3b09
fix e2e test
Lms24 Mar 10, 2025
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
14 changes: 14 additions & 0 deletions dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.svelte
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<script lang="ts">
export let data
</script>

<h1>Type Assertion</h1>

<p>
This route only exists to ensure we don't emit a build error because of the angle bracket type assertion in +page.ts
see https://github.com/getsentry/sentry-javascript/issues/9318
</p>

<p>
Message: {data.msg}
</p>
8 changes: 8 additions & 0 deletions dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
export async function load() {
let x: unknown = 'foo';
return {
// this angle bracket type assertion threw an auto instrumentation error
// see: https://github.com/getsentry/sentry-javascript/issues/9318
msg: <string>x,
};
}
3 changes: 2 additions & 1 deletion packages/sveltekit/package.json
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -44,14 +44,15 @@
}
},
"dependencies": {
"@babel/parser": "7.26.9",
"@sentry/cloudflare": "9.5.0",
"@sentry/core": "9.5.0",
"@sentry/node": "9.5.0",
"@sentry/opentelemetry": "9.5.0",
"@sentry/svelte": "9.5.0",
"@sentry/vite-plugin": "3.2.0",
"magic-string": "0.30.7",
"magicast": "0.2.8",
"recast": "0.23.11",
"sorcery": "1.0.0"
},
"devDependencies": {
Expand Down
27 changes: 20 additions & 7 deletions packages/sveltekit/src/vite/autoInstrument.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import type { ExportNamedDeclaration } from '@babel/types';
import { parseModule } from 'magicast';
import * as recast from 'recast';
import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';

export type AutoInstrumentSelection = {
/**
Expand DownExpand Up@@ -101,22 +102,30 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>

const code = (await fs.promises.readFile(id, 'utf8')).toString();

const mod = parseModule(code);
const ast = recast.parse(code, {
parser,
});

const program = (ast as { program?: t.Program }).program;

const program = mod.$ast.type === 'Program' && mod.$ast;
if (!program) {
// eslint-disable-next-line no-console
debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`);
return false;
}

const hasLoadDeclaration = program.body
.filter((statement): statement is ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration')
.filter(
(statement): statement is recast.types.namedTypes.ExportNamedDeclaration =>
statement.type === 'ExportNamedDeclaration',
)
.find(exportDecl => {
// find `export const load = ...`
if (exportDecl.declaration?.type === 'VariableDeclaration') {
const variableDeclarations = exportDecl.declaration.declarations;
return variableDeclarations.find(decl => decl.id.type === 'Identifier' && decl.id.name === 'load');
return variableDeclarations.find(
decl => decl.type === 'VariableDeclarator' && decl.id.type === 'Identifier' && decl.id.name === 'load',
);
}

// find `export function load = ...`
Expand All@@ -130,7 +139,11 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>
return exportDecl.specifiers.find(specifier => {
return (
(specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') ||
(specifier.exported.type === 'StringLiteral' && specifier.exported.value === 'load')
// Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types
// This plugin adds support for exporting something as a string literal (see comment above)
// Doing this to avoid adding another babel plugin dependency
((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' &&
(specifier.exported as unknown as t.StringLiteral).value === 'load')
);
});
}
Expand Down
91 changes: 91 additions & 0 deletions packages/sveltekit/src/vite/recastTypescriptParser.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
// This babel parser config is taken from recast's typescript parser config, specifically from these two files:
// see: https://github.com/benjamn/recast/blob/master/parsers/_babel_options.ts
// see: https://github.com/benjamn/recast/blob/master/parsers/babel-ts.ts
//
// Changes:
// - we don't add the 'jsx' plugin, to correctly parse TypeScript angle bracket type assertions
// (see https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#type-assertions)
// - minor import and export changes
// - merged the two files linked above into one for simplicity

// Date of access: 2025-03-04
// Commit: https://github.com/benjamn/recast/commit/ba5132174894b496285da9d001f1f2524ceaed3a

// Recast license:

// Copyright (c) 2012 Ben Newman <bn@cs.stanford.edu>

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

import type { ParserPlugin } from '@babel/parser';
import { parse as babelParse } from '@babel/parser';
import type { Options } from 'recast';

export const parser: Options['parser'] = {
parse: (source: string) =>
babelParse(source, {
strictMode: false,
allowImportExportEverywhere: true,
allowReturnOutsideFunction: true,
startLine: 1,
tokens: true,
plugins: [
'typescript',
'asyncGenerators',
'bigInt',
'classPrivateMethods',
'classPrivateProperties',
'classProperties',
'classStaticBlock',
'decimal',
'decorators-legacy',
'doExpressions',
'dynamicImport',
'exportDefaultFrom',
'exportNamespaceFrom',
'functionBind',
'functionSent',
'importAssertions',
'exportExtensions' as ParserPlugin,
'importMeta',
'nullishCoalescingOperator',
'numericSeparator',
'objectRestSpread',
'optionalCatchBinding',
'optionalChaining',
[
'pipelineOperator',
{
proposal: 'minimal',
},
],
[
'recordAndTuple',
{
syntaxType: 'hash',
},
],
'throwExpressions',
'topLevelAwait',
'v8intrinsic',
],
sourceType: 'module',
}),
};
10 changes: 9 additions & 1 deletion packages/sveltekit/test/vite/autoInstrument.test.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,15 @@ describe('canWrapLoad', () => {
return { props: { msg: res.toString() } }
}`,
],

[
'export function declaration - with angle bracket type assertion',
`export async function load() {
let x: unknown = 'foo';
return {
msg: <string>x,
};
}`,
],
[
'variable declaration (let)',
`import {something} from 'somewhere';
Expand Down
79 changes: 25 additions & 54 deletions yarn.lock
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -1695,20 +1695,20 @@
js-tokens "^4.0.0"
picocolors "^1.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
version "7.26.3"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
dependencies:
"@babel/types" "^7.26.3"

"@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
"@babel/parser@7.26.9", "@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
version "7.26.9"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
dependencies:
"@babel/types" "^7.26.9"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
version "7.26.3"
resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
dependencies:
"@babel/types" "^7.26.3"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
version "7.24.4"
resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
Expand DownExpand Up@@ -2829,7 +2829,7 @@
debug "^4.3.1"
globals "^11.1.0"

"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
version "7.26.3"
resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
Expand DownExpand Up@@ -8509,12 +8509,7 @@
dependencies:
"@types/unist" "*"

"@types/history-4@npm:@types/history@4.7.8":
version "4.7.8"
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==

"@types/history-5@npm:@types/history@4.7.8":
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8":
version "4.7.8"
resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
Expand DownExpand Up@@ -21326,15 +21321,6 @@ magic-string@^0.30.0, magic-string@^0.30.10, magic-string@^0.30.11, magic-string
dependencies:
"@jridgewell/sourcemap-codec" "^1.5.0"

magicast@0.2.8:
version "0.2.8"
resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
integrity sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==
dependencies:
"@babel/parser" "^7.21.9"
"@babel/types" "^7.21.5"
recast "^0.23.2"

magicast@^0.2.10:
version "0.2.11"
resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
Expand DownExpand Up@@ -26237,6 +26223,17 @@ realistic-structured-clone@^3.0.0:
typeson "^6.1.0"
typeson-registry "^1.0.0-alpha.20"

recast@0.23.11:
version "0.23.11"
resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
dependencies:
ast-types "^0.16.1"
esprima "~4.0.0"
source-map "~0.6.1"
tiny-invariant "^1.3.3"
tslib "^2.0.1"

recast@^0.18.1:
version "0.18.10"
resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
Expand All@@ -26257,7 +26254,7 @@ recast@^0.20.5:
source-map "~0.6.1"
tslib "^2.0.1"

recast@^0.23.2, recast@^0.23.4:
recast@^0.23.4:
version "0.23.9"
resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
Expand DownExpand Up@@ -28346,16 +28343,7 @@ string-template@~0.2.1:
resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0":
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
dependencies:
emoji-regex "^8.0.0"
is-fullwidth-code-point "^3.0.0"
strip-ansi "^6.0.1"

string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
version "4.2.3"
resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand DownExpand Up@@ -28458,14 +28446,7 @@ stringify-object@^3.2.1:
is-obj "^1.0.1"
is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
dependencies:
ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
version "6.0.1"
resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand DownExpand Up@@ -28630,7 +28611,6 @@ stylus@0.59.0, stylus@^0.59.0:

sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
version "3.36.0"
uid fd682f6129e507c00bb4e6319cc5d6b767e36061
resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
dependencies:
"@jridgewell/gen-mapping" "^0.3.2"
Expand DownExpand Up@@ -31303,16 +31283,7 @@ wrangler@^3.67.1:
optionalDependencies:
fsevents "~2.3.2"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
dependencies:
ansi-styles "^4.0.0"
string-width "^4.1.0"
strip-ansi "^6.0.0"

wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
version "7.0.0"
resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation by Lms24 · Pull Request #15578 · getsentry/sentry-javascript · GitHub
Skip to content
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation#15578

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

Lms24
merged 6 commits into

from

Mar 11, 2025
 Merged


fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation
#15578
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
d71e6ad

fix(sveltekit): Correctly parse angle bracket type assertions for aut…


Lms24 Mar 4, 2025
90685e2

cleanup


Lms24 Mar 4, 2025
9f33bae

extract recast parser config into extra file, add vendor information …


Lms24 Mar 4, 2025
25a39d2

fix type error


Lms24 Mar 4, 2025
0ec758b

add remaining options


Lms24 Mar 4, 2025
62f3b09

fix e2e test


Lms24 Mar 10, 2025

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


14 changes: 14 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<script lang="ts">
 export let data
</script>

<h1>Type Assertion</h1>

<p>
 This route only exists to ensure we don't emit a build error because of the angle bracket type assertion in +page.ts
 see https://github.com/getsentry/sentry-javascript/issues/9318
</p>

<p>
 Message: {data.msg}
</p>

8 changes: 8 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
export async function load() {
 let x: unknown = 'foo';
 return {
 // this angle bracket type assertion threw an auto instrumentation error
 // see: https://github.com/getsentry/sentry-javascript/issues/9318
 msg: <string>x,
 };
}

3 changes: 2 additions & 1 deletion
packages/sveltekit/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,14 +44,15 @@
 }
 },
 "dependencies": {
 "@babel/parser": "7.26.9",
 "@sentry/cloudflare": "9.5.0",
 "@sentry/core": "9.5.0",
 "@sentry/node": "9.5.0",
 "@sentry/opentelemetry": "9.5.0",
 "@sentry/svelte": "9.5.0",
 "@sentry/vite-plugin": "3.2.0",
 "magic-string": "0.30.7",
 "magicast": "0.2.8",
 "recast": "0.23.11",
 "sorcery": "1.0.0"
 },
 "devDependencies": {
Expand Down

27 changes: 20 additions & 7 deletions
packages/sveltekit/src/vite/autoInstrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import type { ExportNamedDeclaration } from '@babel/types';
import { parseModule } from 'magicast';
import * as recast from 'recast';
import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';

export type AutoInstrumentSelection = {
 /**
Expand DownExpand Up@@ -101,22 +102,30 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>

 const code = (await fs.promises.readFile(id, 'utf8')).toString();

 const mod = parseModule(code);
 const ast = recast.parse(code, {
 parser,
 });

 const program = (ast as { program?: t.Program }).program;

 const program = mod.$ast.type === 'Program' && mod.$ast;
 if (!program) {
 // eslint-disable-next-line no-console
 debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`);
 return false;
 }

 const hasLoadDeclaration = program.body
 .filter((statement): statement is ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration')
 .filter(
 (statement): statement is recast.types.namedTypes.ExportNamedDeclaration =>
 statement.type === 'ExportNamedDeclaration',
 )
 .find(exportDecl => {
 // find `export const load = ...`
 if (exportDecl.declaration?.type === 'VariableDeclaration') {
 const variableDeclarations = exportDecl.declaration.declarations;
 return variableDeclarations.find(decl => decl.id.type === 'Identifier' && decl.id.name === 'load');
 return variableDeclarations.find(
 decl => decl.type === 'VariableDeclarator' && decl.id.type === 'Identifier' && decl.id.name === 'load',
 );
 }

 // find `export function load = ...`
Expand All@@ -130,7 +139,11 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>
 return exportDecl.specifiers.find(specifier => {
 return (
 (specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') ||
 (specifier.exported.type === 'StringLiteral' && specifier.exported.value === 'load')
 // Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types
 // This plugin adds support for exporting something as a string literal (see comment above)
 // Doing this to avoid adding another babel plugin dependency
 ((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' &&
 (specifier.exported as unknown as t.StringLiteral).value === 'load')
 );
 });
 }
Expand Down

91 changes: 91 additions & 0 deletions
packages/sveltekit/src/vite/recastTypescriptParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
// This babel parser config is taken from recast's typescript parser config, specifically from these two files:
// see: https://github.com/benjamn/recast/blob/master/parsers/_babel_options.ts
// see: https://github.com/benjamn/recast/blob/master/parsers/babel-ts.ts
//
// Changes:
// - we don't add the 'jsx' plugin, to correctly parse TypeScript angle bracket type assertions
// (see https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#type-assertions)
// - minor import and export changes
// - merged the two files linked above into one for simplicity

// Date of access: 2025-03-04
// Commit: https://github.com/benjamn/recast/commit/ba5132174894b496285da9d001f1f2524ceaed3a

// Recast license:

// Copyright (c) 2012 Ben Newman <bn@cs.stanford.edu>

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

import type { ParserPlugin } from '@babel/parser';
import { parse as babelParse } from '@babel/parser';
import type { Options } from 'recast';

export const parser: Options['parser'] = {
 parse: (source: string) =>
 babelParse(source, {
 strictMode: false,
 allowImportExportEverywhere: true,
 allowReturnOutsideFunction: true,
 startLine: 1,
 tokens: true,
 plugins: [
 'typescript',
 'asyncGenerators',
 'bigInt',
 'classPrivateMethods',
 'classPrivateProperties',
 'classProperties',
 'classStaticBlock',
 'decimal',
 'decorators-legacy',
 'doExpressions',
 'dynamicImport',
 'exportDefaultFrom',
 'exportNamespaceFrom',
 'functionBind',
 'functionSent',
 'importAssertions',
 'exportExtensions' as ParserPlugin,
 'importMeta',
 'nullishCoalescingOperator',
 'numericSeparator',
 'objectRestSpread',
 'optionalCatchBinding',
 'optionalChaining',
 [
 'pipelineOperator',
 {
 proposal: 'minimal',
 },
 ],
 [
 'recordAndTuple',
 {
 syntaxType: 'hash',
 },
 ],
 'throwExpressions',
 'topLevelAwait',
 'v8intrinsic',
 ],
 sourceType: 'module',
 }),
};

10 changes: 9 additions & 1 deletion
packages/sveltekit/test/vite/autoInstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,15 @@ describe('canWrapLoad', () => {
 return { props: { msg: res.toString() } }
 }`,
 ],

 [
 'export function declaration - with angle bracket type assertion',
 `export async function load() {
 let x: unknown = 'foo';
 return {
 msg: <string>x,
 };
 }`,
 ],
 [
 'variable declaration (let)',
 `import {something} from 'somewhere';
Expand Down

79 changes: 25 additions & 54 deletions
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1695,20 +1695,20 @@
 js-tokens "^4.0.0"
 picocolors "^1.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
"@babel/parser@7.26.9", "@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
 version "7.26.9"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
 integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
 dependencies:
 "@babel/types" "^7.26.9"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
 version "7.24.4"
 resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
Expand DownExpand Up@@ -2829,7 +2829,7 @@
 debug "^4.3.1"
 globals "^11.1.0"

"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
 integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
Expand DownExpand Up@@ -8509,12 +8509,7 @@
 dependencies:
 "@types/unist" "*"

"@types/history-4@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==

"@types/history-5@npm:@types/history@4.7.8":
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
Expand DownExpand Up@@ -21326,15 +21321,6 @@ magic-string@^0.30.0, magic-string@^0.30.10, magic-string@^0.30.11, magic-string
 dependencies:
 "@jridgewell/sourcemap-codec" "^1.5.0"

magicast@0.2.8:
 version "0.2.8"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
 integrity sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==
 dependencies:
 "@babel/parser" "^7.21.9"
 "@babel/types" "^7.21.5"
 recast "^0.23.2"

magicast@^0.2.10:
 version "0.2.11"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
Expand DownExpand Up@@ -26237,6 +26223,17 @@ realistic-structured-clone@^3.0.0:
 typeson "^6.1.0"
 typeson-registry "^1.0.0-alpha.20"

recast@0.23.11:
 version "0.23.11"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
 integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
 dependencies:
 ast-types "^0.16.1"
 esprima "~4.0.0"
 source-map "~0.6.1"
 tiny-invariant "^1.3.3"
 tslib "^2.0.1"

recast@^0.18.1:
 version "0.18.10"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
Expand All@@ -26257,7 +26254,7 @@ recast@^0.20.5:
 source-map "~0.6.1"
 tslib "^2.0.1"

recast@^0.23.2, recast@^0.23.4:
recast@^0.23.4:
 version "0.23.9"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
 integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
Expand DownExpand Up@@ -28346,16 +28343,7 @@ string-template@~0.2.1:
 resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0":
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
 dependencies:
 emoji-regex "^8.0.0"
 is-fullwidth-code-point "^3.0.0"
 strip-ansi "^6.0.1"

string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand DownExpand Up@@ -28458,14 +28446,7 @@ stringify-object@^3.2.1:
 is-obj "^1.0.1"
 is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
 dependencies:
 ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand DownExpand Up@@ -28630,7 +28611,6 @@ stylus@0.59.0, stylus@^0.59.0:

sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
 version "3.36.0"
 uid fd682f6129e507c00bb4e6319cc5d6b767e36061
 resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
 dependencies:
 "@jridgewell/gen-mapping" "^0.3.2"
Expand DownExpand Up@@ -31303,16 +31283,7 @@ wrangler@^3.67.1:
 optionalDependencies:
 fsevents "~2.3.2"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
 dependencies:
 ansi-styles "^4.0.0"
 string-width "^4.1.0"
 strip-ansi "^6.0.0"

wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Force GitHub README to respect dark mode
(function() {
var style = document.createElement('style');
style.textContent = '
.markdown-body {
color-scheme: dark light;
}
.markdown-body pre { background: #161b22 !important; }
.markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }
.markdown-body table th, .markdown-body table td { border-color: #30363d !important; }
.markdown-body img { background: #0d1117; }
.markdown-body blockquote { border-left-color: #8b949e; }
.markdown-body hr { border-color: #30363d; }
';
document.head.appendChild(style);
})();
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation by Lms24 · Pull Request #15578 · getsentry/sentry-javascript · GitHub
Skip to content
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation#15578

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

Lms24
merged 6 commits into

from

Mar 11, 2025
 Merged


fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation
#15578
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
d71e6ad

fix(sveltekit): Correctly parse angle bracket type assertions for aut…


Lms24 Mar 4, 2025
90685e2

cleanup


Lms24 Mar 4, 2025
9f33bae

extract recast parser config into extra file, add vendor information …


Lms24 Mar 4, 2025
25a39d2

fix type error


Lms24 Mar 4, 2025
0ec758b

add remaining options


Lms24 Mar 4, 2025
62f3b09

fix e2e test


Lms24 Mar 10, 2025

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


14 changes: 14 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<script lang="ts">
 export let data
</script>

<h1>Type Assertion</h1>

<p>
 This route only exists to ensure we don't emit a build error because of the angle bracket type assertion in +page.ts
 see https://github.com/getsentry/sentry-javascript/issues/9318
</p>

<p>
 Message: {data.msg}
</p>

8 changes: 8 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
export async function load() {
 let x: unknown = 'foo';
 return {
 // this angle bracket type assertion threw an auto instrumentation error
 // see: https://github.com/getsentry/sentry-javascript/issues/9318
 msg: <string>x,
 };
}

3 changes: 2 additions & 1 deletion
packages/sveltekit/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,14 +44,15 @@
 }
 },
 "dependencies": {
 "@babel/parser": "7.26.9",
 "@sentry/cloudflare": "9.5.0",
 "@sentry/core": "9.5.0",
 "@sentry/node": "9.5.0",
 "@sentry/opentelemetry": "9.5.0",
 "@sentry/svelte": "9.5.0",
 "@sentry/vite-plugin": "3.2.0",
 "magic-string": "0.30.7",
 "magicast": "0.2.8",
 "recast": "0.23.11",
 "sorcery": "1.0.0"
 },
 "devDependencies": {
Expand Down

27 changes: 20 additions & 7 deletions
packages/sveltekit/src/vite/autoInstrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import type { ExportNamedDeclaration } from '@babel/types';
import { parseModule } from 'magicast';
import * as recast from 'recast';
import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';

export type AutoInstrumentSelection = {
 /**
Expand DownExpand Up@@ -101,22 +102,30 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>

 const code = (await fs.promises.readFile(id, 'utf8')).toString();

 const mod = parseModule(code);
 const ast = recast.parse(code, {
 parser,
 });

 const program = (ast as { program?: t.Program }).program;

 const program = mod.$ast.type === 'Program' && mod.$ast;
 if (!program) {
 // eslint-disable-next-line no-console
 debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`);
 return false;
 }

 const hasLoadDeclaration = program.body
 .filter((statement): statement is ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration')
 .filter(
 (statement): statement is recast.types.namedTypes.ExportNamedDeclaration =>
 statement.type === 'ExportNamedDeclaration',
 )
 .find(exportDecl => {
 // find `export const load = ...`
 if (exportDecl.declaration?.type === 'VariableDeclaration') {
 const variableDeclarations = exportDecl.declaration.declarations;
 return variableDeclarations.find(decl => decl.id.type === 'Identifier' && decl.id.name === 'load');
 return variableDeclarations.find(
 decl => decl.type === 'VariableDeclarator' && decl.id.type === 'Identifier' && decl.id.name === 'load',
 );
 }

 // find `export function load = ...`
Expand All@@ -130,7 +139,11 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>
 return exportDecl.specifiers.find(specifier => {
 return (
 (specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') ||
 (specifier.exported.type === 'StringLiteral' && specifier.exported.value === 'load')
 // Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types
 // This plugin adds support for exporting something as a string literal (see comment above)
 // Doing this to avoid adding another babel plugin dependency
 ((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' &&
 (specifier.exported as unknown as t.StringLiteral).value === 'load')
 );
 });
 }
Expand Down

91 changes: 91 additions & 0 deletions
packages/sveltekit/src/vite/recastTypescriptParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
// This babel parser config is taken from recast's typescript parser config, specifically from these two files:
// see: https://github.com/benjamn/recast/blob/master/parsers/_babel_options.ts
// see: https://github.com/benjamn/recast/blob/master/parsers/babel-ts.ts
//
// Changes:
// - we don't add the 'jsx' plugin, to correctly parse TypeScript angle bracket type assertions
// (see https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#type-assertions)
// - minor import and export changes
// - merged the two files linked above into one for simplicity

// Date of access: 2025-03-04
// Commit: https://github.com/benjamn/recast/commit/ba5132174894b496285da9d001f1f2524ceaed3a

// Recast license:

// Copyright (c) 2012 Ben Newman <bn@cs.stanford.edu>

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

import type { ParserPlugin } from '@babel/parser';
import { parse as babelParse } from '@babel/parser';
import type { Options } from 'recast';

export const parser: Options['parser'] = {
 parse: (source: string) =>
 babelParse(source, {
 strictMode: false,
 allowImportExportEverywhere: true,
 allowReturnOutsideFunction: true,
 startLine: 1,
 tokens: true,
 plugins: [
 'typescript',
 'asyncGenerators',
 'bigInt',
 'classPrivateMethods',
 'classPrivateProperties',
 'classProperties',
 'classStaticBlock',
 'decimal',
 'decorators-legacy',
 'doExpressions',
 'dynamicImport',
 'exportDefaultFrom',
 'exportNamespaceFrom',
 'functionBind',
 'functionSent',
 'importAssertions',
 'exportExtensions' as ParserPlugin,
 'importMeta',
 'nullishCoalescingOperator',
 'numericSeparator',
 'objectRestSpread',
 'optionalCatchBinding',
 'optionalChaining',
 [
 'pipelineOperator',
 {
 proposal: 'minimal',
 },
 ],
 [
 'recordAndTuple',
 {
 syntaxType: 'hash',
 },
 ],
 'throwExpressions',
 'topLevelAwait',
 'v8intrinsic',
 ],
 sourceType: 'module',
 }),
};

10 changes: 9 additions & 1 deletion
packages/sveltekit/test/vite/autoInstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,15 @@ describe('canWrapLoad', () => {
 return { props: { msg: res.toString() } }
 }`,
 ],

 [
 'export function declaration - with angle bracket type assertion',
 `export async function load() {
 let x: unknown = 'foo';
 return {
 msg: <string>x,
 };
 }`,
 ],
 [
 'variable declaration (let)',
 `import {something} from 'somewhere';
Expand Down

79 changes: 25 additions & 54 deletions
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1695,20 +1695,20 @@
 js-tokens "^4.0.0"
 picocolors "^1.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
"@babel/parser@7.26.9", "@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
 version "7.26.9"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
 integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
 dependencies:
 "@babel/types" "^7.26.9"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
 version "7.24.4"
 resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
Expand DownExpand Up@@ -2829,7 +2829,7 @@
 debug "^4.3.1"
 globals "^11.1.0"

"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
 integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
Expand DownExpand Up@@ -8509,12 +8509,7 @@
 dependencies:
 "@types/unist" "*"

"@types/history-4@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==

"@types/history-5@npm:@types/history@4.7.8":
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
Expand DownExpand Up@@ -21326,15 +21321,6 @@ magic-string@^0.30.0, magic-string@^0.30.10, magic-string@^0.30.11, magic-string
 dependencies:
 "@jridgewell/sourcemap-codec" "^1.5.0"

magicast@0.2.8:
 version "0.2.8"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
 integrity sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==
 dependencies:
 "@babel/parser" "^7.21.9"
 "@babel/types" "^7.21.5"
 recast "^0.23.2"

magicast@^0.2.10:
 version "0.2.11"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
Expand DownExpand Up@@ -26237,6 +26223,17 @@ realistic-structured-clone@^3.0.0:
 typeson "^6.1.0"
 typeson-registry "^1.0.0-alpha.20"

recast@0.23.11:
 version "0.23.11"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
 integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
 dependencies:
 ast-types "^0.16.1"
 esprima "~4.0.0"
 source-map "~0.6.1"
 tiny-invariant "^1.3.3"
 tslib "^2.0.1"

recast@^0.18.1:
 version "0.18.10"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
Expand All@@ -26257,7 +26254,7 @@ recast@^0.20.5:
 source-map "~0.6.1"
 tslib "^2.0.1"

recast@^0.23.2, recast@^0.23.4:
recast@^0.23.4:
 version "0.23.9"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
 integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
Expand DownExpand Up@@ -28346,16 +28343,7 @@ string-template@~0.2.1:
 resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0":
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
 dependencies:
 emoji-regex "^8.0.0"
 is-fullwidth-code-point "^3.0.0"
 strip-ansi "^6.0.1"

string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand DownExpand Up@@ -28458,14 +28446,7 @@ stringify-object@^3.2.1:
 is-obj "^1.0.1"
 is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
 dependencies:
 ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand DownExpand Up@@ -28630,7 +28611,6 @@ stylus@0.59.0, stylus@^0.59.0:

sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
 version "3.36.0"
 uid fd682f6129e507c00bb4e6319cc5d6b767e36061
 resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
 dependencies:
 "@jridgewell/gen-mapping" "^0.3.2"
Expand DownExpand Up@@ -31303,16 +31283,7 @@ wrangler@^3.67.1:
 optionalDependencies:
 fsevents "~2.3.2"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
 dependencies:
 ansi-styles "^4.0.0"
 string-width "^4.1.0"
 strip-ansi "^6.0.0"

wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down

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

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

Lms24
merged 6 commits into

from

Mar 11, 2025
 Merged


fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation
#15578
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
d71e6ad

fix(sveltekit): Correctly parse angle bracket type assertions for aut…


Lms24 Mar 4, 2025
90685e2

cleanup


Lms24 Mar 4, 2025
9f33bae

extract recast parser config into extra file, add vendor information …


Lms24 Mar 4, 2025
25a39d2

fix type error


Lms24 Mar 4, 2025
0ec758b

add remaining options


Lms24 Mar 4, 2025
62f3b09

fix e2e test


Lms24 Mar 10, 2025

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


14 changes: 14 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<script lang="ts">
 export let data
</script>

<h1>Type Assertion</h1>

<p>
 This route only exists to ensure we don't emit a build error because of the angle bracket type assertion in +page.ts
 see https://github.com/getsentry/sentry-javascript/issues/9318
</p>

<p>
 Message: {data.msg}
</p>

8 changes: 8 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
export async function load() {
 let x: unknown = 'foo';
 return {
 // this angle bracket type assertion threw an auto instrumentation error
 // see: https://github.com/getsentry/sentry-javascript/issues/9318
 msg: <string>x,
 };
}

3 changes: 2 additions & 1 deletion
packages/sveltekit/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,14 +44,15 @@
 }
 },
 "dependencies": {
 "@babel/parser": "7.26.9",
 "@sentry/cloudflare": "9.5.0",
 "@sentry/core": "9.5.0",
 "@sentry/node": "9.5.0",
 "@sentry/opentelemetry": "9.5.0",
 "@sentry/svelte": "9.5.0",
 "@sentry/vite-plugin": "3.2.0",
 "magic-string": "0.30.7",
 "magicast": "0.2.8",
 "recast": "0.23.11",
 "sorcery": "1.0.0"
 },
 "devDependencies": {
Expand Down

27 changes: 20 additions & 7 deletions
packages/sveltekit/src/vite/autoInstrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import type { ExportNamedDeclaration } from '@babel/types';
import { parseModule } from 'magicast';
import * as recast from 'recast';
import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';

export type AutoInstrumentSelection = {
 /**
Expand DownExpand Up@@ -101,22 +102,30 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>

 const code = (await fs.promises.readFile(id, 'utf8')).toString();

 const mod = parseModule(code);
 const ast = recast.parse(code, {
 parser,
 });

 const program = (ast as { program?: t.Program }).program;

 const program = mod.$ast.type === 'Program' && mod.$ast;
 if (!program) {
 // eslint-disable-next-line no-console
 debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`);
 return false;
 }

 const hasLoadDeclaration = program.body
 .filter((statement): statement is ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration')
 .filter(
 (statement): statement is recast.types.namedTypes.ExportNamedDeclaration =>
 statement.type === 'ExportNamedDeclaration',
 )
 .find(exportDecl => {
 // find `export const load = ...`
 if (exportDecl.declaration?.type === 'VariableDeclaration') {
 const variableDeclarations = exportDecl.declaration.declarations;
 return variableDeclarations.find(decl => decl.id.type === 'Identifier' && decl.id.name === 'load');
 return variableDeclarations.find(
 decl => decl.type === 'VariableDeclarator' && decl.id.type === 'Identifier' && decl.id.name === 'load',
 );
 }

 // find `export function load = ...`
Expand All@@ -130,7 +139,11 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>
 return exportDecl.specifiers.find(specifier => {
 return (
 (specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') ||
 (specifier.exported.type === 'StringLiteral' && specifier.exported.value === 'load')
 // Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types
 // This plugin adds support for exporting something as a string literal (see comment above)
 // Doing this to avoid adding another babel plugin dependency
 ((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' &&
 (specifier.exported as unknown as t.StringLiteral).value === 'load')
 );
 });
 }
Expand Down

91 changes: 91 additions & 0 deletions
packages/sveltekit/src/vite/recastTypescriptParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
// This babel parser config is taken from recast's typescript parser config, specifically from these two files:
// see: https://github.com/benjamn/recast/blob/master/parsers/_babel_options.ts
// see: https://github.com/benjamn/recast/blob/master/parsers/babel-ts.ts
//
// Changes:
// - we don't add the 'jsx' plugin, to correctly parse TypeScript angle bracket type assertions
// (see https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#type-assertions)
// - minor import and export changes
// - merged the two files linked above into one for simplicity

// Date of access: 2025-03-04
// Commit: https://github.com/benjamn/recast/commit/ba5132174894b496285da9d001f1f2524ceaed3a

// Recast license:

// Copyright (c) 2012 Ben Newman <bn@cs.stanford.edu>

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

import type { ParserPlugin } from '@babel/parser';
import { parse as babelParse } from '@babel/parser';
import type { Options } from 'recast';

export const parser: Options['parser'] = {
 parse: (source: string) =>
 babelParse(source, {
 strictMode: false,
 allowImportExportEverywhere: true,
 allowReturnOutsideFunction: true,
 startLine: 1,
 tokens: true,
 plugins: [
 'typescript',
 'asyncGenerators',
 'bigInt',
 'classPrivateMethods',
 'classPrivateProperties',
 'classProperties',
 'classStaticBlock',
 'decimal',
 'decorators-legacy',
 'doExpressions',
 'dynamicImport',
 'exportDefaultFrom',
 'exportNamespaceFrom',
 'functionBind',
 'functionSent',
 'importAssertions',
 'exportExtensions' as ParserPlugin,
 'importMeta',
 'nullishCoalescingOperator',
 'numericSeparator',
 'objectRestSpread',
 'optionalCatchBinding',
 'optionalChaining',
 [
 'pipelineOperator',
 {
 proposal: 'minimal',
 },
 ],
 [
 'recordAndTuple',
 {
 syntaxType: 'hash',
 },
 ],
 'throwExpressions',
 'topLevelAwait',
 'v8intrinsic',
 ],
 sourceType: 'module',
 }),
};

10 changes: 9 additions & 1 deletion
packages/sveltekit/test/vite/autoInstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,15 @@ describe('canWrapLoad', () => {
 return { props: { msg: res.toString() } }
 }`,
 ],

 [
 'export function declaration - with angle bracket type assertion',
 `export async function load() {
 let x: unknown = 'foo';
 return {
 msg: <string>x,
 };
 }`,
 ],
 [
 'variable declaration (let)',
 `import {something} from 'somewhere';
Expand Down

79 changes: 25 additions & 54 deletions
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1695,20 +1695,20 @@
 js-tokens "^4.0.0"
 picocolors "^1.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
"@babel/parser@7.26.9", "@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
 version "7.26.9"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
 integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
 dependencies:
 "@babel/types" "^7.26.9"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
 version "7.24.4"
 resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
Expand DownExpand Up@@ -2829,7 +2829,7 @@
 debug "^4.3.1"
 globals "^11.1.0"

"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
 integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
Expand DownExpand Up@@ -8509,12 +8509,7 @@
 dependencies:
 "@types/unist" "*"

"@types/history-4@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==

"@types/history-5@npm:@types/history@4.7.8":
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
Expand DownExpand Up@@ -21326,15 +21321,6 @@ magic-string@^0.30.0, magic-string@^0.30.10, magic-string@^0.30.11, magic-string
 dependencies:
 "@jridgewell/sourcemap-codec" "^1.5.0"

magicast@0.2.8:
 version "0.2.8"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
 integrity sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==
 dependencies:
 "@babel/parser" "^7.21.9"
 "@babel/types" "^7.21.5"
 recast "^0.23.2"

magicast@^0.2.10:
 version "0.2.11"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
Expand DownExpand Up@@ -26237,6 +26223,17 @@ realistic-structured-clone@^3.0.0:
 typeson "^6.1.0"
 typeson-registry "^1.0.0-alpha.20"

recast@0.23.11:
 version "0.23.11"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
 integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
 dependencies:
 ast-types "^0.16.1"
 esprima "~4.0.0"
 source-map "~0.6.1"
 tiny-invariant "^1.3.3"
 tslib "^2.0.1"

recast@^0.18.1:
 version "0.18.10"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
Expand All@@ -26257,7 +26254,7 @@ recast@^0.20.5:
 source-map "~0.6.1"
 tslib "^2.0.1"

recast@^0.23.2, recast@^0.23.4:
recast@^0.23.4:
 version "0.23.9"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
 integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
Expand DownExpand Up@@ -28346,16 +28343,7 @@ string-template@~0.2.1:
 resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0":
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
 dependencies:
 emoji-regex "^8.0.0"
 is-fullwidth-code-point "^3.0.0"
 strip-ansi "^6.0.1"

string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand DownExpand Up@@ -28458,14 +28446,7 @@ stringify-object@^3.2.1:
 is-obj "^1.0.1"
 is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
 dependencies:
 ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand DownExpand Up@@ -28630,7 +28611,6 @@ stylus@0.59.0, stylus@^0.59.0:

sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
 version "3.36.0"
 uid fd682f6129e507c00bb4e6319cc5d6b767e36061
 resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
 dependencies:
 "@jridgewell/gen-mapping" "^0.3.2"
Expand DownExpand Up@@ -31303,16 +31283,7 @@ wrangler@^3.67.1:
 optionalDependencies:
 fsevents "~2.3.2"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
 dependencies:
 ansi-styles "^4.0.0"
 string-width "^4.1.0"
 strip-ansi "^6.0.0"

wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Strip utm_, fbclid, gclid, etc. from all links on page
(function() {
var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',
'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',
'ref', 'ref_src', 'source', 'medium', 'campaign'];
function cleanUrl(url) {
try {
var u = new URL(url, window.location.origin);
var changed = false;
trackingParams.forEach(function(p) {
if (u.searchParams.has(p)) {
u.searchParams.delete(p);
changed = true;
}
});
return changed ? u.toString() : url;
} catch (e) {
return url;
}
}
function cleanLinks() {
document.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
cleanLinks();
var observer = new MutationObserver(function(mutations) {
mutations.forEach(function(m) {
m.addedNodes.forEach(function(node) {
if (node.nodeType === 1) {
if (node.tagName === 'A') cleanLinks();
node.querySelectorAll('a[href]').forEach(function(a) {
var clean = cleanUrl(a.href);
if (clean !== a.href) a.href = clean;
});
}
});
});
});
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation by Lms24 · Pull Request #15578 · getsentry/sentry-javascript · GitHub
Skip to content
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation#15578

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

Lms24
merged 6 commits into

from

Mar 11, 2025
 Merged


fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation
#15578
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
d71e6ad

fix(sveltekit): Correctly parse angle bracket type assertions for aut…


Lms24 Mar 4, 2025
90685e2

cleanup


Lms24 Mar 4, 2025
9f33bae

extract recast parser config into extra file, add vendor information …


Lms24 Mar 4, 2025
25a39d2

fix type error


Lms24 Mar 4, 2025
0ec758b

add remaining options


Lms24 Mar 4, 2025
62f3b09

fix e2e test


Lms24 Mar 10, 2025

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


14 changes: 14 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<script lang="ts">
 export let data
</script>

<h1>Type Assertion</h1>

<p>
 This route only exists to ensure we don't emit a build error because of the angle bracket type assertion in +page.ts
 see https://github.com/getsentry/sentry-javascript/issues/9318
</p>

<p>
 Message: {data.msg}
</p>

8 changes: 8 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
export async function load() {
 let x: unknown = 'foo';
 return {
 // this angle bracket type assertion threw an auto instrumentation error
 // see: https://github.com/getsentry/sentry-javascript/issues/9318
 msg: <string>x,
 };
}

3 changes: 2 additions & 1 deletion
packages/sveltekit/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,14 +44,15 @@
 }
 },
 "dependencies": {
 "@babel/parser": "7.26.9",
 "@sentry/cloudflare": "9.5.0",
 "@sentry/core": "9.5.0",
 "@sentry/node": "9.5.0",
 "@sentry/opentelemetry": "9.5.0",
 "@sentry/svelte": "9.5.0",
 "@sentry/vite-plugin": "3.2.0",
 "magic-string": "0.30.7",
 "magicast": "0.2.8",
 "recast": "0.23.11",
 "sorcery": "1.0.0"
 },
 "devDependencies": {
Expand Down

27 changes: 20 additions & 7 deletions
packages/sveltekit/src/vite/autoInstrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import type { ExportNamedDeclaration } from '@babel/types';
import { parseModule } from 'magicast';
import * as recast from 'recast';
import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';

export type AutoInstrumentSelection = {
 /**
Expand DownExpand Up@@ -101,22 +102,30 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>

 const code = (await fs.promises.readFile(id, 'utf8')).toString();

 const mod = parseModule(code);
 const ast = recast.parse(code, {
 parser,
 });

 const program = (ast as { program?: t.Program }).program;

 const program = mod.$ast.type === 'Program' && mod.$ast;
 if (!program) {
 // eslint-disable-next-line no-console
 debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`);
 return false;
 }

 const hasLoadDeclaration = program.body
 .filter((statement): statement is ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration')
 .filter(
 (statement): statement is recast.types.namedTypes.ExportNamedDeclaration =>
 statement.type === 'ExportNamedDeclaration',
 )
 .find(exportDecl => {
 // find `export const load = ...`
 if (exportDecl.declaration?.type === 'VariableDeclaration') {
 const variableDeclarations = exportDecl.declaration.declarations;
 return variableDeclarations.find(decl => decl.id.type === 'Identifier' && decl.id.name === 'load');
 return variableDeclarations.find(
 decl => decl.type === 'VariableDeclarator' && decl.id.type === 'Identifier' && decl.id.name === 'load',
 );
 }

 // find `export function load = ...`
Expand All@@ -130,7 +139,11 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>
 return exportDecl.specifiers.find(specifier => {
 return (
 (specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') ||
 (specifier.exported.type === 'StringLiteral' && specifier.exported.value === 'load')
 // Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types
 // This plugin adds support for exporting something as a string literal (see comment above)
 // Doing this to avoid adding another babel plugin dependency
 ((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' &&
 (specifier.exported as unknown as t.StringLiteral).value === 'load')
 );
 });
 }
Expand Down

91 changes: 91 additions & 0 deletions
packages/sveltekit/src/vite/recastTypescriptParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
// This babel parser config is taken from recast's typescript parser config, specifically from these two files:
// see: https://github.com/benjamn/recast/blob/master/parsers/_babel_options.ts
// see: https://github.com/benjamn/recast/blob/master/parsers/babel-ts.ts
//
// Changes:
// - we don't add the 'jsx' plugin, to correctly parse TypeScript angle bracket type assertions
// (see https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#type-assertions)
// - minor import and export changes
// - merged the two files linked above into one for simplicity

// Date of access: 2025-03-04
// Commit: https://github.com/benjamn/recast/commit/ba5132174894b496285da9d001f1f2524ceaed3a

// Recast license:

// Copyright (c) 2012 Ben Newman <bn@cs.stanford.edu>

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

import type { ParserPlugin } from '@babel/parser';
import { parse as babelParse } from '@babel/parser';
import type { Options } from 'recast';

export const parser: Options['parser'] = {
 parse: (source: string) =>
 babelParse(source, {
 strictMode: false,
 allowImportExportEverywhere: true,
 allowReturnOutsideFunction: true,
 startLine: 1,
 tokens: true,
 plugins: [
 'typescript',
 'asyncGenerators',
 'bigInt',
 'classPrivateMethods',
 'classPrivateProperties',
 'classProperties',
 'classStaticBlock',
 'decimal',
 'decorators-legacy',
 'doExpressions',
 'dynamicImport',
 'exportDefaultFrom',
 'exportNamespaceFrom',
 'functionBind',
 'functionSent',
 'importAssertions',
 'exportExtensions' as ParserPlugin,
 'importMeta',
 'nullishCoalescingOperator',
 'numericSeparator',
 'objectRestSpread',
 'optionalCatchBinding',
 'optionalChaining',
 [
 'pipelineOperator',
 {
 proposal: 'minimal',
 },
 ],
 [
 'recordAndTuple',
 {
 syntaxType: 'hash',
 },
 ],
 'throwExpressions',
 'topLevelAwait',
 'v8intrinsic',
 ],
 sourceType: 'module',
 }),
};

10 changes: 9 additions & 1 deletion
packages/sveltekit/test/vite/autoInstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,15 @@ describe('canWrapLoad', () => {
 return { props: { msg: res.toString() } }
 }`,
 ],

 [
 'export function declaration - with angle bracket type assertion',
 `export async function load() {
 let x: unknown = 'foo';
 return {
 msg: <string>x,
 };
 }`,
 ],
 [
 'variable declaration (let)',
 `import {something} from 'somewhere';
Expand Down

79 changes: 25 additions & 54 deletions
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1695,20 +1695,20 @@
 js-tokens "^4.0.0"
 picocolors "^1.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
"@babel/parser@7.26.9", "@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
 version "7.26.9"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
 integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
 dependencies:
 "@babel/types" "^7.26.9"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
 version "7.24.4"
 resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
Expand DownExpand Up@@ -2829,7 +2829,7 @@
 debug "^4.3.1"
 globals "^11.1.0"

"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
 integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
Expand DownExpand Up@@ -8509,12 +8509,7 @@
 dependencies:
 "@types/unist" "*"

"@types/history-4@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==

"@types/history-5@npm:@types/history@4.7.8":
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
Expand DownExpand Up@@ -21326,15 +21321,6 @@ magic-string@^0.30.0, magic-string@^0.30.10, magic-string@^0.30.11, magic-string
 dependencies:
 "@jridgewell/sourcemap-codec" "^1.5.0"

magicast@0.2.8:
 version "0.2.8"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
 integrity sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==
 dependencies:
 "@babel/parser" "^7.21.9"
 "@babel/types" "^7.21.5"
 recast "^0.23.2"

magicast@^0.2.10:
 version "0.2.11"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
Expand DownExpand Up@@ -26237,6 +26223,17 @@ realistic-structured-clone@^3.0.0:
 typeson "^6.1.0"
 typeson-registry "^1.0.0-alpha.20"

recast@0.23.11:
 version "0.23.11"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
 integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
 dependencies:
 ast-types "^0.16.1"
 esprima "~4.0.0"
 source-map "~0.6.1"
 tiny-invariant "^1.3.3"
 tslib "^2.0.1"

recast@^0.18.1:
 version "0.18.10"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
Expand All@@ -26257,7 +26254,7 @@ recast@^0.20.5:
 source-map "~0.6.1"
 tslib "^2.0.1"

recast@^0.23.2, recast@^0.23.4:
recast@^0.23.4:
 version "0.23.9"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
 integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
Expand DownExpand Up@@ -28346,16 +28343,7 @@ string-template@~0.2.1:
 resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0":
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
 dependencies:
 emoji-regex "^8.0.0"
 is-fullwidth-code-point "^3.0.0"
 strip-ansi "^6.0.1"

string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand DownExpand Up@@ -28458,14 +28446,7 @@ stringify-object@^3.2.1:
 is-obj "^1.0.1"
 is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
 dependencies:
 ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand DownExpand Up@@ -28630,7 +28611,6 @@ stylus@0.59.0, stylus@^0.59.0:

sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
 version "3.36.0"
 uid fd682f6129e507c00bb4e6319cc5d6b767e36061
 resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
 dependencies:
 "@jridgewell/gen-mapping" "^0.3.2"
Expand DownExpand Up@@ -31303,16 +31283,7 @@ wrangler@^3.67.1:
 optionalDependencies:
 fsevents "~2.3.2"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
 dependencies:
 ansi-styles "^4.0.0"
 string-width "^4.1.0"
 strip-ansi "^6.0.0"

wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation by Lms24 · Pull Request #15578 · getsentry/sentry-javascript · GitHub
Skip to content
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation#15578

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

Lms24
merged 6 commits into

from

Mar 11, 2025
 Merged


fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation
#15578
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
d71e6ad

fix(sveltekit): Correctly parse angle bracket type assertions for aut…


Lms24 Mar 4, 2025
90685e2

cleanup


Lms24 Mar 4, 2025
9f33bae

extract recast parser config into extra file, add vendor information …


Lms24 Mar 4, 2025
25a39d2

fix type error


Lms24 Mar 4, 2025
0ec758b

add remaining options


Lms24 Mar 4, 2025
62f3b09

fix e2e test


Lms24 Mar 10, 2025

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


14 changes: 14 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<script lang="ts">
 export let data
</script>

<h1>Type Assertion</h1>

<p>
 This route only exists to ensure we don't emit a build error because of the angle bracket type assertion in +page.ts
 see https://github.com/getsentry/sentry-javascript/issues/9318
</p>

<p>
 Message: {data.msg}
</p>

8 changes: 8 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
export async function load() {
 let x: unknown = 'foo';
 return {
 // this angle bracket type assertion threw an auto instrumentation error
 // see: https://github.com/getsentry/sentry-javascript/issues/9318
 msg: <string>x,
 };
}

3 changes: 2 additions & 1 deletion
packages/sveltekit/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,14 +44,15 @@
 }
 },
 "dependencies": {
 "@babel/parser": "7.26.9",
 "@sentry/cloudflare": "9.5.0",
 "@sentry/core": "9.5.0",
 "@sentry/node": "9.5.0",
 "@sentry/opentelemetry": "9.5.0",
 "@sentry/svelte": "9.5.0",
 "@sentry/vite-plugin": "3.2.0",
 "magic-string": "0.30.7",
 "magicast": "0.2.8",
 "recast": "0.23.11",
 "sorcery": "1.0.0"
 },
 "devDependencies": {
Expand Down

27 changes: 20 additions & 7 deletions
packages/sveltekit/src/vite/autoInstrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import type { ExportNamedDeclaration } from '@babel/types';
import { parseModule } from 'magicast';
import * as recast from 'recast';
import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';

export type AutoInstrumentSelection = {
 /**
Expand DownExpand Up@@ -101,22 +102,30 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>

 const code = (await fs.promises.readFile(id, 'utf8')).toString();

 const mod = parseModule(code);
 const ast = recast.parse(code, {
 parser,
 });

 const program = (ast as { program?: t.Program }).program;

 const program = mod.$ast.type === 'Program' && mod.$ast;
 if (!program) {
 // eslint-disable-next-line no-console
 debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`);
 return false;
 }

 const hasLoadDeclaration = program.body
 .filter((statement): statement is ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration')
 .filter(
 (statement): statement is recast.types.namedTypes.ExportNamedDeclaration =>
 statement.type === 'ExportNamedDeclaration',
 )
 .find(exportDecl => {
 // find `export const load = ...`
 if (exportDecl.declaration?.type === 'VariableDeclaration') {
 const variableDeclarations = exportDecl.declaration.declarations;
 return variableDeclarations.find(decl => decl.id.type === 'Identifier' && decl.id.name === 'load');
 return variableDeclarations.find(
 decl => decl.type === 'VariableDeclarator' && decl.id.type === 'Identifier' && decl.id.name === 'load',
 );
 }

 // find `export function load = ...`
Expand All@@ -130,7 +139,11 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>
 return exportDecl.specifiers.find(specifier => {
 return (
 (specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') ||
 (specifier.exported.type === 'StringLiteral' && specifier.exported.value === 'load')
 // Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types
 // This plugin adds support for exporting something as a string literal (see comment above)
 // Doing this to avoid adding another babel plugin dependency
 ((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' &&
 (specifier.exported as unknown as t.StringLiteral).value === 'load')
 );
 });
 }
Expand Down

91 changes: 91 additions & 0 deletions
packages/sveltekit/src/vite/recastTypescriptParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
// This babel parser config is taken from recast's typescript parser config, specifically from these two files:
// see: https://github.com/benjamn/recast/blob/master/parsers/_babel_options.ts
// see: https://github.com/benjamn/recast/blob/master/parsers/babel-ts.ts
//
// Changes:
// - we don't add the 'jsx' plugin, to correctly parse TypeScript angle bracket type assertions
// (see https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#type-assertions)
// - minor import and export changes
// - merged the two files linked above into one for simplicity

// Date of access: 2025-03-04
// Commit: https://github.com/benjamn/recast/commit/ba5132174894b496285da9d001f1f2524ceaed3a

// Recast license:

// Copyright (c) 2012 Ben Newman <bn@cs.stanford.edu>

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

import type { ParserPlugin } from '@babel/parser';
import { parse as babelParse } from '@babel/parser';
import type { Options } from 'recast';

export const parser: Options['parser'] = {
 parse: (source: string) =>
 babelParse(source, {
 strictMode: false,
 allowImportExportEverywhere: true,
 allowReturnOutsideFunction: true,
 startLine: 1,
 tokens: true,
 plugins: [
 'typescript',
 'asyncGenerators',
 'bigInt',
 'classPrivateMethods',
 'classPrivateProperties',
 'classProperties',
 'classStaticBlock',
 'decimal',
 'decorators-legacy',
 'doExpressions',
 'dynamicImport',
 'exportDefaultFrom',
 'exportNamespaceFrom',
 'functionBind',
 'functionSent',
 'importAssertions',
 'exportExtensions' as ParserPlugin,
 'importMeta',
 'nullishCoalescingOperator',
 'numericSeparator',
 'objectRestSpread',
 'optionalCatchBinding',
 'optionalChaining',
 [
 'pipelineOperator',
 {
 proposal: 'minimal',
 },
 ],
 [
 'recordAndTuple',
 {
 syntaxType: 'hash',
 },
 ],
 'throwExpressions',
 'topLevelAwait',
 'v8intrinsic',
 ],
 sourceType: 'module',
 }),
};

10 changes: 9 additions & 1 deletion
packages/sveltekit/test/vite/autoInstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,15 @@ describe('canWrapLoad', () => {
 return { props: { msg: res.toString() } }
 }`,
 ],

 [
 'export function declaration - with angle bracket type assertion',
 `export async function load() {
 let x: unknown = 'foo';
 return {
 msg: <string>x,
 };
 }`,
 ],
 [
 'variable declaration (let)',
 `import {something} from 'somewhere';
Expand Down

79 changes: 25 additions & 54 deletions
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1695,20 +1695,20 @@
 js-tokens "^4.0.0"
 picocolors "^1.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
"@babel/parser@7.26.9", "@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
 version "7.26.9"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
 integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
 dependencies:
 "@babel/types" "^7.26.9"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
 version "7.24.4"
 resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
Expand DownExpand Up@@ -2829,7 +2829,7 @@
 debug "^4.3.1"
 globals "^11.1.0"

"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
 integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
Expand DownExpand Up@@ -8509,12 +8509,7 @@
 dependencies:
 "@types/unist" "*"

"@types/history-4@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==

"@types/history-5@npm:@types/history@4.7.8":
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
Expand DownExpand Up@@ -21326,15 +21321,6 @@ magic-string@^0.30.0, magic-string@^0.30.10, magic-string@^0.30.11, magic-string
 dependencies:
 "@jridgewell/sourcemap-codec" "^1.5.0"

magicast@0.2.8:
 version "0.2.8"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
 integrity sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==
 dependencies:
 "@babel/parser" "^7.21.9"
 "@babel/types" "^7.21.5"
 recast "^0.23.2"

magicast@^0.2.10:
 version "0.2.11"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
Expand DownExpand Up@@ -26237,6 +26223,17 @@ realistic-structured-clone@^3.0.0:
 typeson "^6.1.0"
 typeson-registry "^1.0.0-alpha.20"

recast@0.23.11:
 version "0.23.11"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
 integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
 dependencies:
 ast-types "^0.16.1"
 esprima "~4.0.0"
 source-map "~0.6.1"
 tiny-invariant "^1.3.3"
 tslib "^2.0.1"

recast@^0.18.1:
 version "0.18.10"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
Expand All@@ -26257,7 +26254,7 @@ recast@^0.20.5:
 source-map "~0.6.1"
 tslib "^2.0.1"

recast@^0.23.2, recast@^0.23.4:
recast@^0.23.4:
 version "0.23.9"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
 integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
Expand DownExpand Up@@ -28346,16 +28343,7 @@ string-template@~0.2.1:
 resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0":
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
 dependencies:
 emoji-regex "^8.0.0"
 is-fullwidth-code-point "^3.0.0"
 strip-ansi "^6.0.1"

string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand DownExpand Up@@ -28458,14 +28446,7 @@ stringify-object@^3.2.1:
 is-obj "^1.0.1"
 is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
 dependencies:
 ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand DownExpand Up@@ -28630,7 +28611,6 @@ stylus@0.59.0, stylus@^0.59.0:

sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
 version "3.36.0"
 uid fd682f6129e507c00bb4e6319cc5d6b767e36061
 resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
 dependencies:
 "@jridgewell/gen-mapping" "^0.3.2"
Expand DownExpand Up@@ -31303,16 +31283,7 @@ wrangler@^3.67.1:
 optionalDependencies:
 fsevents "~2.3.2"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
 dependencies:
 ansi-styles "^4.0.0"
 string-width "^4.1.0"
 strip-ansi "^6.0.0"

wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation by Lms24 · Pull Request #15578 · getsentry/sentry-javascript · GitHub
Skip to content
fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation#15578

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

Lms24
merged 6 commits into

from

Mar 11, 2025
 Merged


fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation
#15578
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
d71e6ad

fix(sveltekit): Correctly parse angle bracket type assertions for aut…


Lms24 Mar 4, 2025
90685e2

cleanup


Lms24 Mar 4, 2025
9f33bae

extract recast parser config into extra file, add vendor information …


Lms24 Mar 4, 2025
25a39d2

fix type error


Lms24 Mar 4, 2025
0ec758b

add remaining options


Lms24 Mar 4, 2025
62f3b09

fix e2e test


Lms24 Mar 10, 2025

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


14 changes: 14 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<script lang="ts">
 export let data
</script>

<h1>Type Assertion</h1>

<p>
 This route only exists to ensure we don't emit a build error because of the angle bracket type assertion in +page.ts
 see https://github.com/getsentry/sentry-javascript/issues/9318
</p>

<p>
 Message: {data.msg}
</p>

8 changes: 8 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
export async function load() {
 let x: unknown = 'foo';
 return {
 // this angle bracket type assertion threw an auto instrumentation error
 // see: https://github.com/getsentry/sentry-javascript/issues/9318
 msg: <string>x,
 };
}

3 changes: 2 additions & 1 deletion
packages/sveltekit/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,14 +44,15 @@
 }
 },
 "dependencies": {
 "@babel/parser": "7.26.9",
 "@sentry/cloudflare": "9.5.0",
 "@sentry/core": "9.5.0",
 "@sentry/node": "9.5.0",
 "@sentry/opentelemetry": "9.5.0",
 "@sentry/svelte": "9.5.0",
 "@sentry/vite-plugin": "3.2.0",
 "magic-string": "0.30.7",
 "magicast": "0.2.8",
 "recast": "0.23.11",
 "sorcery": "1.0.0"
 },
 "devDependencies": {
Expand Down

27 changes: 20 additions & 7 deletions
packages/sveltekit/src/vite/autoInstrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import type { ExportNamedDeclaration } from '@babel/types';
import { parseModule } from 'magicast';
import * as recast from 'recast';
import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';

export type AutoInstrumentSelection = {
 /**
Expand DownExpand Up@@ -101,22 +102,30 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>

 const code = (await fs.promises.readFile(id, 'utf8')).toString();

 const mod = parseModule(code);
 const ast = recast.parse(code, {
 parser,
 });

 const program = (ast as { program?: t.Program }).program;

 const program = mod.$ast.type === 'Program' && mod.$ast;
 if (!program) {
 // eslint-disable-next-line no-console
 debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`);
 return false;
 }

 const hasLoadDeclaration = program.body
 .filter((statement): statement is ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration')
 .filter(
 (statement): statement is recast.types.namedTypes.ExportNamedDeclaration =>
 statement.type === 'ExportNamedDeclaration',
 )
 .find(exportDecl => {
 // find `export const load = ...`
 if (exportDecl.declaration?.type === 'VariableDeclaration') {
 const variableDeclarations = exportDecl.declaration.declarations;
 return variableDeclarations.find(decl => decl.id.type === 'Identifier' && decl.id.name === 'load');
 return variableDeclarations.find(
 decl => decl.type === 'VariableDeclarator' && decl.id.type === 'Identifier' && decl.id.name === 'load',
 );
 }

 // find `export function load = ...`
Expand All@@ -130,7 +139,11 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>
 return exportDecl.specifiers.find(specifier => {
 return (
 (specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') ||
 (specifier.exported.type === 'StringLiteral' && specifier.exported.value === 'load')
 // Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types
 // This plugin adds support for exporting something as a string literal (see comment above)
 // Doing this to avoid adding another babel plugin dependency
 ((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' &&
 (specifier.exported as unknown as t.StringLiteral).value === 'load')
 );
 });
 }
Expand Down

91 changes: 91 additions & 0 deletions
packages/sveltekit/src/vite/recastTypescriptParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
// This babel parser config is taken from recast's typescript parser config, specifically from these two files:
// see: https://github.com/benjamn/recast/blob/master/parsers/_babel_options.ts
// see: https://github.com/benjamn/recast/blob/master/parsers/babel-ts.ts
//
// Changes:
// - we don't add the 'jsx' plugin, to correctly parse TypeScript angle bracket type assertions
// (see https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#type-assertions)
// - minor import and export changes
// - merged the two files linked above into one for simplicity

// Date of access: 2025-03-04
// Commit: https://github.com/benjamn/recast/commit/ba5132174894b496285da9d001f1f2524ceaed3a

// Recast license:

// Copyright (c) 2012 Ben Newman <bn@cs.stanford.edu>

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

import type { ParserPlugin } from '@babel/parser';
import { parse as babelParse } from '@babel/parser';
import type { Options } from 'recast';

export const parser: Options['parser'] = {
 parse: (source: string) =>
 babelParse(source, {
 strictMode: false,
 allowImportExportEverywhere: true,
 allowReturnOutsideFunction: true,
 startLine: 1,
 tokens: true,
 plugins: [
 'typescript',
 'asyncGenerators',
 'bigInt',
 'classPrivateMethods',
 'classPrivateProperties',
 'classProperties',
 'classStaticBlock',
 'decimal',
 'decorators-legacy',
 'doExpressions',
 'dynamicImport',
 'exportDefaultFrom',
 'exportNamespaceFrom',
 'functionBind',
 'functionSent',
 'importAssertions',
 'exportExtensions' as ParserPlugin,
 'importMeta',
 'nullishCoalescingOperator',
 'numericSeparator',
 'objectRestSpread',
 'optionalCatchBinding',
 'optionalChaining',
 [
 'pipelineOperator',
 {
 proposal: 'minimal',
 },
 ],
 [
 'recordAndTuple',
 {
 syntaxType: 'hash',
 },
 ],
 'throwExpressions',
 'topLevelAwait',
 'v8intrinsic',
 ],
 sourceType: 'module',
 }),
};

10 changes: 9 additions & 1 deletion
packages/sveltekit/test/vite/autoInstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,15 @@ describe('canWrapLoad', () => {
 return { props: { msg: res.toString() } }
 }`,
 ],

 [
 'export function declaration - with angle bracket type assertion',
 `export async function load() {
 let x: unknown = 'foo';
 return {
 msg: <string>x,
 };
 }`,
 ],
 [
 'variable declaration (let)',
 `import {something} from 'somewhere';
Expand Down

79 changes: 25 additions & 54 deletions
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1695,20 +1695,20 @@
 js-tokens "^4.0.0"
 picocolors "^1.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
"@babel/parser@7.26.9", "@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
 version "7.26.9"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
 integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
 dependencies:
 "@babel/types" "^7.26.9"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
 version "7.24.4"
 resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
Expand DownExpand Up@@ -2829,7 +2829,7 @@
 debug "^4.3.1"
 globals "^11.1.0"

"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
 integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
Expand DownExpand Up@@ -8509,12 +8509,7 @@
 dependencies:
 "@types/unist" "*"

"@types/history-4@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==

"@types/history-5@npm:@types/history@4.7.8":
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
Expand DownExpand Up@@ -21326,15 +21321,6 @@ magic-string@^0.30.0, magic-string@^0.30.10, magic-string@^0.30.11, magic-string
 dependencies:
 "@jridgewell/sourcemap-codec" "^1.5.0"

magicast@0.2.8:
 version "0.2.8"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
 integrity sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==
 dependencies:
 "@babel/parser" "^7.21.9"
 "@babel/types" "^7.21.5"
 recast "^0.23.2"

magicast@^0.2.10:
 version "0.2.11"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
Expand DownExpand Up@@ -26237,6 +26223,17 @@ realistic-structured-clone@^3.0.0:
 typeson "^6.1.0"
 typeson-registry "^1.0.0-alpha.20"

recast@0.23.11:
 version "0.23.11"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
 integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
 dependencies:
 ast-types "^0.16.1"
 esprima "~4.0.0"
 source-map "~0.6.1"
 tiny-invariant "^1.3.3"
 tslib "^2.0.1"

recast@^0.18.1:
 version "0.18.10"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
Expand All@@ -26257,7 +26254,7 @@ recast@^0.20.5:
 source-map "~0.6.1"
 tslib "^2.0.1"

recast@^0.23.2, recast@^0.23.4:
recast@^0.23.4:
 version "0.23.9"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
 integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
Expand DownExpand Up@@ -28346,16 +28343,7 @@ string-template@~0.2.1:
 resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0":
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
 dependencies:
 emoji-regex "^8.0.0"
 is-fullwidth-code-point "^3.0.0"
 strip-ansi "^6.0.1"

string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand DownExpand Up@@ -28458,14 +28446,7 @@ stringify-object@^3.2.1:
 is-obj "^1.0.1"
 is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
 dependencies:
 ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand DownExpand Up@@ -28630,7 +28611,6 @@ stylus@0.59.0, stylus@^0.59.0:

sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
 version "3.36.0"
 uid fd682f6129e507c00bb4e6319cc5d6b767e36061
 resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
 dependencies:
 "@jridgewell/gen-mapping" "^0.3.2"
Expand DownExpand Up@@ -31303,16 +31283,7 @@ wrangler@^3.67.1:
 optionalDependencies:
 fsevents "~2.3.2"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
 dependencies:
 ansi-styles "^4.0.0"
 string-width "^4.1.0"
 strip-ansi "^6.0.0"

wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down

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

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

Lms24
merged 6 commits into

from

Mar 11, 2025
 Merged


fix(sveltekit): Correctly parse angle bracket type assertions for auto instrumentation
#15578
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
d71e6ad

fix(sveltekit): Correctly parse angle bracket type assertions for aut…


Lms24 Mar 4, 2025
90685e2

cleanup


Lms24 Mar 4, 2025
9f33bae

extract recast parser config into extra file, add vendor information …


Lms24 Mar 4, 2025
25a39d2

fix type error


Lms24 Mar 4, 2025
0ec758b

add remaining options


Lms24 Mar 4, 2025
62f3b09

fix e2e test


Lms24 Mar 10, 2025

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


14 changes: 14 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.svelte

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
<script lang="ts">
 export let data
</script>

<h1>Type Assertion</h1>

<p>
 This route only exists to ensure we don't emit a build error because of the angle bracket type assertion in +page.ts
 see https://github.com/getsentry/sentry-javascript/issues/9318
</p>

<p>
 Message: {data.msg}
</p>

8 changes: 8 additions & 0 deletions
dev-packages/e2e-tests/test-applications/sveltekit-2/src/routes/type-assertion/+page.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
export async function load() {
 let x: unknown = 'foo';
 return {
 // this angle bracket type assertion threw an auto instrumentation error
 // see: https://github.com/getsentry/sentry-javascript/issues/9318
 msg: <string>x,
 };
}

3 changes: 2 additions & 1 deletion
packages/sveltekit/package.json

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -44,14 +44,15 @@
 }
 },
 "dependencies": {
 "@babel/parser": "7.26.9",
 "@sentry/cloudflare": "9.5.0",
 "@sentry/core": "9.5.0",
 "@sentry/node": "9.5.0",
 "@sentry/opentelemetry": "9.5.0",
 "@sentry/svelte": "9.5.0",
 "@sentry/vite-plugin": "3.2.0",
 "magic-string": "0.30.7",
 "magicast": "0.2.8",
 "recast": "0.23.11",
 "sorcery": "1.0.0"
 },
 "devDependencies": {
Expand Down

27 changes: 20 additions & 7 deletions
packages/sveltekit/src/vite/autoInstrument.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
import * as fs from 'fs';
import * as path from 'path';
import type { ExportNamedDeclaration } from '@babel/types';
import { parseModule } from 'magicast';
import * as recast from 'recast';
import t = recast.types.namedTypes;
import type { Plugin } from 'vite';
import { WRAPPED_MODULE_SUFFIX } from '../common/utils';
import { parser } from './recastTypescriptParser';

export type AutoInstrumentSelection = {
 /**
Expand DownExpand Up@@ -101,22 +102,30 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>

 const code = (await fs.promises.readFile(id, 'utf8')).toString();

 const mod = parseModule(code);
 const ast = recast.parse(code, {
 parser,
 });

 const program = (ast as { program?: t.Program }).program;

 const program = mod.$ast.type === 'Program' && mod.$ast;
 if (!program) {
 // eslint-disable-next-line no-console
 debug && console.log(`Skipping wrapping ${id} because it doesn't contain valid JavaScript or TypeScript`);
 return false;
 }

 const hasLoadDeclaration = program.body
 .filter((statement): statement is ExportNamedDeclaration => statement.type === 'ExportNamedDeclaration')
 .filter(
 (statement): statement is recast.types.namedTypes.ExportNamedDeclaration =>
 statement.type === 'ExportNamedDeclaration',
 )
 .find(exportDecl => {
 // find `export const load = ...`
 if (exportDecl.declaration?.type === 'VariableDeclaration') {
 const variableDeclarations = exportDecl.declaration.declarations;
 return variableDeclarations.find(decl => decl.id.type === 'Identifier' && decl.id.name === 'load');
 return variableDeclarations.find(
 decl => decl.type === 'VariableDeclarator' && decl.id.type === 'Identifier' && decl.id.name === 'load',
 );
 }

 // find `export function load = ...`
Expand All@@ -130,7 +139,11 @@ export async function canWrapLoad(id: string, debug: boolean): Promise<boolean>
 return exportDecl.specifiers.find(specifier => {
 return (
 (specifier.exported.type === 'Identifier' && specifier.exported.name === 'load') ||
 (specifier.exported.type === 'StringLiteral' && specifier.exported.value === 'load')
 // Type casting here because somehow the 'exportExtensions' plugin isn't reflected in the possible types
 // This plugin adds support for exporting something as a string literal (see comment above)
 // Doing this to avoid adding another babel plugin dependency
 ((specifier.exported.type as 'StringLiteral' | '') === 'StringLiteral' &&
 (specifier.exported as unknown as t.StringLiteral).value === 'load')
 );
 });
 }
Expand Down

91 changes: 91 additions & 0 deletions
packages/sveltekit/src/vite/recastTypescriptParser.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,91 @@
// This babel parser config is taken from recast's typescript parser config, specifically from these two files:
// see: https://github.com/benjamn/recast/blob/master/parsers/_babel_options.ts
// see: https://github.com/benjamn/recast/blob/master/parsers/babel-ts.ts
//
// Changes:
// - we don't add the 'jsx' plugin, to correctly parse TypeScript angle bracket type assertions
// (see https://www.typescriptlang.org/docs/handbook/2/everyday-types.html#type-assertions)
// - minor import and export changes
// - merged the two files linked above into one for simplicity

// Date of access: 2025-03-04
// Commit: https://github.com/benjamn/recast/commit/ba5132174894b496285da9d001f1f2524ceaed3a

// Recast license:

// Copyright (c) 2012 Ben Newman <bn@cs.stanford.edu>

// Permission is hereby granted, free of charge, to any person obtaining
// a copy of this software and associated documentation files (the
// "Software"), to deal in the Software without restriction, including
// without limitation the rights to use, copy, modify, merge, publish,
// distribute, sublicense, and/or sell copies of the Software, and to
// permit persons to whom the Software is furnished to do so, subject to
// the following conditions:

// The above copyright notice and this permission notice shall be
// included in all copies or substantial portions of the Software.

// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
// EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
// MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
// IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
// CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
// TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
// SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

import type { ParserPlugin } from '@babel/parser';
import { parse as babelParse } from '@babel/parser';
import type { Options } from 'recast';

export const parser: Options['parser'] = {
 parse: (source: string) =>
 babelParse(source, {
 strictMode: false,
 allowImportExportEverywhere: true,
 allowReturnOutsideFunction: true,
 startLine: 1,
 tokens: true,
 plugins: [
 'typescript',
 'asyncGenerators',
 'bigInt',
 'classPrivateMethods',
 'classPrivateProperties',
 'classProperties',
 'classStaticBlock',
 'decimal',
 'decorators-legacy',
 'doExpressions',
 'dynamicImport',
 'exportDefaultFrom',
 'exportNamespaceFrom',
 'functionBind',
 'functionSent',
 'importAssertions',
 'exportExtensions' as ParserPlugin,
 'importMeta',
 'nullishCoalescingOperator',
 'numericSeparator',
 'objectRestSpread',
 'optionalCatchBinding',
 'optionalChaining',
 [
 'pipelineOperator',
 {
 proposal: 'minimal',
 },
 ],
 [
 'recordAndTuple',
 {
 syntaxType: 'hash',
 },
 ],
 'throwExpressions',
 'topLevelAwait',
 'v8intrinsic',
 ],
 sourceType: 'module',
 }),
};

10 changes: 9 additions & 1 deletion
packages/sveltekit/test/vite/autoInstrument.test.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -140,7 +140,15 @@ describe('canWrapLoad', () => {
 return { props: { msg: res.toString() } }
 }`,
 ],

 [
 'export function declaration - with angle bracket type assertion',
 `export async function load() {
 let x: unknown = 'foo';
 return {
 msg: <string>x,
 };
 }`,
 ],
 [
 'variable declaration (let)',
 `import {something} from 'somewhere';
Expand Down

79 changes: 25 additions & 54 deletions
yarn.lock

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -1695,20 +1695,20 @@
 js-tokens "^4.0.0"
 picocolors "^1.0.0"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.21.9", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
"@babel/parser@7.26.9", "@babel/parser@^7.23.6", "@babel/parser@^7.26.9":
 version "7.26.9"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.9.tgz#d9e78bee6dc80f9efd8f2349dcfbbcdace280fd5"
 integrity sha512-81NWa1njQblgZbQHxWHpxxCzNsa3ZwvFqpUg7P+NNUU6f3UU2jBEg4OlF/J6rl8+PQGh1q6/zWScd001YwcA5A==
 dependencies:
 "@babel/types" "^7.26.9"

"@babel/parser@^7.1.0", "@babel/parser@^7.14.7", "@babel/parser@^7.16.4", "@babel/parser@^7.18.10", "@babel/parser@^7.20.7", "@babel/parser@^7.21.8", "@babel/parser@^7.22.10", "@babel/parser@^7.22.16", "@babel/parser@^7.23.5", "@babel/parser@^7.23.9", "@babel/parser@^7.25.3", "@babel/parser@^7.25.4", "@babel/parser@^7.25.6", "@babel/parser@^7.25.9", "@babel/parser@^7.26.0", "@babel/parser@^7.26.3", "@babel/parser@^7.4.5", "@babel/parser@^7.7.0":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/parser/-/parser-7.26.3.tgz#8c51c5db6ddf08134af1ddbacf16aaab48bac234"
 integrity sha512-WJ/CvmY8Mea8iDXo6a7RK2wbmJITT5fN3BEkRuFlxVyNx8jOKIIhmC4fSkTcPcf8JyavbBwIe6OpiCOBXt/IcA==
 dependencies:
 "@babel/types" "^7.26.3"

"@babel/plugin-bugfix-firefox-class-in-computed-class-key@^7.24.4":
 version "7.24.4"
 resolved "https://registry.yarnpkg.com/@babel/plugin-bugfix-firefox-class-in-computed-class-key/-/plugin-bugfix-firefox-class-in-computed-class-key-7.24.4.tgz#6125f0158543fb4edf1c22f322f3db67f21cb3e1"
Expand DownExpand Up@@ -2829,7 +2829,7 @@
 debug "^4.3.1"
 globals "^11.1.0"

"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.21.5", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
"@babel/types@^7.0.0", "@babel/types@^7.18.10", "@babel/types@^7.18.6", "@babel/types@^7.20.7", "@babel/types@^7.22.10", "@babel/types@^7.22.15", "@babel/types@^7.22.17", "@babel/types@^7.22.19", "@babel/types@^7.23.6", "@babel/types@^7.23.9", "@babel/types@^7.24.7", "@babel/types@^7.24.8", "@babel/types@^7.25.4", "@babel/types@^7.25.6", "@babel/types@^7.25.9", "@babel/types@^7.26.0", "@babel/types@^7.26.3", "@babel/types@^7.3.0", "@babel/types@^7.3.3", "@babel/types@^7.4.4", "@babel/types@^7.7.0", "@babel/types@^7.7.2":
 version "7.26.3"
 resolved "https://registry.yarnpkg.com/@babel/types/-/types-7.26.3.tgz#37e79830f04c2b5687acc77db97fbc75fb81f3c0"
 integrity sha512-vN5p+1kl59GVKMvTHt55NzzmYVxprfJD+ql7U9NFIfKCBkYE55LYtS+WtPlaYOyzydrKI8Nezd+aZextrd+FMA==
Expand DownExpand Up@@ -8509,12 +8509,7 @@
 dependencies:
 "@types/unist" "*"

"@types/history-4@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==

"@types/history-5@npm:@types/history@4.7.8":
"@types/history-4@npm:@types/history@4.7.8", "@types/history-5@npm:@types/history@4.7.8":
 version "4.7.8"
 resolved "https://registry.yarnpkg.com/@types/history/-/history-4.7.8.tgz#49348387983075705fe8f4e02fb67f7daaec4934"
 integrity sha512-S78QIYirQcUoo6UJZx9CSP0O2ix9IaeAXwQi26Rhr/+mg7qqPy8TzaxHSUut7eGjL8WmLccT7/MXf304WjqHcA==
Expand DownExpand Up@@ -21326,15 +21321,6 @@ magic-string@^0.30.0, magic-string@^0.30.10, magic-string@^0.30.11, magic-string
 dependencies:
 "@jridgewell/sourcemap-codec" "^1.5.0"

magicast@0.2.8:
 version "0.2.8"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.8.tgz#02b298c65fbc5b7d1fce52ef779c59caf68cc9cf"
 integrity sha512-zEnqeb3E6TfMKYXGyHv3utbuHNixr04o3/gVGviSzVQkbFiU46VZUd+Ea/1npKfvEsEWxBYuIksKzoztTDPg0A==
 dependencies:
 "@babel/parser" "^7.21.9"
 "@babel/types" "^7.21.5"
 recast "^0.23.2"

magicast@^0.2.10:
 version "0.2.11"
 resolved "https://registry.yarnpkg.com/magicast/-/magicast-0.2.11.tgz#d5d9339ec59e5322cf331460d8e3db2f6585f5d5"
Expand DownExpand Up@@ -26237,6 +26223,17 @@ realistic-structured-clone@^3.0.0:
 typeson "^6.1.0"
 typeson-registry "^1.0.0-alpha.20"

recast@0.23.11:
 version "0.23.11"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.11.tgz#8885570bb28cf773ba1dc600da7f502f7883f73f"
 integrity sha512-YTUo+Flmw4ZXiWfQKGcwwc11KnoRAYgzAE2E7mXKCjSviTKShtxBsN6YUUBB2gtaBzKzeKunxhUwNHQuRryhWA==
 dependencies:
 ast-types "^0.16.1"
 esprima "~4.0.0"
 source-map "~0.6.1"
 tiny-invariant "^1.3.3"
 tslib "^2.0.1"

recast@^0.18.1:
 version "0.18.10"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.18.10.tgz#605ebbe621511eb89b6356a7e224bff66ed91478"
Expand All@@ -26257,7 +26254,7 @@ recast@^0.20.5:
 source-map "~0.6.1"
 tslib "^2.0.1"

recast@^0.23.2, recast@^0.23.4:
recast@^0.23.4:
 version "0.23.9"
 resolved "https://registry.yarnpkg.com/recast/-/recast-0.23.9.tgz#587c5d3a77c2cfcb0c18ccce6da4361528c2587b"
 integrity sha512-Hx/BGIbwj+Des3+xy5uAtAbdCyqK9y9wbBcDFDYanLS9JnMqf7OeF87HQwUimE87OEc72mr6tkKUKMBBL+hF9Q==
Expand DownExpand Up@@ -28346,16 +28343,7 @@ string-template@~0.2.1:
 resolved "https://registry.yarnpkg.com/string-template/-/string-template-0.2.1.tgz#42932e598a352d01fc22ec3367d9d84eec6c9add"
 integrity sha1-QpMuWYo1LQH8IuwzZ9nYTuxsmt0=

"string-width-cjs@npm:string-width@^4.2.0":
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
 dependencies:
 emoji-regex "^8.0.0"
 is-fullwidth-code-point "^3.0.0"
 strip-ansi "^6.0.1"

string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
"string-width-cjs@npm:string-width@^4.2.0", string-width@4.2.3, "string-width@^1.0.2 || 2 || 3 || 4", string-width@^4.0.0, string-width@^4.1.0, string-width@^4.2.0, string-width@^4.2.2, string-width@^4.2.3:
 version "4.2.3"
 resolved "https://registry.yarnpkg.com/string-width/-/string-width-4.2.3.tgz#269c7117d27b05ad2e536830a8ec895ef9c6d010"
 integrity sha512-wKyQRQpjJ0sIp62ErSZdGsjMJWsap5oRNihHhu6G7JVO/9jIB6UyevL+tXuOqrng8j/cxKTWyWUwvSTriiZz/g==
Expand DownExpand Up@@ -28458,14 +28446,7 @@ stringify-object@^3.2.1:
 is-obj "^1.0.1"
 is-regexp "^1.0.0"

"strip-ansi-cjs@npm:strip-ansi@^6.0.1":
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
 dependencies:
 ansi-regex "^5.0.1"

strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
"strip-ansi-cjs@npm:strip-ansi@^6.0.1", strip-ansi@6.0.1, strip-ansi@^6.0.0, strip-ansi@^6.0.1:
 version "6.0.1"
 resolved "https://registry.yarnpkg.com/strip-ansi/-/strip-ansi-6.0.1.tgz#9e26c63d30f53443e9489495b2105d37b67a85d9"
 integrity sha512-Y38VPSHcqkFrCpFnQ9vuSXmquuv5oXOKpGeT6aGrr3o3Gc9AlVa6JBfUSOCnbxGGZF+/0ooI7KrPuUSztUdU5A==
Expand DownExpand Up@@ -28630,7 +28611,6 @@ stylus@0.59.0, stylus@^0.59.0:

sucrase@^3.27.0, sucrase@^3.35.0, sucrase@getsentry/sucrase#es2020-polyfills:
 version "3.36.0"
 uid fd682f6129e507c00bb4e6319cc5d6b767e36061
 resolved "https://codeload.github.com/getsentry/sucrase/tar.gz/fd682f6129e507c00bb4e6319cc5d6b767e36061"
 dependencies:
 "@jridgewell/gen-mapping" "^0.3.2"
Expand DownExpand Up@@ -31303,16 +31283,7 @@ wrangler@^3.67.1:
 optionalDependencies:
 fsevents "~2.3.2"

"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0":
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
 dependencies:
 ansi-styles "^4.0.0"
 string-width "^4.1.0"
 strip-ansi "^6.0.0"

wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
"wrap-ansi-cjs@npm:wrap-ansi@^7.0.0", wrap-ansi@7.0.0, wrap-ansi@^7.0.0:
 version "7.0.0"
 resolved "https://registry.yarnpkg.com/wrap-ansi/-/wrap-ansi-7.0.0.tgz#67e145cff510a6a6984bdf1152911d69d2eb9e43"
 integrity sha512-YVGIj2kamLSTxw6NsZjoBxfSwsn0ycdesmc4p+Q21c5zPuZ1pl+NfxVdxPtdHvmNVOQ6XSYG4AUtyt/Fi7D16Q==
Expand Down