@qrvey/utils 1.2.10-0 → 1.2.10-3

package/dist/cjs/stencil/util/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/cjs/tokens/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/cjs/typescript/decorators/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/cjs/typescript/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[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];

package/dist/columns/helpers/getModelColumn.js

@@ -21,6 +21,6 @@ export function getModelColumn(column, model) {
  * @returns the question data array from model object
  */
 function getQuestionData(model) {
-    debugger;
+    // debugger
     return _get(model, 'questions.data', []);
 }

package/dist/filters/adapters/UIToFD.js

@@ -20,9 +20,10 @@ export function UIToFD(uFilterData) {
 }
 /**
  * Builds the Fitler Data structure from UI filter data
+ * @private
  * @param uFilterData The UI filter Data object
  * @param version the version of the structure
- * @returns
+ * @returns a Filter Data structure
  */
 function UI21ToFD(uFilterData, version) {
     return {

package/dist/filters/adapters/adaptDateGroupingProperty.d.ts

@@ -2,7 +2,7 @@ import { IFProperty } from "../interfaces/IFProperty";
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
- * @param property
- * @returns
+ * @param property the property to be adapted
+ * @returns a adapted property
  */
 export declare function adaptDateGroupingProperty(property: IFProperty | any): IFProperty;

package/dist/filters/adapters/adaptDateGroupingProperty.js

@@ -3,8 +3,8 @@ import { DATE_DISTINCT_TIME_PROPERTY } from "../../dates/constants/DATE_DISTINCT
 /**
  * [TODO: For 2022, eliminate this adapter]
  * Get the new property base on the old date grouping properties
- * @param property
- * @returns
+ * @param property the property to be adapted
+ * @returns a adapted property
  */
 export function adaptDateGroupingProperty(property) {
     return property === 'p&quarter' ? DATE_DISTINCT_PROPERTY.YEAR_QUARTER :

package/dist/filters/helpers/applyHierarchyForAggFilters.d.ts

@@ -4,8 +4,8 @@ import { IFUChartSettings } from "../interfaces/ui/IFUChartSettings";
 /**
  * [TODO: Make a proper description for this function]
  * @param chartSettings Chart Settings for the Filter Builder
- * @param scopes
- * @param currentScope
- * @returns
+ * @param scopes the pair id/label scopes
+ * @param currentScope the scope to be validated
+ * @returns the chart settings
  */
 export declare function applyHierarchyForAggFilters(chartSettings: IFUChartSettings, scopes?: IFSScopeID[], currentScope?: IFScope): IFUChartSettings;

package/dist/filters/helpers/applyHierarchyForAggFilters.js

@@ -5,9 +5,9 @@ import { getScopesByHierarchy } from "./getScopesByHierarchy";
 /**
  * [TODO: Make a proper description for this function]
  * @param chartSettings Chart Settings for the Filter Builder
- * @param scopes
- * @param currentScope
- * @returns
+ * @param scopes the pair id/label scopes
+ * @param currentScope the scope to be validated
+ * @returns the chart settings
  */
 export function applyHierarchyForAggFilters(chartSettings, scopes = [], currentScope = FILTER_SCOPE.GLOBAL) {
     if (isEmpty(chartSettings))

package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.d.ts

@@ -1,8 +1,10 @@
 import { IFBFilterAggregate } from "../../interfaces/backend/IFBFilterAggregate";
 /**
+ * @todo Make a proper description for this function
  *
- * @param aggFilters
- * @param summaryIndex
- * @returns
+ * Gets the aggFilters structure by an index
+ * @param aggFilters The aggFilter Structure
+ * @param summaryIndex an index
+ * @returns a new aggFilters structure
  */
 export declare function getAggFiltersBySummaryIndex(aggFilters: IFBFilterAggregate, summaryIndex: number): IFBFilterAggregate;

package/dist/filters/helpers/backend/getAggFiltersBySummaryIndex.js

@@ -1,9 +1,11 @@
 import { filterNestedTree } from "../../../general/array/filterNestedTree";
 /**
+ * @todo Make a proper description for this function
  *
- * @param aggFilters
- * @param summaryIndex
- * @returns
+ * Gets the aggFilters structure by an index
+ * @param aggFilters The aggFilter Structure
+ * @param summaryIndex an index
+ * @returns a new aggFilters structure
  */
 export function getAggFiltersBySummaryIndex(aggFilters, summaryIndex) {
     if (!aggFilters)

package/dist/filters/helpers/backend/getBackendValues.js

@@ -64,9 +64,10 @@ export function getBackendValues(filter) {
 }
 /**
  * Gets the expression values. Depending on the column type
+ * @private
  * @param values a collection of filter values
  * @param filter The filter structure
- * @returns
+ * @returns Expression values
  */
 function getResultValues(values, filter) {
     return (values || []).map((value) => {
@@ -82,6 +83,7 @@ function getResultValues(values, filter) {
 }
 /**
  * Gets the Ranking values.
+ * @private
  * @param values a collection of filter values in the ranking structure
  * @param rankingGroupIndex determine the value by this index to build and return it
  * @returns Expression values for ranking

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

@@ -4,9 +4,10 @@
  * @returns a new MergeFilters settings object.
  */
 export function getMergeFiltersSettings(settings) {
-    var _a, _b;
+    var _a, _b, _c;
     return {
-        overwriteValues: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _a !== void 0 ? _a : false,
-        setGroupedColumnOperator: (_b = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _b !== void 0 ? _b : true
+        overwriteFilterProps: (_a = settings === null || settings === void 0 ? void 0 : settings.overwriteFilterProps) !== null && _a !== void 0 ? _a : true,
+        overwriteValues: (_b = settings === null || settings === void 0 ? void 0 : settings.overwriteValues) !== null && _b !== void 0 ? _b : false,
+        setGroupedColumnOperator: (_c = settings === null || settings === void 0 ? void 0 : settings.setGroupedColumnOperator) !== null && _c !== void 0 ? _c : true
     };
 }

package/dist/filters/helpers/common/mergeFilters.d.ts

@@ -5,7 +5,7 @@ import { IFUData } from "../../interfaces/ui/IFUData";
  * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
  * @param filterData1 The target filter data
  * @param filterData2 the filter data to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter data structure
  */
 export declare function mergeFilters(filterData1: IFSData | IFUData, filterData2: IFSData | IFUData, settings?: IFFiltersMergeFilters): IFSData | IFUData;

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

@@ -1,6 +1,7 @@
 import { isEmpty } from "../../../general/mix/isEmpty";
 import { cloneDeep } from "../../../general/object/cloneDeep";
 import { FILTER_GROUPED_COLUMN_OPERATOR } from "../../constants/common/FILTER_GROUPED_COLUMN_OPERATOR";
+import { getFilterid } from "./getFilterid";
 import { getMergeFiltersSettings } from "./getMergeFiltersSettings";
 import { isInValidator } from "./isInValidator";
 import { isNullValidator } from "./isNullValidator";
@@ -13,7 +14,7 @@ import { resolveScopeConditions } from "./resolveScopeConditions";
  * Merge filter data structures in a new one. The first Filter Data passed in the argument has the priority
  * @param filterData1 The target filter data
  * @param filterData2 the filter data to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter data structure
  */
 export function mergeFilters(filterData1, filterData2, settings) {
@@ -38,7 +39,7 @@ export function mergeFilters(filterData1, filterData2, settings) {
  * Gets a new scope structure array by merging two scope structures
  * @param scopes1 the target scope structure
  * @param scopes2 the scope to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new scope structure array
  */
 function mergeScopes(scopes1 = [], scopes2 = [], settings) {
@@ -59,7 +60,7 @@ function mergeScopes(scopes1 = [], scopes2 = [], settings) {
  * Gets a new dataset structure array by merging two dataset structures
  * @param datasets1 the target dataset structure
  * @param datasets2 the dataset to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new dataset structure array
  */
 function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
@@ -80,19 +81,21 @@ function mergeDatasets(datasets1 = [], datasets2 = [], settings) {
  * Gets a new filter structure array by merging two filter structures
  * @param filters1 the target filter structure
  * @param filters2 the filter to be merged
- * @param overwriteValues Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new filter structure array
  */
 function mergeFilterss(filters1 = [], filters2 = [], settings) {
     let newFilters = filters1.reduce((filters, filter1) => {
         const filter2Index = filters2.findIndex(filter2 => resolveFilterConditions(filter2, { column: filter1.column, dateSection: filter1.dateSection, panelid: filter1.extras.panelid, property: filter1.property, validator: filter1.validator }));
         if (filter2Index > -1) {
-            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings.overwriteValues) });
+            filter1 = Object.assign(Object.assign({}, filter1), { values: mergeValues(filter1, filters2[filter2Index], settings) });
+            filter1 = mergeFilterProps(filter1, filters2[filter2Index], settings);
             filters2.splice(filter2Index, 1);
         }
         else {
             filter1 = Object.assign(Object.assign({}, filter1), { operator: settings.setGroupedColumnOperator ? FILTER_GROUPED_COLUMN_OPERATOR : filter1.operator });
         }
+        filter1.filterid = getFilterid(filter1);
         filters.push(filter1);
         return filters;
     }, []);
@@ -100,20 +103,33 @@ function mergeFilterss(filters1 = [], filters2 = [], settings) {
         newFilters = newFilters.concat(filters2);
     return newFilters;
 }
+/**
+ * Gets a new filter structure when the setting is configured
+ * @param filter1 the target filter structure
+ * @param filter2 the filter to be used to merge the values
+ * @param settings configuration of the mergeFilter
+ * @returns a new filter structure with overwritted props
+ */
+function mergeFilterProps(filter1, filter2, settings) {
+    if (settings.overwriteFilterProps) {
+        filter1 = Object.assign(Object.assign({}, filter1), { extras: filter2.extras, enabled: filter2.enabled || filter1.enabled, filterid: filter2.filterid, lookupDisplayIndex: filter2.lookupDisplayIndex, nullValues: filter2.nullValues, selectAll: filter2.selectAll });
+    }
+    return filter1;
+}
 /**
  * Gets a new value structure array by merging two value structures
  * @param filter1 the target filter structure
  * @param filter2 the filter to be used to merge the values
- * @param overwrite Flag to overwrite or not the filter values
+ * @param settings configuration of the mergeFilter
  * @returns a new value structure array
  */
-function mergeValues(filter1, filter2, overwrite = false) {
+function mergeValues(filter1, filter2, settings) {
     if (isEmpty(filter1) && isEmpty(filter2))
         return [];
     let newValues = [];
     let filter1Values = filter1.values || [];
-    const filter2Values = filter1.values || [];
-    if (!overwrite) {
+    const filter2Values = filter2.values || [];
+    if (!settings.overwriteValues) {
         if (isInValidator(filter1.validator)) {
             newValues = filter2Values.reduce((values, value2) => {
                 const value1Index = filter1Values.findIndex(value1 => value2.anchor === value1.anchor && value2.cursor === value1.cursor && value2.includeCurrent === value1.includeCurrent && value2.isCalendarDate === value1.isCalendarDate && value2.number === value1.number && value2.unit === value1.unit);

package/dist/filters/helpers/getAggFiltersFromFilterData.d.ts

@@ -1,9 +1,10 @@
 import { IFBFilterAggregate } from "../interfaces/backend/IFBFilterAggregate";
 import { IFSData } from "../interfaces/common/IFSData";
 /**
- *
- * @param logics
- * @param summaries
- * @returns
+ * @todo FIX AGGREGATE FILTERS
+ * @private
+ * @param filterData
+ * @param _summaries
+ * @returns the aggFilters structure
  */
 export declare function getAggFiltersFromFilterData(filterData: IFSData, _summaries: any[]): IFBFilterAggregate;

package/dist/filters/helpers/getAggFiltersFromFilterData.js

@@ -1,12 +1,12 @@
 import { isEmpty } from "../../general/mix/isEmpty";
 import { getFiltersByAggregateColumn } from "./common/getFiltersByAggregateColumn";
 /**
- *
- * @param logics
- * @param summaries
- * @returns
+ * @todo FIX AGGREGATE FILTERS
+ * @private
+ * @param filterData
+ * @param _summaries
+ * @returns the aggFilters structure
  */
-// [TODO: FILTERS - FIX AGGREGATE FILTERS]
 export function getAggFiltersFromFilterData(filterData, _summaries) {
     filterData = Object.assign({}, getFiltersByAggregateColumn(filterData));
     if (isEmpty(filterData))

package/dist/filters/helpers/ui/getUIValues.d.ts

@@ -2,10 +2,9 @@ import { IFSFilter } from "../../interfaces/common/IFSFilter";
 import { IFUValue } from "../../interfaces/ui/IFUValue";
 import { IFUUIValueSettings } from "../../interfaces/ui/IFUUIValueSettings";
 /**
- *
- * @param filter
- * @param addEnableds
- * @param rankingGroupIndex
- * @returns
+ * Gets the UI Values generated depending on the validator
+ * @param filter the filter structure
+ * @param settings a settings for this function
+ * @returns the UI Values
  */
 export declare function getUIValues(filter: IFSFilter, settings?: IFUUIValueSettings): IFUValue[];

package/dist/filters/helpers/ui/getUIValues.js

@@ -7,11 +7,10 @@ import { flattenDeep } from "../../../general/array/flattenDeep";
 import { RELATIVE_CURSOR_INFO } from "../../../dates/relative/constants/RELATIVE_CURSOR_INFO";
 import { getI18nDateGroupLabel } from "../../../globalization/helpers/getI18nDateGroupLabel";
 /**
- *
- * @param filter
- * @param addEnableds
- * @param rankingGroupIndex
- * @returns
+ * Gets the UI Values generated depending on the validator
+ * @param filter the filter structure
+ * @param settings a settings for this function
+ * @returns the UI Values
  */
 export function getUIValues(filter, settings) {
     var _a;

package/dist/filters/interfaces/functions/IFFiltersMergeFilters.d.ts

@@ -2,6 +2,7 @@
  * Structure for MergeFilters property settings
  */
 export interface IFFiltersMergeFilters {
+    overwriteFilterProps?: boolean;
     overwriteValues?: boolean;
     setGroupedColumnOperator?: boolean;
 }

package/dist/format/localization.js

@@ -10,10 +10,10 @@ export const getLang = (locale) => {
         return { lang: locale === "browser" ? window.navigator.language : locale };
 };
 export const chooseLang = (config) => {
-    var _a, _b;
+    var _a;
     const lang = (((_a = config === null || config === void 0 ? void 0 : config.i18n) === null || _a === void 0 ? void 0 : _a.lang) ||
         config.lang);
-    return ((_b = lang) === null || _b === void 0 ? void 0 : _b.lang) || lang || LANG_DEFAULT;
+    return (lang === null || lang === void 0 ? void 0 : lang.lang) || lang || LANG_DEFAULT;
 };
 export const formatWithLocale = (value, outputFormat, config = {}) => {
     switch (outputFormat.type) {
@@ -26,7 +26,8 @@ export const formatWithLocale = (value, outputFormat, config = {}) => {
 };
 function formatLocaleDate(value, outputFormat, config) {
     const { lang = LANG_DEFAULT, options } = config;
-    const dateParam = new Date(value);
+    const dateValue = value === null || value === void 0 ? void 0 : value.replace('.000Z', '');
+    const dateParam = new Date(dateValue);
     let langOpts = options;
     if (outputFormat === null || outputFormat === void 0 ? void 0 : outputFormat.originalFormat) {
         const { format } = outputFormat.originalFormat;

package/dist/general/object/get.d.ts

@@ -27,23 +27,3 @@
  * @returns the resolved value.
  */
 export declare function _get<T = any>(baseObject: T, path: string | string[], defaultValue?: any): any;
-/**
- *
- * /**
- * Like lodash _.get.
- * Gets the value at path of object. If the resolved value is undefined, the defaultValue is returned in its place.
- * @param baseObject The object to query
- * @param path The path of the property to get.
- * @param defaultValue The value returned for undefined resolved values.
- * @returns the resolved value.
- export function get(baseObject: any, path: string, defaultValue?: any): any {
-  function fn() {
-    try {
-      const value = eval(`this.${path}`.replace('.[', '['));
-      return typeof value !== 'undefined' ? value : defaultValue;
-    } catch (e) { return defaultValue; }
-  }
-  return fn.apply(baseObject, null);
-}
-
- */ 

package/dist/general/object/get.js

@@ -41,23 +41,3 @@ function validateToReturnDefaultValue(baseObject, path) {
         path == null ||
         (typeof path !== 'string' && !Array.isArray(path));
 }
-/**
- *
- * /**
- * Like lodash _.get.
- * Gets the value at path of object. If the resolved value is undefined, the defaultValue is returned in its place.
- * @param baseObject The object to query
- * @param path The path of the property to get.
- * @param defaultValue The value returned for undefined resolved values.
- * @returns the resolved value.
- export function get(baseObject: any, path: string, defaultValue?: any): any {
-  function fn() {
-    try {
-      const value = eval(`this.${path}`.replace('.[', '['));
-      return typeof value !== 'undefined' ? value : defaultValue;
-    } catch (e) { return defaultValue; }
-  }
-  return fn.apply(baseObject, null);
-}
-
- */ 

package/dist/globalization/interfaces/chart_builder/II18nChartBuilderConditionalFormatting.d.ts

@@ -18,4 +18,6 @@ export interface II18nChartBuilderConditionalFormatting {
     value: string;
     type_value: string;
     remove: string;
+    apply_to: string;
+    entire_row: string;
 }

package/dist/globalization/labels/chart_builder/I18N_CHART_BUILDER_FORMAT_OPTIONS.js

@@ -26,5 +26,7 @@ export const I18N_CHART_BUILDER_FORMAT_OPTIONS = {
         value: 'Value',
         type_value: 'Type Value',
         remove: 'Remove',
+        apply_to: 'Apply to',
+        entire_row: 'Entire Row'
     }
 };

package/dist/interfaces/general/index.d.ts

@@ -1,3 +1,2 @@
 export * from './IGeneralInfo';
-export * from './IGeneralWidgetConfig';
 export * from './IWidgetConfig';

package/dist/interfaces/general/index.js

@@ -1,3 +1,2 @@
 export * from './IGeneralInfo';
-export * from './IGeneralWidgetConfig';
 export * from './IWidgetConfig';

package/dist/qrvey/helpers/getLookupAnswers.js

@@ -1,9 +1,8 @@
 import { COLUMN_PROPERTY } from "../../columns/constants/COLUMN_PROPERTY";
 export function getLookupAnswers(column, property, display) {
-    var _a, _b;
     if (property === COLUMN_PROPERTY.LOOKUP_VALUE) {
         const valueItem = column.lookupValue || column.answers[0];
-        return (((_a = valueItem) === null || _a === void 0 ? void 0 : _a.valueInfo) || ((_b = valueItem) === null || _b === void 0 ? void 0 : _b.answer) || []).map(_value => (Object.assign(Object.assign({}, _value), { answerid: valueItem.answerid })));
+        return ((valueItem === null || valueItem === void 0 ? void 0 : valueItem.valueInfo) || (valueItem === null || valueItem === void 0 ? void 0 : valueItem.answer) || []).map(_value => (Object.assign(Object.assign({}, _value), { answerid: valueItem.answerid })));
     }
     else {
         const answerItem = column.answers[display];

package/dist/services/api/getAllDatasets.api.d.ts

@@ -1,4 +1,4 @@
-import { IGeneralWidgetConfig } from "../../interfaces/general/IGeneralWidgetConfig";
+import { IWidgetConfig } from "../../interfaces/general/IWidgetConfig";
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 /**
  * Get a dataset list from a collection of Qrvey IDs
@@ -10,4 +10,4 @@ import { IDataset } from "../../qrvey/interfaces/IDataset";
  * @param qrveyids Collection of Qrvey IDs for returning a set of available datasets
  * @returns a promise that if it is resolved displays a collection of dataset info.
  */
-export declare function getAllDatasets(config: IGeneralWidgetConfig, qrveyids?: string[]): Promise<IDataset[]>;
+export declare function getAllDatasets(config: IWidgetConfig, qrveyids?: string[]): Promise<IDataset[]>;

package/dist/services/api/getDatasetColumns.api.d.ts

@@ -1,8 +1,8 @@
-import { IGeneralWidgetConfig } from '../../interfaces/general/IGeneralWidgetConfig';
 import { IDataset } from '../../qrvey/interfaces/IDataset';
+import { IWidgetConfig } from '../../interfaces/general/IWidgetConfig';
 /**
    * Get a dataset by Qrvey ID
    * @param qrveyid The Qrvey ID
    * @returns a promise
    */
-export declare function getDatasetColumns(config: IGeneralWidgetConfig, qrveyid?: string): Promise<IDataset[]>;
+export declare function getDatasetColumns(config: IWidgetConfig, qrveyid?: string): Promise<IDataset[]>;

package/dist/services/api/getDatasetsByIds.api.d.ts

@@ -1,8 +1,8 @@
-import { IGeneralWidgetConfig } from '../../interfaces/general/IGeneralWidgetConfig';
 import { IDataset } from '../../qrvey/interfaces/IDataset';
+import { IWidgetConfig } from '../../interfaces/general/IWidgetConfig';
 /**
    * Get a dataset by Qrvey ID
    * @param qrveyid The Qrvey ID
    * @returns a promise
    */
-export declare function getDatasetsByIds(config: IGeneralWidgetConfig, qrveyids?: string[]): Promise<IDataset[]>;
+export declare function getDatasetsByIds(config: IWidgetConfig, qrveyids?: string[]): Promise<IDataset[]>;

package/jsdoc.config.json

@@ -0,0 +1,14 @@
+{
+    "plugins": ["plugins/markdown"],
+    "source": {
+        "include": ["./dist"],
+        "exclude": ["./node_modules", "./src"],
+        "includePattern": "./dist/.+\\.js",
+        "excludePattern": "./dist/cjs/.+\\.js"
+    },
+    "opts": {
+        "package": "./package.json",
+        "readme": "./README.md",
+        "recurse": true
+    }
+}

package/package.json

@@ -1,13 +1,15 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.10-0",
+  "version": "1.2.10-3",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
   "scripts": {
     "build": "tsc && tsc -m commonjs --outDir dist/cjs",
+    "docs": "./node_modules/.bin/jsdoc -c ./jsdoc.config.json",
     "publishing": "node prepareToPublish.js && np",
     "publishing-prerelease": "node prepareToPublish.js && np --any-branch --tag=$npm_config_tag",
+    "publishing-v2": "node publishing.js --np-new-version=$npm_config_np_new_version --np-any-branch=$npm_config_np_any_branch --np-tag=$npm_config_np_tag",
     "test": "jest test",
     "test:watch": "jest --watch test",
     "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
@@ -16,20 +18,20 @@
   "author": "Qrvey Inc",
   "license": "MIT",
   "devDependencies": {
-    "@types/jest": "27.0.2",
+    "@types/jest": "27.4.1",
     "doxdox": "3.0.0",
-    "jest": "27.2.5",
+    "jest": "27.5.1",
     "np": "7.6.0",
-    "ts-jest": "27.0.5",
-    "typedoc": "0.22.5",
-    "typescript": "4.4.4",
-    "@typescript-eslint/eslint-plugin": "5.3.0",
-    "@typescript-eslint/parser": "5.3.0",
-    "eslint": "8.1.0"
+    "ts-jest": "27.1.3",
+    "typedoc": "0.22.13",
+    "typescript": "4.6.2",
+    "@typescript-eslint/eslint-plugin": "5.15.0",
+    "@typescript-eslint/parser": "5.15.0",
+    "eslint": "8.11.0"
   },
   "dependencies": {
     "d3": "6.3.1",
-    "dayjs": "1.10.7",
-    "i18next": "21.4.0"
+    "dayjs": "1.11.0",
+    "i18next": "21.6.14"
   }
 }

package/prepareToPublish.js

@@ -38,9 +38,10 @@ function init() {
       await execute("rm -f package-lock.json && rm -f -R node_modules/ && rm -f -R dist/", "-> Cleaning project...");
       await execute("npm install", "-> Installing Dependencies...");
       await execute("npm run build", "-> Generating Build...");
-      await execute("doxdox 'dist/**/*.js' --layout markdown --output readme.md --ignore 'dist/cjs/**/*.js'", "-> Generating Docs...");
+      await execute("doxdox 'dist/**/*.js' --layout markdown --output README.md --ignore 'dist/cjs/**/*.js'", "-> Generating Docs...");
       changeDocsVersion(oldVersion, newVersion);
       await execute(`git add README.md && git commit -m "📝 docs: Updated docs for ${version}"`, "-> Commit Docs changes...");
+      await execute(`git checkout README.md`);
       console.log('-> Ready to Publish!');
       console.log('-> Please login to npm');