Skip to content

Commit 656021b

Browse files
sxzzsxzz
committed
feat!: prefer to use rolldown native magic-string 
1 parent 90deed9 commit 656021b

12 files changed

Lines changed: 138 additions & 39 deletions

‎package.json‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@
5656
"dependencies": {
5757
"@yuku-toolchain/types": "^0.8.3",
5858
"magic-string-ast": "^2.1.1",
59+
"rolldown-string": "^0.3.1",
5960
"unplugin": "^3.3.0",
6061
"yuku-ast": "^0.8.3",
6162
"yuku-codegen": "^0.8.3",
@@ -68,6 +69,7 @@
6869
"@antfu/utils": "^9.3.0",
6970
"@sxzz/eslint-config": "^8.4.0",
7071
"@sxzz/prettier-config": "^2.3.2",
72+
"@sxzz/test-utils": "^0.5.18",
7173
"@types/node": "^26.1.2",
7274
"@typescript/native-preview": "7.0.0-dev.20260707.2",
7375
"bumpp": "^12.1.1",

‎pnpm-lock.yaml‎

Lines changed: 68 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎src/core/options.ts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,6 @@ export function resolveOptions(options: Options): OptionsResolved {
2929
exclude: options.exclude || undefined,
3030
enforce: options.enforce || undefined,
3131
parserOptions: options.parserOptions || {},
32-
transformer: options.transformer ? toArray(options.transformer) : [],
32+
transformer: toArray(options.transformer),
3333
}
3434
}

