Fix: Incorrect deadline certainty

wanasit · Aug 10, 2024 · b12f412 · b12f412
1 parent e6a8c98
commit b12f412
Show file tree

Hide file tree

Showing 2 changed files with 34 additions and 49 deletions.
diff --git a/src/parsers/en/ENDeadlineFormatParser.js b/src/parsers/en/ENDeadlineFormatParser.js
@@ -62,9 +62,9 @@ exports.Parser = function ENDeadlineFormatParser(){
                 date = date.add(num, 'year');
             }
 
-            result.start.imply('year', date.year());
-            result.start.imply('month', date.month() + 1);
-            result.start.imply('day', date.date());
+            result.start.assign('year', date.year());
+            result.start.assign('month', date.month() + 1);
+            result.start.assign('day', date.date());
             return result;
         }
 
@@ -81,12 +81,12 @@ exports.Parser = function ENDeadlineFormatParser(){
             date = date.add(num, 'second');
         }
 
-        result.start.imply('year', date.year());
-        result.start.imply('month', date.month() + 1);
-        result.start.imply('day', date.date());
-        result.start.imply('hour', date.hour());
-        result.start.imply('minute', date.minute());
-        result.start.imply('second', date.second());
+        result.start.assign('year', date.year());
+        result.start.assign('month', date.month() + 1);
+        result.start.assign('day', date.date());
+        result.start.assign('hour', date.hour());
+        result.start.assign('minute', date.minute());
+        result.start.assign('second', date.second());
         result.tags['ENDeadlineFormatParser'] = true;
         return result;
     };

diff --git a/test/en/en_deadline.test.js b/test/en/en_deadline.test.js
@@ -215,67 +215,52 @@ test("Test - Single Expression (Strict)", function() {
 });
 
 
-test("Test - Single Expression (Implied)", function() {
+test("Test - Single Expression (Certainty)", function() {
 
-    var text = "within 30 days";
+
+    var text = "within 30 years";
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
     expect(results.length).toBe(1);
-    expect(!results[0].start.isCertain('year')).not.toBeNull();
-    expect(!results[0].start.isCertain('month')).not.toBeNull();
-    expect(!results[0].start.isCertain('day')).not.toBeNull();
-    expect(!results[0].start.isCertain('hour')).not.toBeNull();
-    expect(!results[0].start.isCertain('minute')).not.toBeNull();
-    expect(!results[0].start.isCertain('second')).not.toBeNull();
+    expect(results[0].start.isCertain('year')).toBe(true);
 
     var text = "within 30 months";
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
     expect(results.length).toBe(1);
-    expect(!results[0].start.isCertain('year')).not.toBeNull();
-    expect(!results[0].start.isCertain('month')).not.toBeNull();
-    expect(!results[0].start.isCertain('day')).not.toBeNull();
-    expect(!results[0].start.isCertain('hour')).not.toBeNull();
-    expect(!results[0].start.isCertain('minute')).not.toBeNull();
-    expect(!results[0].start.isCertain('second')).not.toBeNull();
+    expect(results[0].start.isCertain('year')).toBe(true);
+    expect(results[0].start.isCertain('month')).toBe(true);
 
-    var text = "within 30 years";
+    var text = "within 30 days";
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
     expect(results.length).toBe(1);
-    expect(!results[0].start.isCertain('year')).not.toBeNull();
-    expect(!results[0].start.isCertain('month')).not.toBeNull();
-    expect(!results[0].start.isCertain('day')).not.toBeNull();
-    expect(!results[0].start.isCertain('hour')).not.toBeNull();
-    expect(!results[0].start.isCertain('minute')).not.toBeNull();
-    expect(!results[0].start.isCertain('second')).not.toBeNull();
+    expect(results[0].start.isCertain('year')).toBe(true);
+    expect(results[0].start.isCertain('month')).toBe(true);
+    expect(results[0].start.isCertain('day')).toBe(true);
 
     var text = "within 5 hours";
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
     expect(results.length).toBe(1);
-    expect(!results[0].start.isCertain('year')).not.toBeNull();
-    expect(!results[0].start.isCertain('month')).not.toBeNull();
-    expect(!results[0].start.isCertain('day')).not.toBeNull();
-    expect(!results[0].start.isCertain('hour')).not.toBeNull();
-    expect(!results[0].start.isCertain('minute')).not.toBeNull();
-    expect(!results[0].start.isCertain('second')).not.toBeNull();
+    expect(results[0].start.isCertain('year')).toBe(true);
+    expect(results[0].start.isCertain('month')).toBe(true);
+    expect(results[0].start.isCertain('day')).toBe(true);
+    expect(results[0].start.isCertain('hour')).toBe(true);
 
     var text = "within 5 minutes";
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
     expect(results.length).toBe(1);
-    expect(!results[0].start.isCertain('year')).not.toBeNull();
-    expect(!results[0].start.isCertain('month')).not.toBeNull();
-    expect(!results[0].start.isCertain('day')).not.toBeNull();
-    expect(!results[0].start.isCertain('hour')).not.toBeNull();
-    expect(!results[0].start.isCertain('minute')).not.toBeNull();
-    expect(!results[0].start.isCertain('second')).not.toBeNull();
+    expect(results[0].start.isCertain('year')).toBe(true);
+    expect(results[0].start.isCertain('month')).toBe(true);
+    expect(results[0].start.isCertain('day')).toBe(true);
+    expect(results[0].start.isCertain('hour')).toBe(true);
+    expect(results[0].start.isCertain('minute')).toBe(true);
 
     var text = "within 5 seconds";
     var results = chrono.parse(text, new Date(2012,7,10,12,14));
     expect(results.length).toBe(1);
-    expect(!results[0].start.isCertain('year')).not.toBeNull();
-    expect(!results[0].start.isCertain('month')).not.toBeNull();
-    expect(!results[0].start.isCertain('day')).not.toBeNull();
-    expect(!results[0].start.isCertain('hour')).not.toBeNull();
-    expect(!results[0].start.isCertain('minute')).not.toBeNull();
-    expect(!results[0].start.isCertain('second')).not.toBeNull();
-
+    expect(results[0].start.isCertain('year')).toBe(true);
+    expect(results[0].start.isCertain('month')).toBe(true);
+    expect(results[0].start.isCertain('day')).toBe(true);
+    expect(results[0].start.isCertain('hour')).toBe(true);
+    expect(results[0].start.isCertain('minute')).toBe(true);
+    expect(results[0].start.isCertain('second')).toBe(true);
 });