@readme/oas-to-har 32.1.14 → 33.0.0

package/dist/index.cjs

@@ -44,11 +44,12 @@ function hasSchemaType(schema, 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]);
+function unwrapFirstPolymorphicBranch(obj) {
+  if (obj.oneOf && Array.isArray(obj.oneOf) && obj.oneOf.length) {
+    return unwrapFirstPolymorphicBranch(obj.oneOf[0]);
+  }
+  if (obj.anyOf && Array.isArray(obj.anyOf) && obj.anyOf.length) {
+    return unwrapFirstPolymorphicBranch(obj.anyOf[0]);
   }
   return obj;
 }
@@ -116,7 +117,7 @@ function getSubschemas(schema, api, opts, seenRefs = /* @__PURE__ */ new Set())
     if (!("properties" in resolvedSchema) && typeof resolvedSchema === "object" && !("type" in resolvedSchema && resolvedSchema.type !== "object")) {
       for (const [propName, propSchema] of Object.entries(resolvedSchema)) {
         if (propSchema && (Array.isArray(propSchema) || typeof propSchema === "object" && propSchema !== null)) {
-          const raw = getSafeRequestBody(propSchema);
+          const raw = unwrapFirstPolymorphicBranch(propSchema);
           const resolved = _types.isRef.call(void 0, raw) ? _utils.dereferenceRef.call(void 0, raw, api) : raw;
           const toPush = resolved && !_types.isRef.call(void 0, resolved) ? resolved : raw;
           if (toPush && typeof toPush === "object") {
@@ -290,7 +291,7 @@ function collectSchemaObjectProperties(schema, api, seenRefs) {
     }
     node = deref;
   }
-  const safe = getSafeRequestBody(node);
+  const safe = unwrapFirstPolymorphicBranch(node);
   if (_types.isRef.call(void 0, safe)) {
     return collectSchemaObjectProperties(safe, api, seenRefs);
   }
@@ -305,6 +306,54 @@ function collectSchemaObjectProperties(schema, api, seenRefs) {
   }
   return void 0;
 }
+function getPayloadPropertyKeys(payload) {
+  if (typeof payload !== "object" || payload === null || Array.isArray(payload)) {
+    return [];
+  }
+  return Object.keys(payload).filter(
+    (k) => typeof payload[k] !== "undefined"
+  );
+}
+function getPolymorphicSchema(node) {
+  return node.oneOf && Array.isArray(node.oneOf) && node.oneOf.length ? node.oneOf : node.anyOf && Array.isArray(node.anyOf) && node.anyOf.length ? node.anyOf : null;
+}
+function pickPolymorphicBranch(alternatives, keys, api) {
+  if (!keys.length) {
+    return alternatives[0];
+  }
+  const scored = alternatives.map((branch, idx) => {
+    const props = collectSchemaObjectProperties(branch, api, /* @__PURE__ */ new Set());
+    const allMatch = Boolean(props && keys.every((k) => Object.prototype.hasOwnProperty.call(props, k)));
+    const propCount = props ? Object.keys(props).length : Number.POSITIVE_INFINITY;
+    return { idx, branch, allMatch, propCount };
+  });
+  const matches = scored.filter((entry) => entry.allMatch);
+  if (matches.length === 1) return matches[0].branch;
+  if (matches.length > 1) {
+    matches.sort((a, b) => a.propCount - b.propCount || a.idx - b.idx);
+    return matches[0].branch;
+  }
+  return scored[0].branch;
+}
+function getSafeRequestBody(schema, payload, api) {
+  let resolved = _utils.dereferenceRefDeep.call(void 0, schema, api);
+  const keys = getPayloadPropertyKeys(payload);
+  for (let alternatives = getPolymorphicSchema(resolved); alternatives != null; alternatives = getPolymorphicSchema(resolved)) {
+    resolved = pickPolymorphicBranch(alternatives, keys, api);
+  }
+  if ("allOf" in resolved && Array.isArray(resolved.allOf) && resolved.allOf.length) {
+    const fromAllOf = mergePropertiesFromAllOf(resolved.allOf, api, /* @__PURE__ */ new Set());
+    if (fromAllOf && Object.keys(fromAllOf).length) {
+      const existing = resolved.properties && typeof resolved.properties === "object" && resolved.properties !== null ? resolved.properties : {};
+      resolved = {
+        ...resolved,
+        type: "object",
+        properties: { ...fromAllOf, ...existing }
+      };
+    }
+  }
+  return resolved;
+}
 function parseJSONStringsInBodyWithSchema(obj, schema, api, seenRefs = /* @__PURE__ */ new Set()) {
   if (schema === void 0) return parseJSONStrings(obj);
   let resolved = schema;
@@ -319,7 +368,7 @@ function parseJSONStringsInBodyWithSchema(obj, schema, api, seenRefs = /* @__PUR
     }
     resolved = deref;
   }
-  const safe = getSafeRequestBody(resolved);
+  const safe = getSafeRequestBody(resolved, obj, api);
   if (_types.isRef.call(void 0, safe)) {
     return parseJSONStringsInBodyWithSchema(obj, safe, api, seenRefs);
   }
@@ -1062,8 +1111,11 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
           let cleanBody = _removeundefinedobjects2.default.call(void 0, formData.body, { preserveNullishArrays: true });
           if (isMultipart) {
             har.postData = { params: [], mimeType: "multipart/form-data" };
-            const safeBodySchema = getSafeRequestBody(requestBodySchema);
-            const binaryTypes = Object.keys(safeBodySchema.properties).filter((key) => {
+            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) {
+                return false;
+              }
               const propData = safeBodySchema.properties[key];
               if (propData.format === "binary") {
                 return true;
@@ -1075,12 +1127,12 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
             if (cleanBody !== void 0) {
               let multipartParams = [];
               const multipartContent = operation.getRequestBody("multipart/form-data");
-              if (typeof multipartContent === "object" && multipartContent !== null && // `getRequestBody()` will return an array if there are multiple content types that
-              // match the one we're looking for but because we're looking for an exact
-              // `multipart/form-data` match `getRequestBody()` will only ever return a single
-              // object back for us.
-              !Array.isArray(multipartContent)) {
-                multipartParams = multipartBodyToFormatterParams(formData.body, multipartContent, safeBodySchema);
+              if (multipartContent) {
+                multipartParams = multipartBodyToFormatterParams(
+                  formData.body,
+                  multipartContent.mediaTypeObject,
+                  safeBodySchema
+                );
               }
               if (multipartParams.length) {
                 Object.keys(cleanBody).forEach((name) => {
@@ -1101,7 +1153,7 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
                           }
                         }
                       }
-                      appendHarValue(_optionalChain([har, 'access', _29 => _29.postData, 'optionalAccess', _30 => _30.params]) || [], name, val, addtlData);
+                      appendHarValue(_optionalChain([har, 'access', _31 => _31.postData, 'optionalAccess', _32 => _32.params]) || [], name, val, addtlData);
                     });
                   }
                 });
@@ -1133,7 +1185,7 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
               } else {
                 try {
                   const parsed = parseJSONStringsInBodyWithSchema(cleanBody, requestBodySchema, operation.api);
-                  if (typeof _optionalChain([parsed, 'optionalAccess', _31 => _31.RAW_BODY]) !== "undefined") {
+                  if (typeof _optionalChain([parsed, 'optionalAccess', _33 => _33.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);
@@ -1152,14 +1204,14 @@ function oasToHar(oas, operationSchema, values = {}, auth = {}, opts = { proxyUr
       }
     }
   }
-  if ((_optionalChain([har, 'access', _32 => _32.postData, 'optionalAccess', _33 => _33.text]) || _optionalChain([requestBody, 'optionalAccess', _34 => _34.schema]) && Object.keys(requestBody.schema).length) && !hasContentType) {
+  if ((_optionalChain([har, 'access', _34 => _34.postData, 'optionalAccess', _35 => _35.text]) || _optionalChain([requestBody, 'optionalAccess', _36 => _36.schema]) && Object.keys(requestBody.schema).length) && !hasContentType) {
     har.headers.push({
       name: "content-type",
       value: contentType
     });
   }
   const securityRequirements = operation.getSecurity();
-  if (_optionalChain([securityRequirements, 'optionalAccess', _35 => _35.length])) {
+  if (_optionalChain([securityRequirements, 'optionalAccess', _37 => _37.length])) {
     securityRequirements.forEach((schemes) => {
       Object.keys(schemes).forEach((security) => {
         const securityValue = _chunkZYPAVWY2cjs.configureSecurity.call(void 0, apiDefinition, auth, security);