fix: don't remove script setup block (#112)

Author: Alan Wang

src/__tests__/runTransformation.spec.ts

@@ -112,6 +112,74 @@ export default {
 `)
   })
 
+  it('don\'t transform scriptSetup blocks in .vue files', () => {
+    const source = `<template>
+  <div id="app">
+    <img alt="Vue logo" src="./assets/logo.png">
+    <HelloWorld msg="Welcome to Your Vue.js App"/>
+  </div>
+</template>
+<script setup lang="ts">
+import { getFormattedTitle } from '../composable/useDocument'
+import { IDocmentHistory } from '@/api/types'
+
+interface IProps {
+  list: IDocmentHistory[]
+  select?: (id: number) => void
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  list: () => [],
+  select: (id: number) => {},
+})
+
+const selectHistory = (id: number) => {
+  props?.select(id)
+}
+</script>
+
+<script lang="ts">
+export default {
+  name: 'document-history',
+}
+</script>
+`
+    const file = { path: '/tmp/a.vue', source }
+    const result = runTransformation(file, addUseStrict)
+    expect(result).toBe(`<template>
+  <div id="app">
+    <img alt="Vue logo" src="./assets/logo.png">
+    <HelloWorld msg="Welcome to Your Vue.js App"/>
+  </div>
+</template>
+<script lang="ts" setup>
+import { getFormattedTitle } from '../composable/useDocument'
+import { IDocmentHistory } from '@/api/types'
+
+interface IProps {
+  list: IDocmentHistory[]
+  select?: (id: number) => void
+}
+
+const props = withDefaults(defineProps<IProps>(), {
+  list: () => [],
+  select: (id: number) => {},
+})
+
+const selectHistory = (id: number) => {
+  props?.select(id)
+}
+</script>
+
+<script lang="ts">
+'use strict';
+export default {
+  name: 'document-history',
+}
+</script>
+`)
+  })
+
   it.todo('transforms script blocks with custom lang attributes in .vue files')
 
   it('(jscodeshift transforms) skips .vue files without script blocks', () => {

src/sfcUtils.ts

@@ -41,11 +41,11 @@ import { Statement } from '@babel/types'
  */
 
 export function stringify(sfcDescriptor: SFCDescriptor) {
-  const { template, script, styles, customBlocks } = sfcDescriptor
+  const { template, script, scriptSetup, styles, customBlocks } = sfcDescriptor
 
   return (
     (
-      [template, script, ...styles, ...customBlocks]
+      [template, script, scriptSetup, ...styles, ...customBlocks]
         // discard blocks that don't exist
         .filter(block => block != null) as Array<NonNullable<SFCBlock>>
     )

yarn.lock

@@ -1170,6 +1170,13 @@
   dependencies:
     "@babel/types" "^7.3.0"
 
+"@types/cli-progress@^3.9.2":
+  version "3.9.2"
+  resolved "https://registry.nlark.com/@types/cli-progress/download/@types/cli-progress-3.9.2.tgz?cache=0&sync_timestamp=1629711886759&other_urls=https%3A%2F%2Fregistry.nlark.com%2F%40types%2Fcli-progress%2Fdownload%2F%40types%2Fcli-progress-3.9.2.tgz#6ca355f96268af39bee9f9307f0ac96145639c26"
+  integrity sha1-bKNV+WJorzm+6fkwfwrJYUVjnCY=
+  dependencies:
+    "@types/node" "*"
+
 "@types/debug@^4.1.5":
   version "4.1.5"
   resolved "https://registry.npmjs.org/@types/debug/-/debug-4.1.5.tgz"
@@ -1341,29 +1348,29 @@
     "@typescript-eslint/types" "4.27.0"
     eslint-visitor-keys "^2.0.0"
 
-"@vue/[email protected].5", "@vue/compiler-core@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.npmjs.org/@vue/compiler-core/-/compiler-core-3.0.5.tgz"
-  integrity sha512-iFXwk2gmU/GGwN4hpBwDWWMLvpkIejf/AybcFtlQ5V1ur+5jwfBaV0Y1RXoR6ePfBPJixtKZ3PmN+M+HgMAtfQ==
+"@vue/[email protected].11", "@vue/compiler-core@~3.0.5":
+  version "3.0.11"
+  resolved "https://registry.nlark.com/@vue/compiler-core/download/@vue/compiler-core-3.0.11.tgz#5ef579e46d7b336b8735228758d1c2c505aae69a"
+  integrity sha1-XvV55G17M2uHNSKHWNHCxQWq5po=
   dependencies:
     "@babel/parser" "^7.12.0"
     "@babel/types" "^7.12.0"
-    "@vue/shared" "3.0.5"
+    "@vue/shared" "3.0.11"
     estree-walker "^2.0.1"
     source-map "^0.6.1"
 
-"@vue/compiler-dom@^3.0.5":
-  version "3.0.5"
-  resolved "https://registry.npmjs.org/@vue/compiler-dom/-/compiler-dom-3.0.5.tgz"
-  integrity sha512-HSOSe2XSPuCkp20h4+HXSiPH9qkhz6YbW9z9ZtL5vef2T2PMugH7/osIFVSrRZP/Ul5twFZ7MIRlp8tPX6e4/g==
+"@vue/compiler-dom@~3.0.5":
+  version "3.0.11"
+  resolved "https://registry.nlark.com/@vue/compiler-dom/download/@vue/compiler-dom-3.0.11.tgz#b15fc1c909371fd671746020ba55b5dab4a730ee"
+  integrity sha1-sV/ByQk3H9ZxdGAgulW12rSnMO4=
   dependencies:
-    "@vue/compiler-core" "3.0.5"
-    "@vue/shared" "3.0.5"
+    "@vue/compiler-core" "3.0.11"
+    "@vue/shared" "3.0.11"
 
-"@vue/[email protected].5":
-  version "3.0.5"
-  resolved "https://registry.npmjs.org/@vue/shared/-/shared-3.0.5.tgz"
-  integrity sha512-gYsNoGkWejBxNO6SNRjOh/xKeZ0H0V+TFzaPzODfBjkAIb0aQgBuixC1brandC/CDJy1wYPwSoYrXpvul7m6yw==
+"@vue/[email protected].11":
+  version "3.0.11"
+  resolved "https://registry.nlark.com/@vue/shared/download/@vue/shared-3.0.11.tgz#20d22dd0da7d358bb21c17f9bde8628152642c77"
+  integrity sha1-INIt0Np9NYuyHBf5vehigVJkLHc=
 
 abab@^2.0.3:
   version "2.0.5"
@@ -1807,6 +1814,14 @@ class-utils@^0.3.5:
     isobject "^3.0.0"
     static-extend "^0.1.1"
 
+cli-progress@^3.9.0:
+  version "3.9.0"
+  resolved "https://registry.npm.taobao.org/cli-progress/download/cli-progress-3.9.0.tgz#25db83447deb812e62d05bac1af9aec5387ef3d4"
+  integrity sha1-JduDRH3rgS5i0FusGvmuxTh+89Q=
+  dependencies:
+    colors "^1.1.2"
+    string-width "^4.2.0"
+
 cliui@^6.0.0:
   version "6.0.0"
   resolved "https://registry.npmjs.org/cliui/-/cliui-6.0.0.tgz"