@anglr/datetime 6.0.0-beta.20221222085135 → 6.0.0-beta.20221223060503

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

@@ -1 +1 @@
-{"version":3,"file":"datePositionParser.service.js","sourceRoot":"","sources":["../../../../src/services/datePositionParser/datePositionParser.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable} from '@angular/core';\nimport {isBlank} from '@jscrpt/common';\n\nimport {DatePositionParser, DatePositionParserResult} from './datePositionParser.interface';\n\n/**\n * Service used for parsing date\n */\n@Injectable({providedIn: 'root'})\nexport class DatePositionParserService\n{\n    //######################### public methods #########################\n\n    /**\n     * Creates parser instance for specified format\n     * @param format - Format to be used for parsing date string\n     */\n    public createParser(format: string): DatePositionParser\n    {\n        return new DefaultDatePositionParser(format);\n    }\n}\n\n/**\n * Default implementation of DatePositionParser\n */\nexport class DefaultDatePositionParser implements DatePositionParser\n{\n    //######################### protected fields #########################\n\n    /**\n     * Indication whether format contains separators\n     */\n    protected _hasSeparator: boolean = false;\n\n    /**\n     * Array of date parts of parsed date format\n     */\n    protected _datePartsIndexes: string[] = [];\n\n    /**\n     * Object storing indexes for strict date parts of parsed date format\n     */\n    protected _strictDatePartsIndexes: {[index: number]: {part: string, length: number}} = {};\n\n    //######################### constructor #########################\n    constructor(protected _format: string)\n    {\n        this._initialize();\n    }\n\n    //######################### public methods - implementation of DatePositionParser #########################\n\n    /**\n     * Parse date as string and returns information about position and selected part of date, while moving it to next part, if it was last part returns null\n     * @param date - String date to be parsed\n     * @param cursorPosition - Current cursor position\n     */\n    public next(date: string|null|undefined, cursorPosition: number): null|DatePositionParserResult\n    {\n        if(isBlank(date))\n        {\n            return null;\n        }\n\n        //non strict format\n        if(this._hasSeparator)\n        {\n            let useNext = false;\n\n            while(true)\n            {\n                if(cursorPosition == date.length)\n                {\n                    return null;\n                }\n\n                if(useNext && !isNaN(+date[cursorPosition]))\n                {\n                    return this.parse(date, cursorPosition);\n                }\n\n                if(isNaN(+date[cursorPosition]))\n                {\n                    useNext = true;\n                }\n\n                cursorPosition++;\n            }\n        }\n        //strict format\n        else\n        {\n            const indexes = Object.keys(this._strictDatePartsIndexes).map(itm => +itm);\n\n            for(const index of indexes)\n            {\n                if(cursorPosition < index)\n                {\n                    return {\n                        part: this._strictDatePartsIndexes[index].part,\n                        positionFrom: index,\n                        positionTo: index + this._strictDatePartsIndexes[index].length\n                    };\n                }\n            }\n        }\n\n        return null;\n    }\n\n    /**\n     * Parse date as string and returns information about position and selected part of date, while moving it to previous part, if it was first part returns null\n     * @param date - String date to be parsed\n     * @param cursorPosition - Current cursor position\n     */\n    public previous(date: string|null|undefined, cursorPosition: number): null|DatePositionParserResult\n    {\n        if(isBlank(date))\n        {\n            return null;\n        }\n\n        //non strict format\n        if(this._hasSeparator)\n        {\n            let useNext = false;\n\n            while(true)\n            {\n                if(cursorPosition < 0)\n                {\n                    return null;\n                }\n\n                if(useNext && !isNaN(+date[cursorPosition]))\n                {\n                    return this.parse(date, cursorPosition);\n                }\n\n                if(isNaN(+date[cursorPosition]))\n                {\n                    useNext = true;\n                }\n\n                cursorPosition--;\n            }\n        }\n        //strict format\n        else\n        {\n            const indexes = Object.keys(this._strictDatePartsIndexes).reverse().map(itm => +itm);\n\n            for(const index of indexes)\n            {\n                if(cursorPosition > index)\n                {\n                    return {\n                        part: this._strictDatePartsIndexes[index].part,\n                        positionFrom: index,\n                        positionTo: index + this._strictDatePartsIndexes[index].length\n                    };\n                }\n            }\n        }\n\n        return null;\n    }\n\n    /**\n     * Parse date as string and returns information about positions and selected part of date\n     * @param date - String date to be parsed\n     * @param cursorPosition - Current cursor position\n     */\n    public parse(date: string|null|undefined, cursorPosition: number): DatePositionParserResult\n    {\n        if(isBlank(date))\n        {\n            return {\n                part: '',\n                positionFrom: 0,\n                positionTo: 0\n            };\n        }\n\n        //non strict format\n        if(this._hasSeparator)\n        {\n            //fix cursor position if is clicked on separator\n            if(cursorPosition != date.length &&\n               /[^0-9ɵ]/.test(date[cursorPosition]) &&\n               /[^0-9ɵ]/.test(date[cursorPosition - 1]))\n            {\n                let breakCycle = false;\n                cursorPosition++;\n\n                while(/[^0-9ɵ]/.test(date[cursorPosition]))\n                {\n                    if(cursorPosition >= date.length)\n                    {\n                        if(breakCycle)\n                        {\n                            return {\n                                part: '',\n                                positionFrom: 0,\n                                positionTo: 0\n                            };\n                        }\n\n                        breakCycle = true;\n                        cursorPosition = 0;\n                    }\n\n                    cursorPosition++;\n                }\n            }\n\n            const updateDate = [date.substr(0, cursorPosition), 'ɵ', date.substr(cursorPosition)].join('');\n            const indexed = updateDate.replace(/[^0-9ɵ]/g, ' ').split(' ');\n            let partIndex = 0;\n            let startPosition = 0;\n            let selectionLength = 0;\n\n            for(const itm of indexed)\n            {\n                //this segment contains cursor\n                if(itm.indexOf('ɵ') >= 0)\n                {\n                    selectionLength = itm.length - 1;\n\n                    break;\n                }\n\n                startPosition++;\n\n                //separator\n                if(!itm.length)\n                {\n                    continue;\n                }\n\n                partIndex++;\n                startPosition += itm.length;\n            }\n\n            return {\n                part: this._datePartsIndexes[partIndex],\n                positionFrom: startPosition,\n                positionTo: startPosition + selectionLength\n            };\n        }\n        //strict format\n        else\n        {\n            const indexes = Object.keys(this._strictDatePartsIndexes).reverse().map(itm => +itm);\n\n            for(const index of indexes)\n            {\n                if(cursorPosition >= index)\n                {\n                    return {\n                        part: this._strictDatePartsIndexes[index].part,\n                        positionFrom: index,\n                        positionTo: index + this._strictDatePartsIndexes[index].length\n                    };\n                }\n            }\n        }\n\n        return {\n            part: '',\n            positionFrom: 0,\n            positionTo: 0\n        };\n    }\n\n    /**\n     * Initialize parser, process format\n     */\n    protected _initialize(): void\n    {\n        this._hasSeparator = /[^yqmwdhs]/i.test(this._format);\n\n        //non strict format\n        if(this._hasSeparator)\n        {\n            this._datePartsIndexes = this._format.replace(/[^yqmwdhs]+/gi, ' ')\n                .split(' ')\n                .filter(itm => !!itm)\n                .map(itm => itm[0]);\n        }\n        //strict format\n        else\n        {\n            let lastPart: string|null = null;\n            let lastIndex: number = 0;\n\n            for(let x = 0; x < this._format.length; x++)\n            {\n                //next part\n                if(this._format[x] != lastPart)\n                {\n                    if(x > 0)\n                    {\n                        this._strictDatePartsIndexes[lastIndex].length = x - lastIndex;\n                    }\n\n                    lastIndex = x;\n                    lastPart = this._format[x];\n\n                    this._strictDatePartsIndexes[x] =\n                    {\n                        length: 0,\n                        part: this._format[x]\n                    };\n                }\n            }\n\n            this._strictDatePartsIndexes[lastIndex].length = this._format.length - lastIndex;\n        }\n    }\n}"]}
+{"version":3,"file":"datePositionParser.service.js","sourceRoot":"","sources":["../../../../src/services/datePositionParser/datePositionParser.service.ts"],"names":[],"mappings":"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","sourcesContent":["import {Injectable} from '@angular/core';\nimport {isBlank} from '@jscrpt/common';\n\nimport {DatePositionParser, DatePositionParserResult} from './datePositionParser.interface';\n\n/**\n * Service used for parsing date\n */\n@Injectable({providedIn: 'root'})\nexport class DatePositionParserService\n{\n    //######################### public methods #########################\n\n    /**\n     * Creates parser instance for specified format\n     * @param format - Format to be used for parsing date string\n     */\n    public createParser(format: string): DatePositionParser\n    {\n        return new DefaultDatePositionParser(format);\n    }\n}\n\n/**\n * Default implementation of DatePositionParser\n */\nexport class DefaultDatePositionParser implements DatePositionParser\n{\n    //######################### protected fields #########################\n\n    /**\n     * Indication whether format contains separators\n     */\n    protected _hasSeparator: boolean = false;\n\n    /**\n     * Array of date parts of parsed date format\n     */\n    protected _datePartsIndexes: string[] = [];\n\n    /**\n     * Object storing indexes for strict date parts of parsed date format\n     */\n    protected _strictDatePartsIndexes: {[index: number]: {part: string, length: number}} = {};\n\n    //######################### constructor #########################\n    constructor(protected _format: string)\n    {\n        this._initialize();\n    }\n\n    //######################### public methods - implementation of DatePositionParser #########################\n\n    /**\n     * Parse date as string and returns information about position and selected part of date, while moving it to next part, if it was last part returns null\n     * @param date - String date to be parsed\n     * @param cursorPosition - Current cursor position\n     */\n    public next(date: string|null|undefined, cursorPosition: number): null|DatePositionParserResult\n    {\n        if(isBlank(date))\n        {\n            return null;\n        }\n\n        //non strict format\n        if(this._hasSeparator)\n        {\n            let useNext = false;\n\n            // eslint-disable-next-line no-constant-condition\n            while(true)\n            {\n                if(cursorPosition == date.length)\n                {\n                    return null;\n                }\n\n                if(useNext && !isNaN(+date[cursorPosition]))\n                {\n                    return this.parse(date, cursorPosition);\n                }\n\n                if(isNaN(+date[cursorPosition]))\n                {\n                    useNext = true;\n                }\n\n                cursorPosition++;\n            }\n        }\n        //strict format\n        else\n        {\n            const indexes = Object.keys(this._strictDatePartsIndexes).map(itm => +itm);\n\n            for(const index of indexes)\n            {\n                if(cursorPosition < index)\n                {\n                    return {\n                        part: this._strictDatePartsIndexes[index].part,\n                        positionFrom: index,\n                        positionTo: index + this._strictDatePartsIndexes[index].length\n                    };\n                }\n            }\n        }\n\n        return null;\n    }\n\n    /**\n     * Parse date as string and returns information about position and selected part of date, while moving it to previous part, if it was first part returns null\n     * @param date - String date to be parsed\n     * @param cursorPosition - Current cursor position\n     */\n    public previous(date: string|null|undefined, cursorPosition: number): null|DatePositionParserResult\n    {\n        if(isBlank(date))\n        {\n            return null;\n        }\n\n        //non strict format\n        if(this._hasSeparator)\n        {\n            let useNext = false;\n\n            // eslint-disable-next-line no-constant-condition\n            while(true)\n            {\n                if(cursorPosition < 0)\n                {\n                    return null;\n                }\n\n                if(useNext && !isNaN(+date[cursorPosition]))\n                {\n                    return this.parse(date, cursorPosition);\n                }\n\n                if(isNaN(+date[cursorPosition]))\n                {\n                    useNext = true;\n                }\n\n                cursorPosition--;\n            }\n        }\n        //strict format\n        else\n        {\n            const indexes = Object.keys(this._strictDatePartsIndexes).reverse().map(itm => +itm);\n\n            for(const index of indexes)\n            {\n                if(cursorPosition > index)\n                {\n                    return {\n                        part: this._strictDatePartsIndexes[index].part,\n                        positionFrom: index,\n                        positionTo: index + this._strictDatePartsIndexes[index].length\n                    };\n                }\n            }\n        }\n\n        return null;\n    }\n\n    /**\n     * Parse date as string and returns information about positions and selected part of date\n     * @param date - String date to be parsed\n     * @param cursorPosition - Current cursor position\n     */\n    public parse(date: string|null|undefined, cursorPosition: number): DatePositionParserResult\n    {\n        if(isBlank(date))\n        {\n            return {\n                part: '',\n                positionFrom: 0,\n                positionTo: 0\n            };\n        }\n\n        //non strict format\n        if(this._hasSeparator)\n        {\n            //fix cursor position if is clicked on separator\n            if(cursorPosition != date.length &&\n               /[^0-9ɵ]/.test(date[cursorPosition]) &&\n               /[^0-9ɵ]/.test(date[cursorPosition - 1]))\n            {\n                let breakCycle = false;\n                cursorPosition++;\n\n                while(/[^0-9ɵ]/.test(date[cursorPosition]))\n                {\n                    if(cursorPosition >= date.length)\n                    {\n                        if(breakCycle)\n                        {\n                            return {\n                                part: '',\n                                positionFrom: 0,\n                                positionTo: 0\n                            };\n                        }\n\n                        breakCycle = true;\n                        cursorPosition = 0;\n                    }\n\n                    cursorPosition++;\n                }\n            }\n\n            const updateDate = [date.substr(0, cursorPosition), 'ɵ', date.substr(cursorPosition)].join('');\n            const indexed = updateDate.replace(/[^0-9ɵ]/g, ' ').split(' ');\n            let partIndex = 0;\n            let startPosition = 0;\n            let selectionLength = 0;\n\n            for(const itm of indexed)\n            {\n                //this segment contains cursor\n                if(itm.indexOf('ɵ') >= 0)\n                {\n                    selectionLength = itm.length - 1;\n\n                    break;\n                }\n\n                startPosition++;\n\n                //separator\n                if(!itm.length)\n                {\n                    continue;\n                }\n\n                partIndex++;\n                startPosition += itm.length;\n            }\n\n            return {\n                part: this._datePartsIndexes[partIndex],\n                positionFrom: startPosition,\n                positionTo: startPosition + selectionLength\n            };\n        }\n        //strict format\n        else\n        {\n            const indexes = Object.keys(this._strictDatePartsIndexes).reverse().map(itm => +itm);\n\n            for(const index of indexes)\n            {\n                if(cursorPosition >= index)\n                {\n                    return {\n                        part: this._strictDatePartsIndexes[index].part,\n                        positionFrom: index,\n                        positionTo: index + this._strictDatePartsIndexes[index].length\n                    };\n                }\n            }\n        }\n\n        return {\n            part: '',\n            positionFrom: 0,\n            positionTo: 0\n        };\n    }\n\n    /**\n     * Initialize parser, process format\n     */\n    protected _initialize(): void\n    {\n        this._hasSeparator = /[^yqmwdhs]/i.test(this._format);\n\n        //non strict format\n        if(this._hasSeparator)\n        {\n            this._datePartsIndexes = this._format.replace(/[^yqmwdhs]+/gi, ' ')\n                .split(' ')\n                .filter(itm => !!itm)\n                .map(itm => itm[0]);\n        }\n        //strict format\n        else\n        {\n            let lastPart: string|null = null;\n            let lastIndex: number = 0;\n\n            for(let x = 0; x < this._format.length; x++)\n            {\n                //next part\n                if(this._format[x] != lastPart)\n                {\n                    if(x > 0)\n                    {\n                        this._strictDatePartsIndexes[lastIndex].length = x - lastIndex;\n                    }\n\n                    lastIndex = x;\n                    lastPart = this._format[x];\n\n                    this._strictDatePartsIndexes[x] =\n                    {\n                        length: 0,\n                        part: this._format[x]\n                    };\n                }\n            }\n\n            this._strictDatePartsIndexes[lastIndex].length = this._format.length - lastIndex;\n        }\n    }\n}"]}

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

