@dwp/govuk-casa 9.7.0 → 10.1.0

package/dist/core-plugins/edit-snapshot/src/pre-steer-hook.d.ts

@@ -1,2 +1,3 @@
-declare function _default(req: any, res: any, next: any): any;
+declare const _default: (req: import("express-serve-static-core").Request<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>, res: import("express-serve-static-core").Response<any, Record<string, any>, number>, next: import("express-serve-static-core").NextFunction) => unknown;
 export default _default;
+//# sourceMappingURL=pre-steer-hook.d.ts.map

package/dist/core-plugins/edit-snapshot/src/pre-steer-hook.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"pre-steer-hook.d.ts","sourceRoot":"","sources":["../../../../src/core-plugins/edit-snapshot/src/pre-steer-hook.js"],"names":[],"mappings":"yBAYgB,4JAAG,EAAE,mFAAG,EAAE,sDAAI"}

package/dist/core-plugins/edit-snapshot/src/pre-steer-hook.js

@@ -1,33 +1,28 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const logger_js_1 = __importDefault(require("../../../lib/logger.js"));
-const utils_js_1 = require("./utils.js");
-const log = (0, logger_js_1.default)("lib:internal-plugin:edit-snapshot:pre-steer-hook");
-exports.default = (req, res, next) => {
-    if (req.query.editcancel && (0, utils_js_1.snapshotExists)(req)) {
+import logger from "../../../lib/logger.js";
+import { FLAG_FOR_PURGING, snapshotExists, recoverSnapshot, createSnapshot, reachedEditOrigin, } from "./utils.js";
+const log = logger("lib:internal-plugin:edit-snapshot:pre-steer-hook");
+/** @type {import("express").RequestHandler} */
+export default (req, res, next) => {
+    if (req.query?.editcancel && snapshotExists(req)) {
         log.debug("Edit workflow was actively canceled. Snapshot will be recovered.");
-        (0, utils_js_1.recoverSnapshot)(log, req);
+        recoverSnapshot(log, req);
         return req.session.save(next);
     }
-    if (!req.casa.editMode && (0, utils_js_1.snapshotExists)(req)) {
+    if (!req.casa.editMode && snapshotExists(req)) {
         log.debug("Edit workflow passively canceled. Snapshot will be recovered.");
-        (0, utils_js_1.recoverSnapshot)(log, req);
+        recoverSnapshot(log, req);
         return req.session.save(next);
     }
-    if (req.casa.editMode && (0, utils_js_1.reachedEditOrigin)(log, req)) {
+    if (req.casa.editMode && reachedEditOrigin(log, req)) {
         log.trace(`Editing workflow has reached editorigin. Purge MAY be carried out in poststeer hook on context '${req.casa.journeyContext.identity.id}'.`);
         // eslint-disable-next-line security/detect-object-injection
-        req.casa[utils_js_1.FLAG_FOR_PURGING] = true;
+        req.casa[FLAG_FOR_PURGING] = true;
         return next();
     }
-    if (req.casa.editMode && !(0, utils_js_1.snapshotExists)(req)) {
+    if (req.casa.editMode && !snapshotExists(req)) {
         log.debug("Editing workflow has just started. Will create snapshot.");
-        (0, utils_js_1.createSnapshot)(log, req);
+        createSnapshot(log, req);
         return req.session.save(next);
     }
     next();
 };
-//# sourceMappingURL=pre-steer-hook.js.map

package/dist/core-plugins/edit-snapshot/src/utils.d.ts

@@ -1,6 +1,9 @@
 export const FLAG_FOR_PURGING: unique symbol;
-export function snapshotExists(req: any): any;
-export function reachedEditOrigin(log: any, req: any): boolean;
-export function createSnapshot(log: any, req: any): void;
-export function recoverSnapshot(log: any, req: any): void;
-export function deleteSnapshot(log: any, req: any): void;
+export function snapshotExists(req: ExpressRequest): undefined | boolean;
+export function reachedEditOrigin(log: CASADebugLogger, req: ExpressRequest): boolean;
+export function createSnapshot(log: CASADebugLogger, req: ExpressRequest): void;
+export function recoverSnapshot(log: CASADebugLogger, req: ExpressRequest): void;
+export function deleteSnapshot(log: CASADebugLogger, req: ExpressRequest): void;
+export type CASADebugLogger = import("../../../lib/logger.js").CASADebugLogger;
+export type ExpressRequest = import("express").Request;
+//# sourceMappingURL=utils.d.ts.map

package/dist/core-plugins/edit-snapshot/src/utils.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../../../src/core-plugins/edit-snapshot/src/utils.js"],"names":[],"mappings":"AAMA,6CAAsE;AAM/D,oCAHI,cAAc,GACZ,SAAS,GAAG,OAAO,CAO/B;AAOM,uCAJI,eAAe,OACf,cAAc,GACZ,OAAO,CAanB;AAOM,oCAJI,eAAe,OACf,cAAc,GACZ,IAAI,CAShB;AAOM,qCAJI,eAAe,OACf,cAAc,GACZ,IAAI,CAWhB;AAOM,oCAJI,eAAe,OACf,cAAc,GACZ,IAAI,CAOhB;8BAEa,OAAO,wBAAwB,EAAE,eAAe;6BAChD,OAAO,SAAS,EAAE,OAAO"}

package/dist/core-plugins/edit-snapshot/src/utils.js

@@ -1,38 +1,56 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteSnapshot = exports.recoverSnapshot = exports.createSnapshot = exports.reachedEditOrigin = exports.snapshotExists = exports.FLAG_FOR_PURGING = void 0;
 /* eslint-disable security/detect-object-injection */
-const casa_js_1 = require("../../../casa.js");
+import { JourneyContext } from "../../../casa.js";
+import NullObject from "../../../lib/NullObject.js";
 const SESSION_KEY = "casa_edit_snapshots";
-exports.FLAG_FOR_PURGING = Symbol("flag_to_purge_edit_snapshot");
-const snapshotExists = (req) => {
+export const FLAG_FOR_PURGING = Symbol("flag_to_purge_edit_snapshot");
+/**
+ * @param {ExpressRequest} req Express request
+ * @returns {undefined | boolean} Whether the snapshot exists
+ */
+export const snapshotExists = (req) => {
     return (req?.session[SESSION_KEY] &&
         Object.hasOwn(req.session[SESSION_KEY], req.casa.journeyContext.identity.id));
 };
-exports.snapshotExists = snapshotExists;
-const reachedEditOrigin = (log, req) => {
+/**
+ * @param {CASADebugLogger} log Express request
+ * @param {ExpressRequest} req Express request
+ * @returns {boolean} Reached edit origin
+ */
+export const reachedEditOrigin = (log, req) => {
     const { pathname: currentPathname } = new URL(req.originalUrl, "https://placeholder.test/");
     const { pathname: editOriginPathname } = new URL(req.casa.editOrigin, "https://placeholder.test/");
     return editOriginPathname === currentPathname;
 };
-exports.reachedEditOrigin = reachedEditOrigin;
-const createSnapshot = (log, req) => {
+/**
+ * @param {CASADebugLogger} log Express request
+ * @param {ExpressRequest} req Express request
+ * @returns {void}
+ */
+export const createSnapshot = (log, req) => {
     log.debug(`Creating a new edit snapshot for context '${req.casa.journeyContext.identity.id}'`);
-    req.session[SESSION_KEY] ??= Object.create(null);
+    req.session[SESSION_KEY] ??= new NullObject();
     req.session[SESSION_KEY][req.casa.journeyContext.identity.id] =
         req.casa.journeyContext.toObject();
 };
-exports.createSnapshot = createSnapshot;
-const recoverSnapshot = (log, req) => {
+/**
+ * @param {CASADebugLogger} log Express request
+ * @param {ExpressRequest} req Express request
+ * @returns {void}
+ */
+export const recoverSnapshot = (log, req) => {
     log.debug(`Recovering snapshot for context '${req.casa.journeyContext.identity.id}'`);
     req.casa.journeyContext.configureFromObject(req.session[SESSION_KEY][req.casa.journeyContext.identity.id]);
-    casa_js_1.JourneyContext.putContext(req.session, req.casa.journeyContext);
-    (0, exports.deleteSnapshot)(log, req);
+    JourneyContext.putContext(req.session, req.casa.journeyContext);
+    deleteSnapshot(log, req);
 };
-exports.recoverSnapshot = recoverSnapshot;
-const deleteSnapshot = (log, req) => {
+/**
+ * @param {CASADebugLogger} log Express request
+ * @param {ExpressRequest} req Express request
+ * @returns {void}
+ */
+export const deleteSnapshot = (log, req) => {
     log.debug(`Purging edit snapshot for context '${req.casa.journeyContext.identity.id}'`);
     req.session[SESSION_KEY][req.casa.journeyContext.identity.id] = undefined;
 };
-exports.deleteSnapshot = deleteSnapshot;
-//# sourceMappingURL=utils.js.map
+/** @typedef {import("../../../lib/logger.js").CASADebugLogger} CASADebugLogger */
+/** @typedef {import("express").Request} ExpressRequest */

package/dist/core-plugins/index.d.ts

@@ -1 +1,2 @@
 export { default as editSnapshot } from "./edit-snapshot/src/index.js";
+//# sourceMappingURL=index.d.ts.map

package/dist/core-plugins/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/core-plugins/index.js"],"names":[],"mappings":""}

package/dist/core-plugins/index.js

@@ -1,10 +1,2 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.editSnapshot = void 0;
 // Convenience for exporting all plugins as "corePlugins" from main casa module
-var index_js_1 = require("./edit-snapshot/src/index.js");
-Object.defineProperty(exports, "editSnapshot", { enumerable: true, get: function () { return __importDefault(index_js_1).default; } });
-//# sourceMappingURL=index.js.map
+export { default as editSnapshot } from "./edit-snapshot/src/index.js";

package/dist/lib/CasaTemplateLoader.d.ts

@@ -30,3 +30,4 @@ export type FileSystemLoaderOptions = import("nunjucks").FileSystemLoaderOptions
 export type LoaderSource = import("nunjucks").LoaderSource;
 export type BlockModifier = (templateName: string) => string;
 import { FileSystemLoader } from "nunjucks";
+//# sourceMappingURL=CasaTemplateLoader.d.ts.map

package/dist/lib/CasaTemplateLoader.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"CasaTemplateLoader.d.ts","sourceRoot":"","sources":["../../src/lib/CasaTemplateLoader.js"],"names":[],"mappings":"AA4BA;;;;GAIG;AAEH;;;GAGG;AACH;IAGE;;;;;OAKG;IACH,yBAHW,MAAM,EAAE,QACR,uBAAuB,EAMjC;IAaD;;;;;;;OAOG;IACH,mBALW,MAAM,YACN,aAAa,GACX,IAAI,CAehB;;CAuBF;sCAxGY,OAAO,UAAU,EAAE,uBAAuB;2BAK1C,OAAO,UAAU,EAAE,YAAY;2CAsBjC,MAAM,KACJ,MAAM;iCA/Bc,UAAU"}

package/dist/lib/CasaTemplateLoader.js

@@ -1,6 +1,4 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const nunjucks_1 = require("nunjucks");
+import { FileSystemLoader } from "nunjucks";
 /**
  * @typedef {import("nunjucks").FileSystemLoaderOptions} FileSystemLoaderOptions
  * @access private
@@ -33,7 +31,7 @@ const VALID_BLOCKS = [
  * @augments FileSystemLoader
  * @access private
  */
-class CasaTemplateLoader extends nunjucks_1.FileSystemLoader {
+export default class CasaTemplateLoader extends FileSystemLoader {
     #blockModifiers;
     /**
      * Constructor.
@@ -92,5 +90,3 @@ class CasaTemplateLoader extends nunjucks_1.FileSystemLoader {
         return source;
     }
 }
-exports.default = CasaTemplateLoader;
-//# sourceMappingURL=CasaTemplateLoader.js.map

package/dist/lib/JourneyContext.d.ts

@@ -18,16 +18,20 @@
  * @typedef {import("../casa").JourneyContextObject} JourneyContextObject
  * @access private
  */
+/**
+ * @typedef {import("../casa").JourneyContextIdentity} JourneyContextIdentity
+ * @access private
+ */
 /**
  * @typedef {import("express").Request} ExpressRequest
  * @access private
  */
 /**
- * @param {any} key Object key to validate
+ * @param {string} key Object key to validate
  * @returns {string} Validated key
  */
-export function validateObjectKey(key?: any): string;
-/** @memberof module:@dwp/govuk-casa */
+export function validateObjectKey(key?: string): string;
+/** @memberof module:"@dwp/govuk-casa" */
 export default class JourneyContext {
     static DEFAULT_CONTEXT_ID: string;
     /** @type {symbol} */
@@ -214,12 +218,15 @@ export default class JourneyContext {
      * among a group of contexts stored in the session.
      *
      * @param {Record<string, any>} data Entire journey data.
-     * @param {object} validation Page errors (indexed by waypoint id).
-     * @param {object} nav Navigation context.
-     * @param {object} identity Some metadata for identifying this context among
-     *   others.
+     * @param {Record<string, ValidationError[] | null>} validation Page errors
+     *   (indexed by waypoint id).
+     * @param {{ language?: string }} nav Navigation context.
+     * @param {JourneyContextIdentity} identity Some metadata for identifying this
+     *   context among others.
      */
-    constructor(data?: Record<string, any>, validation?: object, nav?: object, identity?: object);
+    constructor(data?: Record<string, any>, validation?: Record<string, ValidationError[] | null>, nav?: {
+        language?: string;
+    }, identity?: JourneyContextIdentity);
     /**
      * Clone into an object that can be stringified.
      *
@@ -229,9 +236,11 @@ export default class JourneyContext {
     configureFromObject(object: any): void;
     set data(value: Record<string, any>);
     get data(): Record<string, any>;
-    get validation(): object;
-    get nav(): object;
-    get identity(): object;
+    get validation(): Record<string, ValidationError[] | null>;
+    get nav(): {
+        language?: string;
+    };
+    get identity(): import("../casa").JourneyContextIdentity;
     /**
      * Get data context for a specific a specific page.
      *
@@ -413,5 +422,7 @@ export type Page = import("../casa").Page;
 export type ContextEventHandler = import("../casa").ContextEventHandler;
 export type ContextEvent = import("../casa").ContextEvent;
 export type JourneyContextObject = import("../casa").JourneyContextObject;
+export type JourneyContextIdentity = import("../casa").JourneyContextIdentity;
 export type ExpressRequest = import("express").Request;
 import ValidationError from "./ValidationError.js";
+//# sourceMappingURL=JourneyContext.d.ts.map

package/dist/lib/JourneyContext.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"JourneyContext.d.ts","sourceRoot":"","sources":["../../src/lib/JourneyContext.js"],"names":[],"mappings":"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"}

package/dist/lib/JourneyContext.js

@@ -1,9 +1,3 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.validateObjectKey = validateObjectKey;
 /**
  * Represents the state of a user's journey through the Plan. It contains
  * information about:
@@ -12,16 +6,17 @@ exports.validateObjectKey = validateObjectKey;
  * - Validation errors on that data
  * - 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, 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 });
+import isPlainObject from "is-plain-obj";
+import { deepEqual } from "fast-equals";
+import rfdc from "rfdc";
+import NullObject from "./NullObject.js";
+import ValidationError from "./ValidationError.js";
+import logger from "./logger.js";
+import { notProto } from "./utils.js";
+import { uuid as uuidGenerator } from "./context-id-generators.js";
+const log = logger("lib:journey-context");
+const uuid = uuidGenerator();
+const clone = rfdc({ proto: false });
 /**
  * @typedef {import("../casa").ContextEventUserInfo} ContextEventUserInfo
  * @access private
@@ -42,15 +37,19 @@ const clone = (0, rfdc_1.default)({ proto: false });
  * @typedef {import("../casa").JourneyContextObject} JourneyContextObject
  * @access private
  */
+/**
+ * @typedef {import("../casa").JourneyContextIdentity} JourneyContextIdentity
+ * @access private
+ */
 /**
  * @typedef {import("express").Request} ExpressRequest
  * @access private
  */
 /**
- * @param {any} key Object key to validate
+ * @param {string} key Object key to validate
  * @returns {string} Validated key
  */
-function validateObjectKey(key = "") {
+export function validateObjectKey(key = "") {
     const keyLower = String.prototype.toLowerCase.call(key);
     if (keyLower === "prototype" ||
         keyLower === "__proto__" ||
@@ -59,8 +58,8 @@ function validateObjectKey(key = "") {
     }
     return String(key);
 }
-/** @memberof module:@dwp/govuk-casa */
-class JourneyContext {
+/** @memberof module:"@dwp/govuk-casa" */
+export default class JourneyContext {
     // Private properties
     #data;
     #validation;
@@ -92,10 +91,11 @@ class JourneyContext {
      * among a group of contexts stored in the session.
      *
      * @param {Record<string, any>} data Entire journey data.
-     * @param {object} validation Page errors (indexed by waypoint id).
-     * @param {object} nav Navigation context.
-     * @param {object} identity Some metadata for identifying this context among
-     *   others.
+     * @param {Record<string, ValidationError[] | null>} validation Page errors
+     *   (indexed by waypoint id).
+     * @param {{ language?: string }} nav Navigation context.
+     * @param {JourneyContextIdentity} identity Some metadata for identifying this
+     *   context among others.
      */
     constructor(data = {}, validation = {}, nav = {}, identity = {}) {
         this.#data = data;
@@ -111,7 +111,7 @@ class JourneyContext {
      * @returns {JourneyContextObject} Plain object.
      */
     toObject() {
-        return Object.assign(Object.create(null), {
+        return Object.assign(new NullObject(), {
             data: clone(this.#data),
             validation: clone(this.#validation),
             nav: clone(this.#nav),
@@ -124,16 +124,16 @@ class JourneyContext {
      * @param {JourneyContextObject} obj Object.
      * @returns {JourneyContext} Instance.
      */
-    static fromObject({ data = Object.create(null), validation = Object.create(null), nav = Object.create(null), identity = Object.create(null), } = {}) {
+    static fromObject({ data = new NullObject(), validation = new NullObject(), nav = new NullObject(), identity = new NullObject(), } = {}) {
         // As we're constructing a JourneyContext from a plain JS object, we need to
         // ensure any validation errors are instances of ValidationError.
-        const deserialisedValidation = Object.create(null);
+        const deserialisedValidation = new NullObject();
         for (const [waypoint, errors] of Object.entries(validation)) {
             let dErrors = errors;
             if (Array.isArray(errors)) {
-                dErrors = errors.map((e) => e instanceof ValidationError_js_1.default ? e : new ValidationError_js_1.default(e));
+                dErrors = errors.map((e) => e instanceof ValidationError ? e : new ValidationError(e));
             }
-            deserialisedValidation[(0, utils_js_1.notProto)(waypoint)] = dErrors;
+            deserialisedValidation[notProto(waypoint)] = dErrors;
         }
         return new JourneyContext(data, deserialisedValidation, nav, identity);
     }
@@ -260,7 +260,7 @@ class JourneyContext {
             throw new SyntaxError(`Errors must be an Array. Received ${Object.prototype.toString.call(errors)}`);
         }
         for (const error of errors) {
-            if (!(error instanceof ValidationError_js_1.default)) {
+            if (!(error instanceof ValidationError)) {
                 throw new SyntaxError("Field errors must be a ValidationError");
             }
         }
@@ -288,7 +288,7 @@ class JourneyContext {
      */
     getValidationErrorsForPageByField(pageId) {
         const errors = this.getValidationErrorsForPage(pageId);
-        const obj = Object.create(null);
+        const obj = new NullObject();
         // ESLint disabled as `i` is an integer
         /* eslint-disable security/detect-object-injection */
         for (let i = 0, l = errors.length; i < l; i++) {
@@ -335,8 +335,8 @@ class JourneyContext {
      * @param {string[]} waypoints Waypoints to be removed
      */
     purge(waypoints = []) {
-        const newData = Object.create(null);
-        const newValidation = Object.create(null);
+        const newData = new NullObject();
+        const newValidation = new NullObject();
         const toKeep = Object.keys(this.#data).filter((w) => !waypoints.includes(w));
         // ESLint disabled as `i` is an integer
         /* eslint-disable security/detect-object-injection */
@@ -413,13 +413,13 @@ class JourneyContext {
                 logMessage = `Calling waypoint-specific event handler on "${waypoint}"`;
                 runHandler =
                     previousContext.data?.[waypoint] !== undefined &&
-                        !isEqual(this.data?.[waypoint], previousContext.data?.[waypoint]);
+                        !deepEqual(this.data?.[waypoint], previousContext.data?.[waypoint]);
             }
             else if (waypoint && field) {
                 logMessage = `Calling field-specific event handler on "${waypoint} : ${field}"`;
                 runHandler =
                     previousContext.data?.[waypoint]?.[field] !== undefined &&
-                        !isEqual(this.data?.[waypoint]?.[field], previousContext.data?.[waypoint]?.[field]);
+                        !deepEqual(this.data?.[waypoint]?.[field], previousContext.data?.[waypoint]?.[field]);
             }
             if (runHandler) {
                 log.trace(logMessage);
@@ -654,7 +654,7 @@ class JourneyContext {
      * @throws {TypeError} When session is not a valid type, or context has no ID
      */
     static putContext(session, context, options = {}) {
-        if (!isObject(session)) {
+        if (typeof session !== "object" || session === null) {
             throw new TypeError("Session must be an object");
         }
         else if (!(context instanceof JourneyContext)) {
@@ -795,20 +795,17 @@ class JourneyContext {
         /* eslint-disable security/detect-object-injection */
         // Unset, with setSkipped(a, false)
         if (opts === false) {
-            this.data[waypoint] ??= Object.create(null);
-            this.data[waypoint].__skipped__ = undefined;
+            this.data[waypoint] ??= new NullObject();
             this.data[waypoint].__skip__ = undefined;
         }
         // Set, with setSkipped(a, true) and clear data
         else if (opts === true) {
-            this.data[waypoint] = Object.create(null);
-            this.data[waypoint].__skipped__ = true;
+            this.data[waypoint] = new NullObject();
             this.data[waypoint].__skip__ = { to: null };
         }
         // Set, with setSkipped(a, { to: b }) and clear data
         else if (typeof opts?.to === "string") {
-            this.data[waypoint] = Object.create(null);
-            this.data[waypoint].__skipped__ = true;
+            this.data[waypoint] = new NullObject();
             this.data[waypoint].__skip__ = { to: opts.to };
         }
         else {
@@ -828,12 +825,10 @@ class JourneyContext {
     isSkipped(waypoint, opts) {
         const wpData = this.data[String(waypoint)];
         if (opts === undefined) {
-            return wpData?.__skipped__ === true || wpData?.__skip__ !== undefined;
+            return wpData?.__skip__ !== undefined;
         }
         else if (typeof opts.to === "string") {
             return wpData?.__skip__?.to === opts.to;
         }
     }
 }
-exports.default = JourneyContext;
-//# sourceMappingURL=JourneyContext.js.map