chore: optimize node logic

packages/core/src/plugin/js/index.ts

@@ -154,94 +154,88 @@ export function processVitePlugin(
 }
 
 function normalizeFilterPath(path: string): string {
- if (process.platform === 'win32') {
- return compatibleWin32Path(path);
- }
-
- return path;
+ return process.platform === 'win32' ? compatibleWin32Path(path) : path;
 }
 
 function compatibleWin32Path(path: string): string {
  return path.replaceAll('/', '\\\\');
 }
 
 export function convertPlugin(plugin: JsPlugin): void {
- if (
- plugin.transform &&
- !plugin.transform.filters?.moduleTypes &&
- !plugin.transform.filters?.resolvedPaths
- ) {
- throw new Error(
- `transform hook of plugin ${plugin.name} must have at least one filter(like moduleTypes or resolvedPaths)`
- );
- }
- if (plugin.transform) {
- if (!plugin.transform.filters.moduleTypes) {
- plugin.transform.filters.moduleTypes = [];
- } else if (!plugin.transform.filters.resolvedPaths) {
- plugin.transform.filters.resolvedPaths = [];
- }
- }
+ const ensureFilterExists = (filters: any, filterName: string): void => {
+ filters[filterName] ??= [];
+ };
 
- if (plugin.renderResourcePot) {
- plugin.renderResourcePot.filters ??= {};
+ const ensureHookFiltersExist = (hook: any, hookName: string): void => {
+ if (!hook) return;
 
- if (
- !plugin.renderResourcePot?.filters?.moduleIds &&
- !plugin.renderResourcePot?.filters?.resourcePotTypes
- ) {
+ hook.filters ||= {};
+
+ if (!hook.filters.moduleIds || !hook.filters.resourcePotTypes) {
  throw new Error(
- `renderResourcePot hook of plugin ${plugin.name} must have at least one filter(like moduleIds or resourcePotTypes)`
+ `${hookName} hook of plugin ${plugin.name} must have at least one filter(like moduleIds or resourcePotTypes)`
  );
  }
 
- if (!plugin.renderResourcePot.filters?.resourcePotTypes) {
- plugin.renderResourcePot.filters.resourcePotTypes = [];
- } else if (!plugin.renderResourcePot.filters?.moduleIds) {
- plugin.renderResourcePot.filters.moduleIds = [];
- }
- }
-
- if (plugin.augmentResourceHash) {
- plugin.augmentResourceHash.filters ??= {};
+ ensureFilterExists(hook.filters, 'moduleIds');
+ ensureFilterExists(hook.filters, 'resourcePotTypes');
+ };
 
+ if (plugin.transform) {
  if (
- !plugin.augmentResourceHash?.filters?.moduleIds &&
- !plugin.augmentResourceHash?.filters?.resourcePotTypes
+ !plugin.transform.filters?.moduleTypes &&
+ !plugin.transform.filters?.resolvedPaths
  ) {
  throw new Error(
- `augmentResourceHash hook of plugin ${plugin.name} must have at least one filter(like moduleIds or resourcePotTypes)`
+ `transform hook of plugin ${plugin.name} must have at least one filter(like moduleTypes or resolvedPaths)`
  );
  }
 
- if (!plugin.augmentResourceHash.filters?.resourcePotTypes) {
- plugin.augmentResourceHash.filters.resourcePotTypes = [];
- } else if (!plugin.augmentResourceHash.filters?.moduleIds) {
- plugin.augmentResourceHash.filters.moduleIds = [];
- }
+ ensureFilterExists(plugin.transform.filters, 'moduleTypes');
+ ensureFilterExists(plugin.transform.filters, 'resolvedPaths');
  }
 
+ const normalizeFilters = (filters: string[]): string[] => {
+ return filters.map(normalizeFilterPath);
+ };
+
+ const hookNames = {
+ renderResourcePot: 'renderResourcePot',
+ augmentResourceHash: 'augmentResourceHash'
+ };
+
+ Object.keys(hookNames).forEach((hookKey) => {
+ const hook = plugin[hookKey as keyof JsPlugin];
+ ensureHookFiltersExist(hook, hookNames[hookKey as keyof typeof hookNames]);
+ });
+
  if (plugin.resolve?.filters?.importers?.length) {
- plugin.resolve.filters.importers =
- plugin.resolve.filters.importers.map(normalizeFilterPath);
+ plugin.resolve.filters.importers = normalizeFilters(
+ plugin.resolve.filters.importers
+ );
  }
 
  if (plugin.load?.filters?.resolvedPaths?.length) {
- plugin.load.filters.resolvedPaths =
- plugin.load.filters.resolvedPaths.map(normalizeFilterPath);
+ plugin.load.filters.resolvedPaths = normalizeFilters(
+ plugin.load.filters.resolvedPaths
+ );
  }
 
  if (plugin.transform?.filters?.resolvedPaths?.length) {
- plugin.transform.filters.resolvedPaths =
- plugin.transform.filters.resolvedPaths.map(normalizeFilterPath);
+ plugin.transform.filters.resolvedPaths = normalizeFilters(
+ plugin.transform.filters.resolvedPaths
+ );
  }
+
  if (plugin.augmentResourceHash?.filters?.moduleIds) {
- plugin.augmentResourceHash.filters.moduleIds =
- plugin.augmentResourceHash.filters.moduleIds.map(normalizeFilterPath);
+ plugin.augmentResourceHash.filters.moduleIds = normalizeFilters(
+ plugin.augmentResourceHash.filters.moduleIds
+ );
  }
 
  if (plugin.renderResourcePot?.filters?.moduleIds) {
- plugin.renderResourcePot.filters.moduleIds =
- plugin.renderResourcePot.filters.moduleIds.map(normalizeFilterPath);
+ plugin.renderResourcePot.filters.moduleIds = normalizeFilters(
+ plugin.renderResourcePot.filters.moduleIds
+ );
  }
 }

packages/core/src/watcher/config-watcher.ts

@@ -20,13 +20,16 @@ export class ConfigWatcher {
  callback(file);
  }
 
- const watchedFilesSet = new Set<string>([
- ...(this.resolvedUserConfig.envFiles ?? []),
- ...(this.resolvedUserConfig.configFileDependencies ?? []),
- ...(this.resolvedUserConfig.configFilePath
- ? [this.resolvedUserConfig.configFilePath]
- : [])
- ]);
+ const { envFiles, configFileDependencies, configFilePath } =
+ this.resolvedUserConfig;
+ const watchedFilesSet = new Set(
+ Array.from(
+ (envFiles ?? []).concat(
+ configFileDependencies ?? [],
+ configFilePath ? [configFilePath] : []
+ )
+ )
+ );
 
  const watchedFiles = Array.from(watchedFilesSet).filter(
  (file) => file && existsSync(file)
@@ -56,6 +59,7 @@ export class ConfigWatcher {
  }
 
  close() {
+ if (!this.watcher) return;
  this._close = true;
  this.watcher = null;
  }