@dwp/govuk-casa 8.0.0-alpha1 → 8.0.0

package/dist/lib/MutableRouter.d.ts

@@ -2,14 +2,14 @@ export default class MutableRouter {
     /**
      * Seals this router to make it immutable. Returns the ExpressJS router.
      *
-     * @returns {Router}
+     * @returns {Router} ExpressJS Router
      */
     seal(): Router;
     /**
      * Prepend middleware function(s) using the `all()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependAll(path: string, ...callbacks: Function[]): void;
@@ -17,7 +17,7 @@ export default class MutableRouter {
      * Prepend middleware function(s) using the `get()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependGet(path: string, ...callbacks: Function[]): void;
@@ -25,7 +25,7 @@ export default class MutableRouter {
      * Prepend middleware function(s) using the `post()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependPost(path: string, ...callbacks: Function[]): void;
@@ -33,7 +33,7 @@ export default class MutableRouter {
      * Prepend middleware function(s) using the `delete()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependDelete(path: string, ...callbacks: Function[]): void;
@@ -41,7 +41,7 @@ export default class MutableRouter {
      * Prepend middleware function(s) using the `put()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependPut(path: string, ...callbacks: Function[]): void;
@@ -49,7 +49,7 @@ export default class MutableRouter {
      * Prepend middleware function(s) using the `use()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependUse(path: string, ...callbacks: Function[]): void;
@@ -57,7 +57,7 @@ export default class MutableRouter {
      * Replace middleware function(s) that were mounted using the `all()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replaceAll(path: string, ...callbacks: Function[]): void;
@@ -65,7 +65,7 @@ export default class MutableRouter {
      * Replace middleware function(s) that were mounted using the `get()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replaceGet(path: string, ...callbacks: Function[]): void;
@@ -73,7 +73,7 @@ export default class MutableRouter {
      * Replace middleware function(s) that were mounted using the `post()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replacePost(path: string, ...callbacks: Function[]): void;
@@ -81,7 +81,7 @@ export default class MutableRouter {
      * Replace middleware function(s) that were mounted using the `delete()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replaceDelete(path: string, ...callbacks: Function[]): void;
@@ -89,7 +89,7 @@ export default class MutableRouter {
      * Replace middleware function(s) that were mounted using the `put()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replacePut(path: string, ...callbacks: Function[]): void;
@@ -97,7 +97,7 @@ export default class MutableRouter {
      * Replace middleware function(s) that were mounted using the `use()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replaceUse(path: string, ...callbacks: Function[]): void;
@@ -105,7 +105,7 @@ export default class MutableRouter {
      * Append middleware function(s) using the `all()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     all(path: string, ...callbacks: Function[]): void;
@@ -113,7 +113,7 @@ export default class MutableRouter {
      * Append middleware function(s) using the `get()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     get(path: string, ...callbacks: Function[]): void;
@@ -121,7 +121,7 @@ export default class MutableRouter {
      * Append middleware function(s) using the `post()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     post(path: string, ...callbacks: Function[]): void;
@@ -129,7 +129,7 @@ export default class MutableRouter {
      * Append middleware function(s) using the `delete()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     delete(path: string, ...callbacks: Function[]): void;
@@ -137,7 +137,7 @@ export default class MutableRouter {
      * Append middleware function(s) using the `put()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     put(path: string, ...callbacks: Function[]): void;
@@ -145,7 +145,7 @@ export default class MutableRouter {
      * Append middleware function(s) using the `use()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     use(path: string, ...callbacks: Function[]): void;

package/dist/lib/MutableRouter.js

@@ -12,15 +12,18 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _MutableRouter_instances, _MutableRouter_stack, _MutableRouter_router, _MutableRouter_sealed, _MutableRouter_append, _MutableRouter_prepend, _MutableRouter_replace;
 Object.defineProperty(exports, "__esModule", { value: true });
+/* eslint-disable sonarjs/no-duplicate-string,class-methods-use-this */
 const express_1 = require("express");
 class MutableRouter {
     /**
+     * Mutable router.
+     *
      * @class
      */
     constructor() {
         _MutableRouter_instances.add(this);
         /**
-         * @type {array}
+         * @type {Array}
          */
         _MutableRouter_stack.set(this, void 0);
         /**
@@ -38,13 +41,16 @@ class MutableRouter {
     /**
      * Seals this router to make it immutable. Returns the ExpressJS router.
      *
-     * @returns {Router}
+     * @returns {Router} ExpressJS Router
      */
     seal() {
         if (__classPrivateFieldGet(this, _MutableRouter_sealed, "f")) {
             return __classPrivateFieldGet(this, _MutableRouter_router, "f");
         }
         __classPrivateFieldGet(this, _MutableRouter_stack, "f").forEach(({ method, args }) => {
+            // ESLint disabled as `#router` is dev-controlled, and `seal()` is only
+            // run at boot-time before any user interaction
+            /* eslint-disable-next-line security/detect-object-injection */
             __classPrivateFieldGet(this, _MutableRouter_router, "f")[method].call(__classPrivateFieldGet(this, _MutableRouter_router, "f"), ...args);
         });
         __classPrivateFieldSet(this, _MutableRouter_sealed, true, "f");
@@ -55,7 +61,7 @@ class MutableRouter {
      * Prepend middleware function(s) using the `all()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependAll(path, ...callbacks) {
@@ -65,7 +71,7 @@ class MutableRouter {
      * Prepend middleware function(s) using the `get()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependGet(path, ...callbacks) {
@@ -75,7 +81,7 @@ class MutableRouter {
      * Prepend middleware function(s) using the `post()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependPost(path, ...callbacks) {
@@ -85,7 +91,7 @@ class MutableRouter {
      * Prepend middleware function(s) using the `delete()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependDelete(path, ...callbacks) {
@@ -95,7 +101,7 @@ class MutableRouter {
      * Prepend middleware function(s) using the `put()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependPut(path, ...callbacks) {
@@ -105,19 +111,18 @@ class MutableRouter {
      * Prepend middleware function(s) using the `use()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     prependUse(path, ...callbacks) {
         __classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_prepend).call(this, 'use', path, ...callbacks);
     }
     /* -------------------------------------------------------------- replacers */
-    // TODO: How do we handle multiple routes on the same path?
     /**
      * Replace middleware function(s) that were mounted using the `all()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replaceAll(path, ...callbacks) {
@@ -127,7 +132,7 @@ class MutableRouter {
      * Replace middleware function(s) that were mounted using the `get()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replaceGet(path, ...callbacks) {
@@ -137,7 +142,7 @@ class MutableRouter {
      * Replace middleware function(s) that were mounted using the `post()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replacePost(path, ...callbacks) {
@@ -147,7 +152,7 @@ class MutableRouter {
      * Replace middleware function(s) that were mounted using the `delete()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replaceDelete(path, ...callbacks) {
@@ -157,7 +162,7 @@ class MutableRouter {
      * Replace middleware function(s) that were mounted using the `put()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replacePut(path, ...callbacks) {
@@ -167,7 +172,7 @@ class MutableRouter {
      * Replace middleware function(s) that were mounted using the `use()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     replaceUse(path, ...callbacks) {
@@ -178,7 +183,7 @@ class MutableRouter {
      * Append middleware function(s) using the `all()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     all(path, ...callbacks) {
@@ -188,7 +193,7 @@ class MutableRouter {
      * Append middleware function(s) using the `get()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     get(path, ...callbacks) {
@@ -198,7 +203,7 @@ class MutableRouter {
      * Append middleware function(s) using the `post()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     post(path, ...callbacks) {
@@ -208,7 +213,7 @@ class MutableRouter {
      * Append middleware function(s) using the `delete()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     delete(path, ...callbacks) {
@@ -218,7 +223,7 @@ class MutableRouter {
      * Append middleware function(s) using the `put()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     put(path, ...callbacks) {
@@ -228,14 +233,14 @@ class MutableRouter {
      * Append middleware function(s) using the `use()` method.
      *
      * @param {string} path route path
-     * @param  {...function} callbacks Middleware functions
+     * @param  {...Function} callbacks Middleware functions
      * @returns {void}
      */
     use(path, ...callbacks) {
         __classPrivateFieldGet(this, _MutableRouter_instances, "m", _MutableRouter_append).call(this, 'use', path, ...callbacks);
     }
     route() {
-        throw new Error('The route() method is not currently supported on the MutableRouter class. Please use the verb methods for now.');
+        throw new Error('route() method is not supported on MutableRouter. Use verb methods for now.');
     }
 }
 exports.default = MutableRouter;
@@ -261,12 +266,14 @@ _MutableRouter_stack = new WeakMap(), _MutableRouter_router = new WeakMap(), _Mu
     if (__classPrivateFieldGet(this, _MutableRouter_sealed, "f")) {
         throw new Error('Cannot alter middleware in a sealed mutable router');
     }
-    const index = __classPrivateFieldGet(this, _MutableRouter_stack, "f").findIndex((command) => `${command.method}|${command.path}` === `${method}|${path}`);
+    const finder = (command) => `${command.method}|${command.path}` === `${method}|${path}`;
+    const index = __classPrivateFieldGet(this, _MutableRouter_stack, "f").findIndex(finder);
     if (index > -1) {
         __classPrivateFieldGet(this, _MutableRouter_stack, "f").splice(index, 1, {
             method,
             path,
             args: [path, ...callbacks],
         });
+        __classPrivateFieldSet(this, _MutableRouter_stack, __classPrivateFieldGet(this, _MutableRouter_stack, "f").filter((command, idx) => idx <= index || !finder(command)), "f");
     }
 };

package/dist/lib/Plan.d.ts

@@ -1,10 +1,44 @@
 export default class Plan {
-    static isExitNode(name: any): boolean;
     /**
-     * @param {object} opts
+     * Waypoints using the url:// protocol are known as "exit nodes" as they
+     * indicate an exit point to another Plan.
+     *
+     * @param {string} name Waypoint name
+     * @returns {boolean} True if the waypoint is a url:// type
+     */
+    static isExitNode(name: string): boolean;
+    /**
+     * Create a Plan.
+     *
+     * @param {object} opts Options
+     * @param {boolean} [opts.validateBeforeRouteCondition=true] Check page validity before conditions
+     * @param {Function|string} [opts.arbiter=undefined] Arbitration mechanism
      */
-    constructor(opts?: object);
+    constructor(opts?: {
+        validateBeforeRouteCondition?: boolean | undefined;
+        arbiter?: string | Function | undefined;
+    });
     getOptions(): any;
+    /**
+     * Retrieve the list of skippable waypoints.
+     *
+     * @returns {string[]} List of skippable waypoints
+     */
+    getSkippables(): string[];
+    /**
+     * Add one or more skippable waypoints.
+     *
+     * @param  {...string} waypoints Waypoints
+     * @returns {Plan}{ Chain}
+     */
+    addSkippables(...waypoints: string[]): Plan;
+    /**
+     * Check if the user can skip the named waypoint.
+     *
+     * @param {string} waypoint Waypoint
+     * @returns {boolean} True if waypoint can be skipped
+     */
+    isSkippable(waypoint: string): boolean;
     getWaypoints(): any;
     containsWaypoint(waypoint: any): any;
     getRoutes(): any;
@@ -100,7 +134,7 @@ export default class Plan {
      * string routeName = Follow routes matching this name (next | prev)
      * Map history = Used to detect loops in traversal (internal use)
      * function stopCondition = Condition that, if true, will stop traversal (useful for performance)
-     * function|string arbiter = When mutliple target routes are found, this will decide which one to choose (if any)
+     * function|string arbiter = If mutliple target routes found, this decides which to use (if any)
      *
      * @param {JourneyContext} context Journey context
      * @param {object} options Options
@@ -112,8 +146,9 @@ export default class Plan {
      * Get raw graph data structure. This can be used with other libraries to
      * generate graph visualisations, for example.
      *
-     * @returns {graphlib.Graph} Graph data structure.
+     * @returns {Graph} Graph data structure.
      */
-    getGraphStructure(): any;
+    getGraphStructure(): Graph;
+    #private;
 }
 import JourneyContext from "./JourneyContext.js";

package/dist/lib/Plan.js

@@ -1,12 +1,24 @@
 "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 __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
+var _Plan_skippableWaypoints;
 Object.defineProperty(exports, "__esModule", { value: true });
 const graphlib_1 = require("graphlib");
 const JourneyContext_js_1 = __importDefault(require("./JourneyContext.js"));
 const logger_js_1 = __importDefault(require("./logger.js"));
-const log = (0, logger_js_1.default)('class:plan');
+const log = (0, logger_js_1.default)('lib:plan');
 /**
  * Will check if the source waypoint has specifically passed validation, i.e
  * there is a "null" validation entry for the route source.
@@ -35,6 +47,9 @@ function validateWaypointId(val) {
     if (typeof val !== 'string') {
         throw new TypeError(`Expected waypoint id to be a string, got ${typeof val}`);
     }
+    if (val.substr(0, 6) === 'url://' && !val.endsWith('/')) {
+        throw new SyntaxError('url:// waypoints must include a trailing /');
+    }
 }
 function validateRouteName(val) {
     if (typeof val !== 'string') {
@@ -43,6 +58,7 @@ function validateRouteName(val) {
     else if (!['next', 'prev'].includes(val)) {
         throw new ReferenceError(`Expected route name to be one of next or prev. Got ${val}`);
     }
+    return val;
 }
 function validateRouteCondition(val) {
     if (!(val instanceof Function)) {
@@ -74,13 +90,18 @@ const makeRouteObject = (dgraph, edge) => {
 const reExitNodeProtocol = /^[a-z]+:\/\//i;
 const priv = new WeakMap();
 class Plan {
-    static isExitNode(name) {
-        return reExitNodeProtocol.test(name);
-    }
     /**
-     * @param {object} opts
+     * Create a Plan.
+     *
+     * @param {object} opts Options
+     * @param {boolean} [opts.validateBeforeRouteCondition=true] Check page validity before conditions
+     * @param {Function|string} [opts.arbiter=undefined] Arbitration mechanism
      */
     constructor(opts = {}) {
+        /**
+         * @type {string[]} These waypoints can be skipped
+         */
+        _Plan_skippableWaypoints.set(this, void 0);
         // This is our directed, multigraph representation
         const dgraph = new graphlib_1.Graph({
             directed: true,
@@ -104,10 +125,48 @@ class Plan {
             },
             options,
         });
+        __classPrivateFieldSet(this, _Plan_skippableWaypoints, [], "f");
+    }
+    /**
+     * Waypoints using the url:// protocol are known as "exit nodes" as they
+     * indicate an exit point to another Plan.
+     *
+     * @param {string} name Waypoint name
+     * @returns {boolean} True if the waypoint is a url:// type
+     */
+    static isExitNode(name) {
+        return reExitNodeProtocol.test(name);
     }
     getOptions() {
         return priv.get(this).options;
     }
+    /**
+     * Retrieve the list of skippable waypoints.
+     *
+     * @returns {string[]} List of skippable waypoints
+     */
+    getSkippables() {
+        return __classPrivateFieldGet(this, _Plan_skippableWaypoints, "f");
+    }
+    /**
+     * Add one or more skippable waypoints.
+     *
+     * @param  {...string} waypoints Waypoints
+     * @returns {Plan}{ Chain}
+     */
+    addSkippables(...waypoints) {
+        __classPrivateFieldSet(this, _Plan_skippableWaypoints, [...__classPrivateFieldGet(this, _Plan_skippableWaypoints, "f"), ...waypoints], "f");
+        return this;
+    }
+    /**
+     * Check if the user can skip the named waypoint.
+     *
+     * @param {string} waypoint Waypoint
+     * @returns {boolean} True if waypoint can be skipped
+     */
+    isSkippable(waypoint) {
+        return __classPrivateFieldGet(this, _Plan_skippableWaypoints, "f").indexOf(waypoint) > -1;
+    }
     getWaypoints() {
         return priv.get(this).dgraph.nodes();
     }
@@ -119,7 +178,7 @@ class Plan {
         return self.dgraph.edges().map((edge) => makeRouteObject(self.dgraph, edge));
     }
     getRouteCondition(src, tgt, name) {
-        return priv.get(this).follows[name][`${src}/${tgt}`];
+        return priv.get(this).follows[validateRouteName(name)][`${src}/${tgt}`];
     }
     /**
      * Return all outward routes (out-edges) from the given waypoint, to the
@@ -147,6 +206,8 @@ class Plan {
     addSequence(...waypoints) {
         // Setup simple double routes (next/prev) between all waypoints in this list
         for (let i = 0, l = waypoints.length - 1; i < l; i += 1) {
+            // ESLint disabled as `i` is an integer
+            /* eslint-disable-next-line security/detect-object-injection */
             this.setRoute(waypoints[i], waypoints[i + 1]);
         }
     }
@@ -180,13 +241,14 @@ class Plan {
      */
     setRoute(src, tgt, followNext = undefined, followPrev = undefined) {
         this.setNamedRoute(src, tgt, 'next', followNext);
-        if (followPrev === undefined) {
-            followPrev = followNext === undefined ? undefined : (r, c) => {
+        let followPrevious = followPrev;
+        if (followPrevious === undefined) {
+            followPrevious = followNext === undefined ? undefined : (r, c) => {
                 const invertedRoute = Object.assign(Object.assign({}, r), { source: r.target, target: r.source });
                 return followNext(invertedRoute, c);
             };
         }
-        this.setNamedRoute(tgt, src, 'prev', followPrev);
+        this.setNamedRoute(tgt, src, 'prev', followPrevious);
         return this;
     }
     /**
@@ -219,12 +281,12 @@ class Plan {
             validateRouteCondition(follow);
         }
         // Get routing function name to label edge
-        const label = follow && follow.name;
+        const conditionName = follow && follow.name;
         // Warn if we're overwriting an existing edge on the same name
         if (self.dgraph.hasEdge(src, tgt, name)) {
             log.warn('Setting a route that already exists (%s, %s, %s). Will be overridden', src, tgt, name);
         }
-        self.dgraph.setEdge(src, tgt, { label }, name);
+        self.dgraph.setEdge(src, tgt, { conditionName }, name);
         // Determine which follow function to use
         let followFunc;
         if (follow) {
@@ -250,6 +312,8 @@ class Plan {
         else {
             followFunc = defaultPrevFollow;
         }
+        // ESLint disabled as `name` has been validated further above
+        /* eslint-disable-next-line security/detect-object-injection */
         self.follows[name][`${src}/${tgt}`] = followFunc;
         return this;
     }
@@ -285,7 +349,7 @@ class Plan {
      * string routeName = Follow routes matching this name (next | prev)
      * Map history = Used to detect loops in traversal (internal use)
      * function stopCondition = Condition that, if true, will stop traversal (useful for performance)
-     * function|string arbiter = When mutliple target routes are found, this will decide which one to choose (if any)
+     * function|string arbiter = If mutliple target routes found, this decides which to use (if any)
      *
      * @param {JourneyContext} context Journey context
      * @param {object} options Options
@@ -301,9 +365,7 @@ class Plan {
         if (!self.dgraph.hasNode(startWaypoint)) {
             throw new ReferenceError(`Plan does not contain waypoint '${startWaypoint}'`);
         }
-        if (routeName === undefined) {
-            throw new ReferenceError('Route name must be provided');
-        }
+        validateRouteName(routeName);
         const history = new Map();
         const traverse = (startWP) => {
             let target = self.dgraph.outEdges(startWP).filter((e) => {
@@ -312,6 +374,8 @@ class Plan {
                 }
                 const route = makeRouteObject(self.dgraph, e);
                 try {
+                    // ESLint disabled as `routeName` has been validated further above
+                    /* eslint-disable-next-line security/detect-object-injection */
                     return self.follows[routeName][`${e.v}/${e.w}`](route, context);
                 }
                 catch (ex) {
@@ -330,7 +394,7 @@ class Plan {
                         stopCondition: ({ source }) => targetNames.includes(source),
                     });
                     const resolved = forwardTraversal.pop();
-                    target = target.filter(t => t.w === resolved.source);
+                    target = target.filter((t) => t.w === resolved.source);
                 }
                 else if (arbiter instanceof Function) {
                     log.debug('Using custom arbitration process');
@@ -354,6 +418,8 @@ class Plan {
                     const results = new Array(totalTrav + 1);
                     results[0] = route;
                     for (let i = 0; i < totalTrav; i++) {
+                        // ESLint disabled as `i` is an integer
+                        /* eslint-disable-next-line security/detect-object-injection */
                         results[i + 1] = traversed[i];
                     }
                     return results;
@@ -373,10 +439,11 @@ class Plan {
      * Get raw graph data structure. This can be used with other libraries to
      * generate graph visualisations, for example.
      *
-     * @returns {graphlib.Graph} Graph data structure.
+     * @returns {Graph} Graph data structure.
      */
     getGraphStructure() {
         return priv.get(this).dgraph;
     }
 }
 exports.default = Plan;
+_Plan_skippableWaypoints = new WeakMap();