@qrvey/utils 1.2.9-21 → 1.2.9-22

package/README.md

@@ -1,4 +1,4 @@
-# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.9-21*
+# [@qrvey/utils](https://bitbucket.org/qrvey/qrvey_utils/wiki/Home) *1.2.9-22*
 
 > Helper, Utils for all Qrvey Projects
 
@@ -688,12 +688,12 @@ Output:
 
 
 
-### dist/filters/adapters/FDToFlatUI.js
+### dist/filters/adapters/FDToLogic.js
 
 
-#### FDToFlatUI(filterData, datasetsInfo) 
+#### FDToLogic(filterData) 
 
-Generates a Flattened UI filter structure from Filter Data structure.
+Generates a Filter Logic structure from Filter Data structure.
 
 
 
@@ -703,7 +703,6 @@ Generates a Flattened UI filter structure from Filter Data structure.
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
 | filterData |  | The filter data object. |   |
-| datasetsInfo |  | Collection of datasets information |   |
 
 
 
@@ -711,13 +710,13 @@ Generates a Flattened UI filter structure from Filter Data structure.
 ##### Returns
 
 
--  a flattened UI filters array
+-  a filter logic array
 
 
 
-#### FD21ToFlatUI(scopes, datasetsInfo) 
+#### getLogicBodyFromFD21(filterData) 
 
-Generates a Filter Builder Structure from the Filter Data structure v2.1
+Gets the logic body
 
 
 
@@ -726,8 +725,7 @@ Generates a Filter Builder Structure from the Filter Data structure v2.1
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| scopes |  | The filter scope section |   |
-| datasetsInfo |  | Collection of datasets information |   |
+| filterData |  | The filter data object |   |
 
 
 
@@ -735,17 +733,17 @@ Generates a Filter Builder Structure from the Filter Data structure v2.1
 ##### Returns
 
 
--  a flattened UI filters array
+-  a filter logic array
 
 
 
 
-### dist/filters/adapters/FDToLogic.js
+### dist/filters/adapters/FDToFlatUI.js
 
 
-#### FDToLogic(filterData) 
+#### FDToFlatUI(filterData, datasetsInfo) 
 
-Generates a Filter Logic structure from Filter Data structure.
+Generates a Flattened UI filter structure from Filter Data structure.
 
 
 
@@ -755,6 +753,7 @@ Generates a Filter Logic structure from Filter Data structure.
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
 | filterData |  | The filter data object. |   |
+| datasetsInfo |  | Collection of datasets information |   |
 
 
 
@@ -762,13 +761,13 @@ Generates a Filter Logic structure from Filter Data structure.
 ##### Returns
 
 
--  a filter logic array
+-  a flattened UI filters array
 
 
 
-#### getLogicBodyFromFD21(filterData) 
+#### FD21ToFlatUI(scopes, datasetsInfo) 
 
-Gets the logic body
+Generates a Filter Builder Structure from the Filter Data structure v2.1
 
 
 
@@ -777,7 +776,8 @@ Gets the logic body
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filterData |  | The filter data object |   |
+| scopes |  | The filter scope section |   |
+| datasetsInfo |  | Collection of datasets information |   |
 
 
 
@@ -785,7 +785,7 @@ Gets the logic body
 ##### Returns
 
 
--  a filter logic array
+-  a flattened UI filters array
 
 
 
@@ -2889,6 +2889,33 @@ try to find this string as a variable on Windows object
 
 
 
+### dist/typescript/decorators/Throttled.js
+
+
+#### Throttled(time) 
+
+(Method Decorator) Throttled Class Method
+
+
+
+
+##### Parameters
+
+| Name | Type | Description |  |
+| ---- | ---- | ----------- | -------- |
+| time |  | (optional) deafult 500 |   |
+
+
+
+
+##### Returns
+
+
+- `Void`
+
+
+
+
 ### dist/typescript/decorators/Debounce.js
 
 
@@ -2916,12 +2943,12 @@ try to find this string as a variable on Windows object
 
 
 
-### dist/typescript/decorators/Throttled.js
+### dist/dates/relative/helpers/getStatementCase.js
 
 
-#### Throttled(time) 
+#### getStatementCase(includeCurrent, isCalendarDate) 
 
