@anglr/datetime 5.0.0-beta.20221018103539 → 5.0.0-beta.20221018120203

package/changelog.md

@@ -86,6 +86,14 @@
 - new `datetimeValidator` function, that is date time validator factory function, creates validator for checking validity of datetime
 - new `datetimeMaxValidator` function, that is date time validator factory function, creates validator for checking validity of datetime max value
 - new `datetimeMinValidator` function, that is date time validator factory function, creates validator for checking validity of datetime min value
+- new `DateTimeValidationArgs` interface, that represents validations arguments for date time validators for model based forms
+    - **properties**
+        - `valueFormat` format of validated value
+        - `stringFormat` format of string value
+        - `maxValue` max allowed value
+        - `minValue` min allowed value
+- new `dateTimeModelValidatorFactory` function, that is factory function that creates validator function factory
+- new `DateTime` decorator, that sets date time validator to property on which is used
 - updated `DateApiObject` interface
     - new `unixTimestamp` method, that gets value of date time as unix timestamp
 - *subpackage* `@anglr/datetime/moment`

package/es2015/src/misc/validators.js

@@ -1,6 +1,8 @@
-import { isBlank } from '@jscrpt/common';
+import { ModelPropertyMetadata, ValidatorFnFactory } from '@anglr/common/forms';
+import { isBlank, isNumber, isString } from '@jscrpt/common';
 import { getSingleDateTimeValue, parseDateTime } from './utils';
 import { DateTimeBase } from '../modules/dateTime/directives/dateTimeBase';
+import { DATE_API } from './tokens';
 /**
  * Date time validator factory function, creates validator for checking validity of datetime
  * @param dateApi - Date api used for parsing date time
@@ -29,6 +31,38 @@ export function datetimeValidator(dateApi, valueFormat, stringFormat) {
         return null;
     };
 }
+/**
+ * Factory function that creates validator function factory
+ * @param args - Static arguments for date time validator
+ */
+export function dateTimeModelValidatorFactory(args) {
+    return new ValidatorFnFactory(args => {
+        var _a;
+        const dateApi = (_a = args.injector) === null || _a === void 0 ? void 0 : _a.get(DATE_API, null);
+        if (!dateApi) {
+            throw new Error('DateTime: missing DateApi! Please provide one.');
+        }
+        return datetimeValidator(dateApi, args.valueFormat, args.stringFormat);
+    }, args);
+}
+/**
+ * Sets date time validator to property on which is used
+ */
+export function DateTime(valueFormatOrStringFormat, stringFormat) {
+    let valueFormat;
+    if (isNumber(valueFormatOrStringFormat)) {
+        valueFormat = valueFormatOrStringFormat;
+    }
+    if (isString(valueFormatOrStringFormat)) {
+        stringFormat = valueFormatOrStringFormat;
+    }
+    return ModelPropertyMetadata({
+        validators: [dateTimeModelValidatorFactory({
+                stringFormat,
+                valueFormat,
+            })]
+    });
+}
 /**
  * Date time validator factory function, creates validator for checking validity of datetime max value
  * @param dateApi - Date api used for parsing date time

package/es2015/src/misc/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/misc/validators.ts"],"names":[],"mappings":"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","sourcesContent":["import {AbstractControl, ValidationErrors, ValidatorFn} from '@angular/forms';\nimport {isBlank} from '@jscrpt/common';\n\nimport {DateApi} from '../services';\nimport {DateTimeValueObject} from '../interfaces/dateTime/datetime.interface';\nimport {getSingleDateTimeValue, parseDateTime} from './utils';\nimport {DateTimeValueFormat} from './enums';\nimport {DateTimeInputOutputValue} from './types';\nimport {DateTimeBase} from '../modules/dateTime/directives/dateTimeBase';\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime\n * @param dateApi - Date api used for parsing date time\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                   valueFormat: DateTimeValueFormat|undefined|null,\n                                                   stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value))\n        {\n            return null;\n        }\n\n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(!parsedValue.isValid())\n            {\n                return {\n                    'datetime': stringFormat\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime max value\n * @param dateApi - Date api used for parsing date time\n * @param maxValue - Maximal date time value that should be used for validation against\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeMaxValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      maxValue: string|number|TDate|Date|DateTimeBase<TDate>,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value) || isBlank(maxValue))\n        {\n            return null;\n        }\n\n        if(maxValue instanceof DateTimeBase<TDate>)\n        {\n            const value = getSingleDateTimeValue(maxValue.value);\n\n            //no validation\n            if(isBlank(value))\n            {\n                return null;\n            }\n\n            maxValue = value;\n        }\n        \n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const maxDateTime = dateApi.getValue(maxValue as string|number|TDate, stringFormat ?? undefined);\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(parsedValue.isValid() && !parsedValue.isBefore(maxDateTime.value))\n            {\n                return {\n                    'datetimemax': maxDateTime.value\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime min value\n * @param dateApi - Date api used for parsing date time\n * @param minValue - Minimal date time value that should be used for validation against\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeMinValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      minValue: string|number|TDate|Date|DateTimeBase<TDate>,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value) || isBlank(minValue))\n        {\n            return null;\n        }\n\n        if(minValue instanceof DateTimeBase<TDate>)\n        {\n            const value = getSingleDateTimeValue(minValue.value);\n\n            //no validation\n            if(isBlank(value))\n            {\n                return null;\n            }\n\n            minValue = value;\n        }\n        \n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const minDateTime = dateApi.getValue(minValue as string|number|TDate, stringFormat ?? undefined);\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(parsedValue.isValid() && !parsedValue.isAfter(minDateTime.value))\n            {\n                return {\n                    'datetimemin': minDateTime.value\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Validations functions for datetime\n */\nexport class Validators\n{\n    /**\n     * Creates validator function that validates control if its value is valid datetime value\n     * @param datetime - Object storing information about datetime value\n     */\n    public static datetime<TDate = any>(datetime: DateTimeValueObject<TDate>): ValidatorFn\n    {\n        return (): ValidationErrors|null =>\n        {\n            if(!datetime.valid)\n            {\n                return {\n                    'datetime': true\n                };\n            }\n\n            return null;\n        };\n    }\n\n    /**\n     * Creates validator function that validates control if its value is withing range of minimal datetime value\n     * @param datetime - Object storing information about datetime value\n     * @param dateApi - Date api object\n     */\n    public static minDatetime<TDate = any>(datetime: DateTimeValueObject<TDate>, dateApi: DateApi<TDate>): ValidatorFn\n    {\n        return (control: AbstractControl): ValidationErrors|null =>\n        {\n            if(!!control.value &&\n               datetime.valid &&\n               datetime.minValue &&\n               dateApi.getValue(control.value).isBefore(datetime.minValue))\n            {\n                return {\n                    'minDatetime': datetime.minValue,\n                    'actualValue': control.value\n                };\n            }\n\n            return null;\n        };\n    }\n\n    /**\n     * Creates validator function that validates control if its value is withing range of maximal datetime value\n     * @param datetime - Object storing information about datetime value\n     * @param dateApi - Date api object\n     */\n    public static maxDatetime<TDate = any>(datetime: DateTimeValueObject<TDate>, dateApi: DateApi<TDate>): ValidatorFn\n    {\n        return (control: AbstractControl): ValidationErrors|null =>\n        {\n            if(!!control.value &&\n               datetime.valid &&\n               datetime.maxValue &&\n               dateApi.getValue(control.value).isAfter(datetime.maxValue))\n            {\n                return {\n                    'maxDatetime': datetime.maxValue,\n                    'actualValue': control.value\n                };\n            }\n\n            return null;\n        };\n    }\n}"]}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/misc/validators.ts"],"names":[],"mappings":"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","sourcesContent":["import {AbstractControl, ValidationErrors, ValidatorFn} from '@angular/forms';\nimport {ModelPropertyMetadata, ValidatorFnFactory} from '@anglr/common/forms';\nimport {isBlank, isNumber, isString} from '@jscrpt/common';\n\nimport {DateApi} from '../services';\nimport {DateTimeValueObject} from '../interfaces/dateTime/datetime.interface';\nimport {getSingleDateTimeValue, parseDateTime} from './utils';\nimport {DateTimeValueFormat} from './enums';\nimport {DateTimeInputOutputValue} from './types';\nimport {DateTimeBase} from '../modules/dateTime/directives/dateTimeBase';\nimport {DATE_API} from './tokens';\n\n//TODO: add decorators for min and max date time\n\n/**\n * Validations arguments for date time validators for model based forms\n */\nexport interface DateTimeValidationArgs<TDate = unknown>\n{\n    /**\n     * Format of validated value\n     */\n    valueFormat?: DateTimeValueFormat|null;\n\n    /**\n     * Format of string value\n     */\n    stringFormat?: string|null;\n\n    /**\n     * Max allowed value\n     */\n    maxValue?: string|number|TDate|Date|DateTimeBase<TDate>;\n\n    /**\n     * Min allowed value\n     */\n    minValue?: string|number|TDate|Date|DateTimeBase<TDate>;\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime\n * @param dateApi - Date api used for parsing date time\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                   valueFormat: DateTimeValueFormat|undefined|null,\n                                                   stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value))\n        {\n            return null;\n        }\n\n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(!parsedValue.isValid())\n            {\n                return {\n                    'datetime': stringFormat\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Factory function that creates validator function factory\n * @param args - Static arguments for date time validator\n */\nexport function dateTimeModelValidatorFactory<TDate = unknown>(args: DateTimeValidationArgs<TDate>): ValidatorFnFactory<DateTimeValidationArgs<TDate>>\n{\n    return new ValidatorFnFactory<DateTimeValidationArgs<TDate>>(args =>\n    {\n        const dateApi = args.injector?.get(DATE_API, null);\n\n        if(!dateApi)\n        {\n            throw new Error('DateTime: missing DateApi! Please provide one.');\n        }\n\n        return datetimeValidator(dateApi, args.valueFormat, args.stringFormat);\n    }, args);\n}\n\n/**\n * Sets date time validator, with default formats\n */\nexport function DateTime(): PropertyDecorator\n/**\n * Sets date time validator, with default string format\n * @param valueFormat - Format of validated value\n */\nexport function DateTime(valueFormat: DateTimeValueFormat): PropertyDecorator\n/**\n * Sets date time validator, with default value format\n * @param stringFormat - Format of string value\n */\nexport function DateTime(stringFormat: string|null): PropertyDecorator\n/**\n * Sets date time validator\n * @param valueFormat - Format of validated value\n * @param stringFormat - Format of string value\n */\nexport function DateTime(valueFormat: DateTimeValueFormat, stringFormat: string): PropertyDecorator\n/**\n * Sets date time validator to property on which is used\n */\nexport function DateTime(valueFormatOrStringFormat?: DateTimeValueFormat|string|null, stringFormat?: string|undefined|null): PropertyDecorator\n{\n    let valueFormat: DateTimeValueFormat|undefined|null;\n\n    if(isNumber(valueFormatOrStringFormat))\n    {\n        valueFormat = valueFormatOrStringFormat;\n    }\n\n    if(isString(valueFormatOrStringFormat))\n    {\n        stringFormat = valueFormatOrStringFormat;\n    }\n\n    return ModelPropertyMetadata(\n    {\n        validators: [dateTimeModelValidatorFactory(\n        {\n            stringFormat,\n            valueFormat,\n        })]\n    });\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime max value\n * @param dateApi - Date api used for parsing date time\n * @param maxValue - Maximal date time value that should be used for validation against\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeMaxValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      maxValue: string|number|TDate|Date|DateTimeBase<TDate>|undefined|null,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value) || isBlank(maxValue))\n        {\n            return null;\n        }\n\n        if(maxValue instanceof DateTimeBase<TDate>)\n        {\n            const value = getSingleDateTimeValue(maxValue.value);\n\n            //no validation\n            if(isBlank(value))\n            {\n                return null;\n            }\n\n            maxValue = value;\n        }\n\n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const maxDateTime = dateApi.getValue(maxValue as string|number|TDate, stringFormat ?? undefined);\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(parsedValue.isValid() && !parsedValue.isBefore(maxDateTime.value))\n            {\n                return {\n                    'datetimemax': maxDateTime.value\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime min value\n * @param dateApi - Date api used for parsing date time\n * @param minValue - Minimal date time value that should be used for validation against\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeMinValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      minValue: string|number|TDate|Date|DateTimeBase<TDate>|undefined|null,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value) || isBlank(minValue))\n        {\n            return null;\n        }\n\n        if(minValue instanceof DateTimeBase<TDate>)\n        {\n            const value = getSingleDateTimeValue(minValue.value);\n\n            //no validation\n            if(isBlank(value))\n            {\n                return null;\n            }\n\n            minValue = value;\n        }\n\n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const minDateTime = dateApi.getValue(minValue as string|number|TDate, stringFormat ?? undefined);\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(parsedValue.isValid() && !parsedValue.isAfter(minDateTime.value))\n            {\n                return {\n                    'datetimemin': minDateTime.value\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Validations functions for datetime\n */\nexport class Validators\n{\n    /**\n     * Creates validator function that validates control if its value is valid datetime value\n     * @param datetime - Object storing information about datetime value\n     */\n    public static datetime<TDate = any>(datetime: DateTimeValueObject<TDate>): ValidatorFn\n    {\n        return (): ValidationErrors|null =>\n        {\n            if(!datetime.valid)\n            {\n                return {\n                    'datetime': true\n                };\n            }\n\n            return null;\n        };\n    }\n\n    /**\n     * Creates validator function that validates control if its value is withing range of minimal datetime value\n     * @param datetime - Object storing information about datetime value\n     * @param dateApi - Date api object\n     */\n    public static minDatetime<TDate = any>(datetime: DateTimeValueObject<TDate>, dateApi: DateApi<TDate>): ValidatorFn\n    {\n        return (control: AbstractControl): ValidationErrors|null =>\n        {\n            if(!!control.value &&\n               datetime.valid &&\n               datetime.minValue &&\n               dateApi.getValue(control.value).isBefore(datetime.minValue))\n            {\n                return {\n                    'minDatetime': datetime.minValue,\n                    'actualValue': control.value\n                };\n            }\n\n            return null;\n        };\n    }\n\n    /**\n     * Creates validator function that validates control if its value is withing range of maximal datetime value\n     * @param datetime - Object storing information about datetime value\n     * @param dateApi - Date api object\n     */\n    public static maxDatetime<TDate = any>(datetime: DateTimeValueObject<TDate>, dateApi: DateApi<TDate>): ValidatorFn\n    {\n        return (control: AbstractControl): ValidationErrors|null =>\n        {\n            if(!!control.value &&\n               datetime.valid &&\n               datetime.maxValue &&\n               dateApi.getValue(control.value).isAfter(datetime.maxValue))\n            {\n                return {\n                    'maxDatetime': datetime.maxValue,\n                    'actualValue': control.value\n                };\n            }\n\n            return null;\n        };\n    }\n}"]}

