fix: default to only resolve components (unplugin#193)

hannoeru · web-flow · commit 3ecdeade011d · 2021-10-29T00:21:32.000+08:00
diff --git a/src/core/helpers/libraryResolver.ts b/src/core/helpers/libraryResolver.ts
@@ -1,7 +1,7 @@
 import fs from 'fs'
 import { dirname, join } from 'path'
 import Debug from 'debug'
-import { ComponentResolver, UILibraryOptions } from '../../types'
+import { ComponentResolverObject, UILibraryOptions } from '../../types'
 import { camelCase, kebabCase, resolveImportPath } from '../utils'
 
 const debug = Debug('unplugin-vue-components:helper:library')
@@ -26,7 +26,7 @@ export function tryLoadVeturTags(name: string): string[] | undefined {
   }
 }
 
-export function LibraryResolver(options: UILibraryOptions): ComponentResolver {
+export function LibraryResolver(options: UILibraryOptions): ComponentResolverObject {
   const {
     name: libraryName,
     entries = tryLoadVeturTags(options.name),
diff --git a/src/core/options.ts b/src/core/options.ts
@@ -1,7 +1,7 @@
 import { join, resolve } from 'path'
 import { slash, toArray } from '@antfu/utils'
 import { isPackageExists } from 'local-pkg'
-import { ResolvedOptions, Options } from '../types'
+import { ResolvedOptions, Options, ComponentResolver, ComponentResolverObject } from '../types'
 import { LibraryResolver } from './helpers/libraryResolver'
 
 export const defaultOptions: Omit<Required<Options>, 'include' | 'exclude' | 'transformer' | 'globs' |'directives'> = {
@@ -21,10 +21,14 @@ export const defaultOptions: Omit<Required<Options>, 'include' | 'exclude' | 'tr
   allowOverrides: false,
 }
 
+function normalizeResolvers(resolvers: (ComponentResolver | ComponentResolver[])[]): ComponentResolverObject[] {
+  return toArray(resolvers).flat().map(r => typeof r === 'function' ? { resolve: r, type: 'component' } : r)
+}
+
 export function resolveOptions(options: Options, root: string): ResolvedOptions {
   const resolved = Object.assign({}, defaultOptions, options) as ResolvedOptions
   resolved.libraries = toArray(resolved.libraries).map(i => typeof i === 'string' ? { name: i } : i)
-  resolved.resolvers = toArray(resolved.resolvers).flat()
+  resolved.resolvers = normalizeResolvers(resolved.resolvers)
   resolved.resolvers.push(...resolved.libraries.map(lib => LibraryResolver(lib)))
   resolved.extensions = toArray(resolved.extensions)
 
@@ -60,7 +64,9 @@ export function resolveOptions(options: Options, root: string): ResolvedOptions
   resolved.transformer = options.transformer || getVueVersion() || 'vue3'
   resolved.directives = (typeof options.directives === 'boolean')
     ? options.directives
-    : getVueVersion() === 'vue3'
+    : !resolved.resolvers.some(i => i.type === 'directive')
+      ? false
+      : getVueVersion() === 'vue3'
 
   return resolved
 }
diff --git a/src/types.ts b/src/types.ts
@@ -16,10 +16,12 @@ export interface ComponentInfo extends ImportInfo {
 
 export type ComponentResolveResult = Awaitable<string | ComponentInfo | null | undefined | void>
 
-export type ComponentResolver = {
+export type ComponentResolverFunction = (name: string) => ComponentResolveResult
+export type ComponentResolverObject = {
   type: 'component' | 'directive'
-  resolve: (name: string) => ComponentResolveResult
+  resolve: ComponentResolverFunction
 }
+export type ComponentResolver = ComponentResolverFunction | ComponentResolverObject
 export interface UILibraryOptions {
   name: string
   prefix?: string
@@ -142,7 +144,7 @@ export type ResolvedOptions = Omit<
 Required<Options>,
 'resolvers'|'libraries'|'extensions'|'dirs'|'globalComponentsDeclaration'
 > & {
-  resolvers: ComponentResolver[]
+  resolvers: ComponentResolverObject[]
   libraries: UILibraryOptions[]
   extensions: string[]
   dirs: string[]
