chrono-node 2.3.6 → 2.3.9

package/dist/utils/dayjs.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"dayjs.js","sourceRoot":"","sources":["../../src/utils/dayjs.ts"],"names":[],"mappings":";;;AAEA,oCAAoC;AAEpC,SAAgB,gBAAgB,CAAC,SAA4B,EAAE,WAAwB;IACnF,WAAW,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC;IACxC,iBAAiB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;IAC1C,gBAAgB,CAAC,SAAS,EAAE,WAAW,CAAC,CAAC;AAC7C,CAAC;AAJD,4CAIC;AAED,SAAgB,iBAAiB,CAAC,SAA4B,EAAE,WAAwB;IACpF,SAAS,CAAC,MAAM,CAAC,KAAK,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,SAAS,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;IACnD,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;AACjD,CAAC;AAJD,8CAIC;AAED,SAAgB,iBAAiB,CAAC,SAA4B,EAAE,WAAwB;IACpF,SAAS,CAAC,MAAM,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC7C,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IACjD,SAAS,CAAC,MAAM,CAAC,aAAa,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;IAC3D,IAAI,SAAS,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,EAAE,EAAE;QAC5B,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;KAC7C;SAAM;QACH,SAAS,CAAC,MAAM,CAAC,UAAU,EAAE,gBAAQ,CAAC,EAAE,CAAC,CAAC;KAC7C;AACL,CAAC;AAVD,8CAUC;AAED,SAAgB,gBAAgB,CAAC,SAA4B,EAAE,WAAwB;IACnF,SAAS,CAAC,KAAK,CAAC,MAAM,EAAE,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC;IAC5C,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,QAAQ,EAAE,WAAW,CAAC,MAAM,EAAE,CAAC,CAAC;IAChD,SAAS,CAAC,KAAK,CAAC,aAAa,EAAE,WAAW,CAAC,WAAW,EAAE,CAAC,CAAC;AAC9D,CAAC;AALD,4CAKC"}

package/dist/utils/pattern.js

@@ -28,3 +28,4 @@ function matchAnyPattern(dictionary) {
     return `(?:${joinedTerms})`;
 }
 exports.matchAnyPattern = matchAnyPattern;
+//# sourceMappingURL=pattern.js.map

package/dist/utils/pattern.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"pattern.js","sourceRoot":"","sources":["../../src/utils/pattern.ts"],"names":[],"mappings":";;;AAEA,SAAgB,uBAAuB,CAAC,MAAc,EAAE,qBAA6B;IACjF,MAAM,8BAA8B,GAAG,qBAAqB,CAAC,OAAO,CAAC,WAAW,EAAE,KAAK,CAAC,CAAC;IACzF,OAAO,GAAG,MAAM,GAAG,8BAA8B,wBAAwB,8BAA8B,SAAS,CAAC;AACrH,CAAC;AAHD,0DAGC;AAED,SAAgB,YAAY,CAAC,UAA0B;IACnD,IAAI,IAAc,CAAC;IACnB,IAAI,UAAU,YAAY,KAAK,EAAE;QAC7B,IAAI,GAAG,CAAC,GAAG,UAAU,CAAC,CAAC;KAC1B;SAAM,IAAI,UAAU,YAAY,GAAG,EAAE;QAClC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAE,UAAmC,CAAC,IAAI,EAAE,CAAC,CAAC;KAClE;SAAM;QACH,IAAI,GAAG,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,CAAC;KAClC;IAED,OAAO,IAAI,CAAC;AAChB,CAAC;AAXD,oCAWC;AAED,SAAgB,eAAe,CAAC,UAA0B;IAGtD,MAAM,WAAW,GAAG,YAAY,CAAC,UAAU,CAAC;SACvC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,MAAM,GAAG,CAAC,CAAC,MAAM,CAAC;SACnC,IAAI,CAAC,GAAG,CAAC;SACT,OAAO,CAAC,KAAK,EAAE,KAAK,CAAC,CAAC;IAE3B,OAAO,MAAM,WAAW,GAAG,CAAC;AAChC,CAAC;AATD,0CASC"}

