knip 6.5.0 → 6.6.1

package/dist/util/to-source-path.js

@@ -7,11 +7,26 @@ const defaultExtensions = `.{${[...DEFAULT_EXTENSIONS].map(ext => ext.slice(1)).
 const hasTSExt = /(?<!\.d)\.(m|c)?tsx?$/;
 const matchExt = /(\.d)?\.(m|c)?(j|t)s$/;
 const sourceExtensions = [...DEFAULT_EXTENSIONS];
-export const augmentWorkspace = (workspace, dir, compilerOptions) => {
+const tsconfigSourceMap = (dir, compilerOptions) => {
     const srcDir = join(dir, 'src');
     const outDirHasSrc = compilerOptions.outDir && isDirectory(compilerOptions.outDir, 'src');
-    workspace.srcDir = compilerOptions.rootDir ?? (outDirHasSrc ? dir : isDirectory(srcDir) ? srcDir : dir);
-    workspace.outDir = compilerOptions.outDir || workspace.srcDir;
+    const resolvedSrc = compilerOptions.rootDir ?? (outDirHasSrc ? dir : isDirectory(srcDir) ? srcDir : dir);
+    return { srcDir: resolvedSrc, outDir: compilerOptions.outDir || resolvedSrc };
+};
+export const augmentWorkspace = (workspace, dir, compilerOptions, pluginSourceMaps = []) => {
+    const all = compilerOptions ? [...pluginSourceMaps, tsconfigSourceMap(dir, compilerOptions)] : pluginSourceMaps;
+    if (all.length === 0)
+        return;
+    workspace.sourceMaps = all.sort((a, b) => b.outDir.length - a.outDir.length);
+};
+const isUnderOutDir = (absPath, outDir) => absPath === outDir || absPath.startsWith(`${outDir}/`);
+const isUnderSrcDir = (absPath, srcDir) => absPath === srcDir || absPath.startsWith(`${srcDir}/`);
+const rewritePattern = (sourceMaps, absSpecifier, extensions) => {
+    for (const { srcDir, outDir } of sourceMaps) {
+        if (!isUnderSrcDir(absSpecifier, srcDir) && isUnderOutDir(absSpecifier, outDir)) {
+            return srcDir + absSpecifier.slice(outDir.length).replace(matchExt, extensions);
+        }
+    }
 };
 export const getModuleSourcePathHandler = (chief) => {
     const toSourceMapCache = new Map();
@@ -21,16 +36,18 @@ export const getModuleSourcePathHandler = (chief) => {
         if (toSourceMapCache.has(filePath))
             return toSourceMapCache.get(filePath);
         const workspace = chief.findWorkspaceByFilePath(filePath);
-        if (workspace?.srcDir && workspace.outDir) {
-            if (filePath.startsWith(workspace.outDir) || workspace.srcDir === workspace.outDir) {
-                const basePath = filePath.replace(workspace.outDir, workspace.srcDir).replace(matchExt, '');
-                const srcFilePath = findFileWithExtensions(basePath, sourceExtensions);
-                if (srcFilePath) {
-                    toSourceMapCache.set(filePath, srcFilePath);
-                    if (srcFilePath !== filePath) {
-                        debugLog('*', `Source mapping ${toRelative(filePath, chief.cwd)} → ${toRelative(srcFilePath, chief.cwd)}`);
-                        return srcFilePath;
-                    }
+        if (!workspace?.sourceMaps)
+            return;
+        for (const { srcDir, outDir } of workspace.sourceMaps) {
+            if (!(isUnderOutDir(filePath, outDir) || srcDir === outDir))
+                continue;
+            const basePath = (srcDir + filePath.slice(outDir.length)).replace(matchExt, '');
+            const srcFilePath = findFileWithExtensions(basePath, sourceExtensions);
+            if (srcFilePath) {
+                toSourceMapCache.set(filePath, srcFilePath);
+                if (srcFilePath !== filePath) {
+                    debugLog('*', `Source mapping ${toRelative(filePath, chief.cwd)} → ${toRelative(srcFilePath, chief.cwd)}`);
+                    return srcFilePath;
                 }
             }
         }
@@ -42,16 +59,22 @@ export const getToSourcePathsHandler = (chief) => {
         for (const specifier of specifiers) {
             const absSpecifier = isAbsolute(specifier) ? specifier : prependDirToPattern(dir, specifier);
             const ws = chief.findWorkspaceByFilePath(absSpecifier);
-            if (ws?.srcDir && ws.outDir && !absSpecifier.startsWith(ws.srcDir) && absSpecifier.startsWith(ws.outDir)) {
-                const pattern = absSpecifier.replace(ws.outDir, ws.srcDir).replace(matchExt, extensions);
-                patterns.add(pattern);
-            }
-            else {
-                patterns.add(absSpecifier);
-            }
+            const mapped = ws?.sourceMaps && rewritePattern(ws.sourceMaps, absSpecifier, extensions);
+            patterns.add(mapped ?? absSpecifier);
         }
         const filePaths = await _glob({ patterns: Array.from(patterns), cwd: dir, label });
         debugLogArray(toRelative(dir, chief.cwd), 'Source mapping (package.json)', filePaths);
         return filePaths;
     };
 };
+export const toSourceMappedSpecifiers = (ws, absSpecifier, extensions = defaultExtensions) => {
+    const out = [];
+    if (!ws?.sourceMaps)
+        return out;
+    for (const { srcDir, outDir } of ws.sourceMaps) {
+        if (!isUnderSrcDir(absSpecifier, srcDir) && isUnderOutDir(absSpecifier, outDir)) {
+            out.push(srcDir + absSpecifier.slice(outDir.length).replace(matchExt, extensions));
+        }
+    }
+    return out;
+};

package/dist/util/trace.js

@@ -1,13 +1,13 @@
-import pc from 'picocolors';
+import st from './colors.js';
 export const formatTrace = (node, toRelative, isReferenced, memberStatuses) => {
     const lines = [];
-    const file = pc.white;
-    const id = pc.cyanBright;
-    const ref = pc.cyanBright;
-    const via = pc.dim;
-    const ok = pc.green;
-    const fail = pc.red;
-    const dim = pc.dim;
+    const file = st.white;
+    const id = st.cyanBright;
+    const ref = st.cyanBright;
+    const via = st.dim;
+    const ok = st.green;
+    const fail = st.red;
+    const dim = st.dim;
     const entryMarker = node.isEntry ? dim(' ⎆') : '';
     lines.push(`${file(toRelative(node.filePath))}${dim(':')}${id(node.identifier)}${entryMarker}`);
     const formatVia = (child) => {

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "6.5.0";
+export declare const version = "6.6.1";

package/dist/version.js

@@ -1 +1 @@
-export const version = '6.5.0';
+export const version = '6.6.1';

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "knip",
-  "version": "6.5.0",
+  "version": "6.6.1",
   "description": "Find and fix unused dependencies, exports and files in your TypeScript and JavaScript projects",
   "keywords": [
     "analysis",
@@ -77,14 +77,13 @@
     }
   },
   "dependencies": {
-    "@nodelib/fs.walk": "^1.2.3",
+    "fdir": "^6.5.0",
     "formatly": "^0.3.0",
     "get-tsconfig": "4.14.0",
     "jiti": "^2.6.0",
     "minimist": "^1.2.8",
     "oxc-parser": "^0.126.0",
     "oxc-resolver": "^11.19.1",
-    "picocolors": "^1.1.1",
     "picomatch": "^4.0.4",
     "smol-toml": "^1.6.1",
     "strip-json-comments": "5.0.3",

package/dist/plugins/rslib/types.d.ts

@@ -1 +0,0 @@
-export type RslibConfig = {};

package/dist/plugins/rslib/types.js

@@ -1 +0,0 @@
-export {};