dslop 1.1.0 → 1.3.0

package/CHANGELOG.md

@@ -1,5 +1,28 @@
 # Changelog
 
+## 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)
+
+### 🚀 Enhancements
+
+- Default to checking uncommitted changes, add --all flag ([0492bba](https://github.com/turf-sports/dslop/commit/0492bba))
+
+### ❤️ Contributors
+
+- Siddharth Sharma <sharmasiddharthcs@gmail.com>
+
 ## v1.1.0
 
 [compare changes](https://github.com/turf-sports/dslop/compare/v1.0.7...v1.1.0)

package/README.md

@@ -3,9 +3,11 @@
 Find duplicate code in your codebase.
 
 ```bash
-npx dslop .
+npx dslop
 ```
 
+By default, checks your branch changes (committed + uncommitted) against the codebase.
+
 ## Install
 
 ```bash
@@ -15,23 +17,22 @@ npm i -g dslop
 ## Usage
 
 ```bash
-dslop .                      # scan current directory
-dslop --staged               # 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 . --cross-package      # only cross-package dupes (monorepos)
-dslop . --json               # json output
+dslop --all --cross-package  # cross-package dupes (monorepos)
 ```
 
 ## Options
 
-| Flag | Default | Description |
-|------|---------|-------------|
-| `-m, --min-lines` | 4 | min lines per block |
-| `-s, --similarity` | 70 | similarity threshold (0-100) |
-| `-e, --extensions` | ts,tsx,js,jsx | file extensions |
-| `--staged` | | only show dupes involving uncommitted changes |
-| `--cross-package` | | only show dupes across packages |
-| `--json` | | json output |
+| Flag | Description |
+|------|-------------|
+| `-a, --all` | scan entire codebase (default: uncommitted only) |
+| `-m, --min-lines` | min lines per block (default: 4) |
+| `-s, --similarity` | similarity threshold 0-100 (default: 70) |
+| `-e, --extensions` | file extensions (default: ts,tsx,js,jsx) |
+| `--cross-package` | only show dupes across packages |
+| `--json` | json output |
 
 ## License
 

package/dist/index.js

@@ -6561,22 +6561,32 @@ async function scanDirectory(targetPath, options) {
 }
 
 // index.ts
-var VERSION = process.env.npm_package_version || "1.1.0";
+var VERSION = process.env.npm_package_version || "1.3.0";
 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,15 +6599,17 @@ dslop - Detect Similar/Duplicate Lines Of Programming
 Usage:
   dslop [path] [options]
 
+By default, checks your branch changes (committed + uncommitted) against the codebase.
+
 Arguments:
   path                  Directory to scan (default: current directory)
 
 Options:
+  -a, --all             Scan entire codebase (not just uncommitted changes)
   -m, --min-lines <n>   Minimum block size in lines (default: ${DEFAULT_MIN_LINES})
   -s, --similarity <n>  Minimum similarity threshold 0-100 (default: ${Math.round(DEFAULT_SIMILARITY * 100)})
   -e, --extensions <s>  File extensions to scan (default: ${DEFAULT_EXTENSIONS.join(",")})
   -i, --ignore <s>      Patterns to ignore (default: ${DEFAULT_IGNORE_PATTERNS.slice(0, 4).join(",")},...)
-  --staged              Only show duplicates involving uncommitted changes
   --no-normalize        Disable string/number normalization
   --cross-package       Only show duplicates across different packages/apps (monorepo mode)
   --json                Output as JSON
@@ -6605,10 +6617,10 @@ Options:
   -v, --version         Show version
 
 Examples:
-  dslop .                          Scan current directory
-  dslop --staged                   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 . --cross-package          Only duplicates across packages (great for monorepos)
+  dslop --all --cross-package      Cross-package duplicates in entire codebase
 `);
 }
 function showVersion() {
@@ -6624,7 +6636,7 @@ async function main() {
       ignore: { type: "string", short: "i", default: DEFAULT_IGNORE_PATTERNS.join(",") },
       normalize: { type: "boolean", default: true },
       "no-normalize": { type: "boolean", default: false },
-      staged: { type: "boolean", default: false },
+      all: { type: "boolean", short: "a", default: false },
       "cross-package": { type: "boolean", default: false },
       json: { type: "boolean", default: false },
       help: { type: "boolean", short: "h", default: false },
@@ -6646,7 +6658,7 @@ async function main() {
   const extensions = values.extensions.split(",").map((e) => e.trim());
   const ignorePatterns = values.ignore.split(",").map((p) => p.trim());
   const normalize2 = !values["no-normalize"];
-  const staged = values.staged;
+  const scanAll = values.all;
   const crossPackage = values["cross-package"];
   const jsonOutput = values.json;
   if (minLines < 2) {
@@ -6663,23 +6675,24 @@ async function main() {
     minLines,
     normalize: normalize2
   };
-  const changedFiles = staged ? getChangedFiles(targetPath) : null;
-  if (staged && changedFiles?.size === 0) {
+  const changedFiles = !scanAll ? getChangedFiles(targetPath) : null;
+  if (!scanAll && changedFiles?.size === 0) {
     console.log(`
-No uncommitted changes found.`);
+No changes found. Use --all to scan entire codebase.`);
     process.exit(0);
   }
   console.log(`
 Scanning ${targetPath}...`);
+  if (!scanAll) {
+    console.log(`  Mode: checking ${changedFiles.size} changed files`);
+  } else {
+    console.log(`  Mode: full codebase scan`);
+  }
   console.log(`  Extensions: ${extensions.join(", ")}`);
   console.log(`  Min block size: ${minLines} lines`);
   console.log(`  Similarity threshold: ${Math.round(similarity * 100)}%`);
-  console.log(`  Normalization: ${normalize2 ? "enabled" : "disabled"}`);
-  if (staged) {
-    console.log(`  Staged mode: checking ${changedFiles.size} changed files against codebase`);
-  }
   if (crossPackage) {
-    console.log(`  Cross-package mode: enabled`);
+    console.log(`  Cross-package: enabled`);
   }
   console.log();
   try {
@@ -6696,7 +6709,7 @@ Scanning ${targetPath}...`);
     const detectStart = performance.now();
     let duplicates = findDuplicates(blocks, similarity, targetPath);
     const detectTime = performance.now() - detectStart;
-    if (staged && changedFiles) {
+    if (!scanAll && changedFiles) {
       duplicates = duplicates.filter((group) => group.matches.some((m) => changedFiles.has(m.filePath)));
     }
     if (crossPackage) {
@@ -6711,7 +6724,7 @@ Scanning ${targetPath}...`);
     console.log(`Found ${duplicates.length} duplicate groups in ${Math.round(detectTime)}ms
 `);
     if (duplicates.length === 0) {
-      if (staged) {
+      if (!scanAll) {
         console.log("No duplicates in your changes. You're good!");
       } else if (crossPackage) {
         console.log("No cross-package duplicates found!");

package/package.json

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