fix(macros): remove lib option

Author: zhiyuanzmj

packages/macros/src/core/define-expose.ts

@@ -4,12 +4,12 @@ import type { CallExpression } from '@babel/types'
 export function transformDefineExpose(
   node: CallExpression,
   s: MagicStringAST,
-  lib: string,
+  version: number,
 ): void {
   s.overwriteNode(node.callee, ';')
   s.appendRight(
     node.arguments[0]?.start || node.end! - 1,
-    lib.includes('vapor')
+    version >= 3.6
       ? `${importHelperFn(s, 0, 'currentInstance')}.exposed = `
       : `${importHelperFn(s, 0, 'getCurrentInstance')}().exposed = `,
   )

packages/macros/src/core/define-slots.ts

@@ -3,9 +3,7 @@ import type { CallExpression } from '@babel/types'
 
 export function transformDefineSlots(
   node: CallExpression,
-  propsName: string,
   s: MagicStringAST,
-  lib: string,
 ): void {
   s.overwrite(
     node.start!,
@@ -14,8 +12,6 @@ export function transformDefineSlots(
       node.callee.end!,
     `Object.assign`,
   )
-  const slots = lib.includes('vue')
-    ? `${importHelperFn(s, 0, 'useSlots')}()`
-    : `${propsName}.vSlots`
+  const slots = `${importHelperFn(s, 0, 'useSlots')}()`
   s.appendLeft(node.end! - 1, `${node.arguments[0] ? ',' : '{}, '}${slots}`)
 }

packages/macros/src/core/index.ts

@@ -103,10 +103,10 @@ export function transformJsxMacros(
       })
     }
     if (map.defineSlots) {
-      transformDefineSlots(map.defineSlots, propsName, s, options.lib)
+      transformDefineSlots(map.defineSlots, s)
     }
     if (map.defineExpose) {
-      transformDefineExpose(map.defineExpose, s, options.lib)
+      transformDefineExpose(map.defineExpose, s, options.version)
     }
   }
 

packages/macros/src/options.ts

@@ -1,5 +1,5 @@
 import {
-  detectVueVersion,
+  // detectVueVersion,
   REGEX_NODE_MODULES,
   REGEX_SETUP_SFC,
   REGEX_SRC_FILE,
@@ -8,7 +8,6 @@ import {
 } from '@vue-macros/common'
 
 export type Options = BaseOptions & {
-  lib?: 'vue' | 'vue/vapor' | (string & {})
   defineComponent?: { alias: string[] }
   defineModel?: { alias: string[] }
   defineExpose?: { alias: string[] }
@@ -19,7 +18,6 @@ export type OptionsResolved = MarkRequired<
   Options,
   | 'include'
   | 'version'
-  | 'lib'
   | 'defineComponent'
   | 'defineModel'
   | 'defineExpose'
@@ -28,14 +26,14 @@ export type OptionsResolved = MarkRequired<
 >
 
 export function resolveOptions(options: Options): OptionsResolved {
-  const version = options.version || detectVueVersion()
-  const lib = options.lib || 'vue/vapor'
+  // waiting for [email protected] release
+  // const version = options.version || detectVueVersion()
+  const version = options.version || 3.6
   return {
     include: [REGEX_SRC_FILE],
     exclude: [REGEX_SETUP_SFC, REGEX_NODE_MODULES],
     ...options,
     version,
-    lib,
     defineComponent: {
       alias: options?.defineComponent?.alias ?? [
         'defineComponent',

packages/macros/src/volar/index.ts

@@ -12,7 +12,6 @@ export { getGlobalTypes } from './global-types'
 
 type UserOptions = MarkRequired<
   Exclude<Options, false>,
-  | 'lib'
   | 'defineModel'
   | 'defineSlots'
   | 'defineStyle'
@@ -23,7 +22,6 @@ export type TransformOptions = Overwrite<
   TsmVirtualCode,
   {
     ts: typeof import('typescript')
-    lib: UserOptions['lib']
     defineModel: UserOptions['defineModel']
     defineSlots: UserOptions['defineSlots']
     defineStyle: UserOptions['defineStyle']

packages/macros/src/volar/transform.ts

@@ -86,11 +86,7 @@ export function transformJsxMacros(
           node.expression.getStart(ast),
           `return {\nprops: {} as { ${props.join(', ')} }`,
           `,\nslots: {} as ${map.defineSlots ?? '{}'}`,
-          `,\nexpose: (exposed: ${
-            options.lib === 'vue'
-              ? `import('vue').ShallowUnwrapRef`
-              : 'NonNullable'
-          }<${map.defineExpose ?? '{}'}>) => {}`,
+          `,\nexpose: (exposed: import('vue').ShallowUnwrapRef<${map.defineExpose ?? '{}'}>) => {}`,
           `,\nrender: `,
           shouldWrapByCall ? '(' : '',
         )

packages/macros/tests/fixtures.spec.ts

@@ -31,7 +31,6 @@ describe('fixtures', async () => {
     globs,
     (args, id, code) =>
       transformJsxMacros(code, id, new Map(), {
-        lib: 'vue',
         include: ['*.tsx'],
         version: 3.6,
         ...options,
@@ -44,7 +43,6 @@ describe('vue/vapor fixtures', async () => {
     globs,
     (args, id, code) =>
       transformJsxMacros(code, id, new Map(), {
-        lib: 'vue/vapor',
         include: ['*.tsx'],
         version: 3.6,
         ...options,