chore: refactoring

Author: antfu

src/context.ts

@@ -1,4 +1,5 @@
 import { ComponentsInfo, ComponentsImportMap, Options } from './types'
+import { normalize } from './utils'
 
 export class Context {
   importMap: ComponentsImportMap = {}
@@ -16,7 +17,11 @@ export class Context {
   }
 
   set components(components: ComponentsInfo[]) {
-    this._components = components.map(([name, path]) => [capitalize(camelize(name)), path])
+    this._components = components.map(([name, path]) => [normalize(name), path])
+  }
+
+  searchForComponents(names: string[], excludePaths: string[] = []) {
+    return this.components.filter(i => !excludePaths.includes(i[1]) && names.includes(i[0]))
   }
 
   async getImportMap(key: string) {
@@ -35,17 +40,9 @@ export class Context {
   }
 
   setImportMap(key: string, names: string[]) {
-    const casedNames = names.map(name => capitalize(camelize(name)))
+    const casedNames = names.map(name => normalize(name))
     this.importMap[key] = casedNames
     if (this.importMapPromises[key])
       this.importMapPromises[key][1]?.(casedNames)
   }
 }
-
-function camelize(str: string) {
-  return str.replace(/-(\w)/g, (_, c) => (c ? c.toUpperCase() : ''))
-}
-
-function capitalize(str: string) {
-  return str.charAt(0).toUpperCase() + str.slice(1)
-}

src/fs/glob.ts

@@ -11,9 +11,8 @@ function getNameFromFilePath(filePath: string): string {
   if (parsedFilePath.name === 'index') {
     const filePathSegments = filePath.split(path.sep)
     const parentDirName = filePathSegments[filePathSegments.length - 2]
-    if (parentDirName) {
+    if (parentDirName)
       return parentDirName
-    }
   }
   return parsedFilePath.name
 }

src/generator/resolver.ts

@@ -11,7 +11,7 @@ export function isResolverPath(reqPath: string) {
 export async function generateResolver(ctx: Context, reqPath: string) {
   const sfcPath = reqPath.slice(0, -RESOLVER_EXT.length)
   const names = await ctx.getImportMap(sfcPath) || []
-  const components = ctx.components.filter(i => names.includes(i[0]) && i[1] !== sfcPath)
+  const components = ctx.searchForComponents(names, [sfcPath])
 
   debug(sfcPath)
   debug('using', names, 'imported', components.map(i => i[0]))

src/utils.ts

@@ -0,0 +1,11 @@
+export function normalize(str: string) {
+  return capitalize(camelize(str))
+}
+
+export function camelize(str: string) {
+  return str.replace(/-(\w)/g, (_, c) => (c ? c.toUpperCase() : ''))
+}
+
+export function capitalize(str: string) {
+  return str.charAt(0).toUpperCase() + str.slice(1)
+}

test/fixture/package.json

@@ -3,7 +3,7 @@
   "version": "0.0.0",
   "private": true,
   "scripts": {
-    "dev": "vite",
+    "dev": "vite --open",
     "build": "vite build"
   },
   "dependencies": {