fixes for tag checking

Author: cjroth

scripts/create-release.test.ts

@@ -175,12 +175,6 @@ describe('create-release.ts', () => {
       expect(isClean).toBe(false)
     })
 
-    it('should check if tag exists', () => {
-      const tagExists = 'abc123'
-
-      expect(tagExists.length).toBeGreaterThan(0)
-    })
-
     it('should handle non-existent tag error', () => {
       const throwError = () => {
         throw new Error('tag not found')
@@ -222,6 +216,141 @@ describe('create-release.ts', () => {
     })
   })
 
+  describe('Tag Existence Checking', () => {
+    it('should validate 40-character SHA hashes correctly', () => {
+      const shaRegex = /^[0-9a-f]{40}$/i
+
+      // Valid SHA hashes
+      expect(shaRegex.test('cf5e203d0890ca2450876def639f1c7ed3f83f1c')).toBe(true)
+      expect(shaRegex.test('ABCDEF1234567890ABCDEF1234567890ABCDEF12')).toBe(true)
+
+      // Invalid - too short
+      expect(shaRegex.test('cf5e203')).toBe(false)
+
+      // Invalid - too long
+      expect(shaRegex.test('cf5e203d0890ca2450876def639f1c7ed3f83f1c1')).toBe(false)
+
+      // Invalid - contains non-hex characters
+      expect(shaRegex.test('v1.2.3')).toBe(false)
+      expect(shaRegex.test('fatal: unknown revision')).toBe(false)
+      expect(shaRegex.test('Needed a single revision')).toBe(false)
+    })
+
+    it('should detect tag exists when git returns valid SHA', () => {
+      // This simulates successful git rev-parse --verify
+      const result = 'cf5e203d0890ca2450876def639f1c7ed3f83f1c'
+      const shaRegex = /^[0-9a-f]{40}$/i
+      const exists = result.length > 0 && shaRegex.test(result)
+
+      expect(exists).toBe(true)
+    })
+
+    it('should detect tag does NOT exist when git throws error', () => {
+      // This simulates failed git rev-parse --verify (exception thrown)
+      let exists = false
+      try {
+        throw new Error('fatal: Needed a single revision')
+      } catch {
+        exists = false
+      }
+
+      expect(exists).toBe(false)
+    })
+
+    it('should NOT be fooled by error messages containing tag name (THE BUG)', () => {
+      // This is the exact bug we had: git rev-parse fails but returns text
+      // containing the tag name, which was treated as truthy
+      const errorOutput = "fatal: ambiguous argument 'v1.2.5': unknown revision"
+      const shaRegex = /^[0-9a-f]{40}$/i
+
+      // Old buggy logic would check: if (errorOutput) { tag exists }
+      // New correct logic checks for valid SHA
+      const exists = errorOutput.length > 0 && shaRegex.test(errorOutput)
+
+      expect(exists).toBe(false) // Should be false because it's not a valid SHA
+    })
+
+    it('should handle error output that looks like it might be valid', () => {
+      const testCases = [
+        { output: 'v1.2.5', shouldExist: false },
+        { output: 'tag not found', shouldExist: false },
+        { output: '', shouldExist: false },
+        { output: '123', shouldExist: false },
+        { output: 'abcdef', shouldExist: false }, // Too short
+        { output: 'cf5e203d0890ca2450876def639f1c7ed3f83f1c', shouldExist: true }, // Valid SHA
+      ]
+
+      const shaRegex = /^[0-9a-f]{40}$/i
+
+      testCases.forEach(({ output, shouldExist }) => {
+        const exists = output.length > 0 && shaRegex.test(output)
+        expect(exists).toBe(shouldExist)
+      })
+    })
+
+    it('should detect tag on remote when ls-remote returns data', () => {
+      // Simulate git ls-remote --tags origin refs/tags/v1.2.3
+      const remoteOutput = 'cf5e203d0890ca2450876def639f1c7ed3f83f1c\trefs/tags/v1.2.3'
+      const exists = remoteOutput.length > 0
+
+      expect(exists).toBe(true)
+    })
+
+    it('should detect tag NOT on remote when ls-remote returns empty', () => {
+      // Simulate git ls-remote --tags origin refs/tags/v1.2.3 (tag doesn't exist)
+      const remoteOutput = ''
+      const exists = remoteOutput.length > 0
+
+      expect(exists).toBe(false)
+    })
+
+    it('should check tag existence before making file changes', () => {
+      // This tests the order of operations - tag check should come FIRST
+      const operations: string[] = []
+
+      // Simulate the workflow
+      const checkTag = () => {
+        operations.push('check_tag')
+        return false // Tag doesn't exist
+      }
+
+      const updateFiles = () => operations.push('update_files')
+      const commitChanges = () => operations.push('commit')
+      const createTag = () => operations.push('create_tag')
+
+      // Correct order
+      if (!checkTag()) {
+        updateFiles()
+        commitChanges()
+        createTag()
+      }
+
+      expect(operations).toEqual(['check_tag', 'update_files', 'commit', 'create_tag'])
+      expect(operations[0]).toBe('check_tag') // Tag check MUST be first
+    })
+
+    it('should exit early if tag already exists', () => {
+      // This tests that we don't modify files if tag exists
+      const operations: string[] = []
+
+      const checkTag = () => {
+        operations.push('check_tag')
+        return true // Tag EXISTS
+      }
+
+      const updateFiles = () => operations.push('update_files')
+      const commitChanges = () => operations.push('commit')
+
+      // Should exit early
+      if (!checkTag()) {
+        updateFiles()
+        commitChanges()
+      }
+
+      expect(operations).toEqual(['check_tag']) // Only tag check, nothing else!
+    })
+  })
+
   describe('Argument Parsing', () => {
     it('should parse --version argument', () => {
       process.argv = ['node', 'script.ts', '--version', '1.2.3']

scripts/create-release.ts

@@ -231,10 +231,40 @@ const isGitClean = (): boolean => {
   return status.length === 0
 }
 
+/**
+ * Check if a tag exists (locally or remotely)
+ */
+const tagExists = (tagName: string): boolean => {
+  try {
+    // Check if tag exists locally
+    const result = exec(`git rev-parse --verify ${tagName}`, true)
+    // If the command succeeds and returns a SHA, the tag exists
+    return result.length > 0 && /^[0-9a-f]{40}$/i.test(result)
+  } catch {
+    // Tag doesn't exist locally, check remote
+    try {
+      const output = exec(`git ls-remote --tags origin refs/tags/${tagName}`, true)
+      return output.length > 0
+    } catch {
+      return false
+    }
+  }
+}
+
 /**
  * Commit and tag the version
  */
 const commitAndTag = (version: string) => {
+  const tagName = `v${version}`
+
+  // Check if tag already exists BEFORE making any changes
+  if (tagExists(tagName)) {
+    console.error(`\n❌ Tag ${tagName} already exists!`)
+    console.error(`💡 Tip: Delete the local tag with: git tag -d ${tagName}`)
+    console.error('💡 Or use a different version number')
+    process.exit(1)
+  }
+
   console.log('\n📦 Committing changes...')
 
   exec('git add package.json src-tauri/Cargo.toml src-tauri/tauri.conf.json')
@@ -247,15 +277,6 @@ const commitAndTag = (version: string) => {
   exec(`git commit -m "chore: bump version to ${version}"`)
   console.log('  ✓ Changes committed')
 
-  const tagName = `v${version}`
-
-  // Check if tag already exists
-  const tagExists = exec(`git rev-parse ${tagName} 2>/dev/null || echo ''`, true)
-  if (tagExists) {
-    console.error(`\n❌ Tag ${tagName} already exists!`)
-    process.exit(1)
-  }
-
   console.log(`\n🏷️  Creating tag: ${tagName}`)
   exec(`git tag ${tagName}`)
   console.log('  ✓ Tag created')