chrono-node 2.4.2 → 2.5.1

package/.idea/workspace.xml

@@ -9,7 +9,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="2e0b76bb-7462-4a34-aa1d-16a9ba3798d7" name="Default Changelist" comment="">
-      <change afterPath="$PROJECT_DIR$/.npmignore" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.npmignore" beforeDir="false" afterPath="$PROJECT_DIR$/.npmignore" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -36,35 +36,28 @@
       <filtered-out-file-type name="COMMIT_BY_MESSAGE" />
     </file-type-list>
   </component>
+  <component name="MarkdownSettingsMigration">
+    <option name="stateVersion" value="1" />
+  </component>
   <component name="ProjectId" id="1ZTXLSSDQzWU7y8yHAVTj77ZXsw" />
   <component name="ProjectLevelVcsManager" settingsEditedManually="true" />
   <component name="ProjectViewState">
     <option name="hideEmptyMiddlePackages" value="true" />
     <option name="showLibraryContents" value="true" />
   </component>
-  <component name="PropertiesComponent">
-    <property name="DefaultHtmlFileTemplate" value="HTML File" />
-    <property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
-    <property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
-    <property name="WebServerToolWindowFactoryState" value="false" />
-    <property name="last_opened_file_path" value="$PROJECT_DIR$/test/zh-hant" />
-    <property name="node.js.detected.package.eslint" value="true" />
-    <property name="node.js.detected.package.standard" value="true" />
-    <property name="node.js.detected.package.tslint" value="true" />
-    <property name="node.js.path.for.package.eslint" value="project" />
-    <property name="node.js.path.for.package.standard" value="project" />
-    <property name="node.js.path.for.package.tslint" value="project" />
-    <property name="node.js.selected.package.eslint" value="(autodetect)" />
-    <property name="node.js.selected.package.standard" value="" />
-    <property name="node.js.selected.package.tslint" value="(autodetect)" />
-    <property name="nodejs.jest.jest_package" value="$PROJECT_DIR$/node_modules/jest" />
-    <property name="nodejs_package_manager_path" value="npm" />
-    <property name="prettierjs.PrettierConfiguration.Package" value="$PROJECT_DIR$/node_modules/prettier" />
-    <property name="run.code.analysis.last.selected.profile" value="pProject Default" />
-    <property name="settings.editor.selected.configurable" value="settings.javascript.linters.eslint" />
-    <property name="ts.external.directory.path" value="$PROJECT_DIR$/node_modules/typescript/lib" />
-    <property name="vue.rearranger.settings.migration" value="true" />
-  </component>
+  <component name="PropertiesComponent"><![CDATA[{
+  "keyToString": {
+    "WebServerToolWindowFactoryState": "false",
+    "node.js.detected.package.eslint": "true",
+    "node.js.detected.package.tslint": "true",
+    "node.js.selected.package.eslint": "(autodetect)",
+    "node.js.selected.package.tslint": "(autodetect)",
+    "nodejs.jest.jest_package": "/Users/wanasit/Workspace/chrono/node_modules/jest",
+    "nodejs_package_manager_path": "npm",
+    "prettierjs.PrettierConfiguration.Package": "/Users/wanasit/Workspace/chrono/node_modules/prettier",
+    "vue.rearranger.settings.migration": "true"
+  }
+}]]></component>
   <component name="RecentsManager">
     <key name="CopyFile.RECENT_KEYS">
       <recent name="$PROJECT_DIR$/test/zh-hant" />
@@ -81,7 +74,7 @@
       <recent name="$PROJECT_DIR$/src/locales/zh-hant/hant" />
     </key>
   </component>
-  <component name="RunManager" selected="Jest.Test - Skip impossible dates/times">
+  <component name="RunManager" selected="Jest.All Tests">
     <configuration name="All Tests" type="JavaScriptTestRunnerJest" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
@@ -91,63 +84,60 @@
       <scope-kind value="ALL" />
       <method v="2" />
     </configuration>
-    <configuration name="Test - Skip impossible dates/times" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
+    <configuration name="Test - After with reference" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
       <working-dir value="$PROJECT_DIR$" />
       <envs />
       <scope-kind value="TEST" />
