@dwp/govuk-casa 9.3.3 → 9.3.4

package/dist/lib/CasaTemplateLoader.js

@@ -1,16 +1,4 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var _CasaTemplateLoader_instances, _CasaTemplateLoader_blockModifiers, _CasaTemplateLoader_applyBlockModifiers;
 Object.defineProperty(exports, "__esModule", { value: true });
 const nunjucks_1 = require("nunjucks");
 /**
@@ -46,6 +34,7 @@ const VALID_BLOCKS = [
  * @access private
  */
 class CasaTemplateLoader extends nunjucks_1.FileSystemLoader {
+    #blockModifiers;
     /**
      * Constructor.
      *
@@ -54,9 +43,7 @@ class CasaTemplateLoader extends nunjucks_1.FileSystemLoader {
      */
     constructor(searchPaths, opts) {
         super(searchPaths, opts);
-        _CasaTemplateLoader_instances.add(this);
-        _CasaTemplateLoader_blockModifiers.set(this, void 0);
-        __classPrivateFieldSet(this, _CasaTemplateLoader_blockModifiers, [], "f");
+        this.#blockModifiers = [];
     }
     /**
      * Extract the source from the given template file.
@@ -66,7 +53,7 @@ class CasaTemplateLoader extends nunjucks_1.FileSystemLoader {
      */
     getSource(name) {
         const source = super.getSource(name);
-        return source ? __classPrivateFieldGet(this, _CasaTemplateLoader_instances, "m", _CasaTemplateLoader_applyBlockModifiers).call(this, name, source) : source;
+        return source ? this.#applyBlockModifiers(name, source) : source;
     }
     /**
      * Add a modification function to the loader.
@@ -81,23 +68,30 @@ class CasaTemplateLoader extends nunjucks_1.FileSystemLoader {
         if (!VALID_BLOCKS.includes(block)) {
             throw new Error(`Block "${String(block)}" is not a recognised template block.`);
         }
-        __classPrivateFieldGet(this, _CasaTemplateLoader_blockModifiers, "f").push({
+        this.#blockModifiers.push({
             block,
             modifier,
         });
     }
-}
-_CasaTemplateLoader_blockModifiers = new WeakMap(), _CasaTemplateLoader_instances = new WeakSet(), _CasaTemplateLoader_applyBlockModifiers = function _CasaTemplateLoader_applyBlockModifiers(name, source) {
-    for (let i = 0, l = __classPrivateFieldGet(this, _CasaTemplateLoader_blockModifiers, "f").length; i < l; i++) {
-        // ESLint disabled as `i` is an integer
-        /* eslint-disable-next-line security/detect-object-injection */
-        const { block, modifier } = __classPrivateFieldGet(this, _CasaTemplateLoader_blockModifiers, "f")[i];
-        if (source.src.indexOf(`block ${block}`) > -1) {
-            /* eslint-disable-next-line no-param-reassign */
-            source.src = source.src.replace(`block ${block} %}`, `block ${block} %}${modifier(name)}`);
+    /**
+     * Apply a block modifier to the given source content.
+     *
+     * @param {string} name Block name
+     * @param {string} source Original source pulled from template file
+     * @returns {string} The modified source
+     */
+    #applyBlockModifiers(name, source) {
+        for (let i = 0, l = this.#blockModifiers.length; i < l; i++) {
+            // ESLint disabled as `i` is an integer
+            /* eslint-disable-next-line security/detect-object-injection */
+            const { block, modifier } = this.#blockModifiers[i];
+            if (source.src.indexOf(`block ${block}`) > -1) {
+                /* eslint-disable-next-line no-param-reassign */
+                source.src = source.src.replace(`block ${block} %}`, `block ${block} %}${modifier(name)}`);
+            }
         }
+        return source;
     }
-    return source;
-};
+}
 exports.default = CasaTemplateLoader;
 //# sourceMappingURL=CasaTemplateLoader.js.map

package/dist/lib/CasaTemplateLoader.js.map

