@kubb/adapter-oas 5.0.0-beta.50 → 5.0.0-beta.52

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/adapter-oas",
-  "version": "5.0.0-beta.50",
+  "version": "5.0.0-beta.52",
   "description": "OpenAPI and Swagger adapter for Kubb. Parses and validates OAS 2.0/3.x specifications into a @kubb/ast RootNode for downstream code generation plugins.",
   "keywords": [
     "adapter",
@@ -43,12 +43,12 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^2.31.6",
+    "@apidevtools/json-schema-ref-parser": "^14.2.1",
     "oas": "^32.1.18",
     "oas-normalize": "^16.0.5",
     "swagger2openapi": "^7.0.8",
-    "@kubb/ast": "5.0.0-beta.50",
-    "@kubb/core": "5.0.0-beta.50"
+    "@kubb/ast": "5.0.0-beta.52",
+    "@kubb/core": "5.0.0-beta.52"
   },
   "devDependencies": {
     "@types/swagger2openapi": "^7.0.4",

package/src/factory.ts

@@ -2,9 +2,7 @@ import path from 'node:path'
 import { exists, mergeDeep, URLPath } from '@internals/utils'
 import { Diagnostics } from '@kubb/core'
 import type { AdapterSource } from '@kubb/core'
-import { bundle, loadConfig } from '@redocly/openapi-core'
 import OASNormalize from 'oas-normalize'
-import swagger2openapi from 'swagger2openapi'
 import { MERGE_DEFAULT_TITLE, MERGE_DEFAULT_VERSION, MERGE_OPENAPI_VERSION } from './constants.ts'
 import { isOpenApiV2Document } from './guards.ts'
 import type { Document } from './types.ts'
@@ -22,8 +20,8 @@ export type ValidateDocumentOptions = {
  * Loads and dereferences an OpenAPI document, returning the raw `Document`.
  *
  * Accepts a file path string or an already-parsed document object. File paths are bundled via
- * Redocly to resolve external `$ref`s. Swagger 2.0 documents are automatically up-converted
- * to OpenAPI 3.0 via `swagger2openapi`.
+ * `@apidevtools/json-schema-ref-parser` to resolve external `$ref`s. Swagger 2.0 documents are
+ * automatically up-converted to OpenAPI 3.0 via `swagger2openapi`.
  *
  * @example
  * ```ts
@@ -33,17 +31,10 @@ export type ValidateDocumentOptions = {
  */
 export async function parseDocument(pathOrApi: string | Document, { canBundle = true, enablePaths = true }: ParseOptions = {}): Promise<Document> {
   if (typeof pathOrApi === 'string' && canBundle) {
-    const config = await loadConfig()
-    const bundleResults = await bundle({
-      ref: pathOrApi,
-      config,
-      base: pathOrApi,
-    })
+    const { $RefParser } = await import('@apidevtools/json-schema-ref-parser')
+    const bundled = await $RefParser.bundle(pathOrApi)
 
-    return parseDocument(bundleResults.bundle.parsed as string, {
-      canBundle,
-      enablePaths,
-    })
+    return parseDocument(bundled as Document, { canBundle: false, enablePaths })
   }
 
   const oasNormalize = new OASNormalize(pathOrApi, {
@@ -53,6 +44,7 @@ export async function parseDocument(pathOrApi: string | Document, { canBundle =
   const document = (await oasNormalize.load()) as Document
 
   if (isOpenApiV2Document(document)) {
+    const { default: swagger2openapi } = await import('swagger2openapi')
     const { openapi } = await swagger2openapi.convertObj(document, {
       anchors: true,
     })

package/src/index.ts

@@ -1,6 +1,4 @@
 export { adapterOas, adapterOasName } from './adapter.ts'
-export type { ValidateDocumentOptions } from './factory.ts'
-export { mergeDocuments } from './factory.ts'
 export type {
   AdapterOas,
   AdapterOasOptions,
@@ -15,4 +13,3 @@ export type {
   ResponseObject,
   SchemaObject,
 } from './types.ts'
-export { HttpMethods } from './types.ts'

package/src/resolvers.ts

@@ -223,7 +223,7 @@ type SchemaSourceMode = 'schemas' | 'responses' | 'requestBodies'
 /**
  * A schema annotated with its component section source and original name. Used by `resolveNameCollisions` for cross-source collision resolution.
  */
-export type SchemaWithMetadata = {
+type SchemaWithMetadata = {
   schema: SchemaObject
   source: SchemaSourceMode
   originalName: string

package/src/types.ts

@@ -1,7 +1,7 @@
 // external packages
 
 import type { AdapterFactoryOptions } from '@kubb/core'
-import { ast } from '@kubb/core'
+import type { ast } from '@kubb/core'
 import type { Operation as OASOperation } from 'oas/operation'
 import type {
   DiscriminatorObject as OASDiscriminatorObject,
@@ -12,11 +12,6 @@ import type {
 } from 'oas/types'
 import type { OpenAPIV3 } from 'openapi-types'
 
-/**
- * Re-exports of `openapi-types` for use by adapter consumers.
- */
-export type { OpenAPIV3, OpenAPIV3_1 } from 'openapi-types'
-
 /**
  * Content-type string for selecting request/response schemas from an OpenAPI spec.
  * Supports `'application/json'` or any other media type.
@@ -73,20 +68,6 @@ export type SchemaObject = OASSchemaObject & {
   enum?: Array<string | number | boolean | null>
 }
 
-/**
- * Maps uppercase HTTP method names to lowercase for backwards compatibility.
- *
- * @example
- * ```ts
- * HttpMethods['GET'] // 'get'
- * HttpMethods['POST'] // 'post'
- * ```
- */
-export const HttpMethods = Object.fromEntries(Object.entries(ast.httpMethods).map(([lower, upper]) => [upper, lower])) as Record<
-  Uppercase<ast.HttpMethod>,
-  Lowercase<ast.HttpMethod>
->
-
 /**
  * HTTP method as a lowercase string (`'get' | 'post' | ...`).
  */