onroute-policy-engine 1.8.4 → 2.0.0

package/.vscode/launch.json

@@ -0,0 +1,21 @@
+{
+  // Use IntelliSense to learn about possible attributes.
+  // Hover to view descriptions of existing attributes.
+  // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+  "version": "0.2.0",
+  "configurations": [
+
+    {
+      "type": "node",
+      "request": "launch",
+      "name": "Debug Jest Test",
+      "program": "${workspaceFolder}/node_modules/jest/bin/jest.js",
+      "args": [
+        "--runInBand"
+      ],
+      "console": "integratedTerminal",
+      "internalConsoleOptions": "neverOpen",
+      "cwd": "${workspaceFolder}"
+    }
+  ]
+}

package/dist/enum/facts.d.ts

@@ -3,7 +3,8 @@ export declare enum PolicyFacts {
     DaysInPermitYear = "daysInPermitYear",
     EndOfPermitQuarter = "endOfPermitQuarter",
     ValidationDate = "validationDate",
-    ConfigurationIsValid = "configurationIsValid"
+    ConfigurationIsValid = "configurationIsValid",
+    DaysBetween = "daysBetween"
 }
 export declare enum CostFacts {
     ConditionalFixedCost = "conditionalFixedCost",

package/dist/enum/facts.js

@@ -8,6 +8,7 @@ var PolicyFacts;
     PolicyFacts["EndOfPermitQuarter"] = "endOfPermitQuarter";
     PolicyFacts["ValidationDate"] = "validationDate";
     PolicyFacts["ConfigurationIsValid"] = "configurationIsValid";
+    PolicyFacts["DaysBetween"] = "daysBetween";
 })(PolicyFacts || (exports.PolicyFacts = PolicyFacts = {}));
 var CostFacts;
 (function (CostFacts) {

package/dist/helper/bridge-calculation.helper.d.ts

@@ -1,5 +1,5 @@
 import { BridgeCalculationResult, AxleConfiguration } from 'onroute-policy-engine/types';
-import { Policy } from '../policy-engine';
+import { Policy } from 'onroute-policy-engine';
 /**
  * Runs the bridge formula against the supplied vehicle axle configuration.
  * Evaluates the weight against all possible axle group combinations and returns

package/dist/helper/conditions.helper.d.ts

@@ -1,5 +1,5 @@
-import { Policy } from '../policy-engine';
-import { ConditionForPermit } from '../types';
+import { Policy } from 'onroute-policy-engine';
+import { ConditionForPermit } from 'onroute-policy-engine/types';
 /**
  * Gets a list of conditions that are applicable for the supplied permit
  * application. The conditions may be driven by those applicable for the

package/dist/helper/dimensions.helper.d.ts

@@ -1,6 +1,5 @@
-import { Policy } from '../policy-engine';
-import { AxleConfiguration, PowerUnitWeightDimension, SizeDimension, TrailerWeightDimension, VehicleRelatives, WeightDimension } from '../types';
-import { SingleAxleDimension } from '../types/weight-dimension';
+import { Policy } from 'onroute-policy-engine';
+import { AxleConfiguration, PowerUnitWeightDimension, SingleAxleDimension, SizeDimension, TrailerWeightDimension, VehicleRelatives, WeightDimension } from 'onroute-policy-engine/types';
 /**
  * Gets the maximum size dimensions for a given permit type, commodity,
  * and vehicle configuration. A vehicle configuration's size dimension is
@@ -79,8 +78,8 @@ export declare function selectCorrectWeightDimensionHelper(policy: Policy, weigh
 /**
  * Convenience method to get the vehicles in the configuration relative
  * to the axle unit at the indicated axleIndex, to be used when
- * evaluating weight modifiers.
- * @param policy The instantiated policy object with weight config
+ * evaluating dimension modifiers.
+ * @param policy The instantiated policy object with dimension config
  * @param configuration Full vehicle configuration
  * @param axleIndex Index of the axle unit for which relatives are
  * to be returned.

package/dist/helper/dimensions.helper.js

@@ -6,7 +6,7 @@ exports.getDefaultPowerUnitWeightHelper = getDefaultPowerUnitWeightHelper;
 exports.getDefaultTrailerWeightHelper = getDefaultTrailerWeightHelper;
 exports.selectCorrectWeightDimensionHelper = selectCorrectWeightDimensionHelper;
 exports.getVehicleRelatives = getVehicleRelatives;
-const enum_1 = require("../enum");
+const enum_1 = require("onroute-policy-engine/enum");
 /**
  * Gets the maximum size dimensions for a given permit type, commodity,
  * and vehicle configuration. A vehicle configuration's size dimension is
@@ -24,14 +24,14 @@ const enum_1 = require("../enum");
  * @returns SizeDimension for the given permit type, commodity, and configuration
  */
 function getSizeDimensionHelper(policy, permitTypeId, commodityId, configuration, regions) {
-    var _a, _b, _c;
+    var _a;
     // Initialize the sizeDimension with global defaults
     let sizeDimension = null;
     // Validate that the configuration is permittable
     if (policy.isConfigurationValid(permitTypeId, commodityId, configuration)) {
         // Get the power unit that has the size configuration
         const commodity = policy.getCommodityDefinition(commodityId);
-        const powerUnit = (_b = (_a = commodity === null || commodity === void 0 ? void 0 : commodity.size) === null || _a === void 0 ? void 0 : _a.powerUnits) === null || _b === void 0 ? void 0 : _b.find((pu) => pu.type == configuration[0]);
+        const powerUnit = commodity === null || commodity === void 0 ? void 0 : commodity.powerUnits.find((pu) => pu.type == configuration[0]);
         if (!powerUnit) {
             throw new Error(`Configuration error: could not find power unit '${configuration[0]}'`);
         }
@@ -45,16 +45,13 @@ function getSizeDimensionHelper(policy, permitTypeId, commodityId, configuration
         });
         if (sizeTrailer) {
             // Get the trailer size dimension array for the commodity
-            const trailer = (_c = powerUnit.trailers) === null || _c === void 0 ? void 0 : _c.find((t) => t.type == sizeTrailer);
-            let sizeDimensions;
+            const trailer = (_a = powerUnit.trailers) === null || _a === void 0 ? void 0 : _a.find((t) => t.type == sizeTrailer);
+            let sizeDimensions = [];
             if (trailer &&
                 trailer.sizeDimensions &&
                 trailer.sizeDimensions.length > 0) {
                 sizeDimensions = trailer.sizeDimensions;
             }
-            else {
-                sizeDimensions = new Array();
-            }
             const sizeDimensionConfigured = selectCorrectSizeDimension(sizeDimensions, configuration, sizeTrailer);
             if (sizeDimensionConfigured) {
                 // Adjust the size dimensions for the regions travelled, if needed
@@ -427,8 +424,8 @@ function selectCorrectWeightDimensionHelper(policy, weightDimensions, configurat
 /**
  * Convenience method to get the vehicles in the configuration relative
  * to the axle unit at the indicated axleIndex, to be used when
- * evaluating weight modifiers.
- * @param policy The instantiated policy object with weight config
+ * evaluating dimension modifiers.
+ * @param policy The instantiated policy object with dimension config
  * @param configuration Full vehicle configuration
  * @param axleIndex Index of the axle unit for which relatives are
  * to be returned.
@@ -436,10 +433,13 @@ function selectCorrectWeightDimensionHelper(policy, weightDimensions, configurat
  */
 function getVehicleRelatives(policy, configuration, axleIndex) {
     var _a, _b;
+    if (!configuration || configuration.length === 0) {
+        throw new Error('Cannot get relatives with an empty configuration');
+    }
     const firstType = configuration[0];
-    const lastType = configuration[configuration.length - 1];
     const firstVehicle = policy.getVehicleDefinition(firstType);
-    const lastVehicle = policy.getVehicleDefinition(lastType);
+    const lastVehicle = walk(policy, configuration, configuration.length - 1, -1);
+    const lastType = lastVehicle === null || lastVehicle === void 0 ? void 0 : lastVehicle.id;
     // Get relevant nearby vehicle types for the target axle
     const vehicleRelatives = {
         firstType: firstType,
@@ -455,8 +455,11 @@ function getVehicleRelatives(policy, configuration, axleIndex) {
     }
     else {
         // Subtract 2 from the configuration index to account for
-        // the fact that the power unit has two axles.
-        vehicleRelatives.prevType = configuration[axleIndex - 2];
+        // the fact that the power unit has two axles. We walk the
+        // configuration here to jump over any pseudo vehicles like
+        // additional axle units.
+        const prevVehicleType = walk(policy, configuration, axleIndex - 2, -1);
+        vehicleRelatives.prevType = prevVehicleType === null || prevVehicleType === void 0 ? void 0 : prevVehicleType.id;
         vehicleRelatives.prevCategory = (_a = policy.getVehicleDefinition(vehicleRelatives.prevType)) === null || _a === void 0 ? void 0 : _a.category;
     }
     if (configuration.length === 1 || axleIndex === configuration.length) {
@@ -466,8 +469,40 @@ function getVehicleRelatives(policy, configuration, axleIndex) {
         vehicleRelatives.nextCategory = null;
     }
     else {
-        vehicleRelatives.nextType = configuration[axleIndex];
+        // Walk the configuration towards the rear, to jump over any
+        // pseudo vehicle in the line.
+        const nextVehicleType = walk(policy, configuration, axleIndex, 1);
+        vehicleRelatives.nextType = nextVehicleType === null || nextVehicleType === void 0 ? void 0 : nextVehicleType.id;
         vehicleRelatives.nextCategory = (_b = policy.getVehicleDefinition(vehicleRelatives.nextType)) === null || _b === void 0 ? void 0 : _b.category;
     }
     return vehicleRelatives;
 }
+/**
+ * Walks along the vehicle configuration from the start index
+ * in the direction indicated by increment, which will typically
+ * be either 1 (towards the rear of the vehicle) or -1 (towards
+ * the front of the vehicle), and returns the first non-pseudo
+ * vehicle encountered. If no non-pseudo vehicles are encountered,
+ * returns null.
+ * @param policy The instantiated policy object with dimension config
+ * @param configuration Full vehicle configuration
+ * @param startIndex Index at which to begin search (will return
+ * the vehicle at startIndex if that vehicle is non-pseudo)
+ * @param increment Direction of travel, either 1 (towards the rear
+ * of the vehicle) or -1 (towards the front of the vehicle)
+ * @returns First non-pseudo vehicle encountered in the direction
+ * of travel
+ */
+function walk(policy, configuration, startIndex, increment) {
+    let i = startIndex;
+    let vehicleType = null;
+    while (i >= 0 && i < configuration.length) {
+        const nextType = policy.getVehicleDefinition(configuration[i]);
+        if (nextType && nextType.category !== enum_1.VehicleCategory.Pseudo) {
+            vehicleType = nextType;
+            break;
+        }
+        i = i + increment;
+    }
+    return vehicleType;
+}

package/dist/helper/facts.helper.d.ts

@@ -1,5 +1,5 @@
 import { Engine } from 'json-rules-engine';
-import { Policy } from '../policy-engine';
+import { Policy } from 'onroute-policy-engine';
 /**
  * Adds runtime facts for the validation. For example, adds the
  * validation date for comparison against startDate of the permit.

package/dist/helper/facts.helper.js

@@ -83,6 +83,20 @@ function addRuntimeFacts(engine, policy) {
         }
         return allowedVehicles;
     });
+    /**
+     * Add runtime fact to calculate the number of days between a from
+     * and to date supplied in parameters. Will be positive for a dateTo
+     * in the future with respect to dateFrom, negative otherwise.
+     */
+    engine.addFact(enum_1.PolicyFacts.DaysBetween.toString(), async function (params, almanac) {
+        const dateFromStr = await almanac.factValue(params.dateFrom.fact, {}, params.dateFrom.path);
+        const dateToStr = await almanac.factValue(params.dateTo.fact, {}, params.dateTo.path);
+        const dateFrom = (0, dayjs_1.default)(dateFromStr, enum_1.PermitAppInfo.PermitDateFormat);
+        const dateTo = (0, dayjs_1.default)(dateToStr, enum_1.PermitAppInfo.PermitDateFormat);
+        const daysBetween = dateTo.diff(dateFrom, 'day');
+        console.log(`Calculated daysBetween '${dateFromStr}' and '${dateToStr}' as '${daysBetween}'`);
+        return daysBetween;
+    });
     /**
      * Add runtime fact for a fixed permit cost, the cost supplied
      * as a parameter.

package/dist/helper/vehicles.helper.d.ts

@@ -1,4 +1,4 @@
-import { VehicleTypes } from '../types';
+import { VehicleTypes } from 'onroute-policy-engine/types';
 /**
  * Filters out all LCV vehicles from a supplied list of vehicle IDs.
  * @param vehicleList List of vehicle IDs to filter

package/dist/helper/vehicles.helper.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.filterOutLcv = filterOutLcv;
 exports.filterVehiclesByType = filterVehiclesByType;
-const enum_1 = require("../enum");
+const enum_1 = require("onroute-policy-engine/enum");
 /**
  * Filters out all LCV vehicles from a supplied list of vehicle IDs.
  * @param vehicleList List of vehicle IDs to filter

package/dist/policy-engine.d.ts

@@ -1,4 +1,4 @@
-import { PolicyDefinition, PermitType, Commodity, VehicleType, SizeDimension, AxleConfiguration, BridgeCalculationResult, ConditionForPermit, TrailerType, PowerUnitType, TrailerWeightDimension, PowerUnitWeightDimension, WeightDimension, SingleAxleDimension, StandardTireSize } from 'onroute-policy-engine/types';
+import { PolicyDefinition, PermitType, Commodity, VehicleType, SizeDimension, AxleConfiguration, BridgeCalculationResult, ConditionForPermit, TrailerType, PowerUnitType, TrailerWeightDimension, PowerUnitWeightDimension, WeightDimension, SingleAxleDimension, StandardTireSize, TrailerDimensions } from 'onroute-policy-engine/types';
 import { Engine } from 'json-rules-engine';
 import { ValidationResults } from './validation-results';
 import { SpecialAuthorizations } from './types/special-authorizations';
@@ -77,6 +77,17 @@ export declare class Policy {
      * vehicle, and a string common name for the vehicle.
      */
     getPermittableVehicleTypes(permitTypeId: string, commodityId?: string | null): Map<string, Map<string, string>>;
+    /**
+     * Given a trailer dimensions object from the commodities
+     * configuration and a permit type, return whether or not the
+     * trailer is permittable - this will depend on whether the trailer
+     * is size and/or weight permittable, and whether the permit
+     * type requires size and/or weight dimensions.
+     * @param permitType The permit type object
+     * @param trailer The trailer dimensions object for a specific commodity
+     * @returns true if the trailer is permittable, false otherwise
+     */
+    isTrailerPermittable(permitType: PermitType, trailer: TrailerDimensions): boolean | undefined;
     /**
      * Gets a list of all allowable power unit types for the given permit type
      * and commodity.

package/dist/policy-engine.js

@@ -150,29 +150,15 @@ class Policy {
             return new Map();
         }
         else {
-            // Commodities for oversize permits are those which have at least one
-            // power unit defined in the size dimension object of the commodity.
             const commoditiesForOS = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.commodities.filter((c) => {
-                if (c.size) {
-                    if (c.size.powerUnits) {
-                        if (c.size.powerUnits.length > 0) {
-                            return true;
-                        }
-                    }
-                }
-                return false;
+                // Return true if any of the power units has any size
+                // permittable trailers
+                return c.powerUnits.some((p) => p.trailers.some((t) => t.sizePermittable));
             }));
-            // Commodities for overweight permits are those which have at least one
-            // power unit defined in the weight dimension object of the commodity.
             const commoditiesForOW = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.commodities.filter((c) => {
-                if (c.weight) {
-                    if (c.weight.powerUnits) {
-                        if (c.weight.powerUnits.length > 0) {
-                            return true;
-                        }
-                    }
-                }
-                return false;
+                // Return true if any of the power units has any size
+                // permittable trailers
+                return c.powerUnits.some((p) => p.trailers.some((t) => t.weightPermittable));
             }));
             if (permitType.sizeDimensionRequired &&
                 permitType.weightDimensionRequired) {
@@ -203,7 +189,7 @@ class Policy {
      * vehicle, and a string common name for the vehicle.
      */
     getPermittableVehicleTypes(permitTypeId, commodityId) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         if (!permitTypeId) {
             throw new Error('Missing permitTypeId');
         }
@@ -233,62 +219,67 @@ class Policy {
             if (!commodity) {
                 throw new Error(`Commodity id '${commodityId}' is not correctly configured in the policy definition`);
             }
-            let puTypeIdsOS = (_b = (_a = commodity.size) === null || _a === void 0 ? void 0 : _a.powerUnits) === null || _b === void 0 ? void 0 : _b.map((p) => p.type);
-            let trTypeIdsOS = [];
-            (_d = (_c = commodity.size) === null || _c === void 0 ? void 0 : _c.powerUnits) === null || _d === void 0 ? void 0 : _d.forEach((pu) => {
-                const trForPu = pu.trailers.map((t) => t.type);
-                if (trForPu)
-                    trTypeIdsOS === null || trTypeIdsOS === void 0 ? void 0 : trTypeIdsOS.concat(trForPu);
+            // Extract the permittable power unit and trailer IDs. If the permit
+            // type requires both size and weight dimension, only extract the
+            // power units that have at least one trailer that is both size and
+            // weight permittable.
+            const permittablePowerUnits = commodity.powerUnits.filter((p) => {
+                return p.trailers.some((t) => {
+                    return this.isTrailerPermittable(permitType, t);
+                });
+            });
+            let puTypeIds = permittablePowerUnits.map((p) => p.type);
+            let trTypeIds = [];
+            permittablePowerUnits.forEach((pu) => {
+                trTypeIds = trTypeIds.concat(pu.trailers
+                    .filter((t) => {
+                    return this.isTrailerPermittable(permitType, t);
+                })
+                    .map((t) => t.type));
             });
-            // TODO: implement along with overweight permits. Stub for now.
-            let puTypeIdsOW = [];
-            let trTypeIdsOW = [];
+            // Remove duplicate trailer IDs
+            trTypeIds = [...new Set(trTypeIds)];
             // Remove long combination vehicles if needed
-            if (!((_e = this.specialAuthorizations) === null || _e === void 0 ? void 0 : _e.isLcvAllowed)) {
-                if (puTypeIdsOS) {
-                    puTypeIdsOS = this.filterOutLongCombinationVehicles(puTypeIdsOS);
-                }
-                if (trTypeIdsOS) {
-                    trTypeIdsOS = this.filterOutLongCombinationVehicles(trTypeIdsOS);
-                }
-                if (puTypeIdsOW) {
-                    puTypeIdsOW = this.filterOutLongCombinationVehicles(puTypeIdsOW);
-                }
-                if (trTypeIdsOW) {
-                    trTypeIdsOW = this.filterOutLongCombinationVehicles(trTypeIdsOW);
-                }
-            }
-            const puTypesOS = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.vehicleTypes.powerUnitTypes, puTypeIdsOS);
-            const trTypesOS = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.vehicleTypes.trailerTypes, trTypeIdsOS);
-            const puTypesOW = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.vehicleTypes.powerUnitTypes, puTypeIdsOW);
-            const trTypesOW = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.vehicleTypes.trailerTypes, trTypeIdsOW);
-            if (permitType.sizeDimensionRequired &&
-                permitType.weightDimensionRequired) {
-                puTypes = (0, lists_helper_1.intersectIdMaps)(puTypesOS, puTypesOW);
-                trTypes = (0, lists_helper_1.intersectIdMaps)(trTypesOS, trTypesOW);
+            if (!((_a = this.specialAuthorizations) === null || _a === void 0 ? void 0 : _a.isLcvAllowed)) {
+                puTypeIds = this.filterOutLongCombinationVehicles(puTypeIds);
+                trTypeIds = this.filterOutLongCombinationVehicles(trTypeIds);
             }
-            else if (permitType.sizeDimensionRequired) {
-                puTypes = puTypesOS;
-                trTypes = trTypesOS;
-            }
-            else if (permitType.weightDimensionRequired) {
-                puTypes = puTypesOW;
-                trTypes = trTypesOW;
-            }
-            else {
+            if (!(permitType.sizeDimensionRequired || permitType.weightDimensionRequired)) {
                 // This permit type requires commodity selection, but does not
                 // require size or weight dimensions. For these permit types, the
                 // allowedVehicles must be configured in policy. Return all power
                 // units and trailers from this list.
-                puTypes = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.vehicleTypes.powerUnitTypes, permitType.allowedVehicles);
-                trTypes = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.vehicleTypes.trailerTypes, permitType.allowedVehicles);
+                puTypeIds = permitType.allowedVehicles || [];
+                trTypeIds = permitType.allowedVehicles || [];
             }
+            puTypes = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.vehicleTypes.powerUnitTypes, puTypeIds);
+            trTypes = (0, lists_helper_1.extractIdentifiedObjects)(this.policyDefinition.vehicleTypes.trailerTypes, trTypeIds);
         }
         const vehicleTypes = new Map();
         vehicleTypes.set(enum_1.VehicleTypes.PowerUnits, puTypes);
         vehicleTypes.set(enum_1.VehicleTypes.Trailers, trTypes);
         return vehicleTypes;
     }
+    /**
+     * Given a trailer dimensions object from the commodities
+     * configuration and a permit type, return whether or not the
+     * trailer is permittable - this will depend on whether the trailer
+     * is size and/or weight permittable, and whether the permit
+     * type requires size and/or weight dimensions.
+     * @param permitType The permit type object
+     * @param trailer The trailer dimensions object for a specific commodity
+     * @returns true if the trailer is permittable, false otherwise
+     */
+    isTrailerPermittable(permitType, trailer) {
+        if (permitType.sizeDimensionRequired &&
+            permitType.weightDimensionRequired) {
+            return trailer.sizePermittable && trailer.weightPermittable;
+        }
+        else {
+            return ((trailer.sizePermittable && permitType.sizeDimensionRequired) ||
+                (trailer.weightPermittable && permitType.weightDimensionRequired));
+        }
+    }
     /**
      * Gets a list of all allowable power unit types for the given permit type
      * and commodity.
@@ -315,7 +306,7 @@ class Policy {
      * trailers in a single return value (if applicable).
      */
     getNextPermittableVehicles(permitTypeId, commodityId, currentConfiguration) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         if (!permitTypeId || !commodityId || !currentConfiguration) {
             throw new Error('Missing permitTypeId and/or commodityId and/or currentConfiguration');
         }
@@ -342,10 +333,10 @@ class Policy {
         if (currentConfiguration.length == 0) {
             // The current configuration is empty, so return only the
             // allowable power units.
-            vehicleTypeIds = (_b = (_a = commodity.size) === null || _a === void 0 ? void 0 : _a.powerUnits) === null || _b === void 0 ? void 0 : _b.map((p) => p.type);
+            vehicleTypeIds = Array.from(this.getPermittablePowerUnitTypes(permitTypeId, commodityId).keys());
         }
         else {
-            const powerUnit = (_d = (_c = commodity.size) === null || _c === void 0 ? void 0 : _c.powerUnits) === null || _d === void 0 ? void 0 : _d.find((p) => p.type == currentConfiguration[0]);
+            const powerUnit = commodity.powerUnits.find((p) => p.type == currentConfiguration[0]);
             let validTrailers;
             // ORV2-3953
             // If a jeep has been added, only add trailers that
@@ -356,9 +347,16 @@ class Policy {
             else {
                 validTrailers = powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.trailers;
             }
+            // Filter trailer list down to those permittable for the permit
+            // type (size and/or weight dimensions required)
+            validTrailers = validTrailers === null || validTrailers === void 0 ? void 0 : validTrailers.filter((t) => this.isTrailerPermittable(permitType, t));
             const trailerIds = validTrailers === null || validTrailers === void 0 ? void 0 : validTrailers.map((t) => t.type);
-            if (currentConfiguration.length == 1) {
-                // Just a power unit, return the list of trailerIds for the
+            const lastVehicleId = currentConfiguration[currentConfiguration.length - 1];
+            const powerUnitType = this.getPowerUnitDefinition(powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.type);
+            if (currentConfiguration.length == 1 ||
+                lastVehicleId === (powerUnitType === null || powerUnitType === void 0 ? void 0 : powerUnitType.additionalAxleSubType)) {
+                // Just a power unit, optionally with one or more additional
+                // axles. Return the list of trailerIds for the
                 // power unit, plus jeep if any of the trailer Ids allow
                 // a jeep.
                 if ((powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.trailers) &&
@@ -368,7 +366,6 @@ class Policy {
                 vehicleTypeIds = trailerIds;
             }
             else {
-                const lastVehicleId = currentConfiguration[currentConfiguration.length - 1];
                 switch (lastVehicleId) {
                     case enum_1.AccessoryVehicleType.Jeep:
                         // If there is one jeep, there can be more
@@ -381,11 +378,31 @@ class Policy {
                         break;
                     default:
                         {
-                            const trailer = powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.trailers.find((t) => t.type == lastVehicleId);
+                            // The last vehicle is either a trailer, or an
+                            // additional axle on the trailer. We need to
+                            // identify the actual trailer type to determine
+                            // if a booster is allowed.
+                            let trailer = powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.trailers.find((t) => t.type == lastVehicleId);
+                            if (!trailer) {
+                                // The last vehicle is not a trailer or a booster,
+                                // so must be an additional axle of the trailer since
+                                // we know this is a valid configuration at this point.
+                                // Work our way backwards through the configuration
+                                // to find the trailer.
+                                let i = currentConfiguration.length - 1;
+                                while (!trailer && i > 0) {
+                                    const prevVehicleId = currentConfiguration[--i];
+                                    trailer = powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.trailers.find((t) => t.type == prevVehicleId);
+                                }
+                            }
                             if (trailer && trailer.booster) {
                                 vehicleTypeIds = [enum_1.AccessoryVehicleType.Booster];
                             }
                             else {
+                                // Either the trailer does not permit a booster, or
+                                // we did not find the trailer which would be
+                                // unexpected. Either way, no more vehicles are
+                                // permittable.
                                 vehicleTypeIds = new Array();
                             }
                         }
@@ -394,7 +411,7 @@ class Policy {
             }
         }
         // Remove long combination vehicles if required
-        if (!((_e = this.specialAuthorizations) === null || _e === void 0 ? void 0 : _e.isLcvAllowed)) {
+        if (!((_a = this.specialAuthorizations) === null || _a === void 0 ? void 0 : _a.isLcvAllowed)) {
             if (vehicleTypeIds) {
                 vehicleTypeIds = this.filterOutLongCombinationVehicles(vehicleTypeIds);
             }
@@ -417,7 +434,6 @@ class Policy {
      * allowable for the permit type.
      */
     isConfigurationValid(permitTypeId, commodityId, currentConfiguration, validatePartial = false) {
-        var _a, _b;
         if (!permitTypeId || !commodityId || !currentConfiguration) {
             throw new Error('Missing permitTypeId and/or commodityId and/or currentConfiguration');
         }
@@ -449,15 +465,18 @@ class Policy {
                 return false;
             }
         }
-        const powerUnit = (_b = (_a = commodity.size) === null || _a === void 0 ? void 0 : _a.powerUnits) === null || _b === void 0 ? void 0 : _b.find((p) => p.type == currentConfiguration[0]);
-        if (!powerUnit) {
-            // The power unit is not allowed for the commodity
+        const permittablePowerUnits = this.getPermittablePowerUnitTypes(permitTypeId, commodityId);
+        if (!permittablePowerUnits.has(currentConfiguration[0])) {
+            // The power unit is not permitted
             return false;
         }
-        let trailerIds = powerUnit.trailers.map((t) => t.type);
+        const powerUnit = commodity.powerUnits.find((p) => p.type === currentConfiguration[0]);
+        let trailerIds = (powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.trailers.filter((t) => this.isTrailerPermittable(permitType, t)).map((t) => t.type)) || [];
         let jeepAllowed = true;
         let trailerAllowed = true;
         let boosterAllowed = false;
+        const powerUnitType = this.getPowerUnitDefinition(powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.type);
+        let additionalAxleType = (powerUnitType === null || powerUnitType === void 0 ? void 0 : powerUnitType.additionalAxleSubType) || '';
         for (let i = 1; i < currentConfiguration.length; i++) {
             switch (currentConfiguration[i]) {
                 case enum_1.AccessoryVehicleType.Jeep:
@@ -465,28 +484,47 @@ class Policy {
                         return false;
                     }
                     // Filter allowed trailers to only those that allow jeeps
-                    trailerIds = powerUnit.trailers
-                        .filter((t) => t.jeep)
-                        .map((t) => t.type);
+                    trailerIds =
+                        (powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.trailers.filter((t) => this.isTrailerPermittable(permitType, t)).filter((t) => t.jeep).map((t) => t.type)) || [];
+                    if (trailerIds.length === 0) {
+                        // The configuration has a jeep, but no trailers allow jeeps
+                        // for this power unit and commodity. Return false.
+                        return false;
+                    }
+                    additionalAxleType = '';
                     break;
                 case enum_1.AccessoryVehicleType.Booster:
                     if (!boosterAllowed) {
                         return false;
                     }
+                    additionalAxleType = '';
                     break;
                 default:
+                    // This is a trailer (not a booster or jeep).
+                    // Check to see if it is an additional axle pseudo trailer
+                    // which is valid for the previous vehicle and let it
+                    // pass if so.
+                    if (currentConfiguration[i] === additionalAxleType) {
+                        break;
+                    }
                     if (!trailerAllowed) {
                         return false;
                     }
+                    if (!trailerIds.includes(currentConfiguration[i])) {
+                        // Trailer not in our list of permittable trailers
+                        return false;
+                    }
+                    jeepAllowed = false;
+                    trailerAllowed = false;
                     {
-                        const trailer = powerUnit.trailers.find((t) => t.type == currentConfiguration[i]);
-                        if (!trailer || !trailerIds.includes(currentConfiguration[i])) {
-                            // This trailer is not permitted for this power unit
-                            return false;
-                        }
-                        jeepAllowed = false;
-                        trailerAllowed = false;
-                        boosterAllowed = trailer.booster;
+                        const trailer = powerUnit === null || powerUnit === void 0 ? void 0 : powerUnit.trailers.find((t) => t.type === currentConfiguration[i]);
+                        // This is a trailer, set the additional axle type so it can be
+                        // checked on the next vehicle in the configuration
+                        const trailerType = this.getTrailerDefinition(trailer === null || trailer === void 0 ? void 0 : trailer.type);
+                        additionalAxleType = (trailerType === null || trailerType === void 0 ? void 0 : trailerType.additionalAxleSubType) || '';
+                        // Set the boosterAllowed flag based on whether the trailer allows
+                        // a booster for the commodity in the configuration
+                        boosterAllowed = (trailer === null || trailer === void 0 ? void 0 : trailer.booster) || false;
                     }
                     break;
             }

package/dist/types/commodity.d.ts

@@ -1,11 +1,4 @@
-import { IdentifiedObject, VehicleSizeConfiguration, VehicleWeightConfiguration } from 'onroute-policy-engine/types';
+import { IdentifiedObject, VehicleDimensions } from 'onroute-policy-engine/types';
 export type Commodity = IdentifiedObject & {
-    size?: CommoditySize;
-    weight?: CommodityWeight;
-};
-export type CommoditySize = {
-    powerUnits?: Array<VehicleSizeConfiguration>;
-};
-export type CommodityWeight = {
-    powerUnits?: Array<VehicleWeightConfiguration>;
+    powerUnits: Array<VehicleDimensions>;
 };

package/dist/types/dimension-modifier.d.ts

@@ -9,7 +9,7 @@ export type DimensionModifier = SelfIssuable & {
 };
 export type VehicleRelatives = {
     firstType: string;
-    lastType: string;
+    lastType?: string;
     nextType?: string | null;
     prevType?: string | null;
     firstCategory?: string | null;

package/dist/types/index.d.ts

@@ -1,7 +1,7 @@
 export { AxleConfiguration } from './axle-configuration';
 export { BridgeCalculationConstants } from './bridge-calculation-constants';
 export { BridgeCalculationResult } from './bridge-calculation-result';
-export { Commodity, CommoditySize, CommodityWeight } from './commodity';
+export { Commodity } from './commodity';
 export { CostRule } from './cost-rule';
 export { DimensionModifier, VehicleRelatives } from './dimension-modifier';
 export { PermitFacts } from './facts';
@@ -19,5 +19,5 @@ export { SpecialAuthorizations } from './special-authorizations';
 export { StandardTireSize } from './standard-tire-size';
 export { VehicleCategory, PowerUnitCategory, TrailerCategory, VehicleCategories, } from './vehicle-category';
 export { VehicleType, PowerUnitType, TrailerType, VehicleTypes, } from './vehicle-type';
-export { Vehicle, VehicleSizeConfiguration, VehicleWeightConfiguration, TrailerSize, TrailerWeight, } from './vehicle';
+export { TrailerDimensions, Vehicle, VehicleDimensions } from './vehicle';
 export { WeightDimension, PowerUnitWeightDimension, TrailerWeightDimension, DefaultWeightDimensions, SingleAxleDimension, } from './weight-dimension';

package/dist/types/permit-type.d.ts

@@ -1,6 +1,5 @@
 import { RuleProperties } from 'json-rules-engine';
-import { CostRule, IdentifiedObject } from 'onroute-policy-engine/types';
-import { ConditionRequirement } from './permit-condition';
+import { CostRule, IdentifiedObject, ConditionRequirement } from 'onroute-policy-engine/types';
 export type PermitType = IdentifiedObject & {
     routingRequired: boolean;
     weightDimensionRequired: boolean;

package/dist/types/vehicle-type.d.ts

@@ -1,11 +1,11 @@
-import { IdentifiedObject, SizeDimension, PowerUnitWeightDimension, TrailerWeightDimension } from 'onroute-policy-engine/types';
-import { ConditionRequirement } from './permit-condition';
+import { ConditionRequirement, IdentifiedObject, SizeDimension, PowerUnitWeightDimension, TrailerWeightDimension } from 'onroute-policy-engine/types';
 export type VehicleType = IdentifiedObject & {
     category: string;
     defaultSizeDimensions?: SizeDimension;
     ignoreForSizeDimensions?: boolean;
     isLcv?: boolean;
     conditions?: Array<ConditionRequirement>;
+    additionalAxleSubType?: string;
 };
 export type PowerUnitType = VehicleType & {
     defaultWeightDimensions?: Array<PowerUnitWeightDimension>;

package/dist/types/vehicle.d.ts

@@ -2,22 +2,15 @@ import { SelfIssuable, SizeDimension, PowerUnitWeightDimension, TrailerWeightDim
 export type Vehicle = SelfIssuable & {
     type: string;
 };
-export type VehicleSizeConfiguration = Vehicle & {
-    trailers: Array<TrailerSize>;
-};
-export type VehicleWeightConfiguration = Vehicle & {
+export type VehicleDimensions = Vehicle & {
+    trailers: Array<TrailerDimensions>;
     weightDimensions?: Array<PowerUnitWeightDimension>;
-    additionalAxleSubType?: string;
-    trailers: Array<TrailerWeight>;
 };
-export type TrailerSize = Vehicle & {
-    sizeDimensions?: Array<SizeDimension>;
-    jeep: boolean;
+export type TrailerDimensions = Vehicle & {
     booster: boolean;
-};
-export type TrailerWeight = Vehicle & {
-    weightDimensions?: Array<TrailerWeightDimension>;
-    additionalAxleSubType?: string;
     jeep: boolean;
-    booster: boolean;
+    sizeDimensions?: Array<SizeDimension>;
+    sizePermittable?: boolean;
+    weightDimensions?: Array<TrailerWeightDimension>;
+    weightPermittable?: boolean;
 };

package/dist/version.d.ts

@@ -1 +1 @@
-export declare const version = "v1.8.4";
+export declare const version = "v2.0.0";

package/dist/version.js

@@ -2,4 +2,4 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.version = void 0;
 // Generated by genversion.
-exports.version = 'v1.8.4';
+exports.version = 'v2.0.0';

package/package.json

@@ -58,6 +58,7 @@
     "semver": "^7.6.3"
   },
   "jest": {
+    "verbose": true,
     "moduleFileExtensions": [
       "js",
       "json",
@@ -89,5 +90,5 @@
     ],
     "testEnvironment": "node"
   },
-  "version": "v1.8.4"
+  "version": "v2.0.0"
 }