@sprucelabs/calendar-utils 31.2.1 → 31.3.0

package/build/esm/parsing/AbstractParser.d.ts

@@ -1,7 +1,9 @@
+import { Locale } from '../types/calendar.types';
 import { IDate } from '../utilities/date.utility';
 export declare abstract class AbstractParser implements Parser {
     protected now: () => number;
-    constructor(now: () => number);
+    protected locale: Locale;
+    constructor(now: () => number, locale: Locale);
     abstract parse(str: string, date: Required<IDate>, context: ParserContext): string;
 }
 export interface Parser {

package/build/esm/parsing/AbstractParser.js

@@ -1,5 +1,6 @@
 export class AbstractParser {
-    constructor(now) {
+    constructor(now, locale) {
         this.now = now;
+        this.locale = locale;
     }
 }

package/build/esm/parsing/DateParser.d.ts

@@ -1,7 +1,8 @@
+import { Locale } from '../types/calendar.types';
 export default class DateParser {
     private now;
     private parsers;
     private constructor();
-    static Parser(now: () => number): DateParser;
+    static Parser(now: () => number, locale: Locale): DateParser;
     parse(str: string): number | null;
 }

package/build/esm/parsing/DateParser.js

@@ -2,15 +2,15 @@ import { assertOptions } from '@sprucelabs/schema';
 import dateUtil from '../utilities/date.utility.js';
 import ParserFactory from './ParserFactory.js';
 export default class DateParser {
-    constructor(now) {
+    constructor(now, locale) {
         this.parsers = [];
         this.now = now;
-        const parsers = ParserFactory.Factory(now);
+        const parsers = ParserFactory.Factory(now, locale);
         this.parsers = [...parsers.all()];
     }
-    static Parser(now) {
-        assertOptions({ now }, ['now']);
-        return new this(now);
+    static Parser(now, locale) {
+        assertOptions({ now, locale }, ['now', 'locale']);
+        return new this(now, locale);
     }
     parse(str) {
         const now = this.now();
@@ -25,6 +25,9 @@ export default class DateParser {
                 parsed = parser.parse(parsed, date, context);
             }
         }
+        else {
+            parsed = '';
+        }
         if (parsed === original) {
             return null;
         }

package/build/esm/parsing/ParserFactory.d.ts

@@ -1,10 +1,12 @@
+import { Locale } from '../types/calendar.types';
 import { Parser } from './AbstractParser';
 export default class ParserFactory {
+    private locale;
     all(): Parser[];
     private now;
     private strategies;
     private constructor();
-    static Factory(now: () => number): ParserFactory;
+    static Factory(now: () => number, locale: Locale): ParserFactory;
     Parser(parserType: ParserStrategy): Parser;
 }
 export type ParserStrategy = 'Year' | 'Month' | 'Dow' | 'Time' | 'Week';

package/build/esm/parsing/ParserFactory.js

@@ -13,18 +13,19 @@ export default class ParserFactory {
             this.Parser('Time'),
         ];
     }
-    constructor(now) {
+    constructor(now, locale) {
         this.strategies = {
-            Year: () => new YearParser(this.now),
-            Month: () => new MonthParser(this.now),
-            Dow: () => new DowParser(this.now),
-            Time: () => new TimeParser(this.now),
-            Week: () => new WeekParser(this.now),
+            Year: () => new YearParser(this.now, this.locale),
+            Month: () => new MonthParser(this.now, this.locale),
+            Dow: () => new DowParser(this.now, this.locale),
+            Time: () => new TimeParser(this.now, this.locale),
+            Week: () => new WeekParser(this.now, this.locale),
         };
         this.now = now;
+        this.locale = locale;
     }
-    static Factory(now) {
-        return new this(now);
+    static Factory(now, locale) {
+        return new this(now, locale);
     }
     Parser(parserType) {
         return this.strategies[parserType]();

package/build/esm/parsing/strategies/TimeParser.js

@@ -8,19 +8,21 @@ export default class TimeParser extends AbstractParser {
             return str;
         }
         if (match) {
-            date.hour = parseInt(match, 10);
+            date.hour =
+                parseInt(match, 10) + this.locale.getTimezoneOffsetMinutes() / 60;
             date.minute = 0;
+            str = str.replace(match, '');
         }
-        if (str.includes(':')) {
-            date.minute = parseInt(str.split(':')[1], 10);
+        if (match.includes(':')) {
+            date.minute = parseInt(match.split(':')[1], 10);
         }
-        if (str.includes('pm')) {
+        if (match.includes('pm')) {
             date.hour += 12;
         }
-        else if (date.hour === 12 && str.includes('am')) {
+        else if (date.hour === 12 && match.includes('am')) {
             date.hour = 0;
         }
-        if (!context.hasYear && dateUtil.date(date) < this.now() && str !== 'now') {
+        if (!context.hasYear && dateUtil.date(date) < this.now()) {
             date.hour += 12;
         }
         return str;

package/build/parsing/AbstractParser.d.ts

@@ -1,7 +1,9 @@
+import { Locale } from '../types/calendar.types';
 import { IDate } from '../utilities/date.utility';
 export declare abstract class AbstractParser implements Parser {
     protected now: () => number;
-    constructor(now: () => number);
+    protected locale: Locale;
+    constructor(now: () => number, locale: Locale);
     abstract parse(str: string, date: Required<IDate>, context: ParserContext): string;
 }
 export interface Parser {

package/build/parsing/AbstractParser.js

@@ -2,8 +2,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AbstractParser = void 0;
 class AbstractParser {
-    constructor(now) {
+    constructor(now, locale) {
         this.now = now;
+        this.locale = locale;
     }
 }
 exports.AbstractParser = AbstractParser;

package/build/parsing/DateParser.d.ts

@@ -1,7 +1,8 @@
+import { Locale } from '../types/calendar.types';
 export default class DateParser {
     private now;
     private parsers;
     private constructor();
-    static Parser(now: () => number): DateParser;
+    static Parser(now: () => number, locale: Locale): DateParser;
     parse(str: string): number | null;
 }

package/build/parsing/DateParser.js

@@ -7,15 +7,15 @@ const schema_1 = require("@sprucelabs/schema");
 const date_utility_1 = __importDefault(require("../utilities/date.utility"));
 const ParserFactory_1 = __importDefault(require("./ParserFactory"));
 class DateParser {
-    constructor(now) {
+    constructor(now, locale) {
         this.parsers = [];
         this.now = now;
-        const parsers = ParserFactory_1.default.Factory(now);
+        const parsers = ParserFactory_1.default.Factory(now, locale);
         this.parsers = [...parsers.all()];
     }
-    static Parser(now) {
-        (0, schema_1.assertOptions)({ now }, ['now']);
-        return new this(now);
+    static Parser(now, locale) {
+        (0, schema_1.assertOptions)({ now, locale }, ['now', 'locale']);
+        return new this(now, locale);
     }
     parse(str) {
         const now = this.now();
@@ -30,6 +30,9 @@ class DateParser {
                 parsed = parser.parse(parsed, date, context);
             }
         }
+        else {
+            parsed = '';
+        }
         if (parsed === original) {
             return null;
         }

package/build/parsing/ParserFactory.d.ts

@@ -1,10 +1,12 @@
+import { Locale } from '../types/calendar.types';
 import { Parser } from './AbstractParser';
 export default class ParserFactory {
+    private locale;
     all(): Parser[];
     private now;
     private strategies;
     private constructor();
-    static Factory(now: () => number): ParserFactory;
+    static Factory(now: () => number, locale: Locale): ParserFactory;
     Parser(parserType: ParserStrategy): Parser;
 }
 export type ParserStrategy = 'Year' | 'Month' | 'Dow' | 'Time' | 'Week';

package/build/parsing/ParserFactory.js

@@ -18,18 +18,19 @@ class ParserFactory {
             this.Parser('Time'),
         ];
     }
-    constructor(now) {
+    constructor(now, locale) {
         this.strategies = {
-            Year: () => new YearParser_1.default(this.now),
-            Month: () => new MonthParser_1.default(this.now),
-            Dow: () => new DowParser_1.default(this.now),
-            Time: () => new TimeParser_1.default(this.now),
-            Week: () => new WeekParser_1.default(this.now),
+            Year: () => new YearParser_1.default(this.now, this.locale),
+            Month: () => new MonthParser_1.default(this.now, this.locale),
+            Dow: () => new DowParser_1.default(this.now, this.locale),
+            Time: () => new TimeParser_1.default(this.now, this.locale),
+            Week: () => new WeekParser_1.default(this.now, this.locale),
         };
         this.now = now;
+        this.locale = locale;
     }
-    static Factory(now) {
-        return new this(now);
+    static Factory(now, locale) {
+        return new this(now, locale);
     }
     Parser(parserType) {
         return this.strategies[parserType]();

package/build/parsing/strategies/TimeParser.js

@@ -13,19 +13,21 @@ class TimeParser extends AbstractParser_1.AbstractParser {
             return str;
         }
         if (match) {
-            date.hour = parseInt(match, 10);
+            date.hour =
+                parseInt(match, 10) + this.locale.getTimezoneOffsetMinutes() / 60;
             date.minute = 0;
+            str = str.replace(match, '');
         }
-        if (str.includes(':')) {
-            date.minute = parseInt(str.split(':')[1], 10);
+        if (match.includes(':')) {
+            date.minute = parseInt(match.split(':')[1], 10);
         }
-        if (str.includes('pm')) {
+        if (match.includes('pm')) {
             date.hour += 12;
         }
-        else if (date.hour === 12 && str.includes('am')) {
+        else if (date.hour === 12 && match.includes('am')) {
             date.hour = 0;
         }
-        if (!context.hasYear && date_utility_1.default.date(date) < this.now() && str !== 'now') {
+        if (!context.hasYear && date_utility_1.default.date(date) < this.now()) {
             date.hour += 12;
         }
         return str;

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "31.2.1",
+  "version": "31.3.0",
   "files": [
     "build/**/*",
     "!build/__tests__",