@anglr/datetime 5.0.0-beta.20221018111751 → 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/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/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@anglr/datetime",
-    "version": "5.0.0-beta.20221018111751",
+    "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/version.bak

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