@anglr/datetime 8.0.0-beta.20240125080204 → 8.0.0

package/es2022/src/misc/utils.js

@@ -6,8 +6,9 @@ import { DateTimeValueFormat } from './enums';
  * @param dateApi - Date api used for obtaining result
  * @param dateTimeFormat - Date time format type, optional, if not specified autodetection of format will be used
  * @param stringFormat - String format for parsing string dates, required only for string dates
+ * @param dataFormat - String format for parsing string dates, required only for string dates, has higher priority than `stringFormat`
  */
-export function parseDateTime(value, dateApi, dateTimeFormat, stringFormat) {
+export function parseDateTime(value, dateApi, dateTimeFormat, stringFormat, dataFormat) {
     if (isBlank(value)) {
         return value;
     }
@@ -24,40 +25,46 @@ export function parseDateTime(value, dateApi, dateTimeFormat, stringFormat) {
                 throw new Error('DateTime: requested datetime format is not range, but value is range!');
             }
             return [
-                isBlank(value.from) ? null : parseDateTime(value.from, dateApi, DateTimeValueFormat.DateInstance, null),
-                isBlank(value.to) ? null : parseDateTime(value.to, dateApi, DateTimeValueFormat.DateInstance, null),
+                isBlank(value.from) ? null : parseDateTime(value.from, dateApi, DateTimeValueFormat.DateInstance, null, null),
+                isBlank(value.to) ? null : parseDateTime(value.to, dateApi, DateTimeValueFormat.DateInstance, null, null),
             ];
         }
         //value should be date instance, or number, or string, but it is not
         if (dateTimeFormat != DateTimeValueFormat.DateInstance &&
             dateTimeFormat != DateTimeValueFormat.FormattedString &&
-            dateTimeFormat != DateTimeValueFormat.UnixTimestamp) {
+            dateTimeFormat != DateTimeValueFormat.UnixTimestamp &&
+            dateTimeFormat != DateTimeValueFormat.DataString) {
             throw new Error('DateTime: unable to get date time value, should be date instance, or string, or number!');
         }
+        if (dateTimeFormat == DateTimeValueFormat.DataString) {
+            //value is string, instance of date or unix timestamp
+            return dateApi.getValue(value, dataFormat ?? undefined);
+        }
         //value is string, instance of date or unix timestamp
         return dateApi.getValue(value, stringFormat ?? undefined);
     }
     //value is range
     if (isDateTimeValue(value)) {
         return [
-            isBlank(value.from) ? null : parseDateTime(value.from, dateApi, DateTimeValueFormat.DateInstance, null),
-            isBlank(value.to) ? null : parseDateTime(value.to, dateApi, DateTimeValueFormat.DateInstance, null),
+            isBlank(value.from) ? null : parseDateTime(value.from, dateApi, DateTimeValueFormat.DateInstance, null, null),
+            isBlank(value.to) ? null : parseDateTime(value.to, dateApi, DateTimeValueFormat.DateInstance, null, null),
         ];
     }
     //string format, but format string was not provided
-    if (isString(value) && isBlank(stringFormat)) {
+    if (isString(value) && isBlank(stringFormat) && isBlank(dataFormat)) {
         throw new Error('DateTime: unable to parse string date, because format is missing!');
     }
     //value is string, instance of date or unix timestamp
-    return dateApi.getValue(value, stringFormat ?? undefined);
+    return dateApi.getValue(value, dataFormat ?? stringFormat ?? undefined);
 }
 /**
  * Formats value into specified format of date time
  * @param value - Value that should be converted to input output date time value
  * @param dateTimeFormat - Date time format type
- * @param stringFormat - String format for parsing string dates, required only for string dates
+ * @param stringFormat - String format for formatting string dates, required only for string dates
+ * @param dataFormat - String format for formatting string dates, required only for string dates, has higher priority than `stringFormat`
  */