‎src/core/transform.ts‎

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
import {
2-
generateTransform,
3-
MagicStringAST,
4-
type CodeTransform,
5-
} from 'magic-string-ast'
1+
import { MagicString, MagicStringAST } from 'magic-string-ast'
62
import { walkAsync } from 'yuku-ast'
73
import {
84
langFromPath,
@@ -15,6 +11,7 @@ import {
1511
import { useNodeRef } from './utils.ts'
1612
import type { OptionsResolved } from './options.ts'
1713
import type { Transformer, TransformerParsed } from './types.ts'
14+
import type { RolldownString } from 'rolldown-string'
1815

1916
function parseProgram(code: string, id: string, parserOptions: ParseOptions) {
2017
const path = id.replace(/[?#].*$/, '')
@@ -66,17 +63,17 @@ async function getTransformersByFile(transformer: Transformer[], id: string) {
6663
}
6764

6865
export async function transform(
69-
code: string,
66+
source: string | RolldownString,
7067
id: string,
7168
options: Pick<OptionsResolved, 'parserOptions' | 'transformer'>,
72-
): Promise<CodeTransform | undefined> {
73-
const { getNodeRef } = useNodeRef()
74-
69+
): Promise<RolldownString | undefined> {
7570
const transformers = await getTransformersByFile(options.transformer, id)
7671
if (!transformers.length) return
7772

73+
const code = source.toString()
7874
const program = parseProgram(code, id, options.parserOptions)
7975

76+
const getNodeRef = useNodeRef()
8077
await walkAsync(program, {
8178
async enter(node, context) {
8279
for (const { transformer, nodes } of transformers) {
@@ -93,7 +90,11 @@ export async function transform(
9390
},
9491
})
9592

96-
const s = new MagicStringAST(code)
93+
const s =
94+
typeof source === 'string'
95+
? new MagicString(source, { filename: id })
96+
: source
97+
const msa = new MagicStringAST(s as MagicString)
9798
for (const { transformer, nodes } of transformers) {
9899
for (const node of nodes) {
99100
const value = node.value
@@ -103,7 +104,7 @@ export async function transform(
103104
if (result) {
104105
let newAST: Node
105106
if (typeof result === 'string') {
106-
s.overwriteNode(value, result)
107+
msa.overwriteNode(value, result)
107108
newAST = parseReplacement(result, id, options.parserOptions)
108109
if (newAST.type === 'ExpressionStatement') {
109110
newAST = newAST.expression
@@ -115,7 +116,7 @@ export async function transform(
115116
const generated = generate(result as Program)
116117
let code = generated.code
117118
if (result.type.endsWith('Expression')) code = `(${code})`
118-
s.overwriteNode(value, code)
119+
msa.overwriteNode(value, code)
119120
newAST = {
120121
...result,
121122
start: value.start,
@@ -127,14 +128,14 @@ export async function transform(
127128
} else if (result === false) {
128129
// removes node
129130
node.set(undefined)
130-
s.removeNode(value)
131+
msa.removeNode(value)
131132
}
132133
}
133134
}
134135

135136
for (const { transformer } of transformers) {
136-
await transformer.finalize?.(s)
137+
await transformer.finalize?.(msa)
137138
}
138139

139-
return generateTransform(s, id)
140+
return s
140141
}

‎src/core/utils.ts‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,7 @@
11
import type { NodeRef } from './types.ts'
22
import type { Node } from 'yuku-parser'
33

4-
export function useNodeRef(): {
5-
nodeRefs: Map<Node, NodeRef<Node | undefined>>
6-
getNodeRef: (node: Node) => NodeRef<Node | undefined>
7-
} {
4+
export function useNodeRef(): (node: Node) => NodeRef<Node | undefined> {
85
const nodeRefs: Map<Node, NodeRef<Node | undefined>> = new Map()
96

107
function getNodeRef(node: Node): NodeRef<Node | undefined> {
@@ -19,8 +16,5 @@ export function useNodeRef(): {
1916
return ref
2017
}
2118

22-
return {
23-
nodeRefs,
24-
getNodeRef,
25-
}
19+
return getNodeRef
2620
}

‎src/index.ts‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
import { withMagicString } from 'rolldown-string'
12
import { createUnplugin, type UnpluginInstance } from 'unplugin'
23
import { resolveOptions, type Options } from './core/options.ts'
34
import { transform } from './core/transform.ts'
@@ -13,7 +14,7 @@ export const AST: UnpluginInstance<Options | undefined, false> = createUnplugin(
1314
enforce,
1415
transform: {
1516
filter: { id: { include, exclude } },
16-
handler: (code, id) => transform(code, id, options),
17+
handler: withMagicString((code, id) => transform(code, id, options)),
1718
},
1819
}
1920
},

‎tests/__snapshots__/rolldown.test.ts.snap‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
// Vitest Snapshot v1, https://vitest.dev/guide/snapshot.html
2+
3+
exports[`rolldown build 1`] = `
4+
"// basic.js
5+
const config = { test: {} };
6+
//#endregion
7+
export { config as default };
8+
"
9+
`;

‎tests/basic.test.ts‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -55,25 +55,25 @@ test('basic', async () => {
5555
transformer: [],
5656
parserOptions: {},
5757
}
58-
let code = (await transform(source, 'foo.js', options))?.code
58+
let code = (await transform(source, 'foo.js', options))?.toString()
5959
expect(code).toMatchInlineSnapshot('undefined')
6060

6161
options.transformer = [changeString]
62-
code = (await transform(source, 'foo.js', options))?.code
62+
code = (await transform(source, 'foo.js', options))?.toString()
6363
expect(code).toMatchInlineSnapshot(`
6464
"const foo = 'Hello'
6565
let i = 10"
6666
`)
6767

6868
options.transformer = [changeVarName]
69-
code = (await transform(source, 'foo.js', options))?.code
69+
code = (await transform(source, 'foo.js', options))?.toString()
7070
expect(code).toMatchInlineSnapshot(`
7171
"const newName = 'string'
7272
let i = 10"
7373
`)
7474

7575
options.transformer = [changeString, changeVarName]
76-
code = (await transform(source, 'foo.js', options))?.code
76+
code = (await transform(source, 'foo.js', options))?.toString()
7777
expect(code).toMatchInlineSnapshot(`
7878
"const newName = 'Hello'
7979
let i = 10"
@@ -87,14 +87,14 @@ test('change twice', async () => {
8787
parserOptions: {},
8888
}
8989
options.transformer = [changeString, changeVarName, overwriteVarName]
90-
let code = (await transform(source, 'foo.js', options))?.code
90+
let code = (await transform(source, 'foo.js', options))?.toString()
9191
expect(code).toMatchInlineSnapshot(`
9292
"const overwrite_newName = 'Hello'
9393
let overwrite_i = 10"
9494
`)
9595

9696
options.transformer = [timesTen, timesTen, timesTen]
97-
code = (await transform(source, 'foo.js', options))?.code
97+
code = (await transform(source, 'foo.js', options))?.toString()
9898
expect(code).toMatchInlineSnapshot(`
9999
"const foo = 'string'
100100
let i = 10000"
@@ -108,7 +108,7 @@ test('remove node', async () => {
108108
parserOptions: {},
109109
}
110110
options.transformer = [removeFirstStatement]
111-
const code = (await transform(source, 'foo.js', options))?.code
111+
const code = (await transform(source, 'foo.js', options))?.toString()
112112
expect(code).toMatchInlineSnapshot(`
113113
"
114114
let i = 10;{}"
@@ -147,7 +147,7 @@ test('transform with Yuku AST', async () => {
147147
],
148148
parserOptions: {},
149149
}
150-
const code = (await transform(source, 'foo.js', options))?.code
150+
const code = (await transform(source, 'foo.js', options))?.toString()
151151
expect(code).toBe('const overwrite_renamed = 1')
152152
})
153153

@@ -157,7 +157,7 @@ test('handles Unicode offsets', async () => {
157157
transformer: [changeVarName],
158158
parserOptions: {},
159159
}
160-
const code = (await transform(source, 'foo.js', options))?.code
160+
const code = (await transform(source, 'foo.js', options))?.toString()
161161
expect(code).toBe(`const 文 = '值'\nconst newName = 'string'`)
162162
})
163163

@@ -168,7 +168,7 @@ test('detects language through query parameters', async () => {
168168
parserOptions: {},
169169
}
170170
for (const id of ['foo.ts?raw', 'foo.vue?vue&type=script&lang.ts']) {
171-
const code = (await transform(source, id, options))?.code
171+
const code = (await transform(source, id, options))?.toString()
172172
expect(code).toBe(`const foo: string = 'Hello'`)
173173
}
174174
})
@@ -190,7 +190,7 @@ test.fails('overwrite part', async () => {
190190
parserOptions: {},
191191
}
192192
expect(
193-
(await transform(source, 'foo.js', options))?.code,
193+
(await transform(source, 'foo.js', options))?.toString(),
194194
).toMatchInlineSnapshot('undefined')
195195
})
196196

@@ -209,7 +209,7 @@ test('rewrite statement', async () => {
209209
},
210210
},
211211
]
212-
const code = (await transform(source, 'foo.js', options))?.code
212+
const code = (await transform(source, 'foo.js', options))?.toString()
213213
expect(code).toMatchInlineSnapshot(`
214214
"const foo = 'bar'; const bar = 'foo'
215215
let i = 10;{i++}"

‎tests/fixtures/basic.ts‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
function defineConfig(config: any) {
2+
return config
3+
}
4+
5+
const config: any = defineConfig({
6+
test: {},
7+
})
8+
9+
export default config

0 commit comments

Comments
 (0)