dslop 1.2.0 → 1.3.1

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## v1.3.1
+
+[compare changes](https://github.com/turf-sports/dslop/compare/v1.3.0...v1.3.1)
+
+### 🏡 Chore
+
+- Remove verbose comments ([1fa02d6](https://github.com/turf-sports/dslop/commit/1fa02d6))
+
+### ❤️ Contributors
+
+- Siddharth Sharma <sharmasiddharthcs@gmail.com>
+
+## v1.3.0
+
+
+### 🚀 Enhancements
+
+- Include committed branch changes in default scan ([468c514](https://github.com/turf-sports/dslop/commit/468c514))
+
+### ❤️ Contributors
+
+- Siddharth Sharma <sharmasiddharthcs@gmail.com>
+
 ## v1.2.0
 
 [compare changes](https://github.com/turf-sports/dslop/compare/v1.1.0...v1.2.0)

package/README.md

@@ -6,7 +6,7 @@ Find duplicate code in your codebase.
 npx dslop
 ```
 
-By default, checks your uncommitted changes against the codebase.
+By default, checks your branch changes (committed + uncommitted) against the codebase.
 
 ## Install
 
@@ -17,7 +17,7 @@ npm i -g dslop
 ## Usage
 
 ```bash
-dslop                        # check uncommitted changes for dupes
+dslop                        # check your PR/branch for dupes
 dslop --all                  # scan entire codebase
 dslop ./src -m 6 -s 80       # 6 line min, 80% similarity  
 dslop --all --cross-package  # cross-package dupes (monorepos)

package/dist/index.js

@@ -6561,22 +6561,32 @@ async function scanDirectory(targetPath, options) {
 }
 
 // index.ts
-var VERSION = process.env.npm_package_version || "1.2.0";
+var VERSION = process.env.npm_package_version || "1.3.1";
 function getChangedFiles(targetPath) {
   const absolutePath = path4.resolve(targetPath);
-  try {
-    const staged = execSync("git diff --cached --name-only", { cwd: absolutePath, encoding: "utf-8" });
-    const unstaged = execSync("git diff --name-only", { cwd: absolutePath, encoding: "utf-8" });
-    const untracked = execSync("git ls-files --others --exclude-standard", { cwd: absolutePath, encoding: "utf-8" });
-    const files = new Set;
-    for (const file of [...staged.split(`
-`), ...unstaged.split(`
-`), ...untracked.split(`
-`)]) {
+  const files = new Set;
+  const addFiles = (output) => {
+    for (const file of output.split(`
+`)) {
       if (file.trim()) {
         files.add(path4.resolve(absolutePath, file.trim()));
       }
     }
+  };
+  try {
+    addFiles(execSync("git diff --cached --name-only", { cwd: absolutePath, encoding: "utf-8" }));
+    addFiles(execSync("git diff --name-only", { cwd: absolutePath, encoding: "utf-8" }));
+    addFiles(execSync("git ls-files --others --exclude-standard", { cwd: absolutePath, encoding: "utf-8" }));
+    try {
+      const baseBranch = execSync("git rev-parse --abbrev-ref origin/HEAD 2>/dev/null || echo origin/main", { cwd: absolutePath, encoding: "utf-8" }).trim().replace("origin/", "");
+      const currentBranch = execSync("git rev-parse --abbrev-ref HEAD", { cwd: absolutePath, encoding: "utf-8" }).trim();
+      if (currentBranch !== baseBranch) {
+        const mergeBase = execSync(`git merge-base ${baseBranch} HEAD 2>/dev/null || echo ""`, { cwd: absolutePath, encoding: "utf-8" }).trim();
+        if (mergeBase) {
+          addFiles(execSync(`git diff --name-only ${mergeBase}...HEAD`, { cwd: absolutePath, encoding: "utf-8" }));
+        }
+      }
+    } catch {}
     return files;
   } catch {
     return new Set;
@@ -6589,7 +6599,7 @@ dslop - Detect Similar/Duplicate Lines Of Programming
 Usage:
   dslop [path] [options]
 
-By default, checks uncommitted changes against the codebase.
+By default, checks your branch changes (committed + uncommitted) against the codebase.
 
 Arguments:
   path                  Directory to scan (default: current directory)
@@ -6607,7 +6617,7 @@ Options:
   -v, --version         Show version
 
 Examples:
-  dslop                            Check uncommitted changes for duplicates
+  dslop                            Check your PR/branch changes for duplicates
   dslop --all                      Scan entire codebase
   dslop ./src -m 6 -s 80           Scan src with 6 line min, 80% similarity
   dslop --all --cross-package      Cross-package duplicates in entire codebase
@@ -6668,13 +6678,13 @@ async function main() {
   const changedFiles = !scanAll ? getChangedFiles(targetPath) : null;
   if (!scanAll && changedFiles?.size === 0) {
     console.log(`
-No uncommitted changes found. Use --all to scan entire codebase.`);
+No changes found. Use --all to scan entire codebase.`);
     process.exit(0);
   }
   console.log(`
 Scanning ${targetPath}...`);
   if (!scanAll) {
-    console.log(`  Mode: checking ${changedFiles.size} uncommitted files`);
+    console.log(`  Mode: checking ${changedFiles.size} changed files`);
   } else {
     console.log(`  Mode: full codebase scan`);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "dslop",
-  "version": "1.2.0",
+  "version": "1.3.1",
   "description": "Detect Similar/Duplicate Lines Of Programming - Find code duplication in your codebase",
   "type": "module",
   "main": "./dist/index.js",