knip 0.8.0 → 0.8.2

package/dist/cli.js

@@ -37,7 +37,7 @@ if (help) {
 }
 const cwd = process.cwd();
 const workingDir = dir ? node_path_1.default.resolve(dir) : cwd;
-const isShowProgress = noProgress === false ? process.stdout.isTTY && typeof process.stdout.cursorTo === 'function' : !noProgress;
+const isShowProgress = !isDebug && noProgress === false && process.stdout.isTTY && typeof process.stdout.cursorTo === 'function';
 const printReport = reporter in reporters_1.default ? reporters_1.default[reporter] : require(node_path_1.default.join(workingDir, reporter));
 const run = async () => {
     try {
@@ -60,13 +60,12 @@ const run = async () => {
             },
         });
         printReport({ report, issues, cwd, workingDir, isDev, options: reporterOptions });
-        const reportGroup = report.files ? 'files' : Object.keys(report).find(key => report[key]);
-        const counterGroup = reportGroup === 'unlisted' ? 'unresolved' : reportGroup;
-        if (counterGroup) {
-            const count = counters[counterGroup];
-            if (count > Number(maxIssues))
-                process.exit(count);
-        }
+        const totalErrorCount = Object.keys(report)
+            .filter((reportGroup) => report[reportGroup])
+            .map(reportGroup => reportGroup === 'unlisted' ? 'unresolved' : reportGroup)
+            .reduce((errorCount, reportGroup) => errorCount + counters[reportGroup], 0);
+        if (totalErrorCount > Number(maxIssues))
+            process.exit(totalErrorCount);
     }
     catch (error) {
         if (error instanceof errors_1.ConfigurationError) {

package/dist/index.d.ts

@@ -2,16 +2,5 @@ import type { UnresolvedConfiguration } from './types';
 export declare const main: (options: UnresolvedConfiguration) => Promise<{
     report: import("./types").Report;
     issues: import("./types").Issues;
-    counters: {
-        files: number;
-        dependencies: number;
-        devDependencies: number;
-        unresolved: number;
-        exports: number;
-        types: number;
-        nsExports: number;
-        nsTypes: number;
-        duplicates: number;
-        processed: number;
-    };
+    counters: import("./types").Counters;
 }>;

package/dist/index.js

@@ -13,9 +13,12 @@ const project_1 = require("./util/project");
 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 onfiguration', options);
+    updateMessage('Reading configuration and manifest files...');
     const manifestPath = await (0, fs_1.findFile)(cwd, workingDir, 'package.json');
     const manifest = manifestPath && require(manifestPath);
     const configFilePath = configFilePathArg ?? 'knip.json';
@@ -51,6 +54,7 @@ const main = async (options) => {
             const projectOptions = resolvedTsConfigFilePath
                 ? { tsConfigFilePath: resolvedTsConfigFilePath }
                 : { compilerOptions: { allowJs: true } };
+            updateMessage('Resolving entry files...');
             const entryPaths = await (0, path_1.resolvePaths)({
                 cwd,
                 workingDir,
@@ -65,6 +69,7 @@ const main = async (options) => {
             production.resolveSourceFileDependencies();
             const productionFiles = production.getSourceFiles();
             (0, debug_1.debugLogSourceFiles)(options, 1, 'Included production source files', productionFiles);
+            updateMessage('Resolving project files...');
             const projectPaths = await (0, path_1.resolvePaths)({
                 cwd,
                 workingDir,
@@ -79,6 +84,7 @@ const main = async (options) => {
             return { entryFiles, productionFiles, projectFiles };
         }
         else {
+            updateMessage('Resolving project files...');
             const project = (0, project_1.createProject)({ tsConfigFilePath: resolvedTsConfigFilePath });
             const files = project.getSourceFiles();
             return { entryFiles: files, productionFiles: files, projectFiles: files };

package/dist/progress.d.ts

@@ -0,0 +1,5 @@
+import type { Configuration, Counters, Issue } from './types';
+export declare const getMessageUpdater: (configuration: {
+    isShowProgress: boolean;
+}) => (message: string) => void;
+export declare const getCountersUpdater: (configuration: Configuration, counters: Counters) => (issue?: Issue) => void;

package/dist/progress.js

@@ -0,0 +1,41 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getCountersUpdater = exports.getMessageUpdater = void 0;
+const node_path_1 = __importDefault(require("node:path"));
+const log_1 = require("./log");
+const lineRewriter = new log_1.LineRewriter();
+const getMessageUpdater = (configuration) => {
+    const { isShowProgress } = configuration;
+    if (!isShowProgress)
+        return () => { };
+    return (message) => lineRewriter.update([message]);
+};
+exports.getMessageUpdater = getMessageUpdater;
+const getCountersUpdater = (configuration, counters) => {
+    const { workingDir, isShowProgress, report } = configuration;
+    if (!isShowProgress)
+        return () => { };
+    return (issue) => {
+        if (!issue)
+            return lineRewriter.resetLines();
+        const { processed, total } = counters;
+        const percentage = Math.floor((processed / total) * 100);
+        const messages = [(0, log_1.getLine)(`${percentage}%`, `of files processed (${processed} of ${total})`)];
+        report.files && messages.push((0, log_1.getLine)(counters.files, 'unused files'));
+        report.unlisted && messages.push((0, log_1.getLine)(counters.unresolved, 'unlisted dependencies'));
+        report.exports && messages.push((0, log_1.getLine)(counters.exports, 'unused exports'));
+        report.nsExports && messages.push((0, log_1.getLine)(counters.nsExports, 'unused exports in namespace'));
+        report.types && messages.push((0, log_1.getLine)(counters.types, 'unused types'));
+        report.nsTypes && messages.push((0, log_1.getLine)(counters.nsTypes, 'unused types in namespace'));
+        report.duplicates && messages.push((0, log_1.getLine)(counters.duplicates, 'duplicate exports'));
+        if (processed < total) {
+            messages.push('');
+            messages.push(`Processing: ${node_path_1.default.relative(workingDir, issue.filePath)}`);
+        }
+        lineRewriter.update(messages);
+    };
+};
+exports.getCountersUpdater = getCountersUpdater;

package/dist/reporters/symbols.js

@@ -4,9 +4,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 const node_path_1 = __importDefault(require("node:path"));
-const logIssueLine = ({ issue, workingDir, padding }) => {
+const TRUNCATE_WIDTH = 40;
+const logIssueLine = (issue, workingDir, maxWidth) => {
     const symbols = issue.symbols ? issue.symbols.join(', ') : issue.symbol;
-    console.log(`${symbols.padEnd(padding + 2)}${issue.symbolType?.padEnd(11) || ''}${node_path_1.default.relative(workingDir, issue.filePath)}`);
+    const truncatedSymbol = symbols.length > maxWidth ? symbols.slice(0, maxWidth - 3) + '...' : symbols;
+    const filePath = node_path_1.default.relative(workingDir, issue.filePath);
+    console.log(`${truncatedSymbol.padEnd(maxWidth + 2)}${issue.symbolType?.padEnd(11) || ''}${filePath}`);
 };
 const logIssueGroupResult = (issues, workingDir, title) => {
     title && console.log(`--- ${title} (${issues.length})`);
@@ -17,12 +20,12 @@ const logIssueGroupResult = (issues, workingDir, title) => {
         console.log('Not found');
     }
 };
-const logIssueGroupResults = (issues, workingDir, title) => {
+const logIssueGroupResults = (issues, workingDir, title, isTruncate = false) => {
     title && console.log(`--- ${title} (${issues.length})`);
     if (issues.length) {
         const sortedByFilePath = issues.sort((a, b) => (a.filePath > b.filePath ? 1 : -1));
-        const padding = [...issues].sort((a, b) => b.symbol.length - a.symbol.length)[0].symbol.length;
-        sortedByFilePath.forEach(issue => logIssueLine({ issue, workingDir, padding }));
+        const maxWidth = isTruncate ? TRUNCATE_WIDTH : issues.reduce((max, issue) => Math.max(issue.symbol.length, max), 0);
+        sortedByFilePath.forEach(issue => logIssueLine(issue, workingDir, maxWidth));
     }
     else {
         console.log('Not found');
@@ -64,6 +67,6 @@ exports.default = ({ report, issues, workingDir, isDev }) => {
     }
     if (report.duplicates) {
         const unreferencedDuplicates = Object.values(issues.duplicates).map(Object.values).flat();
-        logIssueGroupResults(unreferencedDuplicates, workingDir, reportMultipleGroups && 'DUPLICATE EXPORTS');
+        logIssueGroupResults(unreferencedDuplicates, workingDir, reportMultipleGroups && 'DUPLICATE EXPORTS', true);
     }
 };

package/dist/runner.d.ts

@@ -1,16 +1,5 @@
-import type { Configuration, Issues } from './types';
+import type { Configuration, Issues, Counters } from './types';
 export declare function findIssues(configuration: Configuration): Promise<{
     issues: Issues;
-    counters: {
-        files: number;
-        dependencies: number;
-        devDependencies: number;
-        unresolved: number;
-        exports: number;
-        types: number;
-        nsExports: number;
-        nsTypes: number;
-        duplicates: number;
-        processed: number;
-    };
+    counters: Counters;
 }>;

package/dist/runner.js

@@ -10,19 +10,19 @@ const ts_morph_helpers_1 = require("ts-morph-helpers");
 const project_1 = require("./util/project");
 const type_1 = require("./util/type");
 const dependencies_1 = require("./util/dependencies");
-const log_1 = require("./log");
 const debug_1 = require("./util/debug");
-const lineRewriter = new log_1.LineRewriter();
+const progress_1 = require("./progress");
 async function findIssues(configuration) {
-    const { workingDir, isShowProgress, report, isDev, jsDocOptions } = configuration;
+    const { workingDir, report, isDev, jsDocOptions } = 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, 'usedProductionFiles', usedProductionFiles);
-    (0, debug_1.debugLogSourceFiles)(configuration, 1, 'unreferencedProductionFiles', unreferencedProductionFiles);
-    (0, debug_1.debugLogSourceFiles)(configuration, 1, 'usedEntryFiles', usedEntryFiles);
-    (0, debug_1.debugLogSourceFiles)(configuration, 1, 'usedNonEntryFiles', usedNonEntryFiles);
+    (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);
     const issues = {
         files: new Set(unreferencedProductionFiles.map(file => file.getFilePath())),
         dependencies: new Set(),
@@ -45,42 +45,25 @@ async function findIssues(configuration) {
         nsTypes: 0,
         duplicates: 0,
         processed: issues.files.size,
+        total: projectFiles.length,
     };
-    const updateProcessingOutput = (item) => {
-        if (!isShowProgress)
-            return;
-        const counter = counters.processed;
-        const total = projectFiles.length;
-        const percentage = Math.floor((counter / total) * 100);
-        const messages = [(0, log_1.getLine)(`${percentage}%`, `of files processed (${counter} of ${total})`)];
-        report.files && messages.push((0, log_1.getLine)(unreferencedProductionFiles.length, 'unused files'));
-        report.unlisted && messages.push((0, log_1.getLine)(counters.unresolved, 'unlisted dependencies'));
-        report.exports && messages.push((0, log_1.getLine)(counters.exports, 'unused exports'));
-        report.nsExports && messages.push((0, log_1.getLine)(counters.nsExports, 'unused exports in namespace'));
-        report.types && messages.push((0, log_1.getLine)(counters.types, 'unused types'));
-        report.nsTypes && messages.push((0, log_1.getLine)(counters.nsTypes, 'unused types in namespace'));
-        report.duplicates && messages.push((0, log_1.getLine)(counters.duplicates, 'duplicate exports'));
-        if (counter < total) {
-            messages.push('');
-            messages.push(`Processing: ${node_path_1.default.relative(workingDir, item.filePath)}`);
-        }
-        lineRewriter.update(messages);
-    };
+    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);
         issues[issueType][key] = issues[issueType][key] ?? {};
         issues[issueType][key][symbol] = issue;
         counters[issueType]++;
-        updateProcessingOutput(issue);
+        updateCounters(issue);
     };
     const addProjectIssue = (issueType, issue) => {
         if (!issues[issueType].has(issue.symbol)) {
             issues[issueType].add(issue.symbol);
             counters[issueType]++;
         }
-        updateProcessingOutput(issue);
+        updateCounters(issue);
     };
+    updateMessage('Connecting the dots...');
     if (report.dependencies ||
         report.unlisted ||
         report.exports ||
@@ -103,7 +86,7 @@ async function findIssues(configuration) {
                     addSymbolIssue('duplicates', { filePath, symbol, symbols });
                 });
             }
-            if (!isIncludeEntryFiles && entryFiles.includes(sourceFile))
+            if (!isIncludeEntryFiles && usedEntryFiles.includes(sourceFile))
                 return;
             if (report.exports || report.types || report.nsExports || report.nsTypes) {
                 if (!isIncludeEntryFiles) {
@@ -128,8 +111,13 @@ async function findIssues(configuration) {
                             identifier = declaration;
                         }
                         else if (declaration.isKind(ts_morph_1.ts.SyntaxKind.ArrowFunction) ||
-                            declaration.isKind(ts_morph_1.ts.SyntaxKind.ObjectLiteralExpression)) {
-                            fakeIdentifier = 'default';
+                            declaration.isKind(ts_morph_1.ts.SyntaxKind.ObjectLiteralExpression) ||
+                            declaration.isKind(ts_morph_1.ts.SyntaxKind.ArrayLiteralExpression) ||
+                            declaration.isKind(ts_morph_1.ts.SyntaxKind.StringLiteral) ||
+                            declaration.isKind(ts_morph_1.ts.SyntaxKind.NumericLiteral)) {
+                            if (!(0, ts_morph_helpers_1.hasReferencingDefaultImport)(sourceFile)) {
+                                fakeIdentifier = 'default';
+                            }
                         }
                         else if (declaration.isKind(ts_morph_1.ts.SyntaxKind.FunctionDeclaration) ||
                             declaration.isKind(ts_morph_1.ts.SyntaxKind.ClassDeclaration) ||
@@ -192,8 +180,7 @@ async function findIssues(configuration) {
             unusedDevDependencies.forEach(symbol => addProjectIssue('devDependencies', { filePath: '', symbol }));
         }
     }
-    if (isShowProgress)
-        lineRewriter.resetLines();
+    updateCounters();
     return { issues, counters };
 }
 exports.findIssues = findIssues;

package/dist/types.d.ts

@@ -78,6 +78,7 @@ export declare type Configuration = {
         level: number;
     };
 };
+export declare type Counters = Record<IssueType | 'processed' | 'total', number>;
 export declare type ReporterOptions = {
     report: Report;
     issues: Issues;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "0.8.0",
+  "version": "0.8.2",
   "description": "Find unused files, dependencies and exports in your TypeScript and JavaScript project",
   "keywords": [
     "find",
@@ -24,7 +24,7 @@
     "knip": "dist/cli.js"
   },
   "scripts": {
-    "knip": "node ./dist/cli.js",
+    "knip": "node ./dist/cli.js --include files,dependencies,unlisted",
     "test": "node --loader tsx --test test/*.spec.ts",
     "watch": "tsc --watch",
     "build": "rm -rf dist && tsc",
@@ -45,7 +45,7 @@
     "is-builtin-module": "3.2.0",
     "micromatch": "4.0.5",
     "ts-morph": "16.0.0",
-    "ts-morph-helpers": "0.5.1"
+    "ts-morph-helpers": "0.6.0"
   },
   "devDependencies": {
     "@types/micromatch": "4.0.2",