difit 2.0.2 → 2.0.4

package/dist/cli/index.js

@@ -16,7 +16,7 @@ program
     .argument('[commit-ish]', 'Git commit, tag, branch, HEAD~n reference, or "working"/"staged"/"."', 'HEAD')
     .argument('[compare-with]', 'Optional: Compare with this commit/branch (shows diff between commit-ish and compare-with)')
     .option('--port <port>', 'preferred port (auto-assigned if occupied)', parseInt)
-    .option('--host <host>', 'host address to bind', '127.0.0.1')
+    .option('--host <host>', 'host address to bind', '')
     .option('--no-open', 'do not automatically open browser')
     .option('--mode <mode>', 'diff mode (side-by-side or inline)', 'side-by-side')
     .option('--tui', 'use terminal UI instead of web interface')

package/dist/cli/index.test.js

@@ -107,7 +107,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -149,7 +149,7 @@ describe('CLI index.ts', () => {
                 targetCommitish: expectedTarget,
                 baseCommitish: expectedBase,
                 preferredPort: undefined,
-                host: '127.0.0.1',
+                host: '',
                 openBrowser: true,
                 mode: 'side-by-side',
             });
@@ -184,7 +184,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -206,7 +206,7 @@ describe('CLI index.ts', () => {
                 targetCommitish: 'HEAD',
                 baseCommitish: 'HEAD^',
                 preferredPort: expectedOptions.port,
-                host: expectedOptions.host || '127.0.0.1',
+                host: expectedOptions.host || '',
                 openBrowser: expectedOptions.open !== false,
                 mode: expectedOptions.mode || 'side-by-side',
             };
@@ -224,7 +224,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -255,7 +255,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -291,7 +291,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -326,7 +326,7 @@ describe('CLI index.ts', () => {
                 targetCommitish: 'abc123',
                 baseCommitish: 'def456',
                 preferredPort: undefined,
-                host: '127.0.0.1',
+                host: '',
                 openBrowser: true,
                 mode: 'side-by-side',
             });
@@ -337,7 +337,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -370,7 +370,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -413,7 +413,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -447,7 +447,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -474,7 +474,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -528,7 +528,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -566,7 +566,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -604,7 +604,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')
@@ -653,7 +653,7 @@ describe('CLI index.ts', () => {
                 .argument('[commit-ish]', 'commit-ish', 'HEAD')
                 .argument('[compare-with]', 'compare-with')
                 .option('--port <port>', 'port', parseInt)
-                .option('--host <host>', 'host', '127.0.0.1')
+                .option('--host <host>', 'host', '')
                 .option('--no-open', 'no-open')
                 .option('--mode <mode>', 'mode', 'side-by-side')
                 .option('--tui', 'tui')

package/dist/cli/utils.js

@@ -21,9 +21,47 @@ export function validateCommitish(commitish) {
         /^[a-f0-9]{4,40}\^+$/i, // SHA hashes with ^ suffix (parent references)
         /^[a-f0-9]{4,40}~\d+$/i, // SHA hashes with ~N suffix (ancestor references)
         /^HEAD(~\d+|\^\d*)*$/, // HEAD, HEAD~1, HEAD^, HEAD^2, etc.
-        /^[a-zA-Z][a-zA-Z0-9_\-/.@]*$/, // branch names, tags (must start with letter, no ^ or ~ in middle)
     ];
-    return validPatterns.some((pattern) => pattern.test(trimmed));
+    // Check if it matches any specific patterns first
+    if (validPatterns.some((pattern) => pattern.test(trimmed))) {
+        return true;
+    }
+    // For branch names, use git's rules
+    return isValidBranchName(trimmed);
+}
+function isValidBranchName(name) {
+    // Git branch name rules
+    if (name.startsWith('-'))
+        return false; // Cannot start with dash
+    if (name.endsWith('.'))
+        return false; // Cannot end with dot
+    if (name === '@')
+        return false; // Cannot be just @
+    if (name.includes('..'))
+        return false; // No consecutive dots
+    if (name.includes('@{'))
+        return false; // No @{ sequence
+    if (name.includes('//'))
+        return false; // No consecutive slashes
+    if (name.startsWith('/') || name.endsWith('/'))
+        return false; // No leading/trailing slashes
+    if (name.endsWith('.lock'))
+        return false; // Cannot end with .lock
+    // Check for forbidden characters
+    const forbiddenChars = /[~^:?*[\\\x00-\x20\x7F]/;
+    if (forbiddenChars.test(name))
+        return false;
+    // Check path components
+    const components = name.split('/');
+    for (const component of components) {
+        if (component === '')
+            return false; // Empty component
+        if (component.startsWith('.'))
+            return false; // Component cannot start with dot
+        if (component.endsWith('.lock'))
+            return false; // Component cannot end with .lock
+    }
+    return true;
 }
 export function shortHash(hash) {
     return hash.substring(0, 7);

package/dist/cli/utils.test.js

@@ -28,9 +28,22 @@ describe('CLI Utils', () => {
             expect(validateCommitish('HEAD~2^1')).toBe(true);
         });
         it('should validate branch names', () => {
+            // Valid branch names according to git rules
             expect(validateCommitish('main')).toBe(true);
             expect(validateCommitish('feature/new-feature')).toBe(true);
             expect(validateCommitish('develop')).toBe(true);
+            expect(validateCommitish('feature-123')).toBe(true); // dash and numbers (not at start)
+            expect(validateCommitish('feature_branch')).toBe(true); // underscore
+            expect(validateCommitish('hotfix@bug')).toBe(true); // @ character (not followed by {)
+            expect(validateCommitish('feature+new')).toBe(true); // plus character
+            expect(validateCommitish('feature=test')).toBe(true); // equals character
+            expect(validateCommitish('feature!important')).toBe(true); // exclamation
+            expect(validateCommitish('feature,list')).toBe(true); // comma
+            expect(validateCommitish('feature;test')).toBe(true); // semicolon
+            expect(validateCommitish('feature"quoted"')).toBe(true); // quotes
+            expect(validateCommitish("feature'quoted'")).toBe(true); // single quotes
+            expect(validateCommitish('release/v2.3.1')).toBe(true); // version numbers
+            expect(validateCommitish('bugfix/login-timeout')).toBe(true); // path with dash
         });
         it('should validate special cases', () => {
             expect(validateCommitish('.')).toBe(true); // working directory diff
@@ -40,6 +53,26 @@ describe('CLI Utils', () => {
             expect(validateCommitish('   ')).toBe(false);
             expect(validateCommitish('HEAD~')).toBe(false);
             expect(validateCommitish('abc')).toBe(true); // short hashes are valid
+            // Invalid branch names according to git rules
+            expect(validateCommitish('-feature')).toBe(false); // cannot start with dash
+            expect(validateCommitish('feature.')).toBe(false); // cannot end with dot
+            expect(validateCommitish('@')).toBe(false); // cannot be just @
+            expect(validateCommitish('feature..test')).toBe(false); // no consecutive dots
+            expect(validateCommitish('feature@{upstream}')).toBe(false); // no @{ sequence
+            expect(validateCommitish('feature//test')).toBe(false); // no consecutive slashes
+            expect(validateCommitish('/feature')).toBe(false); // cannot start with slash
+            expect(validateCommitish('feature/')).toBe(false); // cannot end with slash
+            expect(validateCommitish('feature.lock')).toBe(false); // cannot end with .lock
+            expect(validateCommitish('feature^invalid')).toBe(false); // ^ not allowed
+            expect(validateCommitish('feature~invalid')).toBe(false); // ~ not allowed
+            expect(validateCommitish('feature:invalid')).toBe(false); // : not allowed
+            expect(validateCommitish('feature?invalid')).toBe(false); // ? not allowed
+            expect(validateCommitish('feature*invalid')).toBe(false); // * not allowed
+            expect(validateCommitish('feature[invalid')).toBe(false); // [ not allowed
+            expect(validateCommitish('feature\\invalid')).toBe(false); // \ not allowed
+            expect(validateCommitish('feature invalid')).toBe(false); // space not allowed
+            expect(validateCommitish('feature/.hidden')).toBe(false); // component cannot start with dot
+            expect(validateCommitish('feature/test.lock')).toBe(false); // component cannot end with .lock
         });
         it('should reject non-string input', () => {
             expect(validateCommitish(null)).toBe(false);