@skmtc/core 0.29.0 → 0.31.0

package/script/parse/logBodyMediaTypes.js

@@ -0,0 +1,54 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.logBodyMediaTypes = void 0;
+const jsonMediaType_js_1 = require("../oas/mediaType/jsonMediaType.js");
+/**
+ * Log at most one issue for a parsed response or request body, from the same
+ * choice the lookups make (`toJsonContent`), so the issue and the lookup
+ * cannot disagree. Called after the body is built, so a body that fails to
+ * parse logs nothing.
+ *
+ * - `WILDCARD_MEDIA_TYPE` (`warning`): the body is read from `*\/*` as JSON,
+ *   though the document does not say its format.
+ * - `NO_JSON_MEDIA_TYPE` (`debug`): no lookup reads the body, and its keys
+ *   include a range (`*\/*` with a scalar schema, `application/*`), so its
+ *   format is unknown.
+ *
+ * A body with only specific non-JSON types (`multipart/form-data`,
+ * `application/octet-stream`, `text/plain`) logs nothing: that is a normal
+ * text, form or binary body.
+ */
+const logBodyMediaTypes = ({ content, stackTrail, context }) => {
+    const mediaTypes = Object.keys(content ?? {});
+    if (mediaTypes.length === 0) {
+        return;
+    }
+    const listed = mediaTypes.map(mediaType => `"${mediaType}"`).join(', ');
+    // `parent` is only the keys: the issue log serializes it on every issue.
+    const parent = { mediaTypes };
+    const chosen = (0, jsonMediaType_js_1.toJsonContent)(content);
+    if (chosen !== undefined) {
+        if ((0, jsonMediaType_js_1.isAnyMediaType)(chosen.mediaType)) {
+            context.logIssue({
+                key: 'content',
+                level: 'warning',
+                type: 'WILDCARD_MEDIA_TYPE',
+                message: `Content has no JSON media type (${listed}), so the body is read from "*/*" as JSON although the document does not say its format`,
+                parent,
+                stackTrail
+            });
+        }
+        return;
+    }
+    if (mediaTypes.some(mediaType => (0, jsonMediaType_js_1.toMediaTypeEssence)(mediaType).includes('*'))) {
+        context.logIssue({
+            key: 'content',
+            level: 'debug',
+            type: 'NO_JSON_MEDIA_TYPE',
+            message: `Content names only a media type range or non-JSON types (${listed}), so no lookup without a media type reads its schema`,
+            parent,
+            stackTrail
+        });
+    }
+};
+exports.logBodyMediaTypes = logBodyMediaTypes;

package/script/parse/toOasDialect.d.ts

@@ -1,12 +1,13 @@
 /**
  * The OpenAPI dialects SKMTC parses natively. Each has its own complete
- * parser tree (`core/parse/v3-0`, `core/parse/v3-1`); this module is the
- * ONLY place a document's version is examined. Once a dialect is chosen
- * the matching parser runs top-to-bottom and never re-checks the version,
- * so a 3.0 document can never reach a line of 3.1 logic (or vice versa) —
- * there is no downstream version branch to get wrong.
+ * parser tree (`core/parse/v3-0`, `core/parse/v3-1`, `core/parse/v3-2`);
+ * this module is the ONLY place a document's version is examined. Once a
+ * dialect is chosen the matching parser runs top-to-bottom and never
+ * re-checks the version, so a 3.0 document can never reach a line of 3.1
+ * logic (or vice versa) — there is no downstream version branch to get
+ * wrong.
  */