-(Method Decorator) Throttled Class Method
+Returns a number/constant that identifies a relative date case
 
 
 
@@ -2930,7 +2957,8 @@ try to find this string as a variable on Windows object
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| time |  | (optional) deafult 500 |   |
+| includeCurrent | `boolean`  |  |   |
+| isCalendarDate | `boolean`  |  |   |
 
 
 
@@ -2938,7 +2966,7 @@ try to find this string as a variable on Windows object
 ##### Returns
 
 
-- `Void`
+- `number`  
 
 
 
@@ -2970,12 +2998,12 @@ Build a proper relative date statement type
 
 
 
-### dist/dates/relative/helpers/getStatementCase.js
+### dist/dates/relative/helpers/parseDate.js
 
 
-#### getStatementCase(includeCurrent, isCalendarDate) 
+#### parseDate(date) 
 
-Returns a number/constant that identifies a relative date case
+Parses a string date and returns a dayjs date
 
 
 
@@ -2984,8 +3012,7 @@ Returns a number/constant that identifies a relative date case
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| includeCurrent | `boolean`  |  |   |
-| isCalendarDate | `boolean`  |  |   |
+| date | `string` `Dayjs` `Date`  |  |   |
 
 
 
@@ -2993,17 +3020,17 @@ Returns a number/constant that identifies a relative date case
 ##### Returns
 
 
-- `number`  
+- `Dayjs`  A dayjs date
 
 
 
 
-### dist/dates/relative/helpers/parseDate.js
+### dist/filters/helpers/builder/getFilterBuilderGeneralConfig.js
 
 
-#### parseDate(date) 
+#### getFilterBuilderGeneralConfig(config) 
 
-Parses a string date and returns a dayjs date
+Returns a filter builder config object by a any given config
 
 
 
@@ -3012,7 +3039,7 @@ Parses a string date and returns a dayjs date
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| date | `string` `Dayjs` `Date`  |  |   |
+| config |  | any config object |   |
 
 
 
@@ -3020,7 +3047,7 @@ Parses a string date and returns a dayjs date
 ##### Returns
 
 
-- `Dayjs`  A dayjs date
+-  The filter builder config object
 
 
 
@@ -3321,12 +3348,12 @@ Gets filters from the logic by the scopes hierarchy.
 
 
 
-### dist/filters/helpers/builder/getFilterBuilderGeneralConfig.js
+### dist/filters/helpers/common/areFiltersEquals.js
 
 
-#### getFilterBuilderGeneralConfig(config) 
+#### areFiltersEquals(filter1, filter2) 
 
-Returns a filter builder config object by a any given config
+Validates if both filters are the same
 
 
 
@@ -3335,7 +3362,8 @@ Returns a filter builder config object by a any given config
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| config |  | any config object |   |
+| filter1 |  | filter 1 |   |
+| filter2 |  | filter 2 |   |
 
 
 
@@ -3343,17 +3371,17 @@ Returns a filter builder config object by a any given config
 ##### Returns
 
 
--  The filter builder config object
+-  true: the filters are equal; false: the filters are NOT equal
 
 
 
 
-### dist/filters/helpers/common/areFiltersEquals.js
+### dist/filters/helpers/common/excludeFiltersByAggregateColumn.js
 
 
-#### areFiltersEquals(filter1, filter2) 
+#### excludeFiltersByAggregateColumn(filterData) 
 
-Validates if both filters are the same
+Excludes Aggregate Filters in the Filter Data. Excluding filters when the column.aggregate is included.
 
 
 
@@ -3362,8 +3390,7 @@ Validates if both filters are the same
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filter1 |  | filter 1 |   |
-| filter2 |  | filter 2 |   |
+| filterData |  | The filter data object |   |
 
 
 
@@ -3371,17 +3398,17 @@ Validates if both filters are the same
 ##### Returns
 
 
--  true: the filters are equal; false: the filters are NOT equal
+-  The new filter data object that were excluded the aggregate filters
 
 
 
 
-### dist/filters/helpers/common/excludeFiltersByAggregateColumn.js
+### dist/filters/helpers/common/excludeFiltersByScopes.js
 
 
-#### excludeFiltersByAggregateColumn(filterData) 
+#### excludeFiltersByScopes(filterData, scopes) 
 
