Sources/DateHelper/DateHelper.swift

@@ -50,6 +50,7 @@ public extension Date {
            let formatter = Date.cachedDateFormatters.cachedFormatter(format.stringFormat, timeZone: zone, locale: locale, isLenient: isLenient),
             let date = formatter.date(from: string) {
             self.init(timeInterval: 0, since: date)
+            return
         }
         return nil
     }
@@ -213,23 +214,27 @@ public extension Date {
     /// Compares dates to see if they are equal while ignoring time.
     // swiftlint:disable:next cyclomatic_complexity function_body_length
     func compare(_ comparison: DateComparisonType) -> Bool {
-        let time = self.timeIntervalSince1970
-        let now = Date().timeIntervalSince1970
-        let isPast = now - time > 0
-        let offset = isPast ? -1 : 1
         switch comparison {
         case .isToday:
             return compare(.isSameDay(as: Date()))
-        case .isTomorrow, .isYesterday:
-            if let comparison = Date().offset(.day, value: offset) {
+        case .isYesterday:
+            if let comparison = Date().offset(.day, value: -1) {
+                return compare(.isSameDay(as: comparison))
+            }
+        case .isTomorrow:
+            if let comparison = Date().offset(.day, value: 1) {
                 return compare(.isSameDay(as: comparison))
             }
         case .isSameDay(let date):
             return component(.year) == date.component(.year) && component(.month) == date.component(.month) && component(.day) == date.component(.day)
         case .isThisWeek:
             return self.compare(.isSameWeek(as: Date()))
-        case .isNextWeek, .isLastWeek:
-            if let comparison = Date().offset(.week, value: offset) {
+        case .isLastWeek:
+            if let comparison = Date().offset(.week, value: -1) {
+                return compare(.isSameWeek(as: comparison))
+            }
+        case .isNextWeek:
+            if let comparison = Date().offset(.week, value: 1) {
                 return compare(.isSameWeek(as: comparison))
             }
         case .isSameWeek(let date):
@@ -240,16 +245,24 @@ public extension Date {
             return abs(self.timeIntervalSince(date)) < DateComponentType.week.inSeconds
         case .isThisMonth:
             return self.compare(.isSameMonth(as: Date()))
-        case .isNextMonth, .isLastMonth:
-            if let comparison = Date().offset(.month, value: offset) {
+        case .isLastMonth:
+            if let comparison = Date().offset(.month, value: -1) {
+                return compare(.isSameMonth(as: comparison))
+            }
+        case .isNextMonth:
+            if let comparison = Date().offset(.month, value: 1) {
                 return compare(.isSameMonth(as: comparison))
             }
         case .isSameMonth(let date):
             return component(.year) == date.component(.year) && component(.month) == date.component(.month)
         case .isThisYear:
             return self.compare(.isSameYear(as: Date()))
-        case .isNextYear, .isLastYear:
-            if let comparison = Date().offset(.year, value: offset) {
+        case .isLastYear:
+            if let comparison = Date().offset(.year, value: -1) {
+                return compare(.isSameYear(as: comparison))
+            }
+        case .isNextYear:
+            if let comparison = Date().offset(.year, value: 1) {
                 return compare(.isSameYear(as: comparison))
             }
         case .isSameYear(let date):
@@ -259,9 +272,9 @@ public extension Date {
         case .isInThePast:
             return self.compare(.isEarlier(than: Date()))
         case .isEarlier(let date):
-            return (self as NSDate).earlierDate(date) == self
+            return timeIntervalSince1970 < date.timeIntervalSince1970
         case .isLater(let date):
-            return (self as NSDate).laterDate(date) == self
+            return timeIntervalSince1970 > date.timeIntervalSince1970
         case .isWeekday:
             return !compare(.isWeekend)
         case .isWeekend:
@@ -301,13 +314,14 @@ public extension Date {
     }
 
     /// Sets a new value to the specified component and returns as a new date
-    func adjust(hour: Int? = nil, minute: Int? = nil, second: Int? = nil, day: Int? = nil, month: Int? = nil) -> Date? {
+    func adjust(hour: Int? = nil, minute: Int? = nil, second: Int? = nil, nanosecond: Int? = nil, day: Int? = nil, month: Int? = nil) -> Date? {
         var comp = Date.components(self)
         comp.month = month ?? comp.month
         comp.day = day ?? comp.day
         comp.hour = hour ?? comp.hour
         comp.minute = minute ?? comp.minute
         comp.second = second ?? comp.second
+        comp.nanosecond = nanosecond ?? comp.nanosecond
         return Calendar.current.date(from: comp)
     }
 
@@ -319,7 +333,7 @@ public extension Date {
         case .startOfDay:
             return adjust(hour: 0, minute: 0, second: 0)
         case .endOfDay:
-            return adjust(hour: 23, minute: 59, second: 59)
+            return adjust(hour: 23, minute: 59, second: 59, nanosecond: 999_000_000) // 23:59:59:999
         case .startOfWeek:
             return calendar.date(from: calendar.dateComponents([.yearForWeekOfYear, .weekOfYear, .hour, .minute, .second, .nanosecond], from: self))
         case .endOfWeek:

Tests/DateHelperTests/DateAdjustingTests.swift

@@ -105,7 +105,7 @@ final class DateHelperAdjustingTests: XCTestCase {
     func testDateAdjustEndOfDay() throws {
         guard let original = Calendar.current.date(from: DateComponents(year: 2009, month: 12, day: 06, hour: 18, minute: 14, second: 41)),
               let adjusted = original.adjust(for: .endOfDay),
-              let comparison = Calendar.current.date(from: DateComponents(year: 2009, month: 12, day: 06, hour: 23, minute: 59, second: 59)) else {
+              let comparison = Calendar.current.date(from: DateComponents(year: 2009, month: 12, day: 06, hour: 23, minute: 59, second: 59, nanosecond: 999_000_000)) else {
           return
         }
         XCTAssertEqual(adjusted, comparison)