-export type OasDialect = '3.0' | '3.1';
+export type OasDialect = '3.0' | '3.1' | '3.2';
 /**
  * Map an OpenAPI document's `openapi` version string to its parser
  * dialect.
@@ -15,7 +16,7 @@ export type OasDialect = '3.0' | '3.1';
  * precondition failure — there is no sensible parser to pick — so it throws
  * rather than silently defaulting to one dialect and masking the error. A
  * loose `openapi.startsWith('3.1') ? '3.1' : '3.0'` would route every
- * non-3.1 value (a typo, `3.2`, `4.0`, a missing field) into 3.0 unnoticed;
+ * non-3.1 value (a typo, `4.0`, a missing field) into 3.0 unnoticed;
  * that is the footgun this avoids. Mirrors `@skmtc/convert`'s
  * `toV3Document`, which likewise throws on an unrecognized version.
  *

package/script/parse/toOasDialect.js

@@ -9,7 +9,7 @@ exports.toOasDialect = void 0;
  * precondition failure — there is no sensible parser to pick — so it throws
  * rather than silently defaulting to one dialect and masking the error. A
  * loose `openapi.startsWith('3.1') ? '3.1' : '3.0'` would route every
- * non-3.1 value (a typo, `3.2`, `4.0`, a missing field) into 3.0 unnoticed;
+ * non-3.1 value (a typo, `4.0`, a missing field) into 3.0 unnoticed;
  * that is the footgun this avoids. Mirrors `@skmtc/convert`'s
  * `toV3Document`, which likewise throws on an unrecognized version.
  *
@@ -21,6 +21,8 @@ const toOasDialect = (openapi) => {
         return '3.0';
     if (openapi?.startsWith('3.1'))
         return '3.1';
-    throw new Error(`Unsupported OpenAPI version: ${openapi ?? '(missing)'} — expected 3.0.x or 3.1.x`);
+    if (openapi?.startsWith('3.2'))
+        return '3.2';
+    throw new Error(`Unsupported OpenAPI version: ${openapi ?? '(missing)'} — expected 3.0.x, 3.1.x or 3.2.x`);
 };
 exports.toOasDialect = toOasDialect;

package/script/parse/v3-0/methods.d.ts

@@ -0,0 +1,11 @@
+import type { Method } from '../../types/Method.js';
+/**
+ * A path item field that holds an Operation Object in OpenAPI 3.0. A
+ * `query` key is not one of them: it stays a skipped field.
+ */
+export type PathItemMethod = Exclude<Method, 'query'>;
+export declare const pathItemMethods: readonly PathItemMethod[];
+/**
+ * Returns `key` as a {@link PathItemMethod} when it is one of {@link pathItemMethods}.
+ */
+export declare const toPathItemMethod: (key: string) => PathItemMethod | undefined;

package/script/parse/v3-0/methods.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toPathItemMethod = exports.pathItemMethods = void 0;
+exports.pathItemMethods = [
+    'get',
+    'put',
+    'post',
+    'delete',
+    'options',
+    'head',
+    'patch',
+    'trace'
+];
+/**
+ * Returns `key` as a {@link PathItemMethod} when it is one of {@link pathItemMethods}.
+ */
+const toPathItemMethod = (key) => {
+    return exports.pathItemMethods.find(method => method === key);
+};
+exports.toPathItemMethod = toPathItemMethod;

package/script/parse/v3-0/operation/toOperationsV3.js

@@ -6,7 +6,7 @@ const toResponseV3_js_1 = require("../response/toResponseV3.js");
 const toParameterV3_js_1 = require("../parameter/toParameterV3.js");
 const Operation_js_1 = require("../../../oas/operation/Operation.js");
 const toPathItemV3_js_1 = require("../pathItem/toPathItemV3.js");