package/es2015/src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.js

@@ -1,19 +1,22 @@
 import { __decorate, __metadata } from "tslib";
 import { Directive, ElementRef, EventEmitter, forwardRef, Inject } from '@angular/core';
-import { BindThis } from '@jscrpt/common';
+import { BindThis, isBlank } from '@jscrpt/common';
 import { DATE_API, DATE_TIME_INPUT, FORMAT_PROVIDER } from '../../../../misc/tokens';
 import { formatDateTime, parseDateTime } from '../../../../misc/utils';
+import { DateValueProvider } from '../../../../services';
 import { DateTimeBase } from '../dateTimeBase';
 import * as i0 from "@angular/core";
+import * as i1 from "../../../../services";
 //TODO: range is unimplemented
 /**
  * Directive that is used for setting up date time input
  */
 export class DateTimeInputDirective extends DateTimeBase {
     //######################### constructors #########################
-    constructor(element, dateApi, formatProvider) {
+    constructor(element, dateApi, formatProvider, valueProvider) {
         super(dateApi, formatProvider);
         this.element = element;
+        this.valueProvider = valueProvider;
         /**
          * @inheritdoc
          */
@@ -44,9 +47,9 @@ export class DateTimeInputDirective extends DateTimeBase {
     }
     set value(value) {
         var _a;
-        this.ɵValue = value;
         //accepts all available formats
-        this.internalValue = parseDateTime(value, this.dateApi, null, this.customFormat);
+        this.setInternalValue(value);
+        this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);
         //not range value
         if (!Array.isArray(this.internalValue)) {
             this.rawValue = (_a = this.internalValue) === null || _a === void 0 ? void 0 : _a.format(this.customFormat);
@@ -74,6 +77,38 @@ export class DateTimeInputDirective extends DateTimeBase {
         this.element.nativeElement.removeEventListener('blur', this.handleBlur);
     }
     //######################### protected methods #########################
+    /**
+     * Sets internal value and fix lowest time difference
+     * @param value - Value to be set
+     */
+    setInternalValue(value) {
+        this.internalValue = parseDateTime(value, this.dateApi, null, this.customFormat);
+        if (isBlank(this.internalValue)) {
+            return;
+        }
+        //ranged value
+        if (Array.isArray(this.internalValue)) {
+            const [from, to] = this.internalValue;
+            if (from) {
+                const val = this.valueProvider.getValue(from.value, this.customFormat).from;
+                if (val) {
+                    this.internalValue[0] = this.dateApi.getValue(val, this.customFormat);
+                }
+            }
+            if (to) {
+                const val = this.valueProvider.getValue(to.value, this.customFormat).to;
+                if (val) {
+                    this.internalValue[1] = this.dateApi.getValue(val, this.customFormat);
+                }
+            }
+        }
+        else {
+            const val = this.valueProvider.getValue(this.internalValue.value, this.customFormat).from;
+            if (val) {
+                this.internalValue = this.dateApi.getValue(val, this.customFormat);
+            }
+        }
+    }
     /**
      * Handles input event on input
      */
@@ -84,7 +119,7 @@ export class DateTimeInputDirective extends DateTimeBase {
             this.valueChange.next();
             return;
         }
-        this.internalValue = parseDateTime(this.rawValue, this.dateApi, this.valueFormat, this.customFormat);
+        this.setInternalValue(this.rawValue);
         this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);
         this.valueChange.next();
     }
@@ -103,7 +138,7 @@ export class DateTimeInputDirective extends DateTimeBase {
         this.blur.emit(event);
     }
 }
-DateTimeInputDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateTimeInputDirective, deps: [{ token: i0.ElementRef }, { token: DATE_API }, { token: FORMAT_PROVIDER }], target: i0.ɵɵFactoryTarget.Directive });
+DateTimeInputDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateTimeInputDirective, deps: [{ token: i0.ElementRef }, { token: DATE_API }, { token: FORMAT_PROVIDER }, { token: i1.DateValueProvider }], target: i0.ɵɵFactoryTarget.Directive });
 DateTimeInputDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.6", type: DateTimeInputDirective, selector: "input[dateTime][dateTimeInput]", providers: [
         {
             provide: DATE_TIME_INPUT,
@@ -146,5 +181,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.6", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [FORMAT_PROVIDER]
-                }] }]; }, propDecorators: { handleInput: [], handleFocus: [], handleBlur: [] } });
+                }] }, { type: i1.DateValueProvider }]; }, propDecorators: { handleInput: [], handleFocus: [], handleBlur: [] } });
 //# sourceMappingURL=dateTimeInput.directive.js.map

package/es2015/src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.js.map

@@ -1 +1 @@
-{"version":3,"file":"dateTimeInput.directive.js","sourceRoot":"","sources":["../../../../../../src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.ts"],"names":[],"mappings":"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","sourcesContent":["import {Directive, ElementRef, EventEmitter, ExistingProvider, forwardRef, Inject, OnDestroy} from '@angular/core';\nimport {BindThis} from '@jscrpt/common';\n\nimport {DateTimeInput, FormatProvider} from '../../../../interfaces';\nimport {DATE_API, DATE_TIME_INPUT, FORMAT_PROVIDER} from '../../../../misc/tokens';\nimport {DateTimeInputOutputValue, DateTimeObjectValue} from '../../../../misc/types';\nimport {formatDateTime, parseDateTime} from '../../../../misc/utils';\nimport {DateApi} from '../../../../services';\nimport {DateTimeBase} from '../dateTimeBase';\n\n//TODO: range is unimplemented\n\n/**\n * Directive that is used for setting up date time input\n */\n@Directive(\n{\n    selector: 'input[dateTime][dateTimeInput]',\n    providers:\n    [\n        <ExistingProvider>\n        {\n            provide: DATE_TIME_INPUT,\n            useExisting: forwardRef(() => DateTimeInputDirective),\n        },\n    ],\n    exportAs: 'dateTime',\n})\nexport class DateTimeInputDirective<TDate = unknown> extends DateTimeBase<TDate> implements DateTimeInput, OnDestroy\n{\n    //######################### protected properties #########################\n\n    /**\n     * Internal representation of current date time value\n     */\n    protected internalValue: DateTimeObjectValue<TDate>|undefined|null;\n\n    //######################### public properties - implementation of DateTimeInput #########################\n\n    /**\n     * @inheritdoc\n     */\n    public get rawValue(): string|undefined|null\n    {\n        return this.element.nativeElement.value;\n    }\n    public set rawValue(value: string|undefined|null)\n    {\n        this.element.nativeElement.value = value ?? '';\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public override get value(): DateTimeInputOutputValue<TDate>|undefined|null\n    {\n        return this.ɵValue;\n    }\n    public override set value(value: DateTimeInputOutputValue<TDate>|undefined|null)\n    {\n        this.ɵValue = value;\n\n        //accepts all available formats\n        this.internalValue = parseDateTime(value, this.dateApi, null, this.customFormat);\n        \n        //not range value\n        if(!Array.isArray(this.internalValue))\n        {\n            this.rawValue = this.internalValue?.format(this.customFormat);\n        }\n        else\n        {\n            //TODO: add support for ranges\n        }\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public get disabled(): boolean\n    {\n        return this.element.nativeElement.disabled;\n    }\n    public set disabled(value: boolean)\n    {\n        this.element.nativeElement.disabled = value;\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public focus: EventEmitter<FocusEvent> = new EventEmitter<FocusEvent>();\n\n    /**\n     * @inheritdoc\n     */\n    public blur: EventEmitter<FocusEvent> = new EventEmitter<FocusEvent>();\n\n    //######################### constructors #########################\n    constructor(protected element: ElementRef<HTMLInputElement>,\n                @Inject(DATE_API) dateApi: DateApi<TDate>,\n                @Inject(FORMAT_PROVIDER) formatProvider: FormatProvider,)\n    {\n        super(dateApi, formatProvider);\n\n        this.element.nativeElement.addEventListener('input', this.handleInput);\n        this.element.nativeElement.addEventListener('focus', this.handleFocus);\n        this.element.nativeElement.addEventListener('blur', this.handleBlur);\n    }\n\n    //######################### public methods - implementation of OnDestroy #########################\n    \n    /**\n     * Called when component is destroyed\n     */\n    public ngOnDestroy(): void\n    {\n        this.element.nativeElement.removeEventListener('input', this.handleInput);\n        this.element.nativeElement.removeEventListener('focus', this.handleFocus);\n        this.element.nativeElement.removeEventListener('blur', this.handleBlur);\n    }\n\n    //######################### protected methods #########################\n\n    /**\n     * Handles input event on input\n     */\n    @BindThis\n    protected handleInput(): void\n    {\n        if(!this.rawValue)\n        {\n            this.internalValue = null;\n            this.ɵValue = null;\n\n            this.valueChange.next();\n\n            return;\n        }\n\n        this.internalValue = parseDateTime(this.rawValue, this.dateApi, this.valueFormat, this.customFormat);\n        this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);\n\n        this.valueChange.next();\n    }\n\n    /**\n     * Handles focus event on input\n     * @param event - Event that occured\n     */\n    @BindThis\n    protected handleFocus(event: FocusEvent): void\n    {\n        this.focus.emit(event);\n    }\n\n    /**\n     * Handles blur event on input\n     * @param event - Event that occured\n     */\n    @BindThis\n    protected handleBlur(event: FocusEvent): void\n    {\n        this.blur.emit(event);\n    }\n}"]}
+{"version":3,"file":"dateTimeInput.directive.js","sourceRoot":"","sources":["../../../../../../src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.ts"],"names":[],"mappings":"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","sourcesContent":["import {Directive, ElementRef, EventEmitter, ExistingProvider, forwardRef, Inject, OnDestroy} from '@angular/core';\nimport {BindThis, isBlank} from '@jscrpt/common';\n\nimport {DateTimeInput, FormatProvider} from '../../../../interfaces';\nimport {DATE_API, DATE_TIME_INPUT, FORMAT_PROVIDER} from '../../../../misc/tokens';\nimport {DateTimeInputOutputValue, DateTimeObjectValue} from '../../../../misc/types';\nimport {formatDateTime, parseDateTime} from '../../../../misc/utils';\nimport {DateApi, DateValueProvider} from '../../../../services';\nimport {DateTimeBase} from '../dateTimeBase';\n\n//TODO: range is unimplemented\n\n/**\n * Directive that is used for setting up date time input\n */\n@Directive(\n{\n    selector: 'input[dateTime][dateTimeInput]',\n    providers:\n    [\n        <ExistingProvider>\n        {\n            provide: DATE_TIME_INPUT,\n            useExisting: forwardRef(() => DateTimeInputDirective),\n        },\n    ],\n    exportAs: 'dateTime',\n})\nexport class DateTimeInputDirective<TDate = unknown> extends DateTimeBase<TDate> implements DateTimeInput, OnDestroy\n{\n    //######################### protected properties #########################\n\n    /**\n     * Internal representation of current date time value\n     */\n    protected internalValue: DateTimeObjectValue<TDate>|undefined|null;\n\n    //######################### public properties - implementation of DateTimeInput #########################\n\n    /**\n     * @inheritdoc\n     */\n    public get rawValue(): string|undefined|null\n    {\n        return this.element.nativeElement.value;\n    }\n    public set rawValue(value: string|undefined|null)\n    {\n        this.element.nativeElement.value = value ?? '';\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public override get value(): DateTimeInputOutputValue<TDate>|undefined|null\n    {\n        return this.ɵValue;\n    }\n    public override set value(value: DateTimeInputOutputValue<TDate>|undefined|null)\n    {\n        //accepts all available formats\n        this.setInternalValue(value);\n        this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);\n        \n        //not range value\n        if(!Array.isArray(this.internalValue))\n        {\n            this.rawValue = this.internalValue?.format(this.customFormat);\n        }\n        else\n        {\n            //TODO: add support for ranges\n        }\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public get disabled(): boolean\n    {\n        return this.element.nativeElement.disabled;\n    }\n    public set disabled(value: boolean)\n    {\n        this.element.nativeElement.disabled = value;\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public focus: EventEmitter<FocusEvent> = new EventEmitter<FocusEvent>();\n\n    /**\n     * @inheritdoc\n     */\n    public blur: EventEmitter<FocusEvent> = new EventEmitter<FocusEvent>();\n\n    //######################### constructors #########################\n    constructor(protected element: ElementRef<HTMLInputElement>,\n                @Inject(DATE_API) dateApi: DateApi<TDate>,\n                @Inject(FORMAT_PROVIDER) formatProvider: FormatProvider,\n                protected valueProvider: DateValueProvider<TDate>,)\n    {\n        super(dateApi, formatProvider);\n\n        this.element.nativeElement.addEventListener('input', this.handleInput);\n        this.element.nativeElement.addEventListener('focus', this.handleFocus);\n        this.element.nativeElement.addEventListener('blur', this.handleBlur);\n    }\n\n    //######################### public methods - implementation of OnDestroy #########################\n    \n    /**\n     * Called when component is destroyed\n     */\n    public ngOnDestroy(): void\n    {\n        this.element.nativeElement.removeEventListener('input', this.handleInput);\n        this.element.nativeElement.removeEventListener('focus', this.handleFocus);\n        this.element.nativeElement.removeEventListener('blur', this.handleBlur);\n    }\n\n    //######################### protected methods #########################\n\n    /**\n     * Sets internal value and fix lowest time difference\n     * @param value - Value to be set\n     */\n    protected setInternalValue(value: DateTimeInputOutputValue<TDate>|undefined|null): void\n    {\n        this.internalValue = parseDateTime(value, this.dateApi, null, this.customFormat);\n\n        if(isBlank(this.internalValue))\n        {\n            return;\n        }\n\n        //ranged value\n        if(Array.isArray(this.internalValue))\n        {\n            const [from, to] = this.internalValue;\n\n            if(from)\n            {\n                const val = this.valueProvider.getValue(from.value, this.customFormat).from;\n\n                if(val)\n                {\n                    this.internalValue[0] = this.dateApi.getValue(val, this.customFormat);\n                }\n            }\n\n            if(to)\n            {\n                const val = this.valueProvider.getValue(to.value, this.customFormat).to;\n\n                if(val)\n                {\n                    this.internalValue[1] = this.dateApi.getValue(val, this.customFormat);\n                }\n            }\n        }\n        else\n        {\n            const val = this.valueProvider.getValue(this.internalValue.value, this.customFormat).from;\n\n            if(val)\n            {\n                this.internalValue = this.dateApi.getValue(val, this.customFormat);\n            }\n        }\n    }\n\n    /**\n     * Handles input event on input\n     */\n    @BindThis\n    protected handleInput(): void\n    {\n        if(!this.rawValue)\n        {\n            this.internalValue = null;\n            this.ɵValue = null;\n\n            this.valueChange.next();\n\n            return;\n        }\n\n        this.setInternalValue(this.rawValue);\n        this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);\n\n        this.valueChange.next();\n    }\n\n    /**\n     * Handles focus event on input\n     * @param event - Event that occured\n     */\n    @BindThis\n    protected handleFocus(event: FocusEvent): void\n    {\n        this.focus.emit(event);\n    }\n\n    /**\n     * Handles blur event on input\n     * @param event - Event that occured\n     */\n    @BindThis\n    protected handleBlur(event: FocusEvent): void\n    {\n        this.blur.emit(event);\n    }\n}"]}