package/dist/utils/timeunits.js

@@ -28,3 +28,4 @@ function addImpliedTimeUnits(components, timeUnits) {
     return output;
 }
 exports.addImpliedTimeUnits = addImpliedTimeUnits;
+//# sourceMappingURL=timeunits.js.map

package/dist/utils/timeunits.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"timeunits.js","sourceRoot":"","sources":["../../src/utils/timeunits.ts"],"names":[],"mappings":";;;AAKA,SAAgB,gBAAgB,CAAC,SAAoB;IACjD,MAAM,QAAQ,GAAG,EAAE,CAAC;IACpB,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;QAEzB,QAAQ,CAAC,GAAG,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC;KACnC;IAED,OAAO,QAAqB,CAAC;AACjC,CAAC;AARD,4CAQC;AAED,SAAgB,mBAAmB,CAAC,UAA6B,EAAE,SAAoB;IACnF,MAAM,MAAM,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;IAElC,IAAI,IAAI,GAAG,UAAU,CAAC,KAAK,EAAE,CAAC;IAC9B,KAAK,MAAM,GAAG,IAAI,SAAS,EAAE;QAEzB,IAAI,GAAG,IAAI,CAAC,GAAG,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE,GAAgB,CAAC,CAAC;KACrD;IAED,IAAI,KAAK,IAAI,SAAS,IAAI,GAAG,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,IAAI,OAAO,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,EAAE;QAC9G,MAAM,CAAC,KAAK,CAAC,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;QACjC,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,CAAC,KAAK,EAAE,GAAG,CAAC,CAAC,CAAC;QACxC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;KACrC;IAED,IAAI,QAAQ,IAAI,SAAS,IAAI,QAAQ,IAAI,SAAS,IAAI,MAAM,IAAI,SAAS,EAAE;QACvE,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,IAAI,CAAC,MAAM,EAAE,CAAC,CAAC;QACtC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC;KACrC;IAED,OAAO,MAAM,CAAC;AAClB,CAAC;AAtBD,kDAsBC"}

package/package.json

@@ -15,7 +15,7 @@
     "preset": "ts-jest"
   },
   "license": "MIT",
