✨ Support ISO dates

Author: oschrenk

Sources/Cli/Hours.swift

@@ -23,12 +23,11 @@ struct Hours: ParsableCommand {
   var expression: String
 
   mutating func run() throws {
-    let parser = DateParser(rules: EN.all + Common.all)
     var userDate: Date
-    do {
-      let result = try parser.parse(text: expression, base: Date())
-      userDate = result.date
-    } catch {
+    if let date = DateArgument.parse(s: expression) {
+      userDate = date
+    } else {
+      // try natural date parsing
       StdErr.print("Can't parse date")
       throw ExitCode.failure
     }

Sources/Cli/On.swift

@@ -25,12 +25,11 @@ struct On: ParsableCommand {
   var expression: String
 
   mutating func run() throws {
-    let parser = DateParser(rules: EN.all + Common.all)
     var userDate: Date
-    do {
-      let result = try parser.parse(text: expression, base: Date())
-      userDate = result.date
-    } catch {
+    if let date = DateArgument.parse(s: expression) {
+      userDate = date
+    } else {
+      // try natural date parsing
       StdErr.print("Can't parse date")
       throw ExitCode.failure
     }

Sources/Cli/Util/DateArgument.swift

@@ -0,0 +1,23 @@
+import Foundation
+import when
+
+enum DateArgument {
+  static func parse(s: String) -> Date? {
+    let parser = DateParser(rules: EN.all + Common.all)
+    do {
+      let formatter = DateFormatter()
+      formatter.dateFormat = "yyyy-MM-dd"
+      // try iso date formatting manually
+      // until swift-when supports iso dates/time
+      if let date = formatter.date(from: s) {
+        return date
+      } else {
+        // try natural date parsing
+        let result = try parser.parse(text: s, base: Date())
+        return result.date
+      }
+    } catch {
+      return nil
+    }
+  }
+}