@readme/oas-to-har 14.1.0 → 15.0.0

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 15.0.0 (2022-02-03)
+
+> **BREAKING RELEASE**
+>
+> `oas-to-har` now assumes that the OpenAPI definition you're supplying it has been fully dereferenced.
+
+* feat: upgrading oas and replacing some deprecated accessors (#58) ([ed97a5d](https://github.com/readmeio/oas-to-har/commit/ed97a5d)), closes [#58](https://github.com/readmeio/oas-to-har/issues/58)
+* chore(deps-dev): bump @readme/eslint-config from 8.1.2 to 8.2.0 (#54) ([f783873](https://github.com/readmeio/oas-to-har/commit/f783873)), closes [#54](https://github.com/readmeio/oas-to-har/issues/54)
+* chore(deps-dev): bump @readme/oas-examples from 4.3.3 to 4.4.0 (#53) ([fec1f82](https://github.com/readmeio/oas-to-har/commit/fec1f82)), closes [#53](https://github.com/readmeio/oas-to-har/issues/53)
+* chore(deps-dev): bump eslint from 8.7.0 to 8.8.0 (#56) ([0559975](https://github.com/readmeio/oas-to-har/commit/0559975)), closes [#56](https://github.com/readmeio/oas-to-har/issues/56)
+* chore(deps-dev): bump jest-expect-har from 3.0.1 to 3.0.2 (#57) ([cd2c19e](https://github.com/readmeio/oas-to-har/commit/cd2c19e)), closes [#57](https://github.com/readmeio/oas-to-har/issues/57)
+
+
+
 ## 14.1.0 (2022-01-25)
 
 * chore(deps): bumping all out of date deps (#51) ([926763b](https://github.com/readmeio/oas-to-har/commit/926763b)), closes [#51](https://github.com/readmeio/oas-to-har/issues/51)

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@readme/oas-to-har",
   "description": "Utility to transform an OAS operation into a HAR representation",
-  "version": "14.1.0",
+  "version": "15.0.0",
   "main": "src/index.js",
   "author": "Jon Ursenbach <jon@ursenba.ch>",
   "license": "ISC",
@@ -21,8 +21,8 @@
     "test": "jest --coverage"
   },
   "dependencies": {
-    "@readme/oas-extensions": "^14.1.0",
-    "oas": "^17.5.0",
+    "@readme/oas-extensions": "^14.1.1",
+    "oas": "^17.7.1",
     "parse-data-url": "^4.0.1"
   },
   "devDependencies": {

package/src/index.js

@@ -6,7 +6,7 @@ const configureSecurity = require('./lib/configure-security');
 const removeUndefinedObjects = require('./lib/remove-undefined-objects');
 const formatStyle = require('./lib/style-formatting');
 
-const { findSchemaDefinition, getSchema, jsonSchemaTypes } = utils;
+const { jsonSchemaTypes } = utils;
 
 function formatter(values, param, type, onlyIfExists) {
   if (param.style) {
@@ -188,27 +188,7 @@ module.exports = (
     }
   }
 
-  // Does this operation have any parameters?
-  const parameters = [];
-  function addParameter(param) {
-    if (param.$ref) {
-      parameters.push(findSchemaDefinition(param.$ref, apiDefinition));
-    } else {
-      parameters.push(param);
-    }
-  }
-
-  operation.getParameters().forEach(addParameter);
-
-  // Does this operation have any common parameters?
-  if (
-    apiDefinition &&
-    apiDefinition.paths &&
-    apiDefinition.paths[operation.path] &&
-    apiDefinition.paths[operation.path].parameters
-  ) {
-    apiDefinition.paths[operation.path].parameters.forEach(addParameter);
-  }
+  const parameters = operation.getParameters();
 
   har.url = har.url.replace(/{([-_a-zA-Z0-9[\]]+)}/g, (full, key) => {
     if (!operation || !parameters) return key; // No path params at all
@@ -299,14 +279,12 @@ module.exports = (
     });
   }
 
-  let requestBody = getSchema(operation.schema, apiDefinition);
-  if (requestBody) {
-    requestBody = requestBody.schema;
-  } else {
-    requestBody = { schema: {} };
+  let requestBody = false;
+  if (operation.hasRequestBody()) {
+    [, requestBody] = operation.getRequestBody();
   }
 
-  if (requestBody.schema && Object.keys(requestBody.schema).length) {
+  if (requestBody && requestBody.schema && Object.keys(requestBody.schema).length) {
     if (operation.isFormUrlEncoded()) {
       if (Object.keys(formData.formData).length) {
         const cleanFormData = removeUndefinedObjects(JSON.parse(JSON.stringify(formData.formData)));
@@ -436,7 +414,7 @@ module.exports = (
 
   // Add a `Content-Type` header if there are any body values setup above or if there is a schema defined, but only do
   // so if we don't already have a `Content-Type` present as it's impossible for a request to have multiple.
-  if ((har.postData.text || Object.keys(requestBody.schema).length) && !hasContentType) {
+  if ((har.postData.text || (requestBody && Object.keys(requestBody.schema).length)) && !hasContentType) {
     har.headers.push({
       name: 'Content-Type',
       value: contentType,