@autometa/datetime 0.0.0 → 0.1.0

package/CHANGELOG.md

@@ -0,0 +1,14 @@
+# @autometa/datetime
+
+## 0.1.0
+
+### Minor Changes
+
+- 554b77e: Releasing packages
+
+### Patch Changes
+
+- Updated dependencies [554b77e]
+  - @autometa/asserters@0.1.0
+  - @autometa/errors@0.1.0
+  - @autometa/phrases@0.1.0

package/dist/esm/index.js

@@ -17,7 +17,7 @@ var __privateMethod = (obj, member, method) => {
 };
 
 // src/dates/date-factory.ts
-import { camel, convertPhrase } from "@autometa/phrases";
+import { camel, convertPhrase, collapse } from "@autometa/phrases";
 
 // src/dates/midnight.ts
 function midnight() {
@@ -27,72 +27,130 @@ function midnight() {
 }
 
 // src/dates/date-factory.ts
-var _matchDayPhrase, matchDayPhrase_fn, _addDays, addDays_fn, _addSeconds, addSeconds_fn, _addMilliseconds, addMilliseconds_fn, _addHours, addHours_fn, _addMinutes, addMinutes_fn;
+import { AutomationError, raise } from "@autometa/errors";
+import { ConfirmDefined, ConfirmLengthAtLeast } from "@autometa/asserters";
+var _extractTimeFromPhrase, extractTimeFromPhrase_fn, _extractFutureFromPhrase, extractFutureFromPhrase_fn, _extractPastFromPhrase, extractPastFromPhrase_fn, _addYears, addYears_fn, _addMonths, addMonths_fn, _addWeeks, addWeeks_fn, _addDays, addDays_fn, _addSeconds, addSeconds_fn, _addMilliseconds, addMilliseconds_fn, _addHours, addHours_fn, _addMinutes, addMinutes_fn;
 var DateFactory = class {
   constructor() {
-    __privateAdd(this, _matchDayPhrase);
+    __privateAdd(this, _extractTimeFromPhrase);
+    __privateAdd(this, _extractFutureFromPhrase);
+    __privateAdd(this, _extractPastFromPhrase);
+    __privateAdd(this, _addYears);
+    __privateAdd(this, _addMonths);
+    __privateAdd(this, _addWeeks);
     __privateAdd(this, _addDays);
     __privateAdd(this, _addSeconds);
     __privateAdd(this, _addMilliseconds);
     __privateAdd(this, _addHours);
     __privateAdd(this, _addMinutes);
     this.phraseMap = /* @__PURE__ */ new Map([
-      ["beforeYesterday", this.make(-2, "days")],
-      ["yesterday", this.make(-1, "days")],
-      ["today", this.make(0, "days")],
-      ["tomorrow", this.make(1, "days")],
-      ["afterTomorrow", this.make(2, "days")],
-      ["nextWeek", this.make(7, "days")],
-      ["lastWeek", this.make(-7, "days")],
-      ["nextFortnight", this.make(14, "days")],
-      ["lastFortnight", this.make(-14, "days")],
-      ["midnight", midnight()]
+      ["now", () => this.make(0, "days")],
+      ["beforeYesterday", () => this.make(-2, "days")],
+      ["yesterday", () => this.make(-1, "days")],
+      ["today", () => this.make(0, "days")],
+      ["tomorrow", () => this.make(1, "days")],
+      ["afterTomorrow", () => this.make(2, "days")],
+      ["nextWeek", () => this.make(7, "days")],
+      ["lastWeek", () => this.make(-7, "days")],
+      ["nextFortnight", () => this.make(14, "days")],
+      ["lastFortnight", () => this.make(-14, "days")],
+      ["midnight", midnight]
     ]);
   }
-  fromPhrase(phrase) {
+  fromPhraseSafe(phrase) {
     const name = convertPhrase(phrase, camel);
     if (this.phraseMap.has(name)) {
-      return this.phraseMap.get(name);
+      return this.phraseMap.get(name)?.call(this);
     }
-    const matchDay = __privateMethod(this, _matchDayPhrase, matchDayPhrase_fn).call(this, phrase);
+    const matchDay = __privateMethod(this, _extractTimeFromPhrase, extractTimeFromPhrase_fn).call(this, phrase);
     if (matchDay) {
       return matchDay;
     }
     const parsed = new Date(phrase);
-    if (!isNaN(parsed.getTime()))
-      return parsed;
-    throw new Error(`Cannot find date matching '${phrase}'`);
+    if (isNaN(parsed.getTime())) {
+      return new Date(Date.parse(phrase));
+    }
+    return parsed;
   }
-  make(daysOffset, timeunit) {
-    switch (timeunit) {
+  fromPhrase(phrase) {
+    const result = this.fromPhraseSafe(phrase);
+    if (result) {
+      return result;
+    }
+    raise(
+      `Could not parse date from phrase ${phrase}. Please use a valid date string or a phrase from the following list: ${Array.from(
+        this.phraseMap.keys()
+      ).join(", ")}`
+    );
+  }
+  make(timeOffset, timeunit) {
+    const unit = timeunit.endsWith("s") ? timeunit : `${timeunit}s`;
+    switch (unit) {
+      case "years":
+        return __privateMethod(this, _addYears, addYears_fn).call(this, timeOffset);
+      case "months":
+        return __privateMethod(this, _addMonths, addMonths_fn).call(this, timeOffset);
+      case "weeks":
+        return __privateMethod(this, _addWeeks, addWeeks_fn).call(this, timeOffset);
       case "days":
-        return __privateMethod(this, _addDays, addDays_fn).call(this, daysOffset);
+        return __privateMethod(this, _addDays, addDays_fn).call(this, timeOffset);
       case "seconds":
-        return __privateMethod(this, _addSeconds, addSeconds_fn).call(this, daysOffset);
+        return __privateMethod(this, _addSeconds, addSeconds_fn).call(this, timeOffset);
       case "milliseconds":
-        return __privateMethod(this, _addMilliseconds, addMilliseconds_fn).call(this, daysOffset);
+        return __privateMethod(this, _addMilliseconds, addMilliseconds_fn).call(this, timeOffset);
       case "hours":
-        return __privateMethod(this, _addHours, addHours_fn).call(this, daysOffset);
+        return __privateMethod(this, _addHours, addHours_fn).call(this, timeOffset);
       case "minutes":
-        return __privateMethod(this, _addMinutes, addMinutes_fn).call(this, daysOffset);
+        return __privateMethod(this, _addMinutes, addMinutes_fn).call(this, timeOffset);
       default:
-        throw new Error(
-          `Invalid timeunit ${timeunit}, options are 'days', 'seconds', 'milliseconds', 'hours', 'minutes'`
+        throw new AutomationError(
+          `Invalid timeunit ${timeunit}, options are 'days', 'seconds', 'milliseconds', 'hours', 'minutes'. Non plural equivalents such as 'day' or 'week' are also accepted.`
         );
     }
   }
 };
-_matchDayPhrase = new WeakSet();
-matchDayPhrase_fn = function(phrase) {
-  if (phrase.match(/\d+ day(s)? ago?/gi)) {
-    const value = Number(phrase.match(/\d+/gi)?.pop());
-    return this.make(-value, "days");
+_extractTimeFromPhrase = new WeakSet();
+extractTimeFromPhrase_fn = function(phrase) {
+  return __privateMethod(this, _extractFutureFromPhrase, extractFutureFromPhrase_fn).call(this, phrase) ?? __privateMethod(this, _extractPastFromPhrase, extractPastFromPhrase_fn).call(this, phrase);
+};
+_extractFutureFromPhrase = new WeakSet();
+extractFutureFromPhrase_fn = function(phrase) {
+  const pastPattern = /(\d+) (.*)s? from now?/;
+  const pastMatch = pastPattern.exec(phrase);
+  if (ConfirmDefined(pastMatch) && ConfirmLengthAtLeast(pastMatch, 3)) {
+    const [_, value, unit] = pastMatch;
+    const timeunit = convertPhrase(unit, collapse);
+    return this.make(Number(value), timeunit);
   }
-  if (phrase.match(/\d+ day(s)?( from now)?/gi)) {
-    const value = Number(phrase.match(/\d+/gi)?.pop());
-    return this.make(value, "days");
+};
+_extractPastFromPhrase = new WeakSet();
+extractPastFromPhrase_fn = function(phrase) {
+  const pastPattern = /(\d+) (.*)(s)? ago?/gm;
+  const pastMatch = pastPattern.exec(phrase);
+  if (ConfirmDefined(pastMatch) && ConfirmLengthAtLeast(pastMatch, 3)) {
+    const [_, value, unit] = pastMatch;
+    const timeunit = convertPhrase(unit, camel);
+    return this.make(-Number(value), timeunit);
   }
 };
+_addYears = new WeakSet();
+addYears_fn = function(yearsOffset) {
+  const date = /* @__PURE__ */ new Date();
+  date.setFullYear(date.getFullYear() + yearsOffset);
+  return date;
+};
+_addMonths = new WeakSet();
+addMonths_fn = function(monthOffset) {
+  const date = /* @__PURE__ */ new Date();
+  date.setMonth(date.getMonth() + monthOffset);
+  return date;
+};
+_addWeeks = new WeakSet();
+addWeeks_fn = function(weekOffset) {
+  const date = /* @__PURE__ */ new Date();
+  date.setMonth(date.getMonth() + weekOffset / 4);
+  return date;
+};
 _addDays = new WeakSet();
 addDays_fn = function(daysOffset) {
   const date = /* @__PURE__ */ new Date();
@@ -206,6 +264,9 @@ var DatesObject = class {
   get fmt() {
     return __privateGet(this, _fmt);
   }
+  get now() {
+    return __privateGet(this, _factory).phraseMap.get("now");
+  }
   get beforeYesterday() {
     return __privateGet(this, _factory).phraseMap.get("beforeYesterday");
   }
@@ -239,6 +300,9 @@ var DatesObject = class {
   fromPhrase(phrase) {
     return __privateGet(this, _factory).fromPhrase(phrase);
   }
+  fromPhraseSafe(phrase) {
+    return __privateGet(this, _factory).fromPhraseSafe(phrase);
+  }
   make(timeOffset, timeUnit) {
     return __privateGet(this, _factory).make(timeOffset, timeUnit);
   }
@@ -247,6 +311,55 @@ _factory = new WeakMap();
 _iso = new WeakMap();
 _fmt = new WeakMap();
 var Dates = new DatesObject();
+
+// src/time/time.ts
+import { AssertKey } from "@autometa/asserters";
+import { camel as camel2, convertPhrase as convertPhrase2 } from "@autometa/phrases";
+var TimeDiff = class {
+  minutes(date1, date2) {
+    return this.millis(date1, date2) / 6e4;
+  }
+  seconds(date1, date2) {
+    return this.millis(date1, date2) / 1e3;
+  }
+  millis(date1, date2) {
+    const d1 = new Date(date1).getTime();
+    const d2 = new Date(date2).getTime();
+    return Math.abs(Math.round(d2 - d1));
+  }
+  days(date1, date2) {
+    return this.millis(date1, date2) / 864e5;
+  }
+  hours(date1, date2) {
+    return this.millis(date1, date2) / 36e5;
+  }
+  weeks(date1, date2) {
+    return this.millis(date1, date2) / 6048e5;
+  }
+};
+var _diff;
+var TimeObject = class {
+  constructor() {
+    __privateAdd(this, _diff, new TimeDiff());
+  }
+  get diff() {
+    return __privateGet(this, _diff);
+  }
+  fromPhrase(phrase) {
+    const propertyKey = convertPhrase2(phrase, camel2);
+    AssertKey(this.diff, propertyKey);
+    return Time.diff[propertyKey];
+  }
+};
+_diff = new WeakMap();
+var Time = new TimeObject();
 export {
-  Dates
+  DateFactory,
+  Dates,
+  FmtDateFactory,
+  IsoDateFactory,
+  Time,
+  TimeDiff,
+  TimeObject
 };
+//# sourceMappingURL=index.js.map

package/dist/esm/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../src/dates/date-factory.ts","../../src/dates/midnight.ts","../../src/dates/iso-date-factory.ts","../../src/dates/formatted-date-factory.ts","../../src/dates/dates.ts","../../src/time/time.ts"],"sourcesContent":["import { TimeUnit, camel, convertPhrase, collapse } from \"@autometa/phrases\";\nimport { midnight } from \"./midnight\";\nimport { AutomationError, raise } from \"@autometa/errors\";\nimport { ConfirmDefined, ConfirmLengthAtLeast } from \"@autometa/asserters\";\n\nexport class DateFactory {\n  phraseMap = new Map<string, () => Date>([\n    [\"now\", () => this.make(0, \"days\")],\n    [\"beforeYesterday\", () => this.make(-2, \"days\")],\n    [\"yesterday\", () => this.make(-1, \"days\")],\n    [\"today\", () => this.make(0, \"days\")],\n    [\"tomorrow\", () => this.make(1, \"days\")],\n    [\"afterTomorrow\", () => this.make(2, \"days\")],\n    [\"nextWeek\", () => this.make(7, \"days\")],\n    [\"lastWeek\", () => this.make(-7, \"days\")],\n    [\"nextFortnight\", () => this.make(14, \"days\")],\n    [\"lastFortnight\", () => this.make(-14, \"days\")],\n    [\"midnight\", midnight]\n  ]);\n\n  fromPhraseSafe(phrase: string) {\n    const name = convertPhrase(phrase, camel);\n    if (this.phraseMap.has(name)) {\n      return this.phraseMap.get(name)?.call(this);\n    }\n    const matchDay = this.#extractTimeFromPhrase(phrase);\n    if (matchDay) {\n      return matchDay;\n    }\n    const parsed = new Date(phrase);\n    if (isNaN(parsed.getTime())) {\n      return new Date(Date.parse(phrase));\n    }\n    return parsed;\n  }\n  fromPhrase(phrase: string) {\n    const result = this.fromPhraseSafe(phrase);\n    if (result) {\n      return result;\n    }\n    raise(\n      `Could not parse date from phrase ${phrase}. Please use a valid date string or a phrase from the following list: ${Array.from(\n        this.phraseMap.keys()\n      ).join(\", \")}`\n    );\n  }\n  make(timeOffset: number, timeunit: TimeUnit) {\n    const unit = timeunit.endsWith(\"s\") ? timeunit : `${timeunit}s`;\n    switch (unit) {\n      case \"years\":\n        return this.#addYears(timeOffset);\n      case \"months\":\n        return this.#addMonths(timeOffset);\n      case \"weeks\":\n        return this.#addWeeks(timeOffset);\n      case \"days\":\n        return this.#addDays(timeOffset);\n      case \"seconds\":\n        return this.#addSeconds(timeOffset);\n      case \"milliseconds\":\n        return this.#addMilliseconds(timeOffset);\n      case \"hours\":\n        return this.#addHours(timeOffset);\n      case \"minutes\":\n        return this.#addMinutes(timeOffset);\n      default:\n        throw new AutomationError(\n          `Invalid timeunit ${timeunit}, options are 'days', 'seconds', 'milliseconds', 'hours', 'minutes'. Non plural equivalents such as 'day' or 'week' are also accepted.`\n        );\n    }\n  }\n  #extractTimeFromPhrase(phrase: string) {\n    return (\n      this.#extractFutureFromPhrase(phrase) ??\n      this.#extractPastFromPhrase(phrase)\n    );\n  }\n  #extractFutureFromPhrase(phrase: string) {\n    const pastPattern = /(\\d+) (.*)s? from now?/;\n    const pastMatch = pastPattern.exec(phrase);\n\n    if (ConfirmDefined(pastMatch) && ConfirmLengthAtLeast(pastMatch, 3)) {\n      const [_, value, unit] = pastMatch;\n      const timeunit = convertPhrase(unit, collapse) as TimeUnit;\n      return this.make(Number(value), timeunit);\n    }\n  }\n  #extractPastFromPhrase(phrase: string) {\n    const pastPattern = /(\\d+) (.*)(s)? ago?/gm;\n    const pastMatch = pastPattern.exec(phrase);\n    if (ConfirmDefined(pastMatch) && ConfirmLengthAtLeast(pastMatch, 3)) {\n      const [_, value, unit] = pastMatch;\n      const timeunit = convertPhrase(unit, camel) as TimeUnit;\n      return this.make(-Number(value), timeunit);\n    }\n  }\n  #addYears(yearsOffset: number) {\n    const date = new Date();\n    date.setFullYear(date.getFullYear() + yearsOffset);\n    return date;\n  }\n  #addMonths(monthOffset: number) {\n    const date = new Date();\n    date.setMonth(date.getMonth() + monthOffset);\n    return date;\n  }\n  #addWeeks(weekOffset: number) {\n    const date = new Date();\n    date.setMonth(date.getMonth() + weekOffset / 4);\n    return date;\n  }\n  #addDays(daysOffset: number) {\n    const date = new Date();\n    date.setDate(date.getDate() + daysOffset);\n    return date;\n  }\n\n  #addSeconds(secondsOffset: number) {\n    const date = new Date();\n    date.setSeconds(date.getSeconds() + secondsOffset);\n    return date;\n  }\n\n  #addMilliseconds(millisecondsOffset: number) {\n    const date = new Date();\n    date.setMilliseconds(date.getMilliseconds() + millisecondsOffset);\n    return date;\n  }\n  #addHours(hoursOffset: number) {\n    const date = new Date();\n    date.setHours(date.getHours() + hoursOffset);\n    return date;\n  }\n  #addMinutes(minutesOffset: number) {\n    const date = new Date();\n    date.setMinutes(date.getMinutes() + minutesOffset);\n    return date;\n  }\n}\n","\nexport function midnight() {\n  const date = new Date();\n  date.setHours(0, 0, 0, 0);\n  return date;\n}\n","import { TimeUnit } from '@autometa/phrases';\nimport { midnight } from './midnight';\nimport { DateFactory } from './date-factory';\n\n\nexport class IsoDateFactory {\n  constructor(readonly dateFactory: DateFactory) { }\n  phraseMap = new Map<string, string>([\n    ['beforeYesterday', this.make(-2, 'days')],\n    ['yesterday', this.make(-1, 'days')],\n    ['today', this.make(0, 'days')],\n    ['tomorrow', this.make(1, 'days')],\n    ['afterTomorrow', this.make(2, 'days')],\n    ['nextWeek', this.make(7, 'days')],\n    ['lastWeek', this.make(-7, 'days')],\n    ['nextFortnight', this.make(14, 'days')],\n    ['lastFortnight', this.make(-14, 'days')],\n    ['midnight', midnight().toISOString()],\n  ]);\n  make(daysOffset: number, timeunit: TimeUnit) {\n    return this.dateFactory.make(daysOffset, timeunit).toISOString();\n  }\n  fromPhrase(phrase: string) {\n    return this.dateFactory.fromPhrase(phrase)?.toISOString();\n  }\n\n  get beforeYesterday() {\n    return this.phraseMap.get('beforeYesterday');\n  }\n  get yesterday() {\n    return this.phraseMap.get('yesterday');\n  }\n  get today() {\n    return this.phraseMap.get('today');\n  }\n  get tomorrow() {\n    return this.phraseMap.get('tomorrow');\n  }\n  get afterTomorrow() {\n    return this.phraseMap.get('afterTomorrow');\n  }\n  get midnight() {\n    return this.phraseMap.get('midnight');\n  }\n  get lastWeek() {\n    return this.phraseMap.get('lastWeek');\n  }\n  get nextWeek() {\n    return this.phraseMap.get('nextWeek');\n  }\n  get lastFortnight() {\n    return this.phraseMap.get('lastFortnight');\n  }\n  get nextFortnight() {\n    return this.phraseMap.get('nextFortnight');\n  }\n}\n","import { TimeUnit } from '@autometa/phrases';\nimport { DateFactory } from './date-factory';\n\n\nexport class FmtDateFactory {\n  constructor(readonly dateFactory: DateFactory) { }\n  make(daysOffset: number, timeunit: TimeUnit) {\n    return this.dateFactory\n      .make(daysOffset, timeunit)\n      .toISOString()\n      .split('T')[0];\n  }\n  fromPhrase(phrase: string) {\n    return this.dateFactory.fromPhrase(phrase)?.toISOString().split('T')[0];\n  }\n}\n","import { DateFactory } from \"./date-factory\";\nimport { IsoDateFactory } from \"./iso-date-factory\";\nimport { FmtDateFactory } from \"./formatted-date-factory\";\nimport { TimeUnit } from \"@autometa/phrases\";\n\nexport class DatesObject {\n  #factory: DateFactory = new DateFactory();\n  #iso = new IsoDateFactory(this.#factory);\n  #fmt = new FmtDateFactory(this.#factory);\n  get iso() {\n    return this.#iso;\n  }\n\n  get fmt() {\n    return this.#fmt;\n  }\n\n  get now(){\n    return this.#factory.phraseMap.get(\"now\");\n\n  }\n\n  get beforeYesterday() {\n    return this.#factory.phraseMap.get(\"beforeYesterday\");\n  }\n\n  get yesterday() {\n    return this.#factory.phraseMap.get(\"yesterday\");\n  }\n\n  get today() {\n    return this.#factory.phraseMap.get(\"today\");\n  }\n\n  get tomorrow() {\n    return this.#factory.phraseMap.get(\"tomorrow\");\n  }\n\n  get afterTomorrow() {\n    return this.#factory.phraseMap.get(\"afterTomorrow\");\n  }\n\n  get midnight() {\n    return this.#factory.phraseMap.get(\"midnight\");\n  }\n\n  get lastWeek() {\n    return this.#factory.phraseMap.get(\"lastWeek\");\n  }\n\n  get nextWeek() {\n    return this.#factory.phraseMap.get(\"nextWeek\");\n  }\n\n  get lastFortnight() {\n    return this.#factory.phraseMap.get(\"lastFortnight\");\n  }\n\n  get nextFortnight() {\n    return this.#factory.phraseMap.get(\"nextFortnight\");\n  }\n\n  fromPhrase(phrase: string) {\n    return this.#factory.fromPhrase(phrase);\n  }\n  \n  fromPhraseSafe(phrase: string) {\n    return this.#factory.fromPhraseSafe(phrase);\n  }\n\n  make(timeOffset: number, timeUnit: TimeUnit) {\n    return this.#factory.make(timeOffset, timeUnit);\n  }\n}\n\nexport const Dates = new DatesObject();","import { AssertKey } from \"@autometa/asserters\";\nimport { camel, convertPhrase } from \"@autometa/phrases\";\ntype TimeDiffFn = (date1: Date, date2: Date) => number;\n\nexport class TimeDiff {\n  minutes(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 60000;\n  }\n  seconds(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 1000;\n  }\n  millis(date1: Date, date2: Date) {\n    const d1 = new Date(date1).getTime();\n    const d2 = new Date(date2).getTime();\n    return Math.abs(Math.round(d2 - d1));\n  }\n  days(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 86400000;\n  }\n  hours(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 3600000;\n  }\n  weeks(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 604800000;\n  }\n}\n\nexport class TimeObject {\n  #diff = new TimeDiff();\n  get diff() {\n    return this.#diff;\n  }\n\n  fromPhrase(phrase: string): TimeDiffFn {\n    const propertyKey = convertPhrase(phrase, camel);\n    AssertKey(this.diff, propertyKey);\n    return Time.diff[propertyKey];\n  }\n}\n\nexport const Time = new TimeObject();\n"],"mappings":"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","names":["camel","convertPhrase","convertPhrase","camel"]}

package/dist/index.d.cts

@@ -0,0 +1,73 @@
+import { TimeUnit } from '@autometa/phrases';
+
+declare class DateFactory {
+    #private;
+    phraseMap: Map<string, () => Date>;
+    fromPhraseSafe(phrase: string): Date | undefined;
+    fromPhrase(phrase: string): Date;
+    make(timeOffset: number, timeunit: TimeUnit): Date;
+}
+
+declare class IsoDateFactory {
+    readonly dateFactory: DateFactory;
+    constructor(dateFactory: DateFactory);
+    phraseMap: Map<string, string>;
+    make(daysOffset: number, timeunit: TimeUnit): string;
+    fromPhrase(phrase: string): string;
+    get beforeYesterday(): string | undefined;
+    get yesterday(): string | undefined;
+    get today(): string | undefined;
+    get tomorrow(): string | undefined;
+    get afterTomorrow(): string | undefined;
+    get midnight(): string | undefined;
+    get lastWeek(): string | undefined;
+    get nextWeek(): string | undefined;
+    get lastFortnight(): string | undefined;
+    get nextFortnight(): string | undefined;
+}
+
+declare class FmtDateFactory {
+    readonly dateFactory: DateFactory;
+    constructor(dateFactory: DateFactory);
+    make(daysOffset: number, timeunit: TimeUnit): string;
+    fromPhrase(phrase: string): string;
+}
+
+declare class DatesObject {
+    #private;
+    get iso(): IsoDateFactory;
+    get fmt(): FmtDateFactory;
+    get now(): (() => Date) | undefined;
+    get beforeYesterday(): (() => Date) | undefined;
+    get yesterday(): (() => Date) | undefined;
+    get today(): (() => Date) | undefined;
+    get tomorrow(): (() => Date) | undefined;
+    get afterTomorrow(): (() => Date) | undefined;
+    get midnight(): (() => Date) | undefined;
+    get lastWeek(): (() => Date) | undefined;
+    get nextWeek(): (() => Date) | undefined;
+    get lastFortnight(): (() => Date) | undefined;
+    get nextFortnight(): (() => Date) | undefined;
+    fromPhrase(phrase: string): Date;
+    fromPhraseSafe(phrase: string): Date | undefined;
+    make(timeOffset: number, timeUnit: TimeUnit): Date;
+}
+declare const Dates: DatesObject;
+
+type TimeDiffFn = (date1: Date, date2: Date) => number;
+declare class TimeDiff {
+    minutes(date1: Date, date2: Date): number;
+    seconds(date1: Date, date2: Date): number;
+    millis(date1: Date, date2: Date): number;
+    days(date1: Date, date2: Date): number;
+    hours(date1: Date, date2: Date): number;
+    weeks(date1: Date, date2: Date): number;
+}
+declare class TimeObject {
+    #private;
+    get diff(): TimeDiff;
+    fromPhrase(phrase: string): TimeDiffFn;
+}
+declare const Time: TimeObject;
+
+export { DateFactory, Dates, FmtDateFactory, IsoDateFactory, Time, TimeDiff, TimeObject };

package/dist/index.d.ts

@@ -2,9 +2,10 @@ import { TimeUnit } from '@autometa/phrases';
 
 declare class DateFactory {
     #private;
-    phraseMap: Map<string, Date>;
-    fromPhrase(phrase: string): Date | undefined;
-    make(daysOffset: number, timeunit: TimeUnit): Date;
+    phraseMap: Map<string, () => Date>;
+    fromPhraseSafe(phrase: string): Date | undefined;
+    fromPhrase(phrase: string): Date;
+    make(timeOffset: number, timeunit: TimeUnit): Date;
 }
 
 declare class IsoDateFactory {
@@ -12,7 +13,7 @@ declare class IsoDateFactory {
     constructor(dateFactory: DateFactory);
     phraseMap: Map<string, string>;
     make(daysOffset: number, timeunit: TimeUnit): string;
-    fromPhrase(phrase: string): string | undefined;
+    fromPhrase(phrase: string): string;
     get beforeYesterday(): string | undefined;
     get yesterday(): string | undefined;
     get today(): string | undefined;
@@ -29,26 +30,44 @@ declare class FmtDateFactory {
     readonly dateFactory: DateFactory;
     constructor(dateFactory: DateFactory);
     make(daysOffset: number, timeunit: TimeUnit): string;
-    fromPhrase(phrase: string): string | undefined;
+    fromPhrase(phrase: string): string;
 }
 
 declare class DatesObject {
     #private;
     get iso(): IsoDateFactory;
     get fmt(): FmtDateFactory;
-    get beforeYesterday(): Date | undefined;
-    get yesterday(): Date | undefined;
-    get today(): Date | undefined;
-    get tomorrow(): Date | undefined;
-    get afterTomorrow(): Date | undefined;
-    get midnight(): Date | undefined;
-    get lastWeek(): Date | undefined;
-    get nextWeek(): Date | undefined;
-    get lastFortnight(): Date | undefined;
-    get nextFortnight(): Date | undefined;
-    fromPhrase(phrase: string): Date | undefined;
+    get now(): (() => Date) | undefined;
+    get beforeYesterday(): (() => Date) | undefined;
+    get yesterday(): (() => Date) | undefined;
+    get today(): (() => Date) | undefined;
+    get tomorrow(): (() => Date) | undefined;
+    get afterTomorrow(): (() => Date) | undefined;
+    get midnight(): (() => Date) | undefined;
+    get lastWeek(): (() => Date) | undefined;
+    get nextWeek(): (() => Date) | undefined;
+    get lastFortnight(): (() => Date) | undefined;
+    get nextFortnight(): (() => Date) | undefined;
+    fromPhrase(phrase: string): Date;
+    fromPhraseSafe(phrase: string): Date | undefined;
     make(timeOffset: number, timeUnit: TimeUnit): Date;
 }
 declare const Dates: DatesObject;
 
-export { Dates };
+type TimeDiffFn = (date1: Date, date2: Date) => number;
+declare class TimeDiff {
+    minutes(date1: Date, date2: Date): number;
+    seconds(date1: Date, date2: Date): number;
+    millis(date1: Date, date2: Date): number;
+    days(date1: Date, date2: Date): number;
+    hours(date1: Date, date2: Date): number;
+    weeks(date1: Date, date2: Date): number;
+}
+declare class TimeObject {
+    #private;
+    get diff(): TimeDiff;
+    fromPhrase(phrase: string): TimeDiffFn;
+}
+declare const Time: TimeObject;
+
+export { DateFactory, Dates, FmtDateFactory, IsoDateFactory, Time, TimeDiff, TimeObject };

package/dist/index.js

@@ -37,7 +37,13 @@ var __privateMethod = (obj, member, method) => {
 // src/index.ts
 var src_exports = {};
 __export(src_exports, {
-  Dates: () => Dates
+  DateFactory: () => DateFactory,
+  Dates: () => Dates,
+  FmtDateFactory: () => FmtDateFactory,
+  IsoDateFactory: () => IsoDateFactory,
+  Time: () => Time,
+  TimeDiff: () => TimeDiff,
+  TimeObject: () => TimeObject
 });
 module.exports = __toCommonJS(src_exports);
 
@@ -52,72 +58,130 @@ function midnight() {
 }
 
 // src/dates/date-factory.ts
-var _matchDayPhrase, matchDayPhrase_fn, _addDays, addDays_fn, _addSeconds, addSeconds_fn, _addMilliseconds, addMilliseconds_fn, _addHours, addHours_fn, _addMinutes, addMinutes_fn;
+var import_errors = require("@autometa/errors");
+var import_asserters = require("@autometa/asserters");
+var _extractTimeFromPhrase, extractTimeFromPhrase_fn, _extractFutureFromPhrase, extractFutureFromPhrase_fn, _extractPastFromPhrase, extractPastFromPhrase_fn, _addYears, addYears_fn, _addMonths, addMonths_fn, _addWeeks, addWeeks_fn, _addDays, addDays_fn, _addSeconds, addSeconds_fn, _addMilliseconds, addMilliseconds_fn, _addHours, addHours_fn, _addMinutes, addMinutes_fn;
 var DateFactory = class {
   constructor() {
-    __privateAdd(this, _matchDayPhrase);
+    __privateAdd(this, _extractTimeFromPhrase);
+    __privateAdd(this, _extractFutureFromPhrase);
+    __privateAdd(this, _extractPastFromPhrase);
+    __privateAdd(this, _addYears);
+    __privateAdd(this, _addMonths);
+    __privateAdd(this, _addWeeks);
     __privateAdd(this, _addDays);
     __privateAdd(this, _addSeconds);
     __privateAdd(this, _addMilliseconds);
     __privateAdd(this, _addHours);
     __privateAdd(this, _addMinutes);
     this.phraseMap = /* @__PURE__ */ new Map([
-      ["beforeYesterday", this.make(-2, "days")],
-      ["yesterday", this.make(-1, "days")],
-      ["today", this.make(0, "days")],
-      ["tomorrow", this.make(1, "days")],
-      ["afterTomorrow", this.make(2, "days")],
-      ["nextWeek", this.make(7, "days")],
-      ["lastWeek", this.make(-7, "days")],
-      ["nextFortnight", this.make(14, "days")],
-      ["lastFortnight", this.make(-14, "days")],
-      ["midnight", midnight()]
+      ["now", () => this.make(0, "days")],
+      ["beforeYesterday", () => this.make(-2, "days")],
+      ["yesterday", () => this.make(-1, "days")],
+      ["today", () => this.make(0, "days")],
+      ["tomorrow", () => this.make(1, "days")],
+      ["afterTomorrow", () => this.make(2, "days")],
+      ["nextWeek", () => this.make(7, "days")],
+      ["lastWeek", () => this.make(-7, "days")],
+      ["nextFortnight", () => this.make(14, "days")],
+      ["lastFortnight", () => this.make(-14, "days")],
+      ["midnight", midnight]
     ]);
   }
-  fromPhrase(phrase) {
+  fromPhraseSafe(phrase) {
     const name = (0, import_phrases.convertPhrase)(phrase, import_phrases.camel);
     if (this.phraseMap.has(name)) {
-      return this.phraseMap.get(name);
+      return this.phraseMap.get(name)?.call(this);
     }
-    const matchDay = __privateMethod(this, _matchDayPhrase, matchDayPhrase_fn).call(this, phrase);
+    const matchDay = __privateMethod(this, _extractTimeFromPhrase, extractTimeFromPhrase_fn).call(this, phrase);
     if (matchDay) {
       return matchDay;
     }
     const parsed = new Date(phrase);
-    if (!isNaN(parsed.getTime()))
-      return parsed;
-    throw new Error(`Cannot find date matching '${phrase}'`);
+    if (isNaN(parsed.getTime())) {
+      return new Date(Date.parse(phrase));
+    }
+    return parsed;
   }
-  make(daysOffset, timeunit) {
-    switch (timeunit) {
+  fromPhrase(phrase) {
+    const result = this.fromPhraseSafe(phrase);
+    if (result) {
+      return result;
+    }
+    (0, import_errors.raise)(
+      `Could not parse date from phrase ${phrase}. Please use a valid date string or a phrase from the following list: ${Array.from(
+        this.phraseMap.keys()
+      ).join(", ")}`
+    );
+  }
+  make(timeOffset, timeunit) {
+    const unit = timeunit.endsWith("s") ? timeunit : `${timeunit}s`;
+    switch (unit) {
+      case "years":
+        return __privateMethod(this, _addYears, addYears_fn).call(this, timeOffset);
+      case "months":
+        return __privateMethod(this, _addMonths, addMonths_fn).call(this, timeOffset);
+      case "weeks":
+        return __privateMethod(this, _addWeeks, addWeeks_fn).call(this, timeOffset);
       case "days":
-        return __privateMethod(this, _addDays, addDays_fn).call(this, daysOffset);
+        return __privateMethod(this, _addDays, addDays_fn).call(this, timeOffset);
       case "seconds":
-        return __privateMethod(this, _addSeconds, addSeconds_fn).call(this, daysOffset);
+        return __privateMethod(this, _addSeconds, addSeconds_fn).call(this, timeOffset);
       case "milliseconds":
-        return __privateMethod(this, _addMilliseconds, addMilliseconds_fn).call(this, daysOffset);
+        return __privateMethod(this, _addMilliseconds, addMilliseconds_fn).call(this, timeOffset);
       case "hours":
-        return __privateMethod(this, _addHours, addHours_fn).call(this, daysOffset);
+        return __privateMethod(this, _addHours, addHours_fn).call(this, timeOffset);
       case "minutes":
-        return __privateMethod(this, _addMinutes, addMinutes_fn).call(this, daysOffset);
+        return __privateMethod(this, _addMinutes, addMinutes_fn).call(this, timeOffset);
       default:
-        throw new Error(
-          `Invalid timeunit ${timeunit}, options are 'days', 'seconds', 'milliseconds', 'hours', 'minutes'`
+        throw new import_errors.AutomationError(
+          `Invalid timeunit ${timeunit}, options are 'days', 'seconds', 'milliseconds', 'hours', 'minutes'. Non plural equivalents such as 'day' or 'week' are also accepted.`
         );
     }
   }
 };
-_matchDayPhrase = new WeakSet();
-matchDayPhrase_fn = function(phrase) {
-  if (phrase.match(/\d+ day(s)? ago?/gi)) {
-    const value = Number(phrase.match(/\d+/gi)?.pop());
-    return this.make(-value, "days");
+_extractTimeFromPhrase = new WeakSet();
+extractTimeFromPhrase_fn = function(phrase) {
+  return __privateMethod(this, _extractFutureFromPhrase, extractFutureFromPhrase_fn).call(this, phrase) ?? __privateMethod(this, _extractPastFromPhrase, extractPastFromPhrase_fn).call(this, phrase);
+};
+_extractFutureFromPhrase = new WeakSet();
+extractFutureFromPhrase_fn = function(phrase) {
+  const pastPattern = /(\d+) (.*)s? from now?/;
+  const pastMatch = pastPattern.exec(phrase);
+  if ((0, import_asserters.ConfirmDefined)(pastMatch) && (0, import_asserters.ConfirmLengthAtLeast)(pastMatch, 3)) {
+    const [_, value, unit] = pastMatch;
+    const timeunit = (0, import_phrases.convertPhrase)(unit, import_phrases.collapse);
+    return this.make(Number(value), timeunit);
   }
-  if (phrase.match(/\d+ day(s)?( from now)?/gi)) {
-    const value = Number(phrase.match(/\d+/gi)?.pop());
-    return this.make(value, "days");
+};
+_extractPastFromPhrase = new WeakSet();
+extractPastFromPhrase_fn = function(phrase) {
+  const pastPattern = /(\d+) (.*)(s)? ago?/gm;
+  const pastMatch = pastPattern.exec(phrase);
+  if ((0, import_asserters.ConfirmDefined)(pastMatch) && (0, import_asserters.ConfirmLengthAtLeast)(pastMatch, 3)) {
+    const [_, value, unit] = pastMatch;
+    const timeunit = (0, import_phrases.convertPhrase)(unit, import_phrases.camel);
+    return this.make(-Number(value), timeunit);
   }
 };
+_addYears = new WeakSet();
+addYears_fn = function(yearsOffset) {
+  const date = /* @__PURE__ */ new Date();
+  date.setFullYear(date.getFullYear() + yearsOffset);
+  return date;
+};
+_addMonths = new WeakSet();
+addMonths_fn = function(monthOffset) {
+  const date = /* @__PURE__ */ new Date();
+  date.setMonth(date.getMonth() + monthOffset);
+  return date;
+};
+_addWeeks = new WeakSet();
+addWeeks_fn = function(weekOffset) {
+  const date = /* @__PURE__ */ new Date();
+  date.setMonth(date.getMonth() + weekOffset / 4);
+  return date;
+};
 _addDays = new WeakSet();
 addDays_fn = function(daysOffset) {
   const date = /* @__PURE__ */ new Date();
@@ -231,6 +295,9 @@ var DatesObject = class {
   get fmt() {
     return __privateGet(this, _fmt);
   }
+  get now() {
+    return __privateGet(this, _factory).phraseMap.get("now");
+  }
   get beforeYesterday() {
     return __privateGet(this, _factory).phraseMap.get("beforeYesterday");
   }
@@ -264,6 +331,9 @@ var DatesObject = class {
   fromPhrase(phrase) {
     return __privateGet(this, _factory).fromPhrase(phrase);
   }
+  fromPhraseSafe(phrase) {
+    return __privateGet(this, _factory).fromPhraseSafe(phrase);
+  }
   make(timeOffset, timeUnit) {
     return __privateGet(this, _factory).make(timeOffset, timeUnit);
   }
@@ -272,7 +342,56 @@ _factory = new WeakMap();
 _iso = new WeakMap();
 _fmt = new WeakMap();
 var Dates = new DatesObject();
+
+// src/time/time.ts
+var import_asserters2 = require("@autometa/asserters");
+var import_phrases2 = require("@autometa/phrases");
+var TimeDiff = class {
+  minutes(date1, date2) {
+    return this.millis(date1, date2) / 6e4;
+  }
+  seconds(date1, date2) {
+    return this.millis(date1, date2) / 1e3;
+  }
+  millis(date1, date2) {
+    const d1 = new Date(date1).getTime();
+    const d2 = new Date(date2).getTime();
+    return Math.abs(Math.round(d2 - d1));
+  }
+  days(date1, date2) {
+    return this.millis(date1, date2) / 864e5;
+  }
+  hours(date1, date2) {
+    return this.millis(date1, date2) / 36e5;
+  }
+  weeks(date1, date2) {
+    return this.millis(date1, date2) / 6048e5;
+  }
+};
+var _diff;
+var TimeObject = class {
+  constructor() {
+    __privateAdd(this, _diff, new TimeDiff());
+  }
+  get diff() {
+    return __privateGet(this, _diff);
+  }
+  fromPhrase(phrase) {
+    const propertyKey = (0, import_phrases2.convertPhrase)(phrase, import_phrases2.camel);
+    (0, import_asserters2.AssertKey)(this.diff, propertyKey);
+    return Time.diff[propertyKey];
+  }
+};
+_diff = new WeakMap();
+var Time = new TimeObject();
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
-  Dates
+  DateFactory,
+  Dates,
+  FmtDateFactory,
+  IsoDateFactory,
+  Time,
+  TimeDiff,
+  TimeObject
 });
+//# sourceMappingURL=index.js.map

package/dist/index.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/index.ts","../src/dates/date-factory.ts","../src/dates/midnight.ts","../src/dates/iso-date-factory.ts","../src/dates/formatted-date-factory.ts","../src/dates/dates.ts","../src/time/time.ts"],"sourcesContent":["export * from './dates'\nexport * from './time'","import { TimeUnit, camel, convertPhrase, collapse } from \"@autometa/phrases\";\nimport { midnight } from \"./midnight\";\nimport { AutomationError, raise } from \"@autometa/errors\";\nimport { ConfirmDefined, ConfirmLengthAtLeast } from \"@autometa/asserters\";\n\nexport class DateFactory {\n  phraseMap = new Map<string, () => Date>([\n    [\"now\", () => this.make(0, \"days\")],\n    [\"beforeYesterday\", () => this.make(-2, \"days\")],\n    [\"yesterday\", () => this.make(-1, \"days\")],\n    [\"today\", () => this.make(0, \"days\")],\n    [\"tomorrow\", () => this.make(1, \"days\")],\n    [\"afterTomorrow\", () => this.make(2, \"days\")],\n    [\"nextWeek\", () => this.make(7, \"days\")],\n    [\"lastWeek\", () => this.make(-7, \"days\")],\n    [\"nextFortnight\", () => this.make(14, \"days\")],\n    [\"lastFortnight\", () => this.make(-14, \"days\")],\n    [\"midnight\", midnight]\n  ]);\n\n  fromPhraseSafe(phrase: string) {\n    const name = convertPhrase(phrase, camel);\n    if (this.phraseMap.has(name)) {\n      return this.phraseMap.get(name)?.call(this);\n    }\n    const matchDay = this.#extractTimeFromPhrase(phrase);\n    if (matchDay) {\n      return matchDay;\n    }\n    const parsed = new Date(phrase);\n    if (isNaN(parsed.getTime())) {\n      return new Date(Date.parse(phrase));\n    }\n    return parsed;\n  }\n  fromPhrase(phrase: string) {\n    const result = this.fromPhraseSafe(phrase);\n    if (result) {\n      return result;\n    }\n    raise(\n      `Could not parse date from phrase ${phrase}. Please use a valid date string or a phrase from the following list: ${Array.from(\n        this.phraseMap.keys()\n      ).join(\", \")}`\n    );\n  }\n  make(timeOffset: number, timeunit: TimeUnit) {\n    const unit = timeunit.endsWith(\"s\") ? timeunit : `${timeunit}s`;\n    switch (unit) {\n      case \"years\":\n        return this.#addYears(timeOffset);\n      case \"months\":\n        return this.#addMonths(timeOffset);\n      case \"weeks\":\n        return this.#addWeeks(timeOffset);\n      case \"days\":\n        return this.#addDays(timeOffset);\n      case \"seconds\":\n        return this.#addSeconds(timeOffset);\n      case \"milliseconds\":\n        return this.#addMilliseconds(timeOffset);\n      case \"hours\":\n        return this.#addHours(timeOffset);\n      case \"minutes\":\n        return this.#addMinutes(timeOffset);\n      default:\n        throw new AutomationError(\n          `Invalid timeunit ${timeunit}, options are 'days', 'seconds', 'milliseconds', 'hours', 'minutes'. Non plural equivalents such as 'day' or 'week' are also accepted.`\n        );\n    }\n  }\n  #extractTimeFromPhrase(phrase: string) {\n    return (\n      this.#extractFutureFromPhrase(phrase) ??\n      this.#extractPastFromPhrase(phrase)\n    );\n  }\n  #extractFutureFromPhrase(phrase: string) {\n    const pastPattern = /(\\d+) (.*)s? from now?/;\n    const pastMatch = pastPattern.exec(phrase);\n\n    if (ConfirmDefined(pastMatch) && ConfirmLengthAtLeast(pastMatch, 3)) {\n      const [_, value, unit] = pastMatch;\n      const timeunit = convertPhrase(unit, collapse) as TimeUnit;\n      return this.make(Number(value), timeunit);\n    }\n  }\n  #extractPastFromPhrase(phrase: string) {\n    const pastPattern = /(\\d+) (.*)(s)? ago?/gm;\n    const pastMatch = pastPattern.exec(phrase);\n    if (ConfirmDefined(pastMatch) && ConfirmLengthAtLeast(pastMatch, 3)) {\n      const [_, value, unit] = pastMatch;\n      const timeunit = convertPhrase(unit, camel) as TimeUnit;\n      return this.make(-Number(value), timeunit);\n    }\n  }\n  #addYears(yearsOffset: number) {\n    const date = new Date();\n    date.setFullYear(date.getFullYear() + yearsOffset);\n    return date;\n  }\n  #addMonths(monthOffset: number) {\n    const date = new Date();\n    date.setMonth(date.getMonth() + monthOffset);\n    return date;\n  }\n  #addWeeks(weekOffset: number) {\n    const date = new Date();\n    date.setMonth(date.getMonth() + weekOffset / 4);\n    return date;\n  }\n  #addDays(daysOffset: number) {\n    const date = new Date();\n    date.setDate(date.getDate() + daysOffset);\n    return date;\n  }\n\n  #addSeconds(secondsOffset: number) {\n    const date = new Date();\n    date.setSeconds(date.getSeconds() + secondsOffset);\n    return date;\n  }\n\n  #addMilliseconds(millisecondsOffset: number) {\n    const date = new Date();\n    date.setMilliseconds(date.getMilliseconds() + millisecondsOffset);\n    return date;\n  }\n  #addHours(hoursOffset: number) {\n    const date = new Date();\n    date.setHours(date.getHours() + hoursOffset);\n    return date;\n  }\n  #addMinutes(minutesOffset: number) {\n    const date = new Date();\n    date.setMinutes(date.getMinutes() + minutesOffset);\n    return date;\n  }\n}\n","\nexport function midnight() {\n  const date = new Date();\n  date.setHours(0, 0, 0, 0);\n  return date;\n}\n","import { TimeUnit } from '@autometa/phrases';\nimport { midnight } from './midnight';\nimport { DateFactory } from './date-factory';\n\n\nexport class IsoDateFactory {\n  constructor(readonly dateFactory: DateFactory) { }\n  phraseMap = new Map<string, string>([\n    ['beforeYesterday', this.make(-2, 'days')],\n    ['yesterday', this.make(-1, 'days')],\n    ['today', this.make(0, 'days')],\n    ['tomorrow', this.make(1, 'days')],\n    ['afterTomorrow', this.make(2, 'days')],\n    ['nextWeek', this.make(7, 'days')],\n    ['lastWeek', this.make(-7, 'days')],\n    ['nextFortnight', this.make(14, 'days')],\n    ['lastFortnight', this.make(-14, 'days')],\n    ['midnight', midnight().toISOString()],\n  ]);\n  make(daysOffset: number, timeunit: TimeUnit) {\n    return this.dateFactory.make(daysOffset, timeunit).toISOString();\n  }\n  fromPhrase(phrase: string) {\n    return this.dateFactory.fromPhrase(phrase)?.toISOString();\n  }\n\n  get beforeYesterday() {\n    return this.phraseMap.get('beforeYesterday');\n  }\n  get yesterday() {\n    return this.phraseMap.get('yesterday');\n  }\n  get today() {\n    return this.phraseMap.get('today');\n  }\n  get tomorrow() {\n    return this.phraseMap.get('tomorrow');\n  }\n  get afterTomorrow() {\n    return this.phraseMap.get('afterTomorrow');\n  }\n  get midnight() {\n    return this.phraseMap.get('midnight');\n  }\n  get lastWeek() {\n    return this.phraseMap.get('lastWeek');\n  }\n  get nextWeek() {\n    return this.phraseMap.get('nextWeek');\n  }\n  get lastFortnight() {\n    return this.phraseMap.get('lastFortnight');\n  }\n  get nextFortnight() {\n    return this.phraseMap.get('nextFortnight');\n  }\n}\n","import { TimeUnit } from '@autometa/phrases';\nimport { DateFactory } from './date-factory';\n\n\nexport class FmtDateFactory {\n  constructor(readonly dateFactory: DateFactory) { }\n  make(daysOffset: number, timeunit: TimeUnit) {\n    return this.dateFactory\n      .make(daysOffset, timeunit)\n      .toISOString()\n      .split('T')[0];\n  }\n  fromPhrase(phrase: string) {\n    return this.dateFactory.fromPhrase(phrase)?.toISOString().split('T')[0];\n  }\n}\n","import { DateFactory } from \"./date-factory\";\nimport { IsoDateFactory } from \"./iso-date-factory\";\nimport { FmtDateFactory } from \"./formatted-date-factory\";\nimport { TimeUnit } from \"@autometa/phrases\";\n\nexport class DatesObject {\n  #factory: DateFactory = new DateFactory();\n  #iso = new IsoDateFactory(this.#factory);\n  #fmt = new FmtDateFactory(this.#factory);\n  get iso() {\n    return this.#iso;\n  }\n\n  get fmt() {\n    return this.#fmt;\n  }\n\n  get now(){\n    return this.#factory.phraseMap.get(\"now\");\n\n  }\n\n  get beforeYesterday() {\n    return this.#factory.phraseMap.get(\"beforeYesterday\");\n  }\n\n  get yesterday() {\n    return this.#factory.phraseMap.get(\"yesterday\");\n  }\n\n  get today() {\n    return this.#factory.phraseMap.get(\"today\");\n  }\n\n  get tomorrow() {\n    return this.#factory.phraseMap.get(\"tomorrow\");\n  }\n\n  get afterTomorrow() {\n    return this.#factory.phraseMap.get(\"afterTomorrow\");\n  }\n\n  get midnight() {\n    return this.#factory.phraseMap.get(\"midnight\");\n  }\n\n  get lastWeek() {\n    return this.#factory.phraseMap.get(\"lastWeek\");\n  }\n\n  get nextWeek() {\n    return this.#factory.phraseMap.get(\"nextWeek\");\n  }\n\n  get lastFortnight() {\n    return this.#factory.phraseMap.get(\"lastFortnight\");\n  }\n\n  get nextFortnight() {\n    return this.#factory.phraseMap.get(\"nextFortnight\");\n  }\n\n  fromPhrase(phrase: string) {\n    return this.#factory.fromPhrase(phrase);\n  }\n  \n  fromPhraseSafe(phrase: string) {\n    return this.#factory.fromPhraseSafe(phrase);\n  }\n\n  make(timeOffset: number, timeUnit: TimeUnit) {\n    return this.#factory.make(timeOffset, timeUnit);\n  }\n}\n\nexport const Dates = new DatesObject();","import { AssertKey } from \"@autometa/asserters\";\nimport { camel, convertPhrase } from \"@autometa/phrases\";\ntype TimeDiffFn = (date1: Date, date2: Date) => number;\n\nexport class TimeDiff {\n  minutes(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 60000;\n  }\n  seconds(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 1000;\n  }\n  millis(date1: Date, date2: Date) {\n    const d1 = new Date(date1).getTime();\n    const d2 = new Date(date2).getTime();\n    return Math.abs(Math.round(d2 - d1));\n  }\n  days(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 86400000;\n  }\n  hours(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 3600000;\n  }\n  weeks(date1: Date, date2: Date) {\n    return this.millis(date1, date2) / 604800000;\n  }\n}\n\nexport class TimeObject {\n  #diff = new TimeDiff();\n  get diff() {\n    return this.#diff;\n  }\n\n  fromPhrase(phrase: string): TimeDiffFn {\n    const propertyKey = convertPhrase(phrase, camel);\n    AssertKey(this.diff, propertyKey);\n    return Time.diff[propertyKey];\n  }\n}\n\nexport const Time = new TimeObject();\n"],"mappings":"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","names":["import_asserters","import_phrases"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autometa/datetime",
-  "version": "0.0.0",
+  "version": "0.1.0",
   "description": "Date and Time utilities for Autometa",
   "type": "module",
   "main": "dist/index.js",
@@ -18,22 +18,24 @@
     "@types/uuid": "^9.0.1",
     "@typescript-eslint/eslint-plugin": "^5.54.1",
     "@typescript-eslint/parser": "^5.54.1",
+    "@vitest/coverage-istanbul": "^0.31.0",
     "eslint": "^8.37.0",
-    "eslint-config-custom": "0.5.1",
+    "eslint-config-custom": "0.6.0",
     "eslint-config-prettier": "^8.3.0",
     "rimraf": "^4.1.2",
     "tsconfig": " *",
-    "tsup": "^6.7.0",
+    "tsup": "^7.2.0",
     "typescript": "^4.9.5",
-    "vitest": "^0.29.8"
+    "vitest": "0.33.0"
   },
   "dependencies": {
-    "@autometa/asserters": "^0.0.0",
-    "@autometa/errors": "^0.0.0",
-    "@autometa/phrases": "^0.0.0"
+    "@autometa/asserters": "^0.1.0",
+    "@autometa/errors": "^0.1.0",
+    "@autometa/phrases": "^0.1.0"
   },
   "scripts": {
     "test": "vitest run --passWithNoTests",
+    "coverage": "vitest run --coverage",
     "prettify": "prettier --config .prettierrc 'src/**/*.ts' --write",
     "lint": "eslint . --max-warnings 0",
     "lint:fix": "eslint . --fix",

package/tsup.config.ts

@@ -2,6 +2,7 @@ import { defineConfig } from "tsup";
 
 export default defineConfig({
   clean: true, // clean up the dist folder
+  sourcemap:true, // generate sourcemaps
   format: ["cjs", "esm"], // generate cjs and esm files
   dts: true,
   skipNodeModulesBundle: true,