@kubb/adapter-oas 5.0.0-alpha.42 → 5.0.0-alpha.43

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/adapter-oas",
-  "version": "5.0.0-alpha.42",
+  "version": "5.0.0-alpha.43",
   "description": "OpenAPI / Swagger adapter for Kubb converts OAS input into a @kubb/ast RootNode.",
   "keywords": [
     "openapi",
@@ -37,18 +37,14 @@
   ],
   "dependencies": {
     "@redocly/openapi-core": "^2.28.1",
-    "@stoplight/yaml": "^4.3.0",
-    "fflate": "^0.8.2",
-    "jsonpointer": "^5.0.1",
     "oas": "^31.1.2",
     "oas-normalize": "^16.0.4",
-    "openapi-types": "^12.1.3",
-    "remeda": "^2.33.7",
     "swagger2openapi": "^7.0.8",
-    "@kubb/core": "5.0.0-alpha.42"
+    "@kubb/core": "5.0.0-alpha.43"
   },
   "devDependencies": {
     "@types/swagger2openapi": "^7.0.4",
+    "openapi-types": "^12.1.3",
     "@internals/utils": "0.0.0"
   },
   "engines": {
@@ -60,6 +56,9 @@
   },
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
+  "inlinedDependencies": {
+    "openapi-types": "12.1.3"
+  },
   "scripts": {
     "build": "tsdown",
     "clean": "npx rimraf ./dist",

package/src/factory.ts

@@ -1,10 +1,8 @@
 import path from 'node:path'
-import { URLPath } from '@internals/utils'
+import { mergeDeep, URLPath } from '@internals/utils'
 import type { AdapterSource } from '@kubb/core'
 import { bundle, loadConfig } from '@redocly/openapi-core'
-import yaml from '@stoplight/yaml'
 import OASNormalize from 'oas-normalize'
-import { mergeDeep } from 'remeda'
 import swagger2openapi from 'swagger2openapi'
 import { MERGE_DEFAULT_TITLE, MERGE_DEFAULT_VERSION, MERGE_OPENAPI_VERSION } from './constants.ts'
 import { isOpenApiV2Document } from './guards.ts'
@@ -60,7 +58,7 @@ export async function parseDocument(pathOrApi: string | Document, { canBundle =
 /**
  * Deep-merges multiple OpenAPI documents into a single `Document`.
  *
- * Each document is parsed independently then recursively merged with `remeda`'s `mergeDeep`.
+ * Each document is parsed independently then recursively merged via `mergeDeep` from `@internals/utils`.
  * Throws when the input array is empty.
  *
  * @example
@@ -85,9 +83,12 @@ export async function mergeDocuments(pathOrApi: Array<string | Document>): Promi
     components: { schemas: {} },
   } as Document
 
-  const merged = documents.reduce((acc, current) => mergeDeep(acc, current as Document), seed)
+  const merged = documents.reduce(
+    (acc, current) => mergeDeep(acc as Record<string, unknown>, current as Record<string, unknown>),
+    seed as Record<string, unknown>,
+  )
 
-  return parseDocument(merged)
+  return parseDocument(merged as Document)
 }
 
 /**
@@ -110,12 +111,7 @@ export function parseFromConfig(source: AdapterSource): Promise<Document> {
       return parseDocument(structuredClone(source.data) as Document)
     }
 
-    try {
-      const api: string = yaml.parse(source.data as string)
-      return parseDocument(api)
-    } catch {
-      return parseDocument(source.data as string)
-    }
+    return parseDocument(source.data as string, { canBundle: false })
   }
 
   if (source.type === 'paths') {

package/src/guards.ts

@@ -1,5 +1,5 @@
+import { isPlainObject } from '@internals/utils'
 import type { OpenAPIV2, OpenAPIV3, OpenAPIV3_1 } from 'openapi-types'
-import { isPlainObject } from 'remeda'
 import type { DiscriminatorObject, SchemaObject } from './types.ts'
 
 /**

package/src/index.ts

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

package/src/parser.ts

@@ -404,18 +404,24 @@ function createSchemaParser(ctx: OasParserContext) {
         | 'number'
         | 'boolean'
         | 'string'
-      const sourceValues = extensionKey
-        ? [...new Set((schema as Record<string, unknown>)[extensionKey] as Array<string | number>)]
-        : [...new Set(filteredValues)]
+      const rawEnumNames = extensionKey ? ((schema as Record<string, unknown>)[extensionKey] as Array<string | number>) : undefined
+      const uniqueValues = [...new Set(filteredValues)]
+      const seenNames = new Set<string>()
 
       return ast.createSchema({
         ...enumBase,
         primitive: enumPrimitiveType,
-        namedEnumValues: sourceValues.map((label, index) => ({
-          name: String(label),
-          value: extensionKey ? (filteredValues[index] ?? label) : label,
-          primitive: enumPrimitiveType,
-        })),
+        namedEnumValues: uniqueValues
+          .map((value, index) => ({
+            name: String(rawEnumNames?.[index] ?? value),
+            value,
+            primitive: enumPrimitiveType,
+          }))
+          .filter((entry) => {
+            if (seenNames.has(entry.name)) return false
+            seenNames.add(entry.name)
+            return true
+          }),
       })
     }
 

package/src/refs.ts

@@ -1,4 +1,3 @@
-import jsonpointer from 'jsonpointer'
 import { isReference } from './guards.ts'
 import type { Document } from './types.ts'
 
@@ -24,7 +23,10 @@ export function resolveRef<T = unknown>(document: Document, $ref: string): T | n
   } else {
     return null
   }
-  const current = jsonpointer.get(document, $ref)
+  const current = $ref
+    .split('/')
+    .filter(Boolean)
+    .reduce((obj: unknown, key: string) => (obj as Record<string, unknown>)?.[key], document as unknown)
 
   if (!current) {
     throw new Error(`Could not find a definition for ${origRef}.`)