refactor: common

vue-macros · May 12, 2024 · 3c91f7d · 3c91f7d
1 parent b27e9e9
commit 3c91f7d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/packages/volar/src/common.ts b/packages/volar/src/common.ts
@@ -10,6 +10,8 @@ export const REGEX_DEFINE_COMPONENT =
   /(?<=(default|__VLS_internalComponent =|__VLS_fnComponent =) \(await import\(\S+\)\)\.defineComponent\({\n)/g
 
 export function addProps(codes: Code[], decl: Code[], vueLibName: string) {
+  if (codes.includes('__VLS_TypePropsToOption<')) return
+
   replaceAll(codes, REGEX_DEFINE_COMPONENT, 'props: ({} as ', ...decl, '),\n')
   codes.push(
     `type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;\n`,
@@ -19,6 +21,11 @@ export function addProps(codes: Code[], decl: Code[], vueLibName: string) {
 }
 
 export function addEmits(codes: Code[], decl: Code[]) {
+  if (
+    codes.some((code) => code.includes('emits: ({} as __VLS_NormalizeEmits<'))
+  )
+    return
+
   replaceAll(codes, REGEX_DEFINE_COMPONENT, 'emits: ({} as ', ...decl, '),\n')
   return true
 }

diff --git a/packages/volar/src/define-models.ts b/packages/volar/src/define-models.ts
@@ -44,12 +44,7 @@ function transformDefineModels(options: {
       `{\n${propStrings.join(',\n')}} & `,
     )
 
-    codes.includes('__VLS_TypePropsToOption<') ||
-      addProps(
-        codes,
-        ['__VLS_TypePropsToOption<__VLS_PublicProps>'],
-        vueLibName,
-      )
+    addProps(codes, ['__VLS_TypePropsToOption<__VLS_PublicProps>'], vueLibName)
   }
 
   if (emitStrings.length) {
@@ -59,9 +54,7 @@ function transformDefineModels(options: {
       ` & ReturnType<typeof import('${vueLibName}').defineEmits<{\n${emitStrings.join(',\n')}}>>`,
     )
 
-    codes.some((code) =>
-      code.toString().includes('emits: ({} as __VLS_NormalizeEmits<'),
-    ) || addEmits(codes, ['__VLS_NormalizeEmits<typeof __VLS_modelEmitsType>'])
+    addEmits(codes, ['__VLS_NormalizeEmits<typeof __VLS_modelEmitsType>'])
   }
 }