-      <test-file value="$PROJECT_DIR$/test/en/negative_cases.test.ts" />
+      <test-file value="$PROJECT_DIR$/test/en/en_time_units_later.test.ts" />
       <test-names>
-        <test-name value="Test - Skip impossible dates/times" />
+        <test-name value="Test - After with reference" />
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="Test - Skip random non-date patterns" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
+    <configuration name="Test - Single Expression" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
       <working-dir value="$PROJECT_DIR$" />
       <envs />
       <scope-kind value="TEST" />
-      <test-file value="$PROJECT_DIR$/test/en/negative_cases.test.ts" />
+      <test-file value="$PROJECT_DIR$/test/en/en_time_units_ago.test.ts" />
       <test-names>
-        <test-name value="Test - Skip random non-date patterns" />
+        <test-name value="Test - Single Expression" />
       </test-names>
       <method v="2" />
     </configuration>
-    <configuration name="Test erroneous values" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
+    <configuration name="en_time_units_ago.test.ts" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
       <working-dir value="$PROJECT_DIR$" />
       <envs />
-      <scope-kind value="TEST" />
-      <test-file value="$PROJECT_DIR$/test/system.test.ts" />
-      <test-names>
-        <test-name value="Test erroneous values" />
-      </test-names>
+      <scope-kind value="TEST_FILE" />
+      <test-file value="$PROJECT_DIR$/test/en/en_time_units_ago.test.ts" />
       <method v="2" />
     </configuration>
-    <configuration name="en_time_exp.test.ts" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
+    <configuration name="en_time_units_casual_relative.test.ts" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
       <working-dir value="$PROJECT_DIR$" />
       <envs />
       <scope-kind value="TEST_FILE" />
-      <test-file value="$PROJECT_DIR$/test/en/en_time_exp.test.ts" />
+      <test-file value="$PROJECT_DIR$/test/en/en_time_units_casual_relative.test.ts" />
       <method v="2" />
     </configuration>
-    <configuration name="negative_cases.test.ts" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
+    <configuration name="en_time_units_later.test.ts" type="JavaScriptTestRunnerJest" temporary="true" nameIsGenerated="true">
       <node-interpreter value="project" />
       <node-options value="" />
       <jest-package value="$PROJECT_DIR$/node_modules/jest" />
       <working-dir value="$PROJECT_DIR$" />
       <envs />
       <scope-kind value="TEST_FILE" />
-      <test-file value="$PROJECT_DIR$/test/en/negative_cases.test.ts" />
+      <test-file value="$PROJECT_DIR$/test/en/en_time_units_later.test.ts" />
       <method v="2" />
     </configuration>
     <configuration name="benchmark.js" type="NodeJSConfigurationType" nameIsGenerated="true" path-to-js-file="benchmark/benchmark.js" working-dir="$PROJECT_DIR$/">
@@ -158,20 +148,20 @@
     </configuration>
     <list>
       <item itemvalue="Jest.All Tests" />
+      <item itemvalue="Jest.Test - After with reference" />
+      <item itemvalue="Jest.Test - Single Expression" />
+      <item itemvalue="Jest.en_time_units_ago.test.ts" />
+      <item itemvalue="Jest.en_time_units_casual_relative.test.ts" />
+      <item itemvalue="Jest.en_time_units_later.test.ts" />
       <item itemvalue="Node.js.benchmark.js" />
-      <item itemvalue="Jest.Test - Skip random non-date patterns" />
-      <item itemvalue="Jest.Test erroneous values" />
-      <item itemvalue="Jest.en_time_exp.test.ts" />
-      <item itemvalue="Jest.negative_cases.test.ts" />
-      <item itemvalue="Jest.Test - Skip impossible dates/times" />
     </list>
     <recent_temporary>
       <list>
