@kubb/plugin-oas 4.12.5 → 4.12.7

package/dist/utils.d.cts

@@ -1,5 +1,5 @@
-import { S as Output, _ as contentType, b as Config, f as OasTypes, g as SchemaObject, h as Operation, l as isOptional, m as OpenAPIV3_1, p as OpenAPIV3, u as Oas } from "./SchemaMapper-Cjte6oBd.cjs";
-import { h as OperationSchema, w as FunctionParamsAST } from "./createGenerator-DyVUP-Aj.cjs";
+import { S as Output, _ as contentType, b as Config, f as OasTypes, g as SchemaObject, h as Operation, l as isOptional, m as OpenAPIV3_1, p as OpenAPIV3, u as Oas } from "./SchemaMapper-C0cW-6bU.cjs";
+import { h as OperationSchema, w as FunctionParamsAST } from "./createGenerator-DIaC635C.cjs";
 import { Params } from "@kubb/react-fabric/types";
 
 //#region src/utils/getBanner.d.ts

package/dist/utils.d.ts

@@ -1,5 +1,5 @@
-import { S as Output, _ as contentType, b as Config, f as OasTypes, g as SchemaObject, h as Operation, l as isOptional, m as OpenAPIV3_1, p as OpenAPIV3, u as Oas } from "./SchemaMapper-DlcrPonN.js";
-import { h as OperationSchema, w as FunctionParamsAST } from "./createGenerator-B1p6Pl-d.js";
+import { S as Output, _ as contentType, b as Config, f as OasTypes, g as SchemaObject, h as Operation, l as isOptional, m as OpenAPIV3_1, p as OpenAPIV3, u as Oas } from "./SchemaMapper-BkwcB4db.js";
+import { h as OperationSchema, w as FunctionParamsAST } from "./createGenerator-C0zcRQF6.js";
 import { Params } from "@kubb/react-fabric/types";
 
 //#region src/utils/getBanner.d.ts

package/dist/utils.js

@@ -1,4 +1,4 @@
-import { n as getSchemaFactory, t as getSchemas } from "./getSchemas-XWPSn2uf.js";
+import { n as getSchemaFactory, t as getSchemas } from "./getSchemas-DH7Mz7ud.js";
 import { n as getBanner, t as getFooter } from "./getFooter-C2vyr3vj.js";
 import transformers, { camelCase, isValidVarName } from "@kubb/core/transformers";
 import { URLPath } from "@kubb/core/utils";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@kubb/plugin-oas",
