@skmtc/core 0.0.598 → 0.0.600

package/esm/oas/requestBody/toRequestBodiesV3.js

@@ -13,7 +13,9 @@ export const toRequestBodyV3 = ({ requestBody, context }) => {
     const { description, content, required, ...skipped } = requestBody;
     const extensionFields = toSpecificationExtensionsV3({
         skipped,
-        context
+        parent: requestBody,
+        context,
+        parentType: 'requestBody'
     });
     const fields = {
         description,
@@ -25,17 +27,13 @@ export const toRequestBodyV3 = ({ requestBody, context }) => {
     };
     return new OasRequestBody(fields);
 };
-export const toRequestBodiesV3 = ({ requestBodies, context }, options) => {
+export const toRequestBodiesV3 = ({ requestBodies, context }) => {
     if (!requestBodies) {
         return undefined;
     }
     const entries = Object.entries(requestBodies)
         .map(([key, value]) => {
-        return [
-            key,
-            context.trace(key, () => toRequestBodyV3({ requestBody: value, context })),
-            options
-        ];
+        return [key, context.trace(key, () => toRequestBodyV3({ requestBody: value, context }))];
     })
         .filter(([, value]) => Boolean(value));
     return Object.fromEntries(entries);

package/esm/oas/response/toResponseV3.d.ts

@@ -2,17 +2,16 @@ import type { ParseContext } from '../../context/ParseContext.js';
 import type { OpenAPIV3 } from 'openapi-types';
 import { OasResponse } from './Response.js';
 import type { OasRef } from '../ref/Ref.js';
-import type { TraceOptions } from '../../context/StackTrail.js';
 type ToResponsesV3Args = {
     responses: OpenAPIV3.ResponsesObject;
     context: ParseContext;
 };
-export declare const toResponsesV3: ({ responses, context }: ToResponsesV3Args, options?: TraceOptions) => Record<string, OasResponse | OasRef<"response">>;
+export declare const toResponsesV3: ({ responses, context }: ToResponsesV3Args) => Record<string, OasResponse | OasRef<"response">>;
 type ToOptionalResponsesV3Args = {
     responses: OpenAPIV3.ResponsesObject | undefined;
     context: ParseContext;
 };
-export declare const toOptionalResponsesV3: ({ responses, context }: ToOptionalResponsesV3Args, options?: TraceOptions) => Record<string, OasResponse | OasRef<"response">> | undefined;
+export declare const toOptionalResponsesV3: ({ responses, context }: ToOptionalResponsesV3Args) => Record<string, OasResponse | OasRef<"response">> | undefined;
 type ToResponseV3Args = {
     response: OpenAPIV3.ReferenceObject | OpenAPIV3.ResponseObject;
     context: ParseContext;

package/esm/oas/response/toResponseV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toResponseV3.d.ts","sourceRoot":"","sources":["../../../src/oas/response/toResponseV3.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC/D,KAAK,iBAAiB,GAAG;IACvB,SAAS,EAAE,SAAS,CAAC,eAAe,CAAA;IACpC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,aAAa,2BACA,iBAAiB,YAC/B,YAAY,KACrB,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAMjD,CAAA;AAED,KAAK,yBAAyB,GAAG;IAC/B,SAAS,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAA;IAChD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,qBAAqB,2BACR,yBAAyB,YACvC,YAAY,KACrB,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,SAMrD,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,cAAc,CAAA;IAC9D,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,YAAY,0BAGtB,gBAAgB,KAAG,WAAW,GAAG,MAAM,CAAC,UAAU,CAoBpD,CAAA"}
+{"version":3,"file":"toResponseV3.d.ts","sourceRoot":"","sources":["../../../src/oas/response/toResponseV3.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,EAAE,WAAW,EAAE,MAAM,eAAe,CAAA;AAE3C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAG3C,KAAK,iBAAiB,GAAG;IACvB,SAAS,EAAE,SAAS,CAAC,eAAe,CAAA;IACpC,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,aAAa,2BAGvB,iBAAiB,KAAG,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAmBrE,CAAA;AAED,KAAK,yBAAyB,GAAG;IAC/B,SAAS,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAA;IAChD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,qBAAqB,2BAG/B,yBAAyB,KAAG,MAAM,CAAC,MAAM,EAAE,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,CAAC,GAAG,SAMjF,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,QAAQ,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,cAAc,CAAA;IAC9D,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,YAAY,0BAGtB,gBAAgB,KAAG,WAAW,GAAG,MAAM,CAAC,UAAU,CAsBpD,CAAA"}

package/esm/oas/response/toResponseV3.js

@@ -4,16 +4,29 @@ import { isRef } from '../../helpers/refFns.js';
 import { toOptionalMediaTypeItemsV3 } from '../mediaType/toMediaTypeItemV3.js';
 import { OasResponse } from './Response.js';
 import { toSpecificationExtensionsV3 } from '../specificationExtensions/toSpecificationExtensionsV3.js';
-export const toResponsesV3 = ({ responses, context }, options) => {
-    return Object.fromEntries(Object.entries(responses).map(([key, value]) => {
-        return [key, context.trace(key, () => toResponseV3({ response: value, context }), options)];
-    }));
+export const toResponsesV3 = ({ responses, context }) => {
+    return Object.fromEntries(Object.entries(responses)
+        .map(([key, value]) => {
+        try {
+            return [key, context.trace(key, () => toResponseV3({ response: value, context }))];
+        }
+        catch (error) {
+            context.logWarning({
+                key,
+                message: error instanceof Error ? error.message : 'Failed to parse response',
+                parent: value,
+                type: 'INVALID_RESPONSE'
+            });
+            return undefined;
+        }
+    })
+        .filter(item => item !== undefined));
 };
-export const toOptionalResponsesV3 = ({ responses, context }, options) => {
+export const toOptionalResponsesV3 = ({ responses, context }) => {
     if (!responses) {
         return undefined;
     }
-    return toResponsesV3({ responses, context }, options);
+    return toResponsesV3({ responses, context });
 };
 export const toResponseV3 = ({ response, context }) => {
     if (isRef(response)) {
@@ -22,7 +35,9 @@ export const toResponseV3 = ({ response, context }) => {
     const { description, headers, content, ...skipped } = response;
     const extensionFields = toSpecificationExtensionsV3({
         skipped,
-        context
+        parent: response,
+        context,
+        parentType: 'response'
     });
     const fields = {
         description,

package/esm/oas/schema/Schema.d.ts

@@ -7,8 +7,7 @@ import type { OasObject } from '../object/Object.js';
 import type { OasString } from '../string/String.js';
 import type { OasUnknown } from '../unknown/Unknown.js';
 import type { OasUnion } from '../union/Union.js';
-import type { OasIntersection } from '../intersection/Intersection.js';
-export type OasSchema = OasArray | OasBoolean | OasInteger | OasNumber | OasObject | OasString | OasUnknown | OasUnion | OasIntersection;
+export type OasSchema = OasArray | OasBoolean | OasInteger | OasNumber | OasObject | OasString | OasUnknown | OasUnion;
 export type ToJsonSchemaOptions = {
     resolve: boolean;
 };

package/esm/oas/schema/Schema.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,iCAAiC,CAAA;AAEtE,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,UAAU,GACV,UAAU,GACV,SAAS,GACT,SAAS,GACT,SAAS,GACT,UAAU,GACV,QAAQ,GACR,eAAe,CAAA;AAEnB,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA"}
+{"version":3,"file":"Schema.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/Schema.ts"],"names":[],"mappings":"AAAA,OAAO,yBAAyB,CAAC;AACjC,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AACjD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAA;AACpD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,uBAAuB,CAAA;AACvD,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEjD,MAAM,MAAM,SAAS,GACjB,QAAQ,GACR,UAAU,GACV,UAAU,GACV,SAAS,GACT,SAAS,GACT,SAAS,GACT,UAAU,GACV,QAAQ,CAAA;AAEZ,MAAM,MAAM,mBAAmB,GAAG;IAChC,OAAO,EAAE,OAAO,CAAA;CACjB,CAAA"}

package/esm/oas/schema/schema-types.d.ts

@@ -1,14 +1,12 @@
-import { z } from '@hono/zod-openapi';
+import * as v from 'valibot';
 import { type OasArrayData } from '../array/array-types.js';
 import { type OasBooleanData } from '../boolean/boolean-types.js';
-import { type OasNullData } from '../null/null-types.js';
 import { type OasUnknownData } from '../unknown/unknown-types.js';
 import { type OasUnionData } from '../union/union-types.js';
 import { type OasIntegerData } from '../integer/integer-types.js';
 import { type OasNumberData } from '../number/number-types.js';
-import { type OasIntersectionData } from '../intersection/intersection-types.js';
 import { type OasStringData } from '../string/string-types.js';
 import { type OasObjectData } from '../object/object-types.js';
-export type OasSchemaData = OasArrayData | OasBooleanData | OasNullData | OasIntegerData | OasNumberData | OasStringData | OasObjectData | OasUnionData | OasIntersectionData | OasUnknownData;
-export declare const oasSchemaData: z.ZodType<OasSchemaData>;
+export type OasSchemaData = OasArrayData | OasBooleanData | OasIntegerData | OasNumberData | OasStringData | OasObjectData | OasUnionData | OasUnknownData;
+export declare const oasSchemaData: v.GenericSchema<OasSchemaData>;
 //# sourceMappingURL=schema-types.d.ts.map

package/esm/oas/schema/schema-types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"schema-types.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/schema-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,CAAC,EAAE,MAAM,mBAAmB,CAAA;AACrC,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACzE,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjF,OAAO,EAAe,KAAK,WAAW,EAAE,MAAM,uBAAuB,CAAA;AACrE,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjF,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACzE,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjF,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC7E,OAAO,EAEL,KAAK,mBAAmB,EACzB,MAAM,uCAAuC,CAAA;AAC9C,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC7E,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAE7E,MAAM,MAAM,aAAa,GACrB,YAAY,GACZ,cAAc,GACd,WAAW,GACX,cAAc,GACd,aAAa,GACb,aAAa,GACb,aAAa,GACb,YAAY,GACZ,mBAAmB,GACnB,cAAc,CAAA;AAElB,eAAO,MAAM,aAAa,EAAE,CAAC,CAAC,OAAO,CAAC,aAAa,CAWjD,CAAA"}
+{"version":3,"file":"schema-types.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/schema-types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,SAAS,CAAA;AAC5B,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACzE,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjF,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjF,OAAO,EAAgB,KAAK,YAAY,EAAE,MAAM,yBAAyB,CAAA;AACzE,OAAO,EAAkB,KAAK,cAAc,EAAE,MAAM,6BAA6B,CAAA;AACjF,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC7E,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAC7E,OAAO,EAAiB,KAAK,aAAa,EAAE,MAAM,2BAA2B,CAAA;AAE7E,MAAM,MAAM,aAAa,GACrB,YAAY,GACZ,cAAc,GACd,cAAc,GACd,aAAa,GACb,aAAa,GACb,aAAa,GACb,YAAY,GACZ,cAAc,CAAA;AAElB,eAAO,MAAM,aAAa,EAAE,CAAC,CAAC,aAAa,CAAC,aAAa,CASvD,CAAA"}

package/esm/oas/schema/schema-types.js

@@ -1,23 +1,19 @@
-import { z } from '@hono/zod-openapi';
+import * as v from 'valibot';
 import { oasArrayData } from '../array/array-types.js';
 import { oasBooleanData } from '../boolean/boolean-types.js';
-import { oasNullData } from '../null/null-types.js';
 import { oasUnknownData } from '../unknown/unknown-types.js';
 import { oasUnionData } from '../union/union-types.js';
 import { oasIntegerData } from '../integer/integer-types.js';
 import { oasNumberData } from '../number/number-types.js';
-import { oasIntersectionData } from '../intersection/intersection-types.js';
 import { oasStringData } from '../string/string-types.js';
 import { oasObjectData } from '../object/object-types.js';
-export const oasSchemaData = z.union([
+export const oasSchemaData = v.union([
     oasObjectData,
-    oasArrayData,
+    v.lazy(() => oasArrayData),
     oasBooleanData,
     oasStringData,
     oasNumberData,
-    oasNullData,
     oasIntegerData,
     oasUnionData,
-    oasIntersectionData,
     oasUnknownData
 ]);

package/esm/oas/schema/toSchemasV3.d.ts

@@ -2,17 +2,16 @@ import type { ParseContext } from '../../context/ParseContext.js';
 import type { OpenAPIV3 } from 'openapi-types';
 import type { OasSchema } from './Schema.js';
 import type { OasRef } from '../ref/Ref.js';
-import type { TraceOptions } from '../../context/StackTrail.js';
 type ToSchemasV3Args = {
     schemas: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject>;
     context: ParseContext;
 };
-export declare const toSchemasV3: ({ schemas, context }: ToSchemasV3Args, options?: TraceOptions) => Record<string, OasSchema | OasRef<"schema">>;
+export declare const toSchemasV3: ({ schemas, context }: ToSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">>;
 type ToOptionalSchemasV3Args = {
     schemas: Record<string, OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject> | undefined;
     context: ParseContext;
 };
-export declare const toOptionalSchemasV3: ({ schemas, context }: ToOptionalSchemasV3Args, options?: TraceOptions) => Record<string, OasSchema | OasRef<"schema">> | undefined;
+export declare const toOptionalSchemasV3: ({ schemas, context }: ToOptionalSchemasV3Args) => Record<string, OasSchema | OasRef<"schema">> | undefined;
 type ToSchemaV3Args = {
     schema: OpenAPIV3.ReferenceObject | OpenAPIV3.SchemaObject;
     context: ParseContext;

package/esm/oas/schema/toSchemasV3.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAU3C,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAA;AAC/D,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,WAAW,yBACA,eAAe,YAC3B,YAAY,KACrB,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAM7C,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACvF,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,mBAAmB,yBACR,uBAAuB,YACnC,YAAY,KACrB,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,SAMjD,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,UAAU,wBAAyB,cAAc,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAuC3F,CAAA;AAED,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,kBAAkB,wBAG5B,sBAAsB,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,SAM1D,CAAA"}
+{"version":3,"file":"toSchemasV3.d.ts","sourceRoot":"","sources":["../../../src/oas/schema/toSchemasV3.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AAEjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAE9C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,aAAa,CAAA;AAC5C,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,eAAe,CAAA;AAY3C,KAAK,eAAe,GAAG;IACrB,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,CAAA;IAC3E,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,WAAW,yBAGrB,eAAe,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAwB/D,CAAA;AAED,KAAK,uBAAuB,GAAG;IAC7B,OAAO,EAAE,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAC,GAAG,SAAS,CAAA;IACvF,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,mBAAmB,yBAG7B,uBAAuB,KAAG,MAAM,CAAC,MAAM,EAAE,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,CAAC,GAAG,SAM3E,CAAA;AAED,KAAK,cAAc,GAAG;IACpB,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,CAAA;IAC1D,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,UAAU,wBAAyB,cAAc,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAmI3F,CAAA;AA+CD,KAAK,sBAAsB,GAAG;IAC5B,MAAM,EAAE,SAAS,CAAC,eAAe,GAAG,SAAS,CAAC,YAAY,GAAG,SAAS,CAAA;IACtE,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,kBAAkB,wBAG5B,sBAAsB,KAAG,SAAS,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,SAM1D,CAAA"}

package/esm/oas/schema/toSchemasV3.js

@@ -9,17 +9,37 @@ import { toBoolean } from '../boolean/toBoolean.js';
 import { toString } from '../string/toString.js';
 import { toUnknown } from '../unknown/toUnknown.js';
 import { toUnion } from '../union/toUnion.js';
-import { toIntersection } from '../intersection/toIntersection.js';
-export const toSchemasV3 = ({ schemas, context }, options) => {
-    return Object.fromEntries(Object.entries(schemas).map(([key, schema]) => {
-        return [key, context.trace(key, () => toSchemaV3({ schema, context }), options)];
-    }));
+import { toGetRef } from '../../helpers/refFns.js';
+import { mergeIntersection } from '../_merge-all-of/merge-intersection.js';
+import { mergeUnion } from '../_merge-all-of/merge-union.js';
+export const toSchemasV3 = ({ schemas, context }) => {
+    return Object.fromEntries(Object.entries(schemas)
+        .map(([key, schema]) => {
+        try {
+            return [
+                key,
+                context.trace(key, () => {
+                    return toSchemaV3({ schema, context });
+                })
+            ];
+        }
+        catch (error) {
+            context.logWarning({
+                key,
+                message: error instanceof Error ? error.message : 'Failed to parse schema',
+                parent: schema,
+                type: 'INVALID_SCHEMA'
+            });
+            return undefined;
+        }
+    })
+        .filter(item => item !== undefined));
 };
-export const toOptionalSchemasV3 = ({ schemas, context }, options) => {
+export const toOptionalSchemasV3 = ({ schemas, context }) => {
     if (!schemas) {
         return undefined;
     }
-    return toSchemasV3({ schemas, context }, options);
+    return toSchemasV3({ schemas, context });
 };
 export const toSchemaV3 = ({ schema, context }) => {
     if (isRef(schema)) {
@@ -30,23 +50,42 @@ export const toSchemaV3 = ({ schema, context }) => {
     //   schema.nullable = true
     // }
     return match(schema)
-        .with({ oneOf: P.array() }, ({ oneOf: members, ...value }) => {
-        // if (members.length === 1) {
-        //   return toSchemaV3({ schema: members[0], context })
-        // }
-        return toUnion({ value, members, context });
+        .with({ allOf: P.array() }, schema => {
+        return context.trace('allOf', () => {
+            const merged = mergeIntersection({
+                schema,
+                getRef: toGetRef(context.documentObject)
+            });
+            return toSchemaV3({ schema: merged, context });
+        });
     })
-        .with({ anyOf: P.array() }, ({ anyOf: members, ...value }) => {
-        // if (members.length === 1) {
-        //   return toSchemaV3({ schema: members[0], context })
-        // }
-        return context.trace('anyOf', () => toUnion({ value, members, context }));
+        .with({ oneOf: P.array() }, oneOf => {
+        return context.trace('oneOf', () => {
+            const merged = mergeUnion({
+                schema: oneOf,
+                getRef: toGetRef(context.documentObject),
+                groupType: 'oneOf'
+            });
+            if (!('oneOf' in merged) || !Array.isArray(merged.oneOf)) {
+                throw new Error('Missing "oneOf" array');
+            }
+            const { oneOf: members, ...value } = merged;
+            return toUnion({ value, members, parentType: 'oneOf', context });
+        });
     })
-        .with({ allOf: P.array() }, ({ allOf: members, ...value }) => {
-        // if (members.length === 1) {
-        //   return toSchemaV3({ schema: members[0], context })
-        // }
-        return context.trace('allOf', () => toIntersection({ value, members, context }));
+        .with({ anyOf: P.array() }, anyOf => {
+        return context.trace('anyOf', () => {
+            const merged = mergeUnion({
+                schema: anyOf,
+                getRef: toGetRef(context.documentObject),
+                groupType: 'anyOf'
+            });
+            if (!('anyOf' in merged) || !Array.isArray(merged.anyOf)) {
+                throw new Error('Missing "anyOf" array');
+            }
+            const { anyOf: members, ...value } = merged;
+            return toUnion({ value, members, parentType: 'anyOf', context });
+        });
     })
         .with({ type: 'object' }, value => toObject({ value, context }))
         .with({ type: 'array' }, value => toArray({ value, context }))
@@ -54,7 +93,99 @@ export const toSchemaV3 = ({ schema, context }) => {
         .with({ type: 'number' }, value => toNumber({ value, context }))
         .with({ type: 'boolean' }, value => toBoolean({ value, context }))
         .with({ type: 'string' }, value => toString({ value, context }))
-        .otherwise(value => toUnknown({ value, context }));
+        .otherwise(value => {
+        if (possibleObject(value)) {
+            context.logWarningNoKey({
+                message: 'Object has "properties" property, but is missing type="object" property',
+                parent: value,
+                type: 'MISSING_OBJECT_TYPE'
+            });
+            return toObject({
+                value: {
+                    ...value,
+                    type: 'object'
+                },
+                context
+            });
+        }
+        if (possibleArray(value)) {
+            context.logWarningNoKey({
+                message: 'Object has "items" property, but is missing type="array" property',
+                parent: value,
+                type: 'MISSING_ARRAY_TYPE'
+            });
+            return toArray({
+                value: {
+                    ...value,
+                    type: 'array'
+                    // Adding cast here since {} is a valid value for items
+                },
+                context
+            });
+        }
+        if (possibleBoolean(value)) {
+            context.logWarningNoKey({
+                message: 'Object has a boolean "default" or "example" property, but is missing type="boolean" property',
+                parent: value,
+                type: 'MISSING_BOOLEAN_TYPE'
+            });
+            return toBoolean({
+                value: {
+                    ...value,
+                    type: 'boolean'
+                },
+                context
+            });
+        }
+        if (possibleString(value)) {
+            context.logWarningNoKey({
+                message: 'Object has a string "default" or "example" property, but is missing type="string" property',
+                parent: value,
+                type: 'MISSING_STRING_TYPE'
+            });
+            return toString({
+                value: {
+                    ...value,
+                    type: 'string'
+                },
+                context
+            });
+        }
+        return toUnknown({ value, context });
+    });
+};
+const possibleString = (value) => {
+    return (value &&
+        typeof value === 'object' &&
+        (('default' in value && typeof value.default === 'string') ||
+            ('example' in value && typeof value.example === 'string') ||
+            ('enum' in value &&
+                Array.isArray(value.enum) &&
+                value.enum.every(item => typeof item === 'string')) ||
+            ('format' in value &&
+                typeof value.format === 'string' &&
+                ['date', 'date-time', 'binary', 'byte'].includes(value.format))));
+};
+const possibleBoolean = (value) => {
+    return (value &&
+        typeof value === 'object' &&
+        (('default' in value && typeof value.default === 'boolean') ||
+            ('example' in value && typeof value.example === 'boolean')));
+};
+const possibleArray = (value) => {
+    return (value &&
+        typeof value === 'object' &&
+        'items' in value &&
+        value.items &&
+        typeof value.items === 'object' &&
+        value.items);
+};
+const possibleObject = (value) => {
+    return (value &&
+        typeof value === 'object' &&
+        'properties' in value &&
+        typeof value.properties === 'object' &&
+        value.properties);
 };
 export const toOptionalSchemaV3 = ({ schema, context }) => {
     if (!schema) {

package/esm/oas/securityRequirement/SecurityRequirement.d.ts

@@ -0,0 +1,11 @@
+import type { OpenAPIV3 } from 'openapi-types';
+export type SecurityFields = {
+    requirement: Record<string, string[]>;
+};
+export declare class OasSecurityRequirement {
+    oasType: 'securityRequirement';
+    requirement: Record<string, string[]>;
+    constructor(fields: SecurityFields);
+    toJsonSchema(): OpenAPIV3.SecurityRequirementObject;
+}
+//# sourceMappingURL=SecurityRequirement.d.ts.map

package/esm/oas/securityRequirement/SecurityRequirement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SecurityRequirement.d.ts","sourceRoot":"","sources":["../../../src/oas/securityRequirement/SecurityRequirement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,eAAe,CAAA;AAC9C,MAAM,MAAM,cAAc,GAAG;IAC3B,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;CACtC,CAAA;AAED,qBAAa,sBAAsB;IACjC,OAAO,EAAE,qBAAqB,CAAwB;IACtD,WAAW,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,CAAA;gBAEzB,MAAM,EAAE,cAAc;IAIlC,YAAY,IAAI,SAAS,CAAC,yBAAyB;CAKpD"}

package/esm/oas/securityRequirement/SecurityRequirement.js

@@ -0,0 +1,22 @@
+export class OasSecurityRequirement {
+    constructor(fields) {
+        Object.defineProperty(this, "oasType", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: 'securityRequirement'
+        });
+        Object.defineProperty(this, "requirement", {
+            enumerable: true,
+            configurable: true,
+            writable: true,
+            value: void 0
+        });
+        this.requirement = fields.requirement;
+    }
+    toJsonSchema() {
+        return {
+            ...this.requirement
+        };
+    }
+}

package/esm/oas/securityRequirement/toSecurityRequirement.d.ts

@@ -0,0 +1,9 @@
+import type { ParseContext } from '../../context/ParseContext.js';
+import { OasSecurityRequirement } from './SecurityRequirement.js';
+type ToSecurityRequirementsV3Args = {
+    security: Record<string, string[]>[] | undefined;
+    context: ParseContext;
+};
+export declare const toSecurityRequirementsV3: ({ security }: ToSecurityRequirementsV3Args) => OasSecurityRequirement[] | undefined;
+export {};
+//# sourceMappingURL=toSecurityRequirement.d.ts.map

package/esm/oas/securityRequirement/toSecurityRequirement.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"toSecurityRequirement.d.ts","sourceRoot":"","sources":["../../../src/oas/securityRequirement/toSecurityRequirement.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAA;AAEjE,KAAK,4BAA4B,GAAG;IAClC,QAAQ,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,EAAE,GAAG,SAAS,CAAA;IAChD,OAAO,EAAE,YAAY,CAAA;CACtB,CAAA;AAED,eAAO,MAAM,wBAAwB,iBAElC,4BAA4B,KAAG,sBAAsB,EAAE,GAAG,SAQ5D,CAAA"}

package/esm/oas/securityRequirement/toSecurityRequirement.js

@@ -0,0 +1,9 @@
+import { OasSecurityRequirement } from './SecurityRequirement.js';
+export const toSecurityRequirementsV3 = ({ security }) => {
+    if (!security) {
+        return undefined;
+    }
+    return security.map(requirement => {
+        return new OasSecurityRequirement({ requirement });
+    });
+};

package/esm/oas/securitySchemes/SecurityScheme.d.ts

@@ -0,0 +1,113 @@
+import type { OasRef } from '../ref/Ref.js';
+import type { OpenAPIV3 } from 'openapi-types';
+export type SecuritySchemeFields = HttpSecuritySchemeFields | ApiKeySecuritySchemeFields | OAuth2SecuritySchemeFields | OpenIdSecuritySchemeFields;
+export type HttpSecuritySchemeFields = {
+    description?: string;
+    scheme: string;
+    bearerFormat?: string;
+};
+export type ApiKeySecuritySchemeFields = {
+    description?: string;
+    name: string;
+    in: 'header' | 'query' | 'cookie';
+};
+export type OAuth2SecuritySchemeFields = {
+    description?: string;
+    flows: {
+        authorizationCode: {
+            authorizationUrl: string;
+            tokenUrl: string;
+            refreshUrl?: string | undefined;
+            scopes: Record<string, string>;
+        };
+        clientCredentials: {
+            tokenUrl: string;
+            refreshUrl?: string | undefined;
+            scopes: Record<string, string>;
+        };
+        implicit: {
+            authorizationUrl: string;
+            refreshUrl?: string | undefined;
+            scopes: Record<string, string>;
+        };
+        password: {
+            tokenUrl: string;
+            refreshUrl?: string | undefined;
+            scopes: Record<string, string>;
+        };
+    };
+};
+export type OpenIdSecuritySchemeFields = {
+    description?: string;
+    openIdConnectUrl: string;
+};
+export declare class OasHttpSecurityScheme {
+    oasType: 'securityScheme';
+    type: 'http';
+    description: string | undefined;
+    scheme: string;
+    bearerFormat: string | undefined;
+    constructor(fields: HttpSecuritySchemeFields);
+    isRef(): this is OasRef<'securityScheme'>;
+    resolve(): OasHttpSecurityScheme;
+    resolveOnce(): OasHttpSecurityScheme;
+    toJsonSchema(): OpenAPIV3.HttpSecurityScheme;
+}
+export declare class OasApiKeySecurityScheme {
+    oasType: 'securityScheme';
+    type: 'apiKey';
+    description: string | undefined;
+    name: string;
+    location: 'query' | 'header' | 'cookie';
+    constructor(fields: ApiKeySecuritySchemeFields);
+    isRef(): this is OasRef<'securityScheme'>;
+    resolve(): OasApiKeySecurityScheme;
+    resolveOnce(): OasApiKeySecurityScheme;
+    toJsonSchema(): OpenAPIV3.ApiKeySecurityScheme;
+}
+export declare class OasOAuth2SecurityScheme {
+    oasType: 'securityScheme';
+    type: 'oauth2';
+    description: string | undefined;
+    flows: {
+        authorizationCode: {
+            authorizationUrl: string;
+            tokenUrl: string;
+            refreshUrl?: string | undefined;
+            scopes: Record<string, string>;
+        };
+        clientCredentials: {
+            tokenUrl: string;
+            refreshUrl?: string | undefined;
+            scopes: Record<string, string>;
+        };
+        implicit: {
+            authorizationUrl: string;
+            refreshUrl?: string | undefined;
+            scopes: Record<string, string>;
+        };
+        password: {
+            tokenUrl: string;
+            refreshUrl?: string | undefined;
+            scopes: Record<string, string>;
+        };
+    };
+    constructor(fields: OAuth2SecuritySchemeFields);
+    isRef(): this is OasRef<'securityScheme'>;
+    resolve(): OasOAuth2SecurityScheme;
+    resolveOnce(): OasOAuth2SecurityScheme;
+    toJsonSchema(): OpenAPIV3.OAuth2SecurityScheme;
+}
+export declare class OasOpenIdSecurityScheme {
+    oasType: 'securityScheme';
+    type: 'openIdConnect';
+    description: string | undefined;
+    openIdConnectUrl: string;
+    constructor(fields: OpenIdSecuritySchemeFields);
+    isRef(): this is OasRef<'securityScheme'>;
+    resolve(): OasOpenIdSecurityScheme;
+    resolveOnce(): OasOpenIdSecurityScheme;
+    toJsonSchema(): OpenAPIV3.OpenIdSecurityScheme;
+}
+export type OasSecurityScheme = OasHttpSecurityScheme | OasApiKeySecurityScheme | OasOAuth2SecurityScheme | OasOpenIdSecurityScheme;
+//# sourceMappingURL=SecurityScheme.d.ts.map

package/esm/oas/securitySchemes/SecurityScheme.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"SecurityScheme.d.ts","sourceRoot":"","sources":["../../../src/oas/securitySchemes/SecurityScheme.ts"],"names":[],"mappings":"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"}