-Excludes Aggregate Filters in the Filter Data. Excluding filters when the column.aggregate is included.
+Excludes and returns a filter data without filters by the given scopes
 
 
 
@@ -3390,7 +3417,8 @@ Excludes Aggregate Filters in the Filter Data. Excluding filters when the column
 
 | Name | Type | Description |  |
 | ---- | ---- | ----------- | -------- |
-| filterData |  | The filter data object |   |
+| filterData |  | The Filter Data |   |
+| scopes |  | collection of scopes to be as filtering parameters |   |
 
 
 
@@ -3398,7 +3426,7 @@ Excludes Aggregate Filters in the Filter Data. Excluding filters when the column
 ##### Returns
 
 
--  The new filter data object that were excluded the aggregate filters
+-  The new Filter Data without filters by the given scopes.
 
 
 
@@ -3440,34 +3468,6 @@ The validation to filter the stored filter is depending on:
 
 
 
-### dist/filters/helpers/common/excludeFiltersByScopes.js
-
-
-#### excludeFiltersByScopes(filterData, scopes) 
-
-Excludes and returns a filter data without filters by the given scopes
-
-
-
-
-##### Parameters
-
-| Name | Type | Description |  |
-| ---- | ---- | ----------- | -------- |
-| filterData |  | The Filter Data |   |
-| scopes |  | collection of scopes to be as filtering parameters |   |
-
-
-
-
-##### Returns
-
-
--  The new Filter Data without filters by the given scopes.
-
-
-
-
 ### dist/filters/helpers/common/getFilterColumnLabel.js
 
 

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

@@ -19,12 +19,18 @@ export declare const enum LOCALE_FORMATS {
     DECIMAL = "Decimal",
     CURRENCY = "Currency",
     PERCENTAGE = "Percentage",
-    SCIENTIFIC = "Scientific"
+    SCIENTIFIC = "Scientific",
+    ABBREVIATED = "Abbreviated"
 }
 export declare const enum LOCALE_STYLES {
     DECIMAL = "decimal",
     PERCENT = "percent",
     CURRENCY = "currency",
-    SCIENTIFIC = "scientific"
+    SCIENTIFIC = "scientific",
+    COMPACT = "compact"
 }
 export declare const LANG_DEFAULT = "en-US";
+export declare const CURRENCY_DEFAULT: {
+    text: string;
+    label: string;
+};

package/dist/cjs/format/definition.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-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.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];
@@ -82,3 +82,4 @@ exports.currencyISO = [
     { text: 'RM (MYR)', label: 'MYR' }
 ];
 exports.LANG_DEFAULT = 'en-US';
+exports.CURRENCY_DEFAULT = { text: '$ (USD)', label: 'USD' };

package/dist/cjs/format/format.js

@@ -93,7 +93,7 @@ const addFormat = (value, outputFormat = 'None', config) => {
             return (config === null || config === void 0 ? void 0 : config.lang) && outputFormat.format === 'Default' ? (0, localization_1.formatWithLocale)(value, outputFormat, config) : formatDate(value, outputFormat.format);
         case 'NUMERIC': {
             const parse = parseFloat(value);
-            const withLocale = outputFormat.format !== 'Abbreviated' && outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);
+            const withLocale = outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);
             return isNaN(parse) ? value : withLocale ? (0, localization_1.formatWithLocale)(value, outputFormat, config)
                 : formatNumber(parse, outputFormat, config);
         }

package/dist/cjs/format/localization.js

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.formatWithLocale = exports.chooseLang = exports.getLang = void 0;
+const isEmpty_1 = require("../general/mix/isEmpty");
 const definition_1 = require("./definition");
 const getLang = (locale) => {
     if (!locale)
@@ -52,12 +53,13 @@ function getLocaleOptions(outputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch (format) {
         case "Currency" /* CURRENCY */: {
-            const iso = definition_1.currencyISO.find(item => (item.text === currency.text) || (item.text.includes(currency.label)));
-            return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0 };
+            const iso = (0, isEmpty_1.isEmpty)(currency) ? definition_1.CURRENCY_DEFAULT : definition_1.currencyISO.find(item => (item.text === currency.text) || item.text.includes(currency.label));
+            return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0, currencyDisplay: 'narrowSymbol' };
         }
         case "Scientific" /* SCIENTIFIC */: return { style: "decimal" /* DECIMAL */,
             notation: "scientific" /* SCIENTIFIC */, maximumFractionDigits: decimals };
         case "Percentage" /* PERCENTAGE */: return { style: "percent" /* PERCENT */, maximumFractionDigits: decimals };
+        case "Abbreviated" /* ABBREVIATED */: return { notation: "compact" /* COMPACT */, maximumFractionDigits: decimals };
         default: return { style: "decimal" /* DECIMAL */, maximumFractionDigits: decimals };
     }
 }