-  "version": "4.12.5",
+  "version": "4.12.7",
   "description": "OpenAPI Specification (OAS) plugin for Kubb, providing core functionality for parsing and processing OpenAPI/Swagger schemas for code generation.",
   "keywords": [
     "openapi",
@@ -79,15 +79,14 @@
     }
   ],
   "dependencies": {
-    "@kubb/react-fabric": "0.7.1",
-    "@stoplight/yaml": "^4.3.0",
+    "@kubb/react-fabric": "0.7.2",
     "p-limit": "^7.2.0",
     "remeda": "^2.32.0",
-    "@kubb/core": "4.12.5",
-    "@kubb/oas": "4.12.5"
+    "@kubb/core": "4.12.7",
+    "@kubb/oas": "4.12.7"
   },
   "peerDependencies": {
-    "@kubb/react-fabric": "0.7.1"
+    "@kubb/react-fabric": "0.7.2"
   },
   "engines": {
     "node": ">=20"

package/src/plugin.ts

@@ -1,6 +1,7 @@
 import path from 'node:path'
-import { type Config, definePlugin, type Group, getMode } from '@kubb/core'
+import { type Config, definePlugin, type Group, getMode, type KubbEvents } from '@kubb/core'
 import { camelCase } from '@kubb/core/transformers'
+import type { AsyncEventEmitter } from '@kubb/core/utils'
 import type { Oas } from '@kubb/oas'
 import { parseFromConfig } from '@kubb/oas'
 import { jsonGenerator } from './generators'
@@ -24,7 +25,7 @@ export const pluginOas = definePlugin<PluginOas>((options) => {
     discriminator = 'strict',
   } = options
 
-  const getOas = async ({ config }: { config: Config }): Promise<Oas> => {
+  const getOas = async ({ validate, config, events }: { validate: boolean; config: Config; events: AsyncEventEmitter<KubbEvents> }): Promise<Oas> => {
     // needs to be in a different variable or the catch here will not work(return of a promise instead)
     const oas = await parseFromConfig(config, oasClass)
 
@@ -37,10 +38,18 @@ export const pluginOas = definePlugin<PluginOas>((options) => {
       if (validate) {
         await oas.valdiate()
       }
-    } catch (e) {
-      const error = e as Error
+    } catch (er) {
+      const caughtError = er as Error
+      const errorTimestamp = new Date()
+      const error = new Error('OAS Validation failed', {
+        cause: caughtError,
+      })
 
-      console.warn(error?.message)
+      events.emit('info', caughtError.message)
+      events.emit('debug', {
+        date: errorTimestamp,
+        logs: [`✗ ${error.message}`, caughtError.message],
+      })
     }
 
     return oas
@@ -56,18 +65,20 @@ export const pluginOas = definePlugin<PluginOas>((options) => {
     },
     inject() {
       const config = this.config
+      const events = this.events
+
       let oas: Oas
 
       return {
-        async getOas() {
+        async getOas({ validate = false } = {}) {
           if (!oas) {
-            oas = await getOas({ config })
+            oas = await getOas({ config, events, validate })
           }
 
           return oas
         },
         async getBaseURL() {
-          const oas = await getOas({ config })
+          const oas = await getOas({ config, events, validate: false })
           if (serverIndex !== undefined) {
             return oas.api.servers?.at(serverIndex)?.url
           }
@@ -111,11 +122,12 @@ export const pluginOas = definePlugin<PluginOas>((options) => {
       return path.resolve(root, output.path, baseName)
     },
     async install() {
+      const oas = await this.getOas({ validate })
+
       if (!output) {
         return
       }
 
-      const oas = await this.getOas()
       await oas.dereference()
 
       const schemaGenerator = new SchemaGenerator(

package/src/types.ts

@@ -4,8 +4,12 @@ import type { KubbFile } from '@kubb/fabric-core/types'
 import type { contentType, HttpMethod, Oas, Operation, SchemaObject } from '@kubb/oas'
 import type { Generator } from './generators/types.ts'
 
+type GetOasOptions = {
+  validate?: boolean
+}
+
 type Context = {
-  getOas(): Promise<Oas>
+  getOas(options?: GetOasOptions): Promise<Oas>
   getBaseURL(): Promise<string | undefined>
 }
 

package/src/utils/getSchemas.ts

@@ -96,10 +96,10 @@ export function getSchemas({ oas, contentType, includes = ['schemas', 'requestBo
   if (includes.includes('responses')) {
     const responses = components?.responses || {}
     for (const [name, response] of Object.entries(responses)) {
-      const r = response as OasTypes.ResponseObject
-      if (r.content && !schemas[name]) {
-        const firstContentType = Object.keys(r.content)[0] || 'application/json'
-        schemas[name] = r.content?.[contentType || firstContentType]?.schema as OasTypes.SchemaObject
+      const responseObject = response as OasTypes.ResponseObject
+      if (responseObject.content && !schemas[name]) {
+        const firstContentType = Object.keys(responseObject.content)[0] || 'application/json'
+        schemas[name] = responseObject.content?.[contentType || firstContentType]?.schema as OasTypes.SchemaObject
       }
     }
   }
@@ -107,10 +107,10 @@ export function getSchemas({ oas, contentType, includes = ['schemas', 'requestBo
   if (includes.includes('requestBodies')) {
     const requestBodies = components?.requestBodies || {}
     for (const [name, request] of Object.entries(requestBodies)) {
-      const r = request as OasTypes.RequestBodyObject
-      if (r.content && !schemas[name]) {
-        const firstContentType = Object.keys(r.content)[0] || 'application/json'
-        schemas[name] = r.content?.[contentType || firstContentType]?.schema as OasTypes.SchemaObject
+      const requestObject = request as OasTypes.RequestBodyObject
+      if (requestObject.content && !schemas[name]) {
+        const firstContentType = Object.keys(requestObject.content)[0] || 'application/json'
+        schemas[name] = requestObject.content?.[contentType || firstContentType]?.schema as OasTypes.SchemaObject
       }
     }
   }