@rapidoc/prerender 0.1.2 → 0.1.3

package/dist/index.js

@@ -1335,20 +1335,128 @@ function mergePropertyExamples(obj, propertyName, propExamples) {
 	for (const exampleKey in obj) if (obj[exampleKey] && typeof obj[exampleKey] === "object") obj[exampleKey][propertyName] = propVal;
 	return obj;
 }
+var ANY_TRUE_KEYWORDS = /* @__PURE__ */ new Set([
+	"readOnly",
+	"writeOnly",
+	"deprecated",
+	"nullable"
+]);
+var FIRST_WINS_KEYWORDS = /* @__PURE__ */ new Set(["title", "description"]);
+var CONTENT_KEYWORDS = [
+	"type",
+	"properties",
+	"patternProperties",
+	"additionalProperties",
+	"items",
+	"enum",
+	"const",
+	"format"
+];
+var flattenedAllOf = /* @__PURE__ */ new WeakMap();
+function withoutKeys(obj, keys) {
+	const copy = { ...obj };
+	keys.forEach((key) => delete copy[key]);
+	return copy;
+}
+function pickKeys(obj, keys) {
+	const picked = {};
+	keys.forEach((key) => {
+		if (obj[key] !== void 0) picked[key] = obj[key];
+	});
+	return picked;
+}
+var allOfInProgress = /* @__PURE__ */ new Set();
+function mergeTwoSchemas(a, b) {
+	if (a === b || !a || typeof a !== "object") return b;
+	if (!b || typeof b !== "object") return a;
+	return flattenAllOf({ allOf: [a, b] });
+}
+function mergeSchemaKeywords(into, from, isOwn) {
+	for (const key in from) {
+		const value = from[key];
+		if (key === "allOf" || value === void 0 || key === "x-ref" && !isOwn) continue;
+		if (key === "required") {
+			if (Array.isArray(value)) into.required = [.../* @__PURE__ */ new Set([...into.required || [], ...value])];
+		} else if (key === "properties" || key === "patternProperties") {
+			const merged = { ...into[key] };
+			for (const name in value) merged[name] = name in merged ? mergeTwoSchemas(merged[name], value[name]) : value[name];
+			into[key] = merged;
+		} else if (key === "items" || key === "additionalProperties") into[key] = typeof into[key] === "object" && typeof value === "object" ? mergeTwoSchemas(into[key], value) : value;
+		else if (ANY_TRUE_KEYWORDS.has(key)) into[key] = Boolean(into[key] || value);
+		else if (FIRST_WINS_KEYWORDS.has(key)) {
+			if (value !== "" && (isOwn || into[key] === void 0)) into[key] = value;
+		} else into[key] = value;
+	}
+}
+/**
+* Applies an allOf the way JSON Schema does: every member, and the schema's own keywords, hold for the
+* value. Members are merged in order (nested allOf first), the schema's own keywords last, so they win.
+* A property defined more than once becomes one property (later keywords win), `required` is the union,
+* and readOnly/writeOnly/deprecated/nullable are set when any member sets them. title and description
+* come from the schema itself, otherwise from the first member that has them.
+*
+* oneOf/anyOf members stay options. A single one with nothing else to merge becomes the result's
+* oneOf/anyOf. Otherwise the result keeps an allOf of the merged object part followed by those
+* members, and none of them has an allOf of its own.
+* @param {object} schema - OpenAPI/JSON Schema object
+* @returns {object} The schema itself when it has no allOf, otherwise a new merged schema (cached)
+*/
+function flattenAllOf(schema) {
+	if (!schema || typeof schema !== "object" || !Array.isArray(schema.allOf)) return schema;
+	const cached = flattenedAllOf.get(schema);
+	if (cached) return cached;
+	if (allOfInProgress.has(schema)) return withoutKeys(schema, ["allOf"]);
+	allOfInProgress.add(schema);
+	try {
+		const merged = {};
+		const unions = [];
+		const members = [...schema.allOf, withoutKeys(schema, ["allOf"])];
+		members.forEach((member, i) => {
+			if (!member || typeof member !== "object") return;
+			const isOwn = i === members.length - 1;
+			const flat = flattenAllOf(member);
+			if (flat.allOf) {
+				mergeSchemaKeywords(merged, flat, isOwn);
+				unions.push(...flat.allOf.slice(1));
+			} else if (flat.oneOf || flat.anyOf) {
+				const optionKeys = [flat.oneOf ? "oneOf" : "anyOf", "discriminator"];
+				mergeSchemaKeywords(merged, withoutKeys(flat, optionKeys), isOwn);
+				unions.push(pickKeys(flat, [
+					...optionKeys,
+					"title",
+					"description"
+				]));
+			} else mergeSchemaKeywords(merged, flat, isOwn);
+		});
+		const hasContent = CONTENT_KEYWORDS.some((key) => merged[key] !== void 0);
+		if (merged.$ref && hasContent) delete merged.$ref;
+		let result = merged;
+		if (unions.length > 0) {
+			if (unions.length === 1 && !hasContent) result = {
+				...unions[0],
+				...merged
+			};
+			else result = {
+				...merged,
+				allOf: [pickKeys(merged, [...CONTENT_KEYWORDS, "required"]), ...unions]
+			};
+		}
+		flattenedAllOf.set(schema, result);
+		return result;
+	} finally {
+		allOfInProgress.delete(schema);
+	}
+}
+function isObjectLikeSchema(schema) {
+	return Boolean(schema.allOf || schema.type === "object" || schema.properties || schema.patternProperties || schema.additionalProperties && typeof schema.additionalProperties === "object");
+}
 function schemaToSampleObj(schema, config = {}, level = 0) {
 	let obj = {};
 	if (!schema || level > 8) return;
+	if (schema.allOf && !isObjectLikeSchema(flattenAllOf(schema))) schema = flattenAllOf(schema);
 	if (schema.allOf) {
 		const mergedObj = {};
-		if (schema.allOf.length === 1 && !schema.allOf[0]?.properties && !schema.allOf[0]?.items) {
-			if (schema.allOf[0].$ref) return { "example-0": {} };
-			if (schema.allOf[0].readOnly && config.includeReadOnly) {
-				const tempSchema = schema.allOf[0];
-				return { "example-0": getSampleValueByType(tempSchema) };
-			}
-			return;
-		}
-		schema.allOf.forEach((v) => {
+		[...schema.allOf, withoutKeys(schema, ["allOf"])].forEach((v) => {
 			if (!v) return;
 			if (v.type === "object" || v.properties || v.allOf || v.anyOf || v.oneOf) {
 				const partialSamples = schemaToSampleObj(v, config, level + 1);
@@ -1368,9 +1476,10 @@ function schemaToSampleObj(schema, config = {}, level = 0) {
 	} else if (schema.oneOf) {
 		const objWithSchemaProps = {};
 		if (schema.properties) for (const propertyName in schema.properties) {
-			const propSchema = schema.properties[propertyName];
+			const rawPropSchema = schema.properties[propertyName];
+			const propSchema = flattenAllOf(rawPropSchema);
 			if (propSchema?.properties || propSchema?.items) {
-				const propSamples = schemaToSampleObj(propSchema, config, level + 1);
+				const propSamples = schemaToSampleObj(rawPropSchema, config, level + 1);
 				objWithSchemaProps[propertyName] = propSamples?.["example-0"] ?? propSamples;
 			} else objWithSchemaProps[propertyName] = getSampleValueByType(propSchema);
 		}
@@ -1396,13 +1505,14 @@ function schemaToSampleObj(schema, config = {}, level = 0) {
 	} else if (schema.anyOf) {
 		let commonObj = { "example-0": {} };
 		if (schema.type === "object" || schema.properties) for (const propertyName in schema.properties) {
-			const propSchema = schema.properties[propertyName];
+			const rawPropSchema = schema.properties[propertyName];
+			const propSchema = flattenAllOf(rawPropSchema);
 			if (propSchema?.deprecated && !config.includeDeprecated) continue;
 			if (propSchema?.readOnly && !config.includeReadOnly) continue;
 			if (propSchema?.writeOnly && !config.includeWriteOnly) continue;
-			const propExample = getFirstExample(propSchema);
+			const propExample = getFirstExample(rawPropSchema);
 			if (propExample !== void 0) commonObj["example-0"][propertyName] = propExample;
-			else mergePropertyExamples(commonObj, propertyName, schemaToSampleObj(propSchema, config, level + 1));
+			else mergePropertyExamples(commonObj, propertyName, schemaToSampleObj(rawPropSchema, config, level + 1));
 		}
 		if (schema.anyOf.length > 0) {
 			const variantsToProcess = level === 0 ? schema.anyOf : [schema.anyOf[0]];
@@ -1430,7 +1540,8 @@ function schemaToSampleObj(schema, config = {}, level = 0) {
 		if (firstExample !== void 0) obj["example-0"] = firstExample;
 		else {
 			for (const propertyName in schema.properties) {
-				const propSchema = schema.properties[propertyName];
+				const rawPropSchema = schema.properties[propertyName];
+				const propSchema = flattenAllOf(rawPropSchema);
 				if (!propSchema) continue;
 				if (propSchema.deprecated && !config.includeDeprecated) continue;
 				if (propSchema.readOnly && !config.includeReadOnly) continue;
@@ -1450,7 +1561,7 @@ function schemaToSampleObj(schema, config = {}, level = 0) {
 					}
 					continue;
 				}
-				mergePropertyExamples(obj, propertyName, schemaToSampleObj(propSchema, config, level + 1));
+				mergePropertyExamples(obj, propertyName, schemaToSampleObj(rawPropSchema, config, level + 1));
 			}
 			if (typeof schema.additionalProperties === "object" && schema.additionalProperties !== null) {
 				const propName = schema.additionalProperties["x-additionalPropertiesName"] || "property";
@@ -1633,16 +1744,9 @@ function nodeToAST(schema, level, name, isRequired, suffix) {
 }
 function composeSchemaAST(schema, level, name, isRequired, suffix) {
 	if (schema.allOf) {
-		if (schema.allOf.length === 1 && !schema.allOf[0].properties && !schema.allOf[0].items) {
-			const mergedSchema = {
-				...schema.allOf[0],
-				...schema,
-				title: schema.title || schema.allOf[0].title || "",
-				description: schema.description || schema.allOf[0].description || ""
-			};
-			delete mergedSchema.allOf;
-			return schemaToAST(mergedSchema, level, name, isRequired);
-		}
+		const flat = flattenAllOf(schema);
+		if (!flat.allOf) return schemaToAST(flat, level, name, isRequired, suffix);
+		schema = flat;
 		const mergedProps = [];
 		const mergedPatternProps = [];
 		let mergedAdditionalProps = null;
@@ -1954,23 +2058,14 @@ function getSchemaFromParam(param) {
 	];
 }
 var EMPTY_ARRAY = Object.freeze([]);
-function getMergedProperties(schema, visited = /* @__PURE__ */ new Set()) {
-	if (!schema || typeof schema !== "object" || visited.has(schema)) return {};
-	visited.add(schema);
-	const properties = { ...schema.properties };
-	if (Array.isArray(schema.allOf)) schema.allOf.forEach((sub) => {
-		Object.assign(properties, getMergedProperties(sub, visited));
-	});
-	return properties;
-}
-function getMergedRequired(schema, visited = /* @__PURE__ */ new Set()) {
-	if (!schema || typeof schema !== "object" || visited.has(schema)) return [];
-	visited.add(schema);
-	const required = Array.isArray(schema.required) ? [...schema.required] : [];
-	if (Array.isArray(schema.allOf)) schema.allOf.forEach((sub) => {
-		required.push(...getMergedRequired(sub, visited));
-	});
-	return [...new Set(required)];
+function getMergedProperties(schema) {
+	if (!schema || typeof schema !== "object") return {};
+	return { ...flattenAllOf(schema).properties };
+}
+function getMergedRequired(schema) {
+	if (!schema || typeof schema !== "object") return [];
+	const { required } = flattenAllOf(schema);
+	return Array.isArray(required) ? [...required] : [];
 }
 // ../rapidoc/src/utils/url-utils.js
 /**
@@ -9443,10 +9538,10 @@ function expandCollapseNavBarTag(navLinkEl, action = "toggle") {
 		const isExpanded = tagAndPathEl.classList.contains("expanded");
 		if (isExpanded && (action === "toggle" || action === "collapse")) {
 			tagAndPathEl.classList.replace("expanded", "collapsed");
-			tagAndPathEl.querySelector(".nav-bar-tag")?.setAttribute("aria-expanded", "false");
+			tagAndPathEl.querySelector(".nav-bar-tag-icon")?.setAttribute("aria-expanded", "false");
 		} else if (!isExpanded && (action === "toggle" || action === "expand")) {
 			tagAndPathEl.classList.replace("collapsed", "expanded");
-			tagAndPathEl.querySelector(".nav-bar-tag")?.setAttribute("aria-expanded", "true");
+			tagAndPathEl.querySelector(".nav-bar-tag-icon")?.setAttribute("aria-expanded", "true");
 		}
 	}
 }
@@ -9497,9 +9592,11 @@ function expandCollapseAll$1(event, action = "expand-all") {
 	const elList = [...navEl.querySelectorAll(".nav-bar-tag-and-paths")];
 	if (action === "expand-all") elList.forEach((el) => {
 		el.classList.replace("collapsed", "expanded");
+		el.querySelector(".nav-bar-tag-icon")?.setAttribute("aria-expanded", "true");
 	});
 	else elList.forEach((el) => {
 		el.classList.replace("expanded", "collapsed");
+		el.querySelector(".nav-bar-tag-icon")?.setAttribute("aria-expanded", "false");
 	});
 }
 function navBarClickAndEnterHandler(event) {
@@ -9694,14 +9791,20 @@ function navbarTemplate() {
                 class="nav-bar-tag"
                 part="section-navbar-item section-navbar-tag"
                 id="link-${tag.elementId}"
-                data-action="expand-collapse-tag"
+                data-action="navigate"
+                data-content-id="${tag.elementId}"
                 data-first-path-id="${firstPathId}"
                 tabindex="0"
-                role="button"
-                aria-expanded="${tag.expanded ? "true" : "false"}"
               >
                 <div class="nav-bar-tag-title">${tag.displayName || tag.name}</div>
-                <div class="nav-bar-tag-icon" tabindex="0" data-action="expand-collapse-tag"></div>
+                <div
+                  class="nav-bar-tag-icon"
+                  tabindex="0"
+                  role="button"
+                  aria-label="Expand or collapse ${tag.displayName || tag.name}"
+                  aria-expanded="${tag.expanded ? "true" : "false"}"
+                  data-action="expand-collapse-tag"
+                ></div>
               </div>
               ${this.infoDescriptionHeadingsInNavBar === "true" ? html` <div class="tag-headers">
                       ${(() => {
@@ -13442,7 +13545,7 @@ function bindNavBar(sidebar, rapiDoc, options = {}) {
 		else if (action === "navigate" || navEl.classList.contains("nav-bar-path") || navEl.classList.contains("nav-bar-info")) {
 			const href = navEl.getAttribute("href") || navEl.getAttribute("data-tag-href");
 			const hashIdx = href ? href.indexOf("#") : -1;
-			const elementId = (hashIdx !== -1 ? href.substring(hashIdx + 1) : href) || navEl.getAttribute("data-content-id") || navEl.getAttribute("data-op-slug") || navEl.id?.replace(/^link-/, "");
+			const elementId = (hashIdx !== -1 ? href.substring(hashIdx + 1) : "") || navEl.getAttribute("data-content-id") || navEl.getAttribute("data-op-slug") || navEl.id?.replace(/^link-/, "");
 			if (elementId && rapiDocEl && typeof rapiDocEl.scrollToPath === "function") {
 				e.preventDefault();
 				setActiveNavId(elementId, false);
@@ -13704,9 +13807,8 @@ function renderTag(tag, ctx) {
 	const isExpanded = tag.expanded !== false;
 	const pathsHtml = visiblePaths.map((op) => renderOperation(op, tagSlug, ctx)).join("");
 	const tagHref = ctx.routingMode === "tag-pages" && tagSlug && tagSlug !== "general" ? `${ctx.cleanBase}/${tagSlug}` : `${ctx.basePath}#${elementId}`;
-	if (tag.descriptionOnly) {
-		const isActive = Boolean(ctx.activeHref && (ctx.activeHref === tagHref || ctx.activeHref.endsWith(`#${elementId}`)));
-		return `
+	const isActive = Boolean(ctx.activeHref && (ctx.activeHref === tagHref || ctx.activeHref.endsWith(`#${elementId}`)));
+	if (tag.descriptionOnly) return `
     <div class="nav-bar-tag-and-paths description-only">
       <a
         href="${escapeHtml(tagHref)}"
@@ -13720,21 +13822,26 @@ function renderTag(tag, ctx) {
         <span class="nav-bar-tag-title">${escapeHtml(title)}</span>
       </a>
     </div>`;
-	}
 	return `
-    <div class="nav-bar-tag-and-paths ${isExpanded ? "expanded" : "collapsed"}" id="link-${elementId}">
+    <div class="nav-bar-tag-and-paths ${isExpanded ? "expanded" : "collapsed"}">
       <div
-        class="nav-bar-tag"
+        class="nav-bar-tag${isActive ? " active" : ""}"
         part="section-navbar-item section-navbar-tag"
-        id="link-${elementId}-header"
-        data-action="expand-collapse-tag"
+        id="link-${elementId}"
+        data-action="navigate"
+        data-content-id="${elementId}"
         data-tag-href="${escapeHtml(tagHref)}"
         tabindex="0"
-        role="button"
-        aria-expanded="${isExpanded ? "true" : "false"}"
       >
-        <div class="nav-bar-tag-title" data-tag-href="${escapeHtml(tagHref)}">${escapeHtml(title)}</div>
-        <div class="nav-bar-tag-icon" tabindex="0" data-action="expand-collapse-tag"></div>
+        <div class="nav-bar-tag-title">${escapeHtml(title)}</div>
+        <div
+          class="nav-bar-tag-icon"
+          tabindex="0"
+          role="button"
+          aria-label="Expand or collapse ${escapeHtml(title)}"
+          aria-expanded="${isExpanded ? "true" : "false"}"
+          data-action="expand-collapse-tag"
+        ></div>
       </div>
       <div class="nav-bar-paths-under-tag">
         ${pathsHtml}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@rapidoc/prerender",
-  "version": "0.1.2",
+  "version": "0.1.3",
   "description": "Renders RapiDoc API documentation to HTML at build time: pre-rendered <rapi-doc> (Declarative Shadow DOM or light DOM), sidebar navigation, Arazzo diagrams",
   "keywords": [
     "api-documentation",