api 4.0.0 → 4.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "api",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "description": "Generate an SDK from an OpenAPI definition",
   "main": "src/index.js",
   "scripts": {
@@ -23,10 +23,10 @@
     "node": "^12 || ^14 || ^16"
   },
   "dependencies": {
-    "@readme/oas-to-har": "^13.8.1",
-    "@readme/openapi-parser": "^1.1.0",
+    "@readme/oas-to-har": "^14.0.5",
+    "@readme/openapi-parser": "^2.0.0",
     "datauri": "^4.1.0",
-    "fetch-har": "^5.0.0",
+    "fetch-har": "^5.0.5",
     "find-cache-dir": "^3.3.1",
     "form-data": "^4.0.0",
     "get-stream": "^6.0.0",
@@ -34,12 +34,12 @@
     "make-dir": "^3.1.0",
     "mimer": "^2.0.2",
     "node-fetch": "^2.6.0",
-    "oas": "^16.0.3"
+    "oas": "^17.4.1"
   },
   "devDependencies": {
-    "@readme/eslint-config": "^7.2.2",
-    "@readme/oas-examples": "^4.3.2",
-    "eslint": "^7.32.0",
+    "@readme/eslint-config": "^8.0.2",
+    "@readme/oas-examples": "^4.3.3",
+    "eslint": "^8.3.0",
     "jest": "^27.3.1",
     "memfs": "^3.2.4",
     "nock": "^13.1.3",
@@ -51,5 +51,5 @@
       "__tests__/__fixtures__/"
     ]
   },
-  "gitHead": "f1d2c251f1468bceb78e39731e20f30c6745c419"
+  "gitHead": "eb3b741b7776ce01f3bafe7f23d2cd0df7ca8b21"
 }

package/src/cache.js

@@ -123,7 +123,7 @@ class SdkCache {
     }
 
     return new Promise(resolve => {
-      return resolve(json);
+      resolve(json);
     })
       .then(res => {
         // The `validate` method handles dereferencing for us.
@@ -193,7 +193,7 @@ class SdkCache {
 
   saveFile() {
     return new Promise(resolve => {
-      return resolve(fs.readFileSync(this.uri, 'utf8'));
+      resolve(fs.readFileSync(this.uri, 'utf8'));
     })
       .then(res => {
         if (/\.(yaml|yml)/.test(this.uri)) {

package/src/index.js

@@ -1,11 +1,11 @@
 const fetch = require('node-fetch');
 const fetchHar = require('fetch-har');
-const Oas = require('oas');
+const Oas = require('oas').default;
 const oasToHar = require('@readme/oas-to-har');
 const pkg = require('../package.json');
 
 const Cache = require('./cache');
-const { parseResponse, prepareAuth, prepareParams, prepareServer } = require('./lib/index');
+const { parseResponse, prepareAuth, prepareParams, prepareServer } = require('./lib');
 
 global.fetch = fetch;
 global.Request = fetch.Request;
@@ -19,9 +19,9 @@ class Sdk {
   }
 
   static getOperations(spec) {
-    return Object.keys(spec.paths)
+    return Object.keys(spec.api.paths)
       .map(path => {
-        return Object.keys(spec.paths[path]).map(method => {
+        return Object.keys(spec.api.paths[path]).map(method => {
           return spec.operation(path, method);
         });
       })

package/src/lib/prepareParams.js

@@ -89,7 +89,7 @@ module.exports = async (operation, body, metadata) => {
   // body payload to see if anything in there is either a file path or a file stream so we can translate those into a
   // data URL for `@readme/oas-to-har` to make a request.
   if ('body' in params && operation.isMultipart()) {
-    let requestBody = getSchema(operation.schema, operation.oas);
+    let requestBody = getSchema(operation.schema, operation.api);
     if (requestBody) {
       requestBody = requestBody.schema;
     } else {
@@ -111,7 +111,9 @@ module.exports = async (operation, body, metadata) => {
           file = path.resolve(file);
           if (fs.existsSync(file)) {
             conversions.push(
-              new Promise(resolve => resolve(datauri(file))).then(dataurl => {
+              new Promise(resolve => {
+                resolve(datauri(file));
+              }).then(dataurl => {
                 // Doing this manually for now until when/if https://github.com/data-uri/datauri/pull/29 is accepted.
                 params.body[prop] = dataurl.replace(
                   ';base64',
@@ -124,7 +126,9 @@ module.exports = async (operation, body, metadata) => {
           }
         } else if (file instanceof stream.Readable) {
           conversions.push(
-            new Promise(resolve => resolve(getStream.buffer(file))).then(buffer => {
+            new Promise(resolve => {
+              resolve(getStream.buffer(file));
+            }).then(buffer => {
               // This logic was taken from the `datauri` package, and ideally it should be able to accept the content
               // of a file, or a file stream, but I'll PR that later to that package.
               // @todo

package/src/lib/prepareServer.js

@@ -18,7 +18,7 @@ function stripTrailingSlash(url) {
 module.exports = (spec, url, variables = {}) => {
   let serverIdx;
   const sanitizedUrl = stripTrailingSlash(url);
-  (spec.servers || []).forEach((server, i) => {
+  (spec.api.servers || []).forEach((server, i) => {
     if (server.url === sanitizedUrl) {
       serverIdx = i;
     }