@qrvey/utils 1.3.1 → 1.3.2

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.3.1*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.3.2*
 
 > Helper, Utils for all Qrvey Projects
 

package/dist/cjs/dates/helpers/isValidDateObject.d.ts

@@ -0,0 +1,6 @@
+/**
+ * If the date is a valid Date object, return true, otherwise return false.
+ * @param {Date} date - The date object to check.
+ * @returns A boolean value.
+ */
+export declare function isValidDateObject(date: Date): boolean;

package/dist/cjs/dates/helpers/isValidDateObject.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isValidDateObject = void 0;
+/**
+ * If the date is a valid Date object, return true, otherwise return false.
+ * @param {Date} date - The date object to check.
+ * @returns A boolean value.
+ */
+function isValidDateObject(date) {
+    return date instanceof Date && !isNaN(date.getTime());
+}
+exports.isValidDateObject = isValidDateObject;

package/dist/cjs/dates/range/getDateRange.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.getDateRange = void 0;
 const capitalize_1 = require("../../general/string/capitalize");
 const isTokenLabel_1 = require("../../tokens/isTokenLabel");
+const isValidDateObject_1 = require("../helpers/isValidDateObject");
 /**
  * Get date range object from a string date value
  *
@@ -105,10 +106,16 @@ function getStringTimeRange(value, dateGroupLabel) {
             return [' 00:00:00', ' 23:59:59'];
     }
 }
+/**
+ * It takes a Date object as an argument and returns a string in the format of MM/DD/YYYY
+ * @param {Date} dt - Date - The date object to convert to a string
+ * @returns A string in the format of MM/DD/YYYY
+ */
 function getStringDate(dt) {
-    if (dt.getTime() !== dt.getTime())
-        return '01/01/0000';
-    return `${('0' + (dt.getMonth() + 1)).slice(-2)}/${('0' + dt.getDate()).slice(-2)}/${dt.getFullYear()}`;
+    if ((0, isValidDateObject_1.isValidDateObject)(dt)) {
+        return `${('0' + (dt.getMonth() + 1)).slice(-2)}/${('0' + dt.getDate()).slice(-2)}/${dt.getFullYear()}`;
+    }
+    return '01/01/0000';
 }
 function getYearRange(value) {
     const dateFrom = new Date(Number(value), 0, 1);

package/dist/cjs/filters/helpers/common/mergeFilters.js

@@ -47,7 +47,7 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
         const scope2Index = scopes2.findIndex(scope2 => (0, resolveScopeConditions_1.resolveScopeConditions)(scope2, { scope: scope1.scope, scopeid: scope1.scopeid }));
         if (scope2Index > -1) {
-            scope1 = Object.assign(Object.assign({}, scope1), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
+            scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
             scopes2.splice(scope2Index, 1);
         }
         scopes.push(scope1);
@@ -68,7 +68,7 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
         const dataset2Index = datasets2.findIndex(dataset2 => (0, resolveDatasetConditions_1.resolveDatasetConditions)(dataset2, { qrveyid: dataset1.qrveyid, linkid: dataset1.linkid }));
         if (dataset2Index > -1) {
-            dataset1 = Object.assign(Object.assign({}, dataset1), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
+            dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
             datasets2.splice(dataset2Index, 1);
         }
         datasets.push(dataset1);

package/dist/cjs/format/definition.d.ts

@@ -42,3 +42,65 @@ export declare const DATETIME_OPTIONS: {
     minute: string;
     second: string;
 };
+export declare const PARTS_REGEX: RegExp;
+export declare const DURATION_PARTS: {
+    S: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    s: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    m: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    h: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    H: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    D: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    W: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    M: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    Y: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+};
+export declare const DEFAULT_OPTIONS: {
+    unit: string;
+    locale: string;
+    fractionDigits: number;
+};

package/dist/cjs/format/definition.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DATETIME_OPTIONS = exports.CURRENCY_DEFAULT = exports.LANG_DEFAULT = exports.currencyISO = exports.isTextColumn = exports.supportNumericFormatting = exports.isNumericalColumn = exports.isComplexColumn = exports.hasfileSizeProperty = exports.appliesFormatting = exports.DATEGROUP_FORMATTING_UNSUPPORT = exports.QUESTION_FORMAT_SUPPORT = exports.numericalFields = exports.complexFields = exports.textFields = void 0;
+exports.DEFAULT_OPTIONS = exports.DURATION_PARTS = exports.PARTS_REGEX = exports.DATETIME_OPTIONS = exports.CURRENCY_DEFAULT = exports.LANG_DEFAULT = exports.currencyISO = exports.isTextColumn = exports.supportNumericFormatting = exports.isNumericalColumn = exports.isComplexColumn = exports.hasfileSizeProperty = exports.appliesFormatting = exports.DATEGROUP_FORMATTING_UNSUPPORT = exports.QUESTION_FORMAT_SUPPORT = exports.numericalFields = exports.complexFields = exports.textFields = void 0;
 const COLUMN_1 = require("../columns/constants/COLUMN");
 const Charts_Const_1 = require("../constants/Charts.Const");
 exports.textFields = [COLUMN_1.COLUMN.TEXTFIELD, COLUMN_1.COLUMN.TEXT_CATEGORY, COLUMN_1.COLUMN.TEXT_LABEL, COLUMN_1.COLUMN.TEXT_CATEGORY];
@@ -84,3 +84,20 @@ exports.currencyISO = [
 exports.LANG_DEFAULT = 'en-US';
 exports.CURRENCY_DEFAULT = { text: '$ (USD)', label: 'USD' };
 exports.DATETIME_OPTIONS = { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' };
+exports.PARTS_REGEX = /\[([^\]]+)]|Y{1,2}|M{1,2}|W{1,2}|D{1,2}|h{1,2}|H{1,2}|m{1,2}|s{1,2}|S{1,3}/g;
+exports.DURATION_PARTS = {
+    S: { order: 1, symbol: "S", name: "milliseconds", ms: 1 },
+    s: { order: 2, symbol: "s", name: "seconds", ms: 1000 },
+    m: { order: 3, symbol: "m", name: "minutes", ms: 1000 * 60 },
+    h: { order: 4, symbol: "h", name: "hours", ms: 1000 * 60 * 60 },
+    H: { order: 5, symbol: "H", name: "hours", ms: 1000 * 60 * 60 },
+    D: { order: 6, symbol: "D", name: "days", ms: 1000 * 60 * 60 * 24 },
+    W: { order: 7, symbol: "W", name: "weeks", ms: 1000 * 60 * 60 * 24 * 7 },
+    M: { order: 8, symbol: "M", name: "months", ms: 1000 * 60 * 60 * 24 * 30 },
+    Y: { order: 9, symbol: "Y", name: "years", ms: 1000 * 60 * 60 * 24 * 365 },
+};
+exports.DEFAULT_OPTIONS = {
+    unit: "seconds",
+    locale: "en-EN",
+    fractionDigits: 0
+};

package/dist/cjs/format/duration/addDurationFormat.d.ts

@@ -0,0 +1,13 @@
+/**[TODO: The decimals dots are not working correctly, we need to reviewing (fractionDigits)]
+ * "Convert a number of seconds to a human readable string."
+ *
+ * `addDurationFormat` is a function that takes a number, a format, an optional locale, and an optional
+ * number of fraction digits, and returns a string
+ * @param {number} number - The number of milliseconds to format.
+ * @param {string} format - The format string.
+ * @param {string} [locale] - The locale to use for formatting. If not specified, the default locale is
+ * used.
+ * @param {number} [fractionDigits] - The number of digits to show after the decimal point.
+ * @returns A string
+ */
+export declare function addDurationFormat(number: number, format: string, locale?: string, fractionDigits?: number): string;

package/dist/cjs/format/duration/addDurationFormat.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.addDurationFormat = void 0;
+const durationFormatter_1 = require("./durationFormatter");
+/**[TODO: The decimals dots are not working correctly, we need to reviewing (fractionDigits)]
+ * "Convert a number of seconds to a human readable string."
+ *
+ * `addDurationFormat` is a function that takes a number, a format, an optional locale, and an optional
+ * number of fraction digits, and returns a string
+ * @param {number} number - The number of milliseconds to format.
+ * @param {string} format - The format string.
+ * @param {string} [locale] - The locale to use for formatting. If not specified, the default locale is
+ * used.
+ * @param {number} [fractionDigits] - The number of digits to show after the decimal point.
+ * @returns A string
+ */
+function addDurationFormat(number, format, locale, fractionDigits) {
+    return new durationFormatter_1.DurationFormatter({ template: format, options: { locale: locale, fractionDigits: fractionDigits } }).format(number);
+}
+exports.addDurationFormat = addDurationFormat;

package/dist/cjs/format/duration/durationFormatter.d.ts

@@ -0,0 +1,79 @@
+export declare class DurationFormatter {
+    private options;
+    private parts;
+    private valueFormatter;
+    private numberFactor;
+    private template;
+    private numberFormatOptions;
+    /**
+     * The constructor function takes in a template string and an options object. It then sets the
+     * options object to the default options object if no options object is passed in. It then parses
+     * the template string and sets the parts to the parsed template string. It then tries to set the
+     * valueFormatter to a new Intl.NumberFormat object with the locale and fractionDigits options. If
+     * it fails, it sets the valueFormatter to a new Intl.NumberFormat object with the default locale
+     * and fractionDigits options. It then sets the numberFactor to the duration parts object with the
+     * name of the unit option. If it can't find the unit option, it sets the numberFactor to 1
+     * @param [template] - The template string that will be used to format the duration.
+     * @param options - This is an object that contains the following properties: unit, locale and fractionDigits
+     */
+    constructor(options: {
+        template: string;
+        options?: {
+            unit?: string;
+            locale?: string;
+            fractionDigits?: number;
+        };
+        intlNumberFormat?: Intl.NumberFormat;
+    });
+    private setOptions;
+    /**
+     * It sets the locale formatter for the number.
+     */
+    private setLocaleFormatter;
+    /**
+     * It returns a new instance of the Intl.NumberFormat class, which is a built-in JavaScript class
+     * that formats numbers
+     * @param {string | string[]} locale - string | string[]
+     * @returns A new instance of the Intl.NumberFormat class.
+     */
+    private getNewNumberFormat;
+    /**
+     * It takes a template string and sets the parts property to the result of calling the
+     * parseFormatTemplate function with the template string as an argument
+     * @param {string} template - The format template string.
+     */
+    private setParts;
+    /**
+     * It replaces the H and D characters in the template with h and d respectively
+     * @param {string} template - The template string to be used for the date format.
+     * @returns The template string with all instances of H replaced with h and all instances of D
+     * replaced with d.
+     */
+    private matchFormatsReplace;
+    /**
+     * It sets the numberFactor to the value of the duration part that matches the unit.
+     */
+    private setNumberFactor;
+    /**
+     * It takes a string, splits it into an array of strings, then maps each string to a config object,
+     * then filters out any falsy values, then reverses the array
+     * @param {string} template - string - the template string that we want to parse
+     * @returns An array of objects that have the order and the name of the part of the duration.
+     */
+    private parseFormatTemplate;
+    /**
+     * It takes a number, multiplies it by a factor, then uses the parts array to calculate the number
+     * of each part in the number, then uses the template to format the number
+     * @param {number} number - The number of milliseconds to format.
+     * @returns The template string with the values replaced.
+     */
+    format(number: number): string;
+    /**
+     * It takes a dictionary of values and a list of keys, and returns a formatted string
+     * @param parts - { [x: string]: any; }
+     * @param {string | (string | number)[]} part - This is the part of the date that we're
+     * formatting.
+     * @returns The value of the part of the date that is being formatted.
+     */
+    private formatValue;
+}

package/dist/cjs/format/duration/durationFormatter.js

@@ -0,0 +1,156 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DurationFormatter = void 0;
+const isEmpty_1 = require("../../general/mix/isEmpty");
+const definition_1 = require("../definition");
+/* It takes a template string and a number of milliseconds and returns a string that is formatted to
+the user's preference
+this class is based on moment format:
+     years:   Y or y
+     months:  M
+     weeks:   W or w
+     days:    D or d
+     hours:   H or h
+     minutes: m
+     seconds: s
+     ms:      S
+*/
+class DurationFormatter {
+    /**
+     * The constructor function takes in a template string and an options object. It then sets the
+     * options object to the default options object if no options object is passed in. It then parses
+     * the template string and sets the parts to the parsed template string. It then tries to set the
+     * valueFormatter to a new Intl.NumberFormat object with the locale and fractionDigits options. If
+     * it fails, it sets the valueFormatter to a new Intl.NumberFormat object with the default locale
+     * and fractionDigits options. It then sets the numberFactor to the duration parts object with the
+     * name of the unit option. If it can't find the unit option, it sets the numberFactor to 1
+     * @param [template] - The template string that will be used to format the duration.
+     * @param options - This is an object that contains the following properties: unit, locale and fractionDigits
+     */
+    constructor(options) {
+        this.numberFormatOptions = {
+            minimumFractionDigits: definition_1.DEFAULT_OPTIONS.fractionDigits,
+            maximumFractionDigits: definition_1.DEFAULT_OPTIONS.fractionDigits
+        };
+        this.setOptions(options.options);
+        this.setParts(options.template);
+        this.setLocaleFormatter(options.intlNumberFormat);
+        this.setNumberFactor();
+    }
+    setOptions(options) {
+        this.options = Object.assign(Object.assign({}, definition_1.DEFAULT_OPTIONS), options);
+    }
+    /**
+     * It sets the locale formatter for the number.
+     */
+    setLocaleFormatter(intlNumberFormat) {
+        try {
+            if (intlNumberFormat) {
+                console.log(intlNumberFormat.resolvedOptions());
+                this.valueFormatter = intlNumberFormat;
+            }
+            else {
+                this.valueFormatter = this.getNewNumberFormat(this.options.locale);
+            }
+        }
+        catch (e) {
+            if (intlNumberFormat) {
+                this.valueFormatter = intlNumberFormat;
+            }
+            else {
+                this.valueFormatter = this.getNewNumberFormat(definition_1.DEFAULT_OPTIONS.locale);
+            }
+        }
+    }
+    /**
+     * It returns a new instance of the Intl.NumberFormat class, which is a built-in JavaScript class
+     * that formats numbers
+     * @param {string | string[]} locale - string | string[]
+     * @returns A new instance of the Intl.NumberFormat class.
+     */
+    getNewNumberFormat(locale) {
+        return new Intl.NumberFormat(locale, this.numberFormatOptions);
+    }
+    /**
+     * It takes a template string and sets the parts property to the result of calling the
+     * parseFormatTemplate function with the template string as an argument
+     * @param {string} template - The format template string.
+     */
+    setParts(template) {
+        this.template = this.matchFormatsReplace(template);
+        this.parts = this.parseFormatTemplate(template);
+    }
+    /**
+     * It replaces the H and D characters in the template with h and d respectively
+     * @param {string} template - The template string to be used for the date format.
+     * @returns The template string with all instances of H replaced with h and all instances of D
+     * replaced with d.
+     */
+    matchFormatsReplace(template) {
+        return (0, isEmpty_1.isEmpty)(template) ? template : template.replace(/H/g, 'h');
+    }
+    /**
+     * It sets the numberFactor to the value of the duration part that matches the unit.
+     */
+    setNumberFactor() {
+        var _a;
+        this.numberFactor = ((_a = Object.values(definition_1.DURATION_PARTS).find((d) => d.name === this.options.unit)) === null || _a === void 0 ? void 0 : _a.ms) || 1;
+    }
+    /**
+     * It takes a string, splits it into an array of strings, then maps each string to a config object,
+     * then filters out any falsy values, then reverses the array
+     * @param {string} template - string - the template string that we want to parse
+     * @returns An array of objects that have the order and the name of the part of the duration.
+     */
+    parseFormatTemplate(template) {
+        this.template = (0, isEmpty_1.isEmpty)(template) ? '' : template;
+        return (this.template.match(definition_1.PARTS_REGEX) || [])
+            .reduce((store, part) => {
+            const config = definition_1.DURATION_PARTS[part[0]];
+            if (config)
+                store[config.order] = config;
+            return store;
+        }, [])
+            .filter(Boolean)
+            .reverse();
+    }
+    /**
+     * It takes a number, multiplies it by a factor, then uses the parts array to calculate the number
+     * of each part in the number, then uses the template to format the number
+     * @param {number} number - The number of milliseconds to format.
+     * @returns The template string with the values replaced.
+     */
+    format(number) {
+        if (number === null)
+            return null;
+        if (number === undefined || this.template === undefined || isNaN(number))
+            return undefined;
+        if ((0, isEmpty_1.isEmpty)(number))
+            return "";
+        number *= this.numberFactor;
+        const durationParts = this.parts.reduce((store, part) => {
+            store[part.symbol] = number / part.ms;
+            number %= part.ms;
+            return store;
+        }, {});
+        if (!Number.isInteger(number))
+            return number === null ? null : this.valueFormatter.format(number).padStart(this.parts.length, "0");
+        if ((0, isEmpty_1.isEmpty)(this.template))
+            return this.valueFormatter.format(number).padStart(this.parts.length, "0");
+        return this.template.replace(definition_1.PARTS_REGEX, (match, $1) => {
+            return $1 || this.formatValue(durationParts, match);
+        });
+    }
+    /**
+     * It takes a dictionary of values and a list of keys, and returns a formatted string
+     * @param parts - { [x: string]: any; }
+     * @param {string | (string | number)[]} part - This is the part of the date that we're
+     * formatting.
+     * @returns The value of the part of the date that is being formatted.
+     */
+    formatValue(parts, part) {
+        const value = parts[part[0]];
+        return this.valueFormatter.format(value).padStart(part.length, "0");
+    }
+}
+exports.DurationFormatter = DurationFormatter;

package/dist/cjs/format/duration/index.d.ts

@@ -0,0 +1,2 @@
+export * from './durationFormatter';
+export * from './addDurationFormat';

package/dist/cjs/format/duration/index.js

@@ -0,0 +1,18 @@
+"use strict";
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __exportStar = (this && this.__exportStar) || function(m, exports) {
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+__exportStar(require("./durationFormatter"), exports);
+__exportStar(require("./addDurationFormat"), exports);

package/dist/cjs/format/index.d.ts

@@ -1,2 +1,3 @@
 export * from './format';
 export * from './localization';
+export * from './duration/index';

package/dist/cjs/format/index.js

@@ -16,3 +16,4 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./format"), exports);
 __exportStar(require("./localization"), exports);
+__exportStar(require("./duration/index"), exports);

package/dist/dates/helpers/isValidDateObject.d.ts

@@ -0,0 +1,6 @@
+/**
+ * If the date is a valid Date object, return true, otherwise return false.
+ * @param {Date} date - The date object to check.
+ * @returns A boolean value.
+ */
+export declare function isValidDateObject(date: Date): boolean;

package/dist/dates/helpers/isValidDateObject.js

@@ -0,0 +1,8 @@
+/**
+ * If the date is a valid Date object, return true, otherwise return false.
+ * @param {Date} date - The date object to check.
+ * @returns A boolean value.
+ */
+export function isValidDateObject(date) {
+    return date instanceof Date && !isNaN(date.getTime());
+}

package/dist/dates/range/getDateRange.js

@@ -1,5 +1,6 @@
 import { capitalize } from "../../general/string/capitalize";
 import { isTokenLabel } from "../../tokens/isTokenLabel";
+import { isValidDateObject } from "../helpers/isValidDateObject";
 /**
  * Get date range object from a string date value
  *
@@ -101,10 +102,16 @@ function getStringTimeRange(value, dateGroupLabel) {
             return [' 00:00:00', ' 23:59:59'];
     }
 }
+/**
+ * It takes a Date object as an argument and returns a string in the format of MM/DD/YYYY
+ * @param {Date} dt - Date - The date object to convert to a string
+ * @returns A string in the format of MM/DD/YYYY
+ */
 function getStringDate(dt) {
-    if (dt.getTime() !== dt.getTime())
-        return '01/01/0000';
-    return `${('0' + (dt.getMonth() + 1)).slice(-2)}/${('0' + dt.getDate()).slice(-2)}/${dt.getFullYear()}`;
+    if (isValidDateObject(dt)) {
+        return `${('0' + (dt.getMonth() + 1)).slice(-2)}/${('0' + dt.getDate()).slice(-2)}/${dt.getFullYear()}`;
+    }
+    return '01/01/0000';
 }
 function getYearRange(value) {
     const dateFrom = new Date(Number(value), 0, 1);

package/dist/filters/helpers/common/mergeFilters.js

@@ -43,7 +43,7 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
     let newScopes = scopes1.reduce((scopes, scope1) => {
         const scope2Index = scopes2.findIndex(scope2 => resolveScopeConditions(scope2, { scope: scope1.scope, scopeid: scope1.scopeid }));
         if (scope2Index > -1) {
-            scope1 = Object.assign(Object.assign({}, scope1), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
+            scope1 = Object.assign(Object.assign({}, scopes2[scope2Index]), { datasets: mergeDatasets(scope1.datasets, scopes2[scope2Index].datasets, settings) });
             scopes2.splice(scope2Index, 1);
         }
         scopes.push(scope1);
@@ -64,7 +64,7 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
     let newDatasets = datasets1.reduce((datasets, dataset1) => {
         const dataset2Index = datasets2.findIndex(dataset2 => resolveDatasetConditions(dataset2, { qrveyid: dataset1.qrveyid, linkid: dataset1.linkid }));
         if (dataset2Index > -1) {
-            dataset1 = Object.assign(Object.assign({}, dataset1), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
+            dataset1 = Object.assign(Object.assign({}, datasets2[dataset2Index]), { filters: mergeFilterss(dataset1.filters, datasets2[dataset2Index].filters, settings) });
             datasets2.splice(dataset2Index, 1);
         }
         datasets.push(dataset1);

package/dist/format/definition.d.ts

@@ -42,3 +42,65 @@ export declare const DATETIME_OPTIONS: {
     minute: string;
     second: string;
 };
+export declare const PARTS_REGEX: RegExp;
+export declare const DURATION_PARTS: {
+    S: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    s: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    m: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    h: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    H: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    D: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    W: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    M: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+    Y: {
+        order: number;
+        symbol: string;
+        name: string;
+        ms: number;
+    };
+};
+export declare const DEFAULT_OPTIONS: {
+    unit: string;
+    locale: string;
+    fractionDigits: number;
+};

package/dist/format/definition.js

@@ -75,3 +75,20 @@ export const currencyISO = [
 export const LANG_DEFAULT = 'en-US';
 export const CURRENCY_DEFAULT = { text: '$ (USD)', label: 'USD' };
 export const DATETIME_OPTIONS = { year: 'numeric', month: 'numeric', day: 'numeric', hour: 'numeric', minute: 'numeric', second: 'numeric' };
+export const PARTS_REGEX = /\[([^\]]+)]|Y{1,2}|M{1,2}|W{1,2}|D{1,2}|h{1,2}|H{1,2}|m{1,2}|s{1,2}|S{1,3}/g;
+export const DURATION_PARTS = {
+    S: { order: 1, symbol: "S", name: "milliseconds", ms: 1 },
+    s: { order: 2, symbol: "s", name: "seconds", ms: 1000 },
+    m: { order: 3, symbol: "m", name: "minutes", ms: 1000 * 60 },
+    h: { order: 4, symbol: "h", name: "hours", ms: 1000 * 60 * 60 },
+    H: { order: 5, symbol: "H", name: "hours", ms: 1000 * 60 * 60 },
+    D: { order: 6, symbol: "D", name: "days", ms: 1000 * 60 * 60 * 24 },
+    W: { order: 7, symbol: "W", name: "weeks", ms: 1000 * 60 * 60 * 24 * 7 },
+    M: { order: 8, symbol: "M", name: "months", ms: 1000 * 60 * 60 * 24 * 30 },
+    Y: { order: 9, symbol: "Y", name: "years", ms: 1000 * 60 * 60 * 24 * 365 },
+};
+export const DEFAULT_OPTIONS = {
+    unit: "seconds",
+    locale: "en-EN",
+    fractionDigits: 0
+};

package/dist/format/duration/addDurationFormat.d.ts

@@ -0,0 +1,13 @@
+/**[TODO: The decimals dots are not working correctly, we need to reviewing (fractionDigits)]
+ * "Convert a number of seconds to a human readable string."
+ *
+ * `addDurationFormat` is a function that takes a number, a format, an optional locale, and an optional
+ * number of fraction digits, and returns a string
+ * @param {number} number - The number of milliseconds to format.
+ * @param {string} format - The format string.
+ * @param {string} [locale] - The locale to use for formatting. If not specified, the default locale is
+ * used.
+ * @param {number} [fractionDigits] - The number of digits to show after the decimal point.
+ * @returns A string
+ */
+export declare function addDurationFormat(number: number, format: string, locale?: string, fractionDigits?: number): string;

package/dist/format/duration/addDurationFormat.js

@@ -0,0 +1,16 @@
+import { DurationFormatter } from "./durationFormatter";
+/**[TODO: The decimals dots are not working correctly, we need to reviewing (fractionDigits)]
+ * "Convert a number of seconds to a human readable string."
+ *
+ * `addDurationFormat` is a function that takes a number, a format, an optional locale, and an optional
+ * number of fraction digits, and returns a string
+ * @param {number} number - The number of milliseconds to format.
+ * @param {string} format - The format string.
+ * @param {string} [locale] - The locale to use for formatting. If not specified, the default locale is
+ * used.
+ * @param {number} [fractionDigits] - The number of digits to show after the decimal point.
+ * @returns A string
+ */
+export function addDurationFormat(number, format, locale, fractionDigits) {
+    return new DurationFormatter({ template: format, options: { locale: locale, fractionDigits: fractionDigits } }).format(number);
+}