-        <item itemvalue="Jest.Test - Skip impossible dates/times" />
-        <item itemvalue="Jest.negative_cases.test.ts" />
-        <item itemvalue="Jest.en_time_exp.test.ts" />
-        <item itemvalue="Jest.Test erroneous values" />
-        <item itemvalue="Jest.Test - Skip random non-date patterns" />
+        <item itemvalue="Jest.Test - Single Expression" />
+        <item itemvalue="Jest.en_time_units_casual_relative.test.ts" />
+        <item itemvalue="Jest.en_time_units_ago.test.ts" />
+        <item itemvalue="Jest.Test - After with reference" />
+        <item itemvalue="Jest.en_time_units_later.test.ts" />
       </list>
     </recent_temporary>
   </component>
@@ -273,7 +263,13 @@
       <workItem from="1661048879110" duration="10416000" />
       <workItem from="1665279226374" duration="1041000" />
       <workItem from="1665884284050" duration="2795000" />
-      <workItem from="1668829159659" duration="6265000" />
+      <workItem from="1668829159659" duration="6824000" />
+      <workItem from="1670116434256" duration="4043000" />
+      <workItem from="1671942898708" duration="2246000" />
+      <workItem from="1673684432556" duration="1442000" />
+      <workItem from="1676083612959" duration="425000" />
+      <workItem from="1676777563056" duration="31000" />
+      <workItem from="1677990934481" duration="6060000" />
     </task>
     <servers />
   </component>
@@ -303,18 +299,12 @@
           <line>6</line>
           <option name="timeStamp" value="8" />
         </line-breakpoint>
-        <line-breakpoint enabled="true" type="javascript">
-          <url>file://$PROJECT_DIR$/test/en/en_casual.test.ts</url>
-          <line>347</line>
-          <properties lambdaOrdinal="-1" />
-          <option name="timeStamp" value="9" />
-        </line-breakpoint>
       </breakpoints>
     </breakpoint-manager>
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
     <SUITE FILE_PATH="coverage/chrono$en_time_exp_test_ts.info" NAME="en_time_exp.test.ts Coverage Results" MODIFIED="1595503470724" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="JestJavaScriptTestRunnerCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
-    <SUITE FILE_PATH="coverage/chrono$All_Tests.info" NAME="All Tests Coverage Results" MODIFIED="1665279297997" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="JestJavaScriptTestRunnerCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
     <SUITE FILE_PATH="coverage/chrono$Test___Single_expression.info" NAME="Test - Single expression Coverage Results" MODIFIED="1595504124499" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="JestJavaScriptTestRunnerCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
+    <SUITE FILE_PATH="coverage/chrono$All_Tests.info" NAME="All Tests Coverage Results" MODIFIED="1665279297997" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="JestJavaScriptTestRunnerCoverage" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" />
   </component>
 </project>

package/README.md

@@ -176,7 +176,9 @@ There are several locales supported contributed by multiple developers under `./
 // default English (US)
 chrono.parseDate('6/10/2018');    
 
-chrono.en.parseDate('6/10/2018'); 
+chrono.en.parseDate('6/10/2018');       // June 10th, 2018
+chrono.en.GB.parseDate('6/10/2018');    // October 6th, 2018
+
 chrono.ja.parseDate('昭和６４年１月７日'); 
 ```
 

package/dist/calculation/mergingCalculation.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.mergeDateTimeComponent = exports.mergeDateTimeResult = void 0;
 const index_1 = require("../index");
