Minor refactors

Author: webpro

.github/ISSUE_TEMPLATE/02-regression.yaml

@@ -6,7 +6,8 @@ body:
   - type: markdown
     attributes:
       value: |
-        Please make sure you have read the docs and are using the latest version of Knip. Use common sense and provide the necessary information that helps me or others to help you.
+        Please make sure you have read the docs and are using the latest version of Knip.
+        Use common sense and provide the necessary information that helps me or others to help you.
 
         A minimal reproduction is mandatory: only the code and configuration required to demonstrate the issue.
   - type: checkboxes

packages/docs/src/content/docs/guides/writing-a-plugin.md

@@ -101,7 +101,9 @@ const isEnabled: IsPluginEnabled = ({ dependencies }) =>
 const config = ['.nycrc', '.nycrc.json', '.nycrc.{yml,yaml}', 'nyc.config.js'];
 
 const resolveConfig: ResolveConfig<NycConfig> = config => {
-  return config?.extends ? [config.extends].flat() : [];
+  const extend = config?.extends ?? [];
+  const requires = config?.require ?? [];
+  return [extend, requires].flat().map(toDeferResolve);
 };
 
 export default {
@@ -141,10 +143,10 @@ without an extension are provided as plain text strings.
 
 :::tip[Should I implement resolveConfig?]
 
-You should implement `resolveConfig` if:
+You should implement `resolveConfig` if any of these are true:
 
-- The tool supports a `config` file in JSON or YAML format, and/or
-- The `config` file reference dependencies as strings
+- The tool supports a `config` file in JSON or YAML format
+- The `config` file references dependencies as strings
 
 :::
 
@@ -165,7 +167,7 @@ Here's an example from the Ava test runner plugin:
 
 ```ts
 const resolveEntryPaths: ResolveEntryPaths<AvaConfig> = localConfig => {
-  return localConfig?.files ?? [];
+  return (localConfig?.files ?? []).map(toEntry);
 };
 ```
 

packages/knip/src/plugins/linthtml/index.ts

@@ -17,9 +17,9 @@ const isEnabled: IsPluginEnabled = ({ dependencies }) => hasDependency(dependenc
 const config: string[] = ['package.json', ...toCosmiconfig('linthtml')];
 
 const resolveConfig: ResolveConfig<PluginConfig> = config => {
-  const extensions = [config.extends ?? []].flat();
-  const plugins = [config.plugins ?? []].flat();
-  return [...extensions, ...plugins].map(toDeferResolve);
+  const extensions = config.extends ?? [];
+  const plugins = config.plugins ?? [];
+  return [extensions, plugins].flat().map(toDeferResolve);
 };
 
 export default {

packages/knip/src/plugins/nyc/index.ts

@@ -14,9 +14,9 @@ const isEnabled: IsPluginEnabled = ({ dependencies }) => hasDependency(dependenc
 const config = ['.nycrc', '.nycrc.json', '.nycrc.{yml,yaml}', 'nyc.config.js', 'package.json'];
 
 const resolveConfig: ResolveConfig<NycConfig> = config => {
-  const extend = config?.extends ? [config?.extends].flat() : [];
-  const requires = config?.require ? [config?.require].flat() : [];
-  return [...extend, ...requires].flat().map(toDeferResolve);
+  const extend = config?.extends ?? [];
+  const requires = config?.require ?? [];
+  return [extend, requires].flat().map(toDeferResolve);
 };
 
 export default {

packages/knip/src/plugins/stylelint/index.ts

@@ -15,11 +15,11 @@ const isEnabled: IsPluginEnabled = ({ dependencies }) => hasDependency(dependenc
 const config = ['package.json', ...toCosmiconfig('stylelint')];
 
 const resolve = (config: StyleLintConfig | BaseStyleLintConfig): Input[] => {
-  const extend = config.extends ? [config.extends].flat() : [];
-  const plugins = config.plugins ? [config.plugins].flat() : [];
+  const extend = config.extends ?? [];
+  const plugins = config.plugins ?? [];
   const customSyntax = config.customSyntax ? [config.customSyntax] : [];
   const overrideConfigs = 'overrides' in config ? config.overrides.flatMap(resolve) : [];
-  return [...[...extend, ...plugins, ...customSyntax].map(toDeferResolve), ...overrideConfigs];
+  return [...[extend, plugins, customSyntax].flat().map(toDeferResolve), ...overrideConfigs];
 };
 
 const resolveConfig: ResolveConfig<StyleLintConfig> = config => resolve(config);

packages/knip/src/plugins/travis/index.ts

@@ -14,11 +14,11 @@ const config = ['.travis.yml'];
 const resolveConfig: ResolveConfig = async (config, options) => {
   if (!config) return [];
 
-  const beforeDeploy = [config.before_deploy ?? []].flat();
-  const beforeInstall = [config.before_install ?? []].flat();
-  const beforeScript = [config.before_script ?? []].flat();
+  const beforeDeploy = config.before_deploy ?? [];
+  const beforeInstall = config.before_install ?? [];
+  const beforeScript = config.before_script ?? [];
 
-  const scripts = [...beforeDeploy, ...beforeInstall, ...beforeScript];
+  const scripts = [beforeDeploy, beforeInstall, beforeScript].flat();
 
   return options.getInputsFromScripts(scripts, { knownBinsOnly: true });
 };

packages/knip/src/plugins/vitest/index.ts

@@ -42,12 +42,8 @@ const findConfigDependencies = (localConfig: ViteConfig, options: PluginOptions)
   const coverage = hasCoverageEnabled ? [`@vitest/coverage-${testConfig.coverage?.provider ?? 'v8'}`] : [];
 
   const dir = join(configFileDir, testConfig.root ?? '.');
-  const setupFiles = [testConfig.setupFiles ?? []].flat().map(specifier => {
-    return { ...toDeferResolve(specifier), dir };
-  });
-  const globalSetup = [testConfig.globalSetup ?? []].flat().map(specifier => {
-    return { ...toDeferResolve(specifier), dir };
-  });
+  const setupFiles = [testConfig.setupFiles ?? []].flat().map(specifier => ({ ...toDeferResolve(specifier), dir }));
+  const globalSetup = [testConfig.globalSetup ?? []].flat().map(specifier => ({ ...toDeferResolve(specifier), dir }));
 
   return [...[...environments, ...reporters, ...coverage].map(toDependency), ...setupFiles, ...globalSetup];
 };