-  "version": "2.3.6",
+  "version": "2.3.9",
   "directories": {
     "source": "./src",
     "test": "./test"

package/src/common/casualReferences.ts

@@ -1,6 +1,6 @@
 import { ParsingComponents, ReferenceWithTimezone } from "../results";
 import dayjs from "dayjs";
-import { assignSimilarDate, assignSimilarTime, assignTheNextDay, implySimilarTime } from "../utils/dayjs";
+import { assignSimilarDate, assignSimilarTime, implySimilarTime } from "../utils/dayjs";
 import { Meridiem } from "../index";
 
 export function now(reference: ReferenceWithTimezone): ParsingComponents {
@@ -26,21 +26,26 @@ export function today(reference: ReferenceWithTimezone): ParsingComponents {
  * The previous day. Imply the same time.
  */
 export function yesterday(reference: ReferenceWithTimezone): ParsingComponents {
-    let targetDate = dayjs(reference.instant);
-    const component = new ParsingComponents(reference, {});
-    targetDate = targetDate.add(-1, "day");
-    assignSimilarDate(component, targetDate);
-    implySimilarTime(component, targetDate);
-    return component;
+    return theDayBefore(reference, 1);
+}
+
+export function theDayBefore(reference: ReferenceWithTimezone, numDay: number): ParsingComponents {
+    return theDayAfter(reference, -numDay);
 }
 
 /**
  * The following day with dayjs.assignTheNextDay()
  */
 export function tomorrow(reference: ReferenceWithTimezone): ParsingComponents {
-    const targetDate = dayjs(reference.instant);
+    return theDayAfter(reference, 1);
+}
+
+export function theDayAfter(reference: ReferenceWithTimezone, nDays: number): ParsingComponents {
+    let targetDate = dayjs(reference.instant);
     const component = new ParsingComponents(reference, {});
-    assignTheNextDay(component, targetDate);
+    targetDate = targetDate.add(nDays, "day");
+    assignSimilarDate(component, targetDate);
+    implySimilarTime(component, targetDate);
     return component;
 }
 
@@ -52,3 +57,53 @@ export function tonight(reference: ReferenceWithTimezone, implyHour = 22): Parsi
     assignSimilarDate(component, targetDate);
     return component;
 }
+
+export function lastNight(reference: ReferenceWithTimezone, implyHour = 0): ParsingComponents {
+    let targetDate = dayjs(reference.instant);
+    const component = new ParsingComponents(reference, {});
+    if (targetDate.hour() < 6) {
+        targetDate = targetDate.add(-1, "day");
+    }
+    assignSimilarDate(component, targetDate);
+    component.imply("hour", implyHour);
+    return component;
+}
+
+export function evening(reference: ReferenceWithTimezone, implyHour = 20): ParsingComponents {
+    const component = new ParsingComponents(reference, {});
+    component.imply("meridiem", Meridiem.PM);
+    component.imply("hour", implyHour);
+    return component;
+}
+
+export function yesterdayEvening(reference: ReferenceWithTimezone, implyHour = 20): ParsingComponents {
+    let targetDate = dayjs(reference.instant);
+    const component = new ParsingComponents(reference, {});
+    targetDate = targetDate.add(-1, "day");
+    assignSimilarDate(component, targetDate);
+    component.imply("hour", implyHour);
+    component.imply("meridiem", Meridiem.PM);
+    return component;
+}
+
+export function midnight(reference: ReferenceWithTimezone): ParsingComponents {
+    const component = new ParsingComponents(reference, {});
+    component.imply("hour", 0);
+    component.imply("minute", 0);
+    component.imply("second", 0);
+    return component;
+}
+
+export function morning(reference: ReferenceWithTimezone, implyHour = 6): ParsingComponents {
+    const component = new ParsingComponents(reference, {});
+    component.imply("meridiem", Meridiem.AM);
+    component.imply("hour", implyHour);
+    return component;
+}
+
+export function noon(reference: ReferenceWithTimezone): ParsingComponents {
+    const component = new ParsingComponents(reference, {});
+    component.imply("meridiem", Meridiem.AM);
+    component.imply("hour", 12);
+    return component;
+}

package/src/common/parsers/AbstractParserWithWordBoundary.ts

@@ -15,13 +15,17 @@ export abstract class AbstractParserWithWordBoundaryChecking implements Parser {
     private cachedInnerPattern?: RegExp = null;
     private cachedPattern?: RegExp = null;
 
+    patternLeftBoundary(): string {
+        return `(\\W|^)`;
+    }
+
     pattern(context: ParsingContext): RegExp {
         const innerPattern = this.innerPattern(context);
         if (innerPattern == this.cachedInnerPattern) {
             return this.cachedPattern;
         }
 
-        this.cachedPattern = new RegExp(`(\\W|^)${innerPattern.source}`, innerPattern.flags);
+        this.cachedPattern = new RegExp(`${this.patternLeftBoundary()}${innerPattern.source}`, innerPattern.flags);
         this.cachedInnerPattern = innerPattern;
         return this.cachedPattern;
     }

package/src/common/parsers/AbstractTimeExpressionParser.ts

@@ -3,23 +3,23 @@ import { ParsingComponents, ParsingResult } from "../../results";
 import { Meridiem } from "../../index";
 
 // prettier-ignore
-function primaryTimePattern(primaryPrefix: string, primarySuffix: string) {
+function primaryTimePattern(leftBoundary: string, primaryPrefix: string, primarySuffix: string, flags: string) {
     return new RegExp(
-        "(^|\\s|T|\\b)" +
+            `${leftBoundary}` +
             `${primaryPrefix}` +
-            "(\\d{1,4})" +
-            "(?:" +
-                "(?:\\.|\\:|\\：)" +
-                "(\\d{1,2})" +
-                "(?:" +
-                    "(?:\\:|\\：)" +
-                    "(\\d{2})" +
-                    "(?:\\.(\\d{1,6}))?" +
-                ")?" +
-            ")?" +
-            "(?:\\s*(a\\.m\\.|p\\.m\\.|am?|pm?))?" +
+            `(\\d{1,4})` +
+            `(?:` +
+                `(?:\\.|:|：)` +
+                `(\\d{1,2})` +
+                `(?:` +
+                    `(?::|：)` +
+                    `(\\d{2})` +
+                    `(?:\\.(\\d{1,6}))?` +
+                `)?` +
+            `)?` +
+            `(?:\\s*(a\\.m\\.|p\\.m\\.|am?|pm?))?` +
             `${primarySuffix}`,
-        "i"
+        flags
     );
 }
 
@@ -27,16 +27,16 @@ function primaryTimePattern(primaryPrefix: string, primarySuffix: string) {
 function followingTimePatten(followingPhase: string, followingSuffix: string) {
     return new RegExp(
         `^(${followingPhase})` +
-            "(\\d{1,4})" +
-            "(?:" +
-                "(?:\\.|\\:|\\：)" +
-                "(\\d{1,2})" +
-                "(?:" +
-                    "(?:\\.|\\:|\\：)" +
-                    "(\\d{1,2})(?:\\.(\\d{1,6}))?" +
-                ")?" +
-            ")?" +
-            "(?:\\s*(a\\.m\\.|p\\.m\\.|am?|pm?))?" +
+            `(\\d{1,4})` +
+            `(?:` +
+                `(?:\\.|\\:|\\：)` +
+                `(\\d{1,2})` +
+                `(?:` +
+                    `(?:\\.|\\:|\\：)` +
+                    `(\\d{1,2})(?:\\.(\\d{1,6}))?` +
+                `)?` +
+            `)?` +
+            `(?:\\s*(a\\.m\\.|p\\.m\\.|am?|pm?))?` +
             `${followingSuffix}`,
         "i"
     );
@@ -57,12 +57,20 @@ export abstract class AbstractTimeExpressionParser implements Parser {
         this.strictMode = strictMode;
     }
 
+    patternFlags(): string {
+        return "i";
+    }
+
+    primaryPatternLeftBoundary(): string {
+        return `(^|\\s|T|\\b)`;
+    }
+
     primarySuffix(): string {
-        return "(?=\\W|$)";
+        return `(?=\\W|$)`;
     }
 
     followingSuffix(): string {
-        return "(?=\\W|$)";
+        return `(?=\\W|$)`;
     }
 
     pattern(context: ParsingContext): RegExp {
@@ -84,6 +92,12 @@ export abstract class AbstractTimeExpressionParser implements Parser {
         const remainingText = context.text.substring(match.index);
         const followingPattern = this.getFollowingTimePatternThroughCache();
         const followingMatch = followingPattern.exec(remainingText);
+
+        // Pattern "456-12", "2022-12" should not be time without proper context
+        if (text.match(/^\d{3,4}/) && followingMatch && followingMatch[0].match(/^\s*([+-])\s*\d{2,4}$/)) {
+            return null;
+        }
+
         if (
             !followingMatch ||
             // Pattern "YY.YY -XXXX" is more like timezone offset
@@ -305,11 +319,16 @@ export abstract class AbstractTimeExpressionParser implements Parser {
     }
 
     private checkAndReturnWithoutFollowingPattern(result) {
-        // Single digit (e.g "1") should not be counted as time expression
+        // Single digit (e.g "1") should not be counted as time expression (without proper context)
         if (result.text.match(/^\d$/)) {
             return null;
         }
 
+        // Three or more digit (e.g. "203", "2014") should not be counted as time expression (without proper context)
+        if (result.text.match(/^\d\d\d+$/)) {
+            return null;
+        }
+
         // Instead of "am/pm", it ends with "a" or "p" (e.g "1a", "123p"), this seems unlikely
         if (result.text.match(/\d[apAP]$/)) {
             return null;
@@ -383,7 +402,12 @@ export abstract class AbstractTimeExpressionParser implements Parser {
             return this.cachedPrimaryTimePattern;
         }
 
-        this.cachedPrimaryTimePattern = primaryTimePattern(primaryPrefix, primarySuffix);
+        this.cachedPrimaryTimePattern = primaryTimePattern(
+            this.primaryPatternLeftBoundary(),
+            primaryPrefix,
+            primarySuffix,
+            this.patternFlags()
+        );
         this.cachedPrimaryPrefix = primaryPrefix;
         this.cachedPrimarySuffix = primarySuffix;
         return this.cachedPrimaryTimePattern;

package/src/common/refiners/ExtractTimezoneAbbrRefiner.ts

@@ -221,7 +221,9 @@ export default class ExtractTimezoneAbbrRefiner implements Refiner {
             }
 
             context.debug(() => {
-                console.log(`Extracting timezone: '${timezoneAbbr}' into : ${extractedTimezoneOffset}`);
+                console.log(
+                    `Extracting timezone: '${timezoneAbbr}' into: ${extractedTimezoneOffset} for: ${result.start}`
+                );
             });
 
             const currentTimezoneOffset = result.start.get("timezoneOffset");

package/src/common/refiners/ExtractTimezoneOffsetRefiner.ts

@@ -1,7 +1,7 @@
 import { ParsingContext, Refiner } from "../../chrono";
 import { ParsingResult } from "../../results";
 
-const TIMEZONE_OFFSET_PATTERN = new RegExp("^\\s*(?:(?:GMT|UTC)\\s?)?([+-])(\\d{1,2})(?::?(\\d{2}))?", "i");
+const TIMEZONE_OFFSET_PATTERN = new RegExp("^\\s*(?:\\(?(?:GMT|UTC)\\s?)?([+-])(\\d{1,2})(?::?(\\d{2}))?\\)?", "i");
 const TIMEZONE_OFFSET_SIGN_GROUP = 1;
 const TIMEZONE_OFFSET_HOUR_OFFSET_GROUP = 2;
 const TIMEZONE_OFFSET_MINUTE_OFFSET_GROUP = 3;
@@ -26,6 +26,10 @@ export default class ExtractTimezoneOffsetRefiner implements Refiner {
             const hourOffset = parseInt(match[TIMEZONE_OFFSET_HOUR_OFFSET_GROUP]);
             const minuteOffset = parseInt(match[TIMEZONE_OFFSET_MINUTE_OFFSET_GROUP] || "0");
             let timezoneOffset = hourOffset * 60 + minuteOffset;
+            // No timezones have offsets greater than 14 hours, so disregard this match
+            if (timezoneOffset > 14 * 60) {
+                return;
+            }
             if (match[TIMEZONE_OFFSET_SIGN_GROUP] === "-") {
                 timezoneOffset = -timezoneOffset;
             }

package/src/index.ts

@@ -106,7 +106,8 @@ import * as ja from "./locales/ja";
 import * as pt from "./locales/pt";
 import * as nl from "./locales/nl";
 import * as zh from "./locales/zh";
-export { de, fr, ja, pt, nl, zh };
+import * as ru from "./locales/ru";
+export { de, fr, ja, pt, nl, zh, ru };
 
 /**
  * A shortcut for {@link en | chrono.en.strict}

package/src/locales/de/constants.ts

@@ -1,4 +1,4 @@
-import { OpUnitType } from "dayjs";
+import { OpUnitType, QUnitType } from "dayjs";
 import { matchAnyPattern, repeatedTimeunitPattern } from "../../utils/pattern";
 import { findMostLikelyADYear } from "../../calculation/years";
 import { TimeUnits } from "../../utils/timeunits";
@@ -22,9 +22,12 @@ export const WEEKDAY_DICTIONARY: { [word: string]: number } = {
 
 export const MONTH_DICTIONARY: { [word: string]: number } = {
     "januar": 1,
+    "jänner": 1,
+    "janner": 1,
     "jan": 1,
     "jan.": 1,
     "februar": 2,
+    "feber": 2,
     "feb": 2,
     "feb.": 2,
     "märz": 3,
@@ -64,6 +67,10 @@ export const MONTH_DICTIONARY: { [word: string]: number } = {
 
 export const INTEGER_WORD_DICTIONARY: { [word: string]: number } = {
     "eins": 1,
+    "eine": 1,
+    "einem": 1,
+    "einen": 1,
+    "einer": 1,
     "zwei": 2,
     "drei": 3,
     "vier": 4,
@@ -79,29 +86,37 @@ export const INTEGER_WORD_DICTIONARY: { [word: string]: number } = {
     "zwoelf": 12,
 };
 
-export const TIME_UNIT_DICTIONARY: { [word: string]: OpUnitType } = {
-    sec: "second",
-    second: "second",
-    seconds: "second",
+export const TIME_UNIT_DICTIONARY: { [word: string]: OpUnitType | QUnitType } = {
+    sek: "second",
+    sekunde: "second",
+    sekunden: "second",
     min: "minute",
-    mins: "minute",
     minute: "minute",
-    minutes: "minute",
+    minuten: "minute",
     h: "hour",
-    hr: "hour",
-    hrs: "hour",
-    hour: "hour",
-    hours: "hour",
-    day: "d",
-    days: "d",
-    week: "week",
-    weeks: "week",
-    month: "month",
-    months: "month",
-    y: "year",
-    yr: "year",
-    year: "year",
-    years: "year",
+    std: "hour",
+    stunde: "hour",
+    stunden: "hour",
+    tag: "d",
+    tage: "d",
+    tagen: "d",
+    woche: "week",
+    wochen: "week",
+    monat: "month",
+    monate: "month",
+    monaten: "month",
+    monats: "month",
+    quartal: "quarter",
+    quartals: "quarter",
+    quartale: "quarter",
+    quartalen: "quarter",
+    a: "year",
+    j: "year",
+    jr: "year",
+    jahr: "year",
+    jahre: "year",
+    jahren: "year",
+    jahres: "year",
 };
 
 //-----------------------------
@@ -131,7 +146,7 @@ export function parseNumberPattern(match: string): number {
 
 //-----------------------------
 
-export const YEAR_PATTERN = `(?:[0-9]{1,4}(?:\\s*[vn]\\.?\\s*C(?:hr)?\\.?)?)`;
+export const YEAR_PATTERN = `(?:[0-9]{1,4}(?:\\s*[vn]\\.?\\s*(?:C(?:hr)?|(?:u\\.?|d\\.?(?:\\s*g\\.?)?)?\\s*Z)\\.?|\\s*(?:u\\.?|d\\.?(?:\\s*g\\.)?)\\s*Z\\.?)?)`;
 export function parseYear(match: string): number {
     if (/v/i.test(match)) {
         // v.Chr.
@@ -143,6 +158,11 @@ export function parseYear(match: string): number {
         return parseInt(match.replace(/[^0-9]+/gi, ""));
     }
 
+    if (/z/i.test(match)) {
+        // n.Chr. as "uZ" or "dgZ"
+        return parseInt(match.replace(/[^0-9]+/gi, ""));
+    }
+
     const rawYearNumber = parseInt(match);
     return findMostLikelyADYear(rawYearNumber);
 }

package/src/locales/de/index.ts

@@ -5,11 +5,13 @@ import SlashDateFormatParser from "../../common/parsers/SlashDateFormatParser";
 import ISOFormatParser from "../../common/parsers/ISOFormatParser";
 import DETimeExpressionParser from "./parsers/DETimeExpressionParser";
 import DEWeekdayParser from "./parsers/DEWeekdayParser";
+import DESpecificTimeExpressionParser from "./parsers/DESpecificTimeExpressionParser";
 import DEMergeDateRangeRefiner from "./refiners/DEMergeDateRangeRefiner";
 import DEMergeDateTimeRefiner from "./refiners/DEMergeDateTimeRefiner";
 import DECasualDateParser from "./parsers/DECasualDateParser";
 import DECasualTimeParser from "./parsers/DECasualTimeParser";
 import DEMonthNameLittleEndianParser from "./parsers/DEMonthNameLittleEndianParser";
+import DETimeUnitRelativeFormatParser from "./parsers/DETimeUnitRelativeFormatParser";
 
 // Shortcuts
 export const casual = new Chrono(createCasualConfiguration());
@@ -27,6 +29,7 @@ export function createCasualConfiguration(littleEndian = true): Configuration {
     const option = createConfiguration(false, littleEndian);
     option.parsers.unshift(new DECasualTimeParser());
     option.parsers.unshift(new DECasualDateParser());
+    option.parsers.unshift(new DETimeUnitRelativeFormatParser());
     return option;
 }
 
@@ -37,6 +40,7 @@ export function createConfiguration(strictMode = true, littleEndian = true): Con
                 new ISOFormatParser(),
                 new SlashDateFormatParser(littleEndian),
                 new DETimeExpressionParser(),
+                new DESpecificTimeExpressionParser(),
                 new DEMonthNameLittleEndianParser(),
                 new DEWeekdayParser(),
             ],

package/src/locales/de/parsers/DESpecificTimeExpressionParser.ts

@@ -0,0 +1,150 @@
+import { Parser, ParsingContext } from "../../../chrono";
+import { ParsingComponents, ParsingResult } from "../../../results";
+import { Meridiem } from "../../../index";
+
+/**
+ * 8h10m00s
+ * 8h10m00
+ * 8h10
+ * 8 Uhr
+ * 8h10m00s Uhr
+ * 8:10 Uhr
+ */
+const FIRST_REG_PATTERN = new RegExp(
+    "(^|\\s|T)" +
+        "(?:(?:um|von)\\s*)?" +
+        "(\\d{1,2})(?:h|:)?" +
+        "(?:(\\d{1,2})(?:m|:)?)?" +
+        "(?:(\\d{1,2})(?:s)?)?" +
+        "(?:\\s*Uhr)?" +
+        "(?:\\s*(morgens|vormittags|nachmittags|abends|nachts|am\\s+(?:Morgen|Vormittag|Nachmittag|Abend)|in\\s+der\\s+Nacht))?" +
+        "(?=\\W|$)",
+    "i"
+);
+
+const SECOND_REG_PATTERN = new RegExp(
+    "^\\s*(\\-|\\–|\\~|\\〜|bis(?:\\s+um)?|\\?)\\s*" +
+        "(\\d{1,2})(?:h|:)?" +
+        "(?:(\\d{1,2})(?:m|:)?)?" +
+        "(?:(\\d{1,2})(?:s)?)?" +
+        "(?:\\s*Uhr)?" +
+        "(?:\\s*(morgens|vormittags|nachmittags|abends|nachts|am\\s+(?:Morgen|Vormittag|Nachmittag|Abend)|in\\s+der\\s+Nacht))?" +
+        "(?=\\W|$)",
+    "i"
+);
+
+const HOUR_GROUP = 2;
+const MINUTE_GROUP = 3;
+const SECOND_GROUP = 4;
+const AM_PM_HOUR_GROUP = 5;
+
+export default class DESpecificTimeExpressionParser implements Parser {
+    pattern(context): RegExp {
+        return FIRST_REG_PATTERN;
+    }
+
+    extract(context: ParsingContext, match: RegExpMatchArray): ParsingResult | null {
+        const result = context.createParsingResult(match.index + match[1].length, match[0].substring(match[1].length));
+
+        // This looks more like a year e.g. 2020
+        if (result.text.match(/^\d{4}$/)) {
+            match.index += match[0].length;
+            return null;
+        }
+
+        result.start = DESpecificTimeExpressionParser.extractTimeComponent(result.start.clone(), match);
+        if (!result.start) {
+            match.index += match[0].length;
+            return null;
+        }
+
+        const remainingText = context.text.substring(match.index + match[0].length);
+        const secondMatch = SECOND_REG_PATTERN.exec(remainingText);
+        if (secondMatch) {
+            result.end = DESpecificTimeExpressionParser.extractTimeComponent(result.start.clone(), secondMatch);
+            if (result.end) {
+                result.text += secondMatch[0];
+            }
+        }
+
+        return result;
+    }
+
+    private static extractTimeComponent(
+        extractingComponents: ParsingComponents,
+        match: RegExpMatchArray
+    ): ParsingComponents | null {
+        let hour = 0;
+        let minute = 0;
+        let meridiem = null;
+
+        // ----- Hours
+        hour = parseInt(match[HOUR_GROUP]);
+
+        // ----- Minutes
+        if (match[MINUTE_GROUP] != null) {
+            minute = parseInt(match[MINUTE_GROUP]);
+        }
+
+        if (minute >= 60 || hour > 24) {
+            return null;
+        }
+
+        if (hour >= 12) {
+            meridiem = Meridiem.PM;
+        }
+
+        // ----- AM & PM
+        if (match[AM_PM_HOUR_GROUP] != null) {
+            if (hour > 12) return null;
+            const ampm = match[AM_PM_HOUR_GROUP].toLowerCase();
+            if (ampm.match(/morgen|vormittag/)) {
+                meridiem = Meridiem.AM;
+                if (hour == 12) {
+                    hour = 0;
+                }
+            }
+
+            if (ampm.match(/nachmittag|abend/)) {
+                meridiem = Meridiem.PM;
+                if (hour != 12) {
+                    hour += 12;
+                }
+            }
+
+            if (ampm.match(/nacht/)) {
+                if (hour == 12) {
+                    meridiem = Meridiem.AM;
+                    hour = 0;
+                } else if (hour < 6) {
+                    meridiem = Meridiem.AM;
+                } else {
+                    meridiem = Meridiem.PM;
+                    hour += 12;
+                }
+            }
+        }
+
+        extractingComponents.assign("hour", hour);
+        extractingComponents.assign("minute", minute);
+        if (meridiem !== null) {
+            extractingComponents.assign("meridiem", meridiem);
+        } else {
+            if (hour < 12) {
+                extractingComponents.imply("meridiem", Meridiem.AM);
+            } else {
+                extractingComponents.imply("meridiem", Meridiem.PM);
+            }
+        }
+
+        // ----- Second
+        if (match[SECOND_GROUP] != null) {
+            const second = parseInt(match[SECOND_GROUP]);
+            if (second >= 60) return null;
+
+            extractingComponents.assign("second", second);
+        }
+
+        return extractingComponents;
+    }
+}

package/src/locales/de/parsers/DETimeExpressionParser.ts

@@ -1,7 +1,6 @@
 import { AbstractTimeExpressionParser } from "../../../common/parsers/AbstractTimeExpressionParser";
 import { ParsingComponents } from "../../../results";
 import { ParsingContext } from "../../../chrono";
-import { Meridiem } from "../../../index";
 
 export default class DETimeExpressionParser extends AbstractTimeExpressionParser {
     primaryPrefix(): string {
@@ -12,30 +11,12 @@ export default class DETimeExpressionParser extends AbstractTimeExpressionParser
         return "\\s*(?:\\-|\\–|\\~|\\〜|bis)\\s*";
     }
 
-    primarySuffix(): string {
-        return "(?:\\s*uhr)?(?:\\s*(?:morgens|vormittags|nachmittags|abends|nachts))?(?=\\W|$)";
-    }
-
     extractPrimaryTimeComponents(context: ParsingContext, match: RegExpMatchArray): ParsingComponents | null {
-        const components = super.extractPrimaryTimeComponents(context, match);
-        if (components) {
-            if (match[0].endsWith("morgens") || match[0].endsWith("vormittags")) {
-                components.assign("meridiem", Meridiem.AM);
-                const hour = components.get("hour");
-                if (hour < 12) {
-                    components.assign("hour", components.get("hour"));
-                }
-            }
-
-            if (match[0].endsWith("nachmittags") || match[0].endsWith("abends") || match[0].endsWith("nachts")) {
-                components.assign("meridiem", Meridiem.PM);
-                const hour = components.get("hour");
-                if (hour < 12) {
-                    components.assign("hour", components.get("hour") + 12);
-                }
-            }
+        // This looks more like a year e.g. 2020
+        if (match[0].match(/^\s*\d{4}\s*$/)) {
+            return null;
         }
 
-        return components;
+        return super.extractPrimaryTimeComponents(context, match);
     }
 }