fix(macros): make alias option optional

Author: zhiyuanzmj

packages/macros/src/options.ts

@@ -7,23 +7,25 @@ import {
   type MarkRequired,
 } from '@vue-macros/common'
 
+type DefineComponentOptions = { alias?: string[]; autoReturnFunction?: boolean }
+type DefineModelOptions = { alias?: string[] }
+type DefineExposeOptions = { alias?: string[] }
+type DefineSlotsOptions = { alias?: string[] }
+type DefineStyleOptions = { alias?: string[] }
 export type Options = BaseOptions & {
-  defineComponent?: { alias: string[]; autoReturnFunction?: boolean }
-  defineModel?: { alias: string[] }
-  defineExpose?: { alias: string[] }
-  defineSlots?: { alias: string[] }
-  defineStyle?: { alias: string[] }
+  defineComponent?: DefineComponentOptions
+  defineModel?: DefineModelOptions
+  defineExpose?: DefineExposeOptions
+  defineSlots?: DefineSlotsOptions
+  defineStyle?: DefineStyleOptions
+}
+export type OptionsResolved = MarkRequired<Options, 'include' | 'version'> & {
+  defineComponent: MarkRequired<DefineComponentOptions, 'alias'>
+  defineModel: MarkRequired<DefineModelOptions, 'alias'>
+  defineExpose: MarkRequired<DefineExposeOptions, 'alias'>
+  defineSlots: MarkRequired<DefineSlotsOptions, 'alias'>
+  defineStyle: MarkRequired<DefineStyleOptions, 'alias'>
 }
-export type OptionsResolved = MarkRequired<
-  Options,
-  | 'include'
-  | 'version'
-  | 'defineComponent'
-  | 'defineModel'
-  | 'defineExpose'
-  | 'defineSlots'
-  | 'defineStyle'
->
 
 export function resolveOptions(options: Options): OptionsResolved {
   // waiting for [email protected] release
@@ -35,14 +37,15 @@ export function resolveOptions(options: Options): OptionsResolved {
     ...options,
     version,
     defineComponent: {
-      alias: options?.defineComponent?.alias ?? [
+      ...options.defineComponent,
+      alias: options.defineComponent?.alias ?? [
         'defineComponent',
         'defineVaporComponent',
       ],
     },
-    defineModel: { alias: options?.defineModel?.alias ?? ['defineModel'] },
-    defineSlots: { alias: options?.defineSlots?.alias ?? ['defineSlots'] },
-    defineExpose: { alias: options?.defineExpose?.alias ?? ['defineExpose'] },
-    defineStyle: { alias: options?.defineStyle?.alias ?? ['defineStyle'] },
+    defineModel: { alias: options.defineModel?.alias ?? ['defineModel'] },
+    defineSlots: { alias: options.defineSlots?.alias ?? ['defineSlots'] },
+    defineExpose: { alias: options.defineExpose?.alias ?? ['defineExpose'] },
+    defineStyle: { alias: options.defineStyle?.alias ?? ['defineStyle'] },
   }
 }

packages/macros/src/volar/index.ts

@@ -1,33 +1,16 @@
-import {
-  HELPER_PREFIX,
-  type MarkRequired,
-  type Overwrite,
-} from '@vue-macros/common'
+import { HELPER_PREFIX, type Overwrite } from '@vue-macros/common'
 import { replaceRange, type TsmVirtualCode } from 'ts-macro'
-import type { Options } from '../options'
+import type { OptionsResolved } from '../options'
 import { transformDefineComponent } from './define-component'
 
 export { transformJsxMacros } from './transform'
 export { getGlobalTypes } from './global-types'
 
-type UserOptions = MarkRequired<
-  Exclude<Options, false>,
-  | 'defineModel'
-  | 'defineSlots'
-  | 'defineStyle'
-  | 'defineExpose'
-  | 'defineComponent'
->
 export type TransformOptions = Overwrite<
   TsmVirtualCode,
   {
     ts: typeof import('typescript')
-    defineModel: UserOptions['defineModel']
-    defineSlots: UserOptions['defineSlots']
-    defineStyle: UserOptions['defineStyle']
-    defineExpose: UserOptions['defineExpose']
-    defineComponent: UserOptions['defineComponent']
-  }
+  } & OptionsResolved
 >
 
 export type JsxMacros = {