removed: extra set

space307 · Jan 2, 2024 · 5ff51db · 5ff51db
1 parent cdc527b
commit 5ff51db
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 18 deletions.
diff --git a/src/api/collectUsages.ts b/src/api/collectUsages.ts
@@ -15,7 +15,7 @@ const collectUsages = async (name: string, list: ListItem[]) => {
     _collectUsages({
       config: {
         batch: x.batch || BASE_CONFIG.batch,
-        exclude: x.exclude ? new Set([...BASE_CONFIG.exclude, ...x.exclude]) : BASE_CONFIG.exclude,
+        exclude: x.exclude ? [...new Set([...BASE_CONFIG.exclude, ...x.exclude])] : BASE_CONFIG.exclude,
         extensions: x.extensions || BASE_CONFIG.extensions,
         dir: x.dir,
         collectUsages: name,

diff --git a/src/api/findUnusedExports.ts b/src/api/findUnusedExports.ts
@@ -53,7 +53,7 @@ const findUnusedExports = async (entry: string, list: ListItem[]) => {
       pkg,
       config: {
         batch: x.batch || BASE_CONFIG.batch,
-        exclude: x.exclude ? new Set([...BASE_CONFIG.exclude, ...x.exclude]) : BASE_CONFIG.exclude,
+        exclude: x.exclude ? [...new Set([...BASE_CONFIG.exclude, ...x.exclude])] : BASE_CONFIG.exclude,
         extensions: x.extensions || BASE_CONFIG.extensions,
         dir: x.dir,
         parserConfig: x.parserConfig || BASE_CONFIG.parserConfig,

diff --git a/src/fileTraversal/__tests__/getFiles.test.ts b/src/fileTraversal/__tests__/getFiles.test.ts
@@ -10,7 +10,7 @@ test('getExports', async () => {
   const files = await getFiles({
     config: {
       extensions: ['ts'],
-      exclude: new Set(['components']),
+      exclude: ['components'],
       dir,
     },
   });

diff --git a/src/fileTraversal/getFiles.ts b/src/fileTraversal/getFiles.ts
@@ -6,12 +6,12 @@ import type { Config } from '~/getConfig/index.js';
 const formattedExtensions = (list: Config['extensions']) => list.join(',') + ',';
 
 type Params = {
-  config: Pick<Config, 'extensions' | 'exclude' | 'dir'>;
+  config: Pick<Config, 'extensions' | 'dir' | 'exclude'>;
 };
 
 // fixme: https://github.com/space307/pure-index/issues/10
 const getFiles = async ({ config }: Params) => {
-  const exclude = [...config.exclude]
+  const exclude = config.exclude
     .map((item) => item.replace(/(^\/|\/$)/g, '').replace(/[-\/\\^$*+?.()|[\]{}]/g, '\\$&'))
     .join('|');
   const excludeRegExp = new RegExp(exclude);

diff --git a/src/getConfig/__tests__/config+cli.test.ts b/src/getConfig/__tests__/config+cli.test.ts
@@ -34,7 +34,7 @@ test('default value', async () => {
     collectUsages: 'package-a',
     entry: 'src/main.js',
     extensions: ['js', 'jsx'],
-    exclude: new Set(['node_modules', 'build']),
+    exclude: ['node_modules', 'build'],
     dir: 'dir-from-config',
   });
 

diff --git a/src/getConfig/__tests__/config.test.ts b/src/getConfig/__tests__/config.test.ts
@@ -24,7 +24,7 @@ test('default value', async () => {
     batch: 500,
     entry: 'src/index.ts',
     extensions: ['js', 'jsx'],
-    exclude: new Set([...BASE_CONFIG.exclude, 'build']),
+    exclude: [...BASE_CONFIG.exclude, 'build'],
     dir: 'dir-from-config',
   });
 

diff --git a/src/getConfig/index.ts b/src/getConfig/index.ts
@@ -5,23 +5,27 @@ import { getRepoRoot } from '~/shared/index.js';
 
 import type { ParserConfig } from '@swc/core';
 
-const BASE_CONFIG = {
+type Config = {
+  batch: number;
+  collectUsages: string | null;
+  entry: string;
+  dir: string;
+  exclude: string[];
+  extensions: string[];
+  parserConfig: ParserConfig;
+};
+
+const BASE_CONFIG: Config = {
   batch: 100,
   collectUsages: null,
   entry: 'index.ts',
-  dir: null,
-  exclude: new Set(['node_modules']),
+  dir: '',
+  exclude: ['node_modules'],
   extensions: ['ts', 'tsx'],
   parserConfig: {
     syntax: 'typescript',
     tsx: true,
-  } as ParserConfig,
-};
-
-type Config = Omit<typeof BASE_CONFIG, 'dir' | 'collectUsages' | 'parserConfig'> & {
-  dir: string;
-  collectUsages: string | null;
-  parserConfig: ParserConfig;
+  },
 };
 
 const getConfig = async (): Promise<Config> => {
@@ -42,7 +46,7 @@ const getConfig = async (): Promise<Config> => {
     entry: cli.flags.entry || entry,
     batch,
     parserConfig,
-    exclude: new Set([...BASE_CONFIG.exclude, ...exclude]),
+    exclude: [...new Set([...BASE_CONFIG.exclude, ...exclude])],
     collectUsages: cli.flags.collectUsages || BASE_CONFIG.collectUsages,
     extensions,
     dir: dir || getRepoRoot(),