@qrvey/utils 1.3.0-8 → 1.3.0-9

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

@@ -10,6 +10,8 @@ const isEmpty_1 = require("../../../general/mix/isEmpty");
  * @returns A new filter data with the filtered filters by columns
  */
 function getFiltersByDatasetsColumns(data, datasets = []) {
+    if ((0, isEmpty_1.isEmpty)(data) || (0, isEmpty_1.isEmpty)(data.scopes))
+        return;
     return Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
                 const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
                 if (!(0, isEmpty_1.isEmpty)(dataset)) {

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

@@ -7,6 +7,8 @@ import { isEmpty } from "../../../general/mix/isEmpty";
  * @returns A new filter data with the filtered filters by columns
  */
 export function getFiltersByDatasetsColumns(data, datasets = []) {
+    if (isEmpty(data) || isEmpty(data.scopes))
+        return;
     return Object.assign(Object.assign({}, data), { scopes: data.scopes.map(scope => (Object.assign(Object.assign({}, scope), { datasets: scope.datasets.map(filterDataset => {
                 const dataset = datasets.find(data => data.qrveyid === filterDataset.qrveyid);
                 if (!isEmpty(dataset)) {

package/jest.config.js

@@ -1,5 +1,5 @@
 module.exports = {
-  preset: 'ts-jest',
+  // preset: 'ts-jest',
   testEnvironment: 'node',
   verbose: true,
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@qrvey/utils",
-  "version": "1.3.0-8",
+  "version": "1.3.0-9",
   "description": "Helper, Utils for all Qrvey Projects",
   "homepage": "https://bitbucket.org/qrvey/qrvey_utils/wiki/Home",
   "main": "dist/index.js",
@@ -11,6 +11,7 @@
     "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",
+    "pipeline": "npm run build-clean && npm run lint && npm run test",
     "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",
@@ -22,13 +23,13 @@
   "license": "MIT",
   "devDependencies": {
     "@compodoc/compodoc": "1.1.19",
-    "@types/jest": "27.5.0",
+    "@types/jest": "27.5.1",
     "@typescript-eslint/eslint-plugin": "5.22.0",
     "@typescript-eslint/parser": "5.22.0",
     "eslint": "8.14.0",
-    "jest": "27.5.1",
+    "jest": "28.1.0",
     "np": "7.6.1",
-    "ts-jest": "27.1.4",
+    "ts-jest": "28.0.2",
     "typedoc": "0.22.15",
     "typescript": "4.6.4"
   },

package/src/filters/helpers/common/getFiltersByDatasetsColumns.ts

@@ -10,6 +10,8 @@ import { IFUData } from "../../interfaces/ui/IFUData";
  * @returns A new filter data with the filtered filters by columns
  */
 export function getFiltersByDatasetsColumns(data: IFUData, datasets: IDataset[] = []): IFUData {
+    if (isEmpty(data) || isEmpty(data.scopes)) return;
+
     return {
         ...data,
         scopes: data.scopes.map(scope => ({

package/test/tokens/isTokenLabel.test.js

@@ -0,0 +1,259 @@
+// import { isTokenLabel } from '../../src/tokens/isTokenLabel';
+
+// describe('Testing undefined argument', function () {
+//     test('no argument passed', function () {
+//         const validation: boolean = isTokenLabel();
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Undefined argument', function () {
+//         const validation: boolean = isTokenLabel(undefined);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Null argument', function () {
+//         const validation: boolean = isTokenLabel(null);
+//         expect(validation).toBeFalsy();
+//     });
+// });
+
+// describe('Testing no-string arguments', function () {
+//     const variable1: any = 1;
+//     const variable2: any = false;
+//     const variable3: any = new Date();
+//     const variable4: any = { const1: 'Hello', const2: 'World'};
+//     const variable5: any = ['Hello', 'World'];
+
+//     test('Numeric variable', function () {
+//         const validation: boolean = isTokenLabel(variable1);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Boolean variable', function () {
+//         const validation: boolean = isTokenLabel(variable2);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Date object variable', function () {
+//         const validation: boolean = isTokenLabel(variable3);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Object variable', function () {
+//         const validation: boolean = isTokenLabel(variable4);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Array variable', function () {
+//         const validation: boolean = isTokenLabel(variable5);
+//         expect(validation).toBeFalsy();
+//     });
+// });
+
+// describe('Testing invalid string argument', function () {
+//     const variable1: string = '';
+//     const variable2: string = 'Hello World';
+//     const variable3: string = '{}';
+//     const variable4: string = '{{}}';
+//     const variable5: string = '{{ }}';
+//     const variable6: string = '{{ Hello }}';
+//     const variable7: string = '{{Hello}';
+//     const variable8: string = '{{Hello}}{{World}}';
+//     const variable9: string = '{Hello}';
+    
+//     test('Empty string', function () {
+//         const validation: boolean = isTokenLabel(variable1);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Non-empty and regular string', function () {
+//         const validation: boolean = isTokenLabel(variable2);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Single curly brackets and empty label', function () {
+//         const validation: boolean = isTokenLabel(variable3);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Double curly brackets and empty label', function () {
+//         const validation: boolean = isTokenLabel(variable4);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Double curly brackets and space between them', function () {
+//         const validation: boolean = isTokenLabel(variable5);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Double curly brackets and non-empty label with space between them', function () {
+//         const validation: boolean = isTokenLabel(variable6);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Double left and single right curly brackets and non-empty label', function () {
+//         const validation: boolean = isTokenLabel(variable7);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Two data tokens in a single string', function () {
+//         const validation: boolean = isTokenLabel(variable8);
+//         expect(validation).toBeFalsy();
+//     });
+
+//     test('Single curly brackets and non-empty label', function () {
+//         const validation: boolean = isTokenLabel(variable9);
+//         expect(validation).toBeFalsy();
+//     });
+// });
+
+// describe('Regular scenarios', function () {
+//     const variable1: string = '{{NOW}}';
+//     const variable2: string = '{{LAST_YEAR_END}}';
+//     const variable3: string = '{{data.marathonparatooltips-cambiodesorting.FECHA.avg}}';
+    
+//     test('Scenario #1', function () {
+//         const validation: boolean = isTokenLabel(variable1);
+//         expect(validation).toBeTruthy();
+//     });
+
+//     test('Scenario #2', function () {
+//         const validation: boolean = isTokenLabel(variable2);
+//         expect(validation).toBeTruthy();
+//     });
+
+//     test('Scenario #3', function () {
+//         const validation: boolean = isTokenLabel(variable3);
+//         expect(validation).toBeTruthy();
+//     });
+// });
+
+const { isTokenLabel } = require("../../dist/cjs");
+
+describe('Testing undefined argument', function () {
+    test('no argument passed', function () {
+        const validation = isTokenLabel();
+        expect(validation).toBeFalsy();
+    });
+
+    test('Undefined argument', function () {
+        const validation = isTokenLabel(undefined);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Null argument', function () {
+        const validation = isTokenLabel(null);
+        expect(validation).toBeFalsy();
+    });
+});
+
+describe('Testing no-string arguments', function () {
+    const variable1 = 1;
+    const variable2 = false;
+    const variable3 = new Date();
+    const variable4 = { const1: 'Hello', const2: 'World'};
+    const variable5 = ['Hello', 'World'];
+
+    test('Numeric variable', function () {
+        const validation = isTokenLabel(variable1);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Boolean variable', function () {
+        const validation = isTokenLabel(variable2);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Date object variable', function () {
+        const validation = isTokenLabel(variable3);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Object variable', function () {
+        const validation = isTokenLabel(variable4);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Array variable', function () {
+        const validation = isTokenLabel(variable5);
+        expect(validation).toBeFalsy();
+    });
+});
+
+describe('Testing invalid string argument', function () {
+    const variable1 = '';
+    const variable2 = 'Hello World';
+    const variable3 = '{}';
+    const variable4 = '{{}}';
+    const variable5 = '{{ }}';
+    const variable6 = '{{ Hello }}';
+    const variable7 = '{{Hello}';
+    const variable8 = '{{Hello}}{{World}}';
+    const variable9 = '{Hello}';
+    
+    test('Empty string', function () {
+        const validation = isTokenLabel(variable1);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Non-empty and regular string', function () {
+        const validation = isTokenLabel(variable2);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Single curly brackets and empty label', function () {
+        const validation = isTokenLabel(variable3);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Double curly brackets and empty label', function () {
+        const validation = isTokenLabel(variable4);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Double curly brackets and space between them', function () {
+        const validation = isTokenLabel(variable5);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Double curly brackets and non-empty label with space between them', function () {
+        const validation = isTokenLabel(variable6);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Double left and single right curly brackets and non-empty label', function () {
+        const validation = isTokenLabel(variable7);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Two data tokens in a single string', function () {
+        const validation = isTokenLabel(variable8);
+        expect(validation).toBeFalsy();
+    });
+
+    test('Single curly brackets and non-empty label', function () {
+        const validation = isTokenLabel(variable9);
+        expect(validation).toBeFalsy();
+    });
+});
+
+describe('Regular scenarios', function () {
+    const variable1 = '{{NOW}}';
+    const variable2 = '{{LAST_YEAR_END}}';
+    const variable3 = '{{data.marathonparatooltips-cambiodesorting.FECHA.avg}}';
+    
+    test('Scenario #1', function () {
+        const validation = isTokenLabel(variable1);
+        expect(validation).toBeTruthy();
+    });
+
+    test('Scenario #2', function () {
+        const validation = isTokenLabel(variable2);
+        expect(validation).toBeTruthy();
+    });
+
+    test('Scenario #3', function () {
+        const validation = isTokenLabel(variable3);
+        expect(validation).toBeTruthy();
+    });
+});

package/tsconfig.json

@@ -62,11 +62,5 @@
 
     /* Advanced Options */
     "forceConsistentCasingInFileNames": true  /* Disallow inconsistently-cased references to the same file. */
-  },
-  "include": [
-    "src"
-  ],
-  "exclude": [
-    "test"
-  ]
+  }
 }

package/test/tokens/isTokenLabel.test.ts

@@ -1,129 +0,0 @@
-import { isTokenLabel } from '../../src/tokens/isTokenLabel';
-
-describe('Testing undefined argument', function () {
-    test('no argument passed', function () {
-        const validation: boolean = isTokenLabel();
-        expect(validation).toBeFalsy();
-    });
-
-    test('Undefined argument', function () {
-        const validation: boolean = isTokenLabel(undefined);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Null argument', function () {
-        const validation: boolean = isTokenLabel(null);
-        expect(validation).toBeFalsy();
-    });
-});
-
-describe('Testing no-string arguments', function () {
-    const variable1: any = 1;
-    const variable2: any = false;
-    const variable3: any = new Date();
-    const variable4: any = { const1: 'Hello', const2: 'World'};
-    const variable5: any = ['Hello', 'World'];
-
-    test('Numeric variable', function () {
-        const validation: boolean = isTokenLabel(variable1);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Boolean variable', function () {
-        const validation: boolean = isTokenLabel(variable2);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Date object variable', function () {
-        const validation: boolean = isTokenLabel(variable3);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Object variable', function () {
-        const validation: boolean = isTokenLabel(variable4);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Array variable', function () {
-        const validation: boolean = isTokenLabel(variable5);
-        expect(validation).toBeFalsy();
-    });
-});
-
-describe('Testing invalid string argument', function () {
-    const variable1: string = '';
-    const variable2: string = 'Hello World';
-    const variable3: string = '{}';
-    const variable4: string = '{{}}';
-    const variable5: string = '{{ }}';
-    const variable6: string = '{{ Hello }}';
-    const variable7: string = '{{Hello}';
-    const variable8: string = '{{Hello}}{{World}}';
-    const variable9: string = '{Hello}';
-    
-    test('Empty string', function () {
-        const validation: boolean = isTokenLabel(variable1);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Non-empty and regular string', function () {
-        const validation: boolean = isTokenLabel(variable2);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Single curly brackets and empty label', function () {
-        const validation: boolean = isTokenLabel(variable3);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Double curly brackets and empty label', function () {
-        const validation: boolean = isTokenLabel(variable4);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Double curly brackets and space between them', function () {
-        const validation: boolean = isTokenLabel(variable5);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Double curly brackets and non-empty label with space between them', function () {
-        const validation: boolean = isTokenLabel(variable6);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Double left and single right curly brackets and non-empty label', function () {
-        const validation: boolean = isTokenLabel(variable7);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Two data tokens in a single string', function () {
-        const validation: boolean = isTokenLabel(variable8);
-        expect(validation).toBeFalsy();
-    });
-
-    test('Single curly brackets and non-empty label', function () {
-        const validation: boolean = isTokenLabel(variable9);
-        expect(validation).toBeFalsy();
-    });
-});
-
-describe('Regular scenarios', function () {
-    const variable1: string = '{{NOW}}';
-    const variable2: string = '{{LAST_YEAR_END}}';
-    const variable3: string = '{{data.marathonparatooltips-cambiodesorting.FECHA.avg}}';
-    
-    test('Scenario #1', function () {
-        const validation: boolean = isTokenLabel(variable1);
-        expect(validation).toBeTruthy();
-    });
-
-    test('Scenario #2', function () {
-        const validation: boolean = isTokenLabel(variable2);
-        expect(validation).toBeTruthy();
-    });
-
-    test('Scenario #3', function () {
-        const validation: boolean = isTokenLabel(variable3);
-        expect(validation).toBeTruthy();
-    });
-});