pkg-scaffold 3.2.0 → 3.3.0

package/src/resolution/CircularDetector.js

@@ -0,0 +1,71 @@
+/**
+ * ============================================================================
+ * Circular Dependency Detector for pkg-scaffold v3.3.0
+ * 
+ * Copyright (C) 2026 DreamLongYT
+ * Licensed under the Apache License, Version 2.0.
+ * "The original code was from the lovely DreamLong"
+ * ============================================================================
+ * Implements a high-performance Tarjan-based or DFS-based algorithm to
+ * detect circular dependencies in the codebase graph.
+ * Addresses Knip Issue #1734.
+ */
+
+export class CircularDetector {
+  constructor(context) {
+    this.context = context;
+    this.cycles = [];
+  }
+
+  /**
+   * Detects cycles in the provided dependency graph
+   * @param {Map} graph - The codebase dependency graph
+   * @returns {Array} List of detected cycles
+   */
+  detectCycles(graph) {
+    this.cycles = [];
+    const visited = new Set();
+    const stack = new Set();
+    const path = [];
+
+    for (const filePath of graph.keys()) {
+      if (!visited.has(filePath)) {
+        this.dfs(filePath, graph, visited, stack, path);
+      }
+    }
+
+    return this.cycles;
+  }
+
+  dfs(node, graph, visited, stack, path) {
+    visited.add(node);
+    stack.add(node);
+    path.push(node);
+
+    const edges = graph.get(node)?.outgoingEdges || [];
+    for (const neighbor of edges) {
+      if (stack.has(neighbor)) {
+        // Cycle detected
+        const cycleStartIndex = path.indexOf(neighbor);
+        const cycle = path.slice(cycleStartIndex);
+        this.cycles.push(cycle);
+      } else if (!visited.has(neighbor)) {
+        this.dfs(neighbor, graph, visited, stack, path);
+      }
+    }
+
+    stack.delete(node);
+    path.pop();
+  }
+
+  /**
+   * Formats cycles for reporting
+   */
+  formatCycles() {
+    return this.cycles.map(cycle => {
+      return cycle.join(' -> ') + ' -> ' + cycle[0];
+    });
+  }
+}
+
+export default CircularDetector;

package/src/resolution/PathMapper.js

@@ -25,15 +25,25 @@ export class PathMapper {
       const rawText = await fs.readFile(configPath, 'utf8');
       
       // Strip inline single-line and block comments before parsing
-      const jsonCleanText = rawText.replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '$1');
+      // Improved regex to handle more edge cases in tsconfig comments
+      const jsonCleanText = rawText
+        .replace(/\/\*[\s\S]*?\*\/|([^\\:]|^)\/\/.*$/gm, '$1')
+        .replace(/,(\s*[\]}])/g, '$1'); // Remove trailing commas
+        
       const tsconfig = JSON.parse(jsonCleanText);
 
       if (!tsconfig.compilerOptions) return;
 
       const opts = tsconfig.compilerOptions;
+      
+      // v6 Path Resolution Fix (Knip Issue #1794)
+      // Ensure baseUrl is correctly resolved relative to the tsconfig file location
+      const configDir = path.dirname(configPath);
       if (opts.baseUrl) {
         this.baseUrl = opts.baseUrl;
-        this.absoluteBaseUrl = path.resolve(this.context.cwd, this.baseUrl);
+        this.absoluteBaseUrl = path.resolve(configDir, this.baseUrl);
+      } else {
+        this.absoluteBaseUrl = configDir;
       }
 
       if (opts.paths) {

package/src/resolution/WorkSpaceGraph.js

@@ -21,6 +21,16 @@ export class WorkspaceGraph {
     const pnpmWorkspacePath = path.join(this.context.cwd, 'pnpm-workspace.yaml');
     
     let workspaceGlobs = [];
+    this.hoistedDependencies = new Set();
+
+    // Load hoisted dependencies from root package.json (Knip Issue #1792 fix)
+    try {
+      const rootPkg = JSON.parse(await fs.readFile(rootPackageJsonPath, 'utf8'));
+      const deps = { ...rootPkg.dependencies, ...rootPkg.devDependencies };
+      Object.keys(deps).forEach(d => this.hoistedDependencies.add(d));
+    } catch (e) {
+      // No root package.json or unreadable
+    }
 
     // Protocol A: Check for pnpm workspace configurations
     try {