fix: conflict with master in JPStandardParser.js

wanasit · Jan 13, 2020 · 9a09f5b · 9a09f5b
2 parents 237a85c + fed7bb1
commit 9a09f5b
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 10 deletions.
diff --git a/src/parsers/ja/JPStandardParser.js b/src/parsers/ja/JPStandardParser.js
@@ -1,16 +1,16 @@
 const dayjs = require('dayjs');
-var parser = require('../parser');
-var ParsedResult = require('../../result').ParsedResult;
+const parser = require('../parser');
+const 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;
+const util  = require('../../utils/JP'); 
 
-var SPECIAL_YEAR_GROUP  = 1;
-var TYPICAL_YEAR_GROUP  = 2;
-var ERA_GROUP         = 3;
-var YEAR_NUMBER_GROUP = 4;
-var MONTH_GROUP       = 5;
-var DAY_GROUP         = 6;
+const PATTERN = /(?:(同|今|本|((昭和|平成|令和)?([0-9０-９]{1,4}|元)))年\s*)?([0-9０-９]{1,2})月\s*([0-9０-９]{1,2})日/i;
+const SPECIAL_YEAR_GROUP  = 1;
+const TYPICAL_YEAR_GROUP  = 2;
+const ERA_GROUP         = 3;
+const YEAR_NUMBER_GROUP = 4;
+const MONTH_GROUP       = 5;
+const DAY_GROUP         = 6;
 
 exports.Parser = function JPStandardParser(){
     parser.Parser.apply(this, arguments);

diff --git a/test/ja/ja_standard.test.js b/test/ja/ja_standard.test.js
@@ -137,6 +137,26 @@ test("Test - Single Expression", function() {
         var expectDate = new Date(2019, 5-1, 1, 12);
         expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
     }
+
+    var text = "主な株主（令和2年5月1日）";
+    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(5)
+        expect(result.text).toBe('令和2年5月1日')
+
+        expect(result.start).not.toBeNull()
+        expect(result.start.knownValues.year).toBe(2020)
+        expect(result.start.get('month')).toBe(5)
+        expect(result.start.get('day')).toBe(1)
+
+        var resultDate = result.start.date();
+        var expectDate = new Date(2020, 5-1, 1, 12);
+        expect(expectDate.getTime()).toBeCloseTo(resultDate.getTime())
+    }
+
     var text = "主な株主（同年7月27日）";
     var results = chrono.parse(text, new Date(2012,8-1,10));
     expect(results.length).toBe(1)