@qrvey/utils 1.4.0-4 → 1.4.0-5

package/dist/filters/services/UChartPaginationApi.js

@@ -47,39 +47,21 @@ export default class UChartPaginationApi {
         };
         /**
          * Gets request body structure
-         * @param uFilter The filter Builder filter
-         * @param filterLogic Additional filter logic to apply in the preview
-         * @param chartSettings The settings of the chart. For Aggregate Columns.
+         * @param {IFUFlattenedFilter} uFilter The filter object
+         * @param {IFBLogic[]} filterLogic Additional filter logic to apply in the preview
+         * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
          * @returns the request body structure
          */
         this._getPreviewRequestBody = (uFilter, filterLogic = [], chartSettings, afterKey) => {
-            const { column, validator } = uFilter;
-            const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
-                ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
-            let searchLogic;
-            if (!isEmpty(uFilter.values)) {
-                searchLogic = flatUIToOldLogic([
-                    Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(column, validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
-                ]);
-            }
-            let filterCharts = [];
-            if (haveAggFilters) {
-                filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
-                    const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
-                        s.aggregate === uFilter.column.aggregate);
-                    const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
-                    const chartAggFilters = getAggFiltersBySummaryIndex(chart.aggFilters, summaryIndex);
-                    const searchAggFilters = getAggFilters((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
-                    return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
-                }).filter((chart) => chart.summaries.length);
-            }
+            const searchLogic = this._getSearchLogic(uFilter);
+            const filterCharts = this._getFilterCharts(uFilter, searchLogic, chartSettings);
             const dimensions = !filterCharts[0]
                 ? this._getDimensionsBody(uFilter)
                 : this._getDimensionsBodyAdapter(filterCharts[0].dimensions);
             const summaries = !filterCharts[0]
                 ? this._getSummariesBody(uFilter)
                 : filterCharts[0].summaries;
-            const maxDataPoints = this._getMaxDataPoints(column, chartSettings);
+            const maxDataPoints = this._getMaxDataPoints(uFilter.column, chartSettings);
             const filters = [
                 ...filterLogic,
                 ...(!filterCharts[0] ? (searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [] : []),
@@ -310,4 +292,43 @@ export default class UChartPaginationApi {
             return isEmpty(result);
         };
     }
+    /**
+     * Gets the filter object structure for the searching text
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @returns the filter object structure
+     */
+    _getSearchLogic(uFilter) {
+        let searchLogic;
+        if (!isEmpty(uFilter.values)) {
+            searchLogic = flatUIToOldLogic([
+                Object.assign(Object.assign({}, uFilter), { validator: this._getValidationType(uFilter.column, uFilter.validator), column: Object.assign(Object.assign({}, uFilter.column), { linkid: undefined }) }),
+            ]);
+        }
+        return searchLogic;
+    }
+    /**
+     * Gets the filters from the chart settings
+     * @param {IFUFlattenedFilter} uFilter The filter object
+     * @param {OLD_IFilterData} searchLogic Additional filter object for the searching text
+     * @param {IFUChartSettings} chartSettings The settings of the chart. For Aggregate Columns.
+     * @returns the filters from the chart settings
+     */
+    _getFilterCharts(uFilter, searchLogic, chartSettings) {
+        let filterCharts = [];
+        const haveAggFilters = ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.aggregateColumns) || []).length &&
+            ((chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart) || []).length;
+        if (haveAggFilters) {
+            filterCharts = chartSettings === null || chartSettings === void 0 ? void 0 : chartSettings.chart.map((chart) => {
+                if (uFilter.column.type === COLUMN.AGGREGATED_FORMULA)
+                    return chart;
+                const summaryIndex = (chart.summaries || []).findIndex((s) => s.questionid === uFilter.column.id &&
+                    s.aggregate === uFilter.column.aggregate);
+                const summary = summaryIndex !== -1 && chart.summaries[summaryIndex];
+                const chartAggFilters = getAggFiltersBySummaryIndex(chart.aggFilters, summaryIndex);
+                const searchAggFilters = getAggFilters((searchLogic === null || searchLogic === void 0 ? void 0 : searchLogic.logic) || [], summary ? [summary] : []);
+                return Object.assign(Object.assign({}, chart), { aggFilters: searchAggFilters || chartAggFilters, summaries: summary ? [summary] : [] });
+            }).filter((chart) => chart.summaries.length);
+        }
+        return filterCharts;
+    }
 }

