@powerlines/schema 0.11.75 → 0.11.77

package/dist/index.mjs

@@ -2,7 +2,7 @@ import { createUnpluginResolver } from "@powerlines/core/lib/unplugin";
 import { resolveOptions } from "@powerlines/unplugin/esbuild";
 import { omit } from "@stryke/helpers/omit";
 import { findFileName } from "@stryke/path/file-path-fns";
-import defu, { defu as defu$1 } from "defu";
+import defu from "defu";
 import { build } from "esbuild";
 import { createEsbuildPlugin } from "unplugin";
 import { toBool } from "@stryke/convert/to-bool";
@@ -173,10 +173,9 @@ function getPrimarySchemaType(schema) {
 //#endregion
 //#region src/type-checks.ts
 const isSetNumber = (value) => typeof value === "number" && Number.isFinite(value);
-const isSetBoolean = (value) => typeof value === "boolean";
-const isSchemaLikeValue = (value) => isSetObject(value) || isSetBoolean(value);
+const isSchemaLikeValue = (value) => isSetObject(value) || isBoolean(value);
 const isRecordOfSchemaLike = (value) => isSetObject(value) && Object.values(value).every((item) => isSchemaLikeValue(item));
-const isVocabularyMap = (value) => isSetObject(value) && Object.values(value).every((item) => isSetBoolean(item));
+const isVocabularyMap = (value) => isSetObject(value) && Object.values(value).every((item) => isBoolean(item));
 const isStringArray = (value) => Array.isArray(value) && value.every((item) => isSetString(item));
 const isRecordOfStringArrays = (value) => isSetObject(value) && Object.values(value).every((item) => isStringArray(item));
 const JSON_SCHEMA_PRIMITIVE_TYPE_SET = new Set(JSON_SCHEMA_PRIMITIVE_TYPES);
@@ -238,8 +237,8 @@ const isUntypedFunctionArg = (value) => {
 const isRecordOfUntypedSchema = (value) => isSetObject(value) && Object.values(value).every((item) => isUntypedSchema(item));
 const isArrayOf = (value, predicate) => Array.isArray(value) && value.every((item) => predicate(item));
 const isTupleOfTwo = (value, aPredicate, bPredicate) => Array.isArray(value) && value.length === 2 && aPredicate(value[0]) && bPredicate(value[1]);
-const isOptionalString = (value) => value === void 0 || isSetString(value);
-const isOptionalBoolean = (value) => value === void 0 || isSetBoolean(value);
+const isOptionalString = (value, allowEmpty = false) => value === void 0 || isString(value) && (allowEmpty || value.length > 0);
+const isOptionalBoolean = (value) => value === void 0 || isBoolean(value);
 const isOptionalNumber = (value) => value === void 0 || isSetNumber(value);
 const isOptionalBigint = (value) => value === void 0 || isSetBigint(value);
 const isOptionalJsonSchema = (value) => value === void 0 || isJsonSchema(value);
@@ -250,15 +249,15 @@ const hasValidJsonSchemaKeywords = (schema) => {
 	if (!isOptionalString(schema.$id)) return false;
 	if (!isOptionalString(schema.$schema)) return false;
 	if (schema.$vocabulary !== void 0 && !isVocabularyMap(schema.$vocabulary)) return false;
-	if (!isOptionalString(schema.$comment)) return false;
+	if (!isOptionalString(schema.$comment, true)) return false;
 	if (!isOptionalString(schema.$anchor)) return false;
 	if (schema.$defs !== void 0 && !isRecordOfSchemaLike(schema.$defs)) return false;
 	if (!isOptionalString(schema.$dynamicRef)) return false;
 	if (!isOptionalString(schema.$dynamicAnchor)) return false;
 	if (!isOptionalString(schema.name)) return false;
-	if (!isOptionalString(schema.title)) return false;
-	if (!isOptionalString(schema.description)) return false;
-	if (!isOptionalString(schema.docs)) return false;
+	if (!isOptionalString(schema.title, true)) return false;
+	if (!isOptionalString(schema.description, true)) return false;
+	if (!isOptionalString(schema.docs, true)) return false;
 	if (schema.examples !== void 0 && !Array.isArray(schema.examples)) return false;
 	if (schema.alias !== void 0 && !isStringArray(schema.alias)) return false;
 	if (schema.tags !== void 0 && !isStringArray(schema.tags)) return false;
@@ -309,7 +308,7 @@ function isJsonSchemaArray(input) {
 	if (!isSetObject(input)) return false;
 	const schema = input;
 	if (!hasValidJsonSchemaKeywords(schema) || schema.type !== "array") return false;
-	return isOptionalJsonSchemaArray(schema.prefixItems) && isOptionalJsonSchema(schema.items) && isOptionalJsonSchema(schema.contains) && isOptionalNumber(schema.minItems) && isOptionalNumber(schema.maxItems) && isOptionalBoolean(schema.uniqueItems) && isOptionalNumber(schema.minContains) && isOptionalNumber(schema.maxContains) && (schema.unevaluatedItems === void 0 || isSetBoolean(schema.unevaluatedItems) || isJsonSchema(schema.unevaluatedItems));
+	return isOptionalJsonSchemaArray(schema.prefixItems) && isOptionalJsonSchema(schema.items) && isOptionalJsonSchema(schema.contains) && isOptionalNumber(schema.minItems) && isOptionalNumber(schema.maxItems) && isOptionalBoolean(schema.uniqueItems) && isOptionalNumber(schema.minContains) && isOptionalNumber(schema.maxContains) && (schema.unevaluatedItems === void 0 || isBoolean(schema.unevaluatedItems) || isJsonSchema(schema.unevaluatedItems));
 }
 /**
 * Type guard for bigint-backed integer schemas.
@@ -364,7 +363,7 @@ function isJsonSchemaEnum(input) {
 	const defaultValue = schema.default;
 	if (typeName === "string") return enumValues.every((value) => isSetString(value)) && (defaultValue === void 0 || isSetString(defaultValue));
 	if (typeName === "number" || typeName === "integer") return enumValues.every((value) => isSetNumber(value)) && (defaultValue === void 0 || isSetNumber(defaultValue));
-	if (typeName === "boolean") return enumValues.every((value) => isSetBoolean(value)) && (defaultValue === void 0 || isSetBoolean(defaultValue));
+	if (typeName === "boolean") return enumValues.every((value) => isBoolean(value)) && (defaultValue === void 0 || isBoolean(defaultValue));
 	return typeName === "null" && enumValues.every((value) => value === null) && (defaultValue === void 0 || defaultValue === null);
 }
 /**
@@ -377,7 +376,7 @@ function isJsonSchemaAllOf(input) {
 	if (!isSetObject(input)) return false;
 	const schema = input;
 	if (!hasValidJsonSchemaKeywords(schema) || !isArrayOf(schema.allOf, isJsonSchema)) return false;
-	return schema.unevaluatedProperties === void 0 || isSetBoolean(schema.unevaluatedProperties) || isJsonSchema(schema.unevaluatedProperties);
+	return schema.unevaluatedProperties === void 0 || isBoolean(schema.unevaluatedProperties) || isJsonSchema(schema.unevaluatedProperties);
 }
 /**
 * Type guard for literal-value schemas.
@@ -491,7 +490,7 @@ function isJsonSchemaDecimal(input) {
 function isJsonSchemaObject(input) {
 	if (!isSetObject(input)) return false;
 	const schema = input;
-	return hasValidJsonSchemaKeywords(schema) && schema.type === "object" && (schema.properties === void 0 || isRecordOfSchemaLike(schema.properties)) && (schema.patternProperties === void 0 || isRecordOfSchemaLike(schema.patternProperties)) && (schema.additionalProperties === void 0 || isSetBoolean(schema.additionalProperties) || isJsonSchema(schema.additionalProperties)) && (schema.required === void 0 || isStringArray(schema.required)) && (schema.unevaluatedProperties === void 0 || isSetBoolean(schema.unevaluatedProperties) || isJsonSchema(schema.unevaluatedProperties)) && (schema.dependencies === void 0 || isSetObject(schema.dependencies) && Object.values(schema.dependencies).every((item) => isStringArray(item) || isJsonSchema(item))) && (schema.dependentRequired === void 0 || isRecordOfStringArrays(schema.dependentRequired)) && (schema.dependentSchemas === void 0 || isRecordOfSchemaLike(schema.dependentSchemas)) && isOptionalNumber(schema.minProperties) && isOptionalNumber(schema.maxProperties) && (schema.primaryKey === void 0 || isStringArray(schema.primaryKey)) && isOptionalString(schema.databaseSchema);
+	return hasValidJsonSchemaKeywords(schema) && schema.type === "object" && (schema.properties === void 0 || isRecordOfSchemaLike(schema.properties)) && (schema.patternProperties === void 0 || isRecordOfSchemaLike(schema.patternProperties)) && (schema.additionalProperties === void 0 || isBoolean(schema.additionalProperties) || isJsonSchema(schema.additionalProperties)) && (schema.required === void 0 || isStringArray(schema.required)) && (schema.unevaluatedProperties === void 0 || isBoolean(schema.unevaluatedProperties) || isJsonSchema(schema.unevaluatedProperties)) && (schema.dependencies === void 0 || isSetObject(schema.dependencies) && Object.values(schema.dependencies).every((item) => isStringArray(item) || isJsonSchema(item))) && (schema.dependentRequired === void 0 || isRecordOfStringArrays(schema.dependentRequired)) && (schema.dependentSchemas === void 0 || isRecordOfSchemaLike(schema.dependentSchemas)) && isOptionalNumber(schema.minProperties) && isOptionalNumber(schema.maxProperties) && (schema.primaryKey === void 0 || isStringArray(schema.primaryKey)) && isOptionalString(schema.databaseSchema);
 }
 /**
 * Type guard for string schemas.
@@ -513,7 +512,7 @@ function isJsonSchemaString(input) {
 function isJsonSchemaSet(input) {
 	if (!isSetObject(input)) return false;
 	const schema = input;
-	return hasValidJsonSchemaKeywords(schema) && schema.type === "array" && schema.uniqueItems === true && isOptionalJsonSchemaArray(schema.prefixItems) && isOptionalJsonSchema(schema.items) && isOptionalJsonSchema(schema.contains) && isOptionalNumber(schema.minItems) && isOptionalNumber(schema.maxItems) && isOptionalNumber(schema.minContains) && isOptionalNumber(schema.maxContains) && (schema.unevaluatedItems === void 0 || isSetBoolean(schema.unevaluatedItems) || isJsonSchema(schema.unevaluatedItems));
+	return hasValidJsonSchemaKeywords(schema) && schema.type === "array" && schema.uniqueItems === true && isOptionalJsonSchemaArray(schema.prefixItems) && isOptionalJsonSchema(schema.items) && isOptionalJsonSchema(schema.contains) && isOptionalNumber(schema.minItems) && isOptionalNumber(schema.maxItems) && isOptionalNumber(schema.minContains) && isOptionalNumber(schema.maxContains) && (schema.unevaluatedItems === void 0 || isBoolean(schema.unevaluatedItems) || isJsonSchema(schema.unevaluatedItems));
 }
 /**
 * Type guard for record schemas.
@@ -524,7 +523,7 @@ function isJsonSchemaSet(input) {
 function isJsonSchemaRecord(input) {
 	if (!isSetObject(input)) return false;
 	const schema = input;
-	return hasValidJsonSchemaKeywords(schema) && schema.type === "object" && (schema.patternProperties === void 0 || isRecordOfSchemaLike(schema.patternProperties)) && (schema.additionalProperties === void 0 || isSetBoolean(schema.additionalProperties) || isJsonSchema(schema.additionalProperties)) && isOptionalJsonSchema(schema.propertyNames);
+	return hasValidJsonSchemaKeywords(schema) && schema.type === "object" && (schema.patternProperties === void 0 || isRecordOfSchemaLike(schema.patternProperties)) && (schema.additionalProperties === void 0 || isBoolean(schema.additionalProperties) || isJsonSchema(schema.additionalProperties)) && isOptionalJsonSchema(schema.propertyNames);
 }
 /**
 * Type guard for tuple schemas.
@@ -535,7 +534,7 @@ function isJsonSchemaRecord(input) {
 function isJsonSchemaTuple(input) {
 	if (!isSetObject(input)) return false;
 	const schema = input;
-	return hasValidJsonSchemaKeywords(schema) && schema.type === "array" && isArrayOf(schema.prefixItems, isJsonSchema) && isOptionalNumber(schema.minItems) && isOptionalNumber(schema.maxItems) && isOptionalJsonSchema(schema.items) && isOptionalJsonSchema(schema.contains) && isOptionalBoolean(schema.uniqueItems) && isOptionalNumber(schema.minContains) && isOptionalNumber(schema.maxContains) && (schema.unevaluatedItems === void 0 || isSetBoolean(schema.unevaluatedItems) || isJsonSchema(schema.unevaluatedItems));
+	return hasValidJsonSchemaKeywords(schema) && schema.type === "array" && isArrayOf(schema.prefixItems, isJsonSchema) && isOptionalNumber(schema.minItems) && isOptionalNumber(schema.maxItems) && isOptionalJsonSchema(schema.items) && isOptionalJsonSchema(schema.contains) && isOptionalBoolean(schema.uniqueItems) && isOptionalNumber(schema.minContains) && isOptionalNumber(schema.maxContains) && (schema.unevaluatedItems === void 0 || isBoolean(schema.unevaluatedItems) || isJsonSchema(schema.unevaluatedItems));
 }
 /**
 * Type guard for undefined-representing schemas.
@@ -563,7 +562,7 @@ function isJsonSchemaPrimitiveUnion(input) {
 		if (!Array.isArray(schema.enum)) return false;
 		if (schema.type === "string") return schema.enum.every((value) => isSetString(value)) && (schema.default === void 0 || isSetString(schema.default));
 		if (schema.type === "number") return schema.enum.every((value) => isSetNumber(value)) && (schema.default === void 0 || isSetNumber(schema.default));
-		if (schema.type === "boolean") return schema.enum.every((value) => isSetBoolean(value)) && (schema.default === void 0 || isSetBoolean(schema.default));
+		if (schema.type === "boolean") return schema.enum.every((value) => isBoolean(value)) && (schema.default === void 0 || isBoolean(schema.default));
 		if (schema.type === "integer") {
 			if (schema.format !== "int64") return false;
 			return schema.enum.every((value) => isSetBigint(value)) && (schema.default === void 0 || isSetBigint(schema.default));
@@ -636,7 +635,7 @@ function isStandardSchema(input) {
 function isValibotSchema(input) {
 	if (!isSetObject(input) || !isStandardSchema(input)) return false;
 	const schema = input;
-	return schema.kind === "schema" && isSetString(schema.type) && isSetBoolean(schema.async) && isFunction(schema.reference) && isSetString(schema.expects) && isFunction(schema["~run"]);
+	return schema.kind === "schema" && isSetString(schema.type) && isBoolean(schema.async) && isFunction(schema.reference) && isSetString(schema.expects) && isFunction(schema["~run"]);
 }
 /**
 * Type guard for JSON Schema types.
@@ -774,7 +773,7 @@ function isSchemaObject(input) {
 */
 function getJsonSchema(input) {
 	const schema = isSchema(input) ? input.schema : input;
-	if (!isJsonSchema(schema)) throw new TypeError(`The provided input is not a valid JSON Schema: ${JSON.stringify(schema, null, 2)}`);
+	if (!isJsonSchema(schema)) throw new TypeError(`The provided input is not a valid JSON Schema`);
 	return schema;
 }
 /**
@@ -789,7 +788,7 @@ function getJsonSchema(input) {
 */
 function getJsonSchemaObject(input) {
 	const schema = getJsonSchema(input);
-	if (!isJsonSchemaObject(schema)) throw new TypeError(`The provided input is not a valid JSON Schema object: ${JSON.stringify(schema, null, 2)}`);
+	if (!isJsonSchemaObject(schema)) throw new TypeError(`The provided input is not a valid JSON Schema object`);
 	return schema;
 }
 /**
@@ -852,21 +851,100 @@ function addProperty(obj, name, property) {
 	if (schema.required.length === 0) delete schema.required;
 }
 /**
+* Keywords whose values are a flat record of named JSON Schema fragments.
+* Each child schema is merged recursively with its counterpart.
+*/
+const SCHEMA_RECORD_KEYWORDS = new Set([
+	"properties",
+	"patternProperties",
+	"$defs",
+	"definitions",
+	"dependentSchemas"
+]);
+/**
+* Keywords whose value is a single JSON Schema fragment that should be
+* recursively merged when both sides define it.
+*/
+const SCHEMA_SINGLE_KEYWORDS = new Set([
+	"if",
+	"then",
+	"else",
+	"not",
+	"contains",
+	"items",
+	"additionalProperties",
+	"unevaluatedProperties",
+	"propertyNames",
+	"unevaluatedItems"
+]);
+/**
+* Keywords whose values are arrays of JSON Schema fragments that should be
+* concatenated (rather than overridden) during a merge.
+*/
+const SCHEMA_ARRAY_CONCAT_KEYWORDS = new Set([
+	"allOf",
+	"anyOf",
+	"oneOf"
+]);
+/**
+* Recursively merges two JSON Schema fragments. `override` wins for any scalar
+* key that both schemas define, while structured keywords are handled
+* specially:
+*
+* - `properties`, `patternProperties`, `$defs`, `definitions`,
+*   `dependentSchemas` — each matching child schema is merged recursively.
+* - `allOf`, `anyOf`, `oneOf` — arrays are concatenated.
+* - `if`, `then`, `else`, `not`, `contains`, `items`,
+*   `additionalProperties`, `unevaluatedProperties`, `propertyNames`,
+*   `unevaluatedItems` — merged recursively when both sides are schemas.
+* - `required` — arrays are unioned and deduplicated.
+*/
+function mergeTwo(base, override) {
+	const result = { ...base };
+	for (const [key, overrideValue] of Object.entries(override)) {
+		const baseValue = result[key];
+		if (key === "required") result[key] = getUnique([...Array.isArray(baseValue) ? baseValue : [], ...Array.isArray(overrideValue) ? overrideValue : []]);
+		else if (SCHEMA_RECORD_KEYWORDS.has(key) && isSetObject(baseValue) && isSetObject(overrideValue)) {
+			const merged = { ...baseValue };
+			for (const [childKey, childOverride] of Object.entries(overrideValue)) {
+				const childBase = merged[childKey];
+				merged[childKey] = isJsonSchema(childBase) && isJsonSchema(childOverride) ? mergeTwo(childBase, childOverride) : childOverride;
+			}
+			result[key] = merged;
+		} else if (SCHEMA_ARRAY_CONCAT_KEYWORDS.has(key) && Array.isArray(baseValue) && Array.isArray(overrideValue)) result[key] = [...baseValue, ...overrideValue];
+		else if (SCHEMA_SINGLE_KEYWORDS.has(key) && isJsonSchema(baseValue) && isJsonSchema(overrideValue)) result[key] = mergeTwo(baseValue, overrideValue);
+		else result[key] = overrideValue;
+	}
+	return result;
+}
+/**
 * Merges multiple JSON Schemas into one.
 *
 * @remarks
-* This function takes multiple JSON Schemas or Schema wrappers and merges them into a single JSON Schema object. The merging process combines properties and metadata from all provided schemas, with later schemas in the arguments list taking precedence over earlier ones in case of conflicts. The resulting schema will include all unique properties and metadata from the input schemas.
+* This function takes multiple JSON Schemas or Schema wrappers and merges them
+* into a single JSON Schema object. Later schemas in the argument list take
+* precedence over earlier ones for scalar conflicts.
+*
+* Structured keywords are merged recursively:
+* - Named child schemas (`properties`, `$defs`, etc.) are merged
+*   per-property via recursive calls to `merge`.
+* - Composition arrays (`allOf`, `anyOf`, `oneOf`) are concatenated.
+* - Single-schema keywords (`if`, `then`, `else`, `not`, `items`, etc.)
+*   are merged recursively when both sides define them.
+* - `required` arrays are unioned and deduplicated.
 *
 * @param schemas - An array of JSON Schemas or Schema wrappers to merge.
 * @returns A new JSON Schema that is the result of merging all input schemas.
 */
 function merge(...schemas) {
-	let result = {};
-	for (const schema of schemas.reverse()) if (!result.type || result.type === schema.type) {
-		result = defu$1(result, getJsonSchema(schema));
-		if (isJsonSchemaObject(result)) result.required = getUnique(result.required ?? []);
-	}
-	return result;
+	const jsonSchemas = schemas.map((s) => getJsonSchema(s));
+	if (jsonSchemas.length === 0) return {};
+	return jsonSchemas.reduce((acc, schema) => {
+		const accType = acc.type;
+		const schemaType = schema.type;
+		if (accType && schemaType && accType !== schemaType) return schema;
+		return mergeTwo(acc, schema);
+	});
 }
 /**
 * Returns whether a JSON Schema fragment accepts `null`.