feat: Improve component matching (#102)

element-plus · Apr 20, 2024 · 7e9f9d4 · 7e9f9d4
1 parent 391a6b1
commit 7e9f9d4
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 5 deletions.
diff --git a/src/config.ts b/src/config.ts
@@ -9,12 +9,13 @@ export const libraryName = 'element-plus'
 
 export const iconLibraryName = '@element-plus/icons-vue'
 
-const allComponents = Object.values(AllComponents).reduce<string[]>((all, item) => {
-  if (isVueComponent(item) && /^El[A-Z]\w+/.test((item as Component).name ?? '')) {
-    all.push((item as Component).name!)
+const allComponents = Object.entries(AllComponents).reduce<string[]>((all, [key, item]) => {
+  const regExp = /^El[A-Z]\w+/
+  if (isVueComponent(item) && regExp.test(key) && regExp.test((item as Component).name ?? '')) {
+    all.push(key)
   }
   return all
-}, [] as string[])
+}, [])
 
 export const allIcons = Object.keys(AllIcons)
 
@@ -29,6 +30,8 @@ const allImports: PresetImport[] = allImportsWithStyle
 
 const allNoStylesComponents: string[] = [
   'ElAutoResizer',
+  'ElCollection',
+  'ElCollectionItem',
   'ElTooltipV2'
 ]
 
@@ -45,11 +48,13 @@ const allSubComponents: Record<string, string[]> = {
   ElCarousel: ['ElCarouselItem'],
   ElCheckbox: ['ElCheckboxButton', 'ElCheckboxGroup'],
   ElCollapse: ['ElCollapseItem'],
+  ElCollection: ['ElCollectionItem'],
   ElContainer: ['ElAside', 'ElFooter', 'ElHeader', 'ElMain'],
   ElDescriptions: ['ElDescriptionsItem'],
   ElDropdown: ['ElDropdownItem', 'ElDropdownMenu'],
   ElForm: ['ElFormItem'],
   ElMenu: ['ElMenuItem', 'ElMenuItemGroup', 'ElSubMenu'],
+  ElPopper: ['ElPopperArrow', 'ElPopperContent', 'ElPopperTrigger'],
   ElRadio: ['ElRadioGroup', 'ElRadioButton'],
   ElSkeleton: ['ElSkeletonItem'],
   ElSelect: ['ElOption', 'ElOptionGroup'],

diff --git a/src/utils.ts b/src/utils.ts
@@ -7,7 +7,7 @@ export function isArray (value: any): value is any[] {
 }
 
 export function isVueComponent (value: any): value is Component {
-  return typeof value === 'object' && (value.name || value.props || value.emits || value.setup || value.render)
+  return typeof value === 'object' && value.name && (value.props || value.emits || value.setup || value.render)
 }
 
 export function toArray<T extends any | any[]> (