@@ -1 +1 @@
-{"version":3,"file":"CasaTemplateLoader.js","sourceRoot":"","sources":["../../src/lib/CasaTemplateLoader.js"],"names":[],"mappings":";;;;;;;;;;;;;;AAAA,uCAA4C;AAE5C;;;GAGG;AAEH;;;GAGG;AAEH,MAAM,YAAY,GAAG;IACnB,eAAe;IACf,SAAS;IACT,WAAW;IACX,eAAe;IACf,SAAS;IACT,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,WAAW;IACX,cAAc;IACd,MAAM;IACN,WAAW;IACX,UAAU;CACX,CAAC;AAEF;;;;GAIG;AAEH;;;GAGG;AACH,MAAqB,kBAAmB,SAAQ,2BAAgB;IAG9D;;;;;OAKG;IACH,YAAY,WAAW,EAAE,IAAI;QAC3B,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;;QAT3B,qDAAgB;QAWd,uBAAA,IAAI,sCAAmB,EAAE,MAAA,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,IAAI;QACZ,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC,CAAC,CAAC,uBAAA,IAAI,8EAAqB,MAAzB,IAAI,EAAsB,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACnE,CAAC;IAED;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,QAAQ;QACzB,6EAA6E;QAC7E,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CACb,UAAU,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAC/D,CAAC;QACJ,CAAC;QAED,uBAAA,IAAI,0CAAgB,CAAC,IAAI,CAAC;YACxB,KAAK;YACL,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;CAwBF;8LAfsB,IAAI,EAAE,MAAM;IAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,uBAAA,IAAI,0CAAgB,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;QAC5D,uCAAuC;QACvC,+DAA+D;QAC/D,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,uBAAA,IAAI,0CAAgB,CAAC,CAAC,CAAC,CAAC;QACpD,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;YAC9C,gDAAgD;YAChD,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAC7B,SAAS,KAAK,KAAK,EACnB,SAAS,KAAK,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CACrC,CAAC;QACJ,CAAC;IACH,CAAC;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;kBArEkB,kBAAkB"}
+{"version":3,"file":"CasaTemplateLoader.js","sourceRoot":"","sources":["../../src/lib/CasaTemplateLoader.js"],"names":[],"mappings":";;AAAA,uCAA4C;AAE5C;;;GAGG;AAEH;;;GAGG;AAEH,MAAM,YAAY,GAAG;IACnB,eAAe;IACf,SAAS;IACT,WAAW;IACX,eAAe;IACf,SAAS;IACT,QAAQ;IACR,MAAM;IACN,QAAQ;IACR,WAAW;IACX,cAAc;IACd,MAAM;IACN,WAAW;IACX,UAAU;CACX,CAAC;AAEF;;;;GAIG;AAEH;;;GAGG;AACH,MAAqB,kBAAmB,SAAQ,2BAAgB;IAC9D,eAAe,CAAC;IAEhB;;;;;OAKG;IACH,YAAY,WAAW,EAAE,IAAI;QAC3B,KAAK,CAAC,WAAW,EAAE,IAAI,CAAC,CAAC;QAEzB,IAAI,CAAC,eAAe,GAAG,EAAE,CAAC;IAC5B,CAAC;IAED;;;;;OAKG;IACH,SAAS,CAAC,IAAI;QACZ,MAAM,MAAM,GAAG,KAAK,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC;QACrC,OAAO,MAAM,CAAC,CAAC,CAAC,IAAI,CAAC,oBAAoB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC;IACnE,CAAC;IAED;;;;;;;OAOG;IACH,WAAW,CAAC,KAAK,EAAE,QAAQ;QACzB,6EAA6E;QAC7E,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,CAAC;YAClC,MAAM,IAAI,KAAK,CACb,UAAU,MAAM,CAAC,KAAK,CAAC,uCAAuC,CAC/D,CAAC;QACJ,CAAC;QAED,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;YACxB,KAAK;YACL,QAAQ;SACT,CAAC,CAAC;IACL,CAAC;IAED;;;;;;OAMG;IACH,oBAAoB,CAAC,IAAI,EAAE,MAAM;QAC/B,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC;YAC5D,uCAAuC;YACvC,+DAA+D;YAC/D,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,GAAG,IAAI,CAAC,eAAe,CAAC,CAAC,CAAC,CAAC;YACpD,IAAI,MAAM,CAAC,GAAG,CAAC,OAAO,CAAC,SAAS,KAAK,EAAE,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC;gBAC9C,gDAAgD;gBAChD,MAAM,CAAC,GAAG,GAAG,MAAM,CAAC,GAAG,CAAC,OAAO,CAC7B,SAAS,KAAK,KAAK,EACnB,SAAS,KAAK,MAAM,QAAQ,CAAC,IAAI,CAAC,EAAE,CACrC,CAAC;YACJ,CAAC;QACH,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;CACF;AAtED,qCAsEC"}