package/es2015/src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.js

@@ -25,7 +25,7 @@ export class DateTimeRelativeParser {
      */
     parse(value) {
         var _a;
-        const regex = /([+-])\s*(\d+)\s*([hmdwMy])/;
+        const regex = /([+-])\s*(\d+)\s*([hHmdwMy])/;
         let matches = null;
         //relative date provided
         if (isString(value) && (matches = regex.exec(value))) {
@@ -40,6 +40,7 @@ export class DateTimeRelativeParser {
                         operation == '+' ? now.addMinutes(+amount).endOfMinute() : now.subtractMinutes(+amount).startOfMinute();
                         break;
                     }
+                case 'H':
                 case 'h':
                     {
                         operation == '+' ? now.addHours(+amount).endOfHour() : now.subtractHours(+amount).startOfHour();

package/es2015/src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dateTimeRelativeParser.service.js","sourceRoot":"","sources":["../../../../src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable, Injector} from '@angular/core';\nimport {isString} from '@jscrpt/common';\n\nimport {DATE_API} from '../../misc/tokens';\nimport {DateApi, DateApiObject, DateValue} from '../dateApi/dateApi.interface';\n\n/**\n * Service used for parsing relative date time strings\n */\n@Injectable({providedIn: 'root'})\nexport class DateTimeRelativeParser<TDate = any>\n{\n    //######################### protected fields #########################\n    \n    /**\n     * Date api for handling\n     */\n    protected _dateApi?: DateApi<TDate, DateApiObject>;\n\n    //######################### constructor #########################\n    constructor(protected _injector: Injector)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Tries to parse relative value and returns parsed TDate, otherwise returns input value\n     * @param value - Value to be parsed\n     * \n     * @summary\n     * m - for minutes\n     * h - for hours\n     * d - for days\n     * w - for weeks\n     * M - for months\n     * y - for years\n     */\n    public parse(value: TDate|DateValue): TDate|DateValue\n    {\n        const regex = /([+-])\\s*(\\d+)\\s*([hmdwMy])/;\n        let matches: RegExpExecArray | null = null;\n\n        //relative date provided\n        if(isString(value) && (matches = regex.exec(value)))\n        {\n            const operation = matches[1];\n            const amount = matches[2];\n            const period = matches[3];\n            this._dateApi = this._dateApi ?? this._injector.get(DATE_API);\n            const now = this._dateApi.now();\n\n            switch(period)\n            {\n                case 'm':\n                {\n                    operation == '+' ? now.addMinutes(+amount).endOfMinute() : now.subtractMinutes(+amount).startOfMinute();\n\n                    break;\n                }\n                case 'h':\n                {\n                    operation == '+' ? now.addHours(+amount).endOfHour() : now.subtractHours(+amount).startOfHour();\n\n                    break;\n                }\n                case 'd':\n                {\n                    operation == '+' ? now.addDays(+amount).endOfDay() : now.subtractDays(+amount).startOfDay();\n\n                    break;\n                }\n                case 'w':\n                {\n                    operation == '+' ? now.addWeeks(+amount).endOfDay() : now.subtractWeeks(+amount).startOfDay();\n\n                    break;\n                }\n                case 'M':\n                {\n                    operation == '+' ? now.addMonths(+amount).endOfDay() : now.subtractMonths(+amount).startOfDay();\n\n                    break;\n                }\n                case 'y':\n                {\n                    operation == '+' ? now.addYears(+amount).endOfDay() : now.subtractYears(+amount).startOfDay();\n\n                    break;\n                }\n            }\n\n            value = now.value;\n        }\n\n        return value;\n    }\n}"]}
+{"version":3,"file":"dateTimeRelativeParser.service.js","sourceRoot":"","sources":["../../../../src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable, Injector} from '@angular/core';\nimport {isString} from '@jscrpt/common';\n\nimport {DATE_API} from '../../misc/tokens';\nimport {DateApi, DateApiObject, DateValue} from '../dateApi/dateApi.interface';\n\n/**\n * Service used for parsing relative date time strings\n */\n@Injectable({providedIn: 'root'})\nexport class DateTimeRelativeParser<TDate = any>\n{\n    //######################### protected fields #########################\n    \n    /**\n     * Date api for handling\n     */\n    protected _dateApi?: DateApi<TDate, DateApiObject>;\n\n    //######################### constructor #########################\n    constructor(protected _injector: Injector)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Tries to parse relative value and returns parsed TDate, otherwise returns input value\n     * @param value - Value to be parsed\n     * \n     * @summary\n     * m - for minutes\n     * h - for hours\n     * d - for days\n     * w - for weeks\n     * M - for months\n     * y - for years\n     */\n    public parse(value: TDate|DateValue): TDate|DateValue\n    {\n        const regex = /([+-])\\s*(\\d+)\\s*([hHmdwMy])/;\n        let matches: RegExpExecArray | null = null;\n\n        //relative date provided\n        if(isString(value) && (matches = regex.exec(value)))\n        {\n            const operation = matches[1];\n            const amount = matches[2];\n            const period = matches[3];\n            this._dateApi = this._dateApi ?? this._injector.get(DATE_API);\n            const now = this._dateApi.now();\n\n            switch(period)\n            {\n                case 'm':\n                {\n                    operation == '+' ? now.addMinutes(+amount).endOfMinute() : now.subtractMinutes(+amount).startOfMinute();\n\n                    break;\n                }\n                case 'H':\n                case 'h':\n                {\n                    operation == '+' ? now.addHours(+amount).endOfHour() : now.subtractHours(+amount).startOfHour();\n\n                    break;\n                }\n                case 'd':\n                {\n                    operation == '+' ? now.addDays(+amount).endOfDay() : now.subtractDays(+amount).startOfDay();\n\n                    break;\n                }\n                case 'w':\n                {\n                    operation == '+' ? now.addWeeks(+amount).endOfDay() : now.subtractWeeks(+amount).startOfDay();\n\n                    break;\n                }\n                case 'M':\n                {\n                    operation == '+' ? now.addMonths(+amount).endOfDay() : now.subtractMonths(+amount).startOfDay();\n\n                    break;\n                }\n                case 'y':\n                {\n                    operation == '+' ? now.addYears(+amount).endOfDay() : now.subtractYears(+amount).startOfDay();\n\n                    break;\n                }\n            }\n\n            value = now.value;\n        }\n\n        return value;\n    }\n}"]}

package/es2015/src/services/dateValueProvider/dateValueProvider.service.js

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 import { DATE_API } from '../../misc/tokens';
 import * as i0 from "@angular/core";
+//TODO: change to unknown when legacy stuff is removed
 /**
  * Class used for obtaining DateTimeValue for various formats
  */
@@ -26,7 +27,7 @@ export class DateValueProvider {
             end = val.endOfMinute().value;
         }
         //hour
-        else if (fullFormat.indexOf('H') >= 0) {
+        else if (fullFormat.indexOf('H') >= 0 || fullFormat.indexOf('h') >= 0) {
             start = val.startOfHour().value;
             end = val.endOfHour().value;
         }

package/es2015/src/services/dateValueProvider/dateValueProvider.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dateValueProvider.service.js","sourceRoot":"","sources":["../../../../src/services/dateValueProvider/dateValueProvider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAGjD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;AAG3C;;GAEG;AAEH,MAAM,OAAO,iBAAiB;IAE1B,iEAAiE;IACjE,YAAwC,QAAwB;QAAxB,aAAQ,GAAR,QAAQ,CAAgB;IAEhE,CAAC;IAED,oEAAoE;IAEpE;;;;OAIG;IACI,QAAQ,CAAC,KAAY,EAAE,MAAc;QAExC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,KAAK,GAAU,KAAK,CAAC;QACzB,IAAI,GAAG,GAAU,KAAK,CAAC;QAEvB,QAAQ;QACR,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAC/B;YACI,KAAK,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC;YAClC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;SACjC;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,KAAK;aACA,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;YAC/B,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC;SAC9B;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,OAAO;aACF,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;YACjC,GAAG,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;SAChC;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpE;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QAED,OAAO;YACH,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,GAAG;SACV,CAAC;IACN,CAAC;;8GA9DQ,iBAAiB,kBAGN,QAAQ;kHAHnB,iBAAiB,cADL,MAAM;2FAClB,iBAAiB;kBAD7B,UAAU;mBAAC,EAAC,UAAU,EAAE,MAAM,EAAC;;0BAIf,MAAM;2BAAC,QAAQ","sourcesContent":["import {Inject, Injectable} from '@angular/core';\n\nimport {DateTimeValue} from '../../interfaces/dateTime/datetime.interface';\nimport {DATE_API} from '../../misc/tokens';\nimport {DateApi} from '../dateApi/dateApi.interface';\n\n/**\n * Class used for obtaining DateTimeValue for various formats\n */\n@Injectable({providedIn: 'root'})\nexport class DateValueProvider<TDate = any>\n{\n    //######################### constructor #########################\n    constructor(@Inject(DATE_API) protected _dateApi: DateApi<TDate>)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Gets DateTimeValue from single value based on format\n     * @param value - Current value to be converted to ranged value\n     * @param format - Format that is requested to be displayed, it tells what range should be created\n     */\n    public getValue(value: TDate, format: string): DateTimeValue<TDate>\n    {\n        const val = this._dateApi.getValue(value, format);\n        const fullFormat = this._dateApi.getFormat(format);\n        let start: TDate = value;\n        let end: TDate = value;\n\n        //minute\n        if(fullFormat.indexOf('m') >= 0)\n        {\n            start = val.startOfMinute().value;\n            end = val.endOfMinute().value;\n        }\n        //hour\n        else if(fullFormat.indexOf('H') >= 0)\n        {\n            start = val.startOfHour().value;\n            end = val.endOfHour().value;\n        }\n        //day\n        else if(fullFormat.indexOf('d') >= 0)\n        {\n            start = val.startOfDay().value;\n            end = val.endOfDay().value;\n        }\n        //week\n        else if(fullFormat.indexOf('w') >= 0)\n        {\n            start = val.startOfWeek().value;\n            end = val.endOfWeek().value;\n        }\n        //month\n        else if(fullFormat.indexOf('M') >= 0)\n        {\n            start = val.startOfMonth().value;\n            end = val.endOfMonth().value;\n        }\n        //year\n        else if(fullFormat.indexOf('Y') >= 0 || fullFormat.indexOf('y') >= 0)\n        {\n            start = val.startOfYear().value;\n            end = val.endOfYear().value;\n        }\n\n        return {\n            from: start,\n            to: end\n        };\n    }\n}"]}
+{"version":3,"file":"dateValueProvider.service.js","sourceRoot":"","sources":["../../../../src/services/dateValueProvider/dateValueProvider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAGjD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;AAG3C,sDAAsD;AAEtD;;GAEG;AAEH,MAAM,OAAO,iBAAiB;IAE1B,iEAAiE;IACjE,YAAwC,QAAwB;QAAxB,aAAQ,GAAR,QAAQ,CAAgB;IAEhE,CAAC;IAED,oEAAoE;IAEpE;;;;OAIG;IACI,QAAQ,CAAC,KAAY,EAAE,MAAc;QAExC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,KAAK,GAAU,KAAK,CAAC;QACzB,IAAI,GAAG,GAAU,KAAK,CAAC;QAEvB,QAAQ;QACR,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAC/B;YACI,KAAK,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC;YAClC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;SACjC;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpE;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,KAAK;aACA,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;YAC/B,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC;SAC9B;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,OAAO;aACF,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;YACjC,GAAG,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;SAChC;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpE;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QAED,OAAO;YACH,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,GAAG;SACV,CAAC;IACN,CAAC;;8GA9DQ,iBAAiB,kBAGN,QAAQ;kHAHnB,iBAAiB,cADL,MAAM;2FAClB,iBAAiB;kBAD7B,UAAU;mBAAC,EAAC,UAAU,EAAE,MAAM,EAAC;;0BAIf,MAAM;2BAAC,QAAQ","sourcesContent":["import {Inject, Injectable} from '@angular/core';\n\nimport {DateTimeValue} from '../../interfaces/dateTime/datetime.interface';\nimport {DATE_API} from '../../misc/tokens';\nimport {DateApi} from '../dateApi/dateApi.interface';\n\n//TODO: change to unknown when legacy stuff is removed\n\n/**\n * Class used for obtaining DateTimeValue for various formats\n */\n@Injectable({providedIn: 'root'})\nexport class DateValueProvider<TDate = any>\n{\n    //######################### constructor #########################\n    constructor(@Inject(DATE_API) protected _dateApi: DateApi<TDate>)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Gets DateTimeValue from single value based on format\n     * @param value - Current value to be converted to ranged value\n     * @param format - Format that is requested to be displayed, it tells what range should be created\n     */\n    public getValue(value: TDate, format: string): DateTimeValue<TDate>\n    {\n        const val = this._dateApi.getValue(value, format);\n        const fullFormat = this._dateApi.getFormat(format);\n        let start: TDate = value;\n        let end: TDate = value;\n\n        //minute\n        if(fullFormat.indexOf('m') >= 0)\n        {\n            start = val.startOfMinute().value;\n            end = val.endOfMinute().value;\n        }\n        //hour\n        else if(fullFormat.indexOf('H') >= 0 || fullFormat.indexOf('h') >= 0)\n        {\n            start = val.startOfHour().value;\n            end = val.endOfHour().value;\n        }\n        //day\n        else if(fullFormat.indexOf('d') >= 0)\n        {\n            start = val.startOfDay().value;\n            end = val.endOfDay().value;\n        }\n        //week\n        else if(fullFormat.indexOf('w') >= 0)\n        {\n            start = val.startOfWeek().value;\n            end = val.endOfWeek().value;\n        }\n        //month\n        else if(fullFormat.indexOf('M') >= 0)\n        {\n            start = val.startOfMonth().value;\n            end = val.endOfMonth().value;\n        }\n        //year\n        else if(fullFormat.indexOf('Y') >= 0 || fullFormat.indexOf('y') >= 0)\n        {\n            start = val.startOfYear().value;\n            end = val.endOfYear().value;\n        }\n\n        return {\n            from: start,\n            to: end\n        };\n    }\n}"]}

package/es2020/src/misc/validators.js

@@ -1,6 +1,8 @@
-import { isBlank } from '@jscrpt/common';
+import { ModelPropertyMetadata, ValidatorFnFactory } from '@anglr/common/forms';
+import { isBlank, isNumber, isString } from '@jscrpt/common';
 import { getSingleDateTimeValue, parseDateTime } from './utils';
 import { DateTimeBase } from '../modules/dateTime/directives/dateTimeBase';
+import { DATE_API } from './tokens';
 /**
  * Date time validator factory function, creates validator for checking validity of datetime
  * @param dateApi - Date api used for parsing date time
@@ -29,6 +31,37 @@ export function datetimeValidator(dateApi, valueFormat, stringFormat) {
         return null;
     };
 }
+/**
+ * Factory function that creates validator function factory
+ * @param args - Static arguments for date time validator
+ */
+export function dateTimeModelValidatorFactory(args) {
+    return new ValidatorFnFactory(args => {
+        const dateApi = args.injector?.get(DATE_API, null);
+        if (!dateApi) {
+            throw new Error('DateTime: missing DateApi! Please provide one.');
+        }
+        return datetimeValidator(dateApi, args.valueFormat, args.stringFormat);
+    }, args);
+}
+/**
+ * Sets date time validator to property on which is used
+ */
+export function DateTime(valueFormatOrStringFormat, stringFormat) {
+    let valueFormat;
+    if (isNumber(valueFormatOrStringFormat)) {
+        valueFormat = valueFormatOrStringFormat;
+    }
+    if (isString(valueFormatOrStringFormat)) {
+        stringFormat = valueFormatOrStringFormat;
+    }
+    return ModelPropertyMetadata({
+        validators: [dateTimeModelValidatorFactory({
+                stringFormat,
+                valueFormat,
+            })]
+    });
+}
 /**
  * Date time validator factory function, creates validator for checking validity of datetime max value
  * @param dateApi - Date api used for parsing date time

package/es2020/src/misc/validators.js.map

@@ -1 +1 @@
-{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/misc/validators.ts"],"names":[],"mappings":"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","sourcesContent":["import {AbstractControl, ValidationErrors, ValidatorFn} from '@angular/forms';\nimport {isBlank} from '@jscrpt/common';\n\nimport {DateApi} from '../services';\nimport {DateTimeValueObject} from '../interfaces/dateTime/datetime.interface';\nimport {getSingleDateTimeValue, parseDateTime} from './utils';\nimport {DateTimeValueFormat} from './enums';\nimport {DateTimeInputOutputValue} from './types';\nimport {DateTimeBase} from '../modules/dateTime/directives/dateTimeBase';\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime\n * @param dateApi - Date api used for parsing date time\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                   valueFormat: DateTimeValueFormat|undefined|null,\n                                                   stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value))\n        {\n            return null;\n        }\n\n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(!parsedValue.isValid())\n            {\n                return {\n                    'datetime': stringFormat\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime max value\n * @param dateApi - Date api used for parsing date time\n * @param maxValue - Maximal date time value that should be used for validation against\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeMaxValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      maxValue: string|number|TDate|Date|DateTimeBase<TDate>,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value) || isBlank(maxValue))\n        {\n            return null;\n        }\n\n        if(maxValue instanceof DateTimeBase<TDate>)\n        {\n            const value = getSingleDateTimeValue(maxValue.value);\n\n            //no validation\n            if(isBlank(value))\n            {\n                return null;\n            }\n\n            maxValue = value;\n        }\n        \n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const maxDateTime = dateApi.getValue(maxValue as string|number|TDate, stringFormat ?? undefined);\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(parsedValue.isValid() && !parsedValue.isBefore(maxDateTime.value))\n            {\n                return {\n                    'datetimemax': maxDateTime.value\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime min value\n * @param dateApi - Date api used for parsing date time\n * @param minValue - Minimal date time value that should be used for validation against\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeMinValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      minValue: string|number|TDate|Date|DateTimeBase<TDate>,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value) || isBlank(minValue))\n        {\n            return null;\n        }\n\n        if(minValue instanceof DateTimeBase<TDate>)\n        {\n            const value = getSingleDateTimeValue(minValue.value);\n\n            //no validation\n            if(isBlank(value))\n            {\n                return null;\n            }\n\n            minValue = value;\n        }\n        \n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const minDateTime = dateApi.getValue(minValue as string|number|TDate, stringFormat ?? undefined);\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(parsedValue.isValid() && !parsedValue.isAfter(minDateTime.value))\n            {\n                return {\n                    'datetimemin': minDateTime.value\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Validations functions for datetime\n */\nexport class Validators\n{\n    /**\n     * Creates validator function that validates control if its value is valid datetime value\n     * @param datetime - Object storing information about datetime value\n     */\n    public static datetime<TDate = any>(datetime: DateTimeValueObject<TDate>): ValidatorFn\n    {\n        return (): ValidationErrors|null =>\n        {\n            if(!datetime.valid)\n            {\n                return {\n                    'datetime': true\n                };\n            }\n\n            return null;\n        };\n    }\n\n    /**\n     * Creates validator function that validates control if its value is withing range of minimal datetime value\n     * @param datetime - Object storing information about datetime value\n     * @param dateApi - Date api object\n     */\n    public static minDatetime<TDate = any>(datetime: DateTimeValueObject<TDate>, dateApi: DateApi<TDate>): ValidatorFn\n    {\n        return (control: AbstractControl): ValidationErrors|null =>\n        {\n            if(!!control.value &&\n               datetime.valid &&\n               datetime.minValue &&\n               dateApi.getValue(control.value).isBefore(datetime.minValue))\n            {\n                return {\n                    'minDatetime': datetime.minValue,\n                    'actualValue': control.value\n                };\n            }\n\n            return null;\n        };\n    }\n\n    /**\n     * Creates validator function that validates control if its value is withing range of maximal datetime value\n     * @param datetime - Object storing information about datetime value\n     * @param dateApi - Date api object\n     */\n    public static maxDatetime<TDate = any>(datetime: DateTimeValueObject<TDate>, dateApi: DateApi<TDate>): ValidatorFn\n    {\n        return (control: AbstractControl): ValidationErrors|null =>\n        {\n            if(!!control.value &&\n               datetime.valid &&\n               datetime.maxValue &&\n               dateApi.getValue(control.value).isAfter(datetime.maxValue))\n            {\n                return {\n                    'maxDatetime': datetime.maxValue,\n                    'actualValue': control.value\n                };\n            }\n\n            return null;\n        };\n    }\n}"]}
+{"version":3,"file":"validators.js","sourceRoot":"","sources":["../../../src/misc/validators.ts"],"names":[],"mappings":"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","sourcesContent":["import {AbstractControl, ValidationErrors, ValidatorFn} from '@angular/forms';\nimport {ModelPropertyMetadata, ValidatorFnFactory} from '@anglr/common/forms';\nimport {isBlank, isNumber, isString} from '@jscrpt/common';\n\nimport {DateApi} from '../services';\nimport {DateTimeValueObject} from '../interfaces/dateTime/datetime.interface';\nimport {getSingleDateTimeValue, parseDateTime} from './utils';\nimport {DateTimeValueFormat} from './enums';\nimport {DateTimeInputOutputValue} from './types';\nimport {DateTimeBase} from '../modules/dateTime/directives/dateTimeBase';\nimport {DATE_API} from './tokens';\n\n//TODO: add decorators for min and max date time\n\n/**\n * Validations arguments for date time validators for model based forms\n */\nexport interface DateTimeValidationArgs<TDate = unknown>\n{\n    /**\n     * Format of validated value\n     */\n    valueFormat?: DateTimeValueFormat|null;\n\n    /**\n     * Format of string value\n     */\n    stringFormat?: string|null;\n\n    /**\n     * Max allowed value\n     */\n    maxValue?: string|number|TDate|Date|DateTimeBase<TDate>;\n\n    /**\n     * Min allowed value\n     */\n    minValue?: string|number|TDate|Date|DateTimeBase<TDate>;\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime\n * @param dateApi - Date api used for parsing date time\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                   valueFormat: DateTimeValueFormat|undefined|null,\n                                                   stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value))\n        {\n            return null;\n        }\n\n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(!parsedValue.isValid())\n            {\n                return {\n                    'datetime': stringFormat\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Factory function that creates validator function factory\n * @param args - Static arguments for date time validator\n */\nexport function dateTimeModelValidatorFactory<TDate = unknown>(args: DateTimeValidationArgs<TDate>): ValidatorFnFactory<DateTimeValidationArgs<TDate>>\n{\n    return new ValidatorFnFactory<DateTimeValidationArgs<TDate>>(args =>\n    {\n        const dateApi = args.injector?.get(DATE_API, null);\n\n        if(!dateApi)\n        {\n            throw new Error('DateTime: missing DateApi! Please provide one.');\n        }\n\n        return datetimeValidator(dateApi, args.valueFormat, args.stringFormat);\n    }, args);\n}\n\n/**\n * Sets date time validator, with default formats\n */\nexport function DateTime(): PropertyDecorator\n/**\n * Sets date time validator, with default string format\n * @param valueFormat - Format of validated value\n */\nexport function DateTime(valueFormat: DateTimeValueFormat): PropertyDecorator\n/**\n * Sets date time validator, with default value format\n * @param stringFormat - Format of string value\n */\nexport function DateTime(stringFormat: string|null): PropertyDecorator\n/**\n * Sets date time validator\n * @param valueFormat - Format of validated value\n * @param stringFormat - Format of string value\n */\nexport function DateTime(valueFormat: DateTimeValueFormat, stringFormat: string): PropertyDecorator\n/**\n * Sets date time validator to property on which is used\n */\nexport function DateTime(valueFormatOrStringFormat?: DateTimeValueFormat|string|null, stringFormat?: string|undefined|null): PropertyDecorator\n{\n    let valueFormat: DateTimeValueFormat|undefined|null;\n\n    if(isNumber(valueFormatOrStringFormat))\n    {\n        valueFormat = valueFormatOrStringFormat;\n    }\n\n    if(isString(valueFormatOrStringFormat))\n    {\n        stringFormat = valueFormatOrStringFormat;\n    }\n\n    return ModelPropertyMetadata(\n    {\n        validators: [dateTimeModelValidatorFactory(\n        {\n            stringFormat,\n            valueFormat,\n        })]\n    });\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime max value\n * @param dateApi - Date api used for parsing date time\n * @param maxValue - Maximal date time value that should be used for validation against\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeMaxValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      maxValue: string|number|TDate|Date|DateTimeBase<TDate>|undefined|null,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value) || isBlank(maxValue))\n        {\n            return null;\n        }\n\n        if(maxValue instanceof DateTimeBase<TDate>)\n        {\n            const value = getSingleDateTimeValue(maxValue.value);\n\n            //no validation\n            if(isBlank(value))\n            {\n                return null;\n            }\n\n            maxValue = value;\n        }\n\n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const maxDateTime = dateApi.getValue(maxValue as string|number|TDate, stringFormat ?? undefined);\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(parsedValue.isValid() && !parsedValue.isBefore(maxDateTime.value))\n            {\n                return {\n                    'datetimemax': maxDateTime.value\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Date time validator factory function, creates validator for checking validity of datetime min value\n * @param dateApi - Date api used for parsing date time\n * @param minValue - Minimal date time value that should be used for validation against\n * @param valueFormat - Optional required format\n * @param stringFormat - Optional string format of value\n */\nexport function datetimeMinValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      minValue: string|number|TDate|Date|DateTimeBase<TDate>|undefined|null,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,): ValidatorFn\n{\n    return (control: AbstractControl<DateTimeInputOutputValue<TDate>>): ValidationErrors|null =>\n    {\n        if(isBlank(control.value) || isBlank(minValue))\n        {\n            return null;\n        }\n\n        if(minValue instanceof DateTimeBase<TDate>)\n        {\n            const value = getSingleDateTimeValue(minValue.value);\n\n            //no validation\n            if(isBlank(value))\n            {\n                return null;\n            }\n\n            minValue = value;\n        }\n\n        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const minDateTime = dateApi.getValue(minValue as string|number|TDate, stringFormat ?? undefined);\n\n        if(!Array.isArray(parsedValue))\n        {\n            if(parsedValue.isValid() && !parsedValue.isAfter(minDateTime.value))\n            {\n                return {\n                    'datetimemin': minDateTime.value\n                };\n            }\n        }\n        else\n        {\n            //TODO: support for ranges\n        }\n\n        return null;\n    };\n}\n\n/**\n * Validations functions for datetime\n */\nexport class Validators\n{\n    /**\n     * Creates validator function that validates control if its value is valid datetime value\n     * @param datetime - Object storing information about datetime value\n     */\n    public static datetime<TDate = any>(datetime: DateTimeValueObject<TDate>): ValidatorFn\n    {\n        return (): ValidationErrors|null =>\n        {\n            if(!datetime.valid)\n            {\n                return {\n                    'datetime': true\n                };\n            }\n\n            return null;\n        };\n    }\n\n    /**\n     * Creates validator function that validates control if its value is withing range of minimal datetime value\n     * @param datetime - Object storing information about datetime value\n     * @param dateApi - Date api object\n     */\n    public static minDatetime<TDate = any>(datetime: DateTimeValueObject<TDate>, dateApi: DateApi<TDate>): ValidatorFn\n    {\n        return (control: AbstractControl): ValidationErrors|null =>\n        {\n            if(!!control.value &&\n               datetime.valid &&\n               datetime.minValue &&\n               dateApi.getValue(control.value).isBefore(datetime.minValue))\n            {\n                return {\n                    'minDatetime': datetime.minValue,\n                    'actualValue': control.value\n                };\n            }\n\n            return null;\n        };\n    }\n\n    /**\n     * Creates validator function that validates control if its value is withing range of maximal datetime value\n     * @param datetime - Object storing information about datetime value\n     * @param dateApi - Date api object\n     */\n    public static maxDatetime<TDate = any>(datetime: DateTimeValueObject<TDate>, dateApi: DateApi<TDate>): ValidatorFn\n    {\n        return (control: AbstractControl): ValidationErrors|null =>\n        {\n            if(!!control.value &&\n               datetime.valid &&\n               datetime.maxValue &&\n               dateApi.getValue(control.value).isAfter(datetime.maxValue))\n            {\n                return {\n                    'maxDatetime': datetime.maxValue,\n                    'actualValue': control.value\n                };\n            }\n\n            return null;\n        };\n    }\n}"]}

package/es2020/src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.js

@@ -1,19 +1,22 @@
 import { __decorate, __metadata } from "tslib";
 import { Directive, ElementRef, EventEmitter, forwardRef, Inject } from '@angular/core';
-import { BindThis } from '@jscrpt/common';
+import { BindThis, isBlank } from '@jscrpt/common';
 import { DATE_API, DATE_TIME_INPUT, FORMAT_PROVIDER } from '../../../../misc/tokens';
 import { formatDateTime, parseDateTime } from '../../../../misc/utils';
+import { DateValueProvider } from '../../../../services';
 import { DateTimeBase } from '../dateTimeBase';
 import * as i0 from "@angular/core";
+import * as i1 from "../../../../services";
 //TODO: range is unimplemented
 /**
  * Directive that is used for setting up date time input
  */
 export class DateTimeInputDirective extends DateTimeBase {
     //######################### constructors #########################
-    constructor(element, dateApi, formatProvider) {
+    constructor(element, dateApi, formatProvider, valueProvider) {
         super(dateApi, formatProvider);
         this.element = element;
+        this.valueProvider = valueProvider;
         /**
          * @inheritdoc
          */
@@ -43,9 +46,9 @@ export class DateTimeInputDirective extends DateTimeBase {
         return this.ɵValue;
     }
     set value(value) {
-        this.ɵValue = value;
         //accepts all available formats
-        this.internalValue = parseDateTime(value, this.dateApi, null, this.customFormat);
+        this.setInternalValue(value);
+        this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);
         //not range value
         if (!Array.isArray(this.internalValue)) {
             this.rawValue = this.internalValue?.format(this.customFormat);
@@ -73,6 +76,38 @@ export class DateTimeInputDirective extends DateTimeBase {
         this.element.nativeElement.removeEventListener('blur', this.handleBlur);
     }
     //######################### protected methods #########################
+    /**
+     * Sets internal value and fix lowest time difference
+     * @param value - Value to be set
+     */
+    setInternalValue(value) {
+        this.internalValue = parseDateTime(value, this.dateApi, null, this.customFormat);
+        if (isBlank(this.internalValue)) {
+            return;
+        }
+        //ranged value
+        if (Array.isArray(this.internalValue)) {
+            const [from, to] = this.internalValue;
+            if (from) {
+                const val = this.valueProvider.getValue(from.value, this.customFormat).from;
+                if (val) {
+                    this.internalValue[0] = this.dateApi.getValue(val, this.customFormat);
+                }
+            }
+            if (to) {
+                const val = this.valueProvider.getValue(to.value, this.customFormat).to;
+                if (val) {
+                    this.internalValue[1] = this.dateApi.getValue(val, this.customFormat);
+                }
+            }
+        }
+        else {
+            const val = this.valueProvider.getValue(this.internalValue.value, this.customFormat).from;
+            if (val) {
+                this.internalValue = this.dateApi.getValue(val, this.customFormat);
+            }
+        }
+    }
     /**
      * Handles input event on input
      */
@@ -83,7 +118,7 @@ export class DateTimeInputDirective extends DateTimeBase {
             this.valueChange.next();
             return;
         }
-        this.internalValue = parseDateTime(this.rawValue, this.dateApi, this.valueFormat, this.customFormat);
+        this.setInternalValue(this.rawValue);
         this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);
         this.valueChange.next();
     }
@@ -102,7 +137,7 @@ export class DateTimeInputDirective extends DateTimeBase {
         this.blur.emit(event);
     }
 }
-DateTimeInputDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateTimeInputDirective, deps: [{ token: i0.ElementRef }, { token: DATE_API }, { token: FORMAT_PROVIDER }], target: i0.ɵɵFactoryTarget.Directive });
+DateTimeInputDirective.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateTimeInputDirective, deps: [{ token: i0.ElementRef }, { token: DATE_API }, { token: FORMAT_PROVIDER }, { token: i1.DateValueProvider }], target: i0.ɵɵFactoryTarget.Directive });
 DateTimeInputDirective.ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "14.2.6", type: DateTimeInputDirective, selector: "input[dateTime][dateTimeInput]", providers: [
         {
             provide: DATE_TIME_INPUT,
@@ -145,5 +180,5 @@ i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.6", ngImpor
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [FORMAT_PROVIDER]
-                }] }]; }, propDecorators: { handleInput: [], handleFocus: [], handleBlur: [] } });
+                }] }, { type: i1.DateValueProvider }]; }, propDecorators: { handleInput: [], handleFocus: [], handleBlur: [] } });
 //# sourceMappingURL=dateTimeInput.directive.js.map

