@f5-sales-demo/xcsh 22.8.2 → 22.8.3

package/src/internal-urls/build-info.generated.ts

@@ -17,17 +17,17 @@ export interface BuildInfo {
 }
 
 export const BUILD_INFO: BuildInfo = {
-	"version": "22.8.2",
-	"commit": "2dc893f06f8b975cca3ad6f1edbf468799f2a5b5",
-	"shortCommit": "2dc893f",
+	"version": "22.8.3",
+	"commit": "5ecf98705c48d2de46a9673adadc8957bc32343b",
+	"shortCommit": "5ecf987",
 	"branch": "main",
-	"tag": "v22.8.2",
-	"commitDate": "2026-10-03T15:16:53Z",
-	"buildDate": "2026-10-03T16:03:16.010Z",
+	"tag": "v22.8.3",
+	"commitDate": "2026-10-03T16:38:57Z",
+	"buildDate": "2026-10-03T17:29:00.510Z",
 	"dirty": true,
 	"prNumber": "",
 	"repoUrl": "https://github.com/f5-sales-demo/xcsh",
 	"repoSlug": "f5-sales-demo/xcsh",
-	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/2dc893f06f8b975cca3ad6f1edbf468799f2a5b5",
-	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v22.8.2"
+	"commitUrl": "https://github.com/f5-sales-demo/xcsh/commit/5ecf98705c48d2de46a9673adadc8957bc32343b",
+	"releaseUrl": "https://github.com/f5-sales-demo/xcsh/releases/tag/v22.8.3"
 };

package/src/internal-urls/map-constraints.ts

@@ -1,100 +1,2 @@
-/** Structured map contract rendering and local extension validation. */
-import { isIP } from "node:net";
-
-export interface MapScope {
-	type?: string;
-	minLength?: number;
-	maxLength?: number;
-	pattern?: string;
-	format?: string;
-	minimum?: number;
-	maximum?: number;
-	ranges?: number[][];
-}
-
-export interface MapConstraints {
-	constraintType: string;
-	keys?: MapScope;
-	values?: MapScope;
-	cardinality?: { minProperties?: number; maxProperties?: number };
-	crossEntry?: { uniqueValues?: boolean };
-	originalRules?: Record<string, unknown>;
-}
-
-export function formatMapConstraints(constraints: MapConstraints): string {
-	const parts: string[] = [];
-	for (const scope of ["keys", "values", "cardinality", "crossEntry"] as const) {
-		for (const [key, value] of Object.entries(constraints[scope] ?? {})) {
-			parts.push(`${scope}.${key}: ${typeof value === "string" ? value : JSON.stringify(value)}`);
-		}
-	}
-	return parts.join(", ");
-}
-
-function validateText(value: unknown, scope: MapScope, label: string): string[] {
-	const errors: string[] = [];
-	if (typeof value !== "string") return [`${label} must be a string`];
-	const length = Array.from(value).length;
-	if (scope.minLength !== undefined && length < scope.minLength) errors.push(`${label} below minimum length`);
-	if (scope.maxLength !== undefined && length > scope.maxLength) errors.push(`${label} exceeds maximum length`);
-	if (scope.pattern && !new RegExp(scope.pattern).test(value)) errors.push(`${label} does not match pattern`);
-	if (scope.type === "uint32-string") {
-		const number = Number(value);
-		if (!/^\d+$/.test(value) || !Number.isSafeInteger(number) || number > 4294967295)
-			errors.push(`${label} must be uint32`);
-		if (scope.minimum !== undefined && number < scope.minimum) errors.push(`${label} below minimum`);
-		if (scope.maximum !== undefined && number > scope.maximum) errors.push(`${label} exceeds maximum`);
-		if (scope.ranges && !scope.ranges.some(([lo, hi]) => number >= lo! && number <= hi!))
-			errors.push(`${label} outside ranges`);
-	}
-	switch (scope.format) {
-		case "ipv4":
-			if (isIP(value) !== 4) errors.push(`${label} must be IPv4`);
-			break;
-		case "ipv6":
-			if (isIP(value) !== 6) errors.push(`${label} must be IPv6`);
-			break;
-		case "ip-address":
-			if (!isIP(value)) errors.push(`${label} must be IP`);
-			break;
-		case "mac-address":
-			if (!/^(?:[\da-f]{2}:){5}[\da-f]{2}$/i.test(value)) errors.push(`${label} must be MAC`);
-			break;
-		case "regex":
-			try {
-				new RegExp(value);
-			} catch {
-				errors.push(`${label} must be a valid regex`);
-			}
-			break;
-		case "k8s-label-value":
-			if (value.length > 63 || !/^(?:[A-Za-z0-9](?:[A-Za-z0-9_.-]*[A-Za-z0-9])?)?$/.test(value))
-				errors.push(`${label} must be a Kubernetes label value`);
-			break;
-		case "uri-reference":
-			if (/[^\x21-\x7e]|%(?![\da-f]{2})/i.test(value)) errors.push(`${label} must be a URI-reference`);
-			break;
-	}
-	return errors;
-}
-
-export function validateMapConstraints(value: unknown, constraints: MapConstraints): string[] {
-	if (!value || typeof value !== "object" || Array.isArray(value)) return ["Expected a map object"];
-	const entries = Object.entries(value);
-	const errors: string[] = [];
-	const cardinality = constraints.cardinality;
-	if (cardinality?.minProperties !== undefined && entries.length < cardinality.minProperties)
-		errors.push("Too few map pairs");
-	if (cardinality?.maxProperties !== undefined && entries.length > cardinality.maxProperties)
-		errors.push("Too many map pairs");
-	for (const [key, item] of entries) {
-		if (constraints.keys) errors.push(...validateText(key, constraints.keys, `key ${key}`));
-		if (constraints.values) errors.push(...validateText(item, constraints.values, `value at ${key}`));
-	}
-	if (
-		constraints.crossEntry?.uniqueValues &&
-		new Set(entries.map(([, item]) => JSON.stringify(item))).size !== entries.length
-	)
-		errors.push("Map values must be unique");
-	return errors;
-}
+export type { MapConstraints, MapScope } from "@f5-sales-demo/pi-resource-management";
+export { formatMapConstraints, validateMapConstraints } from "@f5-sales-demo/pi-resource-management";

package/src/resource-management/index.ts

@@ -1,7 +1,65 @@
-import { createKindResolver } from "@f5-sales-demo/pi-resource-management";
+import {
+	createKindResolver,
+	type MapConstraints,
+	type ValidationError,
+	validateMapConstraints,
+} from "@f5-sales-demo/pi-resource-management";
+import { API_CATALOG_DATA } from "../internal-urls/api-catalog-index.generated";
 import { API_SPEC_INDEX, API_VALIDATION_DATA } from "../internal-urls/api-spec-index.generated";
 
-export const kindResolver = createKindResolver(API_SPEC_INDEX, API_VALIDATION_DATA);
+const baseResolver = createKindResolver(API_SPEC_INDEX, API_VALIDATION_DATA);
+const normalizePath = (path: string) =>
+	path.replace(/\{metadata\.namespace\}/g, "{namespace}").replace(/\{metadata\.name\}/g, "{name}");
+
+function valuesAtPath(object: unknown, path: string): unknown[] {
+	if (!path) return [object];
+	const [part, ...remaining] = path.split(".");
+	const name = part!.replace(/(?:\[\]|\{\})$/, "");
+	if (!object || typeof object !== "object") return [];
+	const child = (object as Record<string, unknown>)[name];
+	if (child === undefined || child === null) return [];
+	const rest = remaining.join(".");
+	if (part!.endsWith("[]")) return Array.isArray(child) ? child.flatMap(item => valuesAtPath(item, rest)) : [];
+	if (part!.endsWith("{}"))
+		return typeof child === "object" ? Object.values(child).flatMap(item => valuesAtPath(item, rest)) : [];
+	return valuesAtPath(child, rest);
+}
+
+export const kindResolver = {
+	...baseResolver,
+	resolveKind(kind: string) {
+		const resolved = baseResolver.resolveKind(kind);
+		return {
+			...resolved,
+			validateFields(object: Record<string, unknown>, operation: "create" | "update"): ValidationError[] {
+				const method = operation === "update" ? "put" : "post";
+				const errors: ValidationError[] = [];
+				const seen = new Set<string>();
+				for (const category of Object.values(API_CATALOG_DATA)) {
+					for (const entry of category.operations) {
+						if (entry.method.toLowerCase() !== method || normalizePath(entry.path) !== resolved.paths[operation])
+							continue;
+						for (const [field, metadata] of Object.entries(entry.fieldMetadata ?? {})) {
+							if (metadata.constraints?.constraintType !== "map") continue;
+							const fingerprint = `${field}:${JSON.stringify(metadata.constraints)}`;
+							if (seen.has(fingerprint)) continue;
+							seen.add(fingerprint);
+							for (const value of valuesAtPath(object, field)) {
+								for (const message of validateMapConstraints(
+									value,
+									metadata.constraints as unknown as MapConstraints,
+								)) {
+									errors.push({ path: field, message, code: "INVALID_MAP" });
+								}
+							}
+						}
+					}
+				}
+				return errors;
+			},
+		};
+	},
+};
 
 export type {
 	ApiSpecDomainEntry,