pi-lens 2.0.36 → 2.0.38

package/clients/architect-client.js

@@ -15,36 +15,60 @@ import { minimatch } from "minimatch";
 export class ArchitectClient {
     constructor(verbose = false) {
         this.config = null;
-        this.configPath = null;
+        this.isUserConfig = false;
         this.log = verbose
             ? (msg) => console.error(`[architect] ${msg}`)
             : () => { };
     }
     /**
-     * Load architect config from project root
+     * Load architect config from project root.
+     * Falls back to built-in default if no user config exists.
      */
     loadConfig(projectRoot) {
-        // Try common locations
-        const candidates = [
+        // Try user config locations first
+        const userCandidates = [
             path.join(projectRoot, ".pi-lens", "architect.yaml"),
             path.join(projectRoot, "architect.yaml"),
             path.join(projectRoot, ".pi-lens", "architect.yml"),
         ];
-        for (const configPath of candidates) {
+        for (const configPath of userCandidates) {
             try {
                 const content = fs.readFileSync(configPath, "utf-8");
                 this.config = this.parseYaml(content);
                 this.configPath = configPath;
-                this.log(`Loaded architect config from ${configPath}`);
+                this.isUserConfig = true;
+                this.log(`Loaded user architect config from ${configPath}`);
                 return true;
             }
             catch (error) {
                 this.log(`Could not read ${configPath}: ${error}`);
-                continue;
             }
         }
-        this.log("No architect.yaml found");
-        return false;
+        // Fall back to built-in default
+        try {
+            // Handle both CommonJS and ESM environments
+            let currentDir = ".";
+            if (typeof __dirname !== "undefined") {
+                currentDir = __dirname;
+            }
+            const defaultPath = path.join(currentDir, "..", "default-architect.yaml");
+            const content = fs.readFileSync(defaultPath, "utf-8");
+            this.config = this.parseYaml(content);
+            this.configPath = defaultPath;
+            this.isUserConfig = false;
+            this.log("Using default architect rules (create .pi-lens/architect.yaml to customize)");
+            return true;
+        }
+        catch {
+            this.log("No architect config available");
+            return false;
+        }
+    }
+    /**
+     * Check if the loaded config is user-defined (not default)
+     */
+    isUserDefined() {
+        return this.isUserConfig;
     }
     /**
      * Check if config is loaded
@@ -77,12 +101,22 @@ export class ArchitectClient {
             if (!rule.must_not)
                 continue;
             for (const check of rule.must_not) {
-                const regex = new RegExp(check.pattern, "i");
-                if (regex.test(content)) {
+                // We use 'g' to find all occurrences and correctly report line numbers
+                const regex = new RegExp(check.pattern, "gi");
+                let match;
+                // biome-ignore lint/suspicious/noAssignInExpressions: RegExp.exec iteration
+                while ((match = regex.exec(content)) !== null) {
+                    // Convert index to line number
+                    const lineNum = content.slice(0, match.index).split("\n").length;
                     violations.push({
                         pattern: rule.pattern,
                         message: check.message,
+                        line: lineNum,
                     });
+                    // Prevent infinite loop on empty matches
+                    if (match.index === regex.lastIndex) {
+                        regex.lastIndex++;
+                    }
                 }
             }
         }
@@ -132,7 +166,7 @@ export class ArchitectClient {
     parseYaml(content) {
         const config = { rules: [] };
         // Split into top-level rule blocks (4-space indent "- pattern:")
-        const ruleBlocks = content.split(/(?=^  - pattern:)/m);
+        const ruleBlocks = content.split(/(?=^ {2}- pattern:)/m);
         for (const block of ruleBlocks) {
             const lines = block.split("\n");
             let rule = null;
@@ -154,7 +188,9 @@ export class ArchitectClient {
                     continue;
                 }
                 // Nested pattern inside must_not (may start with "- ")
-                if ((trimmed.startsWith("pattern:") || trimmed.startsWith("- pattern:")) && section === "must_not") {
+                if ((trimmed.startsWith("pattern:") ||
+                    trimmed.startsWith("- pattern:")) &&
+                    section === "must_not") {
                     // Extract everything after "pattern:" and unquote
                     const raw = trimmed.replace(/^-?\s*pattern:\s*/, "").trim();
                     const unquoted = raw.replace(/^["']|["']$/g, "");
@@ -207,10 +243,4 @@ export class ArchitectClient {
     }
 }
 // --- Singleton ---
-let instance = null;
-export function getArchitectClient(verbose = false) {
-    if (!instance) {
-        instance = new ArchitectClient(verbose);
-    }
-    return instance;
-}
+const _instance = null;

package/clients/architect-client.ts

@@ -18,6 +18,7 @@ import { minimatch } from "minimatch";
 export interface ArchitectViolation {
 	pattern: string;
 	message: string;
+	line?: number;
 }
 
 export interface ArchitectRule {
@@ -43,7 +44,7 @@ export interface FileArchitectResult {
 
 export class ArchitectClient {
 	private config: ArchitectConfig | null = null;
-	private configPath: string | null = null;
+	private isUserConfig: boolean = false;
 	private log: (msg: string) => void;
 
 	constructor(verbose = false) {
@@ -53,31 +54,57 @@ export class ArchitectClient {
 	}
 
 	/**
-	 * Load architect config from project root
+	 * Load architect config from project root.
+	 * Falls back to built-in default if no user config exists.
 	 */
 	loadConfig(projectRoot: string): boolean {
-		// Try common locations
-		const candidates = [
+		// Try user config locations first
+		const userCandidates = [
 			path.join(projectRoot, ".pi-lens", "architect.yaml"),
 			path.join(projectRoot, "architect.yaml"),
 			path.join(projectRoot, ".pi-lens", "architect.yml"),
 		];
 
-		for (const configPath of candidates) {
+		for (const configPath of userCandidates) {
 			try {
 				const content = fs.readFileSync(configPath, "utf-8");
 				this.config = this.parseYaml(content);
 				this.configPath = configPath;
-				this.log(`Loaded architect config from ${configPath}`);
+				this.isUserConfig = true;
+				this.log(`Loaded user architect config from ${configPath}`);
 				return true;
 			} catch (error) {
 				this.log(`Could not read ${configPath}: ${error}`);
-				continue;
 			}
 		}
 
-		this.log("No architect.yaml found");
-		return false;
+		// Fall back to built-in default
+		try {
+			// Handle both CommonJS and ESM environments
+			let currentDir = ".";
+			if (typeof __dirname !== "undefined") {
+				currentDir = __dirname;
+			}
+			const defaultPath = path.join(currentDir, "..", "default-architect.yaml");
+			const content = fs.readFileSync(defaultPath, "utf-8");
+			this.config = this.parseYaml(content);
+			this.configPath = defaultPath;
+			this.isUserConfig = false;
+			this.log(
+				"Using default architect rules (create .pi-lens/architect.yaml to customize)",
+			);
+			return true;
+		} catch {
+			this.log("No architect config available");
+			return false;
+		}
+	}
+
+	/**
+	 * Check if the loaded config is user-defined (not default)
+	 */
+	isUserDefined(): boolean {
+		return this.isUserConfig;
 	}
 
 	/**
@@ -114,12 +141,24 @@ export class ArchitectClient {
 			if (!rule.must_not) continue;
 
 			for (const check of rule.must_not) {
-				const regex = new RegExp(check.pattern, "i");
-				if (regex.test(content)) {
+				// We use 'g' to find all occurrences and correctly report line numbers
+				const regex = new RegExp(check.pattern, "gi");
+				let match: RegExpExecArray | null;
+
+				// biome-ignore lint/suspicious/noAssignInExpressions: RegExp.exec iteration
+				while ((match = regex.exec(content)) !== null) {
+					// Convert index to line number
+					const lineNum = content.slice(0, match.index).split("\n").length;
 					violations.push({
 						pattern: rule.pattern,
 						message: check.message,
+						line: lineNum,
 					});
+
+					// Prevent infinite loop on empty matches
+					if (match.index === regex.lastIndex) {
+						regex.lastIndex++;
+					}
 				}
 			}
 		}
@@ -131,7 +170,10 @@ export class ArchitectClient {
 	 * Check file size against max_lines rule
 	 * Returns violation if file exceeds the limit
 	 */
-	checkFileSize(filePath: string, lineCount: number): ArchitectViolation | null {
+	checkFileSize(
+		filePath: string,
+		lineCount: number,
+	): ArchitectViolation | null {
 		const rules = this.getRulesForFile(filePath);
 
 		for (const rule of rules) {
@@ -177,7 +219,7 @@ export class ArchitectClient {
 		const config: ArchitectConfig = { rules: [] };
 
 		// Split into top-level rule blocks (4-space indent "- pattern:")
-		const ruleBlocks = content.split(/(?=^  - pattern:)/m);
+		const ruleBlocks = content.split(/(?=^ {2}- pattern:)/m);
 
 		for (const block of ruleBlocks) {
 			const lines = block.split("\n");
@@ -202,7 +244,11 @@ export class ArchitectClient {
 					continue;
 				}
 				// Nested pattern inside must_not (may start with "- ")
-				if ((trimmed.startsWith("pattern:") || trimmed.startsWith("- pattern:")) && section === "must_not") {
+				if (
+					(trimmed.startsWith("pattern:") ||
+						trimmed.startsWith("- pattern:")) &&
+					section === "must_not"
+				) {
 					// Extract everything after "pattern:" and unquote
 					const raw = trimmed.replace(/^-?\s*pattern:\s*/, "").trim();
 					const unquoted = raw.replace(/^["']|["']$/g, "");
@@ -263,11 +309,4 @@ export class ArchitectClient {
 
 // --- Singleton ---
 
-let instance: ArchitectClient | null = null;
-
-export function getArchitectClient(verbose = false): ArchitectClient {
-	if (!instance) {
-		instance = new ArchitectClient(verbose);
-	}
-	return instance;
-}
+const _instance: ArchitectClient | null = null;

package/clients/ast-grep-client.js

@@ -7,22 +7,28 @@
  * Requires: npm install -D @ast-grep/cli
  * Rules: ./rules/ directory
  */
-import { spawn, spawnSync } from "node:child_process";
+import { spawnSync } from "node:child_process";
 import * as fs from "node:fs";
 import * as path from "node:path";
 import { AstGrepParser } from "./ast-grep-parser.js";
 import { AstGrepRuleManager } from "./ast-grep-rule-manager.js";
+import { SgRunner } from "./sg-runner.js";
+const getExtensionDir = () => {
+    if (typeof __dirname !== "undefined") {
+        return __dirname;
+    }
+    return ".";
+};
 // --- Client ---
 export class AstGrepClient {
     constructor(ruleDir, verbose = false) {
         this.available = null;
-        this.ruleDir =
-            ruleDir ||
-                path.join(typeof __dirname !== "undefined" ? __dirname : ".", "..", "rules");
+        this.ruleDir = ruleDir || path.join(process.cwd(), "rules");
         this.log = verbose
             ? (msg) => console.error(`[ast-grep] ${msg}`)
             : () => { };
         this.ruleManager = new AstGrepRuleManager(this.ruleDir, this.log);
+        this.runner = new SgRunner(verbose);
     }
     /**
      * Check if ast-grep CLI is available
@@ -30,12 +36,7 @@ export class AstGrepClient {
     isAvailable() {
         if (this.available !== null)
             return this.available;
-        const result = spawnSync("npx", ["sg", "--version"], {
-            encoding: "utf-8",
-            timeout: 10000,
-            shell: true,
-        });
-        this.available = !result.error && result.status === 0;
+        this.available = this.runner.isAvailable();
         if (this.available) {
             this.log("ast-grep available");
         }
@@ -45,7 +46,7 @@ export class AstGrepClient {
      * Search for AST patterns in files
      */
     async search(pattern, lang, paths) {
-        return this.runSg([
+        return this.runner.exec([
             "run",
             "-p",
             pattern,
@@ -72,7 +73,7 @@ export class AstGrepClient {
         if (apply)
             args.push("--update-all");
         args.push(...paths);
-        const result = await this.runSg(args);
+        const result = await this.runner.exec(args);
         return { matches: result.matches, applied: apply, error: result.error };
     }
     /**
@@ -81,39 +82,7 @@ export class AstGrepClient {
     runTempScan(dir, ruleId, ruleYaml, timeout = 30000) {
         if (!this.isAvailable())
             return [];
-        const tmpDir = require("node:os").tmpdir();
-        const ts = Date.now();
-        const sessionDir = path.join(tmpDir, `pi-lens-temp-${ruleId}-${ts}`);
-        const rulesSubdir = path.join(sessionDir, "rules");
-        const ruleFile = path.join(rulesSubdir, `${ruleId}.yml`);
-        const configFile = path.join(sessionDir, ".sgconfig.yml");
-        try {
-            fs.mkdirSync(rulesSubdir, { recursive: true });
-            fs.writeFileSync(configFile, `ruleDirs:\n  - ./rules\n`);
-            fs.writeFileSync(ruleFile, ruleYaml);
-            const result = spawnSync("npx", ["sg", "scan", "--config", configFile, "--json", dir], {
-                encoding: "utf-8",
-                timeout,
-                shell: true,
-            });
-            const output = result.stdout || result.stderr || "";
-            if (!output.trim())
-                return [];
-            const items = JSON.parse(output);
-            return Array.isArray(items) ? items : [items];
-        }
-        catch (err) {
-            void err;
-            return [];
-        }
-        finally {
-            try {
-                fs.rmSync(sessionDir, { recursive: true, force: true });
-            }
-            catch (err) {
-                void err;
-            }
-        }
+        return this.runner.tempScan(dir, ruleId, ruleYaml, timeout);
     }
     /**
      * Find similar functions by comparing normalized AST structure
@@ -199,68 +168,8 @@ message: found
         }
         return exports;
     }
-    runSg(args) {
-        return new Promise((resolve) => {
-            const proc = spawn("npx", ["sg", ...args], {
-                stdio: ["ignore", "pipe", "pipe"],
-                shell: true,
-            });
-            let stdout = "";
-            let stderr = "";
-            proc.stdout.on("data", (data) => (stdout += data.toString()));
-            proc.stderr.on("data", (data) => (stderr += data.toString()));
-            proc.on("error", (err) => {
-                if (err.message.includes("ENOENT")) {
-                    resolve({
-                        matches: [],
-                        error: "ast-grep CLI not found. Install: npm i -D @ast-grep/cli",
-                    });
-                }
-                else {
-                    resolve({ matches: [], error: err.message });
-                }
-            });
-            proc.on("close", (code) => {
-                if (code !== 0 && !stdout.trim()) {
-                    resolve({
-                        matches: [],
-                        error: stderr.includes("No files found")
-                            ? undefined
-                            : stderr.trim() || `Exit code ${code}`,
-                    });
-                    return;
-                }
-                if (!stdout.trim()) {
-                    resolve({ matches: [] });
-                    return;
-                }
-                try {
-                    const parsed = JSON.parse(stdout);
-                    const matches = Array.isArray(parsed) ? parsed : [parsed];
-                    resolve({ matches });
-                }
-                catch (err) {
-                    void err;
-                    resolve({ matches: [], error: "Failed to parse output" });
-                }
-            });
-        });
-    }
     formatMatches(matches, isDryRun = false) {
-        if (matches.length === 0)
-            return "No matches found";
-        const MAX = 50;
-        const shown = matches.slice(0, MAX);
-        const lines = shown.map((m) => {
-            const loc = `${m.file}:${m.range.start.line + 1}:${m.range.start.column + 1}`;
-            const text = m.text.length > 100 ? `${m.text.slice(0, 100)}...` : m.text;
-            return isDryRun && m.replacement
-                ? `${loc}\n  - ${text}\n  + ${m.replacement}`
-                : `${loc}: ${text}`;
-        });
-        if (matches.length > MAX)
-            lines.unshift(`Found ${matches.length} matches (showing first ${MAX}):`);
-        return lines.join("\n");
+        return this.runner.formatMatches(matches, isDryRun);
     }
     /**
      * Scan a file against all rules

package/clients/ast-grep-client.test.js

@@ -25,18 +25,6 @@ describe("AstGrepClient", () => {
             const result = client.scanFile("/nonexistent/file.ts");
             expect(result).toEqual([]);
         });
-        it("should detect var usage (no-var rule)", () => {
-            if (!client.isAvailable())
-                return;
-            const content = `
-var x = 1;
-var y = 2;
-`;
-            const filePath = createTempFile(tmpDir, "test.ts", content);
-            const result = client.scanFile(filePath);
-            // Should detect var usage
-            expect(result.some((d) => d.rule === "no-var")).toBe(true);
-        });
         it("should detect console.log usage", () => {
             if (!client.isAvailable())
                 return;
@@ -45,8 +33,8 @@ console.log("test");
 `;
             const filePath = createTempFile(tmpDir, "test.ts", content);
             const result = client.scanFile(filePath);
-            // May detect console.log depending on rules
-            expect(Array.isArray(result)).toBe(true);
+            // Should detect console.log
+            expect(result.some((d) => d.rule === "no-console-log")).toBe(true);
         });
     });
     describe("formatDiagnostics", () => {

package/clients/ast-grep-client.test.ts

@@ -30,20 +30,6 @@ describe("AstGrepClient", () => {
 			expect(result).toEqual([]);
 		});
 
-		it("should detect var usage (no-var rule)", () => {
-			if (!client.isAvailable()) return;
-
-			const content = `
-var x = 1;
-var y = 2;
-`;
-			const filePath = createTempFile(tmpDir, "test.ts", content);
-			const result = client.scanFile(filePath);
-
-			// Should detect var usage
-			expect(result.some((d) => d.rule === "no-var")).toBe(true);
-		});
-
 		it("should detect console.log usage", () => {
 			if (!client.isAvailable()) return;
 
@@ -53,8 +39,8 @@ console.log("test");
 			const filePath = createTempFile(tmpDir, "test.ts", content);
 			const result = client.scanFile(filePath);
 
-			// May detect console.log depending on rules
-			expect(Array.isArray(result)).toBe(true);
+			// Should detect console.log
+			expect(result.some((d) => d.rule === "no-console-log")).toBe(true);
 		});
 	});