package/es2020/src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.js.map

@@ -1 +1 @@
-{"version":3,"file":"dateTimeInput.directive.js","sourceRoot":"","sources":["../../../../../../src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.ts"],"names":[],"mappings":"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","sourcesContent":["import {Directive, ElementRef, EventEmitter, ExistingProvider, forwardRef, Inject, OnDestroy} from '@angular/core';\nimport {BindThis} from '@jscrpt/common';\n\nimport {DateTimeInput, FormatProvider} from '../../../../interfaces';\nimport {DATE_API, DATE_TIME_INPUT, FORMAT_PROVIDER} from '../../../../misc/tokens';\nimport {DateTimeInputOutputValue, DateTimeObjectValue} from '../../../../misc/types';\nimport {formatDateTime, parseDateTime} from '../../../../misc/utils';\nimport {DateApi} from '../../../../services';\nimport {DateTimeBase} from '../dateTimeBase';\n\n//TODO: range is unimplemented\n\n/**\n * Directive that is used for setting up date time input\n */\n@Directive(\n{\n    selector: 'input[dateTime][dateTimeInput]',\n    providers:\n    [\n        <ExistingProvider>\n        {\n            provide: DATE_TIME_INPUT,\n            useExisting: forwardRef(() => DateTimeInputDirective),\n        },\n    ],\n    exportAs: 'dateTime',\n})\nexport class DateTimeInputDirective<TDate = unknown> extends DateTimeBase<TDate> implements DateTimeInput, OnDestroy\n{\n    //######################### protected properties #########################\n\n    /**\n     * Internal representation of current date time value\n     */\n    protected internalValue: DateTimeObjectValue<TDate>|undefined|null;\n\n    //######################### public properties - implementation of DateTimeInput #########################\n\n    /**\n     * @inheritdoc\n     */\n    public get rawValue(): string|undefined|null\n    {\n        return this.element.nativeElement.value;\n    }\n    public set rawValue(value: string|undefined|null)\n    {\n        this.element.nativeElement.value = value ?? '';\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public override get value(): DateTimeInputOutputValue<TDate>|undefined|null\n    {\n        return this.ɵValue;\n    }\n    public override set value(value: DateTimeInputOutputValue<TDate>|undefined|null)\n    {\n        this.ɵValue = value;\n\n        //accepts all available formats\n        this.internalValue = parseDateTime(value, this.dateApi, null, this.customFormat);\n        \n        //not range value\n        if(!Array.isArray(this.internalValue))\n        {\n            this.rawValue = this.internalValue?.format(this.customFormat);\n        }\n        else\n        {\n            //TODO: add support for ranges\n        }\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public get disabled(): boolean\n    {\n        return this.element.nativeElement.disabled;\n    }\n    public set disabled(value: boolean)\n    {\n        this.element.nativeElement.disabled = value;\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public focus: EventEmitter<FocusEvent> = new EventEmitter<FocusEvent>();\n\n    /**\n     * @inheritdoc\n     */\n    public blur: EventEmitter<FocusEvent> = new EventEmitter<FocusEvent>();\n\n    //######################### constructors #########################\n    constructor(protected element: ElementRef<HTMLInputElement>,\n                @Inject(DATE_API) dateApi: DateApi<TDate>,\n                @Inject(FORMAT_PROVIDER) formatProvider: FormatProvider,)\n    {\n        super(dateApi, formatProvider);\n\n        this.element.nativeElement.addEventListener('input', this.handleInput);\n        this.element.nativeElement.addEventListener('focus', this.handleFocus);\n        this.element.nativeElement.addEventListener('blur', this.handleBlur);\n    }\n\n    //######################### public methods - implementation of OnDestroy #########################\n    \n    /**\n     * Called when component is destroyed\n     */\n    public ngOnDestroy(): void\n    {\n        this.element.nativeElement.removeEventListener('input', this.handleInput);\n        this.element.nativeElement.removeEventListener('focus', this.handleFocus);\n        this.element.nativeElement.removeEventListener('blur', this.handleBlur);\n    }\n\n    //######################### protected methods #########################\n\n    /**\n     * Handles input event on input\n     */\n    @BindThis\n    protected handleInput(): void\n    {\n        if(!this.rawValue)\n        {\n            this.internalValue = null;\n            this.ɵValue = null;\n\n            this.valueChange.next();\n\n            return;\n        }\n\n        this.internalValue = parseDateTime(this.rawValue, this.dateApi, this.valueFormat, this.customFormat);\n        this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);\n\n        this.valueChange.next();\n    }\n\n    /**\n     * Handles focus event on input\n     * @param event - Event that occured\n     */\n    @BindThis\n    protected handleFocus(event: FocusEvent): void\n    {\n        this.focus.emit(event);\n    }\n\n    /**\n     * Handles blur event on input\n     * @param event - Event that occured\n     */\n    @BindThis\n    protected handleBlur(event: FocusEvent): void\n    {\n        this.blur.emit(event);\n    }\n}"]}
+{"version":3,"file":"dateTimeInput.directive.js","sourceRoot":"","sources":["../../../../../../src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.ts"],"names":[],"mappings":";AAAA,OAAO,EAAC,SAAS,EAAE,UAAU,EAAE,YAAY,EAAoB,UAAU,EAAE,MAAM,EAAY,MAAM,eAAe,CAAC;AACnH,OAAO,EAAC,QAAQ,EAAE,OAAO,EAAC,MAAM,gBAAgB,CAAC;AAGjD,OAAO,EAAC,QAAQ,EAAE,eAAe,EAAE,eAAe,EAAC,MAAM,yBAAyB,CAAC;AAEnF,OAAO,EAAC,cAAc,EAAE,aAAa,EAAC,MAAM,wBAAwB,CAAC;AACrE,OAAO,EAAU,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;;;AAE7C,8BAA8B;AAE9B;;GAEG;AAcH,MAAM,OAAO,sBAAwC,SAAQ,YAAmB;IAqE5E,kEAAkE;IAClE,YAAsB,OAAqC,EAC7B,OAAuB,EAChB,cAA8B,EAC7C,aAAuC;QAEzD,KAAK,CAAC,OAAO,EAAE,cAAc,CAAC,CAAC;QALb,YAAO,GAAP,OAAO,CAA8B;QAGrC,kBAAa,GAAb,aAAa,CAA0B;QAd7D;;WAEG;QACI,UAAK,GAA6B,IAAI,YAAY,EAAc,CAAC;QAExE;;WAEG;QACI,SAAI,GAA6B,IAAI,YAAY,EAAc,CAAC;QAUnE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACvE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QACvE,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,gBAAgB,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IACzE,CAAC;IAvED,yGAAyG;IAEzG;;OAEG;IACH,IAAW,QAAQ;QAEf,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,CAAC;IAC5C,CAAC;IACD,IAAW,QAAQ,CAAC,KAA4B;QAE5C,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,KAAK,GAAG,KAAK,IAAI,EAAE,CAAC;IACnD,CAAC;IAED;;OAEG;IACH,IAAoB,KAAK;QAErB,OAAO,IAAI,CAAC,MAAM,CAAC;IACvB,CAAC;IACD,IAAoB,KAAK,CAAC,KAAqD;QAE3E,+BAA+B;QAC/B,IAAI,CAAC,gBAAgB,CAAC,KAAK,CAAC,CAAC;QAC7B,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEtF,iBAAiB;QACjB,IAAG,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EACrC;YACI,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,CAAC;SACjE;aAED;YACI,8BAA8B;SACjC;IACL,CAAC;IAED;;OAEG;IACH,IAAW,QAAQ;QAEf,OAAO,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,CAAC;IAC/C,CAAC;IACD,IAAW,QAAQ,CAAC,KAAc;QAE9B,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,QAAQ,GAAG,KAAK,CAAC;IAChD,CAAC;IAyBD,kGAAkG;IAElG;;OAEG;IACI,WAAW;QAEd,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,WAAW,CAAC,CAAC;QAC1E,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,mBAAmB,CAAC,MAAM,EAAE,IAAI,CAAC,UAAU,CAAC,CAAC;IAC5E,CAAC;IAED,uEAAuE;IAEvE;;;OAGG;IACO,gBAAgB,CAAC,KAAqD;QAE5E,IAAI,CAAC,aAAa,GAAG,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEjF,IAAG,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EAC9B;YACI,OAAO;SACV;QAED,cAAc;QACd,IAAG,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,aAAa,CAAC,EACpC;YACI,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,GAAG,IAAI,CAAC,aAAa,CAAC;YAEtC,IAAG,IAAI,EACP;gBACI,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;gBAE5E,IAAG,GAAG,EACN;oBACI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;iBACzE;aACJ;YAED,IAAG,EAAE,EACL;gBACI,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,EAAE,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,EAAE,CAAC;gBAExE,IAAG,GAAG,EACN;oBACI,IAAI,CAAC,aAAa,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;iBACzE;aACJ;SACJ;aAED;YACI,MAAM,GAAG,GAAG,IAAI,CAAC,aAAa,CAAC,QAAQ,CAAC,IAAI,CAAC,aAAa,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC;YAE1F,IAAG,GAAG,EACN;gBACI,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;aACtE;SACJ;IACL,CAAC;IAED;;OAEG;IAEO,WAAW;QAEjB,IAAG,CAAC,IAAI,CAAC,QAAQ,EACjB;YACI,IAAI,CAAC,aAAa,GAAG,IAAI,CAAC;YAC1B,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC;YAEnB,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;YAExB,OAAO;SACV;QAED,IAAI,CAAC,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;QACrC,IAAI,CAAC,MAAM,GAAG,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,IAAI,CAAC,WAAW,EAAE,IAAI,CAAC,YAAY,CAAC,CAAC;QAEtF,IAAI,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC;IAC5B,CAAC;IAED;;;OAGG;IAEO,WAAW,CAAC,KAAiB;QAEnC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC3B,CAAC;IAED;;;OAGG;IAEO,UAAU,CAAC,KAAiB;QAElC,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;IAC1B,CAAC;;mHAzLQ,sBAAsB,4CAuEX,QAAQ,aACR,eAAe;uGAxE1B,sBAAsB,yDAT/B;QAEI;YACI,OAAO,EAAE,eAAe;YACxB,WAAW,EAAE,UAAU,CAAC,GAAG,EAAE,CAAC,sBAAsB,CAAC;SACxD;KACJ;;IAuJA,QAAQ;;;;yDAiBR;;IAMA,QAAQ;;qCACoB,UAAU;;yDAGtC;;IAMA,QAAQ;;qCACmB,UAAU;;wDAGrC;2FAzLQ,sBAAsB;kBAblC,SAAS;mBACV;oBACI,QAAQ,EAAE,gCAAgC;oBAC1C,SAAS,EACT;wBAEI;4BACI,OAAO,EAAE,eAAe;4BACxB,WAAW,EAAE,UAAU,CAAC,GAAG,EAAE,uBAAuB,CAAC;yBACxD;qBACJ;oBACD,QAAQ,EAAE,UAAU;iBACvB;;0BAwEgB,MAAM;2BAAC,QAAQ;;0BACf,MAAM;2BAAC,eAAe;4EA6EzB,WAAW,MAuBX,WAAW,MAUX,UAAU","sourcesContent":["import {Directive, ElementRef, EventEmitter, ExistingProvider, forwardRef, Inject, OnDestroy} from '@angular/core';\nimport {BindThis, isBlank} from '@jscrpt/common';\n\nimport {DateTimeInput, FormatProvider} from '../../../../interfaces';\nimport {DATE_API, DATE_TIME_INPUT, FORMAT_PROVIDER} from '../../../../misc/tokens';\nimport {DateTimeInputOutputValue, DateTimeObjectValue} from '../../../../misc/types';\nimport {formatDateTime, parseDateTime} from '../../../../misc/utils';\nimport {DateApi, DateValueProvider} from '../../../../services';\nimport {DateTimeBase} from '../dateTimeBase';\n\n//TODO: range is unimplemented\n\n/**\n * Directive that is used for setting up date time input\n */\n@Directive(\n{\n    selector: 'input[dateTime][dateTimeInput]',\n    providers:\n    [\n        <ExistingProvider>\n        {\n            provide: DATE_TIME_INPUT,\n            useExisting: forwardRef(() => DateTimeInputDirective),\n        },\n    ],\n    exportAs: 'dateTime',\n})\nexport class DateTimeInputDirective<TDate = unknown> extends DateTimeBase<TDate> implements DateTimeInput, OnDestroy\n{\n    //######################### protected properties #########################\n\n    /**\n     * Internal representation of current date time value\n     */\n    protected internalValue: DateTimeObjectValue<TDate>|undefined|null;\n\n    //######################### public properties - implementation of DateTimeInput #########################\n\n    /**\n     * @inheritdoc\n     */\n    public get rawValue(): string|undefined|null\n    {\n        return this.element.nativeElement.value;\n    }\n    public set rawValue(value: string|undefined|null)\n    {\n        this.element.nativeElement.value = value ?? '';\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public override get value(): DateTimeInputOutputValue<TDate>|undefined|null\n    {\n        return this.ɵValue;\n    }\n    public override set value(value: DateTimeInputOutputValue<TDate>|undefined|null)\n    {\n        //accepts all available formats\n        this.setInternalValue(value);\n        this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);\n        \n        //not range value\n        if(!Array.isArray(this.internalValue))\n        {\n            this.rawValue = this.internalValue?.format(this.customFormat);\n        }\n        else\n        {\n            //TODO: add support for ranges\n        }\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public get disabled(): boolean\n    {\n        return this.element.nativeElement.disabled;\n    }\n    public set disabled(value: boolean)\n    {\n        this.element.nativeElement.disabled = value;\n    }\n\n    /**\n     * @inheritdoc\n     */\n    public focus: EventEmitter<FocusEvent> = new EventEmitter<FocusEvent>();\n\n    /**\n     * @inheritdoc\n     */\n    public blur: EventEmitter<FocusEvent> = new EventEmitter<FocusEvent>();\n\n    //######################### constructors #########################\n    constructor(protected element: ElementRef<HTMLInputElement>,\n                @Inject(DATE_API) dateApi: DateApi<TDate>,\n                @Inject(FORMAT_PROVIDER) formatProvider: FormatProvider,\n                protected valueProvider: DateValueProvider<TDate>,)\n    {\n        super(dateApi, formatProvider);\n\n        this.element.nativeElement.addEventListener('input', this.handleInput);\n        this.element.nativeElement.addEventListener('focus', this.handleFocus);\n        this.element.nativeElement.addEventListener('blur', this.handleBlur);\n    }\n\n    //######################### public methods - implementation of OnDestroy #########################\n    \n    /**\n     * Called when component is destroyed\n     */\n    public ngOnDestroy(): void\n    {\n        this.element.nativeElement.removeEventListener('input', this.handleInput);\n        this.element.nativeElement.removeEventListener('focus', this.handleFocus);\n        this.element.nativeElement.removeEventListener('blur', this.handleBlur);\n    }\n\n    //######################### protected methods #########################\n\n    /**\n     * Sets internal value and fix lowest time difference\n     * @param value - Value to be set\n     */\n    protected setInternalValue(value: DateTimeInputOutputValue<TDate>|undefined|null): void\n    {\n        this.internalValue = parseDateTime(value, this.dateApi, null, this.customFormat);\n\n        if(isBlank(this.internalValue))\n        {\n            return;\n        }\n\n        //ranged value\n        if(Array.isArray(this.internalValue))\n        {\n            const [from, to] = this.internalValue;\n\n            if(from)\n            {\n                const val = this.valueProvider.getValue(from.value, this.customFormat).from;\n\n                if(val)\n                {\n                    this.internalValue[0] = this.dateApi.getValue(val, this.customFormat);\n                }\n            }\n\n            if(to)\n            {\n                const val = this.valueProvider.getValue(to.value, this.customFormat).to;\n\n                if(val)\n                {\n                    this.internalValue[1] = this.dateApi.getValue(val, this.customFormat);\n                }\n            }\n        }\n        else\n        {\n            const val = this.valueProvider.getValue(this.internalValue.value, this.customFormat).from;\n\n            if(val)\n            {\n                this.internalValue = this.dateApi.getValue(val, this.customFormat);\n            }\n        }\n    }\n\n    /**\n     * Handles input event on input\n     */\n    @BindThis\n    protected handleInput(): void\n    {\n        if(!this.rawValue)\n        {\n            this.internalValue = null;\n            this.ɵValue = null;\n\n            this.valueChange.next();\n\n            return;\n        }\n\n        this.setInternalValue(this.rawValue);\n        this.ɵValue = formatDateTime(this.internalValue, this.valueFormat, this.customFormat);\n\n        this.valueChange.next();\n    }\n\n    /**\n     * Handles focus event on input\n     * @param event - Event that occured\n     */\n    @BindThis\n    protected handleFocus(event: FocusEvent): void\n    {\n        this.focus.emit(event);\n    }\n\n    /**\n     * Handles blur event on input\n     * @param event - Event that occured\n     */\n    @BindThis\n    protected handleBlur(event: FocusEvent): void\n    {\n        this.blur.emit(event);\n    }\n}"]}

