@middy/util 7.3.1 → 7.3.2

package/index.d.ts

@@ -219,6 +219,7 @@ export type BooleanRule = {
 export type ArrayRule = {
 	type: "array";
 	items?: OptionSchemaRule;
+	uniqueItems?: boolean;
 	examples?: readonly unknown[];
 };
 
@@ -251,6 +252,11 @@ export type OneOfRule = {
 	examples?: readonly unknown[];
 };
 
+export type AllOfRule = {
+	allOf: readonly OptionSchemaRule[];
+	examples?: readonly unknown[];
+};
+
 export type OptionSchemaRule =
 	| StringRule
 	| NumberRule
@@ -260,7 +266,8 @@ export type OptionSchemaRule =
 	| EnumRule
 	| ConstRule
 	| InstanceofRule
-	| OneOfRule;
+	| OneOfRule
+	| AllOfRule;
 
 export type OptionSchema = ObjectRule;
 

package/index.js

@@ -69,15 +69,16 @@ const checkTypeSpec = (rawType, value, path, fail) => {
 	return true;
 };
 
-// Plain object with no rule-marker key (`type`, `enum`, `oneOf`, `const`,
-// `instanceof`) is a flat object schema; anything else is a rule. Used when
-// dispatching `items` and `additionalProperties`.
+// Plain object with no rule-marker key (`type`, `enum`, `oneOf`, `allOf`,
+// `const`, `instanceof`) is a flat object schema; anything else is a rule.
+// Used when dispatching `items` and `additionalProperties`.
 const checkNestedRule = (rule, value, path, fail) => {
 	if (
 		isPlainObject(rule) &&
 		typeof rule.type !== "string" &&
 		!Array.isArray(rule.enum) &&
 		!Array.isArray(rule.oneOf) &&
+		!Array.isArray(rule.allOf) &&
 		!Object.hasOwn(rule, "const") &&
 		typeof rule.instanceof !== "string"
 	) {
@@ -89,6 +90,20 @@ const checkNestedRule = (rule, value, path, fail) => {
 
 const childPathOf = (path, key) => (path ? `${path}.${key}` : key);
 
+// Stable JSON form: recursively sorts object keys, skips function-typed
+// values. Used for `uniqueItems` so items that differ only by handler
+// identity or key ordering collide.
+const stableStringify = (value) => {
+	if (value === null || typeof value !== "object") return JSON.stringify(value);
+	if (Array.isArray(value)) {
+		return `[${value.map(stableStringify).join(",")}]`;
+	}
+	const keys = Object.keys(value)
+		.filter((k) => typeof value[k] !== "function")
+		.sort();
+	return `{${keys.map((k) => `${JSON.stringify(k)}:${stableStringify(value[k])}`).join(",")}}`;
+};
+
 const resolveInstance = (name) => {
 	const ctor = globalThis[name];
 	if (typeof ctor !== "function") {
@@ -115,6 +130,13 @@ const checkRule = (rule, value, path, fail) => {
 		}
 		return;
 	}
+	if (isPlainObject(rule) && Array.isArray(rule.allOf)) {
+		if (value === undefined) return;
+		for (const sub of rule.allOf) {
+			checkRule(sub, value, path, fail);
+		}
+		return;
+	}
 	if (isPlainObject(rule) && Array.isArray(rule.oneOf)) {
 		if (value === undefined) return;
 		let matches = 0;
@@ -154,6 +176,7 @@ const checkRule = (rule, value, path, fail) => {
 		const {
 			type: rawType,
 			items,
+			uniqueItems,
 			properties,
 			required,
 			additionalProperties,
@@ -185,6 +208,16 @@ const checkRule = (rule, value, path, fail) => {
 				checkNestedRule(items, value[i], `${path}[${i}]`, fail);
 			}
 		}
+		if (type === "array" && uniqueItems === true) {
+			const seen = new Set();
+			for (let i = 0; i < value.length; i++) {
+				const key = stableStringify(value[i]);
+				if (seen.has(key)) {
+					fail(`Duplicate item at '${path}[${i}]'`);
+				}
+				seen.add(key);
+			}
+		}
 		if (type === "object" && Array.isArray(required)) {
 			for (const key of required) {
 				if (value[key] === undefined) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@middy/util",
-	"version": "7.3.1",
+	"version": "7.3.2",
 	"description": "🛵 The stylish Node.js middleware engine for AWS Lambda (util package)",
 	"type": "module",
 	"engines": {
@@ -57,7 +57,7 @@
 	},
 	"devDependencies": {
 		"@aws-sdk/client-ssm": "^3.0.0",
-		"@middy/core": "7.3.1",
+		"@middy/core": "7.3.2",
 		"@types/aws-lambda": "^8.0.0",
 		"@types/node": "^22.0.0",
 		"aws-xray-sdk": "^3.3.3"