package/dist/general/mix/isNaNV2.d.ts

@@ -1,8 +1,15 @@
 /**
  * Validates if the recieved number is NaN type.
- * This function recieves any variable but will return false.
- * Validates if variable is null, undefined, or an empty string, also, the function uses isNaN native function.
+ *
+ * Conditions:
+ * - This function recieves any variable but will return true if it is different to number.
+ * - Empty variables as undefined, null, empty string will return true.
+ *
+ * Special case for isNaN
+ * - The isNaN('') is considered as false statement. The empty string is converted to 0 which is not NaN.
+ * - Boolean variables is considered as false statement.
+ *
  * @param variable the variable to validate
- * @return True if variable is a NaN or false otherwise
+ * @return True: variable is a NaN; False: The variable is a number
  */
 export declare function isNaNV2(variable: any): boolean;

package/dist/general/mix/isNaNV2.js

@@ -1,11 +1,18 @@
 import { isEmpty } from ".";
 /**
  * Validates if the recieved number is NaN type.
- * This function recieves any variable but will return false.
- * Validates if variable is null, undefined, or an empty string, also, the function uses isNaN native function.
+ *
+ * Conditions:
+ * - This function recieves any variable but will return true if it is different to number.
+ * - Empty variables as undefined, null, empty string will return true.
+ *
+ * Special case for isNaN
+ * - The isNaN('') is considered as false statement. The empty string is converted to 0 which is not NaN.
+ * - Boolean variables is considered as false statement.
+ *
  * @param variable the variable to validate
- * @return True if variable is a NaN or false otherwise
+ * @return True: variable is a NaN; False: The variable is a number
  */
 export function isNaNV2(variable) {
-    return isEmpty(variable) || isNaN(variable);
+    return isEmpty(variable) || typeof variable == "boolean" || isNaN(variable);
 }

package/dist/general/string/parseUrl.js

@@ -8,8 +8,8 @@ export const parseUrl = (url, transformer) => {
     if (!match)
         return url;
     return match.reduce((newUrl, curr) => {
-        const key = curr.substr(2);
+        const key = curr.substring(2);
         const value = typeof transformer === "function" ? transformer(key) : transformer[key];
-        return newUrl.replace(curr.substr(1), value);
+        return newUrl.replace(curr.substring(1), value);
     }, url);
 };

package/dist/globalization/helpers/getI18nCalendar.js

@@ -1,12 +1,15 @@
+import { isEmpty } from "../../general/mix/isEmpty";
 import { I18nService } from "../service/i18nextBuilder";
 export function getI18nCalendar(locale) {
-    const localeOverride = locale instanceof I18nService
-        ? locale
-        : typeof locale === "function"
-            ? { translate: locale }
-            : undefined;
-    if (!localeOverride)
-        return undefined;
+    let localeOverride;
+    if (locale instanceof I18nService) {
+        localeOverride = locale;
+    }
+    else if (typeof locale === "function") {
+        localeOverride = { translate: locale };
+    }
+    if (isEmpty(localeOverride))
+        return;
     return {
         clear: localeOverride.translate("common.calendar.clear"),
         days: [

package/dist/globalization/service/i18nextBuilder.js

@@ -11,9 +11,7 @@ import i18next from "i18next";
 import { mergeDeep } from "../../general/object/mergeDeep";
 export class I18nServiceBuilder {
     static buildI18n(i18nDefault, i18nResource) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return yield this._initI18n(i18nDefault, i18nResource);
-        });
+        return this._initI18n(i18nDefault, i18nResource);
     }
     static _initI18n(i18nDefault, i18nResource) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/globalization/service/initI18n.js

@@ -1,15 +1,4 @@
-var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
-    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
-    return new (P || (P = Promise))(function (resolve, reject) {
-        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
-        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
-        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
-        step((generator = generator.apply(thisArg, _arguments || [])).next());
-    });
-};
 import { I18nServiceBuilder } from "../service/i18nextBuilder";
 export function initI18n(i18nConfig = {}, i18nDefault = {}) {
-    return __awaiter(this, void 0, void 0, function* () {
-        return yield I18nServiceBuilder.buildI18n(i18nDefault, i18nConfig);
-    });
+    return I18nServiceBuilder.buildI18n(i18nDefault, i18nConfig);
 }

package/dist/qrvey/helpers/getDataAnswersByColumn.js

@@ -46,9 +46,10 @@ export function getDataAnswersByColumn(settings) {
     return [];
 }
 function getColumnFromData(settings) {
-    return !isEmpty(settings.dataset)
-        ? getDatasetColumn(settings.column, settings.dataset)
-        : !isEmpty(settings.model)
-            ? getModelColumn(settings.column, settings.model)
-            : undefined;
+    if (!isEmpty(settings.dataset)) {
+        return getDatasetColumn(settings.column, settings.dataset);
+    }
+    else if (!isEmpty(settings.model)) {
+        return getModelColumn(settings.column, settings.model);
+    }
 }

package/dist/qrvey/helpers/getExpressionAnswers.js

@@ -9,16 +9,20 @@ import { isEmpty } from "../../general/mix/isEmpty";
 export function getExpressionAnswers(column, property) {
     if (isEmpty(column))
         return [];
-    if (column.expressionCategory) {
-        return (COMPLEX_COLUMN_PROPERTY.EXPRESSION_NEGATIVE === property
-            ? column.expressionNegative
-            : COMPLEX_COLUMN_PROPERTY.EXPRESSION_POSITIVE === property
-                ? column.expressionPositive
-                : []).map((word) => ({ answer: word.text }));
+    const categoryExpressions = column.expressionCategory
+        ? getCategoryAnswers(column, property)
+        : column.expressionWords;
+    return (categoryExpressions || []).map((word) => ({
+        answer: word.text,
+    }));
+}
+function getCategoryAnswers(column, property) {
+    let categoryExpressions;
+    if (COMPLEX_COLUMN_PROPERTY.EXPRESSION_NEGATIVE === property) {
+        categoryExpressions = column.expressionNegative;
     }
-    else {
-        return (column.expressionWords || []).map((word) => ({
-            answer: word.text,
-        }));
+    else if (COMPLEX_COLUMN_PROPERTY.EXPRESSION_POSITIVE === property) {
+        categoryExpressions = column.expressionPositive;
     }
+    return categoryExpressions;
 }

package/dist/tokens/isTokenLabel.js

@@ -7,6 +7,5 @@ import { isEmpty } from "../general/mix/isEmpty";
 export function isTokenLabel(label = "") {
     if (isEmpty(label) || typeof label !== "string")
         return false;
-    const regex = new RegExp("^({{)([^{/\\s/}]+)(}})$", "g");
-    return regex.test(label);
+    return /^\{\{([^{\s}]+)\}\}$/g.test(label);
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.4.0-4",
+  "version": "1.4.0-5",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
@@ -9,10 +9,9 @@
     "build-clean": "node ./scripts/clean-build",
     "compodoc": "npx compodoc -p tsconfig.doc.json",
     "compodoc:server": "./node_modules/.bin/compodoc -p ./tsconfig.doc.json -s --port=4400",
-    "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
-    "lint-dev": "eslint src --debug --ext .ts,.tsx",
+    "lint": "eslint . --quiet --exit-on-fatal-error --ext .ts,.js",
+    "lint-dev": "eslint . --debug --ext .ts,.tsx --fix",
     "prepare": "husky install",
-    "precommit": "prettier --write . && git update-index --again && npm run build && npm run lint",
     "publishing-old": "node ./scripts/prepare-publish && np",
     "publishing-prerelease-old": "node ./scripts/prepare-publish && np --any-branch --tag=$npm_config_tag",
     "publishing-beta-1": "node ./scripts/publishing --np-new-version=$npm_config_np_new_version --np-any-branch=$npm_config_np_any_branch --np-tag=$npm_config_np_tag",
@@ -31,6 +30,7 @@
     "eslint-config-prettier": "8.5.0",
     "husky": "8.0.1",
     "jest": "28.1.0",
+    "lint-staged": "13.0.1",
     "np": "7.6.1",
     "prettier": "2.6.2",
     "ts-jest": "28.0.3",

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

@@ -1,8 +0,0 @@
-import { IDateFormat } from "../interfaces/IDateFormat";
-/**
- * Validates the given string as Date by its date format.
- * @param date a string to validate as date form
- * @param dateForma the format of the date to validate the string
- * @returns true: the string is a valida date
- */
-export declare function validateDateByDateFormat(date: string, dateFormat?: IDateFormat): boolean;

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

@@ -1,27 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateDateByDateFormat = void 0;
-const isTokenLabel_1 = require("../../tokens/isTokenLabel");
-const DATE_FORMAT_1 = require("../constants/DATE_FORMAT");
-const getDateFormatRegularExpressionInArray_1 = require("./getDateFormatRegularExpressionInArray");
-const getSeparatorByDateFormat_1 = require("./getSeparatorByDateFormat");
-/**
- * Validates the given string as Date by its date format.
- * @param date a string to validate as date form
- * @param dateForma the format of the date to validate the string
- * @returns true: the string is a valida date
- */
-function validateDateByDateFormat(date, dateFormat = DATE_FORMAT_1.DATE_FORMAT.DAY) {
-    const resultValidation = [];
-    const separator = (0, getSeparatorByDateFormat_1.getSeparatorByDateFormat)(dateFormat);
-    const separatedDate = date.split(separator);
-    const regularExpression = (0, getDateFormatRegularExpressionInArray_1.getDateFormatRegularExpressionInArray)(dateFormat);
-    if (regularExpression.length !== separatedDate.length)
-        return false;
-    for (let i = 0; i < separatedDate.length; i++) {
-        resultValidation.push((0, isTokenLabel_1.isTokenLabel)(separatedDate[i]) ||
-            new RegExp(regularExpression[i], "g").test(separatedDate[i]));
-    }
-    return resultValidation.every((validValue) => validValue);
-}
-exports.validateDateByDateFormat = validateDateByDateFormat;

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

@@ -1,8 +0,0 @@
-import { IDateFormat } from "../interfaces/IDateFormat";
-/**
- * Validates the given string as Date by its date format.
- * @param date a string to validate as date form
- * @param dateForma the format of the date to validate the string
- * @returns true: the string is a valida date
- */
-export declare function validateDateByDateFormat(date: string, dateFormat?: IDateFormat): boolean;

package/dist/dates/helpers/validateDateByDateFormat.js

@@ -1,23 +0,0 @@
-import { isTokenLabel } from "../../tokens/isTokenLabel";
-import { DATE_FORMAT } from "../constants/DATE_FORMAT";
-import { getDateFormatRegularExpressionInArray } from "./getDateFormatRegularExpressionInArray";
-import { getSeparatorByDateFormat } from "./getSeparatorByDateFormat";
-/**
- * Validates the given string as Date by its date format.
- * @param date a string to validate as date form
- * @param dateForma the format of the date to validate the string
- * @returns true: the string is a valida date
- */
-export function validateDateByDateFormat(date, dateFormat = DATE_FORMAT.DAY) {
-    const resultValidation = [];
-    const separator = getSeparatorByDateFormat(dateFormat);
-    const separatedDate = date.split(separator);
-    const regularExpression = getDateFormatRegularExpressionInArray(dateFormat);
-    if (regularExpression.length !== separatedDate.length)
-        return false;
-    for (let i = 0; i < separatedDate.length; i++) {
-        resultValidation.push(isTokenLabel(separatedDate[i]) ||
-            new RegExp(regularExpression[i], "g").test(separatedDate[i]));
-    }
-    return resultValidation.every((validValue) => validValue);
-}