-export function formatDateTime(value, dateTimeFormat, stringFormat) {
+export function formatDateTime(value, dateTimeFormat, stringFormat, dataFormat) {
     if (isBlank(value)) {
         return value;
     }
@@ -76,6 +83,14 @@ export function formatDateTime(value, dateTimeFormat, stringFormat) {
     if (dateTimeFormat == DateTimeValueFormat.RangeOfDateInstances) {
         throw new Error('DateTime: value is not array of values, but format is range!');
     }
+    //data string date time
+    if (dateTimeFormat == DateTimeValueFormat.DataString) {
+        //string format is missing for string date time
+        if (isBlank(dataFormat)) {
+            throw new Error('DateTime: missing data string format for string date time!');
+        }
+        return value.format(dataFormat);
+    }
     //string date time
     if (dateTimeFormat == DateTimeValueFormat.FormattedString) {
         //string format is missing for string date time
@@ -120,7 +135,7 @@ export function parseRawInput(rawValue, dateApi, dateTimeData, valueProvider) {
         return [null, null];
     }
     const internalValue = getInternalValue(rawValue, dateApi, dateTimeData, valueProvider);
-    const value = formatDateTime(internalValue, dateTimeData.valueFormat, dateTimeData.customFormat);
+    const value = formatDateTime(internalValue, dateTimeData.valueFormat, dateTimeData.customFormat, dateTimeData.dataFormat);
     return [internalValue, value];
 }
 /**
@@ -131,7 +146,7 @@ export function parseRawInput(rawValue, dateApi, dateTimeData, valueProvider) {
  * @param valueProvider - Provider used for obtaining rounded value according format
  */
 export function getInternalValue(value, dateApi, dateTimeData, valueProvider) {
-    let internalValue = parseDateTime(value, dateApi, null, dateTimeData.customFormat);
+    let internalValue = parseDateTime(value, dateApi, null, dateTimeData.customFormat, dateTimeData.dataFormat);
     if (isBlank(internalValue)) {
         return;
     }
@@ -140,22 +155,22 @@ export function getInternalValue(value, dateApi, dateTimeData, valueProvider) {
     if (Array.isArray(internalValue)) {
         const [from, to] = internalValue;
         if (from) {
-            const val = valueProvider.getValue(from.value, dateTimeData.customFormat).from;
+            const val = valueProvider.getValue(from.value, dateTimeData.dataFormat ?? dateTimeData.customFormat).from;
             if (val) {
-                internalValue[0] = dateApi.getValue(val, dateTimeData.customFormat);
+                internalValue[0] = dateApi.getValue(val, dateTimeData.dataFormat ?? dateTimeData.customFormat);
             }
         }
         if (to) {
-            const val = valueProvider.getValue(to.value, dateTimeData.customFormat).to;
+            const val = valueProvider.getValue(to.value, dateTimeData.dataFormat ?? dateTimeData.customFormat).to;
             if (val) {
-                internalValue[1] = dateApi.getValue(val, dateTimeData.customFormat);
+                internalValue[1] = dateApi.getValue(val, dateTimeData.dataFormat ?? dateTimeData.customFormat);
             }
         }
     }
     else {
-        const val = valueProvider.getValue(internalValue.value, dateTimeData.customFormat).from;
+        const val = valueProvider.getValue(internalValue.value, dateTimeData.dataFormat ?? dateTimeData.customFormat).from;
         if (val) {
-            internalValue = dateApi.getValue(val, dateTimeData.customFormat);
+            internalValue = dateApi.getValue(val, dateTimeData.dataFormat ?? dateTimeData.customFormat);
         }
     }
     return internalValue;

package/es2022/src/misc/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/misc/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {isBlank, isJsObject, isPresent, isString, nameof} from '@jscrpt/common';\n\nimport {DateTimeValue} from '../interfaces';\nimport type {DateTimeSADirective} from '../modules/dateTime/directives/dateTime/dateTime.directive';\nimport {DateApi, DateApiObject, DateValue, DateValueProvider} from '../services';\nimport {DateTimeValueFormat} from './enums';\nimport {DateTimeInputOutputValue, DateTimeObjectValue} from './types';\n\n/**\n * Parses date time input output value\n * @param value - Value to be parsed\n * @param dateApi - Date api used for obtaining result\n * @param dateTimeFormat - Date time format type, optional, if not specified autodetection of format will be used\n * @param stringFormat - String format for parsing string dates, required only for string dates\n */\nexport function parseDateTime<TDate = unknown>(value: DateTimeInputOutputValue<TDate>|undefined|null,\n                                               dateApi: DateApi<TDate>,\n                                               dateTimeFormat: DateTimeValueFormat|undefined|null,\n                                               stringFormat: string|undefined|null,): DateTimeObjectValue<TDate>|undefined|null\n{\n    if(isBlank(value))\n    {\n        return value;\n    }\n\n    //format is specified\n    if(isPresent(dateTimeFormat))\n    {\n        //string format required, but format string was not provided\n        if(dateTimeFormat == DateTimeValueFormat.FormattedString && isBlank(stringFormat))\n        {\n            throw new Error('DateTime: unable to parse string date, because format is missing!');\n        }\n\n        //value is range\n        if(isDateTimeValue(value))\n        {\n            //requirested format is different\n            if(dateTimeFormat != DateTimeValueFormat.RangeOfDateInstances)\n            {\n                throw new Error('DateTime: requested datetime format is not range, but value is range!');\n            }\n\n            return [\n                isBlank(value.from) ? null : parseDateTime(value.from, dateApi, DateTimeValueFormat.DateInstance, null) as DateApiObject<TDate>,\n                isBlank(value.to) ? null : parseDateTime(value.to, dateApi, DateTimeValueFormat.DateInstance, null) as DateApiObject<TDate>,\n            ];\n        }\n\n        //value should be date instance, or number, or string, but it is not\n        if(dateTimeFormat != DateTimeValueFormat.DateInstance &&\n           dateTimeFormat != DateTimeValueFormat.FormattedString &&\n           dateTimeFormat != DateTimeValueFormat.UnixTimestamp)\n        {\n            throw new Error('DateTime: unable to get date time value, should be date instance, or string, or number!');\n        }\n\n        //value is string, instance of date or unix timestamp\n        return dateApi.getValue(value, stringFormat ?? undefined);\n    }\n\n    //value is range\n    if(isDateTimeValue(value))\n    {\n        return [\n            isBlank(value.from) ? null : parseDateTime(value.from, dateApi, DateTimeValueFormat.DateInstance, null) as DateApiObject<TDate>,\n            isBlank(value.to) ? null : parseDateTime(value.to, dateApi, DateTimeValueFormat.DateInstance , null) as DateApiObject<TDate>,\n        ];\n    }\n\n    //string format, but format string was not provided\n    if(isString(value) && isBlank(stringFormat))\n    {\n        throw new Error('DateTime: unable to parse string date, because format is missing!');\n    }\n\n    //value is string, instance of date or unix timestamp\n    return dateApi.getValue(value, stringFormat ?? undefined);\n}\n\n/**\n * Formats value into specified format of date time\n * @param value - Value that should be converted to input output date time value\n * @param dateTimeFormat - Date time format type\n * @param stringFormat - String format for parsing string dates, required only for string dates\n */\nexport function formatDateTime<TDate = unknown>(value: DateTimeObjectValue<TDate>|undefined|null,\n                                                dateTimeFormat: DateTimeValueFormat,\n                                                stringFormat: string|undefined|null): DateTimeInputOutputValue<TDate>|undefined|null\n{\n    if(isBlank(value))\n    {\n        return value;\n    }\n\n    //value is range\n    if(Array.isArray(value))\n    {\n        //range is expected\n        if(dateTimeFormat != DateTimeValueFormat.RangeOfDateInstances)\n        {\n            throw new Error('DateTime: value is array of values, but format is not range!');\n        }\n\n        return {\n            from: value[0]?.value ?? null,\n            to: value[1]?.value ?? null,\n        };\n    }\n\n    //range is not expected\n    if(dateTimeFormat == DateTimeValueFormat.RangeOfDateInstances)\n    {\n        throw new Error('DateTime: value is not array of values, but format is range!');\n    }\n\n    //string date time\n    if(dateTimeFormat == DateTimeValueFormat.FormattedString)\n    {\n        //string format is missing for string date time\n        if(isBlank(stringFormat))\n        {\n            throw new Error('DateTime: missing string format for string date time!');\n        }\n\n        return value.format(stringFormat);\n    }\n\n    if(dateTimeFormat == DateTimeValueFormat.UnixTimestamp)\n    {\n        value.unixTimestamp();\n    }\n\n    return value.value;\n}\n\n/**\n * Tests whether value is `DateTimeValue`\n * @param value - Value that is tested\n */\nexport function isDateTimeValue<TDate = unknown>(value: unknown): value is DateTimeValue<TDate>\n{\n    return isJsObject(value) &&\n           nameof<DateTimeValue>('from') in value &&\n           nameof<DateTimeValue>('to') in value;\n}\n\n/**\n * Gets single date time value, use in places where ranged date time can not be used\n * @param value - Value to be examined\n */\nexport function getSingleDateTimeValue<TDate>(value: DateTimeInputOutputValue<TDate>|undefined|null): DateValue|TDate|null|undefined\n{\n    if(isDateTimeValue(value))\n    {\n        throw new Error('DateTime: Unable to apply ranged date time input as value restriction!');\n    }\n\n    return value;\n}\n\n/**\n * Parses raw value into internal value and value\n * @param rawValue - Raw value to be parsed\n * @param dateApi - Date api for manipulation with date\n * @param dateTimeData - Object storing information about format\n * @param valueProvider - Provider used for obtaining rounded value according format\n */\nexport function parseRawInput<TDate>(rawValue: string, \n                                     dateApi: DateApi<TDate>,\n                                     dateTimeData: DateTimeSADirective<TDate>,\n                                     valueProvider: DateValueProvider<TDate>,): [DateTimeObjectValue<TDate>|undefined|null, DateTimeInputOutputValue<TDate>|undefined|null]\n{\n    if(!rawValue)\n    {\n        return [null, null];\n    }\n\n    const internalValue = getInternalValue(rawValue, dateApi, dateTimeData, valueProvider);\n    const value = formatDateTime(internalValue, dateTimeData.valueFormat, dateTimeData.customFormat);\n\n    return [internalValue, value];\n}\n\n/**\n * Gets internal value and fix lowest time difference\n * @param value - Value to be get as internal value\n * @param dateApi - Date api for manipulation with date\n * @param dateTimeData - Object storing information about format\n * @param valueProvider - Provider used for obtaining rounded value according format\n */\nexport function getInternalValue<TDate>(value: DateTimeInputOutputValue<TDate>|undefined|null,\n                                        dateApi: DateApi<TDate>,\n                                        dateTimeData: DateTimeSADirective<TDate>,\n                                        valueProvider: DateValueProvider<TDate>,): DateTimeObjectValue<TDate>|undefined|null\n{\n    let internalValue = parseDateTime(value, dateApi, null, dateTimeData.customFormat);\n\n    if(isBlank(internalValue))\n    {\n        return;\n    }\n\n    //update for specified format, round value\n\n    //ranged value\n    if(Array.isArray(internalValue))\n    {\n        const [from, to] = internalValue;\n\n        if(from)\n        {\n            const val = valueProvider.getValue(from.value, dateTimeData.customFormat).from;\n\n            if(val)\n            {\n                internalValue[0] = dateApi.getValue(val, dateTimeData.customFormat);\n            }\n        }\n\n        if(to)\n        {\n            const val = valueProvider.getValue(to.value, dateTimeData.customFormat).to;\n\n            if(val)\n            {\n                internalValue[1] = dateApi.getValue(val, dateTimeData.customFormat);\n            }\n        }\n    }\n    else\n    {\n        const val = valueProvider.getValue(internalValue.value, dateTimeData.customFormat).from;\n\n        if(val)\n        {\n            internalValue = dateApi.getValue(val, dateTimeData.customFormat);\n        }\n    }\n\n    return internalValue;\n}"]}
+{"version":3,"file":"utils.js","sourceRoot":"","sources":["../../../src/misc/utils.ts"],"names":[],"mappings":"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","sourcesContent":["import {isBlank, isJsObject, isPresent, isString, nameof} from '@jscrpt/common';\n\nimport {DateTimeValue} from '../interfaces';\nimport type {DateTimeSADirective} from '../modules/dateTime/directives/dateTime/dateTime.directive';\nimport {DateApi, DateApiObject, DateValue, DateValueProvider} from '../services';\nimport {DateTimeValueFormat} from './enums';\nimport {DateTimeInputOutputValue, DateTimeObjectValue} from './types';\n\n/**\n * Parses date time input output value\n * @param value - Value to be parsed\n * @param dateApi - Date api used for obtaining result\n * @param dateTimeFormat - Date time format type, optional, if not specified autodetection of format will be used\n * @param stringFormat - String format for parsing string dates, required only for string dates\n * @param dataFormat - String format for parsing string dates, required only for string dates, has higher priority than `stringFormat`\n */\nexport function parseDateTime<TDate = unknown>(value: DateTimeInputOutputValue<TDate>|undefined|null,\n                                               dateApi: DateApi<TDate>,\n                                               dateTimeFormat: DateTimeValueFormat|undefined|null,\n                                               stringFormat: string|undefined|null,\n                                               dataFormat: string|undefined|null,): DateTimeObjectValue<TDate>|undefined|null\n{\n    if(isBlank(value))\n    {\n        return value;\n    }\n\n    //format is specified\n    if(isPresent(dateTimeFormat))\n    {\n        //string format required, but format string was not provided\n        if(dateTimeFormat == DateTimeValueFormat.FormattedString && isBlank(stringFormat))\n        {\n            throw new Error('DateTime: unable to parse string date, because format is missing!');\n        }\n\n        //value is range\n        if(isDateTimeValue(value))\n        {\n            //requirested format is different\n            if(dateTimeFormat != DateTimeValueFormat.RangeOfDateInstances)\n            {\n                throw new Error('DateTime: requested datetime format is not range, but value is range!');\n            }\n\n            return [\n                isBlank(value.from) ? null : parseDateTime(value.from, dateApi, DateTimeValueFormat.DateInstance, null, null) as DateApiObject<TDate>,\n                isBlank(value.to) ? null : parseDateTime(value.to, dateApi, DateTimeValueFormat.DateInstance, null, null) as DateApiObject<TDate>,\n            ];\n        }\n\n        //value should be date instance, or number, or string, but it is not\n        if(dateTimeFormat != DateTimeValueFormat.DateInstance &&\n           dateTimeFormat != DateTimeValueFormat.FormattedString &&\n           dateTimeFormat != DateTimeValueFormat.UnixTimestamp &&\n           dateTimeFormat != DateTimeValueFormat.DataString)\n        {\n            throw new Error('DateTime: unable to get date time value, should be date instance, or string, or number!');\n        }\n\n        if(dateTimeFormat == DateTimeValueFormat.DataString)\n        {\n            //value is string, instance of date or unix timestamp\n            return dateApi.getValue(value, dataFormat ?? undefined);\n        }\n\n        //value is string, instance of date or unix timestamp\n        return dateApi.getValue(value, stringFormat ?? undefined);\n    }\n\n    //value is range\n    if(isDateTimeValue(value))\n    {\n        return [\n            isBlank(value.from) ? null : parseDateTime(value.from, dateApi, DateTimeValueFormat.DateInstance, null, null) as DateApiObject<TDate>,\n            isBlank(value.to) ? null : parseDateTime(value.to, dateApi, DateTimeValueFormat.DateInstance , null, null) as DateApiObject<TDate>,\n        ];\n    }\n\n    //string format, but format string was not provided\n    if(isString(value) && isBlank(stringFormat) && isBlank(dataFormat))\n    {\n        throw new Error('DateTime: unable to parse string date, because format is missing!');\n    }\n\n    //value is string, instance of date or unix timestamp\n    return dateApi.getValue(value, dataFormat ?? stringFormat ?? undefined);\n}\n\n/**\n * Formats value into specified format of date time\n * @param value - Value that should be converted to input output date time value\n * @param dateTimeFormat - Date time format type\n * @param stringFormat - String format for formatting string dates, required only for string dates\n * @param dataFormat - String format for formatting string dates, required only for string dates, has higher priority than `stringFormat`\n */\nexport function formatDateTime<TDate = unknown>(value: DateTimeObjectValue<TDate>|undefined|null,\n                                                dateTimeFormat: DateTimeValueFormat,\n                                                stringFormat: string|undefined|null,\n                                                dataFormat: string|undefined|null,): DateTimeInputOutputValue<TDate>|undefined|null\n{\n    if(isBlank(value))\n    {\n        return value;\n    }\n\n    //value is range\n    if(Array.isArray(value))\n    {\n        //range is expected\n        if(dateTimeFormat != DateTimeValueFormat.RangeOfDateInstances)\n        {\n            throw new Error('DateTime: value is array of values, but format is not range!');\n        }\n\n        return {\n            from: value[0]?.value ?? null,\n            to: value[1]?.value ?? null,\n        };\n    }\n\n    //range is not expected\n    if(dateTimeFormat == DateTimeValueFormat.RangeOfDateInstances)\n    {\n        throw new Error('DateTime: value is not array of values, but format is range!');\n    }\n\n    //data string date time\n    if(dateTimeFormat == DateTimeValueFormat.DataString)\n    {\n        //string format is missing for string date time\n        if(isBlank(dataFormat))\n        {\n            throw new Error('DateTime: missing data string format for string date time!');\n        }\n\n        return value.format(dataFormat);\n    }\n\n    //string date time\n    if(dateTimeFormat == DateTimeValueFormat.FormattedString)\n    {\n        //string format is missing for string date time\n        if(isBlank(stringFormat))\n        {\n            throw new Error('DateTime: missing string format for string date time!');\n        }\n\n        return value.format(stringFormat);\n    }\n\n    if(dateTimeFormat == DateTimeValueFormat.UnixTimestamp)\n    {\n        value.unixTimestamp();\n    }\n\n    return value.value;\n}\n\n/**\n * Tests whether value is `DateTimeValue`\n * @param value - Value that is tested\n */\nexport function isDateTimeValue<TDate = unknown>(value: unknown): value is DateTimeValue<TDate>\n{\n    return isJsObject(value) &&\n           nameof<DateTimeValue>('from') in value &&\n           nameof<DateTimeValue>('to') in value;\n}\n\n/**\n * Gets single date time value, use in places where ranged date time can not be used\n * @param value - Value to be examined\n */\nexport function getSingleDateTimeValue<TDate>(value: DateTimeInputOutputValue<TDate>|undefined|null): DateValue|TDate|null|undefined\n{\n    if(isDateTimeValue(value))\n    {\n        throw new Error('DateTime: Unable to apply ranged date time input as value restriction!');\n    }\n\n    return value;\n}\n\n/**\n * Parses raw value into internal value and value\n * @param rawValue - Raw value to be parsed\n * @param dateApi - Date api for manipulation with date\n * @param dateTimeData - Object storing information about format\n * @param valueProvider - Provider used for obtaining rounded value according format\n */\nexport function parseRawInput<TDate>(rawValue: string, \n                                     dateApi: DateApi<TDate>,\n                                     dateTimeData: DateTimeSADirective<TDate>,\n                                     valueProvider: DateValueProvider<TDate>,): [DateTimeObjectValue<TDate>|undefined|null, DateTimeInputOutputValue<TDate>|undefined|null]\n{\n    if(!rawValue)\n    {\n        return [null, null];\n    }\n\n    const internalValue = getInternalValue(rawValue, dateApi, dateTimeData, valueProvider);\n    const value = formatDateTime(internalValue, dateTimeData.valueFormat, dateTimeData.customFormat, dateTimeData.dataFormat);\n\n    return [internalValue, value];\n}\n\n/**\n * Gets internal value and fix lowest time difference\n * @param value - Value to be get as internal value\n * @param dateApi - Date api for manipulation with date\n * @param dateTimeData - Object storing information about format\n * @param valueProvider - Provider used for obtaining rounded value according format\n */\nexport function getInternalValue<TDate>(value: DateTimeInputOutputValue<TDate>|undefined|null,\n                                        dateApi: DateApi<TDate>,\n                                        dateTimeData: DateTimeSADirective<TDate>,\n                                        valueProvider: DateValueProvider<TDate>,): DateTimeObjectValue<TDate>|undefined|null\n{\n    let internalValue = parseDateTime(value, dateApi, null, dateTimeData.customFormat, dateTimeData.dataFormat);\n\n    if(isBlank(internalValue))\n    {\n        return;\n    }\n\n    //update for specified format, round value\n\n    //ranged value\n    if(Array.isArray(internalValue))\n    {\n        const [from, to] = internalValue;\n\n        if(from)\n        {\n            const val = valueProvider.getValue(from.value, dateTimeData.dataFormat ?? dateTimeData.customFormat).from;\n\n            if(val)\n            {\n                internalValue[0] = dateApi.getValue(val, dateTimeData.dataFormat ?? dateTimeData.customFormat);\n            }\n        }\n\n        if(to)\n        {\n            const val = valueProvider.getValue(to.value, dateTimeData.dataFormat ?? dateTimeData.customFormat).to;\n\n            if(val)\n            {\n                internalValue[1] = dateApi.getValue(val, dateTimeData.dataFormat ?? dateTimeData.customFormat);\n            }\n        }\n    }\n    else\n    {\n        const val = valueProvider.getValue(internalValue.value, dateTimeData.dataFormat ?? dateTimeData.customFormat).from;\n\n        if(val)\n        {\n            internalValue = dateApi.getValue(val, dateTimeData.dataFormat ?? dateTimeData.customFormat);\n        }\n    }\n\n    return internalValue;\n}"]}

package/es2022/src/misc/validators.js

@@ -8,13 +8,14 @@ import { DATE_API } from './tokens';
  * @param dateApi - Date api used for parsing date time
  * @param valueFormat - Optional required format
  * @param stringFormat - Optional string format of value
+ * @param dataFormat - Optional string data format of value
  */
-export function datetimeValidator(dateApi, valueFormat, stringFormat) {
+export function datetimeValidator(dateApi, valueFormat, stringFormat, dataFormat) {
     return (control) => {
         if (isBlank(control.value)) {
             return null;
         }
-        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);
+        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat, dataFormat);
         if (!parsedValue) {
             return null;
         }
@@ -41,13 +42,13 @@ export function dateTimeModelValidatorFactory(args) {
         if (!dateApi) {
             throw new Error('DateTime: missing DateApi! Please provide one.');
         }
-        return datetimeValidator(dateApi, args.valueFormat, args.stringFormat);
+        return datetimeValidator(dateApi, args.valueFormat, args.stringFormat, args.dataFormat);
     }, args);
 }
 /**
  * Sets date time validator to property on which is used
  */
-export function DateTime(valueFormatOrStringFormat, stringFormat) {
+export function DateTime(valueFormatOrStringFormat, stringFormat, dataFormat) {
     let valueFormat;
     if (isNumber(valueFormatOrStringFormat)) {
         valueFormat = valueFormatOrStringFormat;
@@ -59,6 +60,7 @@ export function DateTime(valueFormatOrStringFormat, stringFormat) {
         validators: [dateTimeModelValidatorFactory({
                 stringFormat,
                 valueFormat,
+                dataFormat,
             })]
     });
 }
@@ -68,8 +70,9 @@ export function DateTime(valueFormatOrStringFormat, stringFormat) {
  * @param maxValue - Maximal date time value that should be used for validation against
  * @param valueFormat - Optional required format
  * @param stringFormat - Optional string format of value
+ * @param dataFormat - Optional string data format of value
  */
-export function datetimeMaxValidator(dateApi, maxValue, valueFormat, stringFormat) {
+export function datetimeMaxValidator(dateApi, maxValue, valueFormat, stringFormat, dataFormat) {
     return (control) => {
         if (isBlank(control.value) || isBlank(maxValue)) {
             return null;
@@ -82,7 +85,7 @@ export function datetimeMaxValidator(dateApi, maxValue, valueFormat, stringForma
             }
             maxValue = value;
         }
-        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);
+        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat, dataFormat);
         if (!parsedValue) {
             return null;
         }
@@ -106,8 +109,9 @@ export function datetimeMaxValidator(dateApi, maxValue, valueFormat, stringForma
  * @param minValue - Minimal date time value that should be used for validation against
  * @param valueFormat - Optional required format
  * @param stringFormat - Optional string format of value
+ * @param dataFormat - Optional string data format of value
  */
-export function datetimeMinValidator(dateApi, minValue, valueFormat, stringFormat) {
+export function datetimeMinValidator(dateApi, minValue, valueFormat, stringFormat, dataFormat) {
     return (control) => {
         if (isBlank(control.value) || isBlank(minValue)) {
             return null;
@@ -120,7 +124,7 @@ export function datetimeMinValidator(dateApi, minValue, valueFormat, stringForma
             }
             minValue = value;
         }
-        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat);
+        const parsedValue = parseDateTime(control.value, dateApi, valueFormat, stringFormat, dataFormat);
         if (!parsedValue) {
             return null;
         }

package/es2022/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 {ModelPropertyMetadata, ValidatorFnFactory} from '@anglr/common/forms';\nimport {isBlank, isNumber, isString} from '@jscrpt/common';\n\nimport {DateApi, DateValue} from '../services';\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?: DateValue|TDate|DateTimeBase<TDate>;\n\n    /**\n     * Min allowed value\n     */\n    minValue?: DateValue|TDate|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: DateValue|TDate|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)\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, 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: DateValue|TDate|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)\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, 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"]}
+{"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, DateValue} from '../services';\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     * Format of data string value\n     */\n    dataFormat?: string|null;\n\n    /**\n     * Max allowed value\n     */\n    maxValue?: DateValue|TDate|DateTimeBase<TDate>;\n\n    /**\n     * Min allowed value\n     */\n    minValue?: DateValue|TDate|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 * @param dataFormat - Optional string data format of value\n */\nexport function datetimeValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                   valueFormat: DateTimeValueFormat|undefined|null,\n                                                   stringFormat: string|undefined|null,\n                                                   dataFormat: 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, dataFormat);\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, args.dataFormat);\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\n * @param valueFormat - Format of validated value\n * @param stringFormat - Format of string value\n * @param dataFormat - Format of data string value\n */\nexport function DateTime(valueFormat: DateTimeValueFormat, stringFormat: string|undefined|null, dataFormat: 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, dataFormat?: 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            dataFormat,\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 * @param dataFormat - Optional string data format of value\n */\nexport function datetimeMaxValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      maxValue: DateValue|TDate|DateTimeBase<TDate>|undefined|null,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,\n                                                      dataFormat: 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)\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, dataFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const maxDateTime = dateApi.getValue(maxValue, 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 * @param dataFormat - Optional string data format of value\n */\nexport function datetimeMinValidator<TDate = unknown>(dateApi: DateApi<TDate>,\n                                                      minValue: DateValue|TDate|DateTimeBase<TDate>|undefined|null,\n                                                      valueFormat: DateTimeValueFormat|undefined|null,\n                                                      stringFormat: string|undefined|null,\n                                                      dataFormat: 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)\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, dataFormat);\n\n        if(!parsedValue)\n        {\n            return null;\n        }\n\n        const minDateTime = dateApi.getValue(minValue, 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"]}

package/es2022/src/modules/calendar/components/monthCalendar/monthCalendar.component.js

@@ -11,7 +11,7 @@ import * as i3 from "../../directives/calendarDayTemplate/calendarDayTemplate.di
 /**
  * Component used for displaying month calendar
  */
-class MonthCalendarComponent {
+export class MonthCalendarComponent {
     dateApi;
     formatProvider;
     eventParser;
@@ -184,24 +184,23 @@ class MonthCalendarComponent {
      * Custom input type for `dayAspectRatio` input
      */
     static ngAcceptInputType_dayAspectRatio;
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: MonthCalendarComponent, deps: [{ token: DATE_API }, { token: FORMAT_PROVIDER }, { token: i1.EventParser }], target: i0.ɵɵFactoryTarget.Component });
-    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "16.2.1", type: MonthCalendarComponent, selector: "month-calendar", inputs: { showWeekNumber: "showWeekNumber", display: "display", weekDayName: "weekDayName", dayAspectRatio: "dayAspectRatio", events: "events" }, providers: [
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: MonthCalendarComponent, deps: [{ token: DATE_API }, { token: FORMAT_PROVIDER }, { token: i1.EventParser }], target: i0.ɵɵFactoryTarget.Component });
+    static ɵcmp = i0.ɵɵngDeclareComponent({ minVersion: "14.0.0", version: "17.1.1", type: MonthCalendarComponent, selector: "month-calendar", inputs: { showWeekNumber: "showWeekNumber", display: "display", weekDayName: "weekDayName", dayAspectRatio: "dayAspectRatio", events: "events" }, providers: [
             EventParser,
         ], queries: [{ propertyName: "customCalendarDayTemplate", first: true, predicate: CalendarDayTemplateDirective, descendants: true, read: TemplateRef, static: true }], viewQueries: [{ propertyName: "defaultCalendarDayTemplate", first: true, predicate: CalendarDayTemplateDirective, descendants: true, read: TemplateRef, static: true }], usesOnChanges: true, ngImport: i0, template: "<div *calendarDayTemplate=\"let data\" class=\"default-calendar-day\" [class.is-weekend]=\"data.isWeekend\" [class.is-other-month]=\"!data.isCurrentMonth\">{{data.day}}</div>\n\n<div></div>\n\n<div *ngFor=\"let dayName of weekDayNames\" [class.week-day-name]=\"dayName\">{{dayName}}</div>\n\n<ng-container *ngFor=\"let weekData of calendarData | keyvalue\">\n    <div class=\"week-number\">\n        <ng-container *ngIf=\"showWeekNumber\">{{weekData.key}}</ng-container>\n    </div>\n    \n    <div *ngFor=\"let dayData of weekData.value\" [style.padding-bottom.%]=\"dayAspectRatioValue\" class=\"day-wrapper\">\n        <div class=\"day-content\"><ng-container *ngTemplateOutlet=\"calendarDayTemplate; context: {$implicit: dayData}\"></ng-container></div>\n    </div>\n</ng-container>\n", dependencies: [{ kind: "directive", type: i2.NgForOf, selector: "[ngFor][ngForOf]", inputs: ["ngForOf", "ngForTrackBy", "ngForTemplate"] }, { kind: "directive", type: i2.NgIf, selector: "[ngIf]", inputs: ["ngIf", "ngIfThen", "ngIfElse"] }, { kind: "directive", type: i2.NgTemplateOutlet, selector: "[ngTemplateOutlet]", inputs: ["ngTemplateOutletContext", "ngTemplateOutlet", "ngTemplateOutletInjector"] }, { kind: "directive", type: i3.CalendarDayTemplateDirective, selector: "[calendarDayTemplate]" }, { kind: "pipe", type: i2.KeyValuePipe, name: "keyvalue" }], changeDetection: i0.ChangeDetectionStrategy.OnPush });
 }
-export { MonthCalendarComponent };
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: MonthCalendarComponent, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: MonthCalendarComponent, decorators: [{
             type: Component,
             args: [{ selector: 'month-calendar', providers: [
                         EventParser,
                     ], changeDetection: ChangeDetectionStrategy.OnPush, template: "<div *calendarDayTemplate=\"let data\" class=\"default-calendar-day\" [class.is-weekend]=\"data.isWeekend\" [class.is-other-month]=\"!data.isCurrentMonth\">{{data.day}}</div>\n\n<div></div>\n\n<div *ngFor=\"let dayName of weekDayNames\" [class.week-day-name]=\"dayName\">{{dayName}}</div>\n\n<ng-container *ngFor=\"let weekData of calendarData | keyvalue\">\n    <div class=\"week-number\">\n        <ng-container *ngIf=\"showWeekNumber\">{{weekData.key}}</ng-container>\n    </div>\n    \n    <div *ngFor=\"let dayData of weekData.value\" [style.padding-bottom.%]=\"dayAspectRatioValue\" class=\"day-wrapper\">\n        <div class=\"day-content\"><ng-container *ngTemplateOutlet=\"calendarDayTemplate; context: {$implicit: dayData}\"></ng-container></div>\n    </div>\n</ng-container>\n" }]
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [DATE_API]
                 }] }, { type: undefined, decorators: [{
                     type: Inject,
                     args: [FORMAT_PROVIDER]
-                }] }, { type: i1.EventParser }]; }, propDecorators: { defaultCalendarDayTemplate: [{
+                }] }, { type: i1.EventParser }], propDecorators: { defaultCalendarDayTemplate: [{
                 type: ViewChild,
                 args: [CalendarDayTemplateDirective, { static: true, read: TemplateRef }]
             }], customCalendarDayTemplate: [{

package/es2022/src/modules/calendar/components/monthCalendar/monthCalendar.component.js.map

@@ -1 +1 @@
-{"version":3,"file":"monthCalendar.component.js","sourceRoot":"","sources":["../../../../../../src/modules/calendar/components/monthCalendar/monthCalendar.component.ts","../../../../../../src/modules/calendar/components/monthCalendar/monthCalendar.component.html"],"names":[],"mappings":"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","sourcesContent":["import {Component, ChangeDetectionStrategy, Input, Inject, OnInit, ViewChild, TemplateRef, ContentChild, OnChanges, SimpleChanges} from '@angular/core';\nimport {Dictionary, isString, nameof} from '@jscrpt/common';\n\nimport {CalendarDayData, EventData} from '../../interfaces';\nimport {CalendarDayTemplateDirective, CalendarDayTemplateContext} from '../../directives';\nimport {MonthCalendarDayFormat, CalendarDayAspectRatio} from '../../misc';\nimport {EventParser} from '../../services';\nimport {DATE_API, FORMAT_PROVIDER} from '../../../../misc/tokens';\nimport {DateApi} from '../../../../services';\nimport {FormatProvider} from '../../../../interfaces';\n\n/**\n * Component used for displaying month calendar\n */\n@Component(\n{\n    selector: 'month-calendar',\n    templateUrl: 'monthCalendar.component.html',\n    providers:\n    [\n        EventParser,\n    ],\n    changeDetection: ChangeDetectionStrategy.OnPush\n})\nexport class MonthCalendarComponent<TDate = unknown, TEvent = unknown> implements OnInit, OnChanges\n{\n    //######################### protected properties - template bindings #########################\n\n    /**\n     * Aspect ratio for displayed calendar day cell\n     */\n    protected dayAspectRatioValue: number = CalendarDayAspectRatio.ThreeToTwo;\n\n    /**\n     * Data that represents calendar data\n     */\n    protected calendarData: Dictionary<CalendarDayData<TDate, TEvent>[]> = {};\n\n    /**\n     * Calendar day template to be used\n     */\n    protected get calendarDayTemplate(): TemplateRef<CalendarDayTemplateContext>\n    {\n        return this.customCalendarDayTemplate ?? this.defaultCalendarDayTemplate;\n    }\n\n    /**\n     * Array of weekday names\n     */\n    protected weekDayNames: string[] = [];\n\n    //######################### protected properties - children #########################\n\n    /**\n     * Default calendar day template\n     */\n    @ViewChild(CalendarDayTemplateDirective, {static: true, read: TemplateRef})\n    protected defaultCalendarDayTemplate!: TemplateRef<CalendarDayTemplateContext>;\n\n    /**\n     * Custom calendar day template\n     */\n    @ContentChild(CalendarDayTemplateDirective, {static: true, read: TemplateRef})\n    protected customCalendarDayTemplate: TemplateRef<CalendarDayTemplateContext>|undefined|null;\n\n    //######################### public properties - inputs #########################\n\n    /**\n     * Indication that week number should be displayed\n     */\n    @Input()\n    public showWeekNumber: boolean = false;\n\n    /**\n     * Date that should be displayed in month calendar\n     */\n    @Input()\n    public display: TDate|undefined|null;\n\n    /**\n     * Format for displaying week day names\n     */\n    @Input()\n    public weekDayName: MonthCalendarDayFormat = MonthCalendarDayFormat.Short;\n\n    /**\n     * Aspect ratio for displayed calendar day cell\n     */\n    @Input()\n    public get dayAspectRatio(): number\n    {\n        return this.dayAspectRatioValue;\n    }\n    public set dayAspectRatio(value: number)\n    {\n        if(isString(value))\n        {\n            this.dayAspectRatioValue = CalendarDayAspectRatio[value] as unknown as number;\n\n            return;\n        }\n\n        this.dayAspectRatioValue = value;\n    }\n\n    /**\n     * Array of events that should be displayed\n     */\n    @Input()\n    public events: EventData<TDate, TEvent>[] = [];\n\n    //######################### constructor #########################\n    constructor(@Inject(DATE_API) protected dateApi: DateApi<TDate>,\n                @Inject(FORMAT_PROVIDER) protected formatProvider: FormatProvider,\n                protected eventParser: EventParser<TDate, TEvent>,)\n    {\n    }\n\n    //######################### public methods - implementation of OnInit #########################\n\n    /**\n     * Initialize component\n     */\n    public ngOnInit(): void\n    {\n        this.initWeekdayNames();\n        this.initializeDisplayCalendar();\n    }\n\n    //######################### public methods - implementation of OnChanges #########################\n\n    /**\n     * Called when input value changes\n     */\n    public ngOnChanges(changes: SimpleChanges): void\n    {\n        if(nameof<MonthCalendarComponent>('weekDayName') in changes)\n        {\n            this.initWeekdayNames();\n        }\n\n        if(nameof<MonthCalendarComponent>('display') in changes)\n        {\n            this.initializeDisplayCalendar();\n        }\n\n        if(nameof<MonthCalendarComponent>('events') in changes && !(nameof<MonthCalendarComponent>('display') in changes))\n        {\n            this.initAndAttachEventData();\n        }\n    }\n\n    //######################### protected methods #########################\n\n    /**\n     * Initialize weekday names\n     */\n    protected initWeekdayNames(): void\n    {\n        this.weekDayNames = [];\n        const dateApi = this.dateApi.now().startOfWeek();\n\n        switch(this.weekDayName)\n        {\n            default:\n            // case MonthCalendarDayFormat.None:\n            {\n                for(let x = 0; x < 7; x++)\n                {\n                    this.weekDayNames.push('');\n                }\n\n                break;\n            }\n            case MonthCalendarDayFormat.Short:\n            {\n                for(let x = 0; x < 7; x++)\n                {\n                    this.weekDayNames.push(dateApi.format(this.formatProvider.dayNameShort));\n                    dateApi.addDays(1);\n                }\n\n                break;\n            }\n            case MonthCalendarDayFormat.Full:\n            {\n                for(let x = 0; x < 7; x++)\n                {\n                    this.weekDayNames.push(dateApi.format(this.formatProvider.dayName));\n                    dateApi.addDays(1);\n                }\n\n                break;\n            }\n        }\n    }\n\n    /**\n     * Initialize date for calendar that should be displayed\n     */\n    protected initializeDisplayCalendar(): void\n    {\n        this.display ??= this.dateApi.now().value;\n\n        const workDate = this.dateApi.getValue(this.display);\n\n        workDate.startOfMonth()\n            .startOfWeek();\n\n        this.calendarData = {};\n\n        do\n        {\n            const weekData: CalendarDayData<TDate, TEvent>[] = this.calendarData[workDate.format(this.formatProvider.week)] = [];\n\n            for(let x = 0; x < 7; x++)\n            {\n                weekData.push(\n                {\n                    date: workDate.value,\n                    day: workDate.dayOfMonth(),\n                    events: [],\n                    isCurrentMonth: workDate.isSameMonth(this.display),\n                    isWeekend: workDate.isWeekend(),\n                    week: +workDate.format(this.formatProvider.week),\n                });\n\n                workDate.addDays(1);\n            }\n\n            workDate.startOfWeek();\n        }\n        while(workDate.isSameMonth(this.display));\n\n        this.initAndAttachEventData();\n    }\n\n    /**\n     * Initialize and attaches event data\n     */\n    protected initAndAttachEventData(): void\n    {\n        const events = this.eventParser.getEventsPerDay(this.events);\n\n        for(const week in this.calendarData)\n        {\n            const weekData = this.calendarData[week];\n\n            for(const day of weekData)\n            {\n                const found = events.find(itm => this.dateApi.getValue(itm[0]).isSame(day.date));\n                day.events = found?.[1] ?? [];\n            }\n        }\n    }\n\n    //######################### ng language server #########################\n\n    /**\n     * Custom input type for `weekDayName` input\n     */\n    public static ngAcceptInputType_weekDayName: keyof typeof MonthCalendarDayFormat;\n\n    /**\n     * Custom input type for `dayAspectRatio` input\n     */\n    public static ngAcceptInputType_dayAspectRatio: keyof typeof CalendarDayAspectRatio|number;\n}","<div *calendarDayTemplate=\"let data\" class=\"default-calendar-day\" [class.is-weekend]=\"data.isWeekend\" [class.is-other-month]=\"!data.isCurrentMonth\">{{data.day}}</div>\n\n<div></div>\n\n<div *ngFor=\"let dayName of weekDayNames\" [class.week-day-name]=\"dayName\">{{dayName}}</div>\n\n<ng-container *ngFor=\"let weekData of calendarData | keyvalue\">\n    <div class=\"week-number\">\n        <ng-container *ngIf=\"showWeekNumber\">{{weekData.key}}</ng-container>\n    </div>\n    \n    <div *ngFor=\"let dayData of weekData.value\" [style.padding-bottom.%]=\"dayAspectRatioValue\" class=\"day-wrapper\">\n        <div class=\"day-content\"><ng-container *ngTemplateOutlet=\"calendarDayTemplate; context: {$implicit: dayData}\"></ng-container></div>\n    </div>\n</ng-container>\n"]}
+{"version":3,"file":"monthCalendar.component.js","sourceRoot":"","sources":["../../../../../../src/modules/calendar/components/monthCalendar/monthCalendar.component.ts","../../../../../../src/modules/calendar/components/monthCalendar/monthCalendar.component.html"],"names":[],"mappings":"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","sourcesContent":["import {Component, ChangeDetectionStrategy, Input, Inject, OnInit, ViewChild, TemplateRef, ContentChild, OnChanges, SimpleChanges} from '@angular/core';\nimport {Dictionary, isString, nameof} from '@jscrpt/common';\n\nimport {CalendarDayData, EventData} from '../../interfaces';\nimport {CalendarDayTemplateDirective, CalendarDayTemplateContext} from '../../directives';\nimport {MonthCalendarDayFormat, CalendarDayAspectRatio} from '../../misc';\nimport {EventParser} from '../../services';\nimport {DATE_API, FORMAT_PROVIDER} from '../../../../misc/tokens';\nimport {DateApi} from '../../../../services';\nimport {FormatProvider} from '../../../../interfaces';\n\n/**\n * Component used for displaying month calendar\n */\n@Component(\n{\n    selector: 'month-calendar',\n    templateUrl: 'monthCalendar.component.html',\n    providers:\n    [\n        EventParser,\n    ],\n    changeDetection: ChangeDetectionStrategy.OnPush\n})\nexport class MonthCalendarComponent<TDate = unknown, TEvent = unknown> implements OnInit, OnChanges\n{\n    //######################### protected properties - template bindings #########################\n\n    /**\n     * Aspect ratio for displayed calendar day cell\n     */\n    protected dayAspectRatioValue: number = CalendarDayAspectRatio.ThreeToTwo;\n\n    /**\n     * Data that represents calendar data\n     */\n    protected calendarData: Dictionary<CalendarDayData<TDate, TEvent>[]> = {};\n\n    /**\n     * Calendar day template to be used\n     */\n    protected get calendarDayTemplate(): TemplateRef<CalendarDayTemplateContext>\n    {\n        return this.customCalendarDayTemplate ?? this.defaultCalendarDayTemplate;\n    }\n\n    /**\n     * Array of weekday names\n     */\n    protected weekDayNames: string[] = [];\n\n    //######################### protected properties - children #########################\n\n    /**\n     * Default calendar day template\n     */\n    @ViewChild(CalendarDayTemplateDirective, {static: true, read: TemplateRef})\n    protected defaultCalendarDayTemplate!: TemplateRef<CalendarDayTemplateContext>;\n\n    /**\n     * Custom calendar day template\n     */\n    @ContentChild(CalendarDayTemplateDirective, {static: true, read: TemplateRef})\n    protected customCalendarDayTemplate: TemplateRef<CalendarDayTemplateContext>|undefined|null;\n\n    //######################### public properties - inputs #########################\n\n    /**\n     * Indication that week number should be displayed\n     */\n    @Input()\n    public showWeekNumber: boolean = false;\n\n    /**\n     * Date that should be displayed in month calendar\n     */\n    @Input()\n    public display: TDate|undefined|null;\n\n    /**\n     * Format for displaying week day names\n     */\n    @Input()\n    public weekDayName: MonthCalendarDayFormat = MonthCalendarDayFormat.Short;\n\n    /**\n     * Aspect ratio for displayed calendar day cell\n     */\n    @Input()\n    public get dayAspectRatio(): number\n    {\n        return this.dayAspectRatioValue;\n    }\n    public set dayAspectRatio(value: number)\n    {\n        if(isString(value))\n        {\n            this.dayAspectRatioValue = CalendarDayAspectRatio[value] as unknown as number;\n\n            return;\n        }\n\n        this.dayAspectRatioValue = value;\n    }\n\n    /**\n     * Array of events that should be displayed\n     */\n    @Input()\n    public events: EventData<TDate, TEvent>[] = [];\n\n    //######################### constructor #########################\n    constructor(@Inject(DATE_API) protected dateApi: DateApi<TDate>,\n                @Inject(FORMAT_PROVIDER) protected formatProvider: FormatProvider,\n                protected eventParser: EventParser<TDate, TEvent>,)\n    {\n    }\n\n    //######################### public methods - implementation of OnInit #########################\n\n    /**\n     * Initialize component\n     */\n    public ngOnInit(): void\n    {\n        this.initWeekdayNames();\n        this.initializeDisplayCalendar();\n    }\n\n    //######################### public methods - implementation of OnChanges #########################\n\n    /**\n     * Called when input value changes\n     */\n    public ngOnChanges(changes: SimpleChanges): void\n    {\n        if(nameof<MonthCalendarComponent>('weekDayName') in changes)\n        {\n            this.initWeekdayNames();\n        }\n\n        if(nameof<MonthCalendarComponent>('display') in changes)\n        {\n            this.initializeDisplayCalendar();\n        }\n\n        if(nameof<MonthCalendarComponent>('events') in changes && !(nameof<MonthCalendarComponent>('display') in changes))\n        {\n            this.initAndAttachEventData();\n        }\n    }\n\n    //######################### protected methods #########################\n\n    /**\n     * Initialize weekday names\n     */\n    protected initWeekdayNames(): void\n    {\n        this.weekDayNames = [];\n        const dateApi = this.dateApi.now().startOfWeek();\n\n        switch(this.weekDayName)\n        {\n            default:\n            // case MonthCalendarDayFormat.None:\n            {\n                for(let x = 0; x < 7; x++)\n                {\n                    this.weekDayNames.push('');\n                }\n\n                break;\n            }\n            case MonthCalendarDayFormat.Short:\n            {\n                for(let x = 0; x < 7; x++)\n                {\n                    this.weekDayNames.push(dateApi.format(this.formatProvider.dayNameShort));\n                    dateApi.addDays(1);\n                }\n\n                break;\n            }\n            case MonthCalendarDayFormat.Full:\n            {\n                for(let x = 0; x < 7; x++)\n                {\n                    this.weekDayNames.push(dateApi.format(this.formatProvider.dayName));\n                    dateApi.addDays(1);\n                }\n\n                break;\n            }\n        }\n    }\n\n    /**\n     * Initialize date for calendar that should be displayed\n     */\n    protected initializeDisplayCalendar(): void\n    {\n        this.display ??= this.dateApi.now().value;\n\n        const workDate = this.dateApi.getValue(this.display);\n\n        workDate.startOfMonth()\n            .startOfWeek();\n\n        this.calendarData = {};\n\n        do\n        {\n            const weekData: CalendarDayData<TDate, TEvent>[] = this.calendarData[workDate.format(this.formatProvider.week)] = [];\n\n            for(let x = 0; x < 7; x++)\n            {\n                weekData.push(\n                {\n                    date: workDate.value,\n                    day: workDate.dayOfMonth(),\n                    events: [],\n                    isCurrentMonth: workDate.isSameMonth(this.display),\n                    isWeekend: workDate.isWeekend(),\n                    week: +workDate.format(this.formatProvider.week),\n                });\n\n                workDate.addDays(1);\n            }\n\n            workDate.startOfWeek();\n        }\n        while(workDate.isSameMonth(this.display));\n\n        this.initAndAttachEventData();\n    }\n\n    /**\n     * Initialize and attaches event data\n     */\n    protected initAndAttachEventData(): void\n    {\n        const events = this.eventParser.getEventsPerDay(this.events);\n\n        for(const week in this.calendarData)\n        {\n            const weekData = this.calendarData[week];\n\n            for(const day of weekData)\n            {\n                const found = events.find(itm => this.dateApi.getValue(itm[0]).isSame(day.date));\n                day.events = found?.[1] ?? [];\n            }\n        }\n    }\n\n    //######################### ng language server #########################\n\n    /**\n     * Custom input type for `weekDayName` input\n     */\n    public static ngAcceptInputType_weekDayName: keyof typeof MonthCalendarDayFormat;\n\n    /**\n     * Custom input type for `dayAspectRatio` input\n     */\n    public static ngAcceptInputType_dayAspectRatio: keyof typeof CalendarDayAspectRatio|number;\n}","<div *calendarDayTemplate=\"let data\" class=\"default-calendar-day\" [class.is-weekend]=\"data.isWeekend\" [class.is-other-month]=\"!data.isCurrentMonth\">{{data.day}}</div>\n\n<div></div>\n\n<div *ngFor=\"let dayName of weekDayNames\" [class.week-day-name]=\"dayName\">{{dayName}}</div>\n\n<ng-container *ngFor=\"let weekData of calendarData | keyvalue\">\n    <div class=\"week-number\">\n        <ng-container *ngIf=\"showWeekNumber\">{{weekData.key}}</ng-container>\n    </div>\n    \n    <div *ngFor=\"let dayData of weekData.value\" [style.padding-bottom.%]=\"dayAspectRatioValue\" class=\"day-wrapper\">\n        <div class=\"day-content\"><ng-container *ngTemplateOutlet=\"calendarDayTemplate; context: {$implicit: dayData}\"></ng-container></div>\n    </div>\n</ng-container>\n"]}

package/es2022/src/modules/calendar/directives/calendarDayTemplate/calendarDayTemplate.directive.js

@@ -3,7 +3,7 @@ import * as i0 from "@angular/core";
 /**
  * Directive used for obtaining custom calendar day template
  */
-class CalendarDayTemplateDirective {
+export class CalendarDayTemplateDirective {
     template;
     //######################### constructor #########################
     constructor(template) {
@@ -16,14 +16,13 @@ class CalendarDayTemplateDirective {
     static ngTemplateContextGuard(_dir, _ctx) {
         return true;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: CalendarDayTemplateDirective, deps: [{ token: i0.TemplateRef }], target: i0.ɵɵFactoryTarget.Directive });
-    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "16.2.1", type: CalendarDayTemplateDirective, selector: "[calendarDayTemplate]", ngImport: i0 });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: CalendarDayTemplateDirective, deps: [{ token: i0.TemplateRef }], target: i0.ɵɵFactoryTarget.Directive });
+    static ɵdir = i0.ɵɵngDeclareDirective({ minVersion: "14.0.0", version: "17.1.1", type: CalendarDayTemplateDirective, selector: "[calendarDayTemplate]", ngImport: i0 });
 }
-export { CalendarDayTemplateDirective };
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: CalendarDayTemplateDirective, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: CalendarDayTemplateDirective, decorators: [{
             type: Directive,
             args: [{
                     selector: '[calendarDayTemplate]'
                 }]
-        }], ctorParameters: function () { return [{ type: i0.TemplateRef }]; } });
+        }], ctorParameters: () => [{ type: i0.TemplateRef }] });
 //# sourceMappingURL=calendarDayTemplate.directive.js.map

