@kubb/adapter-oas 5.0.0-beta.104 → 5.0.0-beta.106

package/dist/index.js

@@ -61,17 +61,32 @@ const structuralKeys = /* @__PURE__ */ new Set([
 ]);
 /**
 * Formats `convertFormat` maps to a dedicated type without going through `formatMap`:
-* `int64` and the date/time family. Keep this in sync with the `convertFormat`
+* `int64`, `uint64` and the date/time family. Keep this in sync with the `convertFormat`
 * special-cases in `parser.ts`. `isHandledFormat` reads it so the
 * `KUBB_UNSUPPORTED_FORMAT` diagnostic and the parser agree on what is handled.
 */
 const specialCasedFormats = /* @__PURE__ */ new Set([
 	"int64",
+	"uint64",
 	"date-time",
 	"date",
 	"time"
 ]);
 /**
+* Formats that describe a number, whether they resolve through `formatMap` or through the
+* `convertFormat` special cases. On a `type: 'string'` schema these do not make the value a
+* number: gRPC-gateway and other ProtoJSON producers send 64-bit integers as JSON strings.
+*
+* @see https://protobuf.dev/programming-guides/json/#int64-strings
+*/
+const numericFormats = /* @__PURE__ */ new Set([
+	"int32",
+	"int64",
+	"uint64",
+	"float",
+	"double"
+]);
+/**
 * Static map from OAS `format` strings to Kubb `SchemaType` values.
 *
 * Only formats whose AST type differs from the OAS `type` field appear here.
@@ -821,14 +836,14 @@ function getOperations(document, refs) {
 //#region src/emit/schemaShape.ts
 /**
 * Returns the Kubb `SchemaType` for a given OAS `format` string, or `null` if not found.
-* Formats not in `formatMap` (e.g., `int64`, `date-time`) are handled separately by parser options.
+* Formats not in `formatMap` (e.g., `int64`, `uint64`, `date-time`) are handled separately by parser options.
 */
 function getSchemaType(format) {
 	return formatMap[format] ?? null;
 }
 /**
 * Whether the parser maps `format` to a dedicated type. True for any `formatMap` entry, plus the
-* `specialCasedFormats` that `convertFormat` handles directly. False means the format falls back to
+* `specialCasedFormats` that `convertFormat` handles directly (int64, uint64, date-time, date, time). False means the format falls back to
 * the base type, which is what `KUBB_UNSUPPORTED_FORMAT` flags. Reading both sources keeps the
 * diagnostic in step with the parser as `formatMap` grows.
 */
@@ -1339,14 +1354,16 @@ function convertConst({ schema, name, nullable, defaultValue }) {
 * `format` rule's `match` has confirmed the format is handled (see `isHandledFormat`) and, for
 * a date-ish format, that `dateType` is not `false`.
 */
-function convertFormat({ schema, name, nullable, defaultValue, options }) {
+function convertFormat(context) {
+	const { schema, name, nullable, defaultValue, options, type } = context;
 	const ctx = {
 		schema,
 		name,
 		nullable,
 		defaultValue
 	};
-	if (schema.format === "int64") return createNode(ctx, {
+	if (type === "string" && numericFormats.has(schema.format)) return convertString(context);
+	if (schema.format === "int64" || schema.format === "uint64") return createNode(ctx, {
 		type: options.integerType === "bigint" ? "bigint" : "integer",
 		primitive: "integer",
 		min: schema.minimum,