Conditional row removal

README.md

@@ -14,7 +14,7 @@ It provides a user-friendly editor for creating complex email filtering rules wi
 - 📚 Palette of commands, including core Sieve and provider-specific extensions
 - 🖱️ Drag & drop support for reordering and nesting commands
 - 🔄 Rendering of the visual script into valid Sieve source code
-- 🛠️ Extensible architecture – easily add new commands (see [How To Add New Command](Source/Sieve%20Commands/HowToAddNewCommand.md))  
+- 🛠️ Extensible architecture – easily add new commands (see [How To Add New Command](Source/Yasba/Sieve%20Commands/HowToAddNewCommand.md))  
 
 ## Architecture Overview
 
@@ -40,7 +40,7 @@ Yasba is designed with extensibility in mind. The main architectural components
 
 Contributions are welcome!  
 
-Check out [How To Add New Command](HowToAddNewCommand.md) to learn how to extend Yasba with new Sieve commands.
+Check out [How To Add New Command](Source/Yasba/Sieve%20Commands/HowToAddNewCommand.md) to learn how to extend Yasba with new Sieve commands.
 
 ## License
 

Source/Tests/Sieve Commands/AddFlag/AddFlagCommandTests.swift

@@ -0,0 +1,10 @@
+import Testing
+@testable import Yasba
+
+struct AddFlagCommandTests {
+    @Test func requirements() throws {
+        let command = AddFlagCommand(tag: "tag")
+
+        #expect(command.requirements == ["imap4flags"])
+    }
+}

Source/Tests/Sieve Commands/FileInto/FileIntoCommandTests.swift

@@ -0,0 +1,10 @@
+import Testing
+@testable import Yasba
+
+struct FileIntoCommandTests {
+    @Test func requirements() throws {
+        let command = FileIntoCommand(mailbox: "inbox")
+
+        #expect(command.requirements == ["fileinto"])
+    }
+}

Source/Tests/Sieve Commands/IfCommand/IfCommandTests.swift

@@ -0,0 +1,16 @@
+import Testing
+@testable import Yasba
+
+struct IfCommandTests {
+    @Test func childernRequirementsArePassed() throws {
+        let command = IfCommand(
+            quantifier: .any,
+            tests: [ ],
+            thenChildren: [ DummyLeaf("do1") ],
+            elseChildren: [ DummyLeaf("do2") ]
+        )
+
+        #expect(command.requirements == [DummyLeaf.requirement, DummyLeaf.requirement])
+    }
+}
+

Source/Tests/Sieve Commands/Proton/Expire/ProtonExpireCommandTests.swift

@@ -0,0 +1,10 @@
+import Testing
+@testable import Yasba
+
+struct ProtonExpireCommandTests {
+    @Test func requirements() throws {
+        let command = ProtonExpireCommand(days: 1)
+
+        #expect(command.requirements == ["vnd.proton.expire"])
+    }
+}

Source/Tests/Sieve Commands/Proton/MarkAsRead/ProtonMarkAsReadCommandTests.swift

@@ -0,0 +1,10 @@
+import Testing
+@testable import Yasba
+
+struct ProtonMarkAsReadCommandTests {
+    @Test func requirements() throws {
+        let command = ProtonMarkAsReadCommand()
+
+        #expect(command.requirements == ["imap4flags"])
+    }
+}

Source/Tests/Sieve Commands/Proton/Spam/ProtonSpamCommandTests.swift

@@ -0,0 +1,10 @@
+import Testing
+@testable import Yasba
+
+struct ProtonSpamCommandTests {
+    @Test func requirements() throws {
+        let command = ProtonSpamCommand()
+
+        #expect(command.requirements == ["include", "environment", "variables", "relational", "comparator-i;ascii-numeric", "spamtest"])
+    }
+}

Source/Tests/TestSupport.swift

