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

package/CHANGELOG.md

@@ -3,6 +3,14 @@
 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.7](https://github.com/finnair/v-validation/compare/v1.1.0-alpha.6...v1.1.0-alpha.7) (2022-08-18)
+
+**Note:** Version bump only for package @finnair/v-validation-luxon
+
+
+
+
+
 # [1.1.0-alpha.6](https://github.com/finnair/v-validation/compare/v1.0.1...v1.1.0-alpha.6) (2022-08-17)
 
 

package/dist/Vluxon.d.ts

@@ -1,6 +1,6 @@
 import { ValidationContext, Validator, ValidationResult } from '@finnair/v-validation';
 import { Path } from '@finnair/path';
-import { DateTime, DateTimeOptions } from 'luxon';
+import { DateTime } 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;
-    options: DateTimeOptions;
+    parser: (value: string) => DateTime;
 }
-export declare function validateLuxon({ value, path, ctx, type, proto, pattern, options }: ValidateLuxonParams): ValidationResult;
+export declare function validateLuxon({ value, path, ctx, type, proto, pattern, parser }: 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, options }) {
+function validateLuxon({ value, path, ctx, type, proto, pattern, parser }) {
     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, options }) {
     }
     else if ((0, v_validation_1.isString)(value)) {
         if (pattern.test(value)) {
-            const dateTime = luxon_1.DateTime.fromISO(value, options);
+            const dateTime = parser(value);
             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,
-            options: { zone: luxon_1.FixedOffsetZone.utcInstance },
+            parser: (value) => luxon_1.DateTime.fromISO(value, { zone: luxon_1.FixedOffsetZone.utcInstance }),
         });
     });
 }
@@ -60,7 +60,7 @@ function localTimeValidator(value, path, ctx) {
             type: 'Time',
             proto: luxon_2.LocalTimeLuxon,
             pattern: timePattern,
-            options: { zone: luxon_1.FixedOffsetZone.utcInstance },
+            parser: (value) => luxon_1.DateTime.fromISO(value, { zone: luxon_1.FixedOffsetZone.utcInstance }),
         });
     });
 }
@@ -74,7 +74,7 @@ function dateTimeValidator(value, path, ctx) {
             type: 'DateTime',
             proto: luxon_2.DateTimeLuxon,
             pattern: dateTimePattern,
-            options: { setZone: true },
+            parser: (value) => luxon_1.DateTime.fromISO(value, { setZone: true }),
         });
     });
 }
@@ -87,7 +87,7 @@ function dateTimeUtcValidator(value, path, ctx) {
             type: 'DateTime',
             proto: luxon_2.DateTimeUtcLuxon,
             pattern: dateTimePattern,
-            options: { zone: luxon_1.FixedOffsetZone.utcInstance },
+            parser: (value) => luxon_1.DateTime.fromISO(value, { zone: luxon_1.FixedOffsetZone.utcInstance }),
         });
     });
 }
@@ -101,7 +101,7 @@ function dateTimeMillisValidator(value, path, ctx) {
             type: 'DateTimeMillis',
             proto: luxon_2.DateTimeMillisLuxon,
             pattern: dateTimeMillisPattern,
-            options: { setZone: true },
+            parser: (value) => luxon_1.DateTime.fromISO(value, { setZone: true }),
         });
     });
 }
@@ -114,7 +114,7 @@ function dateTimeMillisUtcValidator(value, path, ctx) {
             type: 'DateTimeMillis',
             proto: luxon_2.DateTimeMillisUtcLuxon,
             pattern: dateTimeMillisPattern,
-            options: { zone: luxon_1.FixedOffsetZone.utcInstance },
+            parser: (value) => luxon_1.DateTime.fromISO(value, { zone: luxon_1.FixedOffsetZone.utcInstance }),
         });
     });
 }

package/dist/luxon.js

@@ -22,6 +22,9 @@ class LuxonDateTime {
         return this.dateTime.valueOf();
     }
     as(type) {
+        if (this instanceof type) {
+            return this;
+        }
         return new type(this.dateTime);
     }
     equals(other) {

package/dist/test-luxon.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@finnair/v-validation-luxon",
-  "version": "1.1.0-alpha.6",
+  "version": "1.1.0-alpha.7",
   "private": false,
   "description": "Luxon validators",
   "main": "dist/index.js",
@@ -32,5 +32,5 @@
   "devDependencies": {
     "@types/luxon": "3.0.0"
   },
-  "gitHead": "cbca3585a6777f34cd135c6c22be566aea34e69b"
+  "gitHead": "b270437f1a403fbb012297653f05d7d6d732fa76"
 }