@kubb/oas 4.32.4 → 4.33.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/oas",
-  "version": "4.32.4",
+  "version": "4.33.1",
   "description": "OpenAPI Specification (OAS) utilities and helpers for Kubb, providing parsing, normalization, and manipulation of OpenAPI/Swagger schemas.",
   "keywords": [
     "openapi",
@@ -59,11 +59,12 @@
     "openapi-types": "^12.1.3",
     "remeda": "^2.33.6",
     "swagger2openapi": "^7.0.8",
-    "@kubb/core": "4.32.4"
+    "@kubb/core": "4.33.1"
   },
   "devDependencies": {
     "@stoplight/yaml": "^4.3.0",
-    "@types/swagger2openapi": "^7.0.4"
+    "@types/swagger2openapi": "^7.0.4",
+    "@internals/utils": "0.0.0"
   },
   "engines": {
     "node": ">=20"

package/src/Oas.ts

@@ -14,6 +14,13 @@ import {
   validate,
 } from './utils.ts'
 
+/**
+ * Prefix used to create synthetic `$ref` values for anonymous (inline) discriminator schemas.
+ * The suffix is the schema index within the discriminator's `oneOf`/`anyOf` array.
+ * @example `#kubb-inline-0`
+ */
+export const KUBB_INLINE_REF_PREFIX = '#kubb-inline-'
+
 type OasOptions = {
   contentType?: contentType
   discriminator?: 'strict' | 'inherit'
@@ -197,7 +204,7 @@ export class Oas extends BaseOas {
           if (discriminatorValue) {
             // Create a synthetic ref for inline schemas using index
             // The value points to the inline schema itself via a special marker
-            existingMapping[discriminatorValue] = `#kubb-inline-${index}`
+            existingMapping[discriminatorValue] = `${KUBB_INLINE_REF_PREFIX}${index}`
           }
         }
       })

package/src/index.ts

@@ -1,4 +1,5 @@
-export { Oas } from './Oas.ts'
+export { KUBB_INLINE_REF_PREFIX, Oas } from './Oas.ts'
+export { resolveServerUrl } from './resolveServerUrl.ts'
 export * from './types.ts'
 export {
   getDefaultValue,

package/src/resolveServerUrl.ts

@@ -0,0 +1,37 @@
+type ServerVariable = {
+  default?: string | number
+  enum?: (string | number)[]
+}
+
+type ServerObject = {
+  url: string
+  variables?: Record<string, ServerVariable>
+}
+
+/**
+ * Resolves an OpenAPI server URL by substituting `{variable}` placeholders
+ * with values from `overrides` (user-provided) or the spec-defined defaults.
+ *
+ * Throws if an override value is not in the variable's `enum` list.
+ */
+export function resolveServerUrl(server: ServerObject, overrides?: Record<string, string>): string {
+  if (!server.variables) {
+    return server.url
+  }
+
+  let url = server.url
+  for (const [key, variable] of Object.entries(server.variables)) {
+    const value = overrides?.[key] ?? (variable.default != null ? String(variable.default) : undefined)
+    if (value === undefined) {
+      continue
+    }
+
+    if (variable.enum?.length && !variable.enum.some((e) => String(e) === value)) {
+      throw new Error(`Invalid server variable value '${value}' for '${key}' when resolving ${server.url}. Valid values are: ${variable.enum.join(', ')}.`)
+    }
+
+    url = url.replaceAll(`{${key}}`, value)
+  }
+
+  return url
+}

package/src/utils.ts

@@ -1,8 +1,7 @@
 import fs from 'node:fs'
 import path from 'node:path'
+import { pascalCase, URLPath } from '@internals/utils'
 import type { Config } from '@kubb/core'
-import { pascalCase } from '@kubb/core/transformers'
-import { URLPath } from '@kubb/core/utils'
 import { bundle } from '@readme/openapi-parser'
 import yaml from '@stoplight/yaml'
 import type { ParameterObject, SchemaObject } from 'oas/types'