diff --git a/.github/workflows/node.yml b/.github/workflows/node.yml index 9fba7b4..89cb101 100644 --- a/.github/workflows/node.yml +++ b/.github/workflows/node.yml @@ -15,7 +15,7 @@ jobs: strategy: matrix: - node-version: [20.x, 22.x] + node-version: [20.x, 22.x, 24.x] # See supported Node.js release schedule at https://nodejs.org/en/about/releases/ steps: diff --git a/package-lock.json b/package-lock.json index 3c0a418..0de77cc 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "serverless-openapi-documenter", - "version": "0.0.118-beta.1", + "version": "0.0.120-beta.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "serverless-openapi-documenter", - "version": "0.0.118-beta.1", + "version": "0.0.120-beta.1", "license": "MIT", "dependencies": { "@apidevtools/json-schema-ref-parser": "^9.1.0", @@ -14,7 +14,7 @@ "chalk": "^4.1.2", "js-yaml": "^4.1.1", "json-schema-for-openapi": "^0.5.0", - "openapi-to-postmanv2": "^5.4.1", + "openapi-to-postmanv2": "^5.6.0", "uuid": "^11.1.0" }, "devDependencies": { @@ -1321,9 +1321,9 @@ } }, "node_modules/openapi-to-postmanv2": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/openapi-to-postmanv2/-/openapi-to-postmanv2-5.4.1.tgz", - "integrity": "sha512-cuPnRZphMS6QsjKa+ktJ9wYXYvAHtl5WyTCodtraASOp4pe6wVcoA9mEs8VHDFZvzYeZ8t7wAQ2faYiw9PsWhQ==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/openapi-to-postmanv2/-/openapi-to-postmanv2-5.6.0.tgz", + "integrity": "sha512-3J1vqmScB3Xgw9PYfpJrjzND0IOUJLemj7tYF9cC2X6xQ0boxaCZYgDljG2A7H43QNINHUAoHo+Y+Dnp4wr+Ew==", "license": "Apache-2.0", "dependencies": { "ajv": "^8.11.0", @@ -2295,9 +2295,9 @@ "optional": true }, "@redocly/ajv": { - "version": "8.11.2", - "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.2.tgz", - "integrity": "sha512-io1JpnwtIcvojV7QKDUSIuMN/ikdOUd1ReEnUnMKGfDVridQZ31J0MmIuqwuRjWDZfmvr+Q0MqCcfHM2gTivOg==", + "version": "8.11.3", + "resolved": "https://registry.npmjs.org/@redocly/ajv/-/ajv-8.11.3.tgz", + "integrity": "sha512-4P3iZse91TkBiY+Dx5DUgxQ9GXkVJf++cmI0MOyLDxV9b5MUBI4II6ES8zA5JCbO72nKAJxWrw4PUPW+YP3ZDQ==", "requires": { "fast-deep-equal": "^3.1.1", "json-schema-traverse": "^1.0.0", @@ -2368,10 +2368,10 @@ "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.11.tgz", "integrity": "sha512-wOuvG1SN4Us4rez+tylwwwCV1psiNVOkJeM3AUWUNWg/jDQY2+HE/444y5gc+jBmRqASOm2Oeh5c1axHobwRKQ==" }, - "@types/node": { - "version": "14.18.63", - "resolved": "https://registry.npmjs.org/@types/node/-/node-14.18.63.tgz", - "integrity": "sha512-fAtCfv4jJg+ExtXhvCkCqUKZ+4ok/JQk01qDKhL5BDDoS3AxKXhV5/MAVUZyQnSEd2GT92fkgZl0pz0Q0AzcIQ==" + "agent-base": { + "version": "7.1.4", + "resolved": "https://registry.npmjs.org/agent-base/-/agent-base-7.1.4.tgz", + "integrity": "sha512-MnA+YT8fwfJPgBx3m60MNqakm30XOkyIoH1y6huTQvC0PwZG7ki8NacLBcrPbNoo8vEZy7Jpuk7+jMO+CUovTQ==" }, "ajv": { "version": "8.11.0", @@ -2786,6 +2786,15 @@ "resolved": "https://registry.npmjs.org/http2-client/-/http2-client-1.3.5.tgz", "integrity": "sha512-EC2utToWl4RKfs5zd36Mxq7nzHHBuomZboI0yYL6Y0RmBgT7Sgkq4rQ0ezFTYoIsSs7Tm9SJe+o2FcAg6GBhGA==" }, + "https-proxy-agent": { + "version": "7.0.6", + "resolved": "https://registry.npmjs.org/https-proxy-agent/-/https-proxy-agent-7.0.6.tgz", + "integrity": "sha512-vK9P5/iUfdl95AI+JVyUuIcVtd4ofvtrOr3HNtM2yxC9bnMbEdp3x01OhQNnjb8IJYi38VlTE3mBXwcfvywuSw==", + "requires": { + "agent-base": "^7.1.2", + "debug": "4" + } + }, "iconv-lite": { "version": "0.6.3", "resolved": "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.6.3.tgz", @@ -3152,9 +3161,9 @@ "integrity": "sha512-RSn9F68PjH9HqtltsSnqYC1XXoWe9Bju5+213R98cNGttag9q9yAOTzdbsqvIa7aNm5WffBZFpWYr2aWrklWAw==" }, "openapi-to-postmanv2": { - "version": "5.4.1", - "resolved": "https://registry.npmjs.org/openapi-to-postmanv2/-/openapi-to-postmanv2-5.4.1.tgz", - "integrity": "sha512-cuPnRZphMS6QsjKa+ktJ9wYXYvAHtl5WyTCodtraASOp4pe6wVcoA9mEs8VHDFZvzYeZ8t7wAQ2faYiw9PsWhQ==", + "version": "5.6.0", + "resolved": "https://registry.npmjs.org/openapi-to-postmanv2/-/openapi-to-postmanv2-5.6.0.tgz", + "integrity": "sha512-3J1vqmScB3Xgw9PYfpJrjzND0IOUJLemj7tYF9cC2X6xQ0boxaCZYgDljG2A7H43QNINHUAoHo+Y+Dnp4wr+Ew==", "requires": { "ajv": "^8.11.0", "ajv-draft-04": "1.0.0", diff --git a/package.json b/package.json index d320a16..b79a36b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "serverless-openapi-documenter", - "version": "0.0.118-beta.1", + "version": "0.0.120-beta.1", "description": "Generate OpenAPI v3 documentation and Postman Collections from your Serverless Config", "main": "index.js", "keywords": [ @@ -50,7 +50,7 @@ "chalk": "^4.1.2", "js-yaml": "^4.1.1", "json-schema-for-openapi": "^0.5.0", - "openapi-to-postmanv2": "^5.4.1", + "openapi-to-postmanv2": "^5.6.0", "uuid": "^11.1.0" }, "engines": { diff --git a/src/schemaHandler.js b/src/schemaHandler.js index 71fc33e..b50af2f 100644 --- a/src/schemaHandler.js +++ b/src/schemaHandler.js @@ -19,6 +19,9 @@ class SchemaHandler { this.shouldConvert = true; if (/(3\.1\.\d)/g.test(this.openAPI.openapi)) this.shouldConvert = false; + this.logger.verbose(`OpenAPI version: ${this.openAPI.openapi}`); + this.logger.verbose(`Convert Schemas: ${this.shouldConvert}`); + this.modelReferences = {}; this.__standardiseModels();