Fix: negative time range parsing

Author: Wanasit Tanakitrungruang

src/common/parsers/AbstractTimeExpressionParser.ts

@@ -72,35 +72,32 @@ export abstract class AbstractTimeExpressionParser implements Parser {
     extract(context: ParsingContext, match: RegExpMatchArray): ParsingResult {
         const startComponents = this.extractPrimaryTimeComponents(context, match);
         if (!startComponents) {
-            match.index += match[0].length;
+            match.index += match[0].length; // Skip over potential overlapping pattern
             return null;
         }
 
-        const result = context.createParsingResult(
-            match.index + match[1].length,
-            match[0].substring(match[1].length),
-            startComponents
-        );
+        const index = match.index + match[1].length;
+        const text = match[0].substring(match[1].length);
+        const result = context.createParsingResult(index, text, startComponents);
+        match.index += match[0].length; // Skip over potential overlapping pattern
 
-        const remainingText = context.text.substring(match.index + match[0].length);
+        const remainingText = context.text.substring(match.index);
         const followingPattern = this.getFollowingTimePatternThroughCache();
-        match = followingPattern.exec(remainingText);
+        const followingMatch = followingPattern.exec(remainingText);
         if (
-            !match ||
+            !followingMatch ||
             // Pattern "YY.YY -XXXX" is more like timezone offset
-            match[0].match(/^\s*([+-])\s*\d{3,4}$/)
+            followingMatch[0].match(/^\s*([+-])\s*\d{3,4}$/)
         ) {
             return this.checkAndReturnWithoutFollowingPattern(result);
         }
 
-        result.end = this.extractFollowingTimeComponents(context, match, result);
+        result.end = this.extractFollowingTimeComponents(context, followingMatch, result);
         if (result.end) {
-            if (result.end) {
-                result.text += match[0];
-            }
+            result.text += followingMatch[0];
         }
 
-        return result;
+        return this.checkAndReturnWithFollowingPattern(result);
     }
 
     extractPrimaryTimeComponents(
@@ -334,6 +331,37 @@ export abstract class AbstractTimeExpressionParser implements Parser {
         return result;
     }
 
+    private checkAndReturnWithFollowingPattern(result) {
+        if (result.text.match(/^\d+-\d+$/)) {
+            return null;
+        }
+
+        // If it ends only with numbers or dots
+        const endingWithNumbers = result.text.match(/[^\d:.](\d[\d.]+)\s*-\s*(\d[\d.]+)$/);
+        if (endingWithNumbers) {
+            // In strict mode (e.g. "at 1-3" or "at 1.2 - 2.3"), this should not be accepted
+            if (this.strictMode) {
+                return null;
+            }
+
+            const startingNumbers: string = endingWithNumbers[1];
+            const endingNumbers: string = endingWithNumbers[2];
+            // If it ends only with dot single digit, e.g. "at 1.2"
+            if (endingNumbers.includes(".") && !endingNumbers.match(/\d(\.\d{2})+$/)) {
+                return null;
+            }
+
+            // If it ends only with numbers above 24, e.g. "at 25"
+            const endingNumberVal = parseInt(endingNumbers);
+            const startingNumberVal = parseInt(startingNumbers);
+            if (endingNumberVal > 24 || startingNumberVal > 24) {
+                return null;
+            }
+        }
+
+        return result;
+    }
+
     private cachedPrimaryPrefix = null;
     private cachedPrimarySuffix = null;
     private cachedPrimaryTimePattern = null;

test/en/en.test.ts

@@ -97,34 +97,6 @@ test("Test - Random text", function () {
     });
 });
 
-test("Test - Random non-date patterns", function () {
-    testUnexpectedResult(chrono, " 3");
-
-    testUnexpectedResult(chrono, "       1");
-
-    testUnexpectedResult(chrono, "  11 ");
-
-    testUnexpectedResult(chrono, " 0.5 ");
-
-    testUnexpectedResult(chrono, " 35.49 ");
-
-    testUnexpectedResult(chrono, "12.53%");
-
-    testUnexpectedResult(chrono, "6358fe2310> *5.0* / 5 Outstanding");
-
-    testUnexpectedResult(chrono, "6358fe2310> *1.5* / 5 Outstanding");
-
-    testUnexpectedResult(chrono, "Total: $1,194.09 [image: View Reservation");
-
-    testUnexpectedResult(chrono, "Version: 1.1.3");
-
-    testUnexpectedResult(chrono, "Version: 1.1.30");
-
-    testUnexpectedResult(chrono, "Version: 1.10.30");
-
-    testUnexpectedResult(chrono, "at 6.5 kilograms");
-});
-
 test("Test - Wikipedia Texts", function () {
     const text =
         "October 7, 2011, of which details were not revealed out of respect to Jobs's family.[239] " +

test/en/en_time_exp.test.ts

@@ -260,6 +260,12 @@ test("Test - Parsing negative cases : 'at [some numbers]'", function () {
     testUnexpectedResult(chrono, "I'm at 10.1");
 });
 
+test("Test - Parsing negative cases : 'at [some numbers] - [some numbers]'", function () {
+    testUnexpectedResult(chrono, "I'm at 10.1 - 10.12");
+
+    testUnexpectedResult(chrono, "I'm at 10 - 10.1");
+});
+
 test("Test - Parsing negative cases (Strict)", function () {
     testUnexpectedResult(chrono.strict, "I'm at 101,194 points!");
 
@@ -271,3 +277,13 @@ test("Test - Parsing negative cases (Strict)", function () {
 
     testUnexpectedResult(chrono.strict, "2020");
 });
+
+test("Test - Parsing negative cases : 'at [some numbers] - [some numbers]' (Strict)", function () {
+    testUnexpectedResult(chrono.strict, "I'm at 10.1 - 10.12");
+
+    testUnexpectedResult(chrono.strict, "I'm at 10 - 10.1");
+
+    testUnexpectedResult(chrono.strict, "I'm at 10 - 20");
+
+    testUnexpectedResult(chrono.strict, "7-730");
+});

test/en/negative_cases.test.ts

@@ -0,0 +1,56 @@
+import { testSingleCase, testUnexpectedResult } from "../test_util";
+import * as chrono from "../../src";
+
+test("Test - Skip random non-date patterns", function () {
+    testUnexpectedResult(chrono, " 3");
+
+    testUnexpectedResult(chrono, "       1");
+
+    testUnexpectedResult(chrono, "  11 ");
+
+    testUnexpectedResult(chrono, " 0.5 ");
+
+    testUnexpectedResult(chrono, " 35.49 ");
+
+    testUnexpectedResult(chrono, "12.53%");
+
+    testUnexpectedResult(chrono, "6358fe2310> *5.0* / 5 Outstanding");
+
+    testUnexpectedResult(chrono, "6358fe2310> *1.5* / 5 Outstanding");
+
+    testUnexpectedResult(chrono, "Total: $1,194.09 [image: View Reservation");
+
+    testUnexpectedResult(chrono, "at 6.5 kilograms");
+});
+
+test("Test - Skip hyphenated numbers pattern", () => {
+    testUnexpectedResult(chrono, "1-2");
+
+    testUnexpectedResult(chrono, "1-2-3");
+
+    testUnexpectedResult(chrono, "4-5-6");
+
+    testUnexpectedResult(chrono, "20-30-12");
+});
+
+test("Test - Skip version number pattern", () => {
+    testUnexpectedResult(chrono, "Version: 1.1.3");
+
+    testUnexpectedResult(chrono, "Version: 1.1.30");
+
+    testUnexpectedResult(chrono, "Version: 1.10.30");
+});
+
+test("Test - Date with version number pattern", () => {
+    testSingleCase(chrono.en, "1.5.3 - 2015-09-24", (result) => {
+        expect(result.text).toBe("2015-09-24");
+    });
+
+    testSingleCase(chrono.en, "1.5.30 - 2015-09-24", (result) => {
+        expect(result.text).toBe("2015-09-24");
+    });
+
+    testSingleCase(chrono.en, "1.50.30 - 2015-09-24", (result) => {
+        expect(result.text).toBe("2015-09-24");
+    });
+});

test/system.test.ts

@@ -169,17 +169,3 @@ test("Test - Compare with native js", () => {
 
     testByCompareWithNative("2014-12-14T18:22:14.759Z");
 });
-
-test("Test - Skip version-number-like pattern", () => {
-    testSingleCase(chrono, "1.5.3 - 2015-09-24", (result) => {
-        expect(result.text).toBe("2015-09-24");
-    });
-
-    testSingleCase(chrono, "1.5.30 - 2015-09-24", (result) => {
-        expect(result.text).toBe("2015-09-24");
-    });
-
-    testSingleCase(chrono, "1.50.30 - 2015-09-24", (result) => {
-        expect(result.text).toBe("2015-09-24");
-    });
-});