@@ -4,16 +4,17 @@ import Testing
 
 /// Minimal non-container command used across tests. Identity is stable via `id`.
 final class DummyLeaf: SieveCommand, SieveCommandValueEquatable {
+    static let requirement: String = "requirement"
+
     let id: UUID
-    var isContainer: Bool { false }
     let text: String
 
     init(_ text: String, id: UUID = UUID()) {
         self.text = text
         self.id = id
     }
 
-    var requirements: [String] { [] }
+    var requirements: [String] { [DummyLeaf.requirement] }
 
     func isSemanticallyEqual(to other: any SieveCommand) -> Bool {
         guard let other = other as? DummyLeaf else { return false }

Source/Yasba/Sieve Commands/Core/Add Flag/AddFlagCommand.swift

@@ -4,9 +4,7 @@ import Foundation
 @Observable
 final class AddFlagCommand: SieveCommand, SieveCommandValueEquatable {
     let id = UUID()
-
     var tag: String
-    var isContainer: Bool { false }
     let requirements = ["imap4flags"]
 
     init(tag: String) {

Source/Yasba/Sieve Commands/Core/File Into/FileIntoFolderCommand.swift → Source/Yasba/Sieve Commands/Core/File Into/FileIntoCommand.swift

@@ -6,10 +6,8 @@ import Foundation
 @Observable
 final class FileIntoCommand: SieveCommand, SieveCommandValueEquatable{
     let id = UUID()
-
     var mailbox: String
-    var isContainer: Bool { false }
-    var requirement: String = "fileinto"
+    let requirements = ["fileinto"]
 
     init(mailbox: String) {
         self.mailbox = mailbox

Source/Yasba/Sieve Commands/Core/If/IfCommand.swift

@@ -24,6 +24,10 @@ final class IfCommand: SieveContainerCommand, SieveCommandValueEquatable {
     var tests: [SieveTest]
     var thenChildren: [AnySieveCommand]
     var elseChildren: [AnySieveCommand]
+
+    var requirements: [String]  {
+        return (thenChildren + elseChildren).flatMap { $0.requirements }
+    }
 
     init(
         quantifier: IfQuantifier = .any,
@@ -37,9 +41,6 @@ final class IfCommand: SieveContainerCommand, SieveCommandValueEquatable {
         self.elseChildren = elseChildren
     }
 
-    var displayName: String { "If" }
-    var isContainer: Bool { true }
-
     func isSemanticallyEqual(to other: AnySieveCommand) -> Bool {
         guard let other = other as? IfCommand else { return false }
         return quantifier == other.quantifier

Source/Yasba/Sieve Commands/Core/If/Rows/IfHeaderRowView.swift

@@ -132,7 +132,6 @@ fileprivate enum TestTemplate: String, CaseIterable, Identifiable {
     case address
     case envelope
     case size
-    case body
     case exists
 
     var id: String { rawValue }
@@ -143,7 +142,6 @@ fileprivate enum TestTemplate: String, CaseIterable, Identifiable {
         case .address:  return "Address"
         case .envelope: return "Envelope"
         case .size:     return "Size"
-        case .body:     return "Body"
         case .exists:   return "Exists"
         }
     }
@@ -158,8 +156,6 @@ fileprivate enum TestTemplate: String, CaseIterable, Identifiable {
             return .envelope(part: .all, names: ["from"], match: .contains, keys: [""])
         case .size:
             return .size(.over, bytes: 1024)
-        case .body:
-            return .exists(["Subject"])
         case .exists:
             return .exists(["Subject"])
         }

Source/Yasba/Sieve Commands/Core/Stop/StopCommand.swift

@@ -3,7 +3,6 @@ import Foundation
 @Observable
 final class StopCommand: SieveCommand, SieveCommandValueEquatable {
     let id = UUID()
-    var isContainer: Bool { return false }
 
     func isSemanticallyEqual(to other: AnySieveCommand) -> Bool {
         return other is StopCommand

Source/Yasba/Sieve Commands/Extension/Proton/Expire/ProtonExpireCommand.swift

@@ -3,10 +3,8 @@ import Foundation
 @Observable
 final class ProtonExpireCommand: SieveCommand, SieveCommandValueEquatable {
     let id = UUID()
-
     var days: Int
-    var isContainer: Bool { false }
-    let requirements = ["imap4flags"]
+    let requirements = ["vnd.proton.expire"]
 
     init(days: Int) {
         self.days = days

Source/Yasba/Sieve Commands/Extension/Proton/MarkAsRead/ProtonMarkAsReadCommand.swift

@@ -3,8 +3,6 @@ import Foundation
 @Observable
 final class ProtonMarkAsReadCommand: SieveCommand, SieveCommandValueEquatable {
     let id = UUID()
-
-    var isContainer: Bool { false }
     let requirements = ["imap4flags"]
 
     func isSemanticallyEqual(to other: AnySieveCommand) -> Bool {

Source/Yasba/Sieve Commands/Extension/Proton/Spam/ProtonSpamCommand.swift

@@ -3,8 +3,6 @@ import Foundation
 @Observable
 final class ProtonSpamCommand: SieveCommand, SieveCommandValueEquatable {
     let id = UUID()
-
-    var isContainer: Bool { false }
     let requirements = ["include", "environment", "variables", "relational", "comparator-i;ascii-numeric", "spamtest"]
 
     func isSemanticallyEqual(to other: AnySieveCommand) -> Bool {

Source/Yasba/Sieve Commands/SieveCommand.swift

@@ -5,7 +5,6 @@ import Foundation
  */
 protocol SieveCommand: AnyObject, Identifiable {
     var id: UUID { get }
-    var isContainer: Bool { get }
 
     var requirements: [String] { get }
 }

Source/Yasba/Views/Sieve Script/Row Token/RowToken.swift

@@ -18,4 +18,11 @@ enum RowToken: Identifiable, Equatable {
     static func == (lhs: RowToken, rhs: RowToken) -> Bool {
         lhs.id == rhs.id
     }
+
+    var canRemove: Bool {
+        switch self {
+        case .elseMarker, .endIf: return false
+        default: return true
+        }
+    }
 }

Source/Yasba/Views/Sieve Script/SieveScriptView.swift

@@ -22,14 +22,14 @@ struct SieveScriptView: View {
     }
 
     var placeholderInsertPosition: Int? {
-        guard let g = dropGapIndex else { return nil }
-        if let pos = filteredIndices.firstIndex(where: { $0 >= g }) { return pos }
+        guard let gap = dropGapIndex else { return nil }
+        if let pos = filteredIndices.firstIndex(where: { $0 >= gap }) { return pos }
         return filteredIndices.count
     }
 
     var placeholderLeading: CGFloat {
-        guard let g = dropGapIndex else { return 0 }
-        if let index = tokens.indices.first(where: { $0 >= g }) { return CGFloat(indents[index]) * 24 }
+        guard let gap = dropGapIndex else { return 0 }
+        if let index = tokens.indices.first(where: { $0 >= gap }) { return CGFloat(indents[index]) * 24 }
         return CGFloat(indents.last ?? 0) * 24
     }
 
@@ -139,7 +139,7 @@ struct SieveScriptView: View {
                 RowTokenToViewMapper.row(for: token)
                 Spacer(minLength: 0)
             }
-            if hoveredRow == index {
+            if hoveredRow == index && token.canRemove {
                 Button {
                     viewModel.remove(at: index)
                     hoveredRow = nil