feat: allow other block

Author: zhiyuanzmj

eslint.config.js

@@ -17,5 +17,6 @@ export default antfu(
         'yaml/indent': 'off',
       },
     },
+    ignores: ['**/playground/**'],
   },
 )

playground/src/components/Comp.vue

@@ -1,15 +1,15 @@
+<template>
+  <div>
+    <slot :id="`${id}`" />
+    <slot name="bottom" v-bind="{ foo: id }" />
+  </div>
+</template>
+
 <script setup lang="ts">
 const { id } = defineProps<{ id: number }>()
 
 defineSlots<{
   default: (props: { id: string }) => any
   bottom: (props: { foo: number }) => any
 }>()
-</script>
-
-<template>
-  <div>
-    <slot :id="`${id}`" />
-    <slot name="bottom" v-bind="{ foo: id }" />
-  </div>
-</template>
+</script>

playground/vite.config.ts

@@ -18,7 +18,9 @@ export default defineConfig({
             propsDestructure: true,
           },
         }),
-        vueJsx: vueJsx(),
+        vueJsx: vueJsx({
+          transformOn: true
+        }),
       },
     }),
 

src/index.ts

@@ -24,6 +24,7 @@ let macro = await select({
     { value: 'jsx-directive' },
     { value: 'setup-sfc' },
     { value: 'short-v-model' },
+    { value: 'define-slots' },
   ],
 },
 )
@@ -41,19 +42,6 @@ if (macro === 'jsx-directive') {
   })
 }
 
-let defineSlots = 'define-slots'
-if (['jsx-directive', 'setup-sfc'].includes(macro)) {
-  defineSlots = await select({
-    message: chalk.green(
-      `Which define-slots macro do you want to use?`,
-    ),
-    choices: [
-      { value: 'define-slots' },
-      { value: 'define-short-slots' },
-    ],
-  })
-}
-
 if (macro === 'short-v-model') {
   macro = await select({
     message: chalk.green(
@@ -76,22 +64,24 @@ const files = await glob(`${targetDirectory}/**/*.vue`, {
   ].filter(Boolean),
 })
 
+async function useTsx(cb = () => {}) {
+  await $`${sg} scan -c ${config}.yml -U --filter '^setup-sfc start' ${targetDirectory}`
+  await $`${sg} scan -c ${config}.yml -U --filter '^setup-sfc end' ${targetDirectory}`
+  await cb()
+  await $`${sg} scan -c ${config}-tsx.yml -U --filter '^setup-sfc clean' ${targetDirectory}`
+}
+
 if (['jsx-directive', 'setup-sfc'].includes(macro)) {
   await $`${sg} scan -c ${config}.yml -U --filter '^v-' ${targetDirectory}`
-
   await $`${sg} scan -c ${config}.yml -U --filter '^${macro === 'setup-sfc' ? 'export-render' : render}' ${targetDirectory}`
 
-  await $`${sg} scan -c ${config}.yml -U --filter '^setup-sfc' ${targetDirectory}`
-
-  await $`${sg} scan -c ${config}-tsx.yml -U --filter '^v-' ${targetDirectory}`
-
-  if (defineSlots === 'define-short-slots')
-    await $`${sg} scan -c ${config}-tsx.yml -U --filter 'define-short-slots' ${targetDirectory}`
+  await useTsx(() => $`${sg} scan -c ${config}-tsx.yml -U --filter '^v-' ${targetDirectory}`)
 
   if (macro === 'setup-sfc')
     await Promise.all(files.map(async file => fs.move(file, `${file.slice(0, -3)}setup.tsx`)))
-  else
-    await $`${sg} scan -c ${config}-tsx.yml -U --filter '^sfc$' ${targetDirectory}`
+}
+else if (macro === 'define-slots') {
+  await useTsx(() => $`${sg} scan -c ${config}-tsx.yml -U --filter '^define-slots' ${targetDirectory}`)
 }
 else {
   await $`${sg} scan -c ${config}.yml -U --filter ^${macro} ${targetDirectory}`

src/rules/define-slots.yml

@@ -45,7 +45,6 @@ rule:
   follows:
     kind: tag_name
     regex: ^slot$
-
 fix: |-
 
 ---
@@ -67,7 +66,7 @@ fix: |-
 
 ---
 
-id: define-short-slots
+id: define-slots
 language: vueTsx
 rule:
   kind: type_annotation

src/rules/setup-sfc.yml

@@ -1,11 +1,45 @@
-id: setup-sfc
+id: setup-sfc start comment
 language: vue
 rule:
   kind: script_element
   has:
-    kind: raw_text
-    pattern: $A
+    kind: start_tag
+    pattern: $START
+    precedes:
+      kind: raw_text
+      pattern: $RAW
+      precedes:
+        kind: end_tag
+        pattern: $END
   inside:
     kind: fragment
 fix: |-
-  $A
+  $START*/
+  $RAW/*$END
+
+---
+
+id: setup-sfc end comment
+language: vue
+rule:
+  kind: fragment
+  pattern: $A
+fix: /*$A*/
+
+---
+
+id: setup-sfc clean comment
+language: vueTsx
+rule:
+  kind: comment
+  regex: /\*</?script|<script.*>\*/$
+  pattern: $A
+  inside:
+    kind: program
+transform:
+  B:
+    substring:
+      startChar: 2
+      endChar: -2
+      source: $A
+fix: $B

src/rules/sfc.yml

@@ -8,4 +8,4 @@ aliasLanguages:
     extensions: [vue]
   vueTsx:
     aliasOf: tsx
-    extensions: [vue]
+    extensions: []