@dwp/govuk-casa 9.7.0 → 10.0.0

package/dist/lib/mount.js

@@ -1,12 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const express_1 = require("express");
-const path_to_regexp_1 = require("path-to-regexp");
-const strip_proxy_path_js_1 = __importDefault(require("../middleware/strip-proxy-path.js"));
-const serve_first_waypoint_js_1 = __importDefault(require("../middleware/serve-first-waypoint.js"));
+import { Router } from "express";
+import { pathToRegexp } from "path-to-regexp";
+import stripProxyPathMiddlewareFactory from "../middleware/strip-proxy-path.js";
+import serveFirstWaypointMiddlewareFactory from "../middleware/serve-first-waypoint.js";
 /**
  * @typedef {import("nunjucks").Environment} NunjucksEnvironment
  * @access private
@@ -46,19 +41,19 @@ const serve_first_waypoint_js_1 = __importDefault(require("../middleware/serve-f
  * @param {ExpressRequestHandler[]} args.postMiddleware Middleware
  * @returns {Mounter} Mount
  */
-exports.default = ({ nunjucksEnv, mountUrl, plan, staticRouter, ancillaryRouter, journeyRouter, preMiddleware, sessionMiddleware, i18nMiddleware, bodyParserMiddleware, dataMiddleware, postMiddleware, }) => (app, { route = "/", serveFirstWaypoint = false } = {}) => {
+export default ({ nunjucksEnv, mountUrl, plan, staticRouter, ancillaryRouter, journeyRouter, preMiddleware, sessionMiddleware, i18nMiddleware, bodyParserMiddleware, dataMiddleware, postMiddleware, }) => (app, { route = "/", serveFirstWaypoint = false } = {}) => {
     nunjucksEnv.express(app);
     app.set("view engine", "njk");
     // If a `mountUrl` has been defined, then we're potentially in "proxy mode",
     // in which we strip the proxy path prefix from the incoming request URLs.
     if (mountUrl) {
-        app.use((0, strip_proxy_path_js_1.default)({ mountUrl }));
+        app.use(stripProxyPathMiddlewareFactory({ mountUrl }));
     }
     // Attach a handler to redirect requests for `/` to the first waypoint in
     // the plan
     if (serveFirstWaypoint && plan) {
-        const re = (0, path_to_regexp_1.pathToRegexp)(`${route}`.replace(/\/+/g, "/"));
-        app.use(re.regexp, (0, serve_first_waypoint_js_1.default)({ plan }));
+        const re = pathToRegexp(`${route}`.replace(/\/+/g, "/"));
+        app.use(re.regexp, serveFirstWaypointMiddlewareFactory({ plan }));
     }
     // Capture the mount path of this CASA app, before any parameterised path
     // segments exert influence over `req.baseUrl` in the `router` further below.
@@ -76,14 +71,14 @@ exports.default = ({ nunjucksEnv, mountUrl, plan, staticRouter, ancillaryRouter,
     const sealedStaticRouter = staticRouter.seal();
     app.use(preMiddleware);
     app.use(sealedStaticRouter);
-    const router = (0, express_1.Router)({
+    const router = Router({
         // Required so that any parameters in the URL are propagated to middleware
         mergeParams: true,
     });
     router.use(preMiddleware);
+    router.use(bodyParserMiddleware);
     router.use(sessionMiddleware);
     router.use(i18nMiddleware);
-    router.use(bodyParserMiddleware);
     router.use(dataMiddleware);
     router.use(ancillaryRouter.seal());
     router.use(journeyRouter.seal());
@@ -91,4 +86,3 @@ exports.default = ({ nunjucksEnv, mountUrl, plan, staticRouter, ancillaryRouter,
     app.use(route, router);
     return app;
 };
-//# sourceMappingURL=mount.js.map

package/dist/lib/nunjucks-filters.d.ts

@@ -1,13 +1,16 @@
 /**
- * @param {...any} objects Objects to merge
+ * Merge multiple objects into one object
+ *
+ * @memberof NunjucksFilters
+ * @param {...(object | Array)} objects Objects to merge
  * @returns {object} Merged object
  */
-export function mergeObjects(...objects: any[]): object;
+export function mergeObjects(...objects: (object | any[])[]): object;
 /**
  * Determine whether a value exists in a list.
  *
  * @memberof NunjucksFilters
- * @param {any[]} source List of items to search
+ * @param {Array} source List of items to search
  * @param {any} search Item to search within the `source`
  * @returns {boolean} True if the search item was found
  */
@@ -48,3 +51,4 @@ export function formatDateObject(date: {
  * @returns {string} Formatted
  */
 export function renderAsAttributes(attrsObject: object): string;
+//# sourceMappingURL=nunjucks-filters.d.ts.map

package/dist/lib/nunjucks-filters.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"nunjucks-filters.d.ts","sourceRoot":"","sources":["../../src/lib/nunjucks-filters.js"],"names":[],"mappings":"AA6CA;;;;;;GAMG;AACH,yCAHc,CAAC,MAAM,QAAQ,CAAC,EAAA,GACjB,MAAM,CAYlB;AAED;;;;;;;GAOG;AACH,kDAHW,GAAG,GACD,OAAO,CAInB;AAED;;;;;;;;;;;;;;;;GAgBG;AACH,uCARG;IAAqB,EAAE,EAAf,MAAM;IACO,EAAE,EAAf,MAAM;IACO,IAAI,EAAjB,MAAM;CACd,WACA;IAAwB,MAAM;IACN,MAAM;CAC9B,GAAU,MAAM,CAoBlB;AAED;;;;;;;;;GASG;AACH,gDAHW,MAAM,GACJ,MAAM,CA0BlB"}

package/dist/lib/nunjucks-filters.js

@@ -1,83 +1,69 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.mergeObjects = mergeObjects;
-exports.includes = includes;
-exports.formatDateObject = formatDateObject;
-exports.renderAsAttributes = renderAsAttributes;
-const deepmerge_1 = __importDefault(require("deepmerge"));
-const luxon_1 = require("luxon");
-const nunjucks_1 = __importDefault(require("nunjucks"));
-const { all: deepmergeAll } = deepmerge_1.default;
-// Arrays will be merged such that elements at the same index will be merged
-// into each other
-// ref: https://www.npmjs.com/package/deepmerge
-const combineMerge = (target, source, options) => {
-    const destination = target.slice();
-    for (let index = 0; index < source.length; index++) {
-        // ESLint disabled as `index` is only an integer
-        /* eslint-disable security/detect-object-injection */
-        const item = source[index];
-        if (typeof destination[index] === "undefined") {
-            destination[index] = options.cloneUnlessOtherwiseSpecified(item, options);
-        }
-        else if (options.isMergeableObject(item)) {
-            destination[index] = (0, deepmerge_1.default)(target[index], item, options);
-        }
-        else if (target.indexOf(item) === -1) {
-            destination.push(item);
-        }
-        /* eslint-enable security/detect-object-injection */
-    }
-    return destination;
-};
-// Allows objects to be deepmerged and retain their type, without becoming [object Object]
-// ref: https://github.com/jonschlinkert/is-plain-object/blob/master/is-plain-object.js
-/**
- * @param {any} o Value to test
- * @returns {boolean} True if an object
- */
-function isObject(o) {
-    return Object.prototype.toString.call(o) === "[object Object]";
-}
+import deepmerge from "@fastify/deepmerge";
+import { DateTime } from "luxon";
+import nunjucks from "nunjucks";
+import isPlainObject from "is-plain-obj";
+import NullObject from "./NullObject.js";
+const merge = deepmerge({
+    all: true,
+    onlyDefinedProperties: true,
+    isMergeableObject: isMergable,
+    mergeArray(options) {
+        const deepmerge = options.deepmerge;
+        const clone = options.clone;
+        return function (target, source) {
+            let i = 0;
+            const tl = target.length;
+            const sl = source.length;
+            const il = Math.max(tl, sl);
+            const result = new Array(il);
+            /* eslint-disable security/detect-object-injection */
+            for (i = 0; i < il; ++i) {
+                const targetItem = target[i];
+                const sourceItem = source[i];
+                if (i < sl) {
+                    result[i] = deepmerge(targetItem, sourceItem);
+                }
+                else {
+                    result[i] = clone(targetItem);
+                }
+            }
+            /* eslint-enable security/detect-object-injection */
+            return result;
+        };
+    },
+});
 /**
- * @param {any} o Value to test
- * @returns {boolean} True if a plain object or array
+ * Returns true if object is mergable (plain object or Array)
+ *
+ * @param {object} object Input object
+ * @returns {boolean} Is mergable
  */
-function isPlainObjectOrArray(o) {
-    if (Array.isArray(o)) {
-        return true;
-    }
-    if (isObject(o) === false) {
-        return false;
-    }
-    const ctor = o.constructor;
-    if (ctor === undefined) {
-        return true;
-    }
-    const prot = ctor.prototype;
-    if (isObject(prot) === false) {
-        return false;
-    }
-    return Object.hasOwn(prot, "isPrototypeOf");
+function isMergable(object) {
+    return Array.isArray(object) || isPlainObject(object);
 }
 /**
- * @param {...any} objects Objects to merge
+ * Merge multiple objects into one object
+ *
+ * @memberof NunjucksFilters
+ * @param {...(object | Array)} objects Objects to merge
  * @returns {object} Merged object
  */
 function mergeObjects(...objects) {
-    return deepmergeAll([Object.create(null), ...objects], {
-        arrayMerge: combineMerge,
-        isMergeableObject: isPlainObjectOrArray,
-    });
+    const merged = merge(new NullObject(), ...objects);
+    if (merged === null) {
+        for (const object of objects) {
+            if (!isMergable(object)) {
+                throw new TypeError(`Cannot convert ${typeof object} to object`);
+            }
+        }
+    }
+    return merged;
 }
 /**
  * Determine whether a value exists in a list.
  *
  * @memberof NunjucksFilters
- * @param {any[]} source List of items to search
+ * @param {Array} source List of items to search
  * @param {any} search Item to search within the `source`
  * @returns {boolean} True if the search item was found
  */
@@ -107,7 +93,7 @@ function formatDateObject(date, config = {}) {
         "yyyy" in date &&
         "mm" in date &&
         "dd" in date) {
-        return luxon_1.DateTime.fromObject({
+        return DateTime.fromObject({
             year: Math.max(0, parseInt(date.yyyy, 10)),
             month: Math.max(0, parseInt(date.mm, 10)),
             day: Math.max(1, parseInt(date.dd, 10)),
@@ -146,6 +132,7 @@ function renderAsAttributes(attrsObject) {
             attrsList.push(`${key}="${value}"`);
         }
     }
-    return new nunjucks_1.default.runtime.SafeString(attrsList.join(" "));
+    return new nunjucks.runtime.SafeString(attrsList.join(" "));
 }
-//# sourceMappingURL=nunjucks-filters.js.map
+/** @namespace NunjucksFilters */
+export { mergeObjects, includes, formatDateObject, renderAsAttributes };

package/dist/lib/nunjucks.d.ts

@@ -7,11 +7,10 @@
  * Create a Nunjucks environment.
  *
  * @param {NunjucksOptions} options Nunjucks options
- * @param {boolean} govukRebrand GovukRebrand flag
  * @returns {Environment} Nunjucks Environment instance
  * @access private
  */
-export default function nunjucksConfig({ views, govukRebrand }: NunjucksOptions): Environment;
+export default function nunjucksConfig({ views }: NunjucksOptions): Environment;
 export type NunjucksOptions = {
     /**
      * Template file directories (optional, default
@@ -20,3 +19,4 @@ export type NunjucksOptions = {
     views?: string[] | undefined;
 };
 import { Environment } from "nunjucks";
+//# sourceMappingURL=nunjucks.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"nunjucks.d.ts","sourceRoot":"","sources":["../../src/lib/nunjucks.js"],"names":[],"mappings":"AAUA;;;;GAIG;AAEH;;;;;;GAMG;AACH,kDAJW,eAAe,GACb,WAAW,CA+BvB;;;;;;;;4BAnD2B,UAAU"}

package/dist/lib/nunjucks.js

@@ -1,15 +1,7 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = nunjucksConfig;
-const node_fs_1 = require("node:fs");
-const node_path_1 = require("node:path");
-const nunjucks_1 = require("nunjucks");
-const dirname_cjs_1 = __importDefault(require("./dirname.cjs"));
-const CasaTemplateLoader_js_1 = __importDefault(require("./CasaTemplateLoader.js"));
-const nunjucks_filters_js_1 = require("./nunjucks-filters.js");
+import { Environment } from "nunjucks";
+import packageInfo from "../../package.json" with { type: "json" };
+import CasaTemplateLoader from "./CasaTemplateLoader.js";
+import { mergeObjects, includes, renderAsAttributes, formatDateObject, } from "./nunjucks-filters.js";
 /**
  * @typedef {object} NunjucksOptions
  * @property {string[]} [views=[]] Template file directories (optional, default
@@ -19,19 +11,18 @@ const nunjucks_filters_js_1 = require("./nunjucks-filters.js");
  * Create a Nunjucks environment.
  *
  * @param {NunjucksOptions} options Nunjucks options
- * @param {boolean} govukRebrand GovukRebrand flag
  * @returns {Environment} Nunjucks Environment instance
  * @access private
  */
-function nunjucksConfig({ views = [], govukRebrand }) {
+export default function nunjucksConfig({ views = [] }) {
     // Prepare a single Nunjucks environment for all responses to use. Note that
     // we cannot prepare response-specific global functions/filters if we use a
     // single environment, but the performance gains of doing so are significant.
-    const loader = new CasaTemplateLoader_js_1.default(views, {
+    const loader = new CasaTemplateLoader(views, {
         watch: false,
         noCache: false,
     });
-    const env = new nunjucks_1.Environment(loader, {
+    const env = new Environment(loader, {
         autoescape: true,
         throwOnUndefined: false,
         trimBlocks: false,
@@ -41,14 +32,10 @@ function nunjucksConfig({ views = [], govukRebrand }) {
     env.modifyBlock = loader.modifyBlock.bind(loader);
     // Globals
     // These can't be modified once set. But they can be overridden by res.locals.
-    env.addGlobal("casaVersion", 
-    /* eslint-disable-next-line security/detect-non-literal-fs-filename */
-    JSON.parse((0, node_fs_1.readFileSync)((0, node_path_1.resolve)(dirname_cjs_1.default, "../../package.json"))).version);
-    env.addGlobal("govukRebrand", govukRebrand);
-    env.addGlobal("mergeObjects", nunjucks_filters_js_1.mergeObjects);
-    env.addGlobal("includes", nunjucks_filters_js_1.includes);
-    env.addGlobal("formatDateObject", nunjucks_filters_js_1.formatDateObject);
-    env.addGlobal("renderAsAttributes", nunjucks_filters_js_1.renderAsAttributes);
+    env.addGlobal("casaVersion", packageInfo.version);
+    env.addGlobal("mergeObjects", mergeObjects);
+    env.addGlobal("includes", includes);
+    env.addGlobal("formatDateObject", formatDateObject);
+    env.addGlobal("renderAsAttributes", renderAsAttributes);
     return env;
 }
-//# sourceMappingURL=nunjucks.js.map

package/dist/lib/utils.d.ts

@@ -25,10 +25,11 @@ export function isStringable(value: any): boolean;
  * @param {string} hookName Hook name (including scope prefix)
  * @param {string} path URL path to match (relative to mountUrl)
  * @param {Hook[]} hooks Hooks to be applied at the page level
- * @returns {Function[]} An array of middleware that should be applied
+ * @returns {import("express").RequestHandler[]} An array of middleware that
+ *   should be applied
  * @access private
  */
-export function resolveMiddlewareHooks(hookName: string, path: string, hooks?: Hook[]): Function[];
+export function resolveMiddlewareHooks(hookName: string, path: string, hooks?: Hook[]): import("express").RequestHandler[];
 /**
  * Coerce an input to a string.
  *
@@ -114,3 +115,4 @@ export function validateView(view: string): void;
  */
 export function validateWaypoint(waypoint: string): void;
 export type Hook = import("../casa").GlobalHook | import("../casa").PageHook;
+//# sourceMappingURL=utils.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"utils.d.ts","sourceRoot":"","sources":["../../src/lib/utils.js"],"names":[],"mappings":"AAAA;;;GAGG;AAEH;;;;;;GAMG;AACH,6BAJW,GAAG,GACD,OAAO,CAiBnB;AAED;;;;;;GAMG;AACH,oCAJW,GAAG,GACD,OAAO,CAKnB;AAED;;;;;;;;;;GAUG;AACH,iDAPW,MAAM,QACN,MAAM,UACN,IAAI,EAAE,GACJ,OAAO,SAAS,EAAE,cAAc,EAAE,CAa9C;AAED;;;;;;;GAOG;AACH,sCALW,GAAG,YACH,MAAM,mBACJ,MAAM,CAUlB;AAED;;;;;GAKG;AACH,4CAHW,GAAG,GACD,MAAM,GAAG,SAAS,CAI9B;AAED;;;;;;;;GAQG;AACH,uCANW,MAAM,WACN,MAAM,GACJ,MAAM,CAqClB;AAID;;;;;;;GAOG;AACH,8BALW,MAAM,GACJ,MAAM,CAalB;AAED;;;;;;;;GAQG;AACH,2CANW,MAAM,GACJ,IAAI,CAmBhB;AAED;;;;;;;GAOG;AACH,uCALW,MAAM,GACJ,IAAI,CAQhB;AAED;;;;;;;;GAQG;AACH,sCANW,MAAM,GACJ,MAAM,CAqBlB;AAED;;;;;;;;GAQG;AACH,mCANW,MAAM,GACJ,IAAI,CAmBhB;AAED;;;;;;;;GAQG;AACH,2CANW,MAAM,GACJ,IAAI,CAmBhB;mBA1QY,OAAO,SAAS,EAAE,UAAU,GAAG,OAAO,SAAS,EAAE,QAAQ"}

package/dist/lib/utils.js

@@ -1,21 +1,7 @@
-"use strict";
 /**
  * @typedef {import("../casa").GlobalHook | import("../casa").PageHook} Hook
  * @access private
  */
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.isEmpty = isEmpty;
-exports.isStringable = isStringable;
-exports.resolveMiddlewareHooks = resolveMiddlewareHooks;
-exports.stringifyInput = stringifyInput;
-exports.coerceInputToInteger = coerceInputToInteger;
-exports.stripWhitespace = stripWhitespace;
-exports.notProto = notProto;
-exports.validateHookName = validateHookName;
-exports.validateHookPath = validateHookPath;
-exports.validateUrlPath = validateUrlPath;
-exports.validateView = validateView;
-exports.validateWaypoint = validateWaypoint;
 /**
  * Determine if value is empty. Recurse over objects.
  *
@@ -23,7 +9,7 @@ exports.validateWaypoint = validateWaypoint;
  * @returns {boolean} True if the object is empty
  * @access private
  */
-function isEmpty(val) {
+export function isEmpty(val) {
     if (val === null ||
         typeof val === "undefined" ||
         (typeof val === "string" && val === "")) {
@@ -43,7 +29,7 @@ function isEmpty(val) {
  * @returns {boolean} Whether the value is stringable or not
  * @access private
  */
-function isStringable(value) {
+export function isStringable(value) {
     return typeof value === "string" || typeof value === "number";
 }
 /**
@@ -53,10 +39,11 @@ function isStringable(value) {
  * @param {string} hookName Hook name (including scope prefix)
  * @param {string} path URL path to match (relative to mountUrl)
  * @param {Hook[]} hooks Hooks to be applied at the page level
- * @returns {Function[]} An array of middleware that should be applied
+ * @returns {import("express").RequestHandler[]} An array of middleware that
+ *   should be applied
  * @access private
  */
-function resolveMiddlewareHooks(hookName, path, hooks = []) {
+export function resolveMiddlewareHooks(hookName, path, hooks = []) {
     const pathMatch = (h) => h.path === undefined ||
         (h.path instanceof RegExp && h.path.test(path)) ||
         h.path === path;
@@ -73,7 +60,7 @@ function resolveMiddlewareHooks(hookName, path, hooks = []) {
  * @returns {string} The stringified input
  * @access private
  */
-function stringifyInput(input, fallback) {
+export function stringifyInput(input, fallback) {
     // Not using param defaults here as the fallback may be explicitly "undefined"
     const fb = arguments.length === 2 && (isStringable(fallback) || fallback === undefined)
         ? fallback
@@ -86,7 +73,7 @@ function stringifyInput(input, fallback) {
  * @param {any} input Input to be coerced.
  * @returns {number | undefined} The number as an integer or `undefined`.
  */
-function coerceInputToInteger(input) {
+export function coerceInputToInteger(input) {
     return Number.isNaN(Number(input)) ? undefined : Math.floor(Number(input));
 }
 /**
@@ -98,7 +85,7 @@ function coerceInputToInteger(input) {
  * @throws {TypeError}
  * @access private
  */
-function stripWhitespace(value, options) {
+export function stripWhitespace(value, options) {
     const opts = {
         leading: "",
         trailing: "",
@@ -135,7 +122,7 @@ function stripWhitespace(value, options) {
  * @throws {Error} If proposed key is an invalid keyword
  * @access private
  */
-function notProto(key) {
+export function notProto(key) {
     if (["__proto__", "constructor", "prototype"].includes(String(key).toLowerCase())) {
         throw new Error("Attempt to use prototype key disallowed");
     }
@@ -150,7 +137,7 @@ function notProto(key) {
  * @throws {SyntaxError}
  * @access private
  */
-function validateHookName(hookName) {
+export function validateHookName(hookName) {
     if (typeof hookName !== "string") {
         throw new TypeError("Hook name must be a string");
     }
@@ -169,7 +156,7 @@ function validateHookName(hookName) {
  * @throws {TypeError}
  * @access private
  */
-function validateHookPath(path) {
+export function validateHookPath(path) {
     if (typeof path !== "string" && !(path instanceof RegExp)) {
         throw new TypeError("Hook path must be a string or RegExp");
     }
@@ -183,7 +170,7 @@ function validateHookPath(path) {
  * @throws {SyntaxError}
  * @access private
  */
-function validateUrlPath(path) {
+export function validateUrlPath(path) {
     if (typeof path !== "string") {
         throw new TypeError("URL path must be a string");
     }
@@ -204,7 +191,7 @@ function validateUrlPath(path) {
  * @throws {SyntaxError}
  * @access private
  */
-function validateView(view) {
+export function validateView(view) {
     if (typeof view !== "string") {
         throw new TypeError("View must be a string");
     }
@@ -224,7 +211,7 @@ function validateView(view) {
  * @throws {SyntaxError}
  * @access private
  */
-function validateWaypoint(waypoint) {
+export function validateWaypoint(waypoint) {
     if (typeof waypoint !== "string") {
         throw new TypeError("Waypoint must be a string");
     }
@@ -235,4 +222,3 @@ function validateWaypoint(waypoint) {
         throw new SyntaxError("Waypoint must contain only a-z, 0-9, -, _ and / characters");
     }
 }
-//# sourceMappingURL=utils.js.map

package/dist/lib/validators/dateObject.d.ts

@@ -85,3 +85,4 @@ export type DateObjectConfigOptions = {
 import ValidatorFactory from "../ValidatorFactory.js";
 import ValidationError from "../ValidationError.js";
 import { DateTime } from "luxon";
+//# sourceMappingURL=dateObject.d.ts.map

package/dist/lib/validators/dateObject.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"dateObject.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/dateObject.js"],"names":[],"mappings":"AAOA;;;GAGG;AAEH;;;;;;;;;;;;;;;;;GAiBG;AAEH;;;;;;;;;;GAUG;AACH;IACE,4DAA4D;IAC5D,aAAoB;IAEpB,0DAqHC;IAED,0BAWC;CACF;iCAzKY,OAAO,YAAY,EAAE,kBAAkB;;;;;cAMtC,kBAAkB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;6BAVH,wBAAwB;4BADzB,uBAAuB;yBAF1B,OAAO"}

package/dist/lib/validators/dateObject.js

@@ -1,14 +1,9 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const luxon_1 = require("luxon");
-const lodash_1 = __importDefault(require("lodash"));
-const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
-const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
-const utils_js_1 = require("../utils.js");
-const { isPlainObject } = lodash_1.default;
+import isPlainObject from "is-plain-obj";
+import { DateTime } from "luxon";
+import NullObject from "../NullObject.js";
+import ValidationError from "../ValidationError.js";
+import ValidatorFactory from "../ValidatorFactory.js";
+import { stringifyInput, stripWhitespace } from "../utils.js";
 /**
  * @typedef {import("../../casa").ErrorMessageConfig} ErrorMessageConfig
  * @access private
@@ -42,7 +37,7 @@ const { isPlainObject } = lodash_1.default;
  * @memberof Validators
  * @augments ValidatorFactory
  */
-class DateObject extends ValidatorFactory_js_1.default {
+export default class DateObject extends ValidatorFactory {
     /** @property {string} name Validator name ("dateObject") */
     name = "dateObject";
     validate(value, dataContext = {}) {
@@ -59,7 +54,7 @@ class DateObject extends ValidatorFactory_js_1.default {
                 inline: "validation:rule.dateObject.beforeOffset.inline",
                 summary: "validation:rule.dateObject.beforeOffset.summary",
             },
-            now: luxon_1.DateTime.local(),
+            now: DateTime.local(),
             allowSingleDigitDay: false,
             allowSingleDigitMonth: false,
             allowMonthNames: false,
@@ -102,7 +97,7 @@ class DateObject extends ValidatorFactory_js_1.default {
         }
         if (typeof value === "object") {
             formats.find((format) => {
-                luxonDate = luxon_1.DateTime.fromFormat([value.dd, value.mm, value.yyyy].join("-"), format).startOf("day");
+                luxonDate = DateTime.fromFormat([value.dd, value.mm, value.yyyy].join("-"), format).startOf("day");
                 valid = luxonDate.isValid;
                 return valid;
             });
@@ -144,20 +139,18 @@ class DateObject extends ValidatorFactory_js_1.default {
                 errorMsg.focusSuffix = ["[dd]", "[mm]", "[yyyy]"];
             }
         }
-        return valid ? [] : [ValidationError_js_1.default.make({ errorMsg, dataContext })];
+        return valid ? [] : [ValidationError.make({ errorMsg, dataContext })];
     }
     sanitise(value) {
         if (value !== undefined) {
             return isPlainObject(value)
                 ? {
-                    dd: (0, utils_js_1.stripWhitespace)((0, utils_js_1.stringifyInput)(value.dd)),
-                    mm: (0, utils_js_1.stripWhitespace)((0, utils_js_1.stringifyInput)(value.mm)),
-                    yyyy: (0, utils_js_1.stripWhitespace)((0, utils_js_1.stringifyInput)(value.yyyy)),
+                    dd: stripWhitespace(stringifyInput(value.dd)),
+                    mm: stripWhitespace(stringifyInput(value.mm)),
+                    yyyy: stripWhitespace(stringifyInput(value.yyyy)),
                 }
-                : Object.create(null);
+                : new NullObject();
         }
         return undefined;
     }
 }
-exports.default = DateObject;
-//# sourceMappingURL=dateObject.js.map

package/dist/lib/validators/email.d.ts

@@ -31,3 +31,4 @@ export type EmailConfigOptions = {
 };
 import ValidatorFactory from "../ValidatorFactory.js";
 import ValidationError from "../ValidationError.js";
+//# sourceMappingURL=email.d.ts.map

package/dist/lib/validators/email.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"email.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/email.js"],"names":[],"mappings":"AAOA;;;GAGG;AAEH;;;GAGG;AAEH;;;;;;;;;GASG;AACH;IACE,uDAAuD;IACvD,aAAe;IAEf,0DAcC;IAED,yCAKC;CACF;iCA7CY,OAAO,YAAY,EAAE,kBAAkB;;;;;cAMtC,kBAAkB;;6BAZH,wBAAwB;4BADzB,uBAAuB"}

package/dist/lib/validators/email.js

@@ -1,13 +1,8 @@
-"use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-const validator_1 = __importDefault(require("validator"));
-const ValidationError_js_1 = __importDefault(require("../ValidationError.js"));
-const ValidatorFactory_js_1 = __importDefault(require("../ValidatorFactory.js"));
-const utils_js_1 = require("../utils.js");
-const { isEmail } = validator_1.default; // CommonJS
+import validatorPkg from "validator";
+import ValidationError from "../ValidationError.js";
+import ValidatorFactory from "../ValidatorFactory.js";
+import { stringifyInput } from "../utils.js";
+const { isEmail } = validatorPkg; // CommonJS
 /**
  * @typedef {import("../../casa").ErrorMessageConfig} ErrorMessageConfig
  * @access private
@@ -26,7 +21,7 @@ const { isEmail } = validator_1.default; // CommonJS
  * @memberof Validators
  * @augments ValidatorFactory
  */
-class Email extends ValidatorFactory_js_1.default {
+export default class Email extends ValidatorFactory {
     /** @property {string} name Validator name ("email") */
     name = "email";
     validate(value, dataContext = {}) {
@@ -41,14 +36,12 @@ class Email extends ValidatorFactory_js_1.default {
             summary: "validation:rule.email.summary",
             inline: "validation:rule.email.inline",
         };
-        return isValid ? [] : [ValidationError_js_1.default.make({ errorMsg, dataContext })];
+        return isValid ? [] : [ValidationError.make({ errorMsg, dataContext })];
     }
     sanitise(value) {
         if (value !== undefined) {
-            return (0, utils_js_1.stringifyInput)(value);
+            return stringifyInput(value);
         }
         return undefined;
     }
 }
-exports.default = Email;
-//# sourceMappingURL=email.js.map

package/dist/lib/validators/inArray.d.ts

@@ -37,3 +37,4 @@ export type ArrayConfigOptions = {
 };
 import ValidatorFactory from "../ValidatorFactory.js";
 import ValidationError from "../ValidationError.js";
+//# sourceMappingURL=inArray.d.ts.map

package/dist/lib/validators/inArray.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"inArray.d.ts","sourceRoot":"","sources":["../../../src/lib/validators/inArray.js"],"names":[],"mappings":"AAYA;;;GAGG;AAEH;;;;GAIG;AAEH;;;;;;;;;;GAUG;AACH;IACE,yDAAyD;IACzD,aAAiB;IAEjB,0DAqBC;IAED,oDAgBC;CACF;iCAjEY,OAAO,YAAY,EAAE,kBAAkB;;;;;cAMtC,kBAAkB;;;;YAClB,MAAM,EAAE;;6BAXO,wBAAwB;4BADzB,uBAAuB"}