Minor refactors

Author: webpro

packages/knip/src/ProjectPrincipal.ts

@@ -18,7 +18,7 @@ import { dirname, extname, isInNodeModules, join } from './util/path.js';
 import type { ToSourceFilePath } from './util/to-source-path.js';
 
 // These compiler options override local options
-const baseCompilerOptions = {
+const baseCompilerOptions: ts.CompilerOptions = {
   allowJs: true,
   allowSyntheticDefaultImports: true,
   declaration: false,
@@ -29,11 +29,11 @@ const baseCompilerOptions = {
   jsx: ts.JsxEmit.Preserve,
   jsxImportSource: undefined,
   lib: [],
-  types: ['node'],
   noEmit: true,
   skipDefaultLibCheck: true,
   skipLibCheck: true,
   sourceMap: false,
+  types: ['node'],
 };
 
 const tsCreateProgram = timerify(ts.createProgram);
@@ -87,7 +87,7 @@ export class ProjectPrincipal {
     this.compilerOptions = {
       ...compilerOptions,
       ...baseCompilerOptions,
-      types: compact([...(compilerOptions.types ?? []), ...baseCompilerOptions.types]),
+      types: compact([...(compilerOptions.types ?? []), ...(baseCompilerOptions.types ?? [])]),
       allowNonTsExtensions: true,
     };
 

packages/knip/src/index.ts

@@ -355,9 +355,7 @@ export const main = async (unresolvedConfiguration: CommandLineOptions) => {
       const files = resolvedFiles.filter(filePath => !analyzedFiles.has(filePath));
 
       debugLogArray('*', `Analyzing used resolved files [P${principals.indexOf(principal) + 1}/${++round}]`, files);
-      for (const filePath of files) {
-        analyzeSourceFile(filePath, principal);
-      }
+      for (const filePath of files) analyzeSourceFile(filePath, principal);
     } while (size !== principal.entryPaths.size);
 
     for (const filePath of principal.getUnreferencedFiles()) unreferencedFiles.add(filePath);

packages/knip/src/util/modules.ts

@@ -70,9 +70,10 @@ export const getEntryPathFromManifest = (
 };
 
 // Strip `?search` and other proprietary directives from the specifier (e.g. https://webpack.js.org/concepts/loaders/)
+const matchDirectives = /^([?!|-]+)?([^!?:]+).*/;
 export const sanitizeSpecifier = (specifier: string) => {
   if (isBuiltin(specifier)) return specifier;
   if (isAbsolute(specifier)) return specifier;
   if (specifier.startsWith('virtual:')) return specifier;
-  return specifier.replace(/^([?!|-]+)?([^!?:]+).*/, '$2');
+  return specifier.replace(matchDirectives, '$2');
 };