@@ -71,9 +71,9 @@ export class DateTimeRelativeParser {
         return value;
     }
 }
-DateTimeRelativeParser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateTimeRelativeParser, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
-DateTimeRelativeParser.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateTimeRelativeParser, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateTimeRelativeParser, decorators: [{
+DateTimeRelativeParser.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: DateTimeRelativeParser, deps: [{ token: i0.Injector }], target: i0.ɵɵFactoryTarget.Injectable });
+DateTimeRelativeParser.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: DateTimeRelativeParser, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: DateTimeRelativeParser, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return [{ type: i0.Injector }]; } });

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

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

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

@@ -57,9 +57,9 @@ export class DateValueProvider {
         };
     }
 }
-DateValueProvider.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateValueProvider, deps: [{ token: DATE_API }], target: i0.ɵɵFactoryTarget.Injectable });
-DateValueProvider.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateValueProvider, providedIn: 'root' });
-i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "14.2.6", ngImport: i0, type: DateValueProvider, decorators: [{
+DateValueProvider.ɵfac = i0.ɵɵngDeclareFactory({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: DateValueProvider, deps: [{ token: DATE_API }], target: i0.ɵɵFactoryTarget.Injectable });
+DateValueProvider.ɵprov = i0.ɵɵngDeclareInjectable({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: DateValueProvider, providedIn: 'root' });
+i0.ɵɵngDeclareClassMetadata({ minVersion: "12.0.0", version: "15.0.4", ngImport: i0, type: DateValueProvider, decorators: [{
             type: Injectable,
             args: [{ providedIn: 'root' }]
         }], ctorParameters: function () { return [{ type: undefined, decorators: [{

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

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

package/moment/src/services/momentDateApi.service.d.ts

@@ -1,5 +1,5 @@
 import { ValueProvider } from '@angular/core';
-import { DateApi, DateValue, DateApiObject, DateTimeRelativeParser, DateApiObjectCtor } from '@anglr/datetime';
+import { DateApi, DateValue, DateApiObject, DateTimeRelativeParser, DateApiObjectCtor, DateObject } from '@anglr/datetime';
 import moment from 'moment';
 import * as i0 from "@angular/core";
 /**
@@ -36,6 +36,10 @@ export declare class MomentDateApiObject implements DateApiObject<moment.Moment>
      * @param format - Format token used for creating formatted string
      */
     format(format: string): string;
+    /**
+     * @inheritdoc
+     */
+    formatISO(): string;
     /**
      * @inheritdoc
      */
@@ -244,42 +248,46 @@ export declare class MomentDateApiObject implements DateApiObject<moment.Moment>
      * Gets indication whether current value is before 'date'
      * @param date - Date which is this date compared to
      */
-    isBefore(date: moment.Moment): boolean;
+    isBefore(date: DateObject<moment.Moment>): boolean;
     /**
      * Gets indication whether current value is after 'date'
      * @param date - Date which is this date compared to
      */
-    isAfter(date: moment.Moment): boolean;
+    isAfter(date: DateObject<moment.Moment>): boolean;
     /**
      * Gets number of days between this and provided date
      * @param date - Date which is used for computation of diff against
      */
-    diffDays(date: moment.Moment): number;
+    diffDays(date: DateObject<moment.Moment>): number;
     /**
      * Compares whether this date is same week as provided date
      * @param date - Date which is used for comparison of same week
      */
-    isSameWeek(date: moment.Moment): boolean;
+    isSameWeek(date: DateObject<moment.Moment>): boolean;
     /**
      * Compares whether this date is same decade as provided date
      * @param date - Date which is used for comparison of same decade
      */
-    isSameDecade(date: moment.Moment): boolean;
+    isSameDecade(date: DateObject<moment.Moment>): boolean;
     /**
      * Compares whether this date is same year as provided date
      * @param date - Date which is used for comparison of same year
      */
-    isSameYear(date: moment.Moment): boolean;
+    isSameYear(date: DateObject<moment.Moment>): boolean;
     /**
      * Compares whether this date is same month as provided date
      * @param date - Date which is used for comparison of same month
      */
-    isSameMonth(date: moment.Moment): boolean;
+    isSameMonth(date: DateObject<moment.Moment>): boolean;
     /**
      * Compares whether this date is same day as provided date
      * @param date - Date which is used for comparison of same day
      */
-    isSameDay(date: moment.Moment): boolean;
+    isSameDay(date: DateObject<moment.Moment>): boolean;
+    /**
+     * @inheritdoc
+     */
+    isSame(date: DateObject<moment.Moment>): boolean;
     /**
      * Creates clone of this instance, value and originalValue have same value and are cloned from value
      */
@@ -299,14 +307,19 @@ export declare class MomentDateApiObject implements DateApiObject<moment.Moment>
      * @returns Itself for fluent API
      */
     resetOriginal(): DateApiObject<moment.Moment>;
+    /**
+     * Converts date object to date
+     * @param value - Value to be converted to date
+     */
+    protected getDate(value: DateObject<moment.Moment>): moment.Moment;
 }
 /**
  * Date api using MomentJS, used for obtaining DateApi wrapper object
  */
 export declare class MomentDateApi implements DateApi<moment.Moment> {
     protected _relativeParser: DateTimeRelativeParser<moment.Moment>;
-    protected _dateApiObjecType: DateApiObjectCtor<MomentDateApiObject, moment.Moment>;
-    constructor(_relativeParser: DateTimeRelativeParser<moment.Moment>, _dateApiObjecType: DateApiObjectCtor<MomentDateApiObject, moment.Moment>);
+    protected _dateApiObjecType: DateApiObjectCtor<moment.Moment, MomentDateApiObject>;
+    constructor(_relativeParser: DateTimeRelativeParser<moment.Moment>, _dateApiObjecType: DateApiObjectCtor<moment.Moment, MomentDateApiObject>);
     /**
      * Gets wrapping object used for manipulation
      * @param value - Value to be converted (parsed) and used for manipulation
@@ -340,7 +353,7 @@ export declare class MomentDateApi implements DateApi<moment.Moment> {
 /**
  * Type that represents creation of DateApiObject for moment
  */
-export declare const momentDateApiObjectType: DateApiObjectCtor<MomentDateApiObject, moment.Moment>;
+export declare const momentDateApiObjectType: DateApiObjectCtor<moment.Moment, MomentDateApiObject>;
 /**
  * Injection token used for injecting type that creates instance of DateApiObject for moment
  */

package/moment/src/services/momentDateApi.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"momentDateApi.service.d.ts","sourceRoot":"","sources":["momentDateApi.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"momentDateApi.service.d.ts","sourceRoot":"","sources":["momentDateApi.service.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@anglr/datetime",
-    "version": "6.0.0-beta.20221222085135",
+    "version": "6.0.0-beta.20221223060503",
     "description": "Angular library for datetime manipulation components",
     "type": "module",
     "sideEffects": false,
@@ -42,7 +42,7 @@
         "doc:api:date-fns": "copyfiles -u 2 date-fns/temp/datetime-date-fns.api.md docs/content/api/ng-datetime-date-fns && rimraf date-fns/temp"
     },
     "engines": {
-        "node": "^14.15.0 || >=16.10.0",
+        "node": "^14.20.0 || ^16.13.0 || >=18.10.0",
         "npm": "^6.10.0"
     },
     "repository": {
@@ -62,52 +62,52 @@
     },
     "homepage": "https://github.com/ressurectit/ng-datetime",
     "peerDependencies": {
-        "@angular/core": ">=14.2.6",
-        "@angular/common": ">=14.2.6",
-        "@angular/forms": ">=14.2.6",
-        "@angular/animations": ">=14.2.6",
+        "@angular/core": ">=15.0.4",
+        "@angular/common": ">=15.0.4",
+        "@angular/forms": ">=15.0.4",
+        "@angular/animations": ">=15.0.4",
         "rxjs": ">=7.5.6",
-        "@jscrpt/common": ">=3.1.0",
-        "@anglr/common": ">=14.1.0",
+        "@jscrpt/common": ">=3.3.0",
+        "@anglr/common": ">=15.0.1",
         "moment": "^2.29.4",
         "date-fns": "^2.29.3",
-        "tslib": "^2.4.0"
+        "tslib": "^2.4.1"
     },
     "devDependencies": {
-        "@angular/core": "^14.2.6",
-        "@angular/common": "^14.2.6",
-        "@angular/forms": "^14.2.6",
-        "@angular/animations": "^14.2.6",
+        "@angular/core": "^15.0.4",
+        "@angular/common": "^15.0.4",
+        "@angular/forms": "^15.0.4",
+        "@angular/animations": "^15.0.4",
         "rxjs": "^7.5.6",
-        "@jscrpt/common": "^3.1.0",
-        "@anglr/common": "^14.1.0",
+        "@jscrpt/common": "^3.3.0",
+        "@anglr/common": "^15.0.1",
         "@types/node": "14.14.31",
         "moment": "^2.29.4",
         "date-fns": "^2.29.3",
-        "@angular/compiler-cli": "^14.2.6",
-        "@angular/compiler": "^14.2.6",
-        "@angular/language-service": "^14.2.6",
+        "@angular/compiler-cli": "^15.0.4",
+        "@angular/compiler": "^15.0.4",
+        "@angular/language-service": "^15.0.4",
         "@microsoft/api-extractor": "7.19.2",
         "@microsoft/api-documenter": "7.13.77",
-        "tslib": "2.4.0",
+        "tslib": "2.4.1",
         "eslint": "7.32.0",
         "@typescript-eslint/eslint-plugin": "4.33.0",
         "@typescript-eslint/parser": "4.33.0",
         "eslint-plugin-ressurectit": "0.1.0",
         "eslint-plugin-jest": "26.1.1",
-        "jest": "29.2.0",
+        "jest": "29.3.1",
         "ts-jest": "29.0.3",
-        "jest-preset-angular": "12.2.2",
-        "@types/jest": "29.1.2",
-        "zone.js": "0.11.8",
-        "@angular/platform-browser-dynamic": "^14.2.6",
-        "@angular/platform-browser": "^14.2.6",
+        "jest-preset-angular": "12.2.3",
+        "@types/jest": "29.2.4",
+        "zone.js": "0.12.0",
+        "@angular/platform-browser-dynamic": "^15.0.4",
+        "@angular/platform-browser": "^15.0.4",
         "@anglr/animations": "^9.1.0",
         "rimraf": "3.0.2",
         "copyfiles": "2.4.1",
-        "replace-in-file": "6.3.2",
+        "replace-in-file": "6.3.5",
         "path-exists-cli": "2.0.0",
-        "typescript": "4.7.2",
+        "typescript": "4.8.4",
         "npm-git-version": "2.0.0"
     },
     "esm2020": "./es2020/src/index.js",
@@ -125,15 +125,6 @@
         "./styles/themes/*": {
             "sass": "./styles/themes/*.scss"
         },
-        "./src/theme.scss": {
-            "sass": "./src/theme.scss"
-        },
-        "./src/dark.scss": {
-            "sass": "./src/dark.scss"
-        },
-        "./src/default.scss": {
-            "sass": "./src/default.scss"
-        },
         ".": {
             "types": "./src/index.d.ts",
             "esm2020": "./es2020/src/index.js",

package/src/directives/index.d.ts

@@ -1,3 +1,4 @@
+export * from './simpleDatePickerInput/simpleDatePickerInput.directive';
 export * from './withTime/withTime.directive';
 export * from './withToday/withToday.directive';
 //# sourceMappingURL=index.d.ts.map

package/src/directives/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,yDAAyD,CAAC;AACxE,cAAc,+BAA+B,CAAC;AAC9C,cAAc,iCAAiC,CAAC"}

package/src/directives/simpleDatePickerInput/simpleDatePickerInput.directive.d.ts

@@ -0,0 +1,11 @@
+import * as i0 from "@angular/core";
+import * as i1 from "../../modules/dateTimePicker/directives/dateTimePicker/dateTimePicker.directive";
+import * as i2 from "../../modules/dateTime/directives/dateTimeInput/dateTimeInput.directive";
+/**
+ * Directive that combines date picker with simple date time input
+ */
+export declare class DatePickerInputSADirective {
+    static ɵfac: i0.ɵɵFactoryDeclaration<DatePickerInputSADirective, never>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<DatePickerInputSADirective, "input[dateTime][simpleDatePickerInput]", never, {}, {}, never, never, true, [{ directive: typeof i1.DateTimePickerSADirective; inputs: { "withPickerOptions": "withPickerOptions"; "pickerOptions": "pickerOptions"; }; outputs: {}; }, { directive: typeof i2.DateTimeInputSADirective; inputs: {}; outputs: {}; }]>;
+}
+//# sourceMappingURL=simpleDatePickerInput.directive.d.ts.map

package/src/directives/simpleDatePickerInput/simpleDatePickerInput.directive.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"simpleDatePickerInput.directive.d.ts","sourceRoot":"","sources":["simpleDatePickerInput.directive.ts"],"names":[],"mappings":";;;AAIA;;GAEG;AACH,qBAmBa,0BAA0B;yCAA1B,0BAA0B;2CAA1B,0BAA0B;CAEtC"}

package/src/directives/withTime/withTime.directive.d.ts

@@ -1,11 +1,11 @@
-import { DateTimePickerDirective, DateTimeDirective } from '../../modules';
+import { DateTimePickerSADirective, DateTimeSADirective } from '../../modules';
 import * as i0 from "@angular/core";
 /**
  * Directive that sets up usage of date time picker to use time format and time picker
  */
 export declare class WithTimeSADirective<TDate = unknown> {
-    constructor(picker: DateTimePickerDirective<TDate>, dateTime: DateTimeDirective<TDate>);
+    constructor(picker: DateTimePickerSADirective<TDate>, dateTime: DateTimeSADirective<TDate>);
     static ɵfac: i0.ɵɵFactoryDeclaration<WithTimeSADirective<any>, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<WithTimeSADirective<any>, "[dateTime][withPicker][withTime]", never, {}, {}, never, never, true>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<WithTimeSADirective<any>, "[dateTime][withPicker][withTime]", never, {}, {}, never, never, true, never>;
 }
 //# sourceMappingURL=withTime.directive.d.ts.map

package/src/directives/withTime/withTime.directive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withTime.directive.d.ts","sourceRoot":"","sources":["withTime.directive.ts"],"names":[],"mappings":"AAEA,OAAO,EAA8B,uBAAuB,EAAuE,iBAAiB,EAAC,MAAM,eAAe,CAAC;;AAE3K;;GAEG;AACH,qBAKa,mBAAmB,CAAC,KAAK,GAAG,OAAO;gBAGhC,MAAM,EAAE,uBAAuB,CAAC,KAAK,CAAC,EACtC,QAAQ,EAAE,iBAAiB,CAAC,KAAK,CAAC;yCAJrC,mBAAmB;2CAAnB,mBAAmB;CAmB/B"}
+{"version":3,"file":"withTime.directive.d.ts","sourceRoot":"","sources":["withTime.directive.ts"],"names":[],"mappings":"AAEA,OAAO,EAA8B,yBAAyB,EAAuE,mBAAmB,EAAC,MAAM,eAAe,CAAC;;AAE/K;;GAEG;AACH,qBAKa,mBAAmB,CAAC,KAAK,GAAG,OAAO;gBAGhC,MAAM,EAAE,yBAAyB,CAAC,KAAK,CAAC,EACxC,QAAQ,EAAE,mBAAmB,CAAC,KAAK,CAAC;yCAJvC,mBAAmB;2CAAnB,mBAAmB;CAmB/B"}

package/src/directives/withToday/withToday.directive.d.ts

@@ -1,5 +1,5 @@
 import { OnDestroy } from '@angular/core';
-import { DateTimeInputDirective } from '../../modules';
+import { DateTimeInputSADirective } from '../../modules';
 import { DateApi } from '../../services';
 import * as i0 from "@angular/core";
 /**
@@ -10,12 +10,12 @@ export declare class WithTodaySADirective<TDate = unknown> implements OnDestroy
      * Subscriptions created during initialization
      */
     private _initSubscriptions;
-    constructor(input: DateTimeInputDirective<TDate>, dateApi: DateApi<TDate>);
+    constructor(input: DateTimeInputSADirective<TDate>, dateApi: DateApi<TDate>);
     /**
      * Called when component is destroyed
      */
     ngOnDestroy(): void;
     static ɵfac: i0.ɵɵFactoryDeclaration<WithTodaySADirective<any>, never>;
-    static ɵdir: i0.ɵɵDirectiveDeclaration<WithTodaySADirective<any>, "[dateTime][withToday]", never, {}, {}, never, never, true>;
+    static ɵdir: i0.ɵɵDirectiveDeclaration<WithTodaySADirective<any>, "[dateTime][withToday]", never, {}, {}, never, never, true, never>;
 }
 //# sourceMappingURL=withToday.directive.d.ts.map

package/src/directives/withToday/withToday.directive.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"withToday.directive.d.ts","sourceRoot":"","sources":["withToday.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAC,MAAM,eAAe,CAAC;AAI3D,OAAO,EAAC,sBAAsB,EAAC,MAAM,eAAe,CAAC;AACrD,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;;AAEvC;;GAEG;AACH,qBAKa,oBAAoB,CAAC,KAAK,GAAG,OAAO,CAAE,YAAW,SAAS;IAInE;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAoC;gBAGlD,KAAK,EAAE,sBAAsB,CAAC,KAAK,CAAC,EAClB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC;IAarD;;OAEG;IACI,WAAW,IAAI,IAAI;yCA3BjB,oBAAoB;2CAApB,oBAAoB;CA+BhC"}
+{"version":3,"file":"withToday.directive.d.ts","sourceRoot":"","sources":["withToday.directive.ts"],"names":[],"mappings":"AAAA,OAAO,EAAoB,SAAS,EAAC,MAAM,eAAe,CAAC;AAI3D,OAAO,EAAC,wBAAwB,EAAC,MAAM,eAAe,CAAC;AACvD,OAAO,EAAC,OAAO,EAAC,MAAM,gBAAgB,CAAC;;AAEvC;;GAEG;AACH,qBAKa,oBAAoB,CAAC,KAAK,GAAG,OAAO,CAAE,YAAW,SAAS;IAInE;;OAEG;IACH,OAAO,CAAC,kBAAkB,CAAoC;gBAGlD,KAAK,EAAE,wBAAwB,CAAC,KAAK,CAAC,EACpB,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC;IAarD;;OAEG;IACI,WAAW,IAAI,IAAI;yCA3BjB,oBAAoB;2CAApB,oBAAoB;CA+BhC"}

package/src/index.d.ts

@@ -1,13 +1,5 @@
 export * from './directives';
 export * from './interfaces';
-export * from './legacy/picker/directives';
-export * from './legacy/picker/interfaces';
-export * from './legacy/picker/modules/picker.module';
-export * from './legacy/picker/types';
-export * from './legacy/selector/interfaces';
-export * from './legacy/selector/modules/basicSelector.module';
-export * from './legacy/selector/modules/selector.module';
-export * from './legacy/selector/types';
 export * from './misc/constants';
 export * from './misc/enums';
 export * from './misc/tokens';

package/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,4BAA4B,CAAC;AAC3C,cAAc,4BAA4B,CAAC;AAC3C,cAAc,uCAAuC,CAAC;AACtD,cAAc,uBAAuB,CAAC;AACtC,cAAc,8BAA8B,CAAC;AAC7C,cAAc,gDAAgD,CAAC;AAC/D,cAAc,2CAA2C,CAAC;AAC1D,cAAc,yBAAyB,CAAC;AACxC,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["index.ts"],"names":[],"mappings":"AAAA,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,kBAAkB,CAAC;AACjC,cAAc,cAAc,CAAC;AAC7B,cAAc,eAAe,CAAC;AAC9B,cAAc,cAAc,CAAC;AAC7B,cAAc,cAAc,CAAC;AAC7B,cAAc,mBAAmB,CAAC;AAClC,cAAc,WAAW,CAAC;AAC1B,cAAc,YAAY,CAAC;AAC3B,cAAc,0BAA0B,CAAC;AACzC,cAAc,yBAAyB,CAAC"}

package/src/interfaces/dateTime/datetime.interface.d.ts

@@ -1,7 +1,7 @@
 /**
  * Represents datetime value as period
  */
-export interface DateTimeValue<TDate = any> {
+export interface DateTimeValue<TDate = unknown> {
     /**
      * Starting date and time of period
      */
@@ -11,25 +11,4 @@ export interface DateTimeValue<TDate = any> {
      */
     to: TDate | undefined | null;
 }
-/**
- * Represents object that holds data for identification of validity of date time
- */
-export interface DateTimeValueObject<TDate = any> {
-    /**
-     * Current value of datetime
-     */
-    readonly value: DateTimeValue<TDate> | null;
-    /**
-     * Indicaiton whether is current value valid, empty value is valid
-     */
-    readonly valid: boolean;
-    /**
-     * Minimal possible value, that can be
-     */
-    readonly minValue: TDate | null;
-    /**
-     * Maximal possible value, that can be
-     */
-    readonly maxValue: TDate | null;
-}
 //# sourceMappingURL=datetime.interface.d.ts.map

package/src/interfaces/dateTime/datetime.interface.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"datetime.interface.d.ts","sourceRoot":"","sources":["datetime.interface.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,aAAa,CAAC,KAAK,GAAG,GAAG;IAEtC;;OAEG;IACH,IAAI,EAAE,KAAK,GAAC,SAAS,GAAC,IAAI,CAAC;IAE3B;;OAEG;IACH,EAAE,EAAE,KAAK,GAAC,SAAS,GAAC,IAAI,CAAC;CAC5B;AAID;;GAEG;AACH,MAAM,WAAW,mBAAmB,CAAC,KAAK,GAAG,GAAG;IAE5C;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,GAAC,IAAI,CAAC;IAE1C;;OAEG;IACH,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAExB;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAC,IAAI,CAAC;IAE9B;;OAEG;IACH,QAAQ,CAAC,QAAQ,EAAE,KAAK,GAAC,IAAI,CAAC;CACjC"}
+{"version":3,"file":"datetime.interface.d.ts","sourceRoot":"","sources":["datetime.interface.ts"],"names":[],"mappings":"AAAA;;GAEG;AACH,MAAM,WAAW,aAAa,CAAC,KAAK,GAAG,OAAO;IAE1C;;OAEG;IACH,IAAI,EAAE,KAAK,GAAC,SAAS,GAAC,IAAI,CAAC;IAE3B;;OAEG;IACH,EAAE,EAAE,KAAK,GAAC,SAAS,GAAC,IAAI,CAAC;CAC5B"}

package/src/legacy/picker/components/picker/picker.component.animations.d.ts

@@ -1,5 +1 @@
-/**
- * Animation trigger for animating scale up and scale down picker
- */
-export declare const scaleUpDownTrigger: import("@angular/animations").AnimationTriggerMetadata;
 //# sourceMappingURL=picker.component.animations.d.ts.map

package/src/legacy/picker/components/picker/picker.component.animations.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"picker.component.animations.d.ts","sourceRoot":"","sources":["picker.component.animations.ts"],"names":[],"mappings":"AAEA;;GAEG;AACH,eAAO,MAAM,kBAAkB,wDAuF7B,CAAC"}
+{"version":3,"file":"picker.component.animations.d.ts","sourceRoot":"","sources":["picker.component.animations.ts"],"names":[],"mappings":""}