@becollective/utils 2.0.14 → 2.0.16

package/.semaphore/utils.yml

@@ -1,14 +1,9 @@
 version: v1.0
-name: @becollective/utils
+name: "@becollective/utils"
 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:
@@ -25,8 +20,16 @@ blocks:
         - name: Test
           commands:
             - cd ./packages/utils
+            - sudo sysctl -w net.ipv6.conf.all.disable_ipv6=1
+            - sudo sysctl -w net.ipv6.conf.default.disable_ipv6=1
             - npm ci
+            - echo "IPv4 $(curl -4 -s https://wtfismyip.com/text)"
+            - echo "IPv6 $(curl -6 -s https://wtfismyip.com/text || echo disabled)"
             - npm run citest
+      epilogue:
+        always:
+          commands:
+            - '[[ -f test-results/report.xml ]] && test-results publish test-results/report.xml || true'
 after_pipeline:
   task:
     jobs:

package/lib/date-time.js

@@ -68,8 +68,11 @@ 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);
+        // GraphQL / JSON often yield ISO strings; fromJSDate alone rejects those as Invalid.
+        const startToTimezone = luxon_1.DateTime.fromJSDate(new Date(from)).setZone(timezone);
+        const endToTimezone = luxon_1.DateTime.fromJSDate(new Date(to)).setZone(timezone);
+        if (!startToTimezone.isValid || !endToTimezone.isValid)
+            return '';
         return `${startToTimezone.toFormat('cccc, d MMMM yyyy, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
     }
     catch (e) {

package/lib/index.d.ts

@@ -0,0 +1,7 @@
+export { password } from './password';
+export { isUnderSixteen, isUnderAge, getAge, datesByThemselves, getShiftText } from './date-time';
+export { getCurrencyFromCurrencyCode, makeMoneyString } from './money';
+export { readableOpportunityType } from './opportunity';
+export { getTimeInfo } from './opportunityUser';
+export { getHomeLocalityFromLocationList } from './locality';
+export { FeatureFlag } from './FeatureFlag';

package/lib/index.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.FeatureFlag = exports.getHomeLocalityFromLocationList = exports.getTimeInfo = exports.readableOpportunityType = exports.makeMoneyString = exports.getCurrencyFromCurrencyCode = exports.getShiftText = exports.datesByThemselves = exports.getAge = exports.isUnderAge = exports.isUnderSixteen = exports.password = void 0;
+var password_1 = require("./password");
+Object.defineProperty(exports, "password", { enumerable: true, get: function () { return password_1.password; } });
+var date_time_1 = require("./date-time");
+Object.defineProperty(exports, "isUnderSixteen", { enumerable: true, get: function () { return date_time_1.isUnderSixteen; } });
+Object.defineProperty(exports, "isUnderAge", { enumerable: true, get: function () { return date_time_1.isUnderAge; } });
+Object.defineProperty(exports, "getAge", { enumerable: true, get: function () { return date_time_1.getAge; } });
+Object.defineProperty(exports, "datesByThemselves", { enumerable: true, get: function () { return date_time_1.datesByThemselves; } });
+Object.defineProperty(exports, "getShiftText", { enumerable: true, get: function () { return date_time_1.getShiftText; } });
+var money_1 = require("./money");
+Object.defineProperty(exports, "getCurrencyFromCurrencyCode", { enumerable: true, get: function () { return money_1.getCurrencyFromCurrencyCode; } });
+Object.defineProperty(exports, "makeMoneyString", { enumerable: true, get: function () { return money_1.makeMoneyString; } });
+var opportunity_1 = require("./opportunity");
+Object.defineProperty(exports, "readableOpportunityType", { enumerable: true, get: function () { return opportunity_1.readableOpportunityType; } });
+var opportunityUser_1 = require("./opportunityUser");
+Object.defineProperty(exports, "getTimeInfo", { enumerable: true, get: function () { return opportunityUser_1.getTimeInfo; } });
+var locality_1 = require("./locality");
+Object.defineProperty(exports, "getHomeLocalityFromLocationList", { enumerable: true, get: function () { return locality_1.getHomeLocalityFromLocationList; } });
+var FeatureFlag_1 = require("./FeatureFlag");
+Object.defineProperty(exports, "FeatureFlag", { enumerable: true, get: function () { return FeatureFlag_1.FeatureFlag; } });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becollective/utils",
-  "version": "2.0.14",
+  "version": "2.0.16",
   "description": "Common utilities",
   "main": "lib/index.js",
   "types": "lib/index.d.ts",

package/src/date-time.ts

@@ -65,8 +65,10 @@ export const datesByThemselves = (a, b) => {
 export const getShiftText = (from, to, timezone) => {
   try {
     if (!from || !to || !timezone) return '';
-    const startToTimezone = DateTime.fromJSDate(from).setZone(timezone);
-    const endToTimezone = DateTime.fromJSDate(to).setZone(timezone);
+    // GraphQL / JSON often yield ISO strings; fromJSDate alone rejects those as Invalid.
+    const startToTimezone = DateTime.fromJSDate(new Date(from)).setZone(timezone);
+    const endToTimezone = DateTime.fromJSDate(new Date(to)).setZone(timezone);
+    if (!startToTimezone.isValid || !endToTimezone.isValid) return '';
     return `${startToTimezone.toFormat('cccc, d MMMM yyyy, h:mma')}-${endToTimezone.toFormat('h:mma')}`;
   }
   catch (e) {

package/src/index.ts

@@ -0,0 +1,7 @@
+export { password } from './password';
+export { isUnderSixteen, isUnderAge, getAge, datesByThemselves, getShiftText } from './date-time';
+export { getCurrencyFromCurrencyCode, makeMoneyString } from './money';
+export { readableOpportunityType } from './opportunity';
+export { getTimeInfo } from './opportunityUser';
+export { getHomeLocalityFromLocationList } from './locality';
+export { FeatureFlag } from './FeatureFlag';

package/tests/date-time.test.ts

@@ -150,6 +150,11 @@ describe('getShiftText', () => {
   test('get shift text with auckland timezone', () => {
     expect(getShiftText(from, to, auckland)).toBe('Thursday, 30 July 2020, 12:00PM-5:30PM');
   });
+  test('accepts ISO strings from GraphQL', () => {
+    expect(getShiftText(from.toISOString(), to.toISOString(), melbourne)).toBe(
+      'Thursday, 30 July 2020, 10:00AM-3:30PM',
+    );
+  });
   // Will not execute due to TypeScript
   // test('with empty data', () => {
   //   expect(getShiftText()).toBe('');

package/index.ts

@@ -1,7 +0,0 @@
-export { password } from './src/password';
-export { isUnderSixteen, isUnderAge, getAge, datesByThemselves, getShiftText } from './src/date-time';
-export { getCurrencyFromCurrencyCode, makeMoneyString } from './src/money';
-export { readableOpportunityType } from './src/opportunity';
-export { getTimeInfo } from './src/opportunityUser';
-export { getHomeLocalityFromLocationList } from './src/locality';
-export { FeatureFlag } from './src/FeatureFlag';