@trpc/openapi 11.15.1-alpha → 11.15.2-canary.2

package/dist/index.cjs

@@ -1,4 +1,5 @@
 const require_objectSpread2$1 = require('./objectSpread2-Cw30I7tb.cjs');
+const node_fs = require_objectSpread2$1.__toESM(require("node:fs"));
 const node_path = require_objectSpread2$1.__toESM(require("node:path"));
 const typescript = require_objectSpread2$1.__toESM(require("typescript"));
 const node_url = require_objectSpread2$1.__toESM(require("node:url"));
@@ -42,8 +43,7 @@ const wrapperDefTypes = new Set([
 	"readonly",
 	"pipe",
 	"transform",
-	"promise",
-	"lazy"
+	"promise"
 ]);
 /**
 * Extract the wrapped inner schema from a wrapper def.
@@ -85,13 +85,22 @@ function extractZodDescriptions(schema) {
 	}
 	walkZodShape(schema, "", {
 		registry,
-		map
+		map,
+		seenLazy: /* @__PURE__ */ new Set()
 	});
 	if (map.properties.size > 0) hasAny = true;
 	return hasAny ? map : null;
 }
 function walkZodShape(schema, prefix, ctx) {
 	const unwrapped = unwrapZodSchema(schema);
+	const def = unwrapped._zod.def;
+	if (def.type === "lazy" && "getter" in def) {
+		if (ctx.seenLazy.has(unwrapped)) return;
+		ctx.seenLazy.add(unwrapped);
+		const inner = def.getter();
+		if (isZodSchema(inner)) walkZodShape(inner, prefix, ctx);
+		return;
+	}
 	const element = zodArrayElement(unwrapped);
 	if (element) {
 		var _elemMeta$description;
@@ -192,35 +201,80 @@ function isProcedure(value) {
 * Overlay description strings from a `DescriptionMap` onto an existing
 * JSON schema produced by the TypeScript type checker.  Mutates in place.
 */
-function applyDescriptions(schema, descs) {
+function applyDescriptions(schema, descs, schemas) {
 	if (descs.self) schema.description = descs.self;
-	for (const [propPath, description] of descs.properties) setNestedDescription(schema, propPath.split("."), description);
+	for (const [propPath, description] of descs.properties) setNestedDescription({
+		schema,
+		pathParts: propPath.split("."),
+		description,
+		schemas
+	});
+}
+function resolveSchemaRef(schema, schemas) {
+	var _schemas$refName;
+	const ref = schema.$ref;
+	if (!ref) return schema;
+	if (!schemas || !ref.startsWith("#/components/schemas/")) return null;
+	const refName = ref.slice(21);
+	return refName ? (_schemas$refName = schemas[refName]) !== null && _schemas$refName !== void 0 ? _schemas$refName : null : null;
+}
+function getArrayItemsSchema(schema) {
+	const items = schema.items;
+	if (schema.type !== "array" || items == null || items === false) return null;
+	return items;
 }
-function setNestedDescription(schema, pathParts, description) {
-	var _schema$properties;
+function getPropertySchema(schema, propertyName) {
+	var _schema$properties$pr, _schema$properties;
+	return (_schema$properties$pr = (_schema$properties = schema.properties) === null || _schema$properties === void 0 ? void 0 : _schema$properties[propertyName]) !== null && _schema$properties$pr !== void 0 ? _schema$properties$pr : null;
+}
+function setLeafDescription(schema, description) {
+	if (schema.$ref) {
+		var _schema$allOf;
+		const ref = schema.$ref;
+		delete schema.$ref;
+		schema.allOf = [{ $ref: ref }, ...(_schema$allOf = schema.allOf) !== null && _schema$allOf !== void 0 ? _schema$allOf : []];
+	}
+	schema.description = description;
+}
+function setNestedDescription({ schema, pathParts, description, schemas }) {
 	if (pathParts.length === 0) return;
 	const [head, ...rest] = pathParts;
 	if (!head) return;
 	if (head === "[]") {
-		const items = schema.type === "array" && schema.items && typeof schema.items === "object" ? schema.items : null;
+		const items = getArrayItemsSchema(schema);
 		if (!items) return;
-		if (rest.length === 0) items.description = description;
-		else setNestedDescription(items, rest, description);
+		if (rest.length === 0) setLeafDescription(items, description);
+		else {
+			var _resolveSchemaRef;
+			const target = (_resolveSchemaRef = resolveSchemaRef(items, schemas)) !== null && _resolveSchemaRef !== void 0 ? _resolveSchemaRef : items;
+			setNestedDescription({
+				schema: target,
+				pathParts: rest,
+				description,
+				schemas
+			});
+		}
 		return;
 	}
-	const propSchema = (_schema$properties = schema.properties) === null || _schema$properties === void 0 ? void 0 : _schema$properties[head];
-	if (!propSchema || typeof propSchema !== "object") return;
-	if (rest.length === 0) propSchema.description = description;
+	const propSchema = getPropertySchema(schema, head);
+	if (!propSchema) return;
+	if (rest.length === 0) setLeafDescription(propSchema, description);
 	else {
-		const target = propSchema.type === "array" && propSchema.items && typeof propSchema.items === "object" ? propSchema.items : propSchema;
-		setNestedDescription(target, rest, description);
+		var _getArrayItemsSchema, _resolveSchemaRef2;
+		const target = (_getArrayItemsSchema = getArrayItemsSchema(propSchema)) !== null && _getArrayItemsSchema !== void 0 ? _getArrayItemsSchema : propSchema;
+		const resolvedTarget = (_resolveSchemaRef2 = resolveSchemaRef(target, schemas)) !== null && _resolveSchemaRef2 !== void 0 ? _resolveSchemaRef2 : target;
+		setNestedDescription({
+			schema: resolvedTarget,
+			pathParts: rest,
+			description,
+			schemas
+		});
 	}
 }
 
 //#endregion
 //#region src/generate.ts
 var import_objectSpread2 = require_objectSpread2$1.__toESM(require_objectSpread2$1.require_objectSpread2(), 1);
-const log = console;
 const PRIMITIVE_FLAGS = typescript.TypeFlags.String | typescript.TypeFlags.Number | typescript.TypeFlags.Boolean | typescript.TypeFlags.StringLiteral | typescript.TypeFlags.NumberLiteral | typescript.TypeFlags.BooleanLiteral;
 function hasFlag(type, flag) {
 	return (type.getFlags() & flag) !== 0;
@@ -252,6 +306,7 @@ const ANONYMOUS_NAMES = new Set([
 	"Object",
 	""
 ]);
+const INTERNAL_COMPUTED_PROPERTY_SYMBOL = /^__@.*@\d+$/;
 /** Try to determine a meaningful name for a TS type (type alias or interface). */
 function getTypeName(type) {
 	var _type$aliasSymbol, _type$getSymbol;
@@ -261,6 +316,21 @@ function getTypeName(type) {
 	if (symName && !ANONYMOUS_NAMES.has(symName) && !symName.startsWith("__")) return symName;
 	return null;
 }
+function shouldSkipPropertySymbol(prop) {
+	var _prop$declarations$so, _prop$declarations;
+	return (_prop$declarations$so = (_prop$declarations = prop.declarations) === null || _prop$declarations === void 0 ? void 0 : _prop$declarations.some((declaration) => {
+		const declarationName = typescript.getNameOfDeclaration(declaration);
+		if (!declarationName || !typescript.isComputedPropertyName(declarationName)) return false;
+		return INTERNAL_COMPUTED_PROPERTY_SYMBOL.test(prop.getName());
+	})) !== null && _prop$declarations$so !== void 0 ? _prop$declarations$so : false;
+}
+function getReferencedSchema(schema, schemas) {
+	var _schemas$refName;
+	const ref = schema === null || schema === void 0 ? void 0 : schema.$ref;
+	if (!(ref === null || ref === void 0 ? void 0 : ref.startsWith("#/components/schemas/"))) return schema;
+	const refName = ref.slice(21);
+	return refName ? (_schemas$refName = schemas[refName]) !== null && _schemas$refName !== void 0 ? _schemas$refName : null : schema;
+}
 function ensureUniqueName(name, existing) {
 	if (!(name in existing)) return name;
 	let i = 2;
@@ -270,6 +340,9 @@ function ensureUniqueName(name, existing) {
 function schemaRef(name) {
 	return { $ref: `#/components/schemas/${name}` };
 }
+function isSelfSchemaRef(schema, name) {
+	return schema.$ref === schemaRef(name).$ref;
+}
 function isNonEmptySchema(s) {
 	for (const _ in s) return true;
 	return false;
@@ -278,21 +351,28 @@ function isNonEmptySchema(s) {
 * Convert a TS type to a JSON Schema.  If the type has been pre-registered
 * (or has a meaningful TS name), it is stored in `ctx.schemas` and a `$ref`
 * is returned instead of an inline schema.
+*
+* Named types (type aliases, interfaces) are auto-registered before conversion
+* so that recursive references (including through unions and intersections)
+* resolve to a `$ref` instead of causing infinite recursion.
 */
 function typeToJsonSchema(type, ctx, depth = 0) {
-	if (depth > 20) {
-		log.warn(`[openapi] Schema conversion reached maximum depth (20) for type "${ctx.checker.typeToString(type)}". The resulting schema will be incomplete.`);
-		return {};
-	}
-	const refName = ctx.typeToRef.get(type);
-	if (refName) {
-		if (refName in ctx.schemas) return schemaRef(refName);
-		ctx.schemas[refName] = {};
+	const existingRef = ctx.typeToRef.get(type);
+	if (existingRef) {
+		const storedSchema = ctx.schemas[existingRef];
+		if (storedSchema && (isNonEmptySchema(storedSchema) || ctx.visited.has(type))) return schemaRef(existingRef);
+		ctx.schemas[existingRef] = storedSchema !== null && storedSchema !== void 0 ? storedSchema : {};
 		const schema$1 = convertTypeToSchema(type, ctx, depth);
-		ctx.schemas[refName] = schema$1;
-		return schemaRef(refName);
+		if (!isSelfSchemaRef(schema$1, existingRef)) ctx.schemas[existingRef] = schema$1;
+		return schemaRef(existingRef);
 	}
 	const schema = convertTypeToSchema(type, ctx, depth);
+	const postConvertRef = ctx.typeToRef.get(type);
+	if (postConvertRef) {
+		const stored = ctx.schemas[postConvertRef];
+		if (stored && !isNonEmptySchema(stored) && !isSelfSchemaRef(schema, postConvertRef)) ctx.schemas[postConvertRef] = schema;
+		return schemaRef(postConvertRef);
+	}
 	if (!schema.description && !schema.$ref && type.aliasSymbol) {
 		const aliasJsDoc = getJsDocComment(type.aliasSymbol, ctx.checker);
 		if (aliasJsDoc) schema.description = aliasJsDoc;
@@ -509,6 +589,7 @@ function convertPlainObject(type, ctx, depth) {
 	const properties = {};
 	const required = [];
 	for (const prop of typeProps) {
+		if (shouldSkipPropertySymbol(prop)) continue;
 		const propType = checker.getTypeOfSymbol(prop);
 		const propSchema = typeToJsonSchema(propType, ctx, depth + 1);
 		const jsDoc = getJsDocComment(prop, checker);
@@ -542,8 +623,18 @@ function convertTypeToSchema(type, ctx, depth) {
 	const flags = type.getFlags();
 	const primitive = convertPrimitiveOrLiteral(type, flags, ctx.checker);
 	if (primitive) return primitive;
-	if (type.isUnion()) return convertUnionType(type, ctx, depth);
-	if (type.isIntersection()) return convertIntersectionType(type, ctx, depth);
+	if (type.isUnion()) {
+		ctx.visited.add(type);
+		const result = convertUnionType(type, ctx, depth);
+		ctx.visited.delete(type);
+		return result;
+	}
+	if (type.isIntersection()) {
+		ctx.visited.add(type);
+		const result = convertIntersectionType(type, ctx, depth);
+		ctx.visited.delete(type);
+		return result;
+	}
 	if (isObjectType(type)) return convertObjectType(type, ctx, depth);
 	return {};
 }
@@ -566,7 +657,69 @@ function isVoidLikeInput(inputType) {
 	const isUnionOfVoids = inputType.isUnion() && inputType.types.every((t) => hasFlag(t, typescript.TypeFlags.Void | typescript.TypeFlags.Undefined));
 	return isUnionOfVoids;
 }
+function shouldIncludeProcedureInOpenAPI(type) {
+	return type !== "subscription";
+}
+function getProcedureInputTypeName(type, path) {
+	const directName = getTypeName(type);
+	if (directName) return directName;
+	for (const sym of [type.aliasSymbol, type.getSymbol()].filter((candidate) => !!candidate)) {
+		var _sym$declarations;
+		for (const declaration of (_sym$declarations = sym.declarations) !== null && _sym$declarations !== void 0 ? _sym$declarations : []) {
+			var _ts$getNameOfDeclarat;
+			const declarationName = (_ts$getNameOfDeclarat = typescript.getNameOfDeclaration(declaration)) === null || _ts$getNameOfDeclarat === void 0 ? void 0 : _ts$getNameOfDeclarat.getText();
+			if (declarationName && !ANONYMOUS_NAMES.has(declarationName) && !declarationName.startsWith("__")) return declarationName;
+		}
+	}
+	const fallbackName = path.split(".").filter(Boolean).map((segment) => segment.split(/[^A-Za-z0-9]+/).filter(Boolean).map((part) => part.charAt(0).toUpperCase() + part.slice(1)).join("")).join("");
+	return `${fallbackName || "Procedure"}Input`;
+}
+function isUnknownLikeType(type) {
+	return hasFlag(type, typescript.TypeFlags.Unknown | typescript.TypeFlags.Any);
+}
+function isCollapsedProcedureInputType(type) {
+	return isUnknownLikeType(type) || isObjectType(type) && type.getProperties().length === 0 && !type.getStringIndexType();
+}
+function recoverProcedureInputType(def, checker) {
+	var _def$symbol$declarati;
+	let initializer = null;
+	for (const declaration of (_def$symbol$declarati = def.symbol.declarations) !== null && _def$symbol$declarati !== void 0 ? _def$symbol$declarati : []) {
+		if (typescript.isPropertyAssignment(declaration)) {
+			initializer = declaration.initializer;
+			break;
+		}
+		if (typescript.isVariableDeclaration(declaration) && declaration.initializer) {
+			initializer = declaration.initializer;
+			break;
+		}
+	}
+	if (!initializer) return null;
+	let recovered = null;
+	const visit = (expr) => {
+		if (!typescript.isCallExpression(expr)) return;
+		const callee = expr.expression;
+		if (!typescript.isPropertyAccessExpression(callee)) return;
+		visit(callee.expression);
+		if (callee.name.text !== "input") return;
+		const [parserExpr] = expr.arguments;
+		if (!parserExpr) return;
+		const parserType = checker.getTypeAtLocation(parserExpr);
+		const standardSym = parserType.getProperty("~standard");
+		if (!standardSym) return;
+		const standardType = checker.getTypeOfSymbolAtLocation(standardSym, parserExpr);
+		const typesSym = standardType.getProperty("types");
+		if (!typesSym) return;
+		const typesType = checker.getNonNullableType(checker.getTypeOfSymbolAtLocation(typesSym, parserExpr));
+		const outputSym = typesType.getProperty("output");
+		if (!outputSym) return;
+		const outputType = checker.getTypeOfSymbolAtLocation(outputSym, parserExpr);
+		if (!isUnknownLikeType(outputType)) recovered = outputType;
+	};
+	visit(initializer);
+	return recovered;
+}
 function extractProcedure(def, ctx) {
+	var _recoverProcedureInpu;
 	const { schemaCtx } = ctx;
 	const { checker } = schemaCtx;
 	const $typesSym = def.defType.getProperty("$types");
@@ -576,12 +729,29 @@ function extractProcedure(def, ctx) {
 	const outputSym = $typesType.getProperty("output");
 	const inputType = inputSym ? checker.getTypeOfSymbol(inputSym) : null;
 	const outputType = outputSym ? checker.getTypeOfSymbol(outputSym) : null;
-	const inputSchema = !inputType || isVoidLikeInput(inputType) ? null : typeToJsonSchema(inputType, schemaCtx);
+	const resolvedInputType = inputType && isCollapsedProcedureInputType(inputType) ? (_recoverProcedureInpu = recoverProcedureInputType(def, checker)) !== null && _recoverProcedureInpu !== void 0 ? _recoverProcedureInpu : inputType : inputType;
+	let inputSchema = null;
+	if (!resolvedInputType || isVoidLikeInput(resolvedInputType)) {} else {
+		const ensureRecoveredInputRegistration = (type) => {
+			if (schemaCtx.typeToRef.has(type)) return;
+			const refName = ensureUniqueName(getProcedureInputTypeName(type, def.path), schemaCtx.schemas);
+			schemaCtx.typeToRef.set(type, refName);
+			schemaCtx.schemas[refName] = {};
+		};
+		if (resolvedInputType !== inputType) ensureRecoveredInputRegistration(resolvedInputType);
+		const initialSchema = typeToJsonSchema(resolvedInputType, schemaCtx);
+		if (!isNonEmptySchema(initialSchema) && !schemaCtx.typeToRef.has(resolvedInputType)) {
+			ensureRecoveredInputRegistration(resolvedInputType);
+			inputSchema = typeToJsonSchema(resolvedInputType, schemaCtx);
+		} else inputSchema = initialSchema;
+	}
 	const outputSchema = outputType ? typeToJsonSchema(outputType, schemaCtx) : null;
 	const runtimeDescs = ctx.runtimeDescriptions.get(def.path);
 	if (runtimeDescs) {
-		if (inputSchema && runtimeDescs.input) applyDescriptions(inputSchema, runtimeDescs.input);
-		if (outputSchema && runtimeDescs.output) applyDescriptions(outputSchema, runtimeDescs.output);
+		const resolvedInputSchema = getReferencedSchema(inputSchema, schemaCtx.schemas);
+		const resolvedOutputSchema = getReferencedSchema(outputSchema, schemaCtx.schemas);
+		if (resolvedInputSchema && runtimeDescs.input) applyDescriptions(resolvedInputSchema, runtimeDescs.input, schemaCtx.schemas);
+		if (resolvedOutputSchema && runtimeDescs.output) applyDescriptions(resolvedOutputSchema, runtimeDescs.output, schemaCtx.schemas);
 	}
 	ctx.procedures.push({
 		path: def.path,
@@ -593,13 +763,33 @@ function extractProcedure(def, ctx) {
 }
 /** Extract the JSDoc comment text from a symbol, if any. */
 function getJsDocComment(sym, checker) {
+	var _sym$declarations2;
+	const isWithinPath = (candidate, parent) => {
+		const rel = node_path.relative(parent, candidate);
+		return rel !== "" && !rel.startsWith("..") && !node_path.isAbsolute(rel);
+	};
+	const normalize = (filePath) => filePath.replace(/\\/g, "/");
+	const workspaceRoot = normalize(process.cwd());
+	const declarations = (_sym$declarations2 = sym.declarations) !== null && _sym$declarations2 !== void 0 ? _sym$declarations2 : [];
+	const isExternalNodeModulesDeclaration = declarations.length > 0 && declarations.every((declaration) => {
+		const sourceFile = declaration.getSourceFile();
+		if (!sourceFile.isDeclarationFile) return false;
+		const declarationPath = normalize(sourceFile.fileName);
+		if (!declarationPath.includes("/node_modules/")) return false;
+		try {
+			const realPath = normalize(node_fs.realpathSync.native(sourceFile.fileName));
+			if (isWithinPath(realPath, workspaceRoot) && !realPath.includes("/node_modules/")) return false;
+		} catch (_unused) {}
+		return true;
+	});
+	if (isExternalNodeModulesDeclaration) return void 0;
 	const parts = sym.getDocumentationComment(checker);
 	if (parts.length === 0) return void 0;
 	const text = parts.map((p) => p.text).join("");
 	return text || void 0;
 }
 function walkType(opts) {
-	const { type, ctx, currentPath, description } = opts;
+	const { type, ctx, currentPath, description, symbol } = opts;
 	if (ctx.seen.has(type)) return;
 	const defSym = type.getProperty("_def");
 	if (!defSym) {
@@ -614,11 +804,14 @@ function walkType(opts) {
 	const defType = checker.getTypeOfSymbol(defSym);
 	const procedureTypeName = getProcedureTypeName(defType, checker);
 	if (procedureTypeName) {
+		var _ref;
+		if (!shouldIncludeProcedureInOpenAPI(procedureTypeName)) return;
 		extractProcedure({
 			defType,
 			typeName: procedureTypeName,
 			path: currentPath,
-			description
+			description,
+			symbol: (_ref = symbol !== null && symbol !== void 0 ? symbol : type.getSymbol()) !== null && _ref !== void 0 ? _ref : defSym
 		}, ctx);
 		return;
 	}
@@ -642,7 +835,8 @@ function walkRecord(recordType, ctx, prefix) {
 			type: propType,
 			ctx,
 			currentPath: fullPath,
-			description
+			description,
+			symbol: prop
 		});
 	}
 }
@@ -720,8 +914,9 @@ function wrapInSuccessEnvelope(outputSchema) {
 	};
 }
 function buildProcedureOperation(proc, method) {
+	const [tag = proc.path] = proc.path.split(".");
 	const operation = (0, import_objectSpread2.default)((0, import_objectSpread2.default)({ operationId: proc.path }, proc.description ? { description: proc.description } : {}), {}, {
-		tags: [proc.path.split(".")[0]],
+		tags: [tag],
 		responses: {
 			"200": {
 				description: "Successful response",
@@ -731,14 +926,14 @@ function buildProcedureOperation(proc, method) {
 		}
 	});
 	if (proc.inputSchema === null) return operation;
-	if (method === "get") operation["parameters"] = [{
+	if (method === "get") operation.parameters = [{
 		name: "input",
 		in: "query",
 		required: true,
 		style: "deepObject",
 		content: { "application/json": { schema: proc.inputSchema } }
 	}];
-	else operation["requestBody"] = {
+	else operation.requestBody = {
 		required: true,
 		content: { "application/json": { schema: proc.inputSchema } }
 	};
@@ -749,7 +944,7 @@ function buildOpenAPIDocument(procedures, options, meta = { errorSchema: null })
 	const paths = {};
 	for (const proc of procedures) {
 		var _paths$opPath;
-		if (proc.type === "subscription") continue;
+		if (!shouldIncludeProcedureInOpenAPI(proc.type)) continue;
 		const opPath = `/${proc.path}`;
 		const method = proc.type === "query" ? "get" : "post";
 		const pathItem = (_paths$opPath = paths[opPath]) !== null && _paths$opPath !== void 0 ? _paths$opPath : {};
@@ -765,7 +960,7 @@ function buildOpenAPIDocument(procedures, options, meta = { errorSchema: null })
 			version: (_options$version = options.version) !== null && _options$version !== void 0 ? _options$version : "0.0.0"
 		},
 		paths,
-		components: (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, hasNamedSchemas ? { schemas: meta.schemas } : {}), {}, { responses: { Error: {
+		components: (0, import_objectSpread2.default)((0, import_objectSpread2.default)({}, hasNamedSchemas && meta.schemas ? { schemas: meta.schemas } : {}), {}, { responses: { Error: {
 			description: "Error response",
 			content: { "application/json": { schema: {
 				type: "object",
@@ -831,4 +1026,14 @@ async function generateOpenAPIDocument(routerFilePath, options = {}) {
 }
 
 //#endregion
+//#region src/types.ts
+var types_exports = {};
+
+//#endregion
+Object.defineProperty(exports, 'OpenAPIV3_1', {
+  enumerable: true,
+  get: function () {
+    return types_exports;
+  }
+});
 exports.generateOpenAPIDocument = generateOpenAPIDocument;

package/dist/index.d.cts

@@ -1,32 +1,99 @@
-//#region src/generate.d.ts
-/**
- * A minimal JSON Schema subset used for OpenAPI 3.1 schemas.
- */
-interface JsonSchema {
+import { OpenAPIV3_1 } from "openapi-types";
+
+//#region rolldown:runtime
+declare namespace types_d_exports {
+  export { ArraySchemaObject, CallbackObject, ComponentsObject, DiscriminatorObject, Document, ExampleObject, ExternalDocumentationObject, HeaderObject, HttpMethods, LinkObject, MediaTypeObject, OperationObject, ParameterBaseObject, ParameterObject, PathItemObject, PathsObject, PrimitiveSchemaType, ReferenceObject, Replace, RequestBodyObject, ResponseObject, ResponsesObject, SchemaLike, SchemaObject, SchemaType, SecuritySchemeObject, XMLObject };
+}
+type Replace<TTarget, TReplaceWith> = Omit<TTarget, keyof TReplaceWith> & TReplaceWith;
+type SchemaType = 'array' | 'boolean' | 'integer' | 'null' | 'number' | 'object' | 'string';
+type PrimitiveSchemaType = SchemaType;
+type HttpMethods = OpenAPIV3_1.HttpMethods;
+type ReferenceObject = OpenAPIV3_1.ReferenceObject;
+type ExampleObject = OpenAPIV3_1.ExampleObject;
+type DiscriminatorObject = OpenAPIV3_1.DiscriminatorObject;
+type ExternalDocumentationObject = OpenAPIV3_1.ExternalDocumentationObject;
+type XMLObject = OpenAPIV3_1.XMLObject;
+type LinkObject = OpenAPIV3_1.LinkObject;
+type SecuritySchemeObject = OpenAPIV3_1.SecuritySchemeObject;
+type SchemaObject = Replace<OpenAPIV3_1.BaseSchemaObject, {
   $ref?: string;
-  $defs?: Record<string, JsonSchema>;
+  $defs?: Record<string, SchemaObject>;
+  $schema?: string;
   type?: string | string[];
-  properties?: Record<string, JsonSchema>;
+  properties?: Record<string, SchemaObject>;
   required?: string[];
-  items?: JsonSchema | false;
-  prefixItems?: JsonSchema[];
+  items?: SchemaObject | false;
+  prefixItems?: SchemaObject[];
   const?: string | number | boolean | null;
   enum?: (string | number | boolean | null)[];
-  oneOf?: JsonSchema[];
-  anyOf?: JsonSchema[];
-  allOf?: JsonSchema[];
-  not?: JsonSchema;
-  additionalProperties?: JsonSchema | boolean;
-  discriminator?: {
-    propertyName: string;
-    mapping?: Record<string, string>;
-  };
-  format?: string;
-  description?: string;
-  minItems?: number;
-  maxItems?: number;
-  $schema?: string;
+  oneOf?: SchemaObject[];
+  anyOf?: SchemaObject[];
+  allOf?: SchemaObject[];
+  not?: SchemaObject;
+  additionalProperties?: boolean | SchemaObject;
+  discriminator?: DiscriminatorObject;
+  externalDocs?: ExternalDocumentationObject;
+  xml?: XMLObject;
+  contentMediaType?: string;
+  exclusiveMinimum?: boolean | number;
+  exclusiveMaximum?: boolean | number;
+}>;
+type SchemaLike = SchemaObject;
+interface ArraySchemaObject extends SchemaObject {
+  type: 'array';
+  items: SchemaObject | false;
+}
+type MediaTypeObject = Replace<OpenAPIV3_1.MediaTypeObject, {
+  schema?: SchemaObject | ReferenceObject;
+  examples?: Record<string, ReferenceObject | ExampleObject>;
+}>;
+interface ParameterBaseObject extends Replace<OpenAPIV3_1.ParameterBaseObject, {
+  schema?: SchemaObject | ReferenceObject;
+  examples?: Record<string, ReferenceObject | ExampleObject>;
+  content?: Record<string, MediaTypeObject>;
+}> {}
+interface ParameterObject extends ParameterBaseObject {
+  name: string;
+  in: string;
 }
+type HeaderObject = ParameterBaseObject;
+type RequestBodyObject = Replace<OpenAPIV3_1.RequestBodyObject, {
+  content: Record<string, MediaTypeObject>;
+}>;
+type ResponseObject = Replace<OpenAPIV3_1.ResponseObject, {
+  headers?: Record<string, ReferenceObject | HeaderObject>;
+  content?: Record<string, MediaTypeObject>;
+  links?: Record<string, ReferenceObject | LinkObject>;
+}>;
+type ResponsesObject = Record<string, ReferenceObject | ResponseObject>;
+type OperationObject<T extends {} = {}> = Replace<OpenAPIV3_1.OperationObject<T>, {
+  parameters?: (ReferenceObject | ParameterObject)[];
+  requestBody?: ReferenceObject | RequestBodyObject;
+  responses?: ResponsesObject;
+  callbacks?: Record<string, ReferenceObject | CallbackObject>;
+}> & T;
+type PathItemObject<T extends {} = {}> = Replace<OpenAPIV3_1.PathItemObject<T>, {
+  parameters?: (ReferenceObject | ParameterObject)[];
+}> & { [method in HttpMethods]?: OperationObject<T> };
+type PathsObject<T extends {} = {}, TPath extends {} = {}> = Record<string, (PathItemObject<T> & TPath) | undefined>;
+type CallbackObject = Record<string, PathItemObject | ReferenceObject>;
+type ComponentsObject = Replace<OpenAPIV3_1.ComponentsObject, {
+  schemas?: Record<string, SchemaObject>;
+  responses?: Record<string, ReferenceObject | ResponseObject>;
+  parameters?: Record<string, ReferenceObject | ParameterObject>;
+  requestBodies?: Record<string, ReferenceObject | RequestBodyObject>;
+  headers?: Record<string, ReferenceObject | HeaderObject>;
+  links?: Record<string, ReferenceObject | LinkObject>;
+  callbacks?: Record<string, ReferenceObject | CallbackObject>;
+  pathItems?: Record<string, ReferenceObject | PathItemObject>;
+}>;
+type Document<T extends {} = {}> = Replace<OpenAPIV3_1.Document<T>, {
+  paths?: PathsObject<T>;
+  components?: ComponentsObject;
+}>;
+//# sourceMappingURL=types.d.ts.map
+//#endregion
+//#region src/generate.d.ts
 interface GenerateOptions {
   /**
    * The name of the exported router symbol.
@@ -38,16 +105,6 @@ interface GenerateOptions {
   /** Version string for the generated OpenAPI `info` object. */
   version?: string;
 }
-interface OpenAPIDocument {
-  openapi: string;
-  jsonSchemaDialect?: string;
-  info: {
-    title: string;
-    version: string;
-  };
-  paths: Record<string, Record<string, unknown>>;
-  components: Record<string, unknown>;
-}
 /**
  * Analyse the given TypeScript router file using the TypeScript compiler and
  * return an OpenAPI 3.1 document describing all query and mutation procedures.
@@ -56,8 +113,9 @@ interface OpenAPIDocument {
  *   the AppRouter.
  * @param options - Optional generation settings (export name, title, version).
  */
-declare function generateOpenAPIDocument(routerFilePath: string, options?: GenerateOptions): Promise<OpenAPIDocument>;
+declare function generateOpenAPIDocument(routerFilePath: string, options?: GenerateOptions): Promise<Document>;
 //# sourceMappingURL=generate.d.ts.map
+
 //#endregion
-export { GenerateOptions, JsonSchema, OpenAPIDocument, generateOpenAPIDocument };
+export { GenerateOptions, types_d_exports as OpenAPIV3_1, generateOpenAPIDocument };
 //# sourceMappingURL=index.d.cts.map

package/dist/index.d.cts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.cts","names":[],"sources":["../src/generate.ts"],"sourcesContent":[],"mappings":";;AAcA;;AAEyB,UAFR,UAAA,CAEQ;EAAU,IAAzB,CAAA,EAAA,MAAA;EAAM,KAEc,CAAA,EAFpB,MAEoB,CAAA,MAAA,EAFL,UAEK,CAAA;EAAU,IAAzB,CAAA,EAAA,MAAA,GAAA,MAAA,EAAA;EAAM,UAEX,CAAA,EAFK,MAEL,CAAA,MAAA,EAFoB,UAEpB,CAAA;EAAU,QACJ,CAAA,EAAA,MAAA,EAAA;EAAU,KAGhB,CAAA,EAJA,UAIA,GAAA,KAAA;EAAU,WACV,CAAA,EAJM,UAIN,EAAA;EAAU,KACV,CAAA,EAAA,MAAA,GAAA,MAAA,GAAA,OAAA,GAAA,IAAA;EAAU,IACZ,CAAA,EAAA,CAAA,MAAA,GAAA,MAAA,GAAA,OAAA,GAAA,IAAA,CAAA,EAAA;EAAU,KACO,CAAA,EAJf,UAIe,EAAA;EAAU,KACiB,CAAA,EAJ1C,UAI0C,EAAA;EAAM,KAAA,CAAA,EAHhD,UAGgD,EAAA;EAsBzC,GAAA,CAAA,EAxBT,UAwBS;EAYA,oBAAe,CAAA,EAnCP,UAmCO,GAAA,OAAA;EAAA,aAAA,CAAA,EAAA;IAIR,YAAA,EAAA,MAAA;IAAf,OAAA,CAAA,EAtC2C,MAsC3C,CAAA,MAAA,EAAA,MAAA,CAAA;EAAM,CAAA;EACK,MAAA,CAAA,EAAA,MAAA;EAqmCE,WAAA,CAAA,EAAA,MAAA;EAAuB,QAAA,CAAA,EAAA,MAAA;EAAA,QAElC,CAAA,EAAA,MAAA;EAAoB,OACpB,CAAA,EAAA,MAAA;;AAAD,UAznCO,eAAA,CAynCP;;;;;;;;;;;UA7mCO,eAAA;;;;;;;SAIR,eAAe;cACV;;;;;;;;;;iBAqmCQ,uBAAA,mCAEX,kBACR,QAAQ"}
+{"version":3,"file":"index.d.cts","names":[],"sources":["../src/types.ts","../src/generate.ts"],"sourcesContent":[],"mappings":"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"}