@finnair/v-validation-luxon 1.1.0-alpha.5 → 1.1.0-alpha.6

package/CHANGELOG.md

@@ -3,6 +3,23 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [1.1.0-alpha.6](https://github.com/finnair/v-validation/compare/v1.0.1...v1.1.0-alpha.6) (2022-08-17)
+
+
+### Bug Fixes
+
+* Fix exports ([b9eacb6](https://github.com/finnair/v-validation/commit/b9eacb6e98a05a07049eb0a8f97b7e6b4958973a))
+
+
+### Features
+
+* fromISO helper for Luxon wrapper construction ([e3b8f24](https://github.com/finnair/v-validation/commit/e3b8f247b3a9bfef8ad474688f995862fdd810e3))
+* Support for Luxon ([00d0a8e](https://github.com/finnair/v-validation/commit/00d0a8e8c8de46bfeb3502f51bb8cd5a3627070e))
+
+
+
+
+
 # [1.1.0-alpha.5](https://github.com/finnair/v-validation/compare/v1.0.1...v1.1.0-alpha.5) (2022-08-16)
 
 

package/dist/Vluxon.d.ts

@@ -1,6 +1,6 @@
 import { ValidationContext, Validator, ValidationResult } from '@finnair/v-validation';
 import { Path } from '@finnair/path';
-import { DateTime, Zone } from 'luxon';
+import { DateTime, DateTimeOptions } from 'luxon';
 import { LuxonDateTime } from './luxon';
 export declare type LuxonInput = string | DateTime | LuxonDateTime;
 export interface ValidateLuxonParams {
@@ -10,9 +10,9 @@ export interface ValidateLuxonParams {
     type: string;
     proto: any;
     pattern: RegExp;
-    defaultZone?: Zone;
+    options: DateTimeOptions;
 }
-export declare function validateLuxon({ value, path, ctx, type, proto, pattern, defaultZone }: ValidateLuxonParams): ValidationResult;
+export declare function validateLuxon({ value, path, ctx, type, proto, pattern, options }: ValidateLuxonParams): ValidationResult;
 export declare class DurationValidator extends Validator {
     validatePath(value: any, path: Path, ctx: ValidationContext): Promise<ValidationResult>;
 }

package/dist/Vluxon.js

@@ -13,7 +13,7 @@ exports.Vluxon = exports.DurationValidator = exports.validateLuxon = void 0;
 const v_validation_1 = require("@finnair/v-validation");
 const luxon_1 = require("luxon");
 const luxon_2 = require("./luxon");
-function validateLuxon({ value, path, ctx, type, proto, pattern, defaultZone }) {
+function validateLuxon({ value, path, ctx, type, proto, pattern, options }) {
     if ((0, v_validation_1.isNullOrUndefined)(value)) {
         return ctx.failure(v_validation_1.defaultViolations.notNull(path), value);
     }
@@ -27,7 +27,7 @@ function validateLuxon({ value, path, ctx, type, proto, pattern, defaultZone })
     }
     else if ((0, v_validation_1.isString)(value)) {
         if (pattern.test(value)) {
-            const dateTime = luxon_1.DateTime.fromISO(value, { setZone: true, zone: defaultZone });
+            const dateTime = luxon_1.DateTime.fromISO(value, options);
             if (dateTime.isValid) {
                 return ctx.success(new proto(dateTime));
             }
@@ -46,7 +46,7 @@ function localDateValidator(value, path, ctx) {
             type: 'Date',
             proto: luxon_2.LocalDateLuxon,
             pattern: datePattern,
-            defaultZone: luxon_1.FixedOffsetZone.utcInstance,
+            options: { zone: luxon_1.FixedOffsetZone.utcInstance },
         });
     });
 }
@@ -60,7 +60,7 @@ function localTimeValidator(value, path, ctx) {
             type: 'Time',
             proto: luxon_2.LocalTimeLuxon,
             pattern: timePattern,
-            defaultZone: luxon_1.FixedOffsetZone.utcInstance,
+            options: { zone: luxon_1.FixedOffsetZone.utcInstance },
         });
     });
 }
@@ -74,6 +74,7 @@ function dateTimeValidator(value, path, ctx) {
             type: 'DateTime',
             proto: luxon_2.DateTimeLuxon,
             pattern: dateTimePattern,
+            options: { setZone: true },
         });
     });
 }