package/dist/lib/JourneyContext.js

@@ -1,30 +1,7 @@
 "use strict";
-var __classPrivateFieldSet = (this && this.__classPrivateFieldSet) || function (receiver, state, value, kind, f) {
-    if (kind === "m") throw new TypeError("Private method is not writable");
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a setter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot write private member to an object whose class did not declare it");
-    return (kind === "a" ? f.call(receiver, value) : f ? f.value = value : state.set(receiver, value)), value;
-};
-var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
-    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
-    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
-    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
-};
-var __rest = (this && this.__rest) || function (s, e) {
-    var t = {};
-    for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
-        t[p] = s[p];
-    if (s != null && typeof Object.getOwnPropertySymbols === "function")
-        for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
-            if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
-                t[p[i]] = s[p[i]];
-        }
-    return t;
-};
 var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
-var _JourneyContext_data, _JourneyContext_validation, _JourneyContext_nav, _JourneyContext_identity, _JourneyContext_eventListeners, _JourneyContext_eventListenerPreState;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.validateObjectKey = validateObjectKey;
 /**
@@ -36,13 +13,15 @@ exports.validateObjectKey = validateObjectKey;
  * - Navigation information about how the user got where they are.
  */
 const lodash_1 = __importDefault(require("lodash"));
+const rfdc_1 = __importDefault(require("rfdc"));
 const ValidationError_js_1 = __importDefault(require("./ValidationError.js"));
 const logger_js_1 = __importDefault(require("./logger.js"));
 const utils_js_1 = require("./utils.js");
 const context_id_generators_js_1 = require("./context-id-generators.js");
-const { isPlainObject, isObject, has, isEqual } = lodash_1.default; // CommonJS
+const { isPlainObject, isObject, isEqual } = lodash_1.default; // CommonJS
 const log = (0, logger_js_1.default)("lib:journey-context");
 const uuid = (0, context_id_generators_js_1.uuid)();
