@readme/oas-to-har 36.0.0 → 37.2.0

package/dist/index.cjs

@@ -4,7 +4,6 @@ var _chunkZYPAVWY2cjs = require('./chunk-ZYPAVWY2.cjs');
 
 // src/index.ts
 var _dataurls = require('@readme/data-urls');
-var _oas = require('oas'); var _oas2 = _interopRequireDefault(_oas);
 var _extensions = require('oas/extensions');
 var _operation = require('oas/operation');
 var _types = require('oas/types');
@@ -850,14 +849,24 @@ function formatStyle(value, parameter) {
 }
 
 // src/index.ts
+function getParamValue(values, param, type) {
+  const bucket = values[type];
+  if (bucket && typeof bucket === "object" && !(param.name in bucket) && type === "header") {
+    const matchedKey = Object.keys(bucket).find((key) => key.toLowerCase() === param.name.toLowerCase());
+    if (matchedKey !== void 0) {
+      return bucket[matchedKey];
+    }
+  }
+  return _optionalChain([bucket, 'optionalAccess', _9 => _9[param.name]]);
+}
 function formatter(values, param, type, onlyIfExists = false) {
   if (param.style) {
-    const value2 = values[type][param.name];
+    const value2 = getParamValue(values, param, type);
     return formatStyle(value2, param);
   }
   let value;
-  if (typeof values[type][param.name] !== "undefined") {
-    value = values[type][param.name];
+  if (typeof getParamValue(values, param, type) !== "undefined") {
+    value = getParamValue(values, param, type);
   } else if (onlyIfExists && !param.required) {
     value = void 0;
   } else if (param.required && param.schema && !_types.isRef.call(void 0, param.schema) && param.schema.default) {
@@ -865,7 +874,7 @@ function formatter(values, param, type, onlyIfExists = false) {
   } else if (param.required && param.content) {
     const contentType = getParameterContentType(param);
     const schema = contentType ? getParameterContentSchema(param, contentType) : null;
-    value = _optionalChain([schema, 'optionalAccess', _9 => _9.default]);
+    value = _optionalChain([schema, 'optionalAccess', _10 => _10.default]);
   } else if (type === "path") {
     return param.name;
   }
@@ -886,7 +895,7 @@ function multipartBodyToFormatterParams(payload, oasMediaTypeObject, schema) {
   const encoding = oasMediaTypeObject.encoding;
   if (typeof payload === "object" && payload !== null) {
     return Object.keys(payload).map((key) => {
-      if (!_optionalChain([schema, 'access', _10 => _10.properties, 'optionalAccess', _11 => _11[key]])) {
+      if (!_optionalChain([schema, 'access', _11 => _11.properties, 'optionalAccess', _12 => _12[key]])) {
         return false;
       }
       const paramEncoding = encoding ? encoding[key] : void 0;
@@ -916,7 +925,7 @@ var defaultFormDataTypes = Object.keys(_utils.jsonSchemaTypes).reduce((prev, cur
 }, {});
 function getResponseContentType(content) {
   const types = Object.keys(content) || [];
-  if (_optionalChain([types, 'optionalAccess', _12 => _12.length])) {
+  if (_optionalChain([types, 'optionalAccess', _13 => _13.length])) {
     const jsonType = types.find((t) => _utils.matchesMimeType.json(t));
     if (jsonType) {
       return jsonType;
@@ -981,11 +990,10 @@ function encodeBodyForHAR(body) {
 function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUrl: "" }) {
   let operation;
   if (!operationSchema || typeof operationSchema.getParameters !== "function") {
-    const currentOas = _oas2.default.init(oas);
     operation = new (0, _operation.Operation)(
-      currentOas,
-      _optionalChain([operationSchema, 'optionalAccess', _13 => _13.path]) || "",
-      _optionalChain([operationSchema, 'optionalAccess', _14 => _14.method]) || "",
+      oas,
+      _optionalChain([operationSchema, 'optionalAccess', _14 => _14.path]) || "",
+      _optionalChain([operationSchema, 'optionalAccess', _15 => _15.method]) || "",
       operationSchema || { path: "", method: "" }
     );
   } else {
@@ -1000,11 +1008,11 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
   if (!formData.server) {
     formData.server = {
       selected: 0,
-      variables: oas.defaultVariables(0)
+      variables: operation.defaultVariables(0)
     };
   }
   formData.server.variables = {
-    ...oas.defaultVariables(formData.server.selected),
+    ...operation.defaultVariables(formData.server.selected),
     ...formData.server.variables ? formData.server.variables : {}
   };
   const har = {
@@ -1016,7 +1024,7 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
     postData: {},
     bodySize: 0,
     method: operation.method.toUpperCase(),
-    url: `${oas.url(formData.server.selected, formData.server.variables)}${operation.path}`.replace(
+    url: `${operation.url(formData.server.selected, formData.server.variables)}${operation.path}`.replace(
       /\s/g,
       "%20"
     ),
@@ -1036,15 +1044,15 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
     }
     return formatter(formData, parameter, "path");
   });
-  const queryStrings = _optionalChain([parameters, 'optionalAccess', _15 => _15.filter, 'call', _16 => _16((param) => param.in === "query")]);
-  if (_optionalChain([queryStrings, 'optionalAccess', _17 => _17.length])) {
+  const queryStrings = _optionalChain([parameters, 'optionalAccess', _16 => _16.filter, 'call', _17 => _17((param) => param.in === "query")]);
+  if (_optionalChain([queryStrings, 'optionalAccess', _18 => _18.length])) {
     queryStrings.forEach((queryString) => {
       const value = formatter(formData, queryString, "query", true);
       appendHarValue(har.queryString, queryString.name, value);
     });
   }
-  const cookies = _optionalChain([parameters, 'optionalAccess', _18 => _18.filter, 'call', _19 => _19((param) => param.in === "cookie")]);
-  if (_optionalChain([cookies, 'optionalAccess', _20 => _20.length])) {
+  const cookies = _optionalChain([parameters, 'optionalAccess', _19 => _19.filter, 'call', _20 => _20((param) => param.in === "cookie")]);
+  if (_optionalChain([cookies, 'optionalAccess', _21 => _21.length])) {
     cookies.forEach((cookie) => {
       const value = formatter(formData, cookie, "cookie", true);
       appendHarValue(har.cookies, cookie.name, value);
@@ -1066,8 +1074,8 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
   }
   let hasContentType = false;
   let contentType = operation.getContentType();
-  const headers = _optionalChain([parameters, 'optionalAccess', _21 => _21.filter, 'call', _22 => _22((param) => param.in === "header")]);
-  if (_optionalChain([headers, 'optionalAccess', _23 => _23.length])) {
+  const headers = _optionalChain([parameters, 'optionalAccess', _22 => _22.filter, 'call', _23 => _23((param) => param.in === "header")]);
+  if (_optionalChain([headers, 'optionalAccess', _24 => _24.length])) {
     headers.forEach((header) => {
       const value = formatter(formData, header, "header", true);
       if (typeof value === "undefined") return;
@@ -1122,9 +1130,9 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
     const matchesRequestBodyType = (payload) => {
       return payload.type === (isFormUrlEncoded ? "formData" : "body");
     };
-    requestBody = _optionalChain([operation, 'access', _24 => _24.getParametersAsJSONSchema, 'call', _25 => _25({ contentType }), 'optionalAccess', _26 => _26.find, 'call', _27 => _27(matchesRequestBodyType)]);
+    requestBody = _optionalChain([operation, 'access', _25 => _25.getParametersAsJSONSchema, 'call', _26 => _26({ contentType }), 'optionalAccess', _27 => _27.find, 'call', _28 => _28(matchesRequestBodyType)]);
   }
-  if (_optionalChain([requestBody, 'optionalAccess', _28 => _28.schema]) && Object.keys(requestBody.schema).length) {
+  if (_optionalChain([requestBody, 'optionalAccess', _29 => _29.schema]) && Object.keys(requestBody.schema).length) {
     const requestBodySchema = requestBody.schema;
     const isFormUrlEncoded = _utils.matchesMimeType.formUrlEncoded(contentType);
     if (isFormUrlEncoded) {
@@ -1159,7 +1167,7 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
             har.postData = { params: [], mimeType: "multipart/form-data" };
             const safeBodySchema = getSafeRequestBody(requestBodySchema, formData.body, operation.api);
             const binaryTypes = Object.keys(_nullishCoalesce(safeBodySchema.properties, () => ( {}))).filter((key) => {
-              if (!_optionalChain([safeBodySchema, 'access', _29 => _29.properties, 'optionalAccess', _30 => _30[key]]) || typeof safeBodySchema.properties[key] !== "object" || safeBodySchema.properties[key] === null) {
+              if (!_optionalChain([safeBodySchema, 'access', _30 => _30.properties, 'optionalAccess', _31 => _31[key]]) || typeof safeBodySchema.properties[key] !== "object" || safeBodySchema.properties[key] === null) {
                 return false;
               }
               const propData = safeBodySchema.properties[key];
@@ -1199,7 +1207,7 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
                           }
                         }
                       }
-                      appendHarValue(_optionalChain([har, 'access', _31 => _31.postData, 'optionalAccess', _32 => _32.params]) || [], name, val, addtlData);
+                      appendHarValue(_optionalChain([har, 'access', _32 => _32.postData, 'optionalAccess', _33 => _33.params]) || [], name, val, addtlData);
                     });
                   }
                 });
@@ -1231,7 +1239,7 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
               } else {
                 try {
                   const parsed = parseJSONStringsInBodyWithSchema(cleanBody, requestBodySchema, operation.api);
-                  if (typeof _optionalChain([parsed, 'optionalAccess', _33 => _33.RAW_BODY]) !== "undefined") {
+                  if (typeof _optionalChain([parsed, 'optionalAccess', _34 => _34.RAW_BODY]) !== "undefined") {
                     har.postData.text = isPrimitive(parsed.RAW_BODY) ? String(parsed.RAW_BODY) : stringify(parsed.RAW_BODY);
                   } else {
                     har.postData.text = JSON.stringify(parsed);
@@ -1250,14 +1258,14 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
       }
     }
   }
-  if ((_optionalChain([har, 'access', _34 => _34.postData, 'optionalAccess', _35 => _35.text]) || _optionalChain([requestBody, 'optionalAccess', _36 => _36.schema]) && Object.keys(requestBody.schema).length) && !hasContentType) {
+  if ((_optionalChain([har, 'access', _35 => _35.postData, 'optionalAccess', _36 => _36.text]) || _optionalChain([requestBody, 'optionalAccess', _37 => _37.schema]) && Object.keys(requestBody.schema).length) && !hasContentType) {
     har.headers.push({
       name: "content-type",
       value: contentType
     });
   }
   const securityRequirements = operation.getSecurity();
-  if (_optionalChain([securityRequirements, 'optionalAccess', _37 => _37.length])) {
+  if (_optionalChain([securityRequirements, 'optionalAccess', _38 => _38.length])) {
     securityRequirements.forEach((schemes) => {
       Object.keys(schemes).forEach((security) => {
         const securityValue = _chunkZYPAVWY2cjs.configureSecurity.call(void 0, apiDefinition, auth, security);