package/es2022/src/modules/calendar/directives/calendarDayTemplate/calendarDayTemplate.directive.js.map

@@ -1 +1 @@
-{"version":3,"file":"calendarDayTemplate.directive.js","sourceRoot":"","sources":["../../../../../../src/modules/calendar/directives/calendarDayTemplate/calendarDayTemplate.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;;AAIrD;;GAEG;AACH,MAIa,4BAA4B;IAGlB;IADnB,iEAAiE;IACjE,YAAmB,QAAgE;QAAhE,aAAQ,GAAR,QAAQ,CAAwD;IAEnF,CAAC;IAED,wEAAwE;IAExE;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,IAAkC,EAAE,IAAa;QAE3E,OAAO,IAAI,CAAC;IAChB,CAAC;uGAfQ,4BAA4B;2FAA5B,4BAA4B;;SAA5B,4BAA4B;2FAA5B,4BAA4B;kBAJxC,SAAS;mBACV;oBACI,QAAQ,EAAE,uBAAuB;iBACpC","sourcesContent":["import {Directive, TemplateRef} from '@angular/core';\n\nimport {CalendarDayTemplateContext} from './calendarDayTemplate.context';\n\n/**\n * Directive used for obtaining custom calendar day template\n */\n@Directive(\n{\n    selector: '[calendarDayTemplate]'\n})\nexport class CalendarDayTemplateDirective<TDate = unknown, TEvent = unknown>\n{\n    //######################### constructor #########################\n    constructor(public template: TemplateRef<CalendarDayTemplateContext<TDate, TEvent>>)\n    {\n    }\n\n    //######################### ng language server #########################\n    \n    /**\n     * Allows typechecking for template\n     */\n    static ngTemplateContextGuard(_dir: CalendarDayTemplateDirective, _ctx: unknown): _ctx is CalendarDayTemplateContext\n    {\n        return true;\n    }\n}"]}
+{"version":3,"file":"calendarDayTemplate.directive.js","sourceRoot":"","sources":["../../../../../../src/modules/calendar/directives/calendarDayTemplate/calendarDayTemplate.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,WAAW,EAAC,MAAM,eAAe,CAAC;;AAIrD;;GAEG;AAKH,MAAM,OAAO,4BAA4B;IAGlB;IADnB,iEAAiE;IACjE,YAAmB,QAAgE;QAAhE,aAAQ,GAAR,QAAQ,CAAwD;IAEnF,CAAC;IAED,wEAAwE;IAExE;;OAEG;IACH,MAAM,CAAC,sBAAsB,CAAC,IAAkC,EAAE,IAAa;QAE3E,OAAO,IAAI,CAAC;IAChB,CAAC;uGAfQ,4BAA4B;2FAA5B,4BAA4B;;2FAA5B,4BAA4B;kBAJxC,SAAS;mBACV;oBACI,QAAQ,EAAE,uBAAuB;iBACpC","sourcesContent":["import {Directive, TemplateRef} from '@angular/core';\n\nimport {CalendarDayTemplateContext} from './calendarDayTemplate.context';\n\n/**\n * Directive used for obtaining custom calendar day template\n */\n@Directive(\n{\n    selector: '[calendarDayTemplate]'\n})\nexport class CalendarDayTemplateDirective<TDate = unknown, TEvent = unknown>\n{\n    //######################### constructor #########################\n    constructor(public template: TemplateRef<CalendarDayTemplateContext<TDate, TEvent>>)\n    {\n    }\n\n    //######################### ng language server #########################\n    \n    /**\n     * Allows typechecking for template\n     */\n    static ngTemplateContextGuard(_dir: CalendarDayTemplateDirective, _ctx: unknown): _ctx is CalendarDayTemplateContext\n    {\n        return true;\n    }\n}"]}

package/es2022/src/modules/calendar/modules/monthCalendar.module.js

@@ -6,15 +6,14 @@ import * as i0 from "@angular/core";
 /**
  * Module used for calendar displaying month
  */
-class MonthCalendarModule {
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: MonthCalendarModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
-    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "16.2.1", ngImport: i0, type: MonthCalendarModule, declarations: [MonthCalendarComponent,
+export class MonthCalendarModule {
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: MonthCalendarModule, deps: [], target: i0.ɵɵFactoryTarget.NgModule });
+    static ɵmod = i0.ɵɵngDeclareNgModule({ minVersion: "14.0.0", version: "17.1.1", ngImport: i0, type: MonthCalendarModule, declarations: [MonthCalendarComponent,
             CalendarDayTemplateDirective], imports: [CommonModule], exports: [MonthCalendarComponent,
             CalendarDayTemplateDirective] });
-    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: MonthCalendarModule, imports: [CommonModule] });
+    static ɵinj = i0.ɵɵngDeclareInjector({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: MonthCalendarModule, imports: [CommonModule] });
 }
