@becollective/utils 1.7.1 → 1.9.0

package/.semaphore/utils.yml

@@ -0,0 +1,44 @@
+version: v1.0
+name: @becollective/utils
+agent:
+  machine:
+    type: e1-standard-2
+    os_image: ubuntu2004
+blocks:
+  - name: Test
+    task:
+      secrets:
+        - name: NPM
+        - name: BUILD_DEPRECATED
+      prologue:
+        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: Test
+          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:
+        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
+

package/README.md

@@ -0,0 +1,149 @@
+# @becollective/utils
+
+## Description
+
+---
+
+A collection of helper methods for handling regional issues, feature-flags and password checking functionality.
+
+These include:
+
+- Age, underSixteen and date diff checks
+- Turns shift dates into readable text
+- Fetch feature-flags from feature flag service
+- Get a tagged home location from a list of locations
+- Money formatting strings
+- Password checks
+
+## :computer: Pre-requisites
+
+---
+
+Some projects have different node versions I would recommend using:
+[nvm](https://github.com/nvm-sh/nvm/blob/master/README.md)
+
+node version for api: `node:14-alpine`
+
+Ensure you have done the following in the [confluence](https://becollective.atlassian.net/wiki/spaces/ENGINEERIN/pages/1605849/Setup+Local+Development+Environment) link
+
+- `Setup Local Development Environment`
+
+- `Dependency services for local Be Collective Services`
+
+## :wave: Getting started
+
+---
+
+- Clone the repository
+
+```
+git clone  <https://github.com/tickboxAU/becollective-npm.git>
+```
+
+```
+cd becollective-npm
+```
+
+```
+cd packages/utils
+```
+
+```
+bcDocker
+```
+
+- `bcDocker` [confluence](https://becollective.atlassian.net/wiki/spaces/ENGINEERIN/pages/1605849/1+-+Setup+Local+Development+Environment#Dependency-services-for-local-Be-Collective-Services)
+
+- Install dependencies
+
+```
+npm install
+```
+
+- how to run tests
+
+```
+npm run test
+```
+
+- how to build
+
+```
+npm run build
+```
+
+## Project Structure
+
+---
+
+The folder structure of this project is explained below:
+
+| Name                    | Description                                        |
+| ----------------------- | -------------------------------------------------- |
+| **node_modules**        | Contains all npm dependencies                      |
+| **.semaphore**          | Contains the deployment yml for semaphore          |
+| **src/date-time**       | Date-time helper methods                           |
+| **src/FeatureFlag**     | Feature flag helper methods                        |
+| **src/locality**        | Location helper methods                            |
+| **src/money**           | Money string helper methods                        |
+| **src/opportunity**     | Opportunity types                                  |
+| **src/opportunityUser** | Opportunity time helper methods                    |
+| **src/password**        | Password validation helper methods                 |
+| **tests**               | Contain all tests                                  |
+| **jestconfig.js**       | Test configuration                                 |
+| **package.json**        | Contains npm dependencies as well as build scripts |
+| **rollup.config.js**    | config for babel and rollup combination            |
+| **setup.ts**            | Test setup script                                  |
+| **tsconfig.json**       | Config settings for TS transpiling                 |
+| **tslint.json**         | Config settings for TSLint code style checking     |
+
+### :sparkles: Guidelines
+
+---
+
+Remember that these packages will be consumed by other services, many of which are lambda's that have strict size restrictions.
+Please be mindful of any packages you add here, as they could potentially cause inoperable deployments of ingesting services.
+_Basically, only import if you really, really need it_
+
+## Import and usage syntax
+
+```
+import {
+    isUnderSixteen,
+    FeatureFlag,
+    getAge,
+    getCurrencyFromCurrencyCode
+    makeMoneyString,
+    password
+} from '@becollective/utils';
+
+const isUnderSixteen = isUnderSixteen(birthdate);
+
+const featureFlag = new FeatureFlag();
+const isFeatureActive = await featureFlag.isFeatureActive(
+  'this-is-a-feature-key',
+  { env: process.env.APP_ENV },
+);
+
+const ageInYears = getAge(birthdate);
+
+const currency = getCurrencyFromCurrencyCode('AUD');
+
+const dollarDollarBills = makeMoneyString({ amount: 100, currencyCode: 'AUD' });
+
+const isValid = password.isValid('this-is-a-password');
+```
+
+---
+
+### Running npm scripts
+
+| Npm Script        | Description                                |
+| ----------------- | ------------------------------------------ |
+| `npm run test`    | Run the tests                              |
+| `npm run build`   | runs rollup                                |
+| `npm run prepare` | runs build (not sure why this is required) |
+
+### :red_circle: Common Issues & FAQ
+
+---

package/bundle.js

@@ -35,7 +35,7 @@ var password = {
   validate: function validate(input) {
     if (typeof input !== 'string') {
       throw new Error('not-string');
-    } else if (input.length < 8) {
+    } else if (input.length < 12) {
       throw new Error('invalid-length');
     }
 
@@ -66,7 +66,7 @@ var moment = require('moment-timezone');
  * @param {string} dateOfBirth
  * @param {string} unit the measurement of the the difference
  *  The supported measurements are:
- *  years, months, weeks, days, hours, minutes, and seconds. 
+ *  years, months, weeks, days, hours, minutes, and seconds.
  * @returns {number} age
  */
 
@@ -105,6 +105,14 @@ var isUnderSixteen = function isUnderSixteen(dateOfBirth) {
   var age = getAge(dateOfBirth);
   return isNaN(age) ? false : age < 16;
 };
+var isUnderAge = function isUnderAge(dateOfBirth, limit) {
+  if (!dateOfBirth || !moment(dateOfBirth).isValid()) {
+    return false;
+  }
+
+  var age = getAge(dateOfBirth);
+  return isNaN(age) ? false : age < limit;
+};
 var datesByThemselves = function datesByThemselves(a, b) {
   if (!a.from) return 1;
   return moment(a.from) - moment(b.from);
@@ -189,9 +197,9 @@ var readableOpportunityType = function readableOpportunityType(type) {
 var _require = require('lodash'),
     pick = _require.pick;
 /**
- * 
- * @param {*} opportunityUser 
- * @param {*} opportunity 
+ *
+ * @param {*} opportunityUser
+ * @param {*} opportunity
  */
 
 
@@ -205,8 +213,8 @@ var getTimeInfo = function getTimeInfo(opportunityUser) {
 };
 
 /**
- * 
- * @param {Array} locationList 
+ *
+ * @param {Array} locationList
  */
 var getHomeLocalityFromLocationList = function getHomeLocalityFromLocationList(locationList) {
   var homeLocation = Array.isArray(locationList) && locationList.find(function (location) {
@@ -2843,54 +2851,38 @@ var followRedirects = wrap({ http: http__default['default'], https: https__defau
 var wrap_1 = wrap;
 followRedirects.wrap = wrap_1;
 
-var _args = [
-	[
-		"axios@0.21.1",
-		"/codefresh/volume/becollective-npm/packages/utils"
-	]
-];
-var _from = "axios@0.21.1";
-var _id = "axios@0.21.1";
-var _inBundle = false;
-var _integrity = "sha512-dKQiRHxGD9PPRIUNIWvZhPTPpl1rf/OxTYKsqKUDjBwYylTvV7SjSHJb9ratfyzM6wCdLCOYLzs73qpg5c4iGA==";
-var _location = "/axios";
-var _phantomChildren = {
+var name = "axios";
+var version = "0.21.1";
+var description = "Promise based HTTP client for the browser and node.js";
+var main = "index.js";
+var scripts = {
+	test: "grunt test && bundlesize",
+	start: "node ./sandbox/server.js",
+	build: "NODE_ENV=production grunt build",
+	preversion: "npm test",
+	version: "npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json",
+	postversion: "git push && git push --tags",
+	examples: "node ./examples/server.js",
+	coveralls: "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
+	fix: "eslint --fix lib/**/*.js"
 };
-var _requested = {
-	type: "version",
-	registry: true,
-	raw: "axios@0.21.1",
-	name: "axios",
-	escapedName: "axios",
-	rawSpec: "0.21.1",
-	saveSpec: null,
-	fetchSpec: "0.21.1"
+var repository = {
+	type: "git",
+	url: "https://github.com/axios/axios.git"
 };
-var _requiredBy = [
-	"/"
+var keywords = [
+	"xhr",
+	"http",
+	"ajax",
+	"promise",
+	"node"
 ];
-var _resolved = "https://registry.npmjs.org/axios/-/axios-0.21.1.tgz";
-var _spec = "0.21.1";
-var _where = "/codefresh/volume/becollective-npm/packages/utils";
-var author = {
-	name: "Matt Zabriskie"
-};
-var browser = {
-	"./lib/adapters/http.js": "./lib/adapters/xhr.js"
-};
+var author = "Matt Zabriskie";
+var license = "MIT";
 var bugs = {
 	url: "https://github.com/axios/axios/issues"
 };
-var bundlesize = [
-	{
-		path: "./dist/axios.min.js",
-		threshold: "5kB"
-	}
-];
-var dependencies = {
-	"follow-redirects": "^1.10.0"
-};
-var description = "Promise based HTTP client for the browser and node.js";
+var homepage = "https://github.com/axios/axios";
 var devDependencies = {
 	bundlesize: "^0.17.0",
 	coveralls: "^3.0.0",
@@ -2928,67 +2920,40 @@ var devDependencies = {
 	webpack: "^1.13.1",
 	"webpack-dev-server": "^1.14.1"
 };
-var homepage = "https://github.com/axios/axios";
-var jsdelivr = "dist/axios.min.js";
-var keywords = [
-	"xhr",
-	"http",
-	"ajax",
-	"promise",
-	"node"
-];
-var license = "MIT";
-var main = "index.js";
-var name = "axios";
-var repository = {
-	type: "git",
-	url: "git+https://github.com/axios/axios.git"
-};
-var scripts = {
-	build: "NODE_ENV=production grunt build",
-	coveralls: "cat coverage/lcov.info | ./node_modules/coveralls/bin/coveralls.js",
-	examples: "node ./examples/server.js",
-	fix: "eslint --fix lib/**/*.js",
-	postversion: "git push && git push --tags",
-	preversion: "npm test",
-	start: "node ./sandbox/server.js",
-	test: "grunt test && bundlesize",
-	version: "npm run build && grunt version && git add -A dist && git add CHANGELOG.md bower.json package.json"
+var browser = {
+	"./lib/adapters/http.js": "./lib/adapters/xhr.js"
 };
-var typings = "./index.d.ts";
+var jsdelivr = "dist/axios.min.js";
 var unpkg = "dist/axios.min.js";
-var version = "0.21.1";
+var typings = "./index.d.ts";
+var dependencies = {
+	"follow-redirects": "^1.10.0"
+};
+var bundlesize = [
+	{
+		path: "./dist/axios.min.js",
+		threshold: "5kB"
+	}
+];
 var pkg = {
-	_args: _args,
-	_from: _from,
-	_id: _id,
-	_inBundle: _inBundle,
-	_integrity: _integrity,
-	_location: _location,
-	_phantomChildren: _phantomChildren,
-	_requested: _requested,
-	_requiredBy: _requiredBy,
-	_resolved: _resolved,
-	_spec: _spec,
-	_where: _where,
+	name: name,
+	version: version,
+	description: description,
+	main: main,
+	scripts: scripts,
+	repository: repository,
+	keywords: keywords,
 	author: author,
-	browser: browser,
+	license: license,
 	bugs: bugs,
-	bundlesize: bundlesize,
-	dependencies: dependencies,
-	description: description,
-	devDependencies: devDependencies,
 	homepage: homepage,
+	devDependencies: devDependencies,
+	browser: browser,
 	jsdelivr: jsdelivr,
-	keywords: keywords,
-	license: license,
-	main: main,
-	name: name,
-	repository: repository,
-	scripts: scripts,
-	typings: typings,
 	unpkg: unpkg,
-	version: version
+	typings: typings,
+	dependencies: dependencies,
+	bundlesize: bundlesize
 };
 
 var httpFollow = followRedirects.http;
@@ -21020,6 +20985,7 @@ class FeatureFlag {
 var util = {
   getAge: getAge,
   getCurrencyFromCurrencyCode: getCurrencyFromCurrencyCode,
+  isUnderAge: isUnderAge,
   isUnderSixteen: isUnderSixteen,
   makeMoneyString: makeMoneyString,
   password: password,

package/index.js

@@ -1,10 +1,5 @@
 import { password } from './src/password';
-import {
-  isUnderSixteen,
-  getAge,
-  datesByThemselves,
-  getShiftText,
-} from './src/date-time';
+import { isUnderSixteen, isUnderAge, getAge, datesByThemselves, getShiftText } from './src/date-time';
 import { getCurrencyFromCurrencyCode, makeMoneyString } from './src/money';
 import { readableOpportunityType } from './src/opportunity';
 import { getTimeInfo } from './src/opportunityUser';
@@ -13,6 +8,7 @@ import FeatureFlag from './src/FeatureFlag';
 const util = {
   getAge,
   getCurrencyFromCurrencyCode,
+  isUnderAge,
   isUnderSixteen,
   makeMoneyString,
   password,

package/jestconfig.json

@@ -5,7 +5,5 @@
   "testRegex": "(/tests/.*|(\\.|/)(test|spec))\\.(jsx?|tsx?)$",
   "moduleFileExtensions": ["ts", "tsx", "js", "jsx", "json", "node"],
   "collectCoverage": true,
-  "setupFiles": [
-    "./setup.ts"
-  ]
+  "setupFiles": ["./setup.ts"]
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@becollective/utils",
-  "version": "1.7.1",
+  "version": "1.9.0",
   "description": "Common utilities",
   "main": "bundle.js",
   "scripts": {

package/rollup.config.js

@@ -8,7 +8,7 @@ export default {
   input: 'index.js',
   output: {
     file: 'bundle.js',
-    format: 'cjs'
+    format: 'cjs',
   },
   plugins: [
     json(),
@@ -18,9 +18,7 @@ export default {
     babel({
       exclude: 'node_modules/**', // only transpile our source code
       babelrc: false,
-      presets: [
-        "@babel/preset-env",
-      ],
+      presets: ['@babel/preset-env'],
     }),
   ],
 };

package/setup.ts

@@ -1,7 +1,4 @@
 // Jest will set NODE_ENV to "test" if not specified
-if (
-  process.env.NODE_ENV !== 'compose' &&
-  process.env.NODE_ENV !== 'localtest'
-) {
+if (process.env.NODE_ENV !== 'compose' && process.env.NODE_ENV !== 'localtest') {
   process.env.NODE_ENV = 'localtest';
 }

package/src/FeatureFlag.ts

@@ -1,10 +1,7 @@
 import axios from 'axios';
 import { memoize, get as lodashGet } from 'lodash';
 
-const fetchFeatureActive = async (
-  feature: string,
-  options: { env: string; region?: string },
-): Promise<boolean> => {
+const fetchFeatureActive = async (feature: string, options: { env: string; region?: string }): Promise<boolean> => {
   const getFlagByFeatureUrl = `https://lb-central.becollective.com/api/v2/feature-flags/${feature}`;
   let isFeatureActive = false;
   const featureFlags = await axios.get(getFlagByFeatureUrl);
@@ -15,9 +12,7 @@ const fetchFeatureActive = async (
   return isFeatureActive;
 };
 
-const memoizedFeatureActive = memoize(fetchFeatureActive, (feature, options) =>
-  JSON.stringify({ feature, options }),
-);
+const memoizedFeatureActive = memoize(fetchFeatureActive, (feature, options) => JSON.stringify({ feature, options }));
 
 class FeatureFlag {
   ttl: number;
@@ -26,10 +21,7 @@ class FeatureFlag {
     this.ttl = ttl || 1000 * 60 * 5; // default to 5 minutes
     this.expiry = Date.now() + ttl;
   }
-  async isFeatureActive(
-    feature: string,
-    options: { env: string; region?: string },
-  ): Promise<boolean> {
+  async isFeatureActive(feature: string, options: { env: string; region?: string }): Promise<boolean> {
     // Lazy expiration upon function call
     const now = Date.now();
     if (now >= this.expiry) {

package/src/date-time.js

@@ -5,10 +5,10 @@ const moment = require('moment-timezone');
  * @param {string} dateOfBirth
  * @param {string} unit the measurement of the the difference
  *  The supported measurements are:
- *  years, months, weeks, days, hours, minutes, and seconds. 
+ *  years, months, weeks, days, hours, minutes, and seconds.
  * @returns {number} age
  */
-export const getAge = (dateOfBirth, unit='years') => {
+export const getAge = (dateOfBirth, unit = 'years') => {
   const age = moment().diff(dateOfBirth, unit);
   if (isNaN(age)) {
     throw new Error('Invalid date');
@@ -30,7 +30,7 @@ export const getAge = (dateOfBirth, unit='years') => {
  * data to have a consistent birthdate property.
  * Then we should throw error if birthdate is not valid
  */
-export const isUnderSixteen = dateOfBirth => {
+export const isUnderSixteen = (dateOfBirth) => {
   if (!dateOfBirth || !moment(dateOfBirth).isValid()) {
     return false;
   }
@@ -38,6 +38,14 @@ export const isUnderSixteen = dateOfBirth => {
   return isNaN(age) ? false : age < 16;
 };
 
+export const isUnderAge = (dateOfBirth, limit) => {
+  if (!dateOfBirth || !moment(dateOfBirth).isValid()) {
+    return false;
+  }
+  const age = getAge(dateOfBirth);
+  return isNaN(age) ? false : age < limit;
+};
+
 export const datesByThemselves = (a, b) => {
   if (!a.from) return 1;
   return moment(a.from) - moment(b.from);
@@ -49,7 +57,8 @@ export const getShiftText = (from, to, timezone) => {
     const startToTimezone = moment(from).tz(timezone);
     const endToTimezone = moment(to).tz(timezone);
     return `${moment(startToTimezone).format('dddd, DD MMMM YYYY, h:mma')}-${moment(endToTimezone).format('h:mma')}`;
-  } catch (e) {
+  }
+  catch (e) {
     return '';
   }
 };

package/src/locality.js

@@ -1,10 +1,9 @@
 /**
- * 
- * @param {Array} locationList 
+ *
+ * @param {Array} locationList
  */
 export const getHomeLocalityFromLocationList = (locationList) => {
-  const homeLocation = Array.isArray(locationList) &&
-    locationList.find((location) => location.name === 'Home');
+  const homeLocation = Array.isArray(locationList) && locationList.find((location) => location.name === 'Home');
 
   if (homeLocation && homeLocation.locality && homeLocation.locality.long) {
     return homeLocation.locality.long;

package/src/money.js

@@ -3,7 +3,7 @@ const { currencies } = require('@becollective/constants');
 // We should probably throw and error on bad input instead of falling back to a default.
 // We're making an assumption that whoever is calling this function can safely work
 // with AUD. But this assumption removes a lot of error handling elsewhere.
-export const getCurrencyFromCurrencyCode = currencyCode => {
+export const getCurrencyFromCurrencyCode = (currencyCode) => {
   if (typeof currencyCode !== 'string' || !currencies[currencyCode]) {
     console.error(new Error(`Invalid currencyCode: ${currencyCode}. Falling back to 'AUD'.`));
     return currencies.AUD;
@@ -12,12 +12,7 @@ export const getCurrencyFromCurrencyCode = currencyCode => {
   return currencies[currencyCode];
 };
 
-export const makeMoneyString = ({
-  amount: inputAmount,
-  currencyCode,
-  rounded = false,
-  showCurrencyCode = false,
-}) => {
+export const makeMoneyString = ({ amount: inputAmount, currencyCode, rounded = false, showCurrencyCode = false }) => {
   let amount = Number(inputAmount);
   if (isNaN(amount)) {
     console.error(new Error(`Invalid amount: ${inputAmount}. Falling back to 0.`));

package/src/opportunity.js

@@ -6,4 +6,4 @@ const TYPE_MAP = {
   [opportunityTypes.flexible]: 'Flexible',
 };
 
-export const readableOpportunityType = type => TYPE_MAP[type] || null;
+export const readableOpportunityType = (type) => TYPE_MAP[type] || null;

package/src/opportunityUser.js

@@ -1,16 +1,25 @@
 const { pick } = require('lodash');
 
 /**
- * 
- * @param {*} opportunityUser 
- * @param {*} opportunity 
+ *
+ * @param {*} opportunityUser
+ * @param {*} opportunity
  */
 export const getTimeInfo = (opportunityUser, opportunity = null) => {
   const opp = opportunity || opportunityUser.opportunity;
   const isEoi = (opportunityUser && opportunityUser.eoi) || (opp && opp.eoi);
   const record = isEoi ? opportunityUser : opp;
-  const fields = pick(record, ['startDate', 'endDate', 'type', 'dates',
-    'recurrenceRule', 'timezone', 'location', 'locationOther', 'locationVirtual']);
+  const fields = pick(record, [
+    'startDate',
+    'endDate',
+    'type',
+    'dates',
+    'recurrenceRule',
+    'timezone',
+    'location',
+    'locationOther',
+    'locationVirtual',
+  ]);
 
   return fields;
 };

package/src/password.js

@@ -9,17 +9,18 @@ export const password = {
     return !!input.match(/[0-9]/);
   },
   validate: (input) => {
-    if(typeof input !== 'string') {
+    if (typeof input !== 'string') {
       throw new Error('not-string');
-    } else if(input.length < 8) {
+    }
+    else if (input.length < 12) {
       throw new Error('invalid-length');
     }
 
     let rules = 0;
-    if(password.hasUppercase(input)) rules++;
-    if(password.hasLowerCase(input)) rules++;
-    if(password.hasNumeral(input)) rules++;
-    if(rules < 3) {
+    if (password.hasUppercase(input)) rules++;
+    if (password.hasLowerCase(input)) rules++;
+    if (password.hasNumeral(input)) rules++;
+    if (rules < 3) {
       throw new Error('invalid-minimum-rules');
     }
 
@@ -31,7 +32,7 @@ export const password = {
       return true;
     }
     catch (e) {
-      return false
+      return false;
     }
-  }
-}
+  },
+};

package/tests/date-time.test.js

@@ -1,4 +1,4 @@
-const { isUnderSixteen, getAge, getShiftText } = require('../bundle.js');
+const { isUnderSixteen, isUnderAge, getAge, getShiftText } = require('../bundle.js');
 const moment = require('moment');
 
 describe('getAge', () => {
@@ -21,6 +21,7 @@ describe('getAge', () => {
   });
 
   test('Throws Error if dob is not a valid date-string', () => {
+    // eslint-disable-next-line no-undef
     expect(() => getAge(notDefined)).toThrow(/not defined/);
     expect(() => getAge(null)).toThrow(/Invalid date/);
     expect(() => getAge('not-valid')).toThrow(/Invalid date/);
@@ -55,16 +56,76 @@ describe('isUnderSixteen', () => {
   });
 });
 
+
+describe('isUnderAge', () => {
+  const refPoint = moment().subtract(13, 'years');
+  const obj = {};
+  test('Is not U13 if dob is 13 years ago', () => {
+    const dob = moment(refPoint);
+
+    expect(isUnderAge(dob.subtract(1, 'minute').utc().format(), 13)).toBe(false);
+    expect(isUnderAge(dob.subtract(100, 'year').utc().format(), 13)).toBe(false);
+  });
+
+  test('Is U16 if dob is less than 16 years ago', () => {
+    const dob = moment(refPoint);
+
+    expect(isUnderAge(dob.add(1, 'minute').utc().format(), 13)).toBe(true);
+    expect(isUnderAge(dob.add(100, 'year').utc().format(), 13)).toBe(true);
+  });
+
+  test('Undefined dob', () => {
+    expect(isUnderAge(obj.notDefined, 13)).toBe(false);
+  });
+  test('Null dob', () => {
+    expect(isUnderAge(null, 13)).toBe(false);
+  });
+  test('Invalid date string', () => {
+    expect(isUnderAge('not-valid', 13)).toBe(false);
+  });
+});
+
+
+describe('isUnderAge - 10', () => {
+  const refPoint = moment().subtract(10, 'years');
+  const obj = {};
+  test('Is not U13 if dob is 10 years ago', () => {
+    const dob = moment(refPoint);
+
+    expect(isUnderAge(dob.subtract(1, 'minute').utc().format(), 10)).toBe(false);
+    expect(isUnderAge(dob.subtract(100, 'year').utc().format(), 10)).toBe(false);
+  });
+
+  test('Is U10 if dob is less than 10 years ago', () => {
+    const dob = moment(refPoint);
+
+    expect(isUnderAge(dob.add(1, 'minute').utc().format(), 10)).toBe(true);
+    expect(isUnderAge(dob.add(100, 'year').utc().format(), 10)).toBe(true);
+  });
+});
+
+
+describe('isUnderAge - over 13', () => {
+  const refPoint = moment().subtract(15, 'years');
+  const obj = {};
+  test('Is not U13 if dob is 15 years ago', () => {
+    const dob = moment(refPoint);
+
+    expect(isUnderAge(dob.subtract(1, 'minute').utc().format(), 15)).toBe(false);
+    expect(isUnderAge(dob.subtract(100, 'year').utc().format(), 15)).toBe(false);
+  });
+});
+
 describe('getShiftText', () => {
   const from = new Date(Date.UTC(2020, 6, 30, 0, 0, 0));
   const to = new Date(Date.UTC(2020, 6, 30, 5, 30, 0));
   const melbourne = 'Australia/Melbourne';
   const auckland = 'Pacific/Auckland';
   test('get shift text with melbourne timezone', () => {
-    expect(getShiftText(from, to,melbourne)).toBe("Thursday, 30 July 2020, 10:00am-3:30pm");
+    expect(getShiftText(from, to, melbourne)).toBe('Thursday, 30 July 2020, 10:00am-3:30pm');
   });
   test('get shift text with auckland timezone', () => {
-    expect(getShiftText(from, to,auckland)).toBe("Thursday, 30 July 2020, 12:00pm-5:30pm");
+    expect(getShiftText(from, to, auckland)).toBe('Thursday, 30 July 2020, 12:00pm-5:30pm');
   });
   test('with empty data', () => {
     expect(getShiftText()).toBe('');

package/tests/featureFlag.test.ts

@@ -11,7 +11,7 @@ describe('Make feature decision based on feature flags', () => {
     mockAxios.get.mockReturnValue(
       Promise.resolve({
         data: { Environments: ['localtest', 'compose'] },
-      }),
+      })
     );
     const isActive = await featureFlag.isFeatureActive(feature, {
       env: 'localtest',
@@ -23,7 +23,7 @@ describe('Make feature decision based on feature flags', () => {
     mockAxios.get.mockReturnValue(
       Promise.resolve({
         data: { Environments: ['dev-au'] },
-      }),
+      })
     );
     const isActive = await featureFlag.isFeatureActive(feature, {
       env: 'localtest',
@@ -44,7 +44,7 @@ describe('Make feature decision based on feature flags', () => {
       mockAxios.get.mockReturnValue(
         Promise.resolve({
           data: { Environments: ['localtest', 'compose'] },
-        }),
+        })
       );
       const isActive = await featureFlag.isFeatureActive(feature, {
         env: 'localtest',
@@ -64,7 +64,7 @@ describe('Make feature decision based on feature flags', () => {
       mockAxios.get.mockReturnValue(
         Promise.resolve({
           data: { Environments: ['localtest', 'compose'] },
-        }),
+        })
       );
       const isActive = await featureFlag.isFeatureActive(feature, {
         env: 'localtest',
@@ -84,7 +84,7 @@ describe('Make feature decision based on feature flags', () => {
       mockAxios.get.mockReturnValue(
         Promise.resolve({
           data: { Environments: ['localtest', 'compose'] },
-        }),
+        })
       );
       const isActive = await featureFlag.isFeatureActive(feature, {
         env: 'localtest',

package/tests/money.test.js

@@ -10,13 +10,8 @@ describe('getCurrencyFromCurrencyCode', () => {
   });
 
   test('Returns AUD currency if currencyCode not found or invalid', () => {
-    const bogusCurrencyCodes = [
-      undefined,
-      1234,
-      'some junk that is not a currency code',
-      { foo: 'bar' },
-    ];
-    bogusCurrencyCodes.forEach(bogusCurrencyCode => {
+    const bogusCurrencyCodes = [undefined, 1234, 'some junk that is not a currency code', { foo: 'bar' }];
+    bogusCurrencyCodes.forEach((bogusCurrencyCode) => {
       expect(getCurrencyFromCurrencyCode(bogusCurrencyCode)).toMatchObject(currencies.AUD);
     });
   });
@@ -60,13 +55,8 @@ describe('makeMoneyString', () => {
   });
 
   test('Outputs a money string for AUD if bad input is provided', () => {
-    const bogusCurrencyCodes = [
-      undefined,
-      1234,
-      'some junk that is not a currency code',
-      { foo: 'bar' },
-    ];
-    bogusCurrencyCodes.forEach(bogusCurrencyCode => {
+    const bogusCurrencyCodes = [undefined, 1234, 'some junk that is not a currency code', { foo: 'bar' }];
+    bogusCurrencyCodes.forEach((bogusCurrencyCode) => {
       expect(
         makeMoneyString({
           amount: 123.05,
@@ -87,7 +77,7 @@ describe('makeMoneyString', () => {
     ).toEqual('£100');
 
     const bogusAmountValues = [undefined, null, 'some junk that is not a number', { foo: 'bar' }];
-    bogusAmountValues.forEach(bogusAmountValue => {
+    bogusAmountValues.forEach((bogusAmountValue) => {
       expect(
         makeMoneyString({
           amount: bogusAmountValue,

package/tests/password.test.js

@@ -2,11 +2,12 @@ const util = require('../bundle.js');
 
 describe('password.valiate', () => {
   test('validate a valid password', async () => {
-    const password = 'Password123';
+    const password = 'Password123456';
     let result;
     try {
       result = util.password.validate(password);
-    } catch(e) {
+    }
+    catch (e) {
       result = e;
     }
     expect(result).toBe(true);
@@ -18,13 +19,13 @@ describe('password.valiate', () => {
     }).toThrow('invalid-length');
   }, 1000);
   test('validate a one rule password', async () => {
-    const password = 'foobarab';
+    const password = 'foobarabpcip';
     expect(() => {
       util.password.validate(password);
     }).toThrow('invalid-minimum-rules');
   }, 1000);
   test('validate a two rule password', async () => {
-    const password = 'foobar123';
+    const password = 'foobarpcip123';
     expect(() => {
       util.password.validate(password);
     }).toThrow('invalid-minimum-rules');
@@ -47,14 +48,7 @@ describe('password.valiate', () => {
     }).toThrow('not-string');
   }, 1000);
   test('returns false for invalid passwords', async () => {
-    const someValid = [
-      'short',
-      '1234567a',
-      '123456aa',
-      '1aB!',
-    ]
-    .map(util.password.isValid)
-    .some(val => val);
+    const someValid = ['short', '1234567a', '123456aa', '1aB!'].map(util.password.isValid).some((val) => val);
     expect(someValid).toBe(false);
   });
   test('returns true for a valid password', async () => {

package/tslint.json

@@ -1,51 +1,30 @@
 {
   "extends": ["tslint:recommended", "tslint-config-prettier"],
   "rules": {
-    "align": [
-      true,
-      "parameters",
-      "arguments",
-      "statements"
-    ],
+    "align": [true, "parameters", "arguments", "statements"],
     "ban": false,
     "class-name": true,
-    "comment-format": [
-      true,
-      "check-space"
-    ],
+    "comment-format": [true, "check-space"],
     "curly": true,
     "eofline": false,
     "forin": true,
-    "indent": [ true, "spaces" ],
+    "indent": [true, "spaces"],
     "interface-name": [true, "never-prefix"],
     "jsdoc-format": true,
     "jsx-no-lambda": false,
     "jsx-no-multiline-js": false,
     "label-position": true,
-    "max-line-length": [ true, 120 ],
+    "max-line-length": [true, 120],
     "member-ordering": [
       true,
       {
-        "order": [
-          "public-before-private",
-          "static-before-instance",
-          "variables-before-functions"
-        ]
+        "order": ["public-before-private", "static-before-instance", "variables-before-functions"]
       }
     ],
     "no-any": true,
     "no-arg": true,
     "no-bitwise": true,
-    "no-console": [
-      true,
-      "log",
-      "error",
-      "debug",
-      "info",
-      "time",
-      "timeEnd",
-      "trace"
-    ],
+    "no-console": [true, "log", "error", "debug", "info", "time", "timeEnd", "trace"],
     "no-consecutive-blank-lines": true,
     "no-construct": true,
     "no-debugger": true,
@@ -57,24 +36,16 @@
     "no-switch-case-fall-through": true,
     "no-trailing-whitespace": false,
     "no-unused-expression": true,
-    "one-line": [
-      true,
-      "check-open-brace",
-      "check-whitespace"
-    ],
+    "one-line": [true, "check-open-brace", "check-whitespace"],
     "quotemark": [true, "single", "jsx-double"],
     "radix": true,
     "semicolon": [true, "always"],
     "switch-default": true,
 
-    "trailing-comma": [true, {"multiline": "always", "singleline": "never"}],
+    "trailing-comma": [true, { "multiline": "always", "singleline": "never" }],
 
-    "triple-equals": [ true, "allow-null-check" ],
-    "typedef": [
-      true,
-      "parameter",
-      "property-declaration"
-    ],
+    "triple-equals": [true, "allow-null-check"],
+    "typedef": [true, "parameter", "property-declaration"],
     "typedef-whitespace": [
       true,
       {