date-vir 5.3.0 → 5.3.2

package/dist/cjs/full-date/create-full-date.js

@@ -6,6 +6,7 @@ const run_time_assertions_1 = require("run-time-assertions");
 const timezones_1 = require("../timezone/timezones");
 const is_valid_full_date_1 = require("./is-valid-full-date");
 const luxon_date_time_conversion_1 = require("./luxon-date-time-conversion");
+const string_parsing_1 = require("./string-parsing");
 function createFullDateInUserTimezone(dateLike) {
     return createFullDate(dateLike, timezones_1.userTimezone);
 }
@@ -42,6 +43,7 @@ function toNewTimezone(fullDate, timezone) {
 }
 exports.toNewTimezone = toNewTimezone;
 function lastDitchConversion(dateLike) {
+    luxon_1.DateTime.fromFormat;
     /** As any cast for last ditch effort to convert the dateLike into a date. */
     const dateTime = luxon_1.DateTime.fromJSDate(new Date(dateLike));
     if (dateTime.isValid) {
@@ -62,11 +64,10 @@ function convertDateLikeToLuxonDateTime(dateLike, timezone) {
         return luxon_1.DateTime.fromMillis(dateLike, { zone: timezones_1.utcTimezone }).setZone(timezone);
     }
     else if ((0, run_time_assertions_1.isRunTimeType)(dateLike, 'string')) {
-        const dateTime = luxon_1.DateTime.fromISO(dateLike, { zone: timezone });
-        if (!dateTime.isValid) {
-            return lastDitchConversion(dateLike);
+        const parsedStringDate = (0, string_parsing_1.parseDateString)(dateLike, timezone);
+        if (parsedStringDate) {
+            return parsedStringDate;
         }
-        return dateTime;
     }
     else if (dateLike instanceof Date) {
         const dateTime = luxon_1.DateTime.fromJSDate(dateLike);

package/dist/cjs/full-date/string-parsing.js

@@ -0,0 +1,33 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.parseDateString = void 0;
+const luxon_1 = require("luxon");
+/**
+ * These formats are for luxon, documented here:
+ * https://moment.github.io/luxon/#/parsing?id=table-of-tokens
+ */
+const knownStringFormats = [
+    // 1-2024
+    'L-y',
+    // jan-2021
+    'LLL-y',
+    // january-2021
+    'LLLL-y',
+];
+function parseDateString(dateString, timezone) {
+    const isoAttempt = luxon_1.DateTime.fromISO(dateString, { zone: timezone });
+    if (isoAttempt.isValid) {
+        return isoAttempt;
+    }
+    let finalizedDateTime;
+    knownStringFormats.some((format) => {
+        const dateTimeAttempt = luxon_1.DateTime.fromFormat(dateString, format, { zone: timezone });
+        if (!dateTimeAttempt.isValid) {
+            return false;
+        }
+        finalizedDateTime = dateTimeAttempt;
+        return true;
+    });
+    return finalizedDateTime;
+}
+exports.parseDateString = parseDateString;

package/dist/esm/extra-utils/now.d.ts

@@ -1,5 +1,6 @@
 import { UtcIsoString } from '../formatting/string-format-types';
 import { FullDate } from '../full-date/full-date-shape';
+import { UtcTimezone } from '../timezone/timezones';
 export declare function getNowInIsoString(): UtcIsoString;
 export declare function getNowInUserTimezone(): FullDate;
-export declare function getNowInUtcTimezone(): FullDate;
+export declare function getNowInUtcTimezone(): FullDate<UtcTimezone>;

package/dist/esm/full-date/create-full-date.js

@@ -3,6 +3,7 @@ import { isRunTimeType } from 'run-time-assertions';
 import { userTimezone, utcTimezone } from '../timezone/timezones';
 import { isValidFullDate } from './is-valid-full-date';
 import { parseLuxonDateTime, toLuxonDateTime } from './luxon-date-time-conversion';
+import { parseDateString } from './string-parsing';
 export function createFullDateInUserTimezone(dateLike) {
     return createFullDate(dateLike, userTimezone);
 }
@@ -35,6 +36,7 @@ export function toNewTimezone(fullDate, timezone) {
     return createFullDate(fullDate, timezone);
 }
 function lastDitchConversion(dateLike) {
+    DateTime.fromFormat;
     /** As any cast for last ditch effort to convert the dateLike into a date. */
     const dateTime = DateTime.fromJSDate(new Date(dateLike));
     if (dateTime.isValid) {
@@ -55,11 +57,10 @@ function convertDateLikeToLuxonDateTime(dateLike, timezone) {
         return DateTime.fromMillis(dateLike, { zone: utcTimezone }).setZone(timezone);
     }
     else if (isRunTimeType(dateLike, 'string')) {
-        const dateTime = DateTime.fromISO(dateLike, { zone: timezone });
-        if (!dateTime.isValid) {
-            return lastDitchConversion(dateLike);
+        const parsedStringDate = parseDateString(dateLike, timezone);
+        if (parsedStringDate) {
+            return parsedStringDate;
         }
-        return dateTime;
     }
     else if (dateLike instanceof Date) {
         const dateTime = DateTime.fromJSDate(dateLike);

package/dist/esm/full-date/string-parsing.d.ts

@@ -0,0 +1,3 @@
+import { DateTime } from 'luxon';
+import { Timezone } from '../timezone/timezone-names';
+export declare function parseDateString(dateString: string, timezone: Timezone): DateTime | undefined;

package/dist/esm/full-date/string-parsing.js

@@ -0,0 +1,29 @@
+import { DateTime } from 'luxon';
+/**
+ * These formats are for luxon, documented here:
+ * https://moment.github.io/luxon/#/parsing?id=table-of-tokens
+ */
+const knownStringFormats = [
+    // 1-2024
+    'L-y',
+    // jan-2021
+    'LLL-y',
+    // january-2021
+    'LLLL-y',
+];
+export function parseDateString(dateString, timezone) {
+    const isoAttempt = DateTime.fromISO(dateString, { zone: timezone });
+    if (isoAttempt.isValid) {
+        return isoAttempt;
+    }
+    let finalizedDateTime;
+    knownStringFormats.some((format) => {
+        const dateTimeAttempt = DateTime.fromFormat(dateString, format, { zone: timezone });
+        if (!dateTimeAttempt.isValid) {
+            return false;
+        }
+        finalizedDateTime = dateTimeAttempt;
+        return true;
+    });
+    return finalizedDateTime;
+}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "date-vir",
-    "version": "5.3.0",
+    "version": "5.3.2",
     "description": "Easy and explicit dates and times",
     "keywords": [
         "date",
@@ -41,15 +41,15 @@
         "test:watch": "web-test-runner --watch --color --config configs/web-test-runner.config.mjs"
     },
     "dependencies": {
-        "@augment-vir/common": "^28.0.2",
+        "@augment-vir/common": "^28.1.0",
         "@types/luxon": "^3.4.2",
         "luxon": "^3.4.4",
-        "object-shape-tester": "^2.3.2",
-        "type-fest": "^4.18.3"
+        "object-shape-tester": "^2.4.0",
+        "type-fest": "^4.20.0"
     },
     "devDependencies": {
-        "@augment-vir/browser": "^28.0.2",
-        "@augment-vir/browser-testing": "^28.0.2",
+        "@augment-vir/browser": "^28.1.0",
+        "@augment-vir/browser-testing": "^28.1.0",
         "@open-wc/testing": "^4.0.0",
         "@types/chai": "^4.3.16",
         "@types/mocha": "^10.0.6",
@@ -58,17 +58,17 @@
         "@web/test-runner-commands": "^0.9.0",
         "@web/test-runner-playwright": "^0.11.0",
         "@web/test-runner-visual-regression": "^0.9.0",
-        "cspell": "^8.8.3",
-        "dependency-cruiser": "^16.3.2",
+        "cspell": "^8.8.4",
+        "dependency-cruiser": "^16.3.3",
         "element-vir": "^22.2.2",
-        "esbuild": "^0.21.4",
+        "esbuild": "^0.21.5",
         "istanbul-smart-text-reporter": "^1.1.4",
         "markdown-code-example-inserter": "^1.0.0",
         "npm-check-updates": "~16.12.3",
-        "prettier": "^3.2.5",
+        "prettier": "^3.3.2",
         "prettier-plugin-interpolated-html-tags": "^1.0.5",
         "prettier-plugin-jsdoc": "^1.3.0",
-        "prettier-plugin-multiline-arrays": "^3.0.4",
+        "prettier-plugin-multiline-arrays": "^3.0.6",
         "prettier-plugin-organize-imports": "^3.2.4",
         "prettier-plugin-packagejson": "^2.5.0",
         "prettier-plugin-sort-json": "^4.0.0",