-const Method_js_1 = require("../../../types/Method.js");
+const methods_js_1 = require("../methods.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
 const toSecurityRequirement_js_1 = require("../securityRequirement/toSecurityRequirement.js");
 const isEmpty_js_1 = require("../../../helpers/isEmpty.js");
@@ -58,14 +58,14 @@ const toOperationsV3 = ({ paths, stackTrail, context }) => {
                 return [];
             }
             const cleaned = Object.entries(pathItem).reduce(({ rest, methodObject }, [key, operation]) => {
-                const isMethod = Method_js_1.methodValues.includes(key);
-                if (isMethod) {
-                    const { [key]: _deleted, ...remaining } = rest;
+                const method = (0, methods_js_1.toPathItemMethod)(key);
+                if (method) {
+                    const { [method]: _deleted, ...remaining } = rest;
                     return {
                         rest: remaining,
                         methodObject: {
                             ...methodObject,
-                            [key]: operation
+                            [method]: operation
                         }
                     };
                 }

package/script/parse/v3-0/parameter/toParameterV3.d.ts

@@ -1,9 +1,10 @@
 import type { ParseContextType } from '../../../context/parseTypes.js';
-import { type OasParameterLocation } from '../../../oas/parameter/parameter-types.js';
+import type { OasParameterLocation } from '../../../oas/parameter/parameter-types.js';
 import type { OpenAPIV3 } from 'openapi-types';
 import { OasParameter } from '../../../oas/parameter/Parameter.js';
 import type { OasRef } from '../../../oas/ref/Ref.js';
 import type { StackTrail } from '../../../context/StackTrail.js';
+type ParameterLocation = Exclude<OasParameterLocation, 'querystring'>;
 export type ToParameterListV3Args = {
     parameters: (OpenAPIV3.ParameterObject | OpenAPIV3.ReferenceObject)[] | undefined;
     stackTrail: StackTrail;
@@ -29,7 +30,7 @@ export type ToParameterV3Args = {
 };
 export type ToStyleArgs = {
     style: string | undefined;
-    location: OasParameterLocation;
+    location: ParameterLocation;
     stackTrail: StackTrail;
 };
 export type ToExplodeArgs = {
@@ -37,3 +38,4 @@ export type ToExplodeArgs = {
     style: string | undefined;
     stackTrail: StackTrail;
 };
+export {};

package/script/parse/v3-0/parameter/toParameterV3.js

@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toOptionalParametersV3 = exports.toParametersV3 = exports.toParameterListV3 = void 0;
 const tryParseAt_js_1 = require("../../../context/tryParseAt.js");
 const refFns_js_1 = require("../../../helpers/refFns.js");
-const parameter_types_js_1 = require("../../../oas/parameter/parameter-types.js");
 const toExamplesV3_js_1 = require("../example/toExamplesV3.js");
 const toRefV31_js_1 = require("../ref/toRefV31.js");
 const toSchemasV3_js_1 = require("../schema/toSchemasV3.js");
@@ -44,6 +43,21 @@ const toMediaTypeItemV3_js_1 = require("../mediaType/toMediaTypeItemV3.js");
 const Parameter_js_1 = require("../../../oas/parameter/Parameter.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
 const v = __importStar(require("valibot"));
+const parameterLocation = v.enum({
+    query: 'query',
+    header: 'header',
+    path: 'path',
+    cookie: 'cookie'
+});
+const parameterStyle = v.enum({
+    matrix: 'matrix',
+    label: 'label',
+    form: 'form',
+    simple: 'simple',
+    spaceDelimited: 'spaceDelimited',
+    pipeDelimited: 'pipeDelimited',
+    deepObject: 'deepObject'
+});
 const toParameterListV3 = ({ parameters, stackTrail, context }) => {
     if (!parameters) {
         return undefined;
@@ -91,7 +105,7 @@ const toParameterV3 = ({ parameter, stackTrail, context }) => {
         stackTrail,
         parentType: 'parameter'
     });
-    const parsedLocation = v.parse(parameter_types_js_1.oasParameterLocation, location);
+    const parsedLocation = v.parse(parameterLocation, location);
     if (parsedLocation === 'path' && !required) {
         console.warn(`Path parameters must be required`);
     }
@@ -121,7 +135,7 @@ const toParameterV3 = ({ parameter, stackTrail, context }) => {
     return context.withStackTrail(stackTrail, () => new Parameter_js_1.OasParameter(fields, context));
 };
 const toStyle = ({ style, location, stackTrail }) => {
-    const parsed = v.parse(v.optional(parameter_types_js_1.oasParameterStyle), style);
+    const parsed = v.parse(v.optional(parameterStyle), style);
     if (parsed !== undefined) {
         return parsed;
     }

package/script/parse/v3-0/requestBody/toRequestBodiesV3.js

@@ -6,6 +6,7 @@ const toRefV31_js_1 = require("../ref/toRefV31.js");
 const toMediaTypeItemV3_js_1 = require("../mediaType/toMediaTypeItemV3.js");
 const RequestBody_js_1 = require("../../../oas/requestBody/RequestBody.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
+const logBodyMediaTypes_js_1 = require("../../logBodyMediaTypes.js");
 const toRequestBodyV3 = ({ requestBody, stackTrail, context }) => {
     if (!requestBody) {
         return undefined;
@@ -29,7 +30,9 @@ const toRequestBodyV3 = ({ requestBody, stackTrail, context }) => {
         required,
         extensionFields
     };
-    return context.withStackTrail(stackTrail, () => new RequestBody_js_1.OasRequestBody(fields, context));
+    const parsed = context.withStackTrail(stackTrail, () => new RequestBody_js_1.OasRequestBody(fields, context));
+    (0, logBodyMediaTypes_js_1.logBodyMediaTypes)({ content: fields.content, stackTrail, context });
+    return parsed;
 };
 exports.toRequestBodyV3 = toRequestBodyV3;
 const toRequestBodiesV3 = ({ requestBodies, stackTrail, context }) => {

package/script/parse/v3-0/response/toResponseV3.js

@@ -9,6 +9,7 @@ const toMediaTypeItemV3_js_1 = require("../mediaType/toMediaTypeItemV3.js");
 const Response_js_1 = require("../../../oas/response/Response.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
 const tryParseAt_js_1 = require("../../../context/tryParseAt.js");
+const logBodyMediaTypes_js_1 = require("../../logBodyMediaTypes.js");
 const toResponsesV3 = ({ responses, stackTrail, context }) => {
     const output = {};
     const entries = Object.entries(responses);
@@ -50,12 +51,14 @@ const toResponseV3 = ({ response, stackTrail, context }) => {
     const parsedHeaders = stackTrail.trace('headers', st => (0, toHeadersV3_js_1.toHeadersV3)({ headers, stackTrail: st, context }));
     const parsedLinks = stackTrail.trace('links', st => (0, toLinksV3_js_1.toLinksV3)({ links, stackTrail: st, context }));
     const parsedContent = stackTrail.trace('content', st => (0, toMediaTypeItemV3_js_1.toOptionalMediaTypeItemsV3)({ content, stackTrail: st, context }));
-    return context.withStackTrail(stackTrail, () => new Response_js_1.OasResponse({
+    const parsed = context.withStackTrail(stackTrail, () => new Response_js_1.OasResponse({
         description,
         headers: parsedHeaders,
         links: parsedLinks,
         content: parsedContent,
         extensionFields
     }, context));
+    (0, logBodyMediaTypes_js_1.logBodyMediaTypes)({ content: parsedContent, stackTrail, context });
+    return parsed;
 };
 exports.toResponseV3 = toResponseV3;

package/script/parse/v3-0/securitySchemes/toSecuritySchemes.js

@@ -39,8 +39,8 @@ const v = __importStar(require("valibot"));
 const security_scheme_types_js_1 = require("../../../oas/securitySchemes/security-scheme-types.js");
 const toRefV31_js_1 = require("../ref/toRefV31.js");
 const refFns_js_1 = require("../../../helpers/refFns.js");
-const isEmpty_js_1 = require("../../../helpers/isEmpty.js");
 const tryParseAt_js_1 = require("../../../context/tryParseAt.js");
+const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
 const toSecuritySchemesV3 = ({ securitySchemes, stackTrail, context }) => {
     if (!securitySchemes) {
         return undefined;
@@ -64,21 +64,29 @@ const toSecuritySchemesV3 = ({ securitySchemes, stackTrail, context }) => {
     return output;
 };
 exports.toSecuritySchemesV3 = toSecuritySchemesV3;
+/**
+ * Log the keys of `value` that `known` does not name as skipped fields.
+ * `v.parse` on a `v.object` schema strips unknown keys, so they are read
+ * off the raw object. `x-` extensions are not logged.
+ */
+const logSkippedKeys = ({ value, known, parentType, stackTrail, context }) => {
+    const skipped = Object.fromEntries(Object.entries(value).filter(([key]) => !Object.hasOwn(known, key)));
+    (0, toSpecificationExtensionsV3_js_1.toSpecificationExtensionsV3)({ skipped, parent: value, parentType, stackTrail, context });
+};
 const toSecuritySchemeV3 = ({ securityScheme, stackTrail, context }) => {
     if ((0, refFns_js_1.isRef)(securityScheme)) {
         return (0, toRefV31_js_1.toRefV31)({ ref: securityScheme, refType: 'securityScheme', stackTrail, context });
     }
     switch (securityScheme.type) {
         case 'http': {
-            const { type: _type, description, scheme, bearerFormat, ...skipped } = v.parse(security_scheme_types_js_1.oasHttpSecuritySchemeData, securityScheme);
-            if (!(0, isEmpty_js_1.isEmpty)(skipped)) {
-                context.logSkippedFields({
-                    skipped,
-                    parent: securityScheme,
-                    stackTrail,
-                    parentType: 'securityScheme:http'
-                });
-            }
+            const { description, scheme, bearerFormat } = v.parse(security_scheme_types_js_1.oasHttpSecuritySchemeData, securityScheme);
+            logSkippedKeys({
+                value: securityScheme,
+                known: security_scheme_types_js_1.oasHttpSecuritySchemeData.entries,
+                parentType: 'securityScheme:http',
+                stackTrail,
+                context
+            });
             return new SecurityScheme_js_1.OasHttpSecurityScheme({
                 description,
                 scheme,
@@ -86,15 +94,14 @@ const toSecuritySchemeV3 = ({ securityScheme, stackTrail, context }) => {
             });
         }
         case 'apiKey': {
-            const { type: _type, in: location, description, name, ...skipped } = v.parse(security_scheme_types_js_1.oasApiKeySecuritySchemeData, securityScheme);
-            if (!(0, isEmpty_js_1.isEmpty)(skipped)) {
-                context.logSkippedFields({
-                    skipped,
-                    parent: securityScheme,
-                    stackTrail,
-                    parentType: 'securityScheme:apiKey'
-                });
-            }
+            const { in: location, description, name } = v.parse(security_scheme_types_js_1.oasApiKeySecuritySchemeData, securityScheme);
+            logSkippedKeys({
+                value: securityScheme,
+                known: security_scheme_types_js_1.oasApiKeySecuritySchemeData.entries,
+                parentType: 'securityScheme:apiKey',
+                stackTrail,
+                context
+            });
             return new SecurityScheme_js_1.OasApiKeySecurityScheme({
                 description,
                 name,
@@ -102,30 +109,35 @@ const toSecuritySchemeV3 = ({ securityScheme, stackTrail, context }) => {
             });
         }
         case 'oauth2': {
-            const { type: _type, flows, description, ...skipped } = v.parse(security_scheme_types_js_1.oasOAuth2SecuritySchemeData, securityScheme);
-            if (!(0, isEmpty_js_1.isEmpty)(skipped)) {
-                context.logSkippedFields({
-                    skipped,
-                    parent: securityScheme,
-                    stackTrail,
-                    parentType: 'securityScheme:oauth2'
-                });
-            }
+            const { flows, description } = v.parse(security_scheme_types_js_1.oasOAuth2SecuritySchemeData, securityScheme);
+            logSkippedKeys({
+                value: securityScheme,
+                known: security_scheme_types_js_1.oasOAuth2SecuritySchemeData.entries,
+                parentType: 'securityScheme:oauth2',
+                stackTrail,
+                context
+            });
+            stackTrail.trace('flows', st => logSkippedKeys({
+                value: securityScheme.flows,
+                known: security_scheme_types_js_1.oasOAuth2FlowsData.entries,
+                parentType: 'oauthFlows',
+                stackTrail: st,
+                context
+            }));
             return new SecurityScheme_js_1.OasOAuth2SecurityScheme({
                 description,
                 flows
             });
         }
         case 'openIdConnect': {
-            const { type: _type, description, openIdConnectUrl, ...skipped } = v.parse(security_scheme_types_js_1.oasOpenIdSecuritySchemeData, securityScheme);
-            if (!(0, isEmpty_js_1.isEmpty)(skipped)) {
-                context.logSkippedFields({
-                    skipped,
-                    parent: securityScheme,
-                    stackTrail,
-                    parentType: 'securityScheme:openIdConnect'
-                });
-            }
+            const { description, openIdConnectUrl } = v.parse(security_scheme_types_js_1.oasOpenIdSecuritySchemeData, securityScheme);
+            logSkippedKeys({
+                value: securityScheme,
+                known: security_scheme_types_js_1.oasOpenIdSecuritySchemeData.entries,
+                parentType: 'securityScheme:openIdConnect',
+                stackTrail,
+                context
+            });
             return new SecurityScheme_js_1.OasOpenIdSecurityScheme({
                 description,
                 openIdConnectUrl

package/script/parse/v3-0/webhook/toWebhooksV3.js

@@ -6,7 +6,7 @@ const toResponseV3_js_1 = require("../response/toResponseV3.js");
 const toParameterV3_js_1 = require("../parameter/toParameterV3.js");
 const Webhook_js_1 = require("../../../oas/webhook/Webhook.js");
 const toPathItemV3_js_1 = require("../pathItem/toPathItemV3.js");
-const Method_js_1 = require("../../../types/Method.js");
+const methods_js_1 = require("../methods.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
 const toSecurityRequirement_js_1 = require("../securityRequirement/toSecurityRequirement.js");
 const isEmpty_js_1 = require("../../../helpers/isEmpty.js");
@@ -73,14 +73,14 @@ const toWebhooksV3 = ({ webhooks, stackTrail, context }) => {
                 return [];
             }
             const cleaned = Object.entries(pathItem).reduce(({ rest, methodObject }, [key, operation]) => {
-                const isMethod = Method_js_1.methodValues.includes(key);
-                if (isMethod) {
-                    const { [key]: _deleted, ...remaining } = rest;
+                const method = (0, methods_js_1.toPathItemMethod)(key);
+                if (method) {
+                    const { [method]: _deleted, ...remaining } = rest;
                     return {
                         rest: remaining,
                         methodObject: {
                             ...methodObject,
-                            [key]: operation
+                            [method]: operation
                         }
                     };
                 }

package/script/parse/v3-1/methods.d.ts

@@ -0,0 +1,11 @@
+import type { Method } from '../../types/Method.js';
+/**
+ * A path item field that holds an Operation Object in OpenAPI 3.1. A
+ * `query` key is not one of them: it stays a skipped field.
+ */
+export type PathItemMethod = Exclude<Method, 'query'>;
+export declare const pathItemMethods: readonly PathItemMethod[];
+/**
+ * Returns `key` as a {@link PathItemMethod} when it is one of {@link pathItemMethods}.
+ */
+export declare const toPathItemMethod: (key: string) => PathItemMethod | undefined;

package/script/parse/v3-1/methods.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.toPathItemMethod = exports.pathItemMethods = void 0;
+exports.pathItemMethods = [
+    'get',
+    'put',
+    'post',
+    'delete',
+    'options',
+    'head',
+    'patch',
+    'trace'
+];
+/**
+ * Returns `key` as a {@link PathItemMethod} when it is one of {@link pathItemMethods}.
+ */
+const toPathItemMethod = (key) => {
+    return exports.pathItemMethods.find(method => method === key);
+};
+exports.toPathItemMethod = toPathItemMethod;

package/script/parse/v3-1/operation/toOperationsV3.js

@@ -6,7 +6,7 @@ const toResponseV3_js_1 = require("../response/toResponseV3.js");
 const toParameterV3_js_1 = require("../parameter/toParameterV3.js");
 const Operation_js_1 = require("../../../oas/operation/Operation.js");
 const toPathItemV3_js_1 = require("../pathItem/toPathItemV3.js");
-const Method_js_1 = require("../../../types/Method.js");
+const methods_js_1 = require("../methods.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
 const toSecurityRequirement_js_1 = require("../securityRequirement/toSecurityRequirement.js");
 const isEmpty_js_1 = require("../../../helpers/isEmpty.js");
@@ -61,14 +61,14 @@ const toOperationsV3 = ({ paths, stackTrail, context }) => {
                 return [];
             }
             const cleaned = Object.entries(pathItem).reduce(({ rest, methodObject }, [key, operation]) => {
-                const isMethod = Method_js_1.methodValues.includes(key);
-                if (isMethod) {
-                    const { [key]: _deleted, ...remaining } = rest;
+                const method = (0, methods_js_1.toPathItemMethod)(key);
+                if (method) {
+                    const { [method]: _deleted, ...remaining } = rest;
                     return {
                         rest: remaining,
                         methodObject: {
                             ...methodObject,
-                            [key]: operation
+                            [method]: operation
                         }
                     };
                 }

package/script/parse/v3-1/parameter/toParameterV3.d.ts

@@ -1,9 +1,10 @@
 import type { ParseContextType } from '../../../context/parseTypes.js';
-import { type OasParameterLocation } from '../../../oas/parameter/parameter-types.js';
+import type { OasParameterLocation } from '../../../oas/parameter/parameter-types.js';
 import type { OpenAPIV3 } from 'openapi-types';
 import { OasParameter } from '../../../oas/parameter/Parameter.js';
 import type { OasRef } from '../../../oas/ref/Ref.js';
 import type { StackTrail } from '../../../context/StackTrail.js';
+type ParameterLocation = Exclude<OasParameterLocation, 'querystring'>;
 export type ToParameterListV3Args = {
     parameters: (OpenAPIV3.ParameterObject | OpenAPIV3.ReferenceObject)[] | undefined;
     stackTrail: StackTrail;
@@ -29,7 +30,7 @@ export type ToParameterV3Args = {
 };
 export type ToStyleArgs = {
     style: string | undefined;
-    location: OasParameterLocation;
+    location: ParameterLocation;
     stackTrail: StackTrail;
 };
 export type ToExplodeArgs = {
@@ -37,3 +38,4 @@ export type ToExplodeArgs = {
     style: string | undefined;
     stackTrail: StackTrail;
 };
+export {};

package/script/parse/v3-1/parameter/toParameterV3.js

@@ -36,7 +36,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.toOptionalParametersV3 = exports.toParametersV3 = exports.toParameterListV3 = void 0;
 const tryParseAt_js_1 = require("../../../context/tryParseAt.js");
 const refFns_js_1 = require("../../../helpers/refFns.js");
-const parameter_types_js_1 = require("../../../oas/parameter/parameter-types.js");
 const toExamplesV3_js_1 = require("../example/toExamplesV3.js");
 const toRefV31_js_1 = require("../ref/toRefV31.js");
 const toSchemasV3_js_1 = require("../schema/toSchemasV3.js");
@@ -44,6 +43,21 @@ const toMediaTypeItemV3_js_1 = require("../mediaType/toMediaTypeItemV3.js");
 const Parameter_js_1 = require("../../../oas/parameter/Parameter.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
 const v = __importStar(require("valibot"));
+const parameterLocation = v.enum({
+    query: 'query',
+    header: 'header',
+    path: 'path',
+    cookie: 'cookie'
+});
+const parameterStyle = v.enum({
+    matrix: 'matrix',
+    label: 'label',
+    form: 'form',
+    simple: 'simple',
+    spaceDelimited: 'spaceDelimited',
+    pipeDelimited: 'pipeDelimited',
+    deepObject: 'deepObject'
+});
 const toParameterListV3 = ({ parameters, stackTrail, context }) => {
     if (!parameters) {
         return undefined;
@@ -91,7 +105,7 @@ const toParameterV3 = ({ parameter, stackTrail, context }) => {
         stackTrail,
         parentType: 'parameter'
     });
-    const parsedLocation = v.parse(parameter_types_js_1.oasParameterLocation, location);
+    const parsedLocation = v.parse(parameterLocation, location);
     if (parsedLocation === 'path' && !required) {
         console.warn(`Path parameters must be required`);
     }
@@ -121,7 +135,7 @@ const toParameterV3 = ({ parameter, stackTrail, context }) => {
     return context.withStackTrail(stackTrail, () => new Parameter_js_1.OasParameter(fields, context));
 };
 const toStyle = ({ style, location, stackTrail }) => {
-    const parsed = v.parse(v.optional(parameter_types_js_1.oasParameterStyle), style);
+    const parsed = v.parse(v.optional(parameterStyle), style);
     if (parsed !== undefined) {
         return parsed;
     }

package/script/parse/v3-1/requestBody/toRequestBodiesV3.js

@@ -6,6 +6,7 @@ const toRefV31_js_1 = require("../ref/toRefV31.js");
 const toMediaTypeItemV3_js_1 = require("../mediaType/toMediaTypeItemV3.js");
 const RequestBody_js_1 = require("../../../oas/requestBody/RequestBody.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
+const logBodyMediaTypes_js_1 = require("../../logBodyMediaTypes.js");
 const toRequestBodyV3 = ({ requestBody, stackTrail, context }) => {
     if (!requestBody) {
         return undefined;
@@ -29,7 +30,9 @@ const toRequestBodyV3 = ({ requestBody, stackTrail, context }) => {
         required,
         extensionFields
     };
-    return context.withStackTrail(stackTrail, () => new RequestBody_js_1.OasRequestBody(fields, context));
+    const parsed = context.withStackTrail(stackTrail, () => new RequestBody_js_1.OasRequestBody(fields, context));
+    (0, logBodyMediaTypes_js_1.logBodyMediaTypes)({ content: fields.content, stackTrail, context });
+    return parsed;
 };
 exports.toRequestBodyV3 = toRequestBodyV3;
 const toRequestBodiesV3 = ({ requestBodies, stackTrail, context }) => {

package/script/parse/v3-1/response/toResponseV3.js

@@ -9,6 +9,7 @@ const toMediaTypeItemV3_js_1 = require("../mediaType/toMediaTypeItemV3.js");
 const Response_js_1 = require("../../../oas/response/Response.js");
 const toSpecificationExtensionsV3_js_1 = require("../specificationExtensions/toSpecificationExtensionsV3.js");
 const tryParseAt_js_1 = require("../../../context/tryParseAt.js");
+const logBodyMediaTypes_js_1 = require("../../logBodyMediaTypes.js");
 const toResponsesV3 = ({ responses, stackTrail, context }) => {
     const output = {};
     const entries = Object.entries(responses);
@@ -50,12 +51,14 @@ const toResponseV3 = ({ response, stackTrail, context }) => {
     const parsedHeaders = stackTrail.trace('headers', st => (0, toHeadersV3_js_1.toHeadersV3)({ headers, stackTrail: st, context }));
     const parsedLinks = stackTrail.trace('links', st => (0, toLinksV3_js_1.toLinksV3)({ links, stackTrail: st, context }));
     const parsedContent = stackTrail.trace('content', st => (0, toMediaTypeItemV3_js_1.toOptionalMediaTypeItemsV3)({ content, stackTrail: st, context }));
-    return context.withStackTrail(stackTrail, () => new Response_js_1.OasResponse({
+    const parsed = context.withStackTrail(stackTrail, () => new Response_js_1.OasResponse({
         description,
         headers: parsedHeaders,
         links: parsedLinks,
         content: parsedContent,
         extensionFields
     }, context));
+    (0, logBodyMediaTypes_js_1.logBodyMediaTypes)({ content: parsedContent, stackTrail, context });
+    return parsed;
 };
 exports.toResponseV3 = toResponseV3;