+const clone = (0, rfdc_1.default)({ proto: false });
 /**
  * @typedef {import("../casa").ContextEventUserInfo} ContextEventUserInfo
  * @access private
@@ -78,6 +57,18 @@ function validateObjectKey(key = "") {
 }
 /** @memberof module:@dwp/govuk-casa */
 class JourneyContext {
+    // Private properties
+    #data;
+    #validation;
+    #nav;
+    #identity;
+    #eventListeners;
+    #eventListenerPreState;
+    static DEFAULT_CONTEXT_ID = "default";
+    /** @type {symbol} */
+    static ID_GENERATOR_REQ_LOG = Symbol("generatedContextIds");
+    /** @type {symbol} */
+    static ID_GENERATOR_REQ_KEY = Symbol("generateContextId");
     /**
      * Constructor.
      *
@@ -103,19 +94,12 @@ class JourneyContext {
      *   others.
      */
     constructor(data = {}, validation = {}, nav = {}, identity = {}) {
-        // Private properties
-        _JourneyContext_data.set(this, void 0);
-        _JourneyContext_validation.set(this, void 0);
-        _JourneyContext_nav.set(this, void 0);
-        _JourneyContext_identity.set(this, void 0);
-        _JourneyContext_eventListeners.set(this, void 0);
-        _JourneyContext_eventListenerPreState.set(this, void 0);
-        __classPrivateFieldSet(this, _JourneyContext_data, data, "f");
-        __classPrivateFieldSet(this, _JourneyContext_validation, validation, "f");
-        __classPrivateFieldSet(this, _JourneyContext_nav, nav, "f");
-        __classPrivateFieldSet(this, _JourneyContext_identity, identity, "f");
-        __classPrivateFieldSet(this, _JourneyContext_eventListeners, [], "f");
-        __classPrivateFieldSet(this, _JourneyContext_eventListenerPreState, null, "f");
+        this.#data = data;
+        this.#validation = validation;
+        this.#nav = nav;
+        this.#identity = identity;
+        this.#eventListeners = [];
+        this.#eventListenerPreState = null;
     }
     /**
      * Clone into an object that can be stringified.
@@ -124,10 +108,10 @@ class JourneyContext {
      */
     toObject() {
         return Object.assign(Object.create(null), {
-            data: structuredClone(__classPrivateFieldGet(this, _JourneyContext_data, "f")),
-            validation: structuredClone(__classPrivateFieldGet(this, _JourneyContext_validation, "f")),
-            nav: structuredClone(__classPrivateFieldGet(this, _JourneyContext_nav, "f")),
-            identity: structuredClone(__classPrivateFieldGet(this, _JourneyContext_identity, "f")),
+            data: clone(this.#data),
+            validation: clone(this.#validation),
+            nav: clone(this.#nav),
+            identity: clone(this.#identity),
         });
     }
     /**
@@ -150,19 +134,19 @@ class JourneyContext {
         return new JourneyContext(data, deserialisedValidation, nav, identity);
     }
     get data() {
-        return __classPrivateFieldGet(this, _JourneyContext_data, "f");
+        return this.#data;
     }
     set data(value) {
-        __classPrivateFieldSet(this, _JourneyContext_data, value, "f");
+        this.#data = value;
     }
     get validation() {
-        return __classPrivateFieldGet(this, _JourneyContext_validation, "f");
+        return this.#validation;
     }
     get nav() {
-        return __classPrivateFieldGet(this, _JourneyContext_nav, "f");
+        return this.#nav;
     }
     get identity() {
-        return __classPrivateFieldGet(this, _JourneyContext_identity, "f");
+        return this.#identity;
     }
     /**
      * Get data context for a specific a specific page.
@@ -173,10 +157,10 @@ class JourneyContext {
      */
     getDataForPage(page) {
         if (typeof page === "string") {
-            return __classPrivateFieldGet(this, _JourneyContext_data, "f")[validateObjectKey(page)];
+            return this.#data[validateObjectKey(page)];
         }
         if (isPlainObject(page)) {
-            return __classPrivateFieldGet(this, _JourneyContext_data, "f")[validateObjectKey(page.waypoint)];
+            return this.#data[validateObjectKey(page.waypoint)];
         }
         throw new TypeError(`Page must be a string or Page object. Got ${typeof page}`);
     }
@@ -186,7 +170,7 @@ class JourneyContext {
      * @returns {object} Page data
      */
     getData() {
-        return __classPrivateFieldGet(this, _JourneyContext_data, "f");
+        return this.#data;
     }
     /**
      * Overwrite the data context with a new object.
@@ -195,7 +179,7 @@ class JourneyContext {
      * @returns {JourneyContext} Chain.
      */
     setData(data) {
-        __classPrivateFieldSet(this, _JourneyContext_data, data, "f");
+        this.#data = data;
         return this;
     }
     /**
@@ -208,10 +192,10 @@ class JourneyContext {
      */
     setDataForPage(page, webFormData) {
         if (typeof page === "string") {
-            __classPrivateFieldGet(this, _JourneyContext_data, "f")[validateObjectKey(page)] = webFormData;
+            this.#data[validateObjectKey(page)] = webFormData;
         }
         else if (isPlainObject(page)) {
-            __classPrivateFieldGet(this, _JourneyContext_data, "f")[validateObjectKey(page.waypoint)] = webFormData;
+            this.#data[validateObjectKey(page.waypoint)] = webFormData;
         }
         else {
             throw new TypeError(`Page must be a string or Page object. Got ${typeof page}`);
@@ -224,7 +208,7 @@ class JourneyContext {
      * @returns {object} All page validation errors.
      */
     getValidationErrors() {
-        return __classPrivateFieldGet(this, _JourneyContext_validation, "f");
+        return this.#validation;
     }
     /**
      * Removes any validation state for the given page. Clearing validation state
@@ -236,8 +220,8 @@ class JourneyContext {
      */
     removeValidationStateForPage(pageId) {
         /* eslint-disable-next-line no-unused-vars */
-        const _a = __classPrivateFieldGet(this, _JourneyContext_validation, "f"), _b = pageId, dummy = _a[_b], remaining = __rest(_a, [typeof _b === "symbol" ? _b : _b + ""]);
-        __classPrivateFieldSet(this, _JourneyContext_validation, Object.assign({}, remaining), "f");
+        const { [pageId]: dummy, ...remaining } = this.#validation;
+        this.#validation = { ...remaining };
         return this;
     }
     /**
@@ -250,7 +234,7 @@ class JourneyContext {
      * @returns {JourneyContext} Chain.
      */
     clearValidationErrorsForPage(pageId) {
-        __classPrivateFieldGet(this, _JourneyContext_validation, "f")[validateObjectKey(pageId)] = null;
+        this.#validation[validateObjectKey(pageId)] = null;
         return this;
     }
     /**
@@ -265,12 +249,12 @@ class JourneyContext {
         if (!Array.isArray(errors)) {
             throw new SyntaxError(`Errors must be an Array. Received ${Object.prototype.toString.call(errors)}`);
         }
-        errors.forEach((error) => {
+        for (const error of errors) {
             if (!(error instanceof ValidationError_js_1.default)) {
                 throw new SyntaxError("Field errors must be a ValidationError");
             }
-        });
-        __classPrivateFieldGet(this, _JourneyContext_validation, "f")[validateObjectKey(pageId)] = errors;
+        }
+        this.#validation[validateObjectKey(pageId)] = errors;
         return this;
     }
     /**
@@ -281,8 +265,7 @@ class JourneyContext {
      * @returns {ValidationError[]} An array of errors
      */
     getValidationErrorsForPage(pageId) {
-        var _a;
-        return (_a = __classPrivateFieldGet(this, _JourneyContext_validation, "f")[validateObjectKey(pageId)]) !== null && _a !== void 0 ? _a : [];
+        return this.#validation[validateObjectKey(pageId)] ?? [];
     }
     /**
      * Same as `getValidationErrorsForPage()`, but the return value is an object
@@ -315,8 +298,7 @@ class JourneyContext {
      * @returns {boolean} Result.
      */
     hasValidationErrorsForPage(pageId) {
-        var _a, _b;
-        return ((_b = (_a = __classPrivateFieldGet(this, _JourneyContext_validation, "f")) === null || _a === void 0 ? void 0 : _a[validateObjectKey(pageId)]) === null || _b === void 0 ? void 0 : _b.length) > 0;
+        return this.#validation?.[validateObjectKey(pageId)]?.length > 0;
     }
     /**
      * Set language of the context.
@@ -325,7 +307,7 @@ class JourneyContext {
      * @returns {JourneyContext} Chain.
      */
     setNavigationLanguage(language = "en") {
-        __classPrivateFieldGet(this, _JourneyContext_nav, "f").language = language;
+        this.#nav.language = language;
         return this;
     }
     /**
@@ -335,7 +317,7 @@ class JourneyContext {
      * @returns {boolean} True if the page is valid.
      */
     isPageValid(pageId) {
-        return __classPrivateFieldGet(this, _JourneyContext_validation, "f")[validateObjectKey(pageId)] === null;
+        return this.#validation[validateObjectKey(pageId)] === null;
     }
     /**
      * Remove information about these waypoints.
@@ -345,16 +327,16 @@ class JourneyContext {
     purge(waypoints = []) {
         const newData = Object.create(null);
         const newValidation = Object.create(null);
-        const toKeep = Object.keys(__classPrivateFieldGet(this, _JourneyContext_data, "f")).filter((w) => !waypoints.includes(w));
+        const toKeep = Object.keys(this.#data).filter((w) => !waypoints.includes(w));
         // ESLint disabled as `i` is an integer
         /* eslint-disable security/detect-object-injection */
         for (let i = 0, l = toKeep.length; i < l; i++) {
-            newData[toKeep[i]] = __classPrivateFieldGet(this, _JourneyContext_data, "f")[toKeep[i]];
-            newValidation[toKeep[i]] = __classPrivateFieldGet(this, _JourneyContext_validation, "f")[toKeep[i]];
+            newData[toKeep[i]] = this.#data[toKeep[i]];
+            newValidation[toKeep[i]] = this.#validation[toKeep[i]];
         }
         /* eslint-enable security/detect-object-injection */
-        __classPrivateFieldSet(this, _JourneyContext_data, Object.assign({}, newData), "f");
-        __classPrivateFieldSet(this, _JourneyContext_validation, Object.assign({}, newValidation), "f");
+        this.#data = { ...newData };
+        this.#validation = { ...newValidation };
     }
     /**
      * Remove validation state from these waypoints. This is useful to quickly
@@ -383,8 +365,8 @@ class JourneyContext {
      * @returns {JourneyContext} Chain
      */
     addEventListeners(events) {
-        __classPrivateFieldSet(this, _JourneyContext_eventListeners, events, "f");
-        __classPrivateFieldSet(this, _JourneyContext_eventListenerPreState, this.toObject(), "f");
+        this.#eventListeners = events;
+        this.#eventListenerPreState = this.toObject();
         return this;
     }
     /**
@@ -400,12 +382,11 @@ class JourneyContext {
      * @returns {JourneyContext} Chain
      */
     applyEventListeners({ event, session, userInfo }) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j;
-        if (!__classPrivateFieldGet(this, _JourneyContext_eventListeners, "f").length) {
+        if (!this.#eventListeners.length) {
             return this;
         }
-        const previousContext = JourneyContext.fromObject(__classPrivateFieldGet(this, _JourneyContext_eventListenerPreState, "f"));
-        const listeners = __classPrivateFieldGet(this, _JourneyContext_eventListeners, "f").filter((l) => l.event === event);
+        const previousContext = JourneyContext.fromObject(this.#eventListenerPreState);
+        const listeners = this.#eventListeners.filter((l) => l.event === event);
         // ESLint disabled as `listeners[i]` uses an integer key, and the other keys
         // are derived from the list of `listeners`, which are not manipulated at
         // runtime (only set by dev in code).
@@ -421,14 +402,14 @@ class JourneyContext {
             else if (waypoint && !field) {
                 logMessage = `Calling waypoint-specific event handler on "${waypoint}"`;
                 runHandler =
-                    ((_a = previousContext.data) === null || _a === void 0 ? void 0 : _a[waypoint]) !== undefined &&
-                        !isEqual((_b = this.data) === null || _b === void 0 ? void 0 : _b[waypoint], (_c = previousContext.data) === null || _c === void 0 ? void 0 : _c[waypoint]);
+                    previousContext.data?.[waypoint] !== undefined &&
+                        !isEqual(this.data?.[waypoint], previousContext.data?.[waypoint]);
             }
             else if (waypoint && field) {
                 logMessage = `Calling field-specific event handler on "${waypoint} : ${field}"`;
                 runHandler =
-                    ((_e = (_d = previousContext.data) === null || _d === void 0 ? void 0 : _d[waypoint]) === null || _e === void 0 ? void 0 : _e[field]) !== undefined &&
-                        !isEqual((_g = (_f = this.data) === null || _f === void 0 ? void 0 : _f[waypoint]) === null || _g === void 0 ? void 0 : _g[field], (_j = (_h = previousContext.data) === null || _h === void 0 ? void 0 : _h[waypoint]) === null || _j === void 0 ? void 0 : _j[field]);
+                    previousContext.data?.[waypoint]?.[field] !== undefined &&
+                        !isEqual(this.data?.[waypoint]?.[field], previousContext.data?.[waypoint]?.[field]);
             }
             if (runHandler) {
                 log.trace(logMessage);
@@ -483,7 +464,7 @@ class JourneyContext {
      * @returns {boolean} True if this is the "default" journey context
      */
     isDefault() {
-        return __classPrivateFieldGet(this, _JourneyContext_identity, "f").id === JourneyContext.DEFAULT_CONTEXT_ID;
+        return this.#identity.id === JourneyContext.DEFAULT_CONTEXT_ID;
     }
     /**
      * Initialise session with an empty entry for the "default" context.
@@ -495,13 +476,13 @@ class JourneyContext {
         // For existing sessions that were created prior to `journeyContextList`
         // being remodelled as an array, we need to convert the "legacy" structure
         // into an equivalent array.
-        if (isPlainObject(session === null || session === void 0 ? void 0 : session.journeyContextList)) {
+        if (isPlainObject(session?.journeyContextList)) {
             log.trace("Session context list already initialised as an object (legacy structure). Will convert from object to array.");
             /* eslint-disable-next-line no-param-reassign */
             session.journeyContextList = Object.entries(session.journeyContextList);
         }
         // Initialise new context list in the session
-        if (!has(session, "journeyContextList")) {
+        if (!Object.hasOwn(session, "journeyContextList")) {
             log.trace("Initialising session with a default journey context list");
             /* eslint-disable-next-line no-param-reassign */
             session.journeyContextList = [];
@@ -545,7 +526,6 @@ class JourneyContext {
      * @throws {Error} When generated ID has already been used
      */
     static generateContextId(req) {
-        var _a;
         // Can't generate custom ID when no request object is provided, because the
         // custom generator function itself exists on that object.
         if (!req) {
@@ -567,7 +547,7 @@ class JourneyContext {
         const inSessionIds = JourneyContext.getContexts(req.session)
             .map((c) => c.identity.id)
             .filter((id) => id !== JourneyContext.DEFAULT_CONTEXT_ID);
-        const inRequestIds = (_a = req[JourneyContext.ID_GENERATOR_REQ_LOG]) !== null && _a !== void 0 ? _a : [];
+        const inRequestIds = req[JourneyContext.ID_GENERATOR_REQ_LOG] ?? [];
         const reservedIds = Array.from(new Set([...inSessionIds, ...inRequestIds]).values());
         // Generate and log the ID
         const id = JourneyContext.validateContextId(req[JourneyContext.ID_GENERATOR_REQ_KEY].call(null, { req, reservedIds }));
@@ -602,7 +582,7 @@ class JourneyContext {
      * @returns {JourneyContext} The discovered JourneyContext instance
      */
     static getContextById(session, id) {
-        const list = new Map(session === null || session === void 0 ? void 0 : session.journeyContextList);
+        const list = new Map(session?.journeyContextList);
         if (list.has(id)) {
             // ESLint disabled as `id` has been verified as an "own" property
             /* eslint-disable-next-line security/detect-object-injection */
@@ -619,7 +599,7 @@ class JourneyContext {
      */
     static getContextByName(session, name) {
         if (session) {
-            const list = new Map(session === null || session === void 0 ? void 0 : session.journeyContextList);
+            const list = new Map(session?.journeyContextList);
             const context = [...list.values()].find((c) => c.identity.name === name);
             if (context) {
                 return JourneyContext.fromObject(context);
@@ -636,9 +616,9 @@ class JourneyContext {
      */
     static getContextsByTag(session, tag) {
         if (session) {
-            const list = new Map(session === null || session === void 0 ? void 0 : session.journeyContextList);
+            const list = new Map(session?.journeyContextList);
             return [...list.values()]
-                .filter((c) => { var _a; return (_a = c.identity.tags) === null || _a === void 0 ? void 0 : _a.includes(tag); })
+                .filter((c) => c.identity.tags?.includes(tag))
                 .map((c) => JourneyContext.fromObject(c));
         }
         return undefined;
@@ -650,7 +630,7 @@ class JourneyContext {
      * @returns {Array} Array of contexts
      */
     static getContexts(session) {
-        if (has(session, "journeyContextList")) {
+        if (session && Object.hasOwn(session, "journeyContextList")) {
             return session.journeyContextList.map(([, contextObj]) => JourneyContext.fromObject(contextObj));
         }
         return [];
@@ -677,7 +657,7 @@ class JourneyContext {
             throw new TypeError("Context must have an ID before storing in session");
         }
         // Initialise the session if necessary
-        if (!has(session, "journeyContextList")) {
+        if (Object.hasOwn(session, "journeyContextList") === false) {
             JourneyContext.initContextStore(session);
         }
         // Apply context events
@@ -717,8 +697,7 @@ class JourneyContext {
      * @returns {void}
      */
     static removeContextById(session, id) {
-        var _a;
-        const index = ((_a = session === null || session === void 0 ? void 0 : session.journeyContextList) !== null && _a !== void 0 ? _a : []).findIndex(([contextId]) => contextId === id);
+        const index = (session?.journeyContextList ?? []).findIndex(([contextId]) => contextId === id);
         if (index > -1) {
             session.journeyContextList.splice(index, 1);
         }
@@ -741,7 +720,9 @@ class JourneyContext {
      * @returns {void}
      */
     static removeContextsByTag(session, tag) {
-        JourneyContext.getContextsByTag(session, tag).forEach((c) => JourneyContext.removeContext(session, c));
+        for (const c of JourneyContext.getContextsByTag(session, tag)) {
+            JourneyContext.removeContext(session, c);
+        }
     }
     /**
      * Remove call contexts.
@@ -750,7 +731,9 @@ class JourneyContext {
      * @returns {void}
      */
     static removeContexts(session) {
-        JourneyContext.getContexts(session).forEach((c) => JourneyContext.removeContext(session, c));
+        for (const c of JourneyContext.getContexts(session)) {
+            JourneyContext.removeContext(session, c);
+        }
     }
     /**
      * Extract the Journey Context referred to in the incoming request.
@@ -765,15 +748,15 @@ class JourneyContext {
     static extractContextFromRequest(req) {
         JourneyContext.initContextStore(req.session);
         let contextId;
-        if (has(req === null || req === void 0 ? void 0 : req.params, "contextid")) {
+        if (req.params && Object.hasOwn(req.params, "contextid")) {
             log.trace("Context ID found in req.params.contextid");
             contextId = String(req.params.contextid);
         }
-        else if (has(req.query, "contextid")) {
+        else if (req.query && Object.hasOwn(req.query, "contextid")) {
             log.trace("Context ID found in req.query.contextid");
             contextId = String(req.query.contextid);
         }
-        else if (has(req === null || req === void 0 ? void 0 : req.body, "contextid")) {
+        else if (req.body && Object.hasOwn(req.body, "contextid")) {
             log.trace("Context ID found in req.body.contextid");
             contextId = String(req.body.contextid);
         }
@@ -803,11 +786,9 @@ class JourneyContext {
      * @param {string} opts.to Waypoint to skip to.
      */
     setSkipped(waypoint, opts) {
-        var _a;
-        var _b;
         // Unset, with setSkipped(a, false)
         if (opts === false) {
-            (_a = (_b = this.data)[waypoint]) !== null && _a !== void 0 ? _a : (_b[waypoint] = Object.create(null));
+            this.data[waypoint] ??= Object.create(null);
             this.data[waypoint].__skipped__ = undefined;
             this.data[waypoint].__skip__ = undefined;
         }
@@ -818,7 +799,7 @@ class JourneyContext {
             this.data[waypoint].__skip__ = { to: null };
         }
         // Set, with setSkipped(a, { to: b }) and clear data
-        else if (typeof (opts === null || opts === void 0 ? void 0 : opts.to) === "string") {
+        else if (typeof opts?.to === "string") {
             this.data[waypoint] = Object.create(null);
             this.data[waypoint].__skipped__ = true;
             this.data[waypoint].__skip__ = { to: opts.to };
@@ -837,21 +818,14 @@ class JourneyContext {
      *   skipped to a specific page.
      */
     isSkipped(waypoint, opts) {
-        var _a, _b, _c, _d;
         if (opts === undefined) {
-            return (((_a = this.data[waypoint]) === null || _a === void 0 ? void 0 : _a.__skipped__) === true ||
-                ((_b = this.data[waypoint]) === null || _b === void 0 ? void 0 : _b.__skip__) !== undefined);
+            return (this.data[waypoint]?.__skipped__ === true ||
+                this.data[waypoint]?.__skip__ !== undefined);
         }
         else if (typeof opts.to === "string") {
-            return ((_d = (_c = this.data[waypoint]) === null || _c === void 0 ? void 0 : _c.__skip__) === null || _d === void 0 ? void 0 : _d.to) === opts.to;
+            return this.data[waypoint]?.__skip__?.to === opts.to;
         }
     }
 }
-_JourneyContext_data = new WeakMap(), _JourneyContext_validation = new WeakMap(), _JourneyContext_nav = new WeakMap(), _JourneyContext_identity = new WeakMap(), _JourneyContext_eventListeners = new WeakMap(), _JourneyContext_eventListenerPreState = new WeakMap();
-JourneyContext.DEFAULT_CONTEXT_ID = "default";
-/** @type {symbol} */
-JourneyContext.ID_GENERATOR_REQ_LOG = Symbol("generatedContextIds");
-/** @type {symbol} */
-JourneyContext.ID_GENERATOR_REQ_KEY = Symbol("generateContextId");
 exports.default = JourneyContext;
 //# sourceMappingURL=JourneyContext.js.map