@kubb/adapter-oas 5.0.0-beta.42 → 5.0.0-beta.44

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/adapter-oas",
-  "version": "5.0.0-beta.42",
+  "version": "5.0.0-beta.44",
   "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,12 @@
     "registry": "https://registry.npmjs.org/"
   },
   "dependencies": {
-    "@redocly/openapi-core": "^2.31.5",
+    "@redocly/openapi-core": "^2.31.6",
     "oas": "^32.1.18",
-    "oas-normalize": "^16.0.4",
+    "oas-normalize": "^16.0.5",
     "swagger2openapi": "^7.0.8",
-    "@kubb/core": "5.0.0-beta.42"
+    "@kubb/ast": "5.0.0-beta.44",
+    "@kubb/core": "5.0.0-beta.44"
   },
   "devDependencies": {
     "@types/swagger2openapi": "^7.0.4",
@@ -63,7 +64,7 @@
   "scripts": {
     "bench": "vitest bench",
     "build": "tsdown",
-    "clean": "npx rimraf ./dist",
+    "clean": "node -e \"require('node:fs').rmSync('./dist', {recursive:true,force:true})\"",
     "lint": "oxlint .",
     "lint:fix": "oxlint --fix .",
     "release": "pnpm publish --no-git-check",

package/src/parser.ts

@@ -1,4 +1,5 @@
 import { pascalCase, URLPath } from '@internals/utils'
+import { childName, enumPropName, extractRefName, findDiscriminator } from '@kubb/ast/utils'
 import { ast } from '@kubb/core'
 import BaseOas from 'oas'
 import { DEFAULT_PARSER_OPTIONS, enumExtensionKeys, SCHEMA_REF_PREFIX, typeOptionMap } from './constants.ts'
@@ -146,7 +147,7 @@ export function createSchemaParser(ctx: OasParserContext, dialect: OasDialect =
     return ast.createSchema({
       ...buildSchemaNode(schema, name, nullable, defaultValue),
       type: 'ref',
-      name: ast.extractRefName(schema.$ref!),
+      name: extractRefName(schema.$ref!),
       ref: schema.$ref,
       schema: resolvedSchema,
     })
@@ -199,7 +200,7 @@ export function createSchemaParser(ctx: OasParserContext, dialect: OasDialect =
         const inOneOf = parentUnion.some((oneOfItem) => dialect.isReference(oneOfItem) && oneOfItem.$ref === childRef)
         const inMapping = Object.values(deref.discriminator.mapping ?? {}).some((v) => v === childRef)
         if (inOneOf || inMapping) {
-          const discriminatorValue = ast.findDiscriminator(deref.discriminator.mapping, childRef)
+          const discriminatorValue = findDiscriminator(deref.discriminator.mapping, childRef)
           if (discriminatorValue) {
             filteredDiscriminantValues.push({
               propertyName: deref.discriminator.propertyName,
@@ -306,7 +307,7 @@ export function createSchemaParser(ctx: OasParserContext, dialect: OasDialect =
     if (sharedPropertiesNode || discriminator?.mapping) {
       const members = unionMembers.map((s) => {
         const ref = dialect.isReference(s) ? s.$ref : undefined
-        const discriminatorValue = ast.findDiscriminator(discriminator?.mapping, ref)
+        const discriminatorValue = findDiscriminator(discriminator?.mapping, ref)
         const memberNode = parseSchema({ schema: s as SchemaObject, name }, rawOptions)
 
         if (!discriminatorValue || !discriminator) {
@@ -568,7 +569,7 @@ export function createSchemaParser(ctx: OasParserContext, dialect: OasDialect =
           const resolvedPropSchema = propSchema as SchemaObject
           const propNullable = dialect.isNullable(resolvedPropSchema)
 
-          const resolvedChildName = ast.childName(name, propName)
+          const resolvedChildName = childName(name, propName)
           const propNode = parseSchema({ schema: resolvedPropSchema, name: resolvedChildName }, rawOptions)
           const schemaNode = (() => {
             const node = ast.setEnumName(propNode, name, propName, options.enumSuffix)
@@ -633,7 +634,7 @@ export function createSchemaParser(ctx: OasParserContext, dialect: OasDialect =
     if (dialect.isDiscriminator(schema) && schema.discriminator.mapping) {
       const discPropName = schema.discriminator.propertyName
       const values = Object.keys(schema.discriminator.mapping)
-      const enumName = name ? ast.enumPropName(name, discPropName, options.enumSuffix) : undefined
+      const enumName = name ? enumPropName(name, discPropName, options.enumSuffix) : undefined
       return ast.setDiscriminatorEnum({
         node: objectNode,
         propertyName: discPropName,
@@ -668,7 +669,7 @@ export function createSchemaParser(ctx: OasParserContext, dialect: OasDialect =
    */
   function convertArray({ schema, name, nullable, defaultValue, rawOptions, options }: SchemaContext): ast.SchemaNode {
     const rawItems = schema.items as SchemaObject | undefined
-    const itemName = rawItems?.enum?.length && name ? ast.enumPropName(null, name, options.enumSuffix) : name
+    const itemName = rawItems?.enum?.length && name ? enumPropName(null, name, options.enumSuffix) : name
     const items = rawItems ? [parseSchema({ schema: rawItems, name: itemName }, rawOptions)] : []
 
     return ast.createSchema({