-export { MonthCalendarModule };
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: MonthCalendarModule, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: MonthCalendarModule, decorators: [{
             type: NgModule,
             args: [{
                     imports: [

package/es2022/src/modules/calendar/modules/monthCalendar.module.js.map

@@ -1 +1 @@
-{"version":3,"file":"monthCalendar.module.js","sourceRoot":"","sources":["../../../../../src/modules/calendar/modules/monthCalendar.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAC,sBAAsB,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,4BAA4B,EAAC,MAAM,eAAe,CAAC;;AAE3D;;GAEG;AACH,MAiBa,mBAAmB;uGAAnB,mBAAmB;wGAAnB,mBAAmB,iBATxB,sBAAsB;YACtB,4BAA4B,aAL5B,YAAY,aASZ,sBAAsB;YACtB,4BAA4B;wGAGvB,mBAAmB,YAbxB,YAAY;;SAaP,mBAAmB;2FAAnB,mBAAmB;kBAjB/B,QAAQ;mBACT;oBACI,OAAO,EACP;wBACI,YAAY;qBACf;oBACD,YAAY,EACZ;wBACI,sBAAsB;wBACtB,4BAA4B;qBAC/B;oBACD,OAAO,EACP;wBACI,sBAAsB;wBACtB,4BAA4B;qBAC/B;iBACJ","sourcesContent":["import {NgModule} from '@angular/core';\nimport {CommonModule} from '@angular/common';\n\nimport {MonthCalendarComponent} from '../components';\nimport {CalendarDayTemplateDirective} from '../directives';\n\n/**\n * Module used for calendar displaying month\n */\n@NgModule(\n{\n    imports:\n    [\n        CommonModule,\n    ],\n    declarations:\n    [\n        MonthCalendarComponent,\n        CalendarDayTemplateDirective,\n    ],\n    exports:\n    [\n        MonthCalendarComponent,\n        CalendarDayTemplateDirective,\n    ],\n})\nexport class MonthCalendarModule\n{\n}"]}
+{"version":3,"file":"monthCalendar.module.js","sourceRoot":"","sources":["../../../../../src/modules/calendar/modules/monthCalendar.module.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,QAAQ,EAAC,MAAM,eAAe,CAAC;AACvC,OAAO,EAAC,YAAY,EAAC,MAAM,iBAAiB,CAAC;AAE7C,OAAO,EAAC,sBAAsB,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,4BAA4B,EAAC,MAAM,eAAe,CAAC;;AAE3D;;GAEG;AAkBH,MAAM,OAAO,mBAAmB;uGAAnB,mBAAmB;wGAAnB,mBAAmB,iBATxB,sBAAsB;YACtB,4BAA4B,aAL5B,YAAY,aASZ,sBAAsB;YACtB,4BAA4B;wGAGvB,mBAAmB,YAbxB,YAAY;;2FAaP,mBAAmB;kBAjB/B,QAAQ;mBACT;oBACI,OAAO,EACP;wBACI,YAAY;qBACf;oBACD,YAAY,EACZ;wBACI,sBAAsB;wBACtB,4BAA4B;qBAC/B;oBACD,OAAO,EACP;wBACI,sBAAsB;wBACtB,4BAA4B;qBAC/B;iBACJ","sourcesContent":["import {NgModule} from '@angular/core';\nimport {CommonModule} from '@angular/common';\n\nimport {MonthCalendarComponent} from '../components';\nimport {CalendarDayTemplateDirective} from '../directives';\n\n/**\n * Module used for calendar displaying month\n */\n@NgModule(\n{\n    imports:\n    [\n        CommonModule,\n    ],\n    declarations:\n    [\n        MonthCalendarComponent,\n        CalendarDayTemplateDirective,\n    ],\n    exports:\n    [\n        MonthCalendarComponent,\n        CalendarDayTemplateDirective,\n    ],\n})\nexport class MonthCalendarModule\n{\n}"]}

package/es2022/src/modules/calendar/services/eventParser/eventParser.service.js

@@ -4,7 +4,7 @@ import * as i0 from "@angular/core";
 /**
  * Service used for parsing events into events to requested period
  */
-class EventParser {
+export class EventParser {
     dateApi;
     //######################### constructor #########################
     constructor(dateApi) {
@@ -63,14 +63,13 @@ class EventParser {
         }
         return result;
     }
-    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: EventParser, deps: [{ token: DATE_API }], target: i0.ɵɵFactoryTarget.Injectable });
-    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: EventParser });
+    static ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: EventParser, deps: [{ token: DATE_API }], target: i0.ɵɵFactoryTarget.Injectable });
+    static ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: EventParser });
 }
