@readme/oas-to-har 27.3.3 → 28.0.1

package/dist/index.cjs

@@ -33,13 +33,126 @@ function set(object, path, value) {
 // src/lib/style-formatting/index.ts
 var _qs = require('qs'); var _qs2 = _interopRequireDefault(_qs);
 
+// src/lib/utils.ts
+
+
+function hasSchemaType(schema, discriminator) {
+  if (Array.isArray(schema.type)) {
+    return schema.type.includes(discriminator);
+  }
+  return schema.type === discriminator;
+}
+function getSafeRequestBody(obj) {
+  if ("oneOf" in obj) {
+    return getSafeRequestBody(obj.oneOf[0]);
+  } else if ("anyOf" in obj) {
+    return getSafeRequestBody(obj.anyOf[0]);
+  }
+  return obj;
+}
+function getSubschemas(schema, opts) {
+  let subSchemaDataSize = 0;
+  if (opts.parentIsArray) {
+    const parentData = get(opts.payload, opts.parentKey || "");
+    if (parentData === void 0 || !Array.isArray(parentData)) {
+      return false;
+    }
+    subSchemaDataSize = parentData.length;
+  }
+  let subschemas = [];
+  if (subSchemaDataSize > 0) {
+    for (let idx = 0; idx < subSchemaDataSize; idx += 1) {
+      subschemas = subschemas.concat(
+        Object.entries(schema).map(([key, subschema]) => ({
+          key: opts.parentKey ? [opts.parentKey, idx, key].join(".") : key,
+          schema: getSafeRequestBody(subschema)
+        }))
+      );
+    }
+  } else {
+    subschemas = Object.entries(schema).map(([key, subschema]) => ({
+      key: opts.parentKey ? [opts.parentKey, key].join(".") : key,
+      schema: getSafeRequestBody(subschema)
+    }));
+  }
+  return subschemas;
+}
+function getTypedFormatsInSchema(format, schema, opts) {
+  try {
+    if (_optionalChain([schema, 'optionalAccess', _6 => _6.format]) === format) {
+      if (opts.parentIsArray) {
+        const parentData = get(opts.payload, opts.parentKey || "");
+        if (parentData !== void 0 && Array.isArray(parentData)) {
+          return Object.keys(parentData).map((pdk) => {
+            const currentKey = [opts.parentKey, pdk].join(".");
+            if (get(opts.payload, currentKey) !== void 0) {
+              return currentKey;
+            }
+            return false;
+          }).filter(Boolean);
+        }
+      } else if (opts.parentKey && get(opts.payload, opts.parentKey) !== void 0) {
+        return opts.parentKey;
+      } else if (opts.payload !== void 0) {
+        return true;
+      }
+      return false;
+    }
+    const subschemas = getSubschemas(schema, opts);
+    if (!subschemas) {
+      return false;
+    }
+    return subschemas.flatMap(({ key, schema: subschema }) => {
+      if ("properties" in subschema) {
+        return getTypedFormatsInSchema(format, subschema.properties, { payload: opts.payload, parentKey: key });
+      } else if ("items" in subschema) {
+        if (_optionalChain([subschema, 'access', _7 => _7.items, 'optionalAccess', _8 => _8.properties])) {
+          return getTypedFormatsInSchema(format, subschema.items.properties, {
+            payload: opts.payload,
+            parentKey: key,
+            parentIsArray: true
+          });
+        }
+        return getTypedFormatsInSchema(format, subschema.items, {
+          payload: opts.payload,
+          parentKey: key,
+          parentIsArray: true
+        });
+      }
+      return getTypedFormatsInSchema(format, subschema, { payload: opts.payload, parentKey: key });
+    }).filter(Boolean);
+  } catch (e) {
+    return [];
+  }
+}
+function getParameterContentType(param) {
+  if (!("content" in param) || typeof param.content !== "object" || !param.content) {
+    return null;
+  }
+  const contentKeys = Object.keys(param.content);
+  if (contentKeys.length < 1) {
+    return null;
+  }
+  return _utils.getParameterContentType.call(void 0, contentKeys) || null;
+}
+function getParameterContentSchema(param, contentType) {
+  if (!("content" in param) || typeof param.content !== "object" || !param.content) {
+    return null;
+  }
+  const mediaTypeObject = param.content[contentType];
+  if (typeof mediaTypeObject === "object" && mediaTypeObject && "schema" in mediaTypeObject && mediaTypeObject.schema) {
+    return _types.isRef.call(void 0, mediaTypeObject.schema) ? null : mediaTypeObject.schema;
+  }
+  return null;
+}
+
 // src/lib/style-formatting/style-serializer.ts
 var isRfc3986Reserved = (char) => ":/?#[]@!$&'()*+,;=".indexOf(char) > -1;
 var isRfc3986Unreserved = (char) => /^[a-z0-9\-._~]+$/i.test(char);
 function isURIEncoded(value) {
   try {
     return decodeURIComponent(value) !== value;
-  } catch (e) {
+  } catch (e2) {
     return false;
   }
 }
@@ -349,6 +462,18 @@ function stylizeValue(value, parameter) {
   if (parameter.in === "header" && shouldNotStyleReservedHeader(parameter)) {
     return value;
   }
+  if (parameter.content && parameter.in === "query") {
+    const contentType = getParameterContentType(parameter);
+    if (!contentType) {
+      return void 0;
+    }
+    switch (contentType) {
+      case "application/json":
+        return encodeURIComponent(JSON.stringify(value));
+      default:
+        return encodeURIComponent(String(value));
+    }
+  }
   let style = parameter.style;
   if (!style) {
     if (parameter.in === "query") {
@@ -399,7 +524,7 @@ function handleDeepObject(value, parameter) {
   });
 }
 function handleExplode(value, parameter) {
-  if (Array.isArray(value) && _optionalChain([parameter, 'access', _6 => _6.schema, 'optionalAccess', _7 => _7.type]) === "array" && parameter.style === "deepObject") {
+  if (Array.isArray(value) && _optionalChain([parameter, 'access', _9 => _9.schema, 'optionalAccess', _10 => _10.type]) === "array" && parameter.style === "deepObject") {
     const newObj = {};
     const deepObjs = handleDeepObject(value, parameter);
     deepObjs.forEach((obj) => {
@@ -432,10 +557,10 @@ function shouldExplode(parameter) {
   return (parameter.explode || parameter.explode !== false && parameter.style === "form" || // style: deepObject && explode: false doesn't exist so explode it always
   // https://github.com/OAI/OpenAPI-Specification/blob/main/versions/3.1.0.md#style-examples
   parameter.style === "deepObject") && // header and path doesn't explode into separate parameters like query and cookie do
-  parameter.in !== "header" && parameter.in !== "path";
+  parameter.in !== "header" && parameter.in !== "path" && !parameter.content;
 }
 function formatStyle(value, parameter) {
-  if (parameter.style === "deepObject" && (!value || typeof value !== "object" || parameter.explode === false)) {
+  if (!parameter.content && parameter.style === "deepObject" && (!value || typeof value !== "object" || parameter.explode === false)) {
     return void 0;
   }
   if (shouldExplode(parameter)) {
@@ -444,97 +569,6 @@ function formatStyle(value, parameter) {
   return stylizeValue(value, parameter);
 }
 
-// src/lib/utils.ts
-function hasSchemaType(schema, discriminator) {
-  if (Array.isArray(schema.type)) {
-    return schema.type.includes(discriminator);
-  }
-  return schema.type === discriminator;
-}
-function getSafeRequestBody(obj) {
-  if ("oneOf" in obj) {
-    return getSafeRequestBody(obj.oneOf[0]);
-  } else if ("anyOf" in obj) {
-    return getSafeRequestBody(obj.anyOf[0]);
-  }
-  return obj;
-}
-function getSubschemas(schema, opts) {
-  let subSchemaDataSize = 0;
-  if (opts.parentIsArray) {
-    const parentData = get(opts.payload, opts.parentKey || "");
-    if (parentData === void 0 || !Array.isArray(parentData)) {
-      return false;
-    }
-    subSchemaDataSize = parentData.length;
-  }
-  let subschemas = [];
-  if (subSchemaDataSize > 0) {
-    for (let idx = 0; idx < subSchemaDataSize; idx += 1) {
-      subschemas = subschemas.concat(
-        Object.entries(schema).map(([key, subschema]) => ({
-          key: opts.parentKey ? [opts.parentKey, idx, key].join(".") : key,
-          schema: getSafeRequestBody(subschema)
-        }))
-      );
-    }
-  } else {
-    subschemas = Object.entries(schema).map(([key, subschema]) => ({
-      key: opts.parentKey ? [opts.parentKey, key].join(".") : key,
-      schema: getSafeRequestBody(subschema)
-    }));
-  }
-  return subschemas;
-}
-function getTypedFormatsInSchema(format, schema, opts) {
-  try {
-    if (_optionalChain([schema, 'optionalAccess', _8 => _8.format]) === format) {
-      if (opts.parentIsArray) {
-        const parentData = get(opts.payload, opts.parentKey || "");
-        if (parentData !== void 0 && Array.isArray(parentData)) {
-          return Object.keys(parentData).map((pdk) => {
-            const currentKey = [opts.parentKey, pdk].join(".");
-            if (get(opts.payload, currentKey) !== void 0) {
-              return currentKey;
-            }
-            return false;
-          }).filter(Boolean);
-        }
-      } else if (opts.parentKey && get(opts.payload, opts.parentKey) !== void 0) {
-        return opts.parentKey;
-      } else if (opts.payload !== void 0) {
-        return true;
-      }
-      return false;
-    }
-    const subschemas = getSubschemas(schema, opts);
-    if (!subschemas) {
-      return false;
-    }
-    return subschemas.flatMap(({ key, schema: subschema }) => {
-      if ("properties" in subschema) {
-        return getTypedFormatsInSchema(format, subschema.properties, { payload: opts.payload, parentKey: key });
-      } else if ("items" in subschema) {
-        if (_optionalChain([subschema, 'access', _9 => _9.items, 'optionalAccess', _10 => _10.properties])) {
-          return getTypedFormatsInSchema(format, subschema.items.properties, {
-            payload: opts.payload,
-            parentKey: key,
-            parentIsArray: true
-          });
-        }
-        return getTypedFormatsInSchema(format, subschema.items, {
-          payload: opts.payload,
-          parentKey: key,
-          parentIsArray: true
-        });
-      }
-      return getTypedFormatsInSchema(format, subschema, { payload: opts.payload, parentKey: key });
-    }).filter(Boolean);
-  } catch (e2) {
-    return [];
-  }
-}
-
 // src/index.ts
 function formatter(values, param, type, onlyIfExists = false) {
   if (param.style) {
@@ -548,6 +582,10 @@ function formatter(values, param, type, onlyIfExists = false) {
     value = void 0;
   } else if (param.required && param.schema && !_types.isRef.call(void 0, param.schema) && param.schema.default) {
     value = param.schema.default;
+  } else if (param.required && param.content) {
+    const contentType = getParameterContentType(param);
+    const schema = contentType ? getParameterContentSchema(param, contentType) : null;
+    value = _optionalChain([schema, 'optionalAccess', _11 => _11.default]);
   } else if (type === "path") {
     return param.name;
   }
@@ -569,7 +607,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', _11 => _11.properties, 'optionalAccess', _12 => _12[key]])) {
+      if (!_optionalChain([schema, 'access', _12 => _12.properties, 'optionalAccess', _13 => _13[key]])) {
         return false;
       }
       const paramEncoding = encoding ? encoding[key] : void 0;
@@ -592,7 +630,7 @@ var defaultFormDataTypes = Object.keys(_utils.jsonSchemaTypes).reduce((prev, cur
 }, {});
 function getResponseContentType(content) {
   const types = Object.keys(content) || [];
-  if (_optionalChain([types, 'optionalAccess', _13 => _13.length])) {
+  if (_optionalChain([types, 'optionalAccess', _14 => _14.length])) {
     const jsonType = types.find((t) => _utils.matchesMimeType.json(t));
     if (jsonType) {
       return jsonType;
@@ -653,8 +691,8 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
   if (!operationSchema || typeof operationSchema.getParameters !== "function") {
     operation = new (0, _operation.Operation)(
       oas,
-      _optionalChain([operationSchema, 'optionalAccess', _14 => _14.path]) || "",
-      _optionalChain([operationSchema, 'optionalAccess', _15 => _15.method]) || "",
+      _optionalChain([operationSchema, 'optionalAccess', _15 => _15.path]) || "",
+      _optionalChain([operationSchema, 'optionalAccess', _16 => _16.method]) || "",
       operationSchema || { path: "", method: "" }
     );
   } else {
@@ -704,15 +742,15 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
     }
     return formatter(formData, parameter, "path");
   });
-  const queryStrings = _optionalChain([parameters, 'optionalAccess', _16 => _16.filter, 'call', _17 => _17((param) => param.in === "query")]);
-  if (_optionalChain([queryStrings, 'optionalAccess', _18 => _18.length])) {
+  const queryStrings = _optionalChain([parameters, 'optionalAccess', _17 => _17.filter, 'call', _18 => _18((param) => param.in === "query")]);
+  if (_optionalChain([queryStrings, 'optionalAccess', _19 => _19.length])) {
     queryStrings.forEach((queryString) => {
       const value = formatter(formData, queryString, "query", true);
       appendHarValue(har.queryString, queryString.name, value);
     });
   }
-  const cookies = _optionalChain([parameters, 'optionalAccess', _19 => _19.filter, 'call', _20 => _20((param) => param.in === "cookie")]);
-  if (_optionalChain([cookies, 'optionalAccess', _21 => _21.length])) {
+  const cookies = _optionalChain([parameters, 'optionalAccess', _20 => _20.filter, 'call', _21 => _21((param) => param.in === "cookie")]);
+  if (_optionalChain([cookies, 'optionalAccess', _22 => _22.length])) {
     cookies.forEach((cookie) => {
       const value = formatter(formData, cookie, "cookie", true);
       appendHarValue(har.cookies, cookie.name, value);
@@ -720,8 +758,8 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
   }
   if (operation.schema.responses) {
     Object.keys(operation.schema.responses).some((response) => {
-      if (_types.isRef.call(void 0, _optionalChain([operation, 'access', _22 => _22.schema, 'access', _23 => _23.responses, 'optionalAccess', _24 => _24[response]]))) return false;
-      const content = (_optionalChain([operation, 'access', _25 => _25.schema, 'access', _26 => _26.responses, 'optionalAccess', _27 => _27[response]])).content;
+      if (_types.isRef.call(void 0, _optionalChain([operation, 'access', _23 => _23.schema, 'access', _24 => _24.responses, 'optionalAccess', _25 => _25[response]]))) return false;
+      const content = (_optionalChain([operation, 'access', _26 => _26.schema, 'access', _27 => _27.responses, 'optionalAccess', _28 => _28[response]])).content;
       if (!content) return false;
       if (Object.keys(formData.header || {}).find((h) => h.toLowerCase() === "accept")) return true;
       har.headers.push({
@@ -733,8 +771,8 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
   }
   let hasContentType = false;
   let contentType = operation.getContentType();
-  const headers = _optionalChain([parameters, 'optionalAccess', _28 => _28.filter, 'call', _29 => _29((param) => param.in === "header")]);
-  if (_optionalChain([headers, 'optionalAccess', _30 => _30.length])) {
+  const headers = _optionalChain([parameters, 'optionalAccess', _29 => _29.filter, 'call', _30 => _30((param) => param.in === "header")]);
+  if (_optionalChain([headers, 'optionalAccess', _31 => _31.length])) {
     headers.forEach((header) => {
       const value = formatter(formData, header, "header", true);
       if (typeof value === "undefined") return;
@@ -780,7 +818,7 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
       return payload.type === (operation.isFormUrlEncoded() ? "formData" : "body");
     });
   }
-  if (_optionalChain([requestBody, 'optionalAccess', _31 => _31.schema]) && Object.keys(requestBody.schema).length) {
+  if (_optionalChain([requestBody, 'optionalAccess', _32 => _32.schema]) && Object.keys(requestBody.schema).length) {
     const requestBodySchema = requestBody.schema;
     if (operation.isFormUrlEncoded()) {
       if (Object.keys(formData.formData || {}).length) {
@@ -839,7 +877,7 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
                           }
                         }
                       }
-                      appendHarValue(_optionalChain([har, 'access', _32 => _32.postData, 'optionalAccess', _33 => _33.params]) || [], name, val, addtlData);
+                      appendHarValue(_optionalChain([har, 'access', _33 => _33.postData, 'optionalAccess', _34 => _34.params]) || [], name, val, addtlData);
                     });
                   }
                 });
@@ -879,14 +917,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 = _chunkIN7TUPJQcjs.configureSecurity.call(void 0, apiDefinition, auth, security);