refactor

packages/v-scope/src/api.ts

@@ -0,0 +1 @@
+export * from './core'

packages/v-scope/src/core/index.ts

@@ -20,16 +20,10 @@ import {
 } from '@babel/types'
 import { SCOPE_DIRECTIVE } from './constant'
 
-export function preTransform(code: string, id: string) {
- const s = new MagicString(code)
+export * from './constant'
 
- return getTransformResult(s, id)
-}
-
-export function postTransform(code: string, id: string) {
- if (!code.includes(SCOPE_DIRECTIVE)) {
- return
- }
+export function transformVScope(code: string, id: string) {
+ if (!code.includes(SCOPE_DIRECTIVE)) return
 
  const lang = getLang(id)
  const program = babelParse(code, lang)

packages/v-scope/src/index.ts

@@ -2,12 +2,13 @@ import { createUnplugin } from 'unplugin'
 import {
  type BaseOptions,
  type MarkRequired,
+ REGEX_SETUP_SFC,
  REGEX_VUE_SFC,
  REGEX_VUE_SUB,
  createFilter,
  detectVueVersion,
 } from '@vue-macros/common'
-import { postTransform, preTransform } from './core'
+import { transformVScope } from './core'
 
 export type Options = BaseOptions
 
@@ -16,35 +17,15 @@ export type OptionsResolved = MarkRequired<Options, 'include' | 'version'>
 function resolveOption(options: Options): OptionsResolved {
  const version = options.version || detectVueVersion()
  return {
- include: [REGEX_VUE_SFC, REGEX_VUE_SUB],
+ include: [REGEX_VUE_SFC, REGEX_SETUP_SFC, REGEX_VUE_SUB],
  ...options,
  version,
  }
 }
 
 const name = 'unplugin-vue-v-scope'
 
-export const PrePlugin = createUnplugin<Options | undefined, false>(
- (userOptions = {}) => {
- const options = resolveOption(userOptions)
- const filter = createFilter(options)
-
- return {
- name: `${name}-pre`,
- enforce: 'pre',
-
- transformInclude(id) {
- return filter(id)
- },
-
- transform(code, id) {
- return preTransform(code, id)
- },
- }
- }
-)
-
-export const PostPlugin = createUnplugin<Options | undefined, false>(
+export default createUnplugin<Options | undefined, false>(
  (userOptions = {}) => {
  const options = resolveOption(userOptions)
  const filter = createFilter(options)
@@ -54,31 +35,23 @@ export const PostPlugin = createUnplugin<Options | undefined, false>(
  }
 
  return {
- name: `${name}-post`,
+ name,
  enforce: 'post',
 
  transformInclude,
  transform(code, id) {
- return postTransform(code, id)
+ return transformVScope(code, id)
  },
 
  rollup: {
  transform: {
  order: 'post',
  handler(code, id) {
  if (!transformInclude(id)) return
- return postTransform(code, id)
+ return transformVScope(code, id)
  },
  },
  },
  }
  }
 )
-
-const plugin = createUnplugin<Options | undefined, true>(
- (userOptions = {}, meta) => {
- return [PrePlugin.raw(userOptions, meta), PostPlugin.raw(userOptions, meta)]
- }
-)
-
-export default plugin