api 3.4.2 → 4.0.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +8 -8
- package/src/cache.js +3 -3
- package/src/lib/parseResponse.js +3 -1
- package/src/lib/prepareParams.js +3 -1
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "api",
|
|
3
|
-
"version": "
|
|
3
|
+
"version": "4.0.0",
|
|
4
4
|
"description": "Generate an SDK from an OpenAPI definition",
|
|
5
5
|
"main": "src/index.js",
|
|
6
6
|
"scripts": {
|
|
@@ -23,8 +23,8 @@
|
|
|
23
23
|
"node": "^12 || ^14 || ^16"
|
|
24
24
|
},
|
|
25
25
|
"dependencies": {
|
|
26
|
-
"@
|
|
27
|
-
"@readme/
|
|
26
|
+
"@readme/oas-to-har": "^13.8.1",
|
|
27
|
+
"@readme/openapi-parser": "^1.1.0",
|
|
28
28
|
"datauri": "^4.1.0",
|
|
29
29
|
"fetch-har": "^5.0.0",
|
|
30
30
|
"find-cache-dir": "^3.3.1",
|
|
@@ -34,16 +34,16 @@
|
|
|
34
34
|
"make-dir": "^3.1.0",
|
|
35
35
|
"mimer": "^2.0.2",
|
|
36
36
|
"node-fetch": "^2.6.0",
|
|
37
|
-
"oas": "^
|
|
37
|
+
"oas": "^16.0.3"
|
|
38
38
|
},
|
|
39
39
|
"devDependencies": {
|
|
40
40
|
"@readme/eslint-config": "^7.2.2",
|
|
41
|
-
"@readme/oas-examples": "^4.2
|
|
41
|
+
"@readme/oas-examples": "^4.3.2",
|
|
42
42
|
"eslint": "^7.32.0",
|
|
43
|
-
"jest": "^27.
|
|
43
|
+
"jest": "^27.3.1",
|
|
44
44
|
"memfs": "^3.2.4",
|
|
45
45
|
"nock": "^13.1.3",
|
|
46
|
-
"prettier": "^2.4.
|
|
46
|
+
"prettier": "^2.4.1"
|
|
47
47
|
},
|
|
48
48
|
"prettier": "@readme/eslint-config/prettier",
|
|
49
49
|
"jest": {
|
|
@@ -51,5 +51,5 @@
|
|
|
51
51
|
"__tests__/__fixtures__/"
|
|
52
52
|
]
|
|
53
53
|
},
|
|
54
|
-
"gitHead": "
|
|
54
|
+
"gitHead": "f1d2c251f1468bceb78e39731e20f30c6745c419"
|
|
55
55
|
}
|
package/src/cache.js
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
const fetch = require('node-fetch');
|
|
2
|
-
const
|
|
2
|
+
const OpenAPIParser = require('@readme/openapi-parser');
|
|
3
3
|
const yaml = require('js-yaml');
|
|
4
4
|
const crypto = require('crypto');
|
|
5
5
|
const findCacheDir = require('find-cache-dir');
|
|
@@ -127,7 +127,7 @@ class SdkCache {
|
|
|
127
127
|
})
|
|
128
128
|
.then(res => {
|
|
129
129
|
// The `validate` method handles dereferencing for us.
|
|
130
|
-
return
|
|
130
|
+
return OpenAPIParser.validate(res, {
|
|
131
131
|
dereference: {
|
|
132
132
|
// If circular `$refs` are ignored they'll remain in the API definition as `$ref: String`. This allows us to
|
|
133
133
|
// not only do easy circular reference detection but also stringify and save dereferenced API definitions
|
|
@@ -135,7 +135,7 @@ class SdkCache {
|
|
|
135
135
|
circular: 'ignore',
|
|
136
136
|
},
|
|
137
137
|
}).catch(err => {
|
|
138
|
-
if (/is not a valid openapi
|
|
138
|
+
if (/is not a valid openapi definition/i.test(err.message)) {
|
|
139
139
|
throw new Error("Sorry, that doesn't look like a valid OpenAPI definition.");
|
|
140
140
|
}
|
|
141
141
|
|
package/src/lib/parseResponse.js
CHANGED
|
@@ -1,6 +1,8 @@
|
|
|
1
1
|
// Nabbed from here:
|
|
2
2
|
// https://github.com/readmeio/api-explorer/blob/77b90ebed4673f168354cdcd730e34b7ee016360/packages/api-explorer/src/lib/parse-response.js#L13-L30
|
|
3
|
-
const {
|
|
3
|
+
const {
|
|
4
|
+
utils: { matchesMimeType },
|
|
5
|
+
} = require('oas');
|
|
4
6
|
|
|
5
7
|
module.exports = async function getResponseBody(response) {
|
|
6
8
|
const contentType = response.headers.get('Content-Type');
|
package/src/lib/prepareParams.js
CHANGED
|
@@ -4,7 +4,9 @@ const stream = require('stream');
|
|
|
4
4
|
const mimer = require('mimer');
|
|
5
5
|
const getStream = require('get-stream');
|
|
6
6
|
const datauri = require('datauri');
|
|
7
|
-
const {
|
|
7
|
+
const {
|
|
8
|
+
utils: { getSchema },
|
|
9
|
+
} = require('oas');
|
|
8
10
|
|
|
9
11
|
function digestParameters(parameters) {
|
|
10
12
|
return parameters.reduce((prev, param) => {
|