@kubb/adapter-oas 5.0.0-beta.13 → 5.0.0-beta.15

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/adapter-oas",
-  "version": "5.0.0-beta.13",
+  "version": "5.0.0-beta.15",
   "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,11 +43,11 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^2.30.4",
+    "@redocly/openapi-core": "^2.30.5",
     "oas": "^32.1.18",
     "oas-normalize": "^16.0.4",
     "swagger2openapi": "^7.0.8",
-    "@kubb/core": "5.0.0-beta.13"
+    "@kubb/core": "5.0.0-beta.15"
   },
   "devDependencies": {
     "@types/swagger2openapi": "^7.0.4",

package/src/parser.ts

@@ -98,7 +98,7 @@ function createSchemaParser(ctx: OasParserContext) {
    * blowup — `customer` alone may be referenced from dozens of top-level schemas,
    * each triggering a fresh recursive expansion of its entire sub-tree.
    *
-   * Memoising by `$ref` path reduces the overall work from O(2^depth) to O(N)
+   * Memoizing by `$ref` path reduces the overall work from O(2^depth) to O(N)
    * where N is the number of unique schema names.
    */
   const resolvedRefCache = new Map<string, ast.SchemaNode | undefined>()
@@ -245,7 +245,7 @@ function createSchemaParser(ctx: OasParserContext) {
 
     return ast.createSchema({
       type: 'intersection',
-      members: [...ast.mergeAdjacentObjects(allOfMembers.slice(0, syntheticStart)), ...ast.mergeAdjacentObjects(allOfMembers.slice(syntheticStart))],
+      members: [...ast.mergeAdjacentObjectsLazy(allOfMembers.slice(0, syntheticStart)), ...ast.mergeAdjacentObjectsLazy(allOfMembers.slice(syntheticStart))],
       ...buildSchemaNode(schema, name, nullable, defaultValue),
     })
   }
@@ -1009,7 +1009,7 @@ export function parseOas(
   const baseOas = new BaseOas(document)
   const paths = baseOas.getPaths()
 
-  const operations: Array<ast.OperationNode> = Object.entries(paths).flatMap(([_path, methods]) =>
+  const operations: Array<ast.OperationNode> = Object.entries(paths).flatMap(([, methods]) =>
     Object.entries(methods)
       .map(([, operation]) => (operation ? _parseOperation(mergedOptions, operation) : null))
       .filter((op): op is ast.OperationNode => op !== null),

package/src/resolvers.ts

@@ -305,10 +305,10 @@ export function extractSchemaFromContent(content: Record<string, unknown> | unde
 /**
  * Walks a schema tree and collects the names of all `#/components/schemas/<name>` `$ref`s.
  */
-function collectRefs(schema: unknown, refs = new Set<string>()): Set<string> {
+function* collectRefs(schema: unknown): Generator<string, void, undefined> {
   if (Array.isArray(schema)) {
-    for (const item of schema) collectRefs(item, refs)
-    return refs
+    for (const item of schema) yield* collectRefs(item)
+    return
   }
 
   if (schema && typeof schema === 'object') {
@@ -317,15 +317,13 @@ function collectRefs(schema: unknown, refs = new Set<string>()): Set<string> {
       if (key === '$ref' && typeof value === 'string') {
         if (value.startsWith(SCHEMA_REF_PREFIX)) {
           const name = value.slice(SCHEMA_REF_PREFIX.length)
-          if (name) refs.add(name)
+          if (name) yield name
         }
       } else {
-        collectRefs(value, refs)
+        yield* collectRefs(value)
       }
     }
   }
-
-  return refs
 }
 
 /**
@@ -344,7 +342,7 @@ export function sortSchemas(schemas: Record<string, SchemaObject>): Record<strin
   const deps = new Map<string, string[]>()
 
   for (const [name, schema] of Object.entries(schemas)) {
-    deps.set(name, Array.from(collectRefs(schema)))
+    deps.set(name, [...new Set(collectRefs(schema))])
   }
 
   const sorted: string[] = []