package/es2020/src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.js

@@ -24,7 +24,7 @@ export class DateTimeRelativeParser {
      * y - for years
      */
     parse(value) {
-        const regex = /([+-])\s*(\d+)\s*([hmdwMy])/;
+        const regex = /([+-])\s*(\d+)\s*([hHmdwMy])/;
         let matches = null;
         //relative date provided
         if (isString(value) && (matches = regex.exec(value))) {
@@ -39,6 +39,7 @@ export class DateTimeRelativeParser {
                         operation == '+' ? now.addMinutes(+amount).endOfMinute() : now.subtractMinutes(+amount).startOfMinute();
                         break;
                     }
+                case 'H':
                 case 'h':
                     {
                         operation == '+' ? now.addHours(+amount).endOfHour() : now.subtractHours(+amount).startOfHour();

package/es2020/src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dateTimeRelativeParser.service.js","sourceRoot":"","sources":["../../../../src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable, Injector} from '@angular/core';\nimport {isString} from '@jscrpt/common';\n\nimport {DATE_API} from '../../misc/tokens';\nimport {DateApi, DateApiObject, DateValue} from '../dateApi/dateApi.interface';\n\n/**\n * Service used for parsing relative date time strings\n */\n@Injectable({providedIn: 'root'})\nexport class DateTimeRelativeParser<TDate = any>\n{\n    //######################### protected fields #########################\n    \n    /**\n     * Date api for handling\n     */\n    protected _dateApi?: DateApi<TDate, DateApiObject>;\n\n    //######################### constructor #########################\n    constructor(protected _injector: Injector)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Tries to parse relative value and returns parsed TDate, otherwise returns input value\n     * @param value - Value to be parsed\n     * \n     * @summary\n     * m - for minutes\n     * h - for hours\n     * d - for days\n     * w - for weeks\n     * M - for months\n     * y - for years\n     */\n    public parse(value: TDate|DateValue): TDate|DateValue\n    {\n        const regex = /([+-])\\s*(\\d+)\\s*([hmdwMy])/;\n        let matches: RegExpExecArray | null = null;\n\n        //relative date provided\n        if(isString(value) && (matches = regex.exec(value)))\n        {\n            const operation = matches[1];\n            const amount = matches[2];\n            const period = matches[3];\n            this._dateApi = this._dateApi ?? this._injector.get(DATE_API);\n            const now = this._dateApi.now();\n\n            switch(period)\n            {\n                case 'm':\n                {\n                    operation == '+' ? now.addMinutes(+amount).endOfMinute() : now.subtractMinutes(+amount).startOfMinute();\n\n                    break;\n                }\n                case 'h':\n                {\n                    operation == '+' ? now.addHours(+amount).endOfHour() : now.subtractHours(+amount).startOfHour();\n\n                    break;\n                }\n                case 'd':\n                {\n                    operation == '+' ? now.addDays(+amount).endOfDay() : now.subtractDays(+amount).startOfDay();\n\n                    break;\n                }\n                case 'w':\n                {\n                    operation == '+' ? now.addWeeks(+amount).endOfDay() : now.subtractWeeks(+amount).startOfDay();\n\n                    break;\n                }\n                case 'M':\n                {\n                    operation == '+' ? now.addMonths(+amount).endOfDay() : now.subtractMonths(+amount).startOfDay();\n\n                    break;\n                }\n                case 'y':\n                {\n                    operation == '+' ? now.addYears(+amount).endOfDay() : now.subtractYears(+amount).startOfDay();\n\n                    break;\n                }\n            }\n\n            value = now.value;\n        }\n\n        return value;\n    }\n}"]}
+{"version":3,"file":"dateTimeRelativeParser.service.js","sourceRoot":"","sources":["../../../../src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,QAAQ,EAAC,MAAM,eAAe,CAAC;AACnD,OAAO,EAAC,QAAQ,EAAC,MAAM,gBAAgB,CAAC;AAExC,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;AAG3C;;GAEG;AAEH,MAAM,OAAO,sBAAsB;IAS/B,iEAAiE;IACjE,YAAsB,SAAmB;QAAnB,cAAS,GAAT,SAAS,CAAU;IAEzC,CAAC;IAED,oEAAoE;IAEpE;;;;;;;;;;;OAWG;IACI,KAAK,CAAC,KAAsB;QAE/B,MAAM,KAAK,GAAG,8BAA8B,CAAC;QAC7C,IAAI,OAAO,GAA2B,IAAI,CAAC;QAE3C,wBAAwB;QACxB,IAAG,QAAQ,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EACnD;YACI,MAAM,SAAS,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC7B,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,MAAM,MAAM,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC;YAC1B,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,SAAS,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;YAC9D,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC;YAEhC,QAAO,MAAM,EACb;gBACI,KAAK,GAAG;oBACR;wBACI,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,aAAa,EAAE,CAAC;wBAExG,MAAM;qBACT;gBACD,KAAK,GAAG,CAAC;gBACT,KAAK,GAAG;oBACR;wBACI,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,WAAW,EAAE,CAAC;wBAEhG,MAAM;qBACT;gBACD,KAAK,GAAG;oBACR;wBACI,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,YAAY,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;wBAE5F,MAAM;qBACT;gBACD,KAAK,GAAG;oBACR;wBACI,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;wBAE9F,MAAM;qBACT;gBACD,KAAK,GAAG;oBACR;wBACI,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,cAAc,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;wBAEhG,MAAM;qBACT;gBACD,KAAK,GAAG;oBACR;wBACI,SAAS,IAAI,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC,aAAa,CAAC,CAAC,MAAM,CAAC,CAAC,UAAU,EAAE,CAAC;wBAE9F,MAAM;qBACT;aACJ;YAED,KAAK,GAAG,GAAG,CAAC,KAAK,CAAC;SACrB;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;;mHAvFQ,sBAAsB;uHAAtB,sBAAsB,cADV,MAAM;2FAClB,sBAAsB;kBADlC,UAAU;mBAAC,EAAC,UAAU,EAAE,MAAM,EAAC","sourcesContent":["import {Injectable, Injector} from '@angular/core';\nimport {isString} from '@jscrpt/common';\n\nimport {DATE_API} from '../../misc/tokens';\nimport {DateApi, DateApiObject, DateValue} from '../dateApi/dateApi.interface';\n\n/**\n * Service used for parsing relative date time strings\n */\n@Injectable({providedIn: 'root'})\nexport class DateTimeRelativeParser<TDate = any>\n{\n    //######################### protected fields #########################\n    \n    /**\n     * Date api for handling\n     */\n    protected _dateApi?: DateApi<TDate, DateApiObject>;\n\n    //######################### constructor #########################\n    constructor(protected _injector: Injector)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Tries to parse relative value and returns parsed TDate, otherwise returns input value\n     * @param value - Value to be parsed\n     * \n     * @summary\n     * m - for minutes\n     * h - for hours\n     * d - for days\n     * w - for weeks\n     * M - for months\n     * y - for years\n     */\n    public parse(value: TDate|DateValue): TDate|DateValue\n    {\n        const regex = /([+-])\\s*(\\d+)\\s*([hHmdwMy])/;\n        let matches: RegExpExecArray | null = null;\n\n        //relative date provided\n        if(isString(value) && (matches = regex.exec(value)))\n        {\n            const operation = matches[1];\n            const amount = matches[2];\n            const period = matches[3];\n            this._dateApi = this._dateApi ?? this._injector.get(DATE_API);\n            const now = this._dateApi.now();\n\n            switch(period)\n            {\n                case 'm':\n                {\n                    operation == '+' ? now.addMinutes(+amount).endOfMinute() : now.subtractMinutes(+amount).startOfMinute();\n\n                    break;\n                }\n                case 'H':\n                case 'h':\n                {\n                    operation == '+' ? now.addHours(+amount).endOfHour() : now.subtractHours(+amount).startOfHour();\n\n                    break;\n                }\n                case 'd':\n                {\n                    operation == '+' ? now.addDays(+amount).endOfDay() : now.subtractDays(+amount).startOfDay();\n\n                    break;\n                }\n                case 'w':\n                {\n                    operation == '+' ? now.addWeeks(+amount).endOfDay() : now.subtractWeeks(+amount).startOfDay();\n\n                    break;\n                }\n                case 'M':\n                {\n                    operation == '+' ? now.addMonths(+amount).endOfDay() : now.subtractMonths(+amount).startOfDay();\n\n                    break;\n                }\n                case 'y':\n                {\n                    operation == '+' ? now.addYears(+amount).endOfDay() : now.subtractYears(+amount).startOfDay();\n\n                    break;\n                }\n            }\n\n            value = now.value;\n        }\n\n        return value;\n    }\n}"]}

package/es2020/src/services/dateValueProvider/dateValueProvider.service.js

@@ -1,6 +1,7 @@
 import { Inject, Injectable } from '@angular/core';
 import { DATE_API } from '../../misc/tokens';
 import * as i0 from "@angular/core";
+//TODO: change to unknown when legacy stuff is removed
 /**
  * Class used for obtaining DateTimeValue for various formats
  */
@@ -26,7 +27,7 @@ export class DateValueProvider {
             end = val.endOfMinute().value;
         }
         //hour
-        else if (fullFormat.indexOf('H') >= 0) {
+        else if (fullFormat.indexOf('H') >= 0 || fullFormat.indexOf('h') >= 0) {
             start = val.startOfHour().value;
             end = val.endOfHour().value;
         }

package/es2020/src/services/dateValueProvider/dateValueProvider.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"dateValueProvider.service.js","sourceRoot":"","sources":["../../../../src/services/dateValueProvider/dateValueProvider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAGjD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;AAG3C;;GAEG;AAEH,MAAM,OAAO,iBAAiB;IAE1B,iEAAiE;IACjE,YAAwC,QAAwB;QAAxB,aAAQ,GAAR,QAAQ,CAAgB;IAEhE,CAAC;IAED,oEAAoE;IAEpE;;;;OAIG;IACI,QAAQ,CAAC,KAAY,EAAE,MAAc;QAExC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,KAAK,GAAU,KAAK,CAAC;QACzB,IAAI,GAAG,GAAU,KAAK,CAAC;QAEvB,QAAQ;QACR,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAC/B;YACI,KAAK,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC;YAClC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;SACjC;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,KAAK;aACA,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;YAC/B,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC;SAC9B;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,OAAO;aACF,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;YACjC,GAAG,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;SAChC;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpE;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QAED,OAAO;YACH,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,GAAG;SACV,CAAC;IACN,CAAC;;8GA9DQ,iBAAiB,kBAGN,QAAQ;kHAHnB,iBAAiB,cADL,MAAM;2FAClB,iBAAiB;kBAD7B,UAAU;mBAAC,EAAC,UAAU,EAAE,MAAM,EAAC;;0BAIf,MAAM;2BAAC,QAAQ","sourcesContent":["import {Inject, Injectable} from '@angular/core';\n\nimport {DateTimeValue} from '../../interfaces/dateTime/datetime.interface';\nimport {DATE_API} from '../../misc/tokens';\nimport {DateApi} from '../dateApi/dateApi.interface';\n\n/**\n * Class used for obtaining DateTimeValue for various formats\n */\n@Injectable({providedIn: 'root'})\nexport class DateValueProvider<TDate = any>\n{\n    //######################### constructor #########################\n    constructor(@Inject(DATE_API) protected _dateApi: DateApi<TDate>)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Gets DateTimeValue from single value based on format\n     * @param value - Current value to be converted to ranged value\n     * @param format - Format that is requested to be displayed, it tells what range should be created\n     */\n    public getValue(value: TDate, format: string): DateTimeValue<TDate>\n    {\n        const val = this._dateApi.getValue(value, format);\n        const fullFormat = this._dateApi.getFormat(format);\n        let start: TDate = value;\n        let end: TDate = value;\n\n        //minute\n        if(fullFormat.indexOf('m') >= 0)\n        {\n            start = val.startOfMinute().value;\n            end = val.endOfMinute().value;\n        }\n        //hour\n        else if(fullFormat.indexOf('H') >= 0)\n        {\n            start = val.startOfHour().value;\n            end = val.endOfHour().value;\n        }\n        //day\n        else if(fullFormat.indexOf('d') >= 0)\n        {\n            start = val.startOfDay().value;\n            end = val.endOfDay().value;\n        }\n        //week\n        else if(fullFormat.indexOf('w') >= 0)\n        {\n            start = val.startOfWeek().value;\n            end = val.endOfWeek().value;\n        }\n        //month\n        else if(fullFormat.indexOf('M') >= 0)\n        {\n            start = val.startOfMonth().value;\n            end = val.endOfMonth().value;\n        }\n        //year\n        else if(fullFormat.indexOf('Y') >= 0 || fullFormat.indexOf('y') >= 0)\n        {\n            start = val.startOfYear().value;\n            end = val.endOfYear().value;\n        }\n\n        return {\n            from: start,\n            to: end\n        };\n    }\n}"]}
+{"version":3,"file":"dateValueProvider.service.js","sourceRoot":"","sources":["../../../../src/services/dateValueProvider/dateValueProvider.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAGjD,OAAO,EAAC,QAAQ,EAAC,MAAM,mBAAmB,CAAC;;AAG3C,sDAAsD;AAEtD;;GAEG;AAEH,MAAM,OAAO,iBAAiB;IAE1B,iEAAiE;IACjE,YAAwC,QAAwB;QAAxB,aAAQ,GAAR,QAAQ,CAAgB;IAEhE,CAAC;IAED,oEAAoE;IAEpE;;;;OAIG;IACI,QAAQ,CAAC,KAAY,EAAE,MAAc;QAExC,MAAM,GAAG,GAAG,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC,CAAC;QAClD,MAAM,UAAU,GAAG,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC;QACnD,IAAI,KAAK,GAAU,KAAK,CAAC;QACzB,IAAI,GAAG,GAAU,KAAK,CAAC;QAEvB,QAAQ;QACR,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EAC/B;YACI,KAAK,GAAG,GAAG,CAAC,aAAa,EAAE,CAAC,KAAK,CAAC;YAClC,GAAG,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;SACjC;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpE;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,KAAK;aACA,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;YAC/B,GAAG,GAAG,GAAG,CAAC,QAAQ,EAAE,CAAC,KAAK,CAAC;SAC9B;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QACD,OAAO;aACF,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpC;YACI,KAAK,GAAG,GAAG,CAAC,YAAY,EAAE,CAAC,KAAK,CAAC;YACjC,GAAG,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,KAAK,CAAC;SAChC;QACD,MAAM;aACD,IAAG,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,IAAI,UAAU,CAAC,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,EACpE;YACI,KAAK,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,KAAK,CAAC;YAChC,GAAG,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,KAAK,CAAC;SAC/B;QAED,OAAO;YACH,IAAI,EAAE,KAAK;YACX,EAAE,EAAE,GAAG;SACV,CAAC;IACN,CAAC;;8GA9DQ,iBAAiB,kBAGN,QAAQ;kHAHnB,iBAAiB,cADL,MAAM;2FAClB,iBAAiB;kBAD7B,UAAU;mBAAC,EAAC,UAAU,EAAE,MAAM,EAAC;;0BAIf,MAAM;2BAAC,QAAQ","sourcesContent":["import {Inject, Injectable} from '@angular/core';\n\nimport {DateTimeValue} from '../../interfaces/dateTime/datetime.interface';\nimport {DATE_API} from '../../misc/tokens';\nimport {DateApi} from '../dateApi/dateApi.interface';\n\n//TODO: change to unknown when legacy stuff is removed\n\n/**\n * Class used for obtaining DateTimeValue for various formats\n */\n@Injectable({providedIn: 'root'})\nexport class DateValueProvider<TDate = any>\n{\n    //######################### constructor #########################\n    constructor(@Inject(DATE_API) protected _dateApi: DateApi<TDate>)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Gets DateTimeValue from single value based on format\n     * @param value - Current value to be converted to ranged value\n     * @param format - Format that is requested to be displayed, it tells what range should be created\n     */\n    public getValue(value: TDate, format: string): DateTimeValue<TDate>\n    {\n        const val = this._dateApi.getValue(value, format);\n        const fullFormat = this._dateApi.getFormat(format);\n        let start: TDate = value;\n        let end: TDate = value;\n\n        //minute\n        if(fullFormat.indexOf('m') >= 0)\n        {\n            start = val.startOfMinute().value;\n            end = val.endOfMinute().value;\n        }\n        //hour\n        else if(fullFormat.indexOf('H') >= 0 || fullFormat.indexOf('h') >= 0)\n        {\n            start = val.startOfHour().value;\n            end = val.endOfHour().value;\n        }\n        //day\n        else if(fullFormat.indexOf('d') >= 0)\n        {\n            start = val.startOfDay().value;\n            end = val.endOfDay().value;\n        }\n        //week\n        else if(fullFormat.indexOf('w') >= 0)\n        {\n            start = val.startOfWeek().value;\n            end = val.endOfWeek().value;\n        }\n        //month\n        else if(fullFormat.indexOf('M') >= 0)\n        {\n            start = val.startOfMonth().value;\n            end = val.endOfMonth().value;\n        }\n        //year\n        else if(fullFormat.indexOf('Y') >= 0 || fullFormat.indexOf('y') >= 0)\n        {\n            start = val.startOfYear().value;\n            end = val.endOfYear().value;\n        }\n\n        return {\n            from: start,\n            to: end\n        };\n    }\n}"]}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@anglr/datetime",
-    "version": "5.0.0-beta.20221018103539",
+    "version": "5.0.0-beta.20221018120203",
     "description": "Angular library for datetime manipulation components",
     "type": "module",
     "sideEffects": false,

package/src/misc/validators.d.ts

@@ -1,8 +1,30 @@
 import { ValidatorFn } from '@angular/forms';
+import { ValidatorFnFactory } from '@anglr/common/forms';
 import { DateApi } from '../services';
 import { DateTimeValueObject } from '../interfaces/dateTime/datetime.interface';
 import { DateTimeValueFormat } from './enums';
 import { DateTimeBase } from '../modules/dateTime/directives/dateTimeBase';
+/**
+ * Validations arguments for date time validators for model based forms
+ */
+export interface DateTimeValidationArgs<TDate = unknown> {
+    /**
+     * Format of validated value
+     */
+    valueFormat?: DateTimeValueFormat | null;
+    /**
+     * Format of string value
+     */
+    stringFormat?: string | null;
+    /**
+     * Max allowed value
+     */
+    maxValue?: string | number | TDate | Date | DateTimeBase<TDate>;
+    /**
+     * Min allowed value
+     */
+    minValue?: string | number | TDate | Date | DateTimeBase<TDate>;
+}
 /**
  * Date time validator factory function, creates validator for checking validity of datetime
  * @param dateApi - Date api used for parsing date time
@@ -10,6 +32,31 @@ import { DateTimeBase } from '../modules/dateTime/directives/dateTimeBase';
  * @param stringFormat - Optional string format of value
  */
 export declare function datetimeValidator<TDate = unknown>(dateApi: DateApi<TDate>, valueFormat: DateTimeValueFormat | undefined | null, stringFormat: string | undefined | null): ValidatorFn;
+/**
+ * Factory function that creates validator function factory
+ * @param args - Static arguments for date time validator
+ */
+export declare function dateTimeModelValidatorFactory<TDate = unknown>(args: DateTimeValidationArgs<TDate>): ValidatorFnFactory<DateTimeValidationArgs<TDate>>;
+/**
+ * Sets date time validator, with default formats
+ */
+export declare function DateTime(): PropertyDecorator;
+/**
+ * Sets date time validator, with default string format
+ * @param valueFormat - Format of validated value
+ */
+export declare function DateTime(valueFormat: DateTimeValueFormat): PropertyDecorator;
+/**
+ * Sets date time validator, with default value format
+ * @param stringFormat - Format of string value
+ */
+export declare function DateTime(stringFormat: string | null): PropertyDecorator;
+/**
+ * Sets date time validator
+ * @param valueFormat - Format of validated value
+ * @param stringFormat - Format of string value
+ */
+export declare function DateTime(valueFormat: DateTimeValueFormat, stringFormat: string): PropertyDecorator;
 /**
  * Date time validator factory function, creates validator for checking validity of datetime max value
  * @param dateApi - Date api used for parsing date time
@@ -17,7 +64,7 @@ export declare function datetimeValidator<TDate = unknown>(dateApi: DateApi<TDat
  * @param valueFormat - Optional required format
  * @param stringFormat - Optional string format of value
  */
-export declare function datetimeMaxValidator<TDate = unknown>(dateApi: DateApi<TDate>, maxValue: string | number | TDate | Date | DateTimeBase<TDate>, valueFormat: DateTimeValueFormat | undefined | null, stringFormat: string | undefined | null): ValidatorFn;
+export declare function datetimeMaxValidator<TDate = unknown>(dateApi: DateApi<TDate>, maxValue: string | number | TDate | Date | DateTimeBase<TDate> | undefined | null, valueFormat: DateTimeValueFormat | undefined | null, stringFormat: string | undefined | null): ValidatorFn;
 /**
  * Date time validator factory function, creates validator for checking validity of datetime min value
  * @param dateApi - Date api used for parsing date time
@@ -25,7 +72,7 @@ export declare function datetimeMaxValidator<TDate = unknown>(dateApi: DateApi<T
  * @param valueFormat - Optional required format
  * @param stringFormat - Optional string format of value
  */
-export declare function datetimeMinValidator<TDate = unknown>(dateApi: DateApi<TDate>, minValue: string | number | TDate | Date | DateTimeBase<TDate>, valueFormat: DateTimeValueFormat | undefined | null, stringFormat: string | undefined | null): ValidatorFn;
+export declare function datetimeMinValidator<TDate = unknown>(dateApi: DateApi<TDate>, minValue: string | number | TDate | Date | DateTimeBase<TDate> | undefined | null, valueFormat: DateTimeValueFormat | undefined | null, stringFormat: string | undefined | null): ValidatorFn;
 /**
  * Validations functions for datetime
  */

package/src/misc/validators.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["validators.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoC,WAAW,EAAC,MAAM,gBAAgB,CAAC;AAG9E,OAAO,EAAC,OAAO,EAAC,MAAM,aAAa,CAAC;AACpC,OAAO,EAAC,mBAAmB,EAAC,MAAM,2CAA2C,CAAC;AAE9E,OAAO,EAAC,mBAAmB,EAAC,MAAM,SAAS,CAAC;AAE5C,OAAO,EAAC,YAAY,EAAC,MAAM,6CAA6C,CAAC;AAEzE;;;;;GAKG;AACH,wBAAgB,iBAAiB,CAAC,KAAK,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EACvB,WAAW,EAAE,mBAAmB,GAAC,SAAS,GAAC,IAAI,EAC/C,YAAY,EAAE,MAAM,GAAC,SAAS,GAAC,IAAI,GAAI,WAAW,CAgCpG;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EACvB,QAAQ,EAAE,MAAM,GAAC,MAAM,GAAC,KAAK,GAAC,IAAI,GAAC,YAAY,CAAC,KAAK,CAAC,EACtD,WAAW,EAAE,mBAAmB,GAAC,SAAS,GAAC,IAAI,EAC/C,YAAY,EAAE,MAAM,GAAC,SAAS,GAAC,IAAI,GAAI,WAAW,CA+CvG;AAED;;;;;;GAMG;AACH,wBAAgB,oBAAoB,CAAC,KAAK,GAAG,OAAO,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EACvB,QAAQ,EAAE,MAAM,GAAC,MAAM,GAAC,KAAK,GAAC,IAAI,GAAC,YAAY,CAAC,KAAK,CAAC,EACtD,WAAW,EAAE,mBAAmB,GAAC,SAAS,GAAC,IAAI,EAC/C,YAAY,EAAE,MAAM,GAAC,SAAS,GAAC,IAAI,GAAI,WAAW,CA+CvG;AAED;;GAEG;AACH,qBAAa,UAAU;IAEnB;;;OAGG;WACW,QAAQ,CAAC,KAAK,GAAG,GAAG,EAAE,QAAQ,EAAE,mBAAmB,CAAC,KAAK,CAAC,GAAG,WAAW;IAetF;;;;OAIG;WACW,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,QAAQ,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,WAAW;IAmBlH;;;;OAIG;WACW,WAAW,CAAC,KAAK,GAAG,GAAG,EAAE,QAAQ,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,GAAG,WAAW;CAkBrH"}
+{"version":3,"file":"validators.d.ts","sourceRoot":"","sources":["validators.ts"],"names":[],"mappings":"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"}

package/src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.d.ts

@@ -1,7 +1,7 @@
 import { ElementRef, EventEmitter, OnDestroy } from '@angular/core';
 import { DateTimeInput, FormatProvider } from '../../../../interfaces';
 import { DateTimeInputOutputValue, DateTimeObjectValue } from '../../../../misc/types';
-import { DateApi } from '../../../../services';
+import { DateApi, DateValueProvider } from '../../../../services';
 import { DateTimeBase } from '../dateTimeBase';
 import * as i0 from "@angular/core";
 /**
@@ -9,6 +9,7 @@ import * as i0 from "@angular/core";
  */
 export declare class DateTimeInputDirective<TDate = unknown> extends DateTimeBase<TDate> implements DateTimeInput, OnDestroy {
     protected element: ElementRef<HTMLInputElement>;
+    protected valueProvider: DateValueProvider<TDate>;
     /**
      * Internal representation of current date time value
      */
@@ -36,11 +37,16 @@ export declare class DateTimeInputDirective<TDate = unknown> extends DateTimeBas
      * @inheritdoc
      */
     blur: EventEmitter<FocusEvent>;
-    constructor(element: ElementRef<HTMLInputElement>, dateApi: DateApi<TDate>, formatProvider: FormatProvider);
+    constructor(element: ElementRef<HTMLInputElement>, dateApi: DateApi<TDate>, formatProvider: FormatProvider, valueProvider: DateValueProvider<TDate>);
     /**
      * Called when component is destroyed
      */
     ngOnDestroy(): void;
+    /**
+     * Sets internal value and fix lowest time difference
+     * @param value - Value to be set
+     */
+    protected setInternalValue(value: DateTimeInputOutputValue<TDate> | undefined | null): void;
     /**
      * Handles input event on input
      */

package/src/modules/dateTime/directives/dateTimeInput/dateTimeInput.directive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dateTimeInput.directive.d.ts","sourceRoot":"","sources":["dateTimeInput.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAE,YAAY,EAAwC,SAAS,EAAC,MAAM,eAAe,CAAC;AAGnH,OAAO,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAErE,OAAO,EAAC,wBAAwB,EAAE,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AAErF,OAAO,EAAC,OAAO,EAAC,MAAM,sBAAsB,CAAC;AAC7C,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;;AAI7C;;GAEG;AACH,qBAaa,sBAAsB,CAAC,KAAK,GAAG,OAAO,CAAE,SAAQ,YAAY,CAAC,KAAK,CAAE,YAAW,aAAa,EAAE,SAAS;IAuEpG,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;IAnE3D;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,mBAAmB,CAAC,KAAK,CAAC,GAAC,SAAS,GAAC,IAAI,CAAC;IAInE;;OAEG;IACH,IAAW,QAAQ,IAAI,MAAM,GAAC,SAAS,GAAC,IAAI,CAG3C;IACD,IAAW,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAC,SAAS,GAAC,IAAI,EAG/C;IAED;;OAEG;IACH,IAAoB,KAAK,IAAI,wBAAwB,CAAC,KAAK,CAAC,GAAC,SAAS,GAAC,IAAI,CAG1E;IACD,IAAoB,KAAK,CAAC,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC,GAAC,SAAS,GAAC,IAAI,EAgB9E;IAED;;OAEG;IACH,IAAW,QAAQ,IAAI,OAAO,CAG7B;IACD,IAAW,QAAQ,CAAC,KAAK,EAAE,OAAO,EAGjC;IAED;;OAEG;IACI,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC,CAAkC;IAExE;;OAEG;IACI,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,CAAkC;gBAGjD,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC,EAC7B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAChB,cAAc,EAAE,cAAc;IAWnE;;OAEG;IACI,WAAW,IAAI,IAAI;IAS1B;;OAEG;IAEH,SAAS,CAAC,WAAW,IAAI,IAAI;IAkB7B;;;OAGG;IAEH,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAK9C;;;OAGG;IAEH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;yCArIpC,sBAAsB;2CAAtB,sBAAsB;CAyIlC"}
+{"version":3,"file":"dateTimeInput.directive.d.ts","sourceRoot":"","sources":["dateTimeInput.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,UAAU,EAAE,YAAY,EAAwC,SAAS,EAAC,MAAM,eAAe,CAAC;AAGnH,OAAO,EAAC,aAAa,EAAE,cAAc,EAAC,MAAM,wBAAwB,CAAC;AAErE,OAAO,EAAC,wBAAwB,EAAE,mBAAmB,EAAC,MAAM,wBAAwB,CAAC;AAErF,OAAO,EAAC,OAAO,EAAE,iBAAiB,EAAC,MAAM,sBAAsB,CAAC;AAChE,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;;AAI7C;;GAEG;AACH,qBAaa,sBAAsB,CAAC,KAAK,GAAG,OAAO,CAAE,SAAQ,YAAY,CAAC,KAAK,CAAE,YAAW,aAAa,EAAE,SAAS;IAsEpG,SAAS,CAAC,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC;IAG/C,SAAS,CAAC,aAAa,EAAE,iBAAiB,CAAC,KAAK,CAAC;IArE7D;;OAEG;IACH,SAAS,CAAC,aAAa,EAAE,mBAAmB,CAAC,KAAK,CAAC,GAAC,SAAS,GAAC,IAAI,CAAC;IAInE;;OAEG;IACH,IAAW,QAAQ,IAAI,MAAM,GAAC,SAAS,GAAC,IAAI,CAG3C;IACD,IAAW,QAAQ,CAAC,KAAK,EAAE,MAAM,GAAC,SAAS,GAAC,IAAI,EAG/C;IAED;;OAEG;IACH,IAAoB,KAAK,IAAI,wBAAwB,CAAC,KAAK,CAAC,GAAC,SAAS,GAAC,IAAI,CAG1E;IACD,IAAoB,KAAK,CAAC,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC,GAAC,SAAS,GAAC,IAAI,EAe9E;IAED;;OAEG;IACH,IAAW,QAAQ,IAAI,OAAO,CAG7B;IACD,IAAW,QAAQ,CAAC,KAAK,EAAE,OAAO,EAGjC;IAED;;OAEG;IACI,KAAK,EAAE,YAAY,CAAC,UAAU,CAAC,CAAkC;IAExE;;OAEG;IACI,IAAI,EAAE,YAAY,CAAC,UAAU,CAAC,CAAkC;gBAGjD,OAAO,EAAE,UAAU,CAAC,gBAAgB,CAAC,EAC7B,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,EAChB,cAAc,EAAE,cAAc,EAC7C,aAAa,EAAE,iBAAiB,CAAC,KAAK,CAAC;IAW7D;;OAEG;IACI,WAAW,IAAI,IAAI;IAS1B;;;OAGG;IACH,SAAS,CAAC,gBAAgB,CAAC,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC,GAAC,SAAS,GAAC,IAAI,GAAG,IAAI;IA6CvF;;OAEG;IAEH,SAAS,CAAC,WAAW,IAAI,IAAI;IAkB7B;;;OAGG;IAEH,SAAS,CAAC,WAAW,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;IAK9C;;;OAGG;IAEH,SAAS,CAAC,UAAU,CAAC,KAAK,EAAE,UAAU,GAAG,IAAI;yCAtLpC,sBAAsB;2CAAtB,sBAAsB;CA0LlC"}

package/src/services/dateTimeRelativeParser/dateTimeRelativeParser.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dateTimeRelativeParser.service.d.ts","sourceRoot":"","sources":["dateTimeRelativeParser.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,QAAQ,EAAC,MAAM,eAAe,CAAC;AAInD,OAAO,EAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAC,MAAM,8BAA8B,CAAC;;AAE/E;;GAEG;AACH,qBACa,sBAAsB,CAAC,KAAK,GAAG,GAAG;IAU/B,SAAS,CAAC,SAAS,EAAE,QAAQ;IANzC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;gBAG7B,SAAS,EAAE,QAAQ;IAMzC;;;;;;;;;;;OAWG;IACI,KAAK,CAAC,KAAK,EAAE,KAAK,GAAC,SAAS,GAAG,KAAK,GAAC,SAAS;yCA5B5C,sBAAsB;6CAAtB,sBAAsB;CAuFlC"}
+{"version":3,"file":"dateTimeRelativeParser.service.d.ts","sourceRoot":"","sources":["dateTimeRelativeParser.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAa,QAAQ,EAAC,MAAM,eAAe,CAAC;AAInD,OAAO,EAAC,OAAO,EAAE,aAAa,EAAE,SAAS,EAAC,MAAM,8BAA8B,CAAC;;AAE/E;;GAEG;AACH,qBACa,sBAAsB,CAAC,KAAK,GAAG,GAAG;IAU/B,SAAS,CAAC,SAAS,EAAE,QAAQ;IANzC;;OAEG;IACH,SAAS,CAAC,QAAQ,CAAC,EAAE,OAAO,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC;gBAG7B,SAAS,EAAE,QAAQ;IAMzC;;;;;;;;;;;OAWG;IACI,KAAK,CAAC,KAAK,EAAE,KAAK,GAAC,SAAS,GAAG,KAAK,GAAC,SAAS;yCA5B5C,sBAAsB;6CAAtB,sBAAsB;CAwFlC"}

package/src/services/dateValueProvider/dateValueProvider.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dateValueProvider.service.d.ts","sourceRoot":"","sources":["dateValueProvider.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,8CAA8C,CAAC;AAE3E,OAAO,EAAC,OAAO,EAAC,MAAM,8BAA8B,CAAC;;AAErD;;GAEG;AACH,qBACa,iBAAiB,CAAC,KAAK,GAAG,GAAG;IAGR,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;gBAAxB,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;IAMhE;;;;OAIG;IACI,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC;yCAd1D,iBAAiB;6CAAjB,iBAAiB;CA+D7B"}
+{"version":3,"file":"dateValueProvider.service.d.ts","sourceRoot":"","sources":["dateValueProvider.service.ts"],"names":[],"mappings":"AAEA,OAAO,EAAC,aAAa,EAAC,MAAM,8CAA8C,CAAC;AAE3E,OAAO,EAAC,OAAO,EAAC,MAAM,8BAA8B,CAAC;;AAIrD;;GAEG;AACH,qBACa,iBAAiB,CAAC,KAAK,GAAG,GAAG;IAGR,SAAS,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;gBAAxB,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC;IAMhE;;;;OAIG;IACI,QAAQ,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,GAAG,aAAa,CAAC,KAAK,CAAC;yCAd1D,iBAAiB;6CAAjB,iBAAiB;CA+D7B"}

package/version.bak

@@ -1 +1 @@
-5.0.0-beta.20221018103539 
+5.0.0-beta.20221018120203