@qrvey/utils 1.2.10-7 → 1.3.0-0

package/dist/qrvey/interfaces/{IFunctionGetValueWithSuffixes.d.ts → IGetValueWithSuffixesSettings.d.ts}

@@ -1,10 +1,10 @@
 import { II18nServiceTranslate } from "../../globalization/interfaces/II18nServiceTranslate";
-export interface IFunctionGetValueWithSuffixes {
+export interface IGetValueWithSuffixesSettings {
     translate?: II18nServiceTranslate;
     suffixTranslateLabel?: string;
-    suffixes?: IFunctionGetValueWithSuffixesSuffixes;
+    suffixes?: IGetValueWithSuffixesSettingsSuffixes;
 }
-interface IFunctionGetValueWithSuffixesSuffixes {
+interface IGetValueWithSuffixesSettingsSuffixes {
     singular: string;
     plural: string;
 }

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

@@ -1,18 +1,7 @@
-export * from './IAppStatus';
-export * from './IAppType';
 export * from './IBDataset';
-export * from './IBModel';
-export * from './IBModelBranchesMapBranch';
-export * from './IBModelData';
 export * from './ICalculation';
 export * from './ICalculationInfo';
 export * from './ICalculationType';
 export * from './IDataset';
-export * from './IFunctionGetDataAnswersByColumn';
-export * from './IFunctionGetValueWithSuffixes';
-export * from './IModel';
-export * from './IModelAnswer';
-export * from './IBModelBranchesMap';
-export * from './IModelColumn';
-export * from './IModelDataset';
+export * from './IGetValueWithSuffixesSettings';
 export * from './ITransformValueSettings';

package/dist/qrvey/interfaces/index.js

@@ -1,18 +1,7 @@
-export * from './IAppStatus';
-export * from './IAppType';
 export * from './IBDataset';
-export * from './IBModel';
-export * from './IBModelBranchesMapBranch';
-export * from './IBModelData';
 export * from './ICalculation';
 export * from './ICalculationInfo';
 export * from './ICalculationType';
 export * from './IDataset';
-export * from './IFunctionGetDataAnswersByColumn';
-export * from './IFunctionGetValueWithSuffixes';
-export * from './IModel';
-export * from './IModelAnswer';
-export * from './IBModelBranchesMap';
-export * from './IModelColumn';
-export * from './IModelDataset';
+export * from './IGetValueWithSuffixesSettings';
 export * from './ITransformValueSettings';

package/dist/services/adapters/BColumnsToUIColumns.adapter.js

@@ -1,24 +1,16 @@
 export function BColumnsToUIColumns(columns = [], dataset) {
     return columns.map(column => ({
-        answers: column.answers,
         bucketid: column.bucketId,
-        expressionCategory: column.activeCat,
-        expressionNegative: column.negative,
-        expressionPositive: column.positive,
-        expressionWords: column.words,
         formulaid: column.formulaId,
         formulaType: column.formulaType,
         geogroup: column.geogroup,
         id: column.id,
-        imageUploadOption: column.imageUploadOption,
         label: column.text,
         linked: column.linked,
         linkid: (dataset === null || dataset === void 0 ? void 0 : dataset.linkid) || column.linkid,
         outputFormat: column.outputFormat,
         property: column.property,
         qrveyid: (dataset === null || dataset === void 0 ? void 0 : dataset.qrveyid) || column.qrveyid,
-        slidebarValue: column.sliderVal,
-        lookupValue: column.value,
         type: column.type,
     }));
 }

package/dist/services/adapters/index.d.ts

@@ -1,3 +1,2 @@
-export * from './BBranchesMapToUIBranchesMap.adapter';
 export * from './BDatasetsToUIDatasets.adapter';
 export * from './BColumnsToUIColumns.adapter';

package/dist/services/adapters/index.js

@@ -1,3 +1,2 @@
-export * from './BBranchesMapToUIBranchesMap.adapter';
 export * from './BDatasetsToUIDatasets.adapter';
 export * from './BColumnsToUIColumns.adapter';

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

@@ -1,13 +1,9 @@
-import { IWidgetConfig } from "../../interfaces/general/IWidgetConfig";
+import { IGeneralWidgetConfig } from "../../interfaces/general/IGeneralWidgetConfig";
 import { IDataset } from "../../qrvey/interfaces/IDataset";
 /**
  * Get a dataset list from a collection of Qrvey IDs
- * Considerations for qrveyids second argument:
- * - If it is a undefined argument, the function will return all available datasets of the app
- * - If it is a empty array argument, the function will return an empty dataset list. (A request will not be executed)
- * - If it is a non-empty array argument, the function will return a set of available datasets
- * @param config the widget config. Includes general configuration properties
- * @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.
+ * @param config the widget config. Includes the appid and others configuration properties
+ * @param pickDatasets Collection of Qrvey IDs for filtering the request
+ * @returns a promise
  */
-export declare function getAllDatasets(config: IWidgetConfig, qrveyids?: string[]): Promise<IDataset[]>;
+export declare function getAllDatasets(config: IGeneralWidgetConfig, pickDatasets?: string[]): Promise<IDataset[]>;

package/dist/services/api/getAllDatasets.api.js

@@ -1,29 +1,20 @@
-import { getArrayByProperty } from "../../general/array/getArrayByProperty";
-import { isEmpty } from "../../general/mix/isEmpty";
+import { flattenDeep, isEmpty } from "../../general";
 import { getAllQrveys } from "./getAllQrveys.api";
-import { getDatasetsByIds } from "./getDatasetsByIds.api";
+import { getDatasetColumns } from "./getDatasetColumns.api";
 /**
  * Get a dataset list from a collection of Qrvey IDs
- * Considerations for qrveyids second argument:
- * - If it is a undefined argument, the function will return all available datasets of the app
- * - If it is a empty array argument, the function will return an empty dataset list. (A request will not be executed)
- * - If it is a non-empty array argument, the function will return a set of available datasets
- * @param config the widget config. Includes general configuration properties
- * @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.
+ * @param config the widget config. Includes the appid and others configuration properties
+ * @param pickDatasets Collection of Qrvey IDs for filtering the request
+ * @returns a promise
  */
-export function getAllDatasets(config, qrveyids) {
-    if (Array.isArray(qrveyids) && isEmpty(qrveyids)) {
-        return Promise.resolve([]);
-    }
-    else if (Array.isArray(qrveyids) && !isEmpty(qrveyids)) {
-        return getDatasetsByIds(config, qrveyids);
-    }
-    else {
-        return getAllQrveys(Object.assign({}, config), { status: ['RUNNING', 'FINISHED', 'PAUSED'], loadAll: true })
-            .then((qrveys) => {
-            const datasets = qrveys.Items.filter(item => !['NPS', 'CHECKLIST'].includes(item.appType.toUpperCase()));
-            return getDatasetsByIds(config, getArrayByProperty(datasets, 'qrveyid'));
-        }).catch(_e => []);
-    }
+export function getAllDatasets(config, pickDatasets = []) {
+    return getAllQrveys(Object.assign({}, config), { status: ['RUNNING', 'FINISHED', 'PAUSED'], loadAll: true })
+        .then((qrveys) => {
+        let datasets = qrveys.Items.filter(filterSupportedDatasets);
+        datasets = isEmpty(pickDatasets) ? [] : datasets.filter(item => pickDatasets.includes(item.qrveyid));
+        return Promise.all(datasets.map(dataset => getDatasetColumns(config, dataset.qrveyid))).then(response => flattenDeep(response));
+    }).catch(_e => Promise.all([]));
+}
+function filterSupportedDatasets(dataset) {
+    return !['NPS', 'CHECKLIST'].includes(dataset.appType.toUpperCase());
 }

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

@@ -1,6 +1,6 @@
 import IPayloadQrveyAll from "../interfaces/IPayloadQrveyAll";
 /**
-  * Request function for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
+  * POST Request for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
   * @param config Configuration
   * @param params  Object for getting precise data
   */

package/dist/services/api/getAllQrveys.api.js

@@ -1,7 +1,7 @@
 import { QRVEY_ENDPOINT } from "../constants/QRVEY_ENDPOINT";
 import Request from "../helpers/Request";
 /**
-  * Request function for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
+  * POST Request for getting Qrveys such as Web Forms and Datasets. Use params for getting precise data
   * @param config Configuration
   * @param params  Object for getting precise data
   */

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

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

package/dist/services/api/getDatasetColumns.api.js

@@ -1,8 +1,7 @@
-import { CHART_ENDPOINT } from '../constants/CHART_ENDPOINT';
-import Request from '../helpers/Request';
-import { BDatasetsToUIDatasets } from '../adapters/BDatasetsToUIDatasets.adapter';
-import { getDefaultQuestionListOptionsAttributes } from '../helpers/getDefaultQuestionListOptionsAttributes';
-import { chooseLang } from '../../format/localization';
+import { CHART_ENDPOINT } from "../constants/CHART_ENDPOINT";
+import Request from "../helpers/Request";
+import { BDatasetsToUIDatasets } from "../adapters/BDatasetsToUIDatasets.adapter";
+import { chooseLang } from "../..";
 /**
    * Get a dataset by Qrvey ID
    * @param qrveyid The Qrvey ID
@@ -11,8 +10,8 @@ import { chooseLang } from '../../format/localization';
 export function getDatasetColumns(config, qrveyid) {
     const lang = chooseLang(config);
     return Request.post(Object.assign(Object.assign({}, config), { qrveyid, endpoint: CHART_ENDPOINT }), '/question/list', {
-        optionsAttributes: getDefaultQuestionListOptionsAttributes(),
-        extend: true,
+        'optionsAttributes': ['id', 'text', 'type', 'property', 'linked', 'linkid', 'qrveyid', 'bucketId', 'formulaId', 'formulaType', 'geogroup', 'outputFormat'],
+        'extend': true
     }, { lang })
         .then(BDatasetsToUIDatasets)
         .catch(_e => []);

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

@@ -1,5 +1,3 @@
 export * from './getAllDatasets.api';
 export * from './getAllQrveys.api';
 export * from './getDatasetColumns.api';
-export * from './getDatasetsByIds.api';
-export * from './getModel.api';

package/dist/services/api/index.js

@@ -1,5 +1,3 @@
 export * from './getAllDatasets.api';
 export * from './getAllQrveys.api';
 export * from './getDatasetColumns.api';
-export * from './getDatasetsByIds.api';
-export * from './getModel.api';

package/dist/services/constants/index.d.ts

@@ -1,6 +1,2 @@
 export * from './CHART_ENDPOINT';
-export * from './MODEL_ENDPOINT';
 export * from './QRVEY_ENDPOINT';
-export * from './QUESTION_LIST_BULK_ENDPOINT';
-export * from './UCHART_ENDPOINT';
-export * from './UCHART_PAGINATION_ENDPOINT';

package/dist/services/constants/index.js

@@ -1,6 +1,2 @@
 export * from './CHART_ENDPOINT';
-export * from './MODEL_ENDPOINT';
 export * from './QRVEY_ENDPOINT';
-export * from './QUESTION_LIST_BULK_ENDPOINT';
-export * from './UCHART_ENDPOINT';
-export * from './UCHART_PAGINATION_ENDPOINT';

package/dist/services/helpers/index.d.ts

@@ -1,2 +1 @@
-export * from './getDefaultQuestionListOptionsAttributes';
 export * from './Request';

package/dist/services/helpers/index.js

@@ -1,2 +1 @@
-export * from './getDefaultQuestionListOptionsAttributes';
 export * from './Request';

package/package.json

@@ -1,38 +1,42 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.2.10-7",
+  "version": "1.3.0-0",
   "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",
+    "build-clean": "node ./scripts/clean-build",
     "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",
+    "doxs": "doxdox './dist/**/*.js' --ignore './dist/cjs/**/*.js' --output README.md --layout markdown --package ./package.json",
     "lint": "eslint src --quiet --exit-on-fatal-error --ext .ts,.js",
-    "lint-dev": "eslint src --debug --ext .ts,.tsx"
+    "lint-dev": "eslint src --debug --ext .ts,.tsx",
+    "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",
+    "publishing-beta-2": "node ./scripts/clean-build && node ./scripts/generating-docs && np --any-branch --np-tag=$npm_config_np_tag",
+    "test": "jest test",
+    "test:watch": "jest --watch test"
   },
   "author": "Qrvey Inc",
   "license": "MIT",
   "devDependencies": {
     "@types/jest": "27.4.1",
-    "@typescript-eslint/eslint-plugin": "5.15.0",
-    "@typescript-eslint/parser": "5.15.0",
+    "@typescript-eslint/eslint-plugin": "5.22.0",
+    "@typescript-eslint/parser": "5.22.0",
     "doxdox": "3.0.0",
-    "eslint": "8.11.0",
+    "eslint": "8.14.0",
     "jest": "27.5.1",
     "jsdoc": "3.6.10",
-    "np": "7.6.0",
-    "ts-jest": "27.1.3",
-    "typedoc": "0.22.13",
-    "typescript": "4.6.2"
+    "np": "7.6.1",
+    "typedoc": "0.22.15",
+    "typescript": "4.6.4"
   },
   "dependencies": {
     "d3": "6.3.1",
-    "dayjs": "1.11.0",
-    "i18next": "21.6.14"
+    "i18next": "21.6.16"
+  },
+  "peerDependencies": {
+    "dayjs": ">=1.11.1 <1.12.0"
   }
 }

package/scripts/clean-build/index.js

@@ -0,0 +1,62 @@
+/**
+ * Script for cleaning the project from temporary files and building a new bundle
+ * 1- Deleting some directories and files
+ * 2- Installing dependencies
+ * 3- Build a new bundle
+ */
+
+const util = require('util');
+const childProcess = require('child_process');
+const exec = util.promisify(childProcess.exec);
+const { exit } = require('process');
+ 
+async function execute(command) {
+    console.log(command);
+    const response = await exec(command);
+    if (response.error != null) {
+        throw new Error(response.error);
+    }
+    if (response.stderr != null && response.stderr !== '') {
+        console.error(response.stderr);
+    }
+    if (response.stdout != null && response.stdout !== '') {
+        console.log(response.stdout);
+    }
+    return response;
+}
+
+async function cleaningProject(settings) {
+    console.log('==>>> Cleaning project...');
+    await execute(`rm -f ${settings.packageLockPath}`);
+    await execute(`rm -f -R ${settings.nodeModulesPath}`);
+    await execute(`rm -f -R ${settings.distPath}`);
+}
+
+async function buildingBundle(_settings) {
+    console.log('==>>> Installing Dependencies...');
+    await execute('npm install');
+
+    await execute('npm run build');
+}
+
+async function init() {
+    console.log('Welcome.');
+    let settings = {
+        distPath: './dist',
+        nodeModulesPath: './node_modules',
+        packageLockPath: './package-lock.json',
+    };
+
+    try {
+        await cleaningProject(settings);
+        await buildingBundle(settings);
+        console.info('Finished cleaning and installed dependencies');
+    } catch (err) {
+        console.error('Error: ', err);
+    } finally {
+        console.log('Execution finished');
+        exit();
+    }
+}
+ 
+init();

package/scripts/generating-docs/index.js

@@ -0,0 +1,133 @@
+/**
+ * Script for cleaning the project from temporary files and building a new bundle
+ * 1- Deleting some directories and files
+ * 2- Installing dependencies
+ * 3- Build a new bundle
+ */
+
+const fs = require('fs');
+const util = require('util');
+const childProcess = require('child_process');
+const exec = util.promisify(childProcess.exec);
+const proc = require('process');
+const readline = require("readline");
+const rl = readline.createInterface({
+    input: proc.stdin,
+    output: proc.stdout
+});
+const question = util.promisify(rl.question).bind(rl);
+const { exit } = require('process');
+  
+async function execute(command) {
+    console.log(command);
+    const response = await exec(command);
+    if (response.error != null) {
+        throw new Error(response.error);
+    }
+    if (response.stderr != null && response.stderr !== '') {
+        console.error(response.stderr);
+    }
+    if (response.stdout != null && response.stdout !== '') {
+        console.log(response.stdout);
+    }
+    return response;
+}
+
+async function getPackageJson(settings) {
+    console.log('==>>> Opening package.json file...');
+    const packageJson = await fs.readFileSync(settings.packagePath, 'utf8');
+    const packageObject = JSON.parse(packageJson);
+    if (packageObject != null) {
+        console.log(`**** The current version is ${packageObject.version}`);
+        return packageObject.version;
+    }
+    return '';
+}
+
+async function getNewVersion() {
+    console.log('==>>> Checking the new version provided...');
+    let newVersion;
+    const versionIndex = proc.argv.findIndex(function (argv) { return argv.includes('--np-new-version='); });
+    if (versionIndex > -1) {
+        const versionArg = proc.argv[versionIndex].split('--np-new-version=');
+        newVersion = versionArg[1] == null || versionArg[1] === '' ? undefined : versionArg[1];
+    }
+    if (newVersion == null) {
+        newVersion = await question('No version provided. Type the new version: ');
+    }
+    console.log('**** Version to publish: ' + newVersion);
+    return newVersion;
+}
+
+async function startGeneratingDocs(settings) {
+    console.log('==>>> Starting the Docs generation');
+
+    await generatingDocument(settings);
+    await changingVersion(settings);
+    await pushingChanges(settings);
+}
+
+async function generatingDocument(settings) {
+    console.log('==>>> Generating Document...');
+    await execute(`doxdox './dist/**/*.js' --output ${settings.docsFileName} --ignore './dist/cjs/**/*.js' --package ${settings.packagePath} --layout markdown`);
+}
+
+async function changingVersion(settings) {
+    console.log('==>>> Replacing the old version in the document');
+    const doc = await fs.readFileSync(settings.docsPath, 'utf8');
+    const replacedDoc = doc.replace(settings.currentVersion, settings.newVersion);
+    await fs.writeFileSync(settings.docsPath, replacedDoc, 'utf8');
+}
+
+async function pushingChanges(settings) {
+    console.log('==>>> Commiting and Pushing Docs changes...');
+
+    const gitStatus = await execute('git status -s');
+    console.log('gitStatus', gitStatus);
+    if (gitStatus.stdout !== '') {
+        const gitStdout = await execute('git rev-parse --abbrev-ref HEAD');
+        console.log('gitStdout', gitStdout);
+        await execute(`git add ${settings.docsPath}`);
+        await execute(`git commit -m "📝 docs: Updated docs${settings.newVersion != null || settings.newVersion !== '' ? ' for ' + settings.newVersion : ''}"`);
+        await execute(`git push -u origin ${gitStdout.stdout}`);
+    } else {
+        console.log('Nothing to Push');
+    }
+}
+ 
+ async function revertChanges(settings) {
+    console.log('>>> Checking for modifications...');
+    console.warn(`>>> Unstaging posible changes from ${settings.docsFileName} and ${settings.packageFileName} file`);
+    await execute(`git restore --staged ${settings.docsPath} ${settings.packagePath}`);
+    console.warn(`>>> Discarting posible changes of ${settings.docsFileName} and ${settings.packageFileName} file`);
+    await execute(`git checkout -- ${settings.docsPath} ${settings.packagePath}`);
+}
+
+ async function init() {
+    console.log('Generating Docs execution.');
+    let settings = {
+        currentVersion: '',
+        docsPath: './README.md',
+        docsFileName: 'README.md',
+        newVersion: undefined,
+        packageFileName: 'package.json',
+        packagePath: './package.json',
+     };
+ 
+    try {
+        settings["currentVersion"] = await getPackageJson(settings);
+        settings["newVersion"] = await getNewVersion();
+
+        await startGeneratingDocs(settings);
+        console.info('Docs were generated.');
+    } catch (err) {
+        console.error('Error: ', err);
+        await revertChanges(settings);
+    } finally {
+        console.log('Execution finished');
+        exit();
+    }
+ }
+  
+ init();
+ 

package/{publishing.js → scripts/publishing/index.js}

@@ -134,22 +134,36 @@ async function startGeneratingDocs(settings) {
     console.log('==>>> Starting the Docs generation');
 
     await generatingDocument(settings);
+    await changingVersion(settings);
     await pushingChanges(settings);
 }
 
 async function generatingDocument(settings) {
     console.log('==>>> Generating Document...');
-    await execute(`doxdox './dist/.+\\.js' --output ${settings.docsFileName} --ignore './dist/cjs/.+\\.js' --package ${settings.packagePath}`);
+    await execute(`doxdox './dist/**/*.js' --output ${settings.docsFileName} --ignore './dist/cjs/**/*.js' --package ${settings.packagePath} --layout markdown`);
+}
+
+async function changingVersion(settings) {
+    console.log('==>>> Replacing the old version in the document');
+    const doc = await fs.readFileSync(settings.docsPath, 'utf8');
+    const replacedDoc = doc.replace(settings.currentVersion, settings.newVersion);
+    await fs.writeFileSync(settings.docsPath, replacedDoc, 'utf8');
 }
 
 async function pushingChanges(settings) {
     console.log('==>>> Commiting and Pushing Docs changes...');
 
-    const gitStdout = await execute('git rev-parse --abbrev-ref HEAD');
-    console.log('gitStdout', gitStdout);
-    await execute(`git add ${settings.docsPath}`);
-    await execute(`git commit -m "📝 docs: Updated docs${settings.newVersion != null || settings.newVersion !== '' ? ' for ' + settings.newVersion : ''}"`);
-    await execute(`git push -u origin ${gitStdout.stdout}`);
+    const gitStatus = await execute('git status -s');
+    console.log('gitStatus', gitStatus);
+    if (gitStatus.stdout !== '') {
+        const gitStdout = await execute('git rev-parse --abbrev-ref HEAD');
+        console.log('gitStdout', gitStdout);
+        await execute(`git add ${settings.docsPath}`);
+        await execute(`git commit -m "📝 docs: Updated docs${settings.newVersion != null || settings.newVersion !== '' ? ' for ' + settings.newVersion : ''}"`);
+        await execute(`git push -u origin ${gitStdout.stdout}`);
+    } else {
+        console.log('Nothing to Push');
+    }
 }
 
 async function revertChanges(settings) {
@@ -171,7 +185,6 @@ async function init() {
         packageFileName: 'package.json',
         packageLockPath: './package-lock.json',
         packagePath: './package.json',
-        
     };
 
     console.log('Welcome. The publishing operationg will begin.');
@@ -181,8 +194,8 @@ async function init() {
 
         await cleaningProject(settings);
         await buildingBundle(settings);
-        await startPublishingVersion(settings);
         await startGeneratingDocs(settings);
+        await startPublishingVersion(settings);
         console.info('Finished Publishing');
     } catch (err) {
         console.error('Error: ', err);

package/src/charts/constants/index.ts

@@ -1,5 +1,4 @@
 export * from './AGGREGATE_ABBREVIATION';
-export * from './AGGREGATE_GENERAL';
 export * from './AGGREGATE_INFO_LIST';
 export * from './AGGREGATE_INFO';
 export * from './AGGREGATE_LABEL';

package/src/columns/constants/COLUMN_LABEL.ts

@@ -17,6 +17,7 @@ export const COLUMN_LABEL = {
 	CHECKLIST: 'Check List',
 	NPS_SCORE: 'NPS Score',
 	NPS_FEEDBACK: 'NPS Feedback',
+	TEXT: 'Text',
 	TEXT_LABEL: 'Text Label',
 	TEXT_CATEGORY: 'Text Category',
 	LOOKUP: 'Lookup',

package/src/columns/constants/COLUMN_PROPERTY_INFO.ts

@@ -12,7 +12,7 @@ import { DATE_DISTINCT_TIME_PROPERTY_INFO_LIST } from "../../dates/constants/DAT
 export const COLUMN_PROPERTY_INFO: { [key in IColumnType]?: IColumnPropertyInfo[] } = {
   [COLUMN.LOOKUP]: [
     { value: COLUMN_PROPERTY.LOOKUP_DISPLAY, label: 'Display', shortLabel: 'Display', abbrLabel: 'DSY', displayed: true, i18nLabelPath: 'common.properties.lookup_display_label' },
-    { value: COLUMN_PROPERTY.LOOKUP_VALUE, label: 'Value', shortLabel: 'Value', abbrLabel: 'Val', displayed: true, i18nLabelPath: 'common.properties.lookup_display_value' }
+    { value: COLUMN_PROPERTY.LOOKUP_VALUE, label: 'Value', shortLabel: 'Value', abbrLabel: 'Val', displayed: true, i18nLabelPath: 'common.properties.lookup_value_label' }
   ],
   [COLUMN.DATE]: [
     ...DATE_GROUPING_PROPERTY_INFO_LIST,

package/src/columns/constants/index.ts

@@ -1,12 +1,7 @@
-export * from './COLUMN_IMAGE_UPLOAD_OPTION_LIST';
-export * from './COLUMN_IMAGE_UPLOAD_OPTION';
-
 export * from './COLUMN_INFO_LIST';
 export * from './COLUMN_INFO';
-export * from './COLUMN_LABEL';
 export * from './COLUMN_PROPERTIES';
 export * from './COLUMN_PROPERTY_INFO';
-export * from './COLUMN_PROPERTY_LABEL';
 export * from './COLUMN_PROPERTY';
 export * from './COLUMN';
 export * from './COLUMNS';

package/src/columns/helpers/index.ts

@@ -1,8 +1,3 @@
-export * from './getColumnsLabel';
-export * from './getDatasetByColumn';
-export * from './getDatasetColumn';
-export * from './getDatasetColumnyDatasets';
-export * from './getModelColumn';
 export * from './isComplexColumn';
 export * from './isDateColumn';
 export * from './isNumericalColumn';