@@ -85,7 +86,8 @@ function dateTimeUtcValidator(value, path, ctx) {
             ctx,
             type: 'DateTime',
             proto: luxon_2.DateTimeUtcLuxon,
-            pattern: dateTimePattern
+            pattern: dateTimePattern,
+            options: { zone: luxon_1.FixedOffsetZone.utcInstance },
         });
     });
 }
@@ -98,7 +100,8 @@ function dateTimeMillisValidator(value, path, ctx) {
             ctx,
             type: 'DateTimeMillis',
             proto: luxon_2.DateTimeMillisLuxon,
-            pattern: dateTimeMillisPattern
+            pattern: dateTimeMillisPattern,
+            options: { setZone: true },
         });
     });
 }
@@ -110,7 +113,8 @@ function dateTimeMillisUtcValidator(value, path, ctx) {
             ctx,
             type: 'DateTimeMillis',
             proto: luxon_2.DateTimeMillisUtcLuxon,
-            pattern: dateTimeMillisPattern
+            pattern: dateTimeMillisPattern,
+            options: { zone: luxon_1.FixedOffsetZone.utcInstance },
         });
     });
 }

package/dist/luxon.d.ts

@@ -1,4 +1,4 @@
-import { DateTime, DateTimeOptions } from 'luxon';
+import { DateTime, DateTimeJSOptions, DateTimeOptions } from 'luxon';
 export declare type LuxonDateTimeInput = DateTime | LuxonDateTime;
 export declare abstract class LuxonDateTime {
     readonly dateTime: DateTime;
@@ -16,10 +16,11 @@ export declare abstract class LuxonDateTime {
 export declare class LocalDateLuxon extends LuxonDateTime {
     static readonly format = "yyyy-MM-dd";
     constructor(input: LuxonDateTimeInput);
-    static now(): LocalDateLuxon;
+    static nowLocal(options?: DateTimeJSOptions): LocalDateLuxon;
+    static nowUtc(): LocalDateLuxon;
     static fromISO(value: string, options?: DateTimeOptions): LocalDateLuxon;
     static fromJSDate(date: Date, options?: DateTimeOptions): LocalDateLuxon;
-    static fromMillis(milliseconds: number, options?: DateTimeOptions): LocalDateLuxon;
+    static fromMillis(millis: number, options?: DateTimeOptions): LocalDateLuxon;
     protected normalize(dateTime: DateTime): DateTime;
     wrap(fn: (dateTime: DateTime) => DateTime): LocalDateLuxon;
     toJSON(): string;
@@ -27,10 +28,11 @@ export declare class LocalDateLuxon extends LuxonDateTime {
 export declare class LocalTimeLuxon extends LuxonDateTime {
     static readonly format = "HH:mm:ss";
     constructor(input: LuxonDateTimeInput);
-    static now(): LocalTimeLuxon;
+    static nowLocal(options?: DateTimeJSOptions): LocalTimeLuxon;
+    static nowUtc(): LocalTimeLuxon;
     static fromISO(value: string, options?: DateTimeOptions): LocalTimeLuxon;
     static fromJSDate(date: Date, options?: DateTimeOptions): LocalTimeLuxon;
-    static fromMillis(milliseconds: number, options?: DateTimeOptions): LocalTimeLuxon;
+    static fromMillis(millis: number, options?: DateTimeOptions): LocalTimeLuxon;
     protected normalize(dateTime: DateTime): DateTime;
     wrap(fn: (dateTime: DateTime) => DateTime): LocalTimeLuxon;
     toJSON(): string;
@@ -39,10 +41,10 @@ export declare class DateTimeLuxon extends LuxonDateTime {
     static readonly format = "yyyy-MM-dd'T'HH:mm:ss";
     static readonly formatTz: string;
     constructor(input: LuxonDateTimeInput);
-    static now(): DateTimeLuxon;
+    static now(options?: DateTimeJSOptions): DateTimeLuxon;
     static fromISO(value: string, options?: DateTimeOptions): DateTimeLuxon;
     static fromJSDate(date: Date, options?: DateTimeOptions): DateTimeLuxon;
-    static fromMillis(milliseconds: number, options?: DateTimeOptions): DateTimeLuxon;
+    static fromMillis(millis: number, options?: DateTimeOptions): DateTimeLuxon;
     protected normalize(dateTime: DateTime): DateTime;
     wrap(fn: (dateTime: DateTime) => DateTime): DateTimeLuxon;
     toJSON(): string;
@@ -50,9 +52,9 @@ export declare class DateTimeLuxon extends LuxonDateTime {
 export declare class DateTimeUtcLuxon extends LuxonDateTime {
     constructor(input: LuxonDateTimeInput);
     static now(): DateTimeUtcLuxon;
-    static fromISO(value: string): DateTimeUtcLuxon;
+    static fromISO(value: string, options?: DateTimeOptions): DateTimeUtcLuxon;
     static fromJSDate(date: Date, options?: DateTimeOptions): DateTimeUtcLuxon;
-    static fromMillis(milliseconds: number, options?: DateTimeOptions): DateTimeUtcLuxon;
+    static fromMillis(millis: number, options?: DateTimeOptions): DateTimeUtcLuxon;
     protected normalize(dateTime: DateTime): DateTime;
     wrap(fn: (dateTime: DateTime) => DateTime): DateTimeUtcLuxon;
     toJSON(): string;
@@ -61,10 +63,10 @@ export declare class DateTimeMillisLuxon extends LuxonDateTime {
     static readonly format = "yyyy-MM-dd'T'HH:mm:ss.SSS";
     static readonly formatTz: string;
     constructor(input: LuxonDateTimeInput);
-    static now(): DateTimeMillisLuxon;
-    static fromISO(value: string): DateTimeMillisLuxon;
+    static now(options?: DateTimeJSOptions): DateTimeMillisLuxon;
+    static fromISO(value: string, options?: DateTimeOptions): DateTimeMillisLuxon;
     static fromJSDate(date: Date, options?: DateTimeOptions): DateTimeMillisLuxon;
-    static fromMillis(milliseconds: number, options?: DateTimeOptions): DateTimeMillisLuxon;
+    static fromMillis(millis: number, options?: DateTimeOptions): DateTimeMillisLuxon;
     protected normalize(dateTime: DateTime): DateTime;
     wrap(fn: (dateTime: DateTime) => DateTime): DateTimeMillisLuxon;
     toJSON(): string;
@@ -74,7 +76,7 @@ export declare class DateTimeMillisUtcLuxon extends LuxonDateTime {
     static now(): DateTimeMillisUtcLuxon;
     static fromISO(value: string, options?: DateTimeOptions): DateTimeMillisUtcLuxon;
     static fromJSDate(date: Date, options?: DateTimeOptions): DateTimeMillisUtcLuxon;
-    static fromMillis(milliseconds: number, options?: DateTimeOptions): DateTimeMillisUtcLuxon;
+    static fromMillis(millis: number, options?: DateTimeOptions): DateTimeMillisUtcLuxon;
     protected normalize(dateTime: DateTime): DateTime;
     wrap(fn: (dateTime: DateTime) => DateTime): DateTimeMillisUtcLuxon;
     toJSON(): string;

package/dist/luxon.js

@@ -36,8 +36,11 @@ class LocalDateLuxon extends LuxonDateTime {
     constructor(input) {
         super(input);
     }
-    static now() {
-        return new LocalDateLuxon(luxon_1.DateTime.now());
+    static nowLocal(options) {
+        return new LocalDateLuxon(luxon_1.DateTime.local(options));
+    }
+    static nowUtc() {
+        return new LocalDateLuxon(luxon_1.DateTime.utc());
     }
     static fromISO(value, options) {
         return new LocalDateLuxon(luxon_1.DateTime.fromISO(value, options));
@@ -45,8 +48,8 @@ class LocalDateLuxon extends LuxonDateTime {
     static fromJSDate(date, options) {
         return new LocalDateLuxon(luxon_1.DateTime.fromJSDate(date, options));
     }
-    static fromMillis(milliseconds, options) {
-        return new LocalDateLuxon(luxon_1.DateTime.fromMillis(milliseconds, options));
+    static fromMillis(millis, options) {
+        return new LocalDateLuxon(luxon_1.DateTime.fromMillis(millis, options));
     }
     normalize(dateTime) {
         return luxon_1.DateTime.utc(dateTime.year, dateTime.month, dateTime.day);
@@ -64,8 +67,11 @@ class LocalTimeLuxon extends LuxonDateTime {
     constructor(input) {
         super(input);
     }
-    static now() {
-        return new LocalTimeLuxon(luxon_1.DateTime.now());
+    static nowLocal(options) {
+        return new LocalTimeLuxon(luxon_1.DateTime.local(options));
+    }
+    static nowUtc() {
+        return new LocalTimeLuxon(luxon_1.DateTime.utc());
     }
     static fromISO(value, options) {
         return new LocalTimeLuxon(luxon_1.DateTime.fromISO(value, options));
@@ -73,8 +79,8 @@ class LocalTimeLuxon extends LuxonDateTime {
     static fromJSDate(date, options) {
         return new LocalTimeLuxon(luxon_1.DateTime.fromJSDate(date, options));
     }
-    static fromMillis(milliseconds, options) {
-        return new LocalTimeLuxon(luxon_1.DateTime.fromMillis(milliseconds, options));
+    static fromMillis(millis, options) {
+        return new LocalTimeLuxon(luxon_1.DateTime.fromMillis(millis, options));
     }
     normalize(dateTime) {
         return luxon_1.DateTime.utc(1970, 1, 1, dateTime.hour, dateTime.minute, dateTime.second);
@@ -92,17 +98,17 @@ class DateTimeLuxon extends LuxonDateTime {
     constructor(input) {
         super(input);
     }
-    static now() {
-        return new DateTimeLuxon(luxon_1.DateTime.now());
+    static now(options) {
+        return new DateTimeLuxon(luxon_1.DateTime.local(options));
     }
     static fromISO(value, options) {
-        return new DateTimeLuxon(luxon_1.DateTime.fromISO(value, options));
+        return new DateTimeLuxon(luxon_1.DateTime.fromISO(value, Object.assign({ setZone: true }, options)));
     }
     static fromJSDate(date, options) {
         return new DateTimeLuxon(luxon_1.DateTime.fromJSDate(date, options));
     }
-    static fromMillis(milliseconds, options) {
-        return new DateTimeLuxon(luxon_1.DateTime.fromMillis(milliseconds, options));
+    static fromMillis(millis, options) {
+        return new DateTimeLuxon(luxon_1.DateTime.fromMillis(millis, options));
     }
     normalize(dateTime) {
         return dateTime.startOf('second');
@@ -126,16 +132,16 @@ class DateTimeUtcLuxon extends LuxonDateTime {
         super(input);
     }
     static now() {
-        return new DateTimeUtcLuxon(luxon_1.DateTime.now());
+        return new DateTimeUtcLuxon(luxon_1.DateTime.utc());
     }
-    static fromISO(value) {
-        return new DateTimeUtcLuxon(luxon_1.DateTime.fromISO(value));
+    static fromISO(value, options) {
+        return new DateTimeUtcLuxon(luxon_1.DateTime.fromISO(value, Object.assign({ zone: luxon_1.FixedOffsetZone.utcInstance }, options)));
     }
     static fromJSDate(date, options) {
-        return new DateTimeUtcLuxon(luxon_1.DateTime.fromJSDate(date, options));
+        return new DateTimeUtcLuxon(luxon_1.DateTime.fromJSDate(date, Object.assign({ zone: luxon_1.FixedOffsetZone.utcInstance }, options)));
     }
-    static fromMillis(milliseconds, options) {
-        return new DateTimeUtcLuxon(luxon_1.DateTime.fromMillis(milliseconds, options));
+    static fromMillis(millis, options) {
+        return new DateTimeUtcLuxon(luxon_1.DateTime.fromMillis(millis, Object.assign({ zone: luxon_1.FixedOffsetZone.utcInstance }, options)));
     }
     normalize(dateTime) {
         return dateTime.toUTC().startOf('second');
@@ -152,17 +158,17 @@ class DateTimeMillisLuxon extends LuxonDateTime {
     constructor(input) {
         super(input);
     }
-    static now() {
-        return new DateTimeMillisLuxon(luxon_1.DateTime.now());
+    static now(options) {
+        return new DateTimeMillisLuxon(luxon_1.DateTime.local(options));
     }
-    static fromISO(value) {
-        return new DateTimeMillisLuxon(luxon_1.DateTime.fromISO(value));
+    static fromISO(value, options) {
+        return new DateTimeMillisLuxon(luxon_1.DateTime.fromISO(value, Object.assign({ setZone: true }, options)));
     }
     static fromJSDate(date, options) {
         return new DateTimeMillisLuxon(luxon_1.DateTime.fromJSDate(date, options));
     }
-    static fromMillis(milliseconds, options) {
-        return new DateTimeMillisLuxon(luxon_1.DateTime.fromMillis(milliseconds, options));
+    static fromMillis(millis, options) {
+        return new DateTimeMillisLuxon(luxon_1.DateTime.fromMillis(millis, options));
     }
     normalize(dateTime) {
         return dateTime;
@@ -186,16 +192,16 @@ class DateTimeMillisUtcLuxon extends LuxonDateTime {
         super(input);
     }
     static now() {
-        return new DateTimeMillisUtcLuxon(luxon_1.DateTime.now());
+        return new DateTimeMillisUtcLuxon(luxon_1.DateTime.utc());
     }
     static fromISO(value, options) {
-        return new DateTimeMillisUtcLuxon(luxon_1.DateTime.fromISO(value, options));
+        return new DateTimeMillisUtcLuxon(luxon_1.DateTime.fromISO(value, Object.assign({ zone: luxon_1.FixedOffsetZone.utcInstance }, options)));
     }
     static fromJSDate(date, options) {
-        return new DateTimeMillisUtcLuxon(luxon_1.DateTime.fromJSDate(date, options));
+        return new DateTimeMillisUtcLuxon(luxon_1.DateTime.fromJSDate(date, Object.assign({ zone: luxon_1.FixedOffsetZone.utcInstance }, options)));
     }
-    static fromMillis(milliseconds, options) {
-        return new DateTimeMillisUtcLuxon(luxon_1.DateTime.fromMillis(milliseconds, options));
+    static fromMillis(millis, options) {
+        return new DateTimeMillisUtcLuxon(luxon_1.DateTime.fromMillis(millis, Object.assign({ zone: luxon_1.FixedOffsetZone.utcInstance }, options)));
     }
     normalize(dateTime) {
         return dateTime.toUTC();

package/dist/test-luxon.js

@@ -1,4 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const luxon_1 = require("luxon");
-console.log(luxon_1.DateTime.local(1970, 1, 1).toMillis());
+const d = luxon_1.DateTime.fromISO('2016-05-25T09:08:34.123');
+console.log(d === d.toUTC());

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finnair/v-validation-luxon",
-  "version": "1.1.0-alpha.5",
+  "version": "1.1.0-alpha.6",
   "private": false,
   "description": "Luxon validators",
   "main": "dist/index.js",
@@ -25,12 +25,12 @@
     "build": "tsc -b ."
   },
   "dependencies": {
-    "@finnair/path": "^1.1.0-alpha.5",
-    "@finnair/v-validation": "^1.1.0-alpha.5",
+    "@finnair/path": "^1.1.0-alpha.6",
+    "@finnair/v-validation": "^1.1.0-alpha.6",
     "luxon": "3.0.1"
   },
   "devDependencies": {
     "@types/luxon": "3.0.0"
   },
-  "gitHead": "593b0dc9cb646a7059d2ede95c44c3b80bec51d3"
+  "gitHead": "cbca3585a6777f34cd135c6c22be566aea34e69b"
 }