-export { EventParser };
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "16.2.1", ngImport: i0, type: EventParser, decorators: [{
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "17.1.1", ngImport: i0, type: EventParser, decorators: [{
             type: Injectable
-        }], ctorParameters: function () { return [{ type: undefined, decorators: [{
+        }], ctorParameters: () => [{ type: undefined, decorators: [{
                     type: Inject,
                     args: [DATE_API]
-                }] }]; } });
+                }] }] });
 //# sourceMappingURL=eventParser.service.js.map

package/es2022/src/modules/calendar/services/eventParser/eventParser.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"eventParser.service.js","sourceRoot":"","sources":["../../../../../../src/modules/calendar/services/eventParser/eventParser.service.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,MAAM,EAAE,UAAU,EAAC,MAAM,eAAe,CAAC;AAEjD,OAAO,EAAC,QAAQ,EAAC,MAAM,yBAAyB,CAAC;;AAIjD;;GAEG;AACH,MACa,WAAW;IAGoB;IADxC,iEAAiE;IACjE,YAAwC,OAAuB;QAAvB,YAAO,GAAP,OAAO,CAAgB;IAE/D,CAAC;IAED,oEAAoE;IAEpE;;;OAGG;IACI,eAAe,CAAC,MAAkC;QAErD,MAAM,WAAW,GAAG,MAAM,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;YAEjC,OACA;gBACI,IAAI,EAAE,GAAG,CAAC,IAAI;gBACd,QAAQ,EAAE,GAAG,CAAC,QAAQ;gBACtB,MAAM,EAAE,GAAG,CAAC,MAAM;gBAClB,WAAW,EAAE,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC;gBAChD,SAAS,EAAE,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,IAAI;aACnE,CAAC;QACN,CAAC,CAAC,CAAC;QAEH,WAAW,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;YAEtB,IAAG,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,EAC7C;gBACI,OAAO,CAAC,CAAC;aACZ;YAED,IAAG,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAC,CAAC,WAAW,CAAC,KAAK,CAAC,EAC9C;gBACI,OAAO,CAAC,CAAC,CAAC;aACb;YAED,OAAO,CAAC,CAAC;QACb,CAAC,CAAC,CAAC;QAEH,MAAM,MAAM,GAAyD,EAAE,CAAC;QAExE,KAAI,MAAM,KAAK,IAAI,WAAW,EAC9B;YACI,MAAM,QAAQ,GAAG,KAAK,CAAC,WAAW,CAAC,KAAK,EAAE,CAAC,UAAU,EAAE,CAAC;YACxD,MAAM,IAAI,GAA8C,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,IAAI,EAAE,CAAC;YAClH,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;YAE1B,GACA;gBACI,IAAI,IAAI,GAAiE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,QAAQ,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAExH,IAAG,CAAC,IAAI,EACR;oBACI,IAAI,GAAG,CAAC,QAAQ,CAAC,KAAK,EAAE,EAAE,CAAC,CAAC;oBAC5B,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;iBACrB;gBAED,MAAM,KAAK,GAA8C,IAAI,CAAC,CAAC,CAAC,CAAC;gBACjE,KAAK,CAAC,KAAK,CAAC;oBACZ;wBACI,IAAI,EAAE,KAAK,CAAC,IAAI;wBAChB,WAAW,EAAE,KAAK,CAAC,WAAW;wBAC9B,SAAS,EAAE,KAAK,CAAC,SAAS;wBAC1B,QAAQ,EAAE,KAAK,CAAC,QAAQ;wBACxB,MAAM,EAAE,KAAK,CAAC,MAAM;wBACpB,WAAW,EAAE,QAAQ,CAAC,UAAU,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC;wBAC7D,MAAM,EAAE,CAAC,QAAQ,CAAC,MAAM,CAAC,KAAK,CAAC,WAAW,CAAC,IAAI,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,WAAW,CAAC,CAAC;4BAC3E,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC;wBAChH,SAAS,EAAE,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC;qBACrE,CAAC;gBAEF,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,UAAU,EAAE,CAAC;aACpC,QACK,CAAC,CAAC,KAAK,CAAC,SAAS,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,SAAS,CAAC,CAAC,EAAE;SAC3G;QAED,OAAO,MAAM,CAAC;IAClB,CAAC;uGAhFQ,WAAW,kBAGA,QAAQ;2GAHnB,WAAW;;SAAX,WAAW;2FAAX,WAAW;kBADvB,UAAU;;0BAIM,MAAM;2BAAC,QAAQ","sourcesContent":["import {Inject, Injectable} from '@angular/core';\n\nimport {DATE_API} from '../../../../misc/tokens';\nimport {DateApi} from '../../../../services';\nimport {CalendarEventDayMetadata, EventData, ɵEventData} from '../../interfaces';\n\n/**\n * Service used for parsing events into events to requested period\n */\n@Injectable()\nexport class EventParser<TDate = unknown, TEvent = unknown>\n{\n    //######################### constructor #########################\n    constructor(@Inject(DATE_API) protected dateApi: DateApi<TDate>,)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Gets events parsed per day\n     * @param events - Array of events to be parsed\n     */\n    public getEventsPerDay(events: EventData<TDate, TEvent>[]): [TDate, CalendarEventDayMetadata<TDate, TEvent>[]][]\n    {\n        const eventsLocal = events.map(itm =>\n        {\n            return <ɵEventData<TDate, TEvent>>\n            {\n                data: itm.data,\n                dateFrom: itm.dateFrom,\n                dateTo: itm.dateTo,\n                dateApiFrom: this.dateApi.getValue(itm.dateFrom),\n                dateApiTo: itm.dateTo ? this.dateApi.getValue(itm.dateTo) : null,\n            };\n        });\n\n        eventsLocal.sort((a, b) =>\n        {\n            if(a.dateApiFrom.isAfter(b.dateApiFrom.value))\n            {\n                return 1;\n            }\n\n            if(a.dateApiFrom.isBefore(b.dateApiFrom.value))\n            {\n                return -1;\n            }\n\n            return 0;\n        });\n\n        const result: [TDate, CalendarEventDayMetadata<TDate, TEvent>[]][] = [];\n\n        for(const event of eventsLocal)\n        {\n            const workDate = event.dateApiFrom.clone().startOfDay();\n            const data: CalendarEventDayMetadata<TDate, TEvent>[] = result.find(itm => workDate.isSameDay(itm[0]))?.[1] ?? [];\n            const index = data.length;\n\n            do\n            {\n                let data: [TDate, CalendarEventDayMetadata<TDate, TEvent>[]]|undefined = result.find(itm => workDate.isSameDay(itm[0]));\n\n                if(!data)\n                {\n                    data = [workDate.value, []];\n                    result.push(data);\n                }\n\n                const evnts: CalendarEventDayMetadata<TDate, TEvent>[] = data[1];\n                evnts[index] =\n                {\n                    data: event.data,\n                    dateApiFrom: event.dateApiFrom,\n                    dateApiTo: event.dateApiTo,\n                    dateFrom: event.dateFrom,\n                    dateTo: event.dateTo,\n                    onGoingFrom: workDate.startOfDay().isAfter(event.dateApiFrom),\n                    allDay: (workDate.isSame(event.dateApiFrom) || workDate.isAfter(event.dateApiFrom)) &&\n                            !!event.dateApiTo && (workDate.endOfDay().isSame(event.dateApiTo) || workDate.isBefore(event.dateApiTo)),\n                    onGoingTo: !!event.dateApiTo && workDate.isBefore(event.dateApiTo),\n                };\n                \n                workDate.addDays(1).startOfDay();\n            }\n            while(!!event.dateApiTo && (workDate.isBefore(event.dateApiTo) || workDate.isSameDay(event.dateApiTo)));\n        }\n\n        return result;\n    }\n}"]}
+{"version":3,"file":"eventParser.service.js","sourceRoot":"","sources":["../../../../../../src/modules/calendar/services/eventParser/eventParser.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Inject, Injectable} from '@angular/core';\n\nimport {DATE_API} from '../../../../misc/tokens';\nimport {DateApi} from '../../../../services';\nimport {CalendarEventDayMetadata, EventData, ɵEventData} from '../../interfaces';\n\n/**\n * Service used for parsing events into events to requested period\n */\n@Injectable()\nexport class EventParser<TDate = unknown, TEvent = unknown>\n{\n    //######################### constructor #########################\n    constructor(@Inject(DATE_API) protected dateApi: DateApi<TDate>,)\n    {\n    }\n\n    //######################### public methods #########################\n\n    /**\n     * Gets events parsed per day\n     * @param events - Array of events to be parsed\n     */\n    public getEventsPerDay(events: EventData<TDate, TEvent>[]): [TDate, CalendarEventDayMetadata<TDate, TEvent>[]][]\n    {\n        const eventsLocal = events.map(itm =>\n        {\n            return <ɵEventData<TDate, TEvent>>\n            {\n                data: itm.data,\n                dateFrom: itm.dateFrom,\n                dateTo: itm.dateTo,\n                dateApiFrom: this.dateApi.getValue(itm.dateFrom),\n                dateApiTo: itm.dateTo ? this.dateApi.getValue(itm.dateTo) : null,\n            };\n        });\n\n        eventsLocal.sort((a, b) =>\n        {\n            if(a.dateApiFrom.isAfter(b.dateApiFrom.value))\n            {\n                return 1;\n            }\n\n            if(a.dateApiFrom.isBefore(b.dateApiFrom.value))\n            {\n                return -1;\n            }\n\n            return 0;\n        });\n\n        const result: [TDate, CalendarEventDayMetadata<TDate, TEvent>[]][] = [];\n\n        for(const event of eventsLocal)\n        {\n            const workDate = event.dateApiFrom.clone().startOfDay();\n            const data: CalendarEventDayMetadata<TDate, TEvent>[] = result.find(itm => workDate.isSameDay(itm[0]))?.[1] ?? [];\n            const index = data.length;\n\n            do\n            {\n                let data: [TDate, CalendarEventDayMetadata<TDate, TEvent>[]]|undefined = result.find(itm => workDate.isSameDay(itm[0]));\n\n                if(!data)\n                {\n                    data = [workDate.value, []];\n                    result.push(data);\n                }\n\n                const evnts: CalendarEventDayMetadata<TDate, TEvent>[] = data[1];\n                evnts[index] =\n                {\n                    data: event.data,\n                    dateApiFrom: event.dateApiFrom,\n                    dateApiTo: event.dateApiTo,\n                    dateFrom: event.dateFrom,\n                    dateTo: event.dateTo,\n                    onGoingFrom: workDate.startOfDay().isAfter(event.dateApiFrom),\n                    allDay: (workDate.isSame(event.dateApiFrom) || workDate.isAfter(event.dateApiFrom)) &&\n                            !!event.dateApiTo && (workDate.endOfDay().isSame(event.dateApiTo) || workDate.isBefore(event.dateApiTo)),\n                    onGoingTo: !!event.dateApiTo && workDate.isBefore(event.dateApiTo),\n                };\n                \n                workDate.addDays(1).startOfDay();\n            }\n            while(!!event.dateApiTo && (workDate.isBefore(event.dateApiTo) || workDate.isSameDay(event.dateApiTo)));\n        }\n\n        return result;\n    }\n}"]}