chore: cleanup

Author: antfu

src/context.ts

@@ -14,7 +14,6 @@ const debug = {
 
 export class Context {
   readonly options: ResolvedOptions
-  readonly globs: string[]
 
   private _componentPaths = new Set<string>()
   private _componentNameMap: Record<string, ComponentInfo> = {}
@@ -26,38 +25,19 @@ export class Context {
     public readonly viteConfig: ResolvedConfig,
   ) {
     this.options = resolveOptions(options, viteConfig)
-    const { extensions, dirs, deep } = this.options
-    const exts = toArray(extensions)
-
-    if (!exts.length)
-      throw new Error('[vite-plugin-components] extensions are required to search for components')
-
-    const extsGlob = exts.length === 1 ? exts[0] : `{${exts.join(',')}}`
-
-    this.globs = toArray(dirs).map(i =>
-      deep
-        ? `${i}/**/*.${extsGlob}`
-        : `${i}/*.${extsGlob}`,
-    )
-
-    const watchDirs = toArray(dirs).map(i => resolve(viteConfig.root, i))
-    const watchGlobs = toArray(watchDirs).map(i =>
-      deep
-        ? join(i, `/**/*.${extsGlob}`)
-        : join(i, `/*.${extsGlob}`),
-    )
+    const { globs, dirs } = this.options
 
     if (viteConfig.command === 'serve') {
       // TODO: use vite's watcher instead
-      chokidar.watch(watchDirs, { ignoreInitial: true })
+      chokidar.watch(dirs, { ignoreInitial: true })
         .on('unlink', (path) => {
-          if (matchGlobs(path, watchGlobs)) {
+          if (matchGlobs(path, globs)) {
             this.removeComponents(path)
             this.onUpdate(path)
           }
         })
         .on('add', (path) => {
-          if (matchGlobs(path, watchGlobs)) {
+          if (matchGlobs(path, globs)) {
             this.addComponents(path)
             this.onUpdate(path)
           }

src/fs/glob.ts

@@ -5,10 +5,10 @@ import { Context } from '../context'
 const debug = Debug('vite-plugin-components:glob')
 
 export function searchComponents(ctx: Context) {
-  debug(`started with: [${ctx.globs.join(', ')}]`)
+  debug(`started with: [${ctx.options.globs.join(', ')}]`)
   const root = ctx.root
 
-  const files = fg.sync(ctx.globs, {
+  const files = fg.sync(ctx.options.globs, {
     ignore: ['node_modules'],
     onlyFiles: true,
     cwd: root,

src/types.ts

@@ -67,9 +67,15 @@ export interface Options {
   customComponentResolvers?: ComponentResolver | ComponentResolver[]
 }
 
-export type ResolvedOptions = Omit<Required<Options>, 'customComponentResolvers'|'libraries'> & {
+export type ResolvedOptions = Omit<
+Required<Options>,
+'customComponentResolvers'|'libraries'|'extensions'|'dirs'
+> & {
   customComponentResolvers: ComponentResolver[]
   libraries: UILibraryOptions[]
+  extensions: string[]
+  dirs: string[]
+  globs: string[]
 }
 
 export interface ComponentInfo {

src/utils.ts

@@ -1,4 +1,4 @@
-import { parse, resolve } from 'path'
+import { join, parse, resolve } from 'path'
 import minimatch from 'minimatch'
 import { ResolvedConfig } from 'vite'
 import { ComponentInfo, ResolvedOptions, Options } from './types'
@@ -72,12 +72,28 @@ export function stringifyComponentImport({ name, path, importName }: ComponentIn
 }
 
 export function resolveOptions(options: Options, viteConfig: ResolvedConfig): ResolvedOptions {
-  const resolvedOptions = Object.assign({}, defaultOptions, options) as ResolvedOptions
-  resolvedOptions.libraries = toArray(resolvedOptions.libraries).map(i => typeof i === 'string' ? { name: i } : i)
-  resolvedOptions.customComponentResolvers = toArray(resolvedOptions.customComponentResolvers)
-  resolvedOptions.customComponentResolvers.push(...resolvedOptions.libraries.map(lib => LibraryResolver(lib)))
+  const resolved = Object.assign({}, defaultOptions, options) as ResolvedOptions
+  resolved.libraries = toArray(resolved.libraries).map(i => typeof i === 'string' ? { name: i } : i)
+  resolved.customComponentResolvers = toArray(resolved.customComponentResolvers)
+  resolved.customComponentResolvers.push(...resolved.libraries.map(lib => LibraryResolver(lib)))
+  resolved.extensions = toArray(resolved.extensions)
 
-  return resolvedOptions
+  const extsGlob = resolved.extensions.length === 1
+    ? resolved.extensions
+    : `{${resolved.extensions.join(',')}}`
+
+  resolved.globs = toArray(resolved.dirs).map(i =>
+    resolved.deep
+      ? join(i, `/**/*.${extsGlob}`)
+      : join(i, `/*.${extsGlob}`),
+  )
+
+  resolved.dirs = toArray(resolved.dirs).map(i => resolve(viteConfig.root, i))
+
+  if (!resolved.extensions.length)
+    throw new Error('[vite-plugin-components] extensions are required to search for components')
+
+  return resolved
 }
 
 export function getNameFromFilePath(filePath: string, options: ResolvedOptions): string {