Skip to content

Commit

Permalink
fix(compiler-sfc): generate valid TS in script and script setup co-us…
Browse files Browse the repository at this point in the history 
…age with TS

fix #5094
  • Loading branch information
@yyx990803
yyx990803 committed Dec 12, 2021
1 parent ea1fcfb commit 7e4f0a8
Show file tree
Hide file tree
Showing 3 changed files with 140 additions and 104 deletions.
79 changes: 50 additions & 29 deletions packages/compiler-sfc/__tests__/__snapshots__/compileScript.spec.ts.snap
View file
Expand Up @@ -4,8 +4,10 @@ exports[`SFC compile <script setup> <script> and <script setup> co-usage script
"import { x } from './x'
export const n = 1
const __default__ = {}
export default {
export default /*#__PURE__*/Object.assign(__default__, {
setup(__props, { expose }) {
expose();
Expand All @@ -14,13 +16,15 @@ export default {
return { n, x }
}
}"
})"
`;
exports[`SFC compile <script setup> <script> and <script setup> co-usage script setup first 1`] = `
"import { x } from './x'
"export const n = 1
const __default__ = {}
import { x } from './x'
export default {
export default /*#__PURE__*/Object.assign(__default__, {
setup(__props, { expose }) {
expose();
Expand All @@ -29,29 +33,48 @@ export default {
return { n, x }
}
}
export const n = 1"
})"
`;
exports[`SFC compile <script setup> <script> and <script setup> co-usage script setup first, lang="ts", script block content export default 1`] = `
"import { defineComponent as _defineComponent } from 'vue'
import { x } from './x'
const __default__ = {
name: \\"test\\"
}
import { x } from './x'
function setup(__props, { expose }) {
export default /*#__PURE__*/_defineComponent({
...__default__,
setup(__props, { expose }) {
expose();
x()
return { x }
}
})"
`;
const __default__ = {
name: \\"test\\"
}
exports[`SFC compile <script setup> <script> and <script setup> co-usage script setup first, named default export 1`] = `
"export const n = 1
const def = {}
export default /*#__PURE__*/_defineComponent({
...__default__,
setup})"
const __default__ = def
import { x } from './x'
export default /*#__PURE__*/Object.assign(__default__, {
setup(__props, { expose }) {
expose();
x()
return { n, def, x }
}
})"
`;
exports[`SFC compile <script setup> <script> and <script setup> co-usage spaces in ExportDefaultDeclaration node with many spaces and newline 1`] = `
Expand All @@ -62,16 +85,15 @@ exports[`SFC compile <script setup> <script> and <script setup> co-usage spaces
some:'option'
}
function setup(__props, { expose }) {
export default /*#__PURE__*/Object.assign(__default__, {
setup(__props, { expose }) {
expose();
x()
return { n, x }
}
export default /*#__PURE__*/ Object.assign(__default__, {
setup
})"
`;
Expand All @@ -83,16 +105,15 @@ exports[`SFC compile <script setup> <script> and <script setup> co-usage spaces
some:'option'
}
function setup(__props, { expose }) {
export default /*#__PURE__*/Object.assign(__default__, {
setup(__props, { expose }) {
expose();
x()
return { n, x }
}
export default /*#__PURE__*/ Object.assign(__default__, {
setup
})"
`;
Expand Down Expand Up @@ -980,7 +1001,12 @@ return () => {}
`;
exports[`SFC compile <script setup> should expose top level declarations 1`] = `
"import { x } from './x'
"import { xx } from './x'
let aa = 1
const bb = 2
function cc() {}
class dd {}
import { x } from './x'
export default {
setup(__props, { expose }) {
Expand All @@ -994,12 +1020,7 @@ export default {
return { aa, bb, cc, dd, a, b, c, d, xx, x }
}
}
import { xx } from './x'
let aa = 1
const bb = 2
function cc() {}
class dd {}"
}"
`;
exports[`SFC compile <script setup> with TypeScript const Enum 1`] = `
Expand Down
92 changes: 55 additions & 37 deletions packages/compiler-sfc/__tests__/compileScript.spec.ts
View file
Expand Up @@ -169,47 +169,12 @@ defineExpose({ foo: 123 })
})

describe('<script> and <script setup> co-usage', () => {
describe('spaces in ExportDefaultDeclaration node', () => {
// #4371
test('with many spaces and newline', () => {
// #4371
const { content } = compile(`
<script>
export const n = 1
export default
{
some:'option'
}
</script>
<script setup>
import { x } from './x'
x()
</script>
`)
assertCode(content)
})

test('with minimal spaces', () => {
const { content } = compile(`
<script>
export const n = 1
export default{
some:'option'
}
</script>
<script setup>
import { x } from './x'
x()
</script>
`)
assertCode(content)
})
})

test('script first', () => {
const { content } = compile(`
<script>
export const n = 1
export default {}
</script>
<script setup>
import { x } from './x'
Expand All @@ -227,6 +192,22 @@ defineExpose({ foo: 123 })
</script>
<script>
export const n = 1
export default {}
</script>
`)
assertCode(content)
})

test('script setup first, named default export', () => {
const { content } = compile(`
<script setup>
import { x } from './x'
x()
</script>
<script>
export const n = 1
const def = {}
export { def as default }
</script>
`)
assertCode(content)
Expand All @@ -249,6 +230,43 @@ defineExpose({ foo: 123 })
expect(content).toMatch(/const __default__[\S\s]*\.\.\.__default__/m)
assertCode(content)
})

describe('spaces in ExportDefaultDeclaration node', () => {
// #4371
test('with many spaces and newline', () => {
// #4371
const { content } = compile(`
<script>
export const n = 1
export default
{
some:'option'
}
</script>
<script setup>
import { x } from './x'
x()
</script>
`)
assertCode(content)
})

test('with minimal spaces', () => {
const { content } = compile(`
<script>
export const n = 1
export default{
some:'option'
}
</script>
<script setup>
import { x } from './x'
x()
</script>
`)
assertCode(content)
})
})
})

describe('imports', () => {
Expand Down

0 comments on commit 7e4f0a8

Please sign in to comment.