+const dayjs_1 = require("../utils/dayjs");
 function mergeDateTimeResult(dateResult, timeResult) {
     const result = dateResult.clone();
     const beginDate = dateResult.start;
@@ -12,11 +13,12 @@ function mergeDateTimeResult(dateResult, timeResult) {
         const endTime = timeResult.end == null ? timeResult.start : timeResult.end;
         const endDateTime = mergeDateTimeComponent(endDate, endTime);
         if (dateResult.end == null && endDateTime.date().getTime() < result.start.date().getTime()) {
+            const nextDayJs = endDateTime.dayjs().add(1, "day");
             if (endDateTime.isCertain("day")) {
-                endDateTime.assign("day", endDateTime.get("day") + 1);
+                dayjs_1.assignSimilarDate(endDateTime, nextDayJs);
             }
             else {
-                endDateTime.imply("day", endDateTime.get("day") + 1);
+                dayjs_1.implySimilarDate(endDateTime, nextDayJs);
             }
         }
         result.end = endDateTime;

package/dist/calculation/mergingCalculation.js.map

@@ -1 +1 @@
-{"version":3,"file":"mergingCalculation.js","sourceRoot":"","sources":["../../src/calculation/mergingCalculation.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"mergingCalculation.js","sourceRoot":"","sources":["../../src/calculation/mergingCalculation.ts"],"names":[],"mappings":"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"}

package/dist/common/casualReferences.d.ts

@@ -11,4 +11,5 @@ export declare function evening(reference: ReferenceWithTimezone, implyHour?: nu
 export declare function yesterdayEvening(reference: ReferenceWithTimezone, implyHour?: number): ParsingComponents;
 export declare function midnight(reference: ReferenceWithTimezone): ParsingComponents;
 export declare function morning(reference: ReferenceWithTimezone, implyHour?: number): ParsingComponents;
+export declare function afternoon(reference: ReferenceWithTimezone, implyHour?: number): ParsingComponents;
 export declare function noon(reference: ReferenceWithTimezone): ParsingComponents;

package/dist/common/casualReferences.js

@@ -3,7 +3,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.noon = exports.morning = exports.midnight = exports.yesterdayEvening = exports.evening = exports.lastNight = exports.tonight = exports.theDayAfter = exports.tomorrow = exports.theDayBefore = exports.yesterday = exports.today = exports.now = void 0;
+exports.noon = exports.afternoon = exports.morning = exports.midnight = exports.yesterdayEvening = exports.evening = exports.lastNight = exports.tonight = exports.theDayAfter = exports.tomorrow = exports.theDayBefore = exports.yesterday = exports.today = exports.now = void 0;
 const results_1 = require("../results");
 const dayjs_1 = __importDefault(require("dayjs"));
 const dayjs_2 = require("../utils/dayjs");
@@ -87,9 +87,14 @@ function yesterdayEvening(reference, implyHour = 20) {
 exports.yesterdayEvening = yesterdayEvening;
 function midnight(reference) {
     const component = new results_1.ParsingComponents(reference, {});
-    component.imply("hour", 0);
+    const targetDate = dayjs_1.default(reference.instant);
+    if (targetDate.hour() > 2) {
+        dayjs_2.implyTheNextDay(component, targetDate);
+    }
+    component.assign("hour", 0);
     component.imply("minute", 0);
     component.imply("second", 0);
+    component.imply("millisecond", 0);
     return component;
 }
 exports.midnight = midnight;
@@ -97,13 +102,29 @@ function morning(reference, implyHour = 6) {
     const component = new results_1.ParsingComponents(reference, {});
     component.imply("meridiem", index_1.Meridiem.AM);
     component.imply("hour", implyHour);
+    component.imply("minute", 0);
+    component.imply("second", 0);
+    component.imply("millisecond", 0);
     return component;
 }
 exports.morning = morning;
+function afternoon(reference, implyHour = 15) {
+    const component = new results_1.ParsingComponents(reference, {});
+    component.imply("meridiem", index_1.Meridiem.PM);
+    component.imply("hour", implyHour);
+    component.imply("minute", 0);
+    component.imply("second", 0);
+    component.imply("millisecond", 0);
+    return component;
+}
+exports.afternoon = afternoon;
 function noon(reference) {
     const component = new results_1.ParsingComponents(reference, {});
     component.imply("meridiem", index_1.Meridiem.AM);
     component.imply("hour", 12);
+    component.imply("minute", 0);
+    component.imply("second", 0);
+    component.imply("millisecond", 0);
     return component;
 }
 exports.noon = noon;

package/dist/common/casualReferences.js.map

@@ -1 +1 @@
-{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../src/common/casualReferences.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"casualReferences.js","sourceRoot":"","sources":["../../src/common/casualReferences.ts"],"names":[],"mappings":"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"}

package/dist/esm/calculation/mergingCalculation.d.ts

@@ -0,0 +1,3 @@
+import { ParsingComponents, ParsingResult } from "../results";
+export declare function mergeDateTimeResult(dateResult: ParsingResult, timeResult: ParsingResult): ParsingResult;
+export declare function mergeDateTimeComponent(dateComponent: ParsingComponents, timeComponent: ParsingComponents): ParsingComponents;

package/dist/esm/calculation/mergingCalculation.js

@@ -0,0 +1,69 @@
+import { Meridiem } from "../index";
+import { assignSimilarDate, implySimilarDate } from "../utils/dayjs";
+export function mergeDateTimeResult(dateResult, timeResult) {
+    const result = dateResult.clone();
+    const beginDate = dateResult.start;
+    const beginTime = timeResult.start;
+    result.start = mergeDateTimeComponent(beginDate, beginTime);
+    if (dateResult.end != null || timeResult.end != null) {
+        const endDate = dateResult.end == null ? dateResult.start : dateResult.end;
+        const endTime = timeResult.end == null ? timeResult.start : timeResult.end;
+        const endDateTime = mergeDateTimeComponent(endDate, endTime);
+        if (dateResult.end == null && endDateTime.date().getTime() < result.start.date().getTime()) {
+            const nextDayJs = endDateTime.dayjs().add(1, "day");
+            if (endDateTime.isCertain("day")) {
+                assignSimilarDate(endDateTime, nextDayJs);
+            }
+            else {
+                implySimilarDate(endDateTime, nextDayJs);
+            }
+        }
+        result.end = endDateTime;
+    }
+    return result;
+}
+export function mergeDateTimeComponent(dateComponent, timeComponent) {
+    const dateTimeComponent = dateComponent.clone();
+    if (timeComponent.isCertain("hour")) {
+        dateTimeComponent.assign("hour", timeComponent.get("hour"));
+        dateTimeComponent.assign("minute", timeComponent.get("minute"));
+        if (timeComponent.isCertain("second")) {
+            dateTimeComponent.assign("second", timeComponent.get("second"));
+            if (timeComponent.isCertain("millisecond")) {
+                dateTimeComponent.assign("millisecond", timeComponent.get("millisecond"));
+            }
+            else {
+                dateTimeComponent.imply("millisecond", timeComponent.get("millisecond"));
+            }
+        }
+        else {
+            dateTimeComponent.imply("second", timeComponent.get("second"));
+            dateTimeComponent.imply("millisecond", timeComponent.get("millisecond"));
+        }
+    }
+    else {
+        dateTimeComponent.imply("hour", timeComponent.get("hour"));
+        dateTimeComponent.imply("minute", timeComponent.get("minute"));
+        dateTimeComponent.imply("second", timeComponent.get("second"));
+        dateTimeComponent.imply("millisecond", timeComponent.get("millisecond"));
+    }
+    if (timeComponent.isCertain("timezoneOffset")) {
+        dateTimeComponent.assign("timezoneOffset", timeComponent.get("timezoneOffset"));
+    }
+    if (timeComponent.isCertain("meridiem")) {
+        dateTimeComponent.assign("meridiem", timeComponent.get("meridiem"));
+    }
+    else if (timeComponent.get("meridiem") != null && dateTimeComponent.get("meridiem") == null) {
+        dateTimeComponent.imply("meridiem", timeComponent.get("meridiem"));
+    }
+    if (dateTimeComponent.get("meridiem") == Meridiem.PM && dateTimeComponent.get("hour") < 12) {
+        if (timeComponent.isCertain("hour")) {
+            dateTimeComponent.assign("hour", dateTimeComponent.get("hour") + 12);
+        }
+        else {
+            dateTimeComponent.imply("hour", dateTimeComponent.get("hour") + 12);
+        }
+    }
+    return dateTimeComponent;
+}
+//# sourceMappingURL=mergingCalculation.js.map

package/dist/esm/calculation/mergingCalculation.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"mergingCalculation.js","sourceRoot":"","sources":["../../../src/calculation/mergingCalculation.ts"],"names":[],"mappings":"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"}

package/dist/esm/calculation/years.d.ts

@@ -0,0 +1,2 @@
+export declare function findMostLikelyADYear(yearNumber: number): number;
+export declare function findYearClosestToRef(refDate: Date, day: number, month: number): number;

package/dist/esm/calculation/years.js

@@ -0,0 +1,29 @@
+import dayjs from "dayjs";
+export function findMostLikelyADYear(yearNumber) {
+    if (yearNumber < 100) {
+        if (yearNumber > 50) {
+            yearNumber = yearNumber + 1900;
+        }
+        else {
+            yearNumber = yearNumber + 2000;
+        }
+    }
+    return yearNumber;
+}
+export function findYearClosestToRef(refDate, day, month) {
+    const refMoment = dayjs(refDate);
+    let dateMoment = refMoment;
+    dateMoment = dateMoment.month(month - 1);
+    dateMoment = dateMoment.date(day);
+    dateMoment = dateMoment.year(refMoment.year());
+    const nextYear = dateMoment.add(1, "y");
+    const lastYear = dateMoment.add(-1, "y");
+    if (Math.abs(nextYear.diff(refMoment)) < Math.abs(dateMoment.diff(refMoment))) {
+        dateMoment = nextYear;
+    }
+    else if (Math.abs(lastYear.diff(refMoment)) < Math.abs(dateMoment.diff(refMoment))) {
+        dateMoment = lastYear;
+    }
+    return dateMoment.year();
+}
+//# sourceMappingURL=years.js.map

package/dist/esm/calculation/years.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"years.js","sourceRoot":"","sources":["../../../src/calculation/years.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAQ1B,MAAM,UAAU,oBAAoB,CAAC,UAAkB;IACnD,IAAI,UAAU,GAAG,GAAG,EAAE;QAClB,IAAI,UAAU,GAAG,EAAE,EAAE;YACjB,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;SAClC;aAAM;YACH,UAAU,GAAG,UAAU,GAAG,IAAI,CAAC;SAClC;KACJ;IAED,OAAO,UAAU,CAAC;AACtB,CAAC;AAED,MAAM,UAAU,oBAAoB,CAAC,OAAa,EAAE,GAAW,EAAE,KAAa;IAE1E,MAAM,SAAS,GAAG,KAAK,CAAC,OAAO,CAAC,CAAC;IACjC,IAAI,UAAU,GAAG,SAAS,CAAC;IAC3B,UAAU,GAAG,UAAU,CAAC,KAAK,CAAC,KAAK,GAAG,CAAC,CAAC,CAAC;IACzC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IAClC,UAAU,GAAG,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,EAAE,CAAC,CAAC;IAE/C,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACxC,MAAM,QAAQ,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE;QAC3E,UAAU,GAAG,QAAQ,CAAC;KACzB;SAAM,IAAI,IAAI,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,GAAG,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,EAAE;QAClF,UAAU,GAAG,QAAQ,CAAC;KACzB;IAED,OAAO,UAAU,CAAC,IAAI,EAAE,CAAC;AAC7B,CAAC"}

package/dist/esm/chrono.d.ts

@@ -0,0 +1,41 @@
+import { ReferenceWithTimezone, ParsingComponents, ParsingResult } from "./results";
+import { Component, ParsedResult, ParsingOption, ParsingReference } from "./index";
+import { AsyncDebugBlock, DebugHandler } from "./debugging";
+export interface Configuration {
+    parsers: Parser[];
+    refiners: Refiner[];
+}
+export interface Parser {
+    pattern(context: ParsingContext): RegExp;
+    extract(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | ParsingResult | {
+        [c in Component]?: number;
+    } | null;
+}
+export interface Refiner {
+    refine: (context: ParsingContext, results: ParsingResult[]) => ParsingResult[];
+}
+export declare class Chrono {
+    parsers: Array<Parser>;
+    refiners: Array<Refiner>;
+    constructor(configuration?: Configuration);
+    clone(): Chrono;
+    parseDate(text: string, referenceDate?: ParsingReference | Date, option?: ParsingOption): Date | null;
+    parse(text: string, referenceDate?: ParsingReference | Date, option?: ParsingOption): ParsedResult[];
+    private static executeParser;
+}
+export declare class ParsingContext implements DebugHandler {
+    readonly text: string;
+    readonly option: ParsingOption;
+    readonly reference: ReferenceWithTimezone;
+    readonly refDate: Date;
+    constructor(text: string, refDate?: ParsingReference | Date, option?: ParsingOption);
+    createParsingComponents(components?: {
+        [c in Component]?: number;
+    } | ParsingComponents): ParsingComponents;
+    createParsingResult(index: number, textOrEndIndex: number | string, startComponents?: {
+        [c in Component]?: number;
+    } | ParsingComponents, endComponents?: {
+        [c in Component]?: number;
+    } | ParsingComponents): ParsingResult;
+    debug(block: AsyncDebugBlock): void;
+}

package/dist/esm/chrono.js

@@ -0,0 +1,99 @@
+import { ReferenceWithTimezone, ParsingComponents, ParsingResult } from "./results";
+import { createCasualConfiguration } from "./locales/en";
+export class Chrono {
+    constructor(configuration) {
+        configuration = configuration || createCasualConfiguration();
+        this.parsers = [...configuration.parsers];
+        this.refiners = [...configuration.refiners];
+    }
+    clone() {
+        return new Chrono({
+            parsers: [...this.parsers],
+            refiners: [...this.refiners],
+        });
+    }
+    parseDate(text, referenceDate, option) {
+        const results = this.parse(text, referenceDate, option);
+        return results.length > 0 ? results[0].start.date() : null;
+    }
+    parse(text, referenceDate, option) {
+        const context = new ParsingContext(text, referenceDate, option);
+        let results = [];
+        this.parsers.forEach((parser) => {
+            const parsedResults = Chrono.executeParser(context, parser);
+            results = results.concat(parsedResults);
+        });
+        results.sort((a, b) => {
+            return a.index - b.index;
+        });
+        this.refiners.forEach(function (refiner) {
+            results = refiner.refine(context, results);
+        });
+        return results;
+    }
+    static executeParser(context, parser) {
+        const results = [];
+        const pattern = parser.pattern(context);
+        const originalText = context.text;
+        let remainingText = context.text;
+        let match = pattern.exec(remainingText);
+        while (match) {
+            const index = match.index + originalText.length - remainingText.length;
+            match.index = index;
+            const result = parser.extract(context, match);
+            if (!result) {
+                remainingText = originalText.substring(match.index + 1);
+                match = pattern.exec(remainingText);
+                continue;
+            }
+            let parsedResult = null;
+            if (result instanceof ParsingResult) {
+                parsedResult = result;
+            }
+            else if (result instanceof ParsingComponents) {
+                parsedResult = context.createParsingResult(match.index, match[0]);
+                parsedResult.start = result;
+            }
+            else {
+                parsedResult = context.createParsingResult(match.index, match[0], result);
+            }
+            context.debug(() => console.log(`${parser.constructor.name} extracted result ${parsedResult}`));
+            results.push(parsedResult);
+            remainingText = originalText.substring(index + parsedResult.text.length);
+            match = pattern.exec(remainingText);
+        }
+        return results;
+    }
+}
+export class ParsingContext {
+    constructor(text, refDate, option) {
+        this.text = text;
+        this.reference = new ReferenceWithTimezone(refDate);
+        this.option = option ?? {};
+        this.refDate = this.reference.instant;
+    }
+    createParsingComponents(components) {
+        if (components instanceof ParsingComponents) {
+            return components;
+        }
+        return new ParsingComponents(this.reference, components);
+    }
+    createParsingResult(index, textOrEndIndex, startComponents, endComponents) {
+        const text = typeof textOrEndIndex === "string" ? textOrEndIndex : this.text.substring(index, textOrEndIndex);
+        const start = startComponents ? this.createParsingComponents(startComponents) : null;
+        const end = endComponents ? this.createParsingComponents(endComponents) : null;
+        return new ParsingResult(this.reference, index, text, start, end);
+    }
+    debug(block) {
+        if (this.option.debug) {
+            if (this.option.debug instanceof Function) {
+                this.option.debug(block);
+            }
+            else {
+                const handler = this.option.debug;
+                handler.debug(block);
+            }
+        }
+    }
+}
+//# sourceMappingURL=chrono.js.map

package/dist/esm/chrono.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"chrono.js","sourceRoot":"","sources":["../../src/chrono.ts"],"names":[],"mappings":"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"}