feat: optimize the themes judgment logic

Author: tolking

src/core/options.ts

@@ -1,7 +1,7 @@
 import { useNuxt } from '@nuxt/kit'
 import { libraryName, optimizeDeps } from '../config'
-import type { ModuleOptions, Themes } from '../types'
 import { isFunction } from '../utils'
+import type { ModuleOptions, Themes } from '../types'
 
 export function resolveOptions (config: ModuleOptions) {
   const { cache, importStyle, namespace, themeChalk } = config
@@ -26,25 +26,28 @@ export function resolveOptions (config: ModuleOptions) {
   nuxt.options.webpack.loaders.scss.api ??= 'modern-compiler'
 
   if (importStyle === 'scss' && themeChalk) {
-    const keys = Object.keys(themeChalk)
     const files: Array<'namespace' | 'common' | Themes> = []
+    const keys = Object.keys(themeChalk) as (keyof typeof themeChalk)[]
+    const themes = keys.filter((key) => {
+      return !key.startsWith('$') && themeChalk[key] && Object.keys(themeChalk[key]).length
+    }) as Themes[]
 
     if (namespace && namespace !== 'el') {
       files.push('namespace')
     }
     if (keys.some(key => key.startsWith('$'))) {
       files.push('common')
     }
-    files.push(...keys.filter(key => !key.startsWith('$')) as Themes[])
+    files.push(...themes)
 
     const additionalData = files.reduce((all, item) => {
       all += `@use "${nuxt.options.buildDir}/${libraryName}-scss-${item}.scss";`
       return all
     }, '')
 
     async function genAdditionalData (old: string | Function | undefined, source: string, ...arg: unknown[]) {
-      const res = isFunction(old) ? await old(source, ...arg) : (old ?? '') + source
-      return additionalData + res
+      const content = isFunction(old) ? await old(source, ...arg) : (old ?? '') + source
+      return additionalData + content
     }
 
     if (additionalData) {

src/core/themeChalk.ts

@@ -1,7 +1,7 @@
 import type { NuxtTemplate } from '@nuxt/schema'
 import { libraryName } from '../config'
-import type { ModuleOptions, ScssChalk, ScssVariables, Themes } from '../types'
 import { isArray, isObject, resolveComponentPath } from '../utils'
+import type { ModuleOptions, ScssChalk, ScssVariables, Themes } from '../types'
 
 export function resolveThemeChalk (config: ModuleOptions) {
   const { themeChalk, namespace } = config
@@ -29,8 +29,8 @@ export function resolveThemeChalk (config: ModuleOptions) {
   }
 
   themes.forEach((type) => {
-    const config = themeChalk[type] as ScssChalk
-    if (Object.keys(config).length) {
+    const config = themeChalk[type]
+    if (config && Object.keys(config).length) {
       files.push(genThemeChalkFile(type, config))
     }
   })

src/types.ts

@@ -17,11 +17,7 @@ export interface TransformOptions {
   exclude: RegExp[]
 }
 
-export type ScssVariables<Key extends string, Value = string> = {
-  [k in Key]?: Value
-} & {
-  [k: string]: Value
-}
+export type ScssVariables<Key extends string, Value = string> = { [k in Key]?: Value } & { [k: string]: Value }
 
 export interface ScssChalk {
   '$colors'?: Partial<Record<'success' | 'warning' | 'danger' | 'error' | 'info', { base?: string }>> & ScssVariables<'white' | 'black', string | { base?: string }>