package/dist/cjs/qrvey/helpers/transformValue.js

@@ -43,5 +43,5 @@ function getOutputFormat(settings) {
  */
 function getFormatConfig(settings) {
     var _a;
-    return { lang: (_a = settings.i18n) === null || _a === void 0 ? void 0 : _a.lang };
+    return { lang: (_a = settings.i18n) === null || _a === void 0 ? void 0 : _a.locale };
 }

package/dist/format/definition.d.ts

@@ -19,12 +19,18 @@ export declare const enum LOCALE_FORMATS {
     DECIMAL = "Decimal",
     CURRENCY = "Currency",
     PERCENTAGE = "Percentage",
-    SCIENTIFIC = "Scientific"
+    SCIENTIFIC = "Scientific",
+    ABBREVIATED = "Abbreviated"
 }
 export declare const enum LOCALE_STYLES {
     DECIMAL = "decimal",
     PERCENT = "percent",
     CURRENCY = "currency",
-    SCIENTIFIC = "scientific"
+    SCIENTIFIC = "scientific",
+    COMPACT = "compact"
 }
 export declare const LANG_DEFAULT = "en-US";
+export declare const CURRENCY_DEFAULT: {
+    text: string;
+    label: string;
+};

package/dist/format/definition.js

@@ -73,3 +73,4 @@ export const currencyISO = [
     { text: 'RM (MYR)', label: 'MYR' }
 ];
 export const LANG_DEFAULT = 'en-US';
+export const CURRENCY_DEFAULT = { text: '$ (USD)', label: 'USD' };

package/dist/format/format.js

@@ -84,7 +84,7 @@ export const addFormat = (value, outputFormat = 'None', config) => {
             return (config === null || config === void 0 ? void 0 : config.lang) && outputFormat.format === 'Default' ? formatWithLocale(value, outputFormat, config) : formatDate(value, outputFormat.format);
         case 'NUMERIC': {
             const parse = parseFloat(value);
-            const withLocale = outputFormat.format !== 'Abbreviated' && outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);
+            const withLocale = outputFormat !== 'None' && (config === null || config === void 0 ? void 0 : config.lang);
             return isNaN(parse) ? value : withLocale ? formatWithLocale(value, outputFormat, config)
                 : formatNumber(parse, outputFormat, config);
         }

package/dist/format/localization.js

@@ -1,4 +1,5 @@
-import { currencyISO, LANG_DEFAULT } from './definition';
+import { isEmpty } from '../general/mix/isEmpty';
+import { currencyISO, LANG_DEFAULT, CURRENCY_DEFAULT } from './definition';
 export const getLang = (locale) => {
     if (!locale)
         return;
@@ -46,12 +47,13 @@ function getLocaleOptions(outputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch (format) {
         case "Currency" /* CURRENCY */: {
-            const iso = currencyISO.find(item => (item.text === currency.text) || (item.text.includes(currency.label)));
-            return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0 };
+            const iso = isEmpty(currency) ? CURRENCY_DEFAULT : currencyISO.find(item => (item.text === currency.text) || item.text.includes(currency.label));
+            return { style: "currency" /* CURRENCY */, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0, currencyDisplay: 'narrowSymbol' };
         }
         case "Scientific" /* SCIENTIFIC */: return { style: "decimal" /* DECIMAL */,
             notation: "scientific" /* SCIENTIFIC */, maximumFractionDigits: decimals };
         case "Percentage" /* PERCENTAGE */: return { style: "percent" /* PERCENT */, maximumFractionDigits: decimals };
+        case "Abbreviated" /* ABBREVIATED */: return { notation: "compact" /* COMPACT */, maximumFractionDigits: decimals };
         default: return { style: "decimal" /* DECIMAL */, maximumFractionDigits: decimals };
     }
 }

package/dist/qrvey/helpers/transformValue.js

@@ -39,5 +39,5 @@ function getOutputFormat(settings) {
  */
 function getFormatConfig(settings) {
     var _a;
-    return { lang: (_a = settings.i18n) === null || _a === void 0 ? void 0 : _a.lang };
+    return { lang: (_a = settings.i18n) === null || _a === void 0 ? void 0 : _a.locale };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.9-21",
+  "version": "1.2.9-22",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",

package/src/format/definition.ts

@@ -91,12 +91,15 @@ export const enum LOCALE_FORMATS {
   CURRENCY = 'Currency',
   PERCENTAGE = 'Percentage',
   SCIENTIFIC = 'Scientific',
+  ABBREVIATED = 'Abbreviated'
 }
 export const enum LOCALE_STYLES {
   DECIMAL = 'decimal',
   PERCENT = 'percent',
   CURRENCY = 'currency',
   SCIENTIFIC = 'scientific',
+  COMPACT = 'compact'
 }
 
-export const LANG_DEFAULT = 'en-US';
+export const LANG_DEFAULT = 'en-US';
+export const CURRENCY_DEFAULT = { text: '$ (USD)', label: 'USD' };

package/src/format/format.ts

@@ -92,7 +92,7 @@ export const addFormat = (value: any, outputFormat: any = 'None', config?: IForm
       return config?.lang && outputFormat.format === 'Default' ? formatWithLocale(value, outputFormat, config) : formatDate(value, outputFormat.format);
     case 'NUMERIC': {
       const parse = parseFloat(value);
-      const withLocale = outputFormat.format !== 'Abbreviated' && outputFormat !== 'None' && config?.lang;
+      const withLocale = outputFormat !== 'None' && config?.lang;
       return isNaN(parse) ? value : withLocale ? formatWithLocale(value, outputFormat, config)
        : formatNumber(parse, outputFormat, config);
     }

package/src/format/localization.ts

@@ -1,5 +1,6 @@
+import { isEmpty } from '../general/mix/isEmpty';
 import { IFormatConfig, IFormatOutputFormat } from '../interfaces';
-import { currencyISO, LOCALE_FORMATS, LOCALE_STYLES, LANG_DEFAULT } from './definition';
+import { currencyISO, LOCALE_FORMATS, LOCALE_STYLES, LANG_DEFAULT, CURRENCY_DEFAULT } from './definition';
 
 export const getLang = (locale: string | Record<string, any>) => {
     if (!locale) return;
@@ -49,12 +50,13 @@ function getLocaleOptions(outputFormat: IFormatOutputFormat) {
     const { format, decimals, currency } = outputFormat;
     switch(format) {
         case LOCALE_FORMATS.CURRENCY: {
-            const iso = currencyISO.find(item => (item.text === currency.text) || (item.text.includes(currency.label)));
-            return { style: LOCALE_STYLES.CURRENCY, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0 };
+            const iso = isEmpty(currency) ? CURRENCY_DEFAULT : currencyISO.find(item => (item.text === currency.text) || item.text.includes(currency.label));
+            return { style: LOCALE_STYLES.CURRENCY, currency: iso.label, maximumFractionDigits: decimals, minimumFractionDigits: 0, currencyDisplay: 'narrowSymbol' };
         }
         case LOCALE_FORMATS.SCIENTIFIC: return { style: LOCALE_STYLES.DECIMAL,
              notation: LOCALE_STYLES.SCIENTIFIC, maximumFractionDigits: decimals };
         case LOCALE_FORMATS.PERCENTAGE: return { style: LOCALE_STYLES.PERCENT, maximumFractionDigits: decimals };
+        case LOCALE_FORMATS.ABBREVIATED: return { notation: LOCALE_STYLES.COMPACT, maximumFractionDigits: decimals };
         default: return { style: LOCALE_STYLES.DECIMAL, maximumFractionDigits: decimals };
     }
 }

package/src/qrvey/helpers/transformValue.ts

@@ -43,5 +43,5 @@ function getOutputFormat(settings: ITransformValueSettings) {
  * @returns the format config
  */
 function getFormatConfig(settings: ITransformValueSettings) {
-    return { lang: settings.i18n?.lang };
+    return { lang: settings.i18n?.locale };
 }