fix: JPStandardParser.js year checking

wanasit · Jan 13, 2020 · 237a85c · 237a85c
2 parents ca12dfc + e342a2f
commit 237a85c
Show file tree

Hide file tree

Showing 6 changed files with 110 additions and 32 deletions.
diff --git a/chrono.js b/chrono.js
diff --git a/chrono.map.json b/chrono.map.json
diff --git a/chrono.min.js b/chrono.min.js
diff --git a/package.json b/package.json
@@ -11,7 +11,7 @@
     "testURL": "http://localhost/"
   },
   "license": "MIT",
-  "version": "1.4.1",
+  "version": "1.4.2",
   "directories": {
     "source": "./src",
     "test": "./test"

diff --git a/src/parsers/ja/JPStandardParser.js b/src/parsers/ja/JPStandardParser.js
@@ -1,10 +1,12 @@
+const dayjs = require('dayjs');
 var parser = require('../parser');
 var ParsedResult = require('../../result').ParsedResult;
 
 var util  = require('../../utils/JP'); 
 var PATTERN = /(?:(同|今|本|((昭和|平成|令和)?([0-9０-９]{2,4}|元)))年\s*)?([0-9０-９]{1,2})月\s*([0-9０-９]{1,2})日/i;
-
-var YEAR_GROUP        = 2;
+
+var SPECIAL_YEAR_GROUP  = 1;
+var TYPICAL_YEAR_GROUP  = 2;
 var ERA_GROUP         = 3;
 var YEAR_NUMBER_GROUP = 4;
 var MONTH_GROUP       = 5;
@@ -16,8 +18,6 @@ exports.Parser = function JPStandardParser(){
     this.pattern = function() { return PATTERN; }
 
     this.extract = function(text, ref, match, opt){ 
-
-
         var result = new ParsedResult({
             text: match[0],
             index: match.index,
@@ -35,15 +35,8 @@ exports.Parser = function JPStandardParser(){
         result.start.assign('day', day);
         result.start.assign('month', month);
 
-        if (!match[YEAR_GROUP]) {
-            year = parser.findYearClosestToRef(ref, day, month);
-            result.start.imply('year', year);
-
-        } else if (match[YEAR_GROUP].match('同年|今年|本年')) {
-
-            result.start.assign('year', startMoment.year());
+        if (match[TYPICAL_YEAR_GROUP]) {
 
-        } else {
             var year = match[YEAR_NUMBER_GROUP];
             if (year == '元') {
                 year = 1;
@@ -61,9 +54,15 @@ exports.Parser = function JPStandardParser(){
             }
 
             result.start.assign('year', year);
+
+        } else if (match[SPECIAL_YEAR_GROUP] && match[SPECIAL_YEAR_GROUP].match('同|今|本')) {
+            const moment = dayjs(ref)
+            result.start.assign('year', moment.year());
+        } else {
+            const year = parser.findYearClosestToRef(ref, day, month);
+            result.start.imply('year', year);
         }
 
-
         result.tags['JPStandardParser'] = true;
         return result;
     };

diff --git a/test/ja/ja_standard.test.js b/test/ja/ja_standard.test.js
@@ -42,6 +42,25 @@ test("Test - Single Expression", function() {
         expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     } 
 
+    var text = "主な株主（2020年2月29日現在）";
+    var results = chrono.parse(text, new Date(2019,8-1,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(5)
+        expect(result.text).toBe('2020年2月29日')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2020)
+        expect(result.start.get('month')).toBe(2)
+        expect(result.start.get('day')).toBe(29)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2020, 2-1, 29, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    } 
+
     var text = "主な株主（９月3日現在）";
     var results = chrono.parse(text, new Date(2012,8-1,10));
     expect(results.length).toBe(1)
@@ -174,6 +193,67 @@ test("Test - Single Expression", function() {
         var expectDate = new Date(2012, 7-1, 27, 12);
         expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     }
+
+    var text = "主な株主（今年11月27日）";
+    var results = chrono.parse(text, new Date(2012,1-1,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(5)
+        expect(result.text).toBe('今年11月27日')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2012)
+        expect(result.start.get('month')).toBe(11)
+        expect(result.start.get('day')).toBe(27)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 11-1, 27, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+});
+
+
+test("Test - Single Expression without year", function() {
+
+    var text = "7月27日";
+    var results = chrono.parse(text, new Date(2012,8-1,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('7月27日')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2012)
+        expect(result.start.get('month')).toBe(7)
+        expect(result.start.get('day')).toBe(27)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2012, 7-1, 27, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
+    var text = "11月27日";
+    var results = chrono.parse(text, new Date(2012,1-1,10));
+    expect(results.length).toBe(1)
+
+    var result = results[0];
+    if (result) {
+        expect(result.index).toBe(0)
+        expect(result.text).toBe('11月27日')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.get('year')).toBe(2011)
+        expect(result.start.get('month')).toBe(11)
+        expect(result.start.get('day')).toBe(27)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2011, 11-1, 27, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
 });