@becollective/utils 2.0.13 → 2.0.14

package/.semaphore/utils.yml

@@ -4,11 +4,17 @@ agent:
   machine:
     type: e1-standard-2
     os_image: ubuntu2404
+global_job_config:
+  epilogue:
+    always:
+      commands:
+        - '[[ -f packages/utils/test-results/report.xml ]] && test-results publish packages/utils/test-results/report.xml || true'
 blocks:
   - name: Test
+    skip:
+      when: "change_in('/packages/utils', {default_branch: 'master', on_tags: false}) = false"
     task:
       secrets:
-        - name: NPM
         - name: BUILD_DEPRECATED
       prologue:
         commands:
@@ -20,25 +26,10 @@ blocks:
           commands:
             - cd ./packages/utils
             - npm ci
-            - npm run test
-  - name: Publish
-    skip:
-      when: "branch != 'master'"
-    task:
-      secrets:
-        - name: NPM
-        - name: BUILD_DEPRECATED
-      env_vars:
-        - name: PACKAGE_DIR
-          value: ./packages/utils
-      prologue:
+            - npm run citest
+after_pipeline:
+  task:
+    jobs:
+      - name: Merge reports
         commands:
-          - checkout
-          - export AWS_ACCESS_KEY_ID=$AWS_BUILD_DEPRECATED_ACCESS_KEY
-          - export AWS_SECRET_ACCESS_KEY=$AWS_BUILD_DEPRECATED_SECRET_ACCESS_KEY
-      jobs:
-        - name: Publish
-          commands:
-            - echo "deploying @becollective/utils"
-            - sh ./.semaphore/deployer.sh
-
+          - test-results gen-pipeline-report || echo "Report merge skipped (no artifacts or pull failed)"

package/jestconfig.json

@@ -5,5 +5,16 @@
   "testRegex": "(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
   "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json", "node"],
   "collectCoverage": true,
-  "setupFiles": ["./setup.ts"]
+  "setupFiles": ["./setup.ts"],
+  "reporters": [
+    "default",
+    [
+      "jest-junit",
+      {
+        "outputDirectory": "test-results",
+        "outputName": "report.xml",
+        "includeConsoleOutput": true
+      }
+    ]
+  ]
 }

package/lib/date-time.js

@@ -70,7 +70,7 @@ const getShiftText = (from, to, timezone) => {
             return '';
         const startToTimezone = luxon_1.DateTime.fromJSDate(from).setZone(timezone);
         const endToTimezone = luxon_1.DateTime.fromJSDate(to).setZone(timezone);
-        return `${startToTimezone.toFormat('cccc, DD, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
+        return `${startToTimezone.toFormat('cccc, d MMMM yyyy, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
     }
     catch (e) {
         return '';

package/lib/forms.d.ts

@@ -46,6 +46,9 @@ export declare const validator: {
             'ui:bc-multiSelect': {
                 type: string;
             };
+            'ui:bc-allowCustomAnswer': {
+                type: string;
+            };
             'ui:widget': {
                 type: string;
                 enum: string[];

package/lib/forms.js

@@ -312,6 +312,9 @@ exports.validator = {
             'ui:bc-multiSelect': {
                 type: 'boolean',
             },
+            'ui:bc-allowCustomAnswer': {
+                type: 'boolean',
+            },
             'ui:widget': {
                 type: 'string',
                 enum: widgetTypes,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becollective/utils",
-  "version": "2.0.13",
+  "version": "2.0.14",
   "description": "Common utilities",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",
@@ -11,17 +11,26 @@
   },
   "scripts": {
     "test": "npm run build && NODE_ENV=localtest jest --config jestconfig.json --detectOpenHandles --verbose --forceExit",
+    "citest": "npm run build && NODE_ENV=localtest jest --config jestconfig.json --detectOpenHandles --verbose --forceExit",
     "build": "tsc",
     "prepare": "npm run build"
   },
   "author": "",
   "license": "ISC",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/tickboxAU/becollective-npm.git"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
   "devDependencies": {
     "@types/jest": "^30.0.0",
     "@types/mongodb": "^4.0.7",
     "@types/node": "^25.6.0",
     "@types/pino": "^7.0.5",
     "jest": "^30.3.0",
+    "jest-junit": "^17.0.0",
     "prettier": "^3.8.3",
     "ts-jest": "^29.4.9",
     "tslint": "^6.1.3",

package/src/date-time.ts

@@ -67,7 +67,7 @@ export const getShiftText = (from, to, timezone) => {
     if (!from || !to || !timezone) return '';
     const startToTimezone = DateTime.fromJSDate(from).setZone(timezone);
     const endToTimezone = DateTime.fromJSDate(to).setZone(timezone);
-    return `${startToTimezone.toFormat('cccc, DD, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
+    return `${startToTimezone.toFormat('cccc, d MMMM yyyy, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
   }
   catch (e) {
     return '';

package/src/forms.ts

@@ -359,6 +359,9 @@ export const validator = {
       'ui:bc-multiSelect': {
         type: 'boolean',
       },
+      'ui:bc-allowCustomAnswer': {
+        type: 'boolean',
+      },
       'ui:widget': {
         type: 'string',
         enum: widgetTypes,

package/tests/forms.test.ts

@@ -1,5 +1,5 @@
 'use strict';
-const validator = require('../src/forms');
+const { validator } = require('../lib/forms');
 const testSchema = require('./forms.test-schema.json');
 const testUischema = require('./forms.test-uischema.json');
 const testData = require('./forms.test-data.json');
@@ -136,6 +136,40 @@ describe('validateSchema', () => {
     ]);
   });
 
+  test('should accept array schema with custom answer pattern in anyOf', () => {
+    const t = {
+      data: {
+        type: 'object',
+        required: [],
+        properties: {
+          q1: {
+            title: 'Pick one',
+            type: 'array',
+            uniqueItems: true,
+            items: {
+              type: 'string',
+              anyOf: [
+                { type: 'string', enum: ['Yes'] },
+                { type: 'string', enum: ['No'] },
+                { type: 'string', pattern: '^Other: .+' },
+              ],
+            },
+          },
+        },
+      },
+      ui: {
+        'ui:order': ['q1'],
+        q1: {
+          'ui:widget': 'WidgetRadio',
+          'ui:title': 'Pick one',
+          'ui:bc-allowCustomAnswer': true,
+        },
+      },
+    };
+
+    return expect(validateSchema(t.data, t.ui)).resolves.toBe(true);
+  });
+
   test('should succeed, returning true when schema and uischema are valid', () => {
     return expect(validateSchema(schema, uischema)).resolves.toBe(true);
   });
@@ -303,6 +337,58 @@ describe('validateData', () => {
 
     return expect(validateData(schema, data)).resolves.toBe(undefined);
   });
+
+  test('should accept custom answer values for choice fields', () => {
+    const customChoiceSchema = {
+      type: 'object',
+      required: [],
+      properties: {
+        q1: {
+          title: 'Pick one',
+          type: 'array',
+          uniqueItems: true,
+          items: {
+            type: 'string',
+            anyOf: [
+              { type: 'string', enum: ['Yes'] },
+              { type: 'string', enum: ['No'] },
+              { type: 'string', pattern: '^Other: .+' },
+            ],
+          },
+        },
+      },
+    };
+
+    return expect(
+      validateData(customChoiceSchema, { q1: ['Other: Prefer weekends'] }),
+    ).resolves.toBe(undefined);
+  });
+
+  test('should reject incomplete custom answer values for choice fields', () => {
+    const customChoiceSchema = {
+      type: 'object',
+      required: [],
+      properties: {
+        q1: {
+          title: 'Pick one',
+          type: 'array',
+          uniqueItems: true,
+          items: {
+            type: 'string',
+            anyOf: [
+              { type: 'string', enum: ['Yes'] },
+              { type: 'string', enum: ['No'] },
+              { type: 'string', pattern: '^Other: .+' },
+            ],
+          },
+        },
+      },
+    };
+
+    return expect(validateData(customChoiceSchema, { q1: ['Other'] })).rejects.toEqual([
+      expect.objectContaining({ name: 'Datatype is not an array of strings' }),
+    ]);
+  });
 });
 
 describe('stripEmptyArraysFromData', () => {
@@ -569,6 +655,40 @@ describe('dataTypeIsValid', () => {
     });
   });
 
+  describe('array with custom answer', () => {
+    const choice = {
+      schema: {
+        type: 'array',
+        title: 'Pick one',
+        items: {
+          type: 'string',
+          anyOf: [
+            { type: 'string', enum: ['Yes'] },
+            { type: 'string', enum: ['No'] },
+            { type: 'string', pattern: '^Other: .+' },
+          ],
+        },
+        uniqueItems: true,
+      },
+    };
+
+    test('should return true for a completed custom answer', () => {
+      expect(isValid.array(['Other: Prefer weekends'], choice.schema)).toBe(true);
+    });
+
+    test('should return true for a predefined option', () => {
+      expect(isValid.array(['No'], choice.schema)).toBe(true);
+    });
+
+    test('should return false for incomplete Other without text', () => {
+      expect(isValid.array(['Other'], choice.schema)).toBe(false);
+    });
+
+    test('should return false for arbitrary text not matching pattern', () => {
+      expect(isValid.array(['Maybe'], choice.schema)).toBe(false);
+    });
+  });
+
   describe('skills', () => {
     const skills = {
       schema: {

package/lib/rrule/parsing.test.d.ts

@@ -1 +0,0 @@
-export {};

package/lib/rrule/parsing.test.js

@@ -1,11 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const parsing_1 = require("./parsing");
-it('removes null or undefined fields', () => {
-    expect((0, parsing_1.toRruleStr)({
-        DTSTART: '20120201T023000Z',
-        DURATION: '1h',
-        COUNT: null,
-        UNTIL: undefined,
-    })).toEqual('DTSTART=20120201T023000Z;DURATION=1h');
-});

package/lib/src/FeatureFlag.d.ts

@@ -1,12 +0,0 @@
-export declare class FeatureFlag {
-    ttl: number;
-    expiry: number;
-    constructor(ttl?: any);
-    isFeatureActive(feature: string, options: {
-        env: string;
-        region?: string;
-    }): Promise<boolean>;
-    clearCache(): void;
-    setCacheTtl(ttl: number): void;
-}
-export default FeatureFlag;

package/lib/src/FeatureFlag.js

@@ -1,51 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.FeatureFlag = void 0;
-const cache = {
-    store: new Map(),
-    memoize: async (feature, options) => {
-        const stringified = JSON.stringify({ feature, options });
-        const response = cache.store.get(stringified);
-        if (response) {
-            return JSON.parse(response);
-        }
-        const fetchResponse = await fetchFeatureActive(feature, options);
-        cache.store.set(stringified, JSON.stringify(fetchResponse));
-        return fetchResponse;
-    },
-};
-const fetchFeatureActive = async (feature, options) => {
-    const getFlagByFeatureUrl = `https://lb-central.becollective.com/api/v2/feature-flags/${feature}`;
-    let isFeatureActive = false;
-    const featureFlags = await fetch(getFlagByFeatureUrl, { method: 'get' });
-    const json = await featureFlags.json();
-    const environments = json.Environments;
-    if (environments) {
-        isFeatureActive = environments.includes(options.env);
-    }
-    return isFeatureActive;
-};
-class FeatureFlag {
-    constructor(ttl) {
-        this.ttl = ttl || 1000 * 60 * 5; // default to 5 minutes
-        this.expiry = Date.now() + ttl;
-    }
-    async isFeatureActive(feature, options) {
-        // Lazy expiration upon function call
-        const now = Date.now();
-        if (now >= this.expiry) {
-            cache.store.clear();
-            this.expiry = now + this.ttl;
-        }
-        return cache.memoize(feature, options);
-    }
-    clearCache() {
-        cache.store.clear();
-    }
-    setCacheTtl(ttl) {
-        this.ttl = ttl;
-        this.expiry = Date.now() + ttl;
-    }
-}
-exports.FeatureFlag = FeatureFlag;
-exports.default = FeatureFlag;

package/lib/src/date-time.d.ts

@@ -1,28 +0,0 @@
-/**
- * Get current age based on the given birth date
- * @param {string} dateOfBirth
- * @param {string} unit the measurement of the the difference
- *  The supported measurements are:
- *  years, months, weeks, days, hours, minutes, and seconds.
- * @returns {number} age
- */
-export declare const getAge: (dateOfBirth: any, unit?: string) => number;
-/**
- * Check if a user requires parent(guardian) consent
- * i.e. Is under the age of 16 years, based on GDPR
- * https://gdpr-info.eu/art-8-gdpr/
- * @param {string} dateOfBirth moment.js compatible date time
- * @returns {boolean}
- * NOTE:
- * We used to not allow child (under 16) to register,
- * and birthdate is not a required field for ghost user
- * So an existing user could have no birthdate, we assume these users are adults
- * TODO:
- * Remove above logic after we migrated all legacy
- * data to have a consistent birthdate property.
- * Then we should throw error if birthdate is not valid
- */
-export declare const isUnderSixteen: (dateOfBirth: any) => boolean;
-export declare const isUnderAge: (dateOfBirth: any, limit: any, maxAcknowledgedAge?: number | null) => boolean;
-export declare const datesByThemselves: (a: any, b: any) => number;
-export declare const getShiftText: (from: any, to: any, timezone: any) => string;

package/lib/src/date-time.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.getShiftText = exports.datesByThemselves = exports.isUnderAge = exports.isUnderSixteen = exports.getAge = void 0;
-const luxon_1 = require("luxon");
-/**
- * Get current age based on the given birth date
- * @param {string} dateOfBirth
- * @param {string} unit the measurement of the the difference
- *  The supported measurements are:
- *  years, months, weeks, days, hours, minutes, and seconds.
- * @returns {number} age
- */
-const getAge = (dateOfBirth, unit = 'years') => {
-    if (!dateOfBirth) {
-        throw new Error('Invalid date');
-    }
-    const dob = luxon_1.DateTime.fromJSDate(new Date(dateOfBirth));
-    if (!dob.isValid) {
-        throw new Error('Invalid date');
-    }
-    const age = dob.diffNow(unit);
-    const ageUnit = -age.as(unit);
-    // Note: luxon returns scientific notation, ie 6.976154236428209e-9
-    return Number(ageUnit.toString().split('.').shift());
-};
-exports.getAge = getAge;
-/**
- * Check if a user requires parent(guardian) consent
- * i.e. Is under the age of 16 years, based on GDPR
- * https://gdpr-info.eu/art-8-gdpr/
- * @param {string} dateOfBirth moment.js compatible date time
- * @returns {boolean}
- * NOTE:
- * We used to not allow child (under 16) to register,
- * and birthdate is not a required field for ghost user
- * So an existing user could have no birthdate, we assume these users are adults
- * TODO:
- * Remove above logic after we migrated all legacy
- * data to have a consistent birthdate property.
- * Then we should throw error if birthdate is not valid
- */
-const isUnderSixteen = (dateOfBirth) => {
-    if (!dateOfBirth || !luxon_1.DateTime.fromJSDate(new Date(dateOfBirth)).isValid) {
-        return false;
-    }
-    const age = (0, exports.getAge)(dateOfBirth);
-    return isNaN(age) ? false : age < 16;
-};
-exports.isUnderSixteen = isUnderSixteen;
-const isUnderAge = (dateOfBirth, limit, maxAcknowledgedAge = null) => {
-    if ((!dateOfBirth || !luxon_1.DateTime.fromJSDate(new Date(dateOfBirth)).isValid) && !maxAcknowledgedAge) {
-        return false;
-    }
-    if (dateOfBirth) {
-        const age = (0, exports.getAge)(dateOfBirth);
-        return isNaN(age) ? true : age < limit;
-    }
-    return maxAcknowledgedAge ? maxAcknowledgedAge < limit : true;
-};
-exports.isUnderAge = isUnderAge;
-const datesByThemselves = (a, b) => {
-    if (!a.from)
-        return 1;
-    return new Date(a.from).getTime() - new Date(b.from).getTime();
-};
-exports.datesByThemselves = datesByThemselves;
-const getShiftText = (from, to, timezone) => {
-    try {
-        if (!from || !to || !timezone)
-            return '';
-        const startToTimezone = luxon_1.DateTime.fromJSDate(from).setZone(timezone);
-        const endToTimezone = luxon_1.DateTime.fromJSDate(to).setZone(timezone);
-        return `${startToTimezone.toFormat('cccc, DD, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
-    }
-    catch (e) {
-        return '';
-    }
-};
-exports.getShiftText = getShiftText;

package/lib/src/forms.d.ts

@@ -1 +0,0 @@
-export {};