knip 0.9.1 → 0.10.0

package/README.md

@@ -125,10 +125,12 @@ following types of issues:
 - `nsTypes` - Unused types in namespaces: did not find direct references to this exported variable (2)
 - `duplicates` - Duplicate exports: the same thing is exported more than once with different names from the same file
 
-1.  This may also include dependencies that could not be resolved properly (such as non-relative `local/dir/file.ts` not
-    and `local` not being in `node_modules`).
+1.  This includes dependencies that could not be resolved. For instance, what does `unresolved/dir/module` mean?
+    - To target something in the (missing) `node_modules/unresolved` package?
+    - Target a local module that should have a relative path?
+    - It does not match any `paths` entry in `tsconfig.json#compilerOptions`.
 2.  The variable or type is not referenced directly, and has become a member of a namespace. That's why Knip is not sure
-    whether this export can be removed, so please look into it:
+    whether this export can be removed, so please look into it.
 
 You can `--include` or `--exclude` any of the types to slice & dice the report to your needs. Alternatively, they can be
 added to the configuration (e.g. `"exclude": ["dependencies"]`).
@@ -140,8 +142,8 @@ As always, make sure to backup files or use Git before deleting files or making
 - Unused files can be removed.
 - Unused dependencies can be removed from `package.json`.
 - Unlisted dependencies should be added to `package.json`.
-- Unused exports and types: remove the `export` keyword in front of unused exports. Then you (or tools such as the
-  TypeScript language server in VS Code and/or ESLint) can see whether the variable or type is used within the same
+- Unused exports and types: remove the `export` keyword in front of unused exports. Then you (or tools such as
+  TypeScript language services in VS Code and/or ESLint) can see whether the variable or type is used within the same
   file. If this is not the case, it can be removed.
 
 🔁 Repeat the process to reveal new unused files and exports. Sometimes it's so liberating to remove things!

package/dist/index.d.ts

@@ -1,5 +1,5 @@
 import type { UnresolvedConfiguration } from './types';
-export declare const main: (options: UnresolvedConfiguration) => Promise<{
+export declare const main: (unresolvedConfiguration: UnresolvedConfiguration) => Promise<{
     report: import("./types").Report;
     issues: import("./types").Issues;
     counters: import("./types").Counters;

package/dist/index.js

@@ -13,10 +13,10 @@ const runner_1 = require("./runner");
 const errors_1 = require("./util/errors");
 const debug_1 = require("./util/debug");
 const progress_1 = require("./progress");
-const main = async (options) => {
-    const { cwd, workingDir, configFilePath: configFilePathArg, tsConfigFilePath: tsConfigFilePathArg, include, exclude, ignore, gitignore, isIncludeEntryFiles, isDev, isShowProgress, jsDoc, debug, } = options;
-    const updateMessage = (0, progress_1.getMessageUpdater)(options);
-    (0, debug_1.debugLogObject)(options, 1, 'Unresolved configuration', options);
+const main = async (unresolvedConfiguration) => {
+    const { cwd, workingDir, configFilePath: configFilePathArg, tsConfigFilePath: tsConfigFilePathArg, include, exclude, ignore, gitignore, isIncludeEntryFiles, isDev, isShowProgress, jsDoc, debug, } = unresolvedConfiguration;
+    const updateMessage = (0, progress_1.getMessageUpdater)(unresolvedConfiguration);
+    (0, debug_1.debugLogObject)(debug, 1, 'Unresolved configuration', unresolvedConfiguration);
     updateMessage('Reading configuration and manifest files...');
     const manifestPath = await (0, fs_1.findFile)(cwd, workingDir, 'package.json');
     const manifest = manifestPath && require(manifestPath);
@@ -31,10 +31,10 @@ const main = async (options) => {
     if (tsConfigFilePathArg && !resolvedTsConfigFilePath) {
         throw new errors_1.ConfigurationError(`Unable to find ${tsConfigFilePathArg}`);
     }
-    let tsConfigPaths = [];
+    let tsConfigPathGlobs = [];
     if (resolvedTsConfigFilePath) {
         const config = typescript_1.default.readConfigFile(resolvedTsConfigFilePath, typescript_1.default.sys.readFile);
-        tsConfigPaths = config.config.compilerOptions?.paths
+        tsConfigPathGlobs = config.config.compilerOptions?.paths
             ? Object.keys(config.config.compilerOptions.paths).map(p => p.replace(/\*/g, '**'))
             : [];
         if (config.error) {
@@ -43,7 +43,7 @@ const main = async (options) => {
     }
     const dir = (0, path_1.relative)(workingDir);
     const resolvedConfig = (0, config_1.resolveConfig)(manifest.knip ?? localConfig, { workingDir: dir, isDev });
-    (0, debug_1.debugLogObject)(options, 1, 'Resolved configuration', resolvedConfig);
+    (0, debug_1.debugLogObject)(debug, 1, 'Resolved configuration', resolvedConfig);
     if (!resolvedConfigFilePath && !manifest.knip && !resolvedTsConfigFilePath) {
         throw new errors_1.ConfigurationError(`Unable to find ${configFilePath} or package.json#knip or ${tsConfigFilePath}`);
     }
@@ -55,29 +55,31 @@ const main = async (options) => {
                 : { compilerOptions: { allowJs: true } };
             updateMessage('Resolving entry files...');
             const entryPaths = await (0, path_1.resolvePaths)({
+                cwd,
                 workingDir,
                 patterns: resolvedConfig.entryFiles,
                 ignore,
                 gitignore,
             });
-            (0, debug_1.debugLogFiles)(options, 1, 'Globbed entry paths', entryPaths);
+            (0, debug_1.debugLogFiles)(debug, 1, 'Globbed entry paths', entryPaths);
             const production = (0, project_1.createProject)({ ...projectOptions, ...skipAddFiles }, entryPaths);
             const entryFiles = production.getSourceFiles();
-            (0, debug_1.debugLogSourceFiles)(options, 1, 'Included entry source files', entryFiles);
+            (0, debug_1.debugLogSourceFiles)(debug, 1, 'Included entry source files', entryFiles);
             production.resolveSourceFileDependencies();
             const productionFiles = production.getSourceFiles();
-            (0, debug_1.debugLogSourceFiles)(options, 1, 'Included production source files', productionFiles);
+            (0, debug_1.debugLogSourceFiles)(debug, 1, 'Included production source files', productionFiles);
             updateMessage('Resolving project files...');
             const projectPaths = await (0, path_1.resolvePaths)({
+                cwd,
                 workingDir,
                 patterns: resolvedConfig.projectFiles,
                 ignore,
                 gitignore,
             });
-            (0, debug_1.debugLogFiles)(options, 1, 'Globbed project paths', projectPaths);
+            (0, debug_1.debugLogFiles)(debug, 1, 'Globbed project paths', projectPaths);
             const project = (0, project_1.createProject)({ ...projectOptions, ...skipAddFiles }, projectPaths);
             const projectFiles = project.getSourceFiles();
-            (0, debug_1.debugLogSourceFiles)(options, 1, 'Included project source files', projectFiles);
+            (0, debug_1.debugLogSourceFiles)(debug, 1, 'Included project source files', projectFiles);
             return { entryFiles, productionFiles, projectFiles };
         }
         else {
@@ -100,7 +102,7 @@ const main = async (options) => {
         optionalDependencies: Object.keys(manifest.optionalDependencies ?? {}),
         devDependencies: Object.keys(manifest.devDependencies ?? {}),
         isDev: Boolean(resolvedConfig?.dev),
-        tsConfigPaths,
+        tsConfigPathGlobs: tsConfigPathGlobs,
         isShowProgress,
         jsDocOptions: {
             isReadPublicTag: jsDoc.includes('public'),
@@ -108,7 +110,7 @@ const main = async (options) => {
         debug,
     };
     const { issues, counters } = await (0, runner_1.findIssues)(config);
-    (0, debug_1.debugLogObject)(options, 2, 'Issues', issues);
+    (0, debug_1.debugLogObject)(debug, 2, 'Issues', issues);
     return { report, issues, counters };
 };
 exports.main = main;

package/dist/runner.js

@@ -13,16 +13,16 @@ const dependencies_1 = require("./util/dependencies");
 const debug_1 = require("./util/debug");
 const progress_1 = require("./progress");
 async function findIssues(configuration) {
-    const { workingDir, report, isDev, jsDocOptions } = configuration;
+    const { workingDir, report, isDev, jsDocOptions, debug } = configuration;
     const { entryFiles, productionFiles, projectFiles, isIncludeEntryFiles } = configuration;
     const updateMessage = (0, progress_1.getMessageUpdater)(configuration);
     const { getUnresolvedDependencies, getUnusedDependencies, getUnusedDevDependencies } = (0, dependencies_1.getDependencyAnalyzer)(configuration);
     const [usedProductionFiles, unreferencedProductionFiles] = (0, project_1.partitionSourceFiles)(projectFiles, productionFiles);
     const [usedEntryFiles, usedNonEntryFiles] = (0, project_1.partitionSourceFiles)(usedProductionFiles, entryFiles);
-    (0, debug_1.debugLogSourceFiles)(configuration, 1, 'Used production files', usedProductionFiles);
-    (0, debug_1.debugLogSourceFiles)(configuration, 1, 'Unreferenced production files', unreferencedProductionFiles);
-    (0, debug_1.debugLogSourceFiles)(configuration, 1, 'Used entry files', usedEntryFiles);
-    (0, debug_1.debugLogSourceFiles)(configuration, 1, 'Used non-entry files', usedNonEntryFiles);
+    (0, debug_1.debugLogSourceFiles)(debug, 1, 'Used production files', usedProductionFiles);
+    (0, debug_1.debugLogSourceFiles)(debug, 1, 'Unreferenced production files', unreferencedProductionFiles);
+    (0, debug_1.debugLogSourceFiles)(debug, 1, 'Used entry files', usedEntryFiles);
+    (0, debug_1.debugLogSourceFiles)(debug, 1, 'Used non-entry files', usedNonEntryFiles);
     const issues = {
         files: new Set(unreferencedProductionFiles.map(file => file.getFilePath())),
         dependencies: new Set(),
@@ -50,7 +50,7 @@ async function findIssues(configuration) {
     const updateCounters = (0, progress_1.getCountersUpdater)(configuration, counters);
     const addSymbolIssue = (issueType, issue) => {
         const { filePath, symbol } = issue;
-        const key = node_path_1.default.relative(workingDir, filePath);
+        const key = node_path_1.default.relative(workingDir, filePath).replace(/\\/g, '/');
         issues[issueType][key] = issues[issueType][key] ?? {};
         issues[issueType][key][symbol] = issue;
         counters[issueType]++;

package/dist/types.d.ts

@@ -65,7 +65,7 @@ export declare type Configuration = {
     optionalDependencies: string[];
     devDependencies: string[];
     isDev: boolean;
-    tsConfigPaths: string[];
+    tsConfigPathGlobs: string[];
     isShowProgress: boolean;
     jsDocOptions: {
         isReadPublicTag: boolean;

package/dist/util/config.d.ts

@@ -1,6 +1,6 @@
-import type { ImportedConfiguration, LocalConfiguration } from '../types';
+import type { ImportedConfiguration, LocalConfiguration, Report } from '../types';
 export declare const resolveConfig: (importedConfiguration: ImportedConfiguration, options?: {
     workingDir?: string;
     isDev?: boolean;
 }) => LocalConfiguration | undefined;
-export declare const resolveIncludedIssueTypes: (includeArg: string[], excludeArg: string[], resolvedConfig?: LocalConfiguration) => import("../types").Report;
+export declare const resolveIncludedIssueTypes: (includeArg: string[], excludeArg: string[], resolvedConfig?: LocalConfiguration) => Report;

package/dist/util/config.js

@@ -31,15 +31,13 @@ exports.resolveConfig = resolveConfig;
 const resolveIncludedIssueTypes = (includeArg, excludeArg, resolvedConfig) => {
     const deps = resolvedConfig?.dev ? ['dependencies', 'devDependencies'] : ['dependencies'];
     const groups = ['files', ...deps, 'unlisted', 'exports', 'types', 'nsExports', 'nsTypes', 'duplicates'];
-    const include = [includeArg, resolvedConfig?.include ?? []]
-        .flat()
-        .map(value => value.split(','))
-        .flat();
-    const exclude = [excludeArg, resolvedConfig?.exclude ?? []]
-        .flat()
-        .map(value => value.split(','))
-        .flat();
-    const includes = (include.length > 0 ? include : groups).filter(group => !exclude.includes(group));
-    return groups.reduce((r, group) => ((r[group] = includes.includes(group)), r), {});
+    const normalizedIncludesArg = includeArg.map(value => value.split(',')).flat();
+    const normalizedExcludesArg = excludeArg.map(value => value.split(',')).flat();
+    const excludes = (resolvedConfig?.exclude ?? []).filter(exclude => !normalizedIncludesArg.includes(exclude));
+    const includes = (resolvedConfig?.include ?? []).filter(include => !normalizedExcludesArg.includes(include));
+    const include = [normalizedIncludesArg, includes].flat();
+    const exclude = [normalizedExcludesArg, excludes].flat();
+    const included = (include.length > 0 ? include : groups).filter(group => !exclude.includes(group));
+    return groups.reduce((types, group) => ((types[group] = included.includes(group)), types), {});
 };
 exports.resolveIncludedIssueTypes = resolveIncludedIssueTypes;

package/dist/util/debug.d.ts

@@ -1,11 +1,9 @@
 import type { SourceFile } from 'ts-morph';
-declare type Config = {
-    debug: {
-        isEnabled: boolean;
-        level: number;
-    };
+declare type Debug = {
+    isEnabled: boolean;
+    level: number;
 };
-export declare const debugLogObject: (config: Config, minimumLevel: number, name: string, obj: unknown) => void;
-export declare const debugLogFiles: (config: Config, minimumLevel: number, name: string, filePaths: string[]) => void;
-export declare const debugLogSourceFiles: (config: Config, minimumLevel: number, name: string, sourceFiles: SourceFile[]) => void;
+export declare const debugLogObject: (debug: Debug, minimumLevel: number, name: string, obj: unknown) => void;
+export declare const debugLogFiles: (debug: Debug, minimumLevel: number, name: string, filePaths: string[]) => void;
+export declare const debugLogSourceFiles: (debug: Debug, minimumLevel: number, name: string, sourceFiles: SourceFile[]) => void;
 export {};

package/dist/util/debug.js

@@ -6,17 +6,16 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.debugLogSourceFiles = exports.debugLogFiles = exports.debugLogObject = void 0;
 const node_util_1 = __importDefault(require("node:util"));
 const logArray = (collection) => console.log(node_util_1.default.inspect(collection, { maxArrayLength: null }));
-const debugLogObject = (config, minimumLevel, name, obj) => {
-    if (minimumLevel > config.debug.level)
+const debugLogObject = (debug, minimumLevel, name, obj) => {
+    if (minimumLevel > debug.level)
         return;
     console.log(`[knip] ${name}:`);
     console.log(node_util_1.default.inspect(obj, { depth: null, colors: true }));
 };
 exports.debugLogObject = debugLogObject;
-const debugLogFiles = (config, minimumLevel, name, filePaths) => {
-    if (minimumLevel > config.debug.level)
+const debugLogFiles = (debug, minimumLevel, name, filePaths) => {
+    if (minimumLevel > debug.level)
         return;
-    const { debug } = config;
     if (debug.level > 1) {
         console.debug(`[knip] ${name} (${filePaths.length}):`);
         logArray(filePaths);
@@ -26,10 +25,9 @@ const debugLogFiles = (config, minimumLevel, name, filePaths) => {
     }
 };
 exports.debugLogFiles = debugLogFiles;
-const debugLogSourceFiles = (config, minimumLevel, name, sourceFiles) => {
-    if (minimumLevel > config.debug.level)
+const debugLogSourceFiles = (debug, minimumLevel, name, sourceFiles) => {
+    if (minimumLevel > debug.level)
         return;
-    const { debug } = config;
     if (debug.level > 1) {
         console.debug(`[knip] ${name} (${sourceFiles.length}):`);
         logArray(sourceFiles.map(sourceFile => sourceFile.getFilePath()));
@@ -39,8 +37,8 @@ const debugLogSourceFiles = (config, minimumLevel, name, sourceFiles) => {
     }
 };
 exports.debugLogSourceFiles = debugLogSourceFiles;
-const debugLogDiff = (config, minimumLevel, name, arrA, arrB) => {
-    if (minimumLevel > config.debug.level)
+const debugLogDiff = (debug, minimumLevel, name, arrA, arrB) => {
+    if (minimumLevel > debug.level)
         return;
     const onlyInA = arrA.filter(itemA => !arrB.includes(itemA)).sort();
     const onlyInB = arrB.filter(itemB => !arrA.includes(itemB)).sort();

package/dist/util/dependencies.js

@@ -7,29 +7,35 @@ exports.getDependencyAnalyzer = void 0;
 const ts_morph_1 = require("ts-morph");
 const is_builtin_module_1 = __importDefault(require("is-builtin-module"));
 const micromatch_1 = __importDefault(require("micromatch"));
+const ts_morph_helpers_1 = require("ts-morph-helpers");
 const compact = (collection) => Array.from(new Set(collection)).filter((value) => Boolean(value));
+const findRequireModuleSpecifiers = (sourceFile) => (0, ts_morph_helpers_1.findCallExpressionsByName)(sourceFile, 'require').map(expression => expression.getFirstDescendantByKind(ts_morph_1.ts.SyntaxKind.StringLiteral));
+const isExternalDependency = (moduleSpecifier, tsConfigPathGlobs) => {
+    if (moduleSpecifier.startsWith('.'))
+        return false;
+    if ((0, is_builtin_module_1.default)(moduleSpecifier))
+        return false;
+    if (tsConfigPathGlobs.length > 0 && micromatch_1.default.isMatch(moduleSpecifier, tsConfigPathGlobs))
+        return false;
+    return true;
+};
+const resolvePackageName = (moduleSpecifier) => {
+    const parts = moduleSpecifier.split('/').slice(0, 2);
+    return moduleSpecifier.startsWith('@') ? parts.join('/') : parts[0];
+};
 const getDependencyAnalyzer = (configuration) => {
-    const { dependencies, devDependencies, peerDependencies, optionalDependencies, tsConfigPaths } = configuration;
+    const { dependencies, devDependencies, peerDependencies, optionalDependencies, tsConfigPathGlobs } = configuration;
     const productionDependencies = [...dependencies, ...peerDependencies, ...optionalDependencies];
     const referencedDependencies = new Set();
     const getUnresolvedDependencies = (sourceFile) => {
         const unresolvedDependencies = new Set();
         const importLiterals = sourceFile.getImportStringLiterals();
-        const requires = sourceFile
-            .getDescendantsOfKind(ts_morph_1.ts.SyntaxKind.CallExpression)
-            .filter(callExpression => callExpression.getExpression().getText() === 'require')
-            .map(expression => expression.getFirstDescendantByKind(ts_morph_1.ts.SyntaxKind.StringLiteral));
-        const literals = compact([importLiterals, requires].flat());
-        literals.forEach(importLiteral => {
-            const moduleSpecifier = importLiteral.getLiteralText();
-            if (moduleSpecifier.startsWith('.'))
-                return;
-            if ((0, is_builtin_module_1.default)(moduleSpecifier))
-                return;
-            if (tsConfigPaths.length > 0 && micromatch_1.default.isMatch(moduleSpecifier, tsConfigPaths))
+        const requireCallExpressions = findRequireModuleSpecifiers(sourceFile);
+        const moduleSpecifiers = compact([importLiterals, requireCallExpressions].flat()).map(i => i.getLiteralText());
+        moduleSpecifiers.forEach(moduleSpecifier => {
+            if (!isExternalDependency(moduleSpecifier, tsConfigPathGlobs))
                 return;
-            const parts = moduleSpecifier.split('/').slice(0, 2);
-            const packageName = moduleSpecifier.startsWith('@') ? parts.join('/') : parts[0];
+            const packageName = resolvePackageName(moduleSpecifier);
             if (!productionDependencies.includes(packageName) && !devDependencies.includes(packageName)) {
                 unresolvedDependencies.add({ filePath: sourceFile.getFilePath(), symbol: moduleSpecifier });
             }

package/dist/util/path.d.ts

@@ -1,5 +1,6 @@
 export declare const relative: (to: string) => string;
-export declare const resolvePaths: ({ workingDir, patterns, ignore, gitignore, }: {
+export declare const resolvePaths: ({ cwd, workingDir, patterns, ignore, gitignore, }: {
+    cwd: string;
     workingDir: string;
     patterns: string[];
     ignore: string[];

package/dist/util/path.js

@@ -18,12 +18,12 @@ const glob = async function (patterns, options) {
 };
 const prependDirToPattern = (workingDir, pattern) => {
     if (pattern.startsWith('!'))
-        return '!' + node_path_1.default.join(workingDir, pattern.slice(1));
-    return node_path_1.default.join(workingDir, pattern);
+        return '!' + node_path_1.default.posix.join(workingDir, pattern.slice(1));
+    return node_path_1.default.posix.join(workingDir, pattern);
 };
-const resolvePaths = async ({ workingDir, patterns, ignore, gitignore, }) => glob(patterns.map(pattern => prependDirToPattern((0, exports.relative)(workingDir), pattern)), {
+const resolvePaths = async ({ cwd, workingDir, patterns, ignore, gitignore, }) => glob(patterns.map(pattern => prependDirToPattern(node_path_1.default.posix.relative(cwd, workingDir), pattern)), {
     cwd,
-    ignore,
+    ignore: [...ignore, '**/node_modules'],
     gitignore,
     absolute: true,
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "0.9.1",
+  "version": "0.10.0",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript project",
   "keywords": [
     "find",
@@ -25,7 +25,7 @@
   },
   "scripts": {
     "knip": "node ./dist/cli.js --jsdoc public",
-    "test": "node --loader tsx --test test/*.spec.ts",
+    "test": "globstar -- node --loader tsx --test \"test/*.spec.ts\"",
     "watch": "tsc --watch",
     "build": "rm -rf dist && tsc",
     "prepublishOnly": "npm test && npm run build && npm run knip",
@@ -50,6 +50,7 @@
   "devDependencies": {
     "@types/micromatch": "4.0.2",
     "@types/node": "18.11.2",
+    "globstar": "1.0.0",
     "prettier": "2.7.1",
     "release-it": "15.5.0",
     "tsx": "3.10.3",