Commit 4498be3b authored by Luke Sandberg's avatar Luke Sandberg

restrict free call optimization to turbopack identifiers for now

parent efec7ab9
...@@ -78,11 +78,15 @@ describe('deobfuscateModuleId', () => { ...@@ -78,11 +78,15 @@ describe('deobfuscateModuleId', () => {
describe('removeFreeCallWrapper', () => { describe('removeFreeCallWrapper', () => {
test('removes (0, ) wrapper', () => { test('removes (0, ) wrapper', () => {
expect(removeFreeCallWrapper('(0, foo.bar)')).toBe('foo.bar') expect(removeFreeCallWrapper('(0, __TURBOPACK__foo__.bar)')).toBe(
'__TURBOPACK__foo__.bar'
)
}) })
test('removes (0 , ) wrapper with spaces', () => { test('removes (0 , ) wrapper with spaces', () => {
expect(removeFreeCallWrapper('(0 , foo.bar)')).toBe('foo.bar') expect(removeFreeCallWrapper('(0 , __TURBOPACK__foo__.bar)')).toBe(
'__TURBOPACK__foo__.bar'
)
}) })
test('leaves non-free-call expressions unchanged', () => { test('leaves non-free-call expressions unchanged', () => {
...@@ -96,20 +100,16 @@ describe('deobfuscateText', () => { ...@@ -96,20 +100,16 @@ describe('deobfuscateText', () => {
const input = const input =
'(0 , __TURBOPACK__imported__module__$5b$project$5d2f$examples$2f$with$2d$turbopack$2f$app$2f$foo$2e$ts__$5b$app$2d$rsc$5d$__$28$ecmascript$29$__.foo) is not a function' '(0 , __TURBOPACK__imported__module__$5b$project$5d2f$examples$2f$with$2d$turbopack$2f$app$2f$foo$2e$ts__$5b$app$2d$rsc$5d$__$28$ecmascript$29$__.foo) is not a function'
const output = deobfuscateText(input) const output = deobfuscateText(input)
expect(output).toContain('imported module') expect(output).toBe(
expect(output).toContain('./examples/with-turbopack/app/foo.ts') '{imported module ./examples/with-turbopack/app/foo.ts}.foo is not a function'
expect(output).not.toContain('[project]') )
expect(output).not.toContain('[app-rsc]')
expect(output).not.toContain('(ecmascript)')
expect(output).not.toContain('(0 ,')
}) })
test('handles multiple magic identifiers', () => { test('handles multiple magic identifiers', () => {
const input = const input =
'__TURBOPACK__module__evaluation__ called __TURBOPACK__foo$2f$bar__' '__TURBOPACK__module__evaluation__ called __TURBOPACK__foo$2f$bar__'
const output = deobfuscateText(input) const output = deobfuscateText(input)
expect(output).toContain('module evaluation') expect(output).toBe('{module evaluation} called {foo/bar}')
expect(output).toContain('foo/bar')
}) })
test('leaves regular text unchanged', () => { test('leaves regular text unchanged', () => {
......
...@@ -125,7 +125,7 @@ export function removeFreeCallWrapper(text: string): string { ...@@ -125,7 +125,7 @@ export function removeFreeCallWrapper(text: string): string {
// Use Unicode property escapes (\p{ID_Start}, \p{ID_Continue}) for full JS identifier support // Use Unicode property escapes (\p{ID_Start}, \p{ID_Continue}) for full JS identifier support
// Requires the 'u' (unicode) flag in the regex // Requires the 'u' (unicode) flag in the regex
return text.replace( return text.replace(
/\(0\s*,\s*([\p{ID_Start}_$][\p{ID_Continue}$]*\.[\p{ID_Start}_$][\p{ID_Continue}$]*)\)/u, /\(0\s*,\s*(__TURBOPACK__[a-zA-Z0-9_$]+__\.[\p{ID_Start}_$][\p{ID_Continue}$]*)\)/u,
'$1' '$1'
) )
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment