@effected/schemastore 0.15.2 → 0.16.1

package/StoreDocument.js

@@ -128,6 +128,52 @@ const restoreDefsRefs = (node, depth) => {
 	}
 	return node;
 };
+const SCHEMA_KEYWORDS = /* @__PURE__ */ new Set([
+	"items",
+	"additionalItems",
+	"contains",
+	"additionalProperties",
+	"propertyNames",
+	"not",
+	"if",
+	"then",
+	"else"
+]);
+const SCHEMA_ARRAY_KEYWORDS = /* @__PURE__ */ new Set([
+	"allOf",
+	"anyOf",
+	"oneOf"
+]);
+const SCHEMA_MAP_KEYWORDS = /* @__PURE__ */ new Set([
+	"properties",
+	"patternProperties",
+	"definitions",
+	"$defs",
+	"dependencies"
+]);
+const isPlainObject = (value) => typeof value === "object" && value !== null && !Array.isArray(value);
+const collapseSchemaMap = (node, depth) => {
+	if (!isPlainObject(node)) return node;
+	const out = Object.create(null);
+	for (const [key, value] of Object.entries(node)) out[key] = isPlainObject(value) ? collapseUniformTuples(value, depth + 1) : value;
+	return out;
+};
+const collapseUniformTuples = (node, depth) => {
+	if (depth >= 256) throw new RewriteDepthExceeded();
+	if (!isPlainObject(node)) return node;
+	const out = Object.create(null);
+	for (const [key, value] of Object.entries(node)) if (SCHEMA_KEYWORDS.has(key)) out[key] = Array.isArray(value) ? value.map((item) => collapseUniformTuples(item, depth + 1)) : collapseUniformTuples(value, depth + 1);
+	else if (SCHEMA_ARRAY_KEYWORDS.has(key) && Array.isArray(value)) out[key] = value.map((item) => collapseUniformTuples(item, depth + 1));
+	else if (SCHEMA_MAP_KEYWORDS.has(key)) out[key] = collapseSchemaMap(value, depth + 1);
+	else out[key] = value;
+	const tuple = out.items;
+	const rest = out.additionalItems;
+	if (Array.isArray(tuple) && tuple.length > 0 && isPlainObject(rest) && tuple.every((element) => CanonicalJson.equals(element, rest))) {
+		out.items = rest;
+		delete out.additionalItems;
+	}
+	return out;
+};
 /**
 * A SchemaStore-shaped Draft-07 JSON Schema document assembled from an
 * Effect Schema source: `$schema` (the Draft-07 meta-schema) + `$id` + the
@@ -137,9 +183,11 @@ const restoreDefsRefs = (node, depth) => {
 * `Schema.toJsonSchemaDocument` (Draft 2020-12), core's
 * `JsonSchema.toDocumentDraft07` lowering, the `#/definitions` →
 * `#/$defs` `$ref` rewrite the lowering makes necessary — so every `$ref`
-* in a built document already resolves against the `$defs` pool — and the
-* gate that holds the document's non-standard surface to the declared
-* keyword families ({@link KeywordFamilies}). The package owns assembly and
+* in a built document already resolves against the `$defs` pool — the
+* uniform-tuple collapse that keeps open-ended `NonEmptyArray`-shaped
+* arrays publishable through the strict ajv gate (#818), and the gate that
+* holds the document's non-standard surface to the declared keyword
+* families ({@link KeywordFamilies}). The package owns assembly and
 * publication shape, not a JSON Schema engine.
 *
 * Annotated declared-family keys survive into the built document because
@@ -148,7 +196,12 @@ const restoreDefsRefs = (node, depth) => {
 * (2020-12 `prefixItems[i]` → Draft-07 `items[i]`, trailing `items` →
 * `additionalItems`). This package therefore does no re-grafting of its
 * own; it only declines to rewrite `$ref`-shaped strings *inside* those
-* opaque payloads.
+* opaque payloads. The one structural normalization it does own is the
+* uniform-tuple collapse: when every tuple element is content-equal to the
+* open rest schema — always true for `NonEmptyArray` — the tuple is
+* rewritten to a single-schema `items` with core's `minItems` untouched,
+* the shape ajv's strictTuples rule accepts; a heterogeneous head keeps the
+* tuple form.
 *
 * @public
 */
@@ -220,9 +273,9 @@ var StoreDocument = class StoreDocument extends Schema.Class("StoreDocument")({
 				keys: [...undeclared].sort()
 			}));
 			const lowered = JsonSchema.toDocumentDraft07(document);
-			const root = restoreDefsRefs(lowered.schema, 0);
+			const root = collapseUniformTuples(restoreDefsRefs(lowered.schema, 0), 0);
 			const defs = Object.create(null);
-			for (const [name, definition] of Object.entries(lowered.definitions)) defs[name] = restoreDefsRefs(definition, 1);
+			for (const [name, definition] of Object.entries(lowered.definitions)) defs[name] = collapseUniformTuples(restoreDefsRefs(definition, 1), 1);
 			if (options.rootAnnotations !== void 0) applyRootAnnotations(root, defs, options.rootAnnotations);
 			return Result.succeed(StoreDocument.make({
 				$schema: DRAFT_07_META_SCHEMA,

package/index.d.ts

@@ -339,9 +339,11 @@ declare const StoreDocument_base: Schema.Class<StoreDocument, Schema.Struct<{
  * `Schema.toJsonSchemaDocument` (Draft 2020-12), core's
  * `JsonSchema.toDocumentDraft07` lowering, the `#/definitions` →
  * `#/$defs` `$ref` rewrite the lowering makes necessary — so every `$ref`
- * in a built document already resolves against the `$defs` pool — and the
- * gate that holds the document's non-standard surface to the declared
- * keyword families ({@link KeywordFamilies}). The package owns assembly and
+ * in a built document already resolves against the `$defs` pool — the
+ * uniform-tuple collapse that keeps open-ended `NonEmptyArray`-shaped
+ * arrays publishable through the strict ajv gate (#818), and the gate that
+ * holds the document's non-standard surface to the declared keyword
+ * families ({@link KeywordFamilies}). The package owns assembly and
  * publication shape, not a JSON Schema engine.
  *
  * Annotated declared-family keys survive into the built document because
@@ -350,7 +352,12 @@ declare const StoreDocument_base: Schema.Class<StoreDocument, Schema.Struct<{
  * (2020-12 `prefixItems[i]` → Draft-07 `items[i]`, trailing `items` →
  * `additionalItems`). This package therefore does no re-grafting of its
  * own; it only declines to rewrite `$ref`-shaped strings *inside* those
- * opaque payloads.
+ * opaque payloads. The one structural normalization it does own is the
+ * uniform-tuple collapse: when every tuple element is content-equal to the
+ * open rest schema — always true for `NonEmptyArray` — the tuple is
+ * rewritten to a single-schema `items` with core's `minItems` untouched,
+ * the shape ajv's strictTuples rule accepts; a heterogeneous head keeps the
+ * tuple form.
  *
  * @public
  */

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@effected/schemastore",
-	"version": "0.15.2",
+	"version": "0.16.1",
 	"private": false,
 	"description": "Build, validate, version and publish SchemaStore-shaped Draft-07 JSON Schema documents from Effect Schema sources: document assembly, ajv strict-mode validation, structural lints, catalog entries, canonical JSON and a content-comparing emit pipeline.",
 	"keywords": [
@@ -38,10 +38,10 @@
 		"./package.json": "./package.json"
 	},
 	"dependencies": {
-		"@effected/semver": "^0.9.0"
+		"@effected/semver": "^0.10.1"
 	},
 	"peerDependencies": {
-		"effect": "4.0.0-rc.117"
+		"effect": "4.0.0-rc.118"
 	},
 	"engines": {
 		"node": ">=24.11.0"