diff --git a/package.json b/package.json index 071fbf97..f8a6e705 100644 --- a/package.json +++ b/package.json @@ -43,11 +43,11 @@ }, "dependencies": { "@babel/runtime": "^7.17.2", - "@useoptic/api-checks": "0.23.4", - "@useoptic/json-pointer-helpers": "0.23.4", - "@useoptic/openapi-cli": "0.23.4", - "@useoptic/openapi-io": "0.23.4", - "@useoptic/openapi-utilities": "0.23.4", + "@useoptic/api-checks": "0.23.5", + "@useoptic/json-pointer-helpers": "0.23.5", + "@useoptic/openapi-cli": "0.23.5", + "@useoptic/openapi-io": "0.23.5", + "@useoptic/openapi-utilities": "0.23.5", "chai": "^4.3.4", "change-case": "^4.1.2", "find-parent-dir": "^0.3.1", diff --git a/src/workflows/tests/templates.test.ts b/src/workflows/tests/templates.test.ts index faeb9878..fe725549 100644 --- a/src/workflows/tests/templates.test.ts +++ b/src/workflows/tests/templates.test.ts @@ -3,7 +3,7 @@ import { addCreateOperationTemplate } from "../templates/operations/create"; import { factsToChangelog, OpenAPIV3 } from "@useoptic/openapi-utilities"; import { newSnykApiCheckService } from "../../service"; import { SynkApiCheckContext } from "../../dsl"; -import { parseOpenAPIFromMemory } from "@useoptic/openapi-io"; +import { dereferenceOpenAPI } from "@useoptic/openapi-io"; import { addUpdateOperationTemplate } from "../templates/operations/update"; import { addDeleteOperationTemplate } from "../templates/operations/delete"; import { addGetOperationTemplate } from "../templates/operations/get"; @@ -56,8 +56,8 @@ const context: SynkApiCheckContext = { async function check(from: OpenAPIV3.Document, to: OpenAPIV3.Document) { const checkService = newSnykApiCheckService(); - const { jsonLike: parsedFrom } = await parseOpenAPIFromMemory(from); - const { jsonLike: parsedTo } = await parseOpenAPIFromMemory(to); + const { jsonLike: parsedFrom } = await dereferenceOpenAPI(from); + const { jsonLike: parsedTo } = await dereferenceOpenAPI(to); const { currentFacts, nextFacts } = checkService.generateFacts( parsedFrom, parsedTo, diff --git a/yarn.lock b/yarn.lock index e32ccaf6..dd19bb39 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2079,19 +2079,19 @@ dependencies: "@types/yargs-parser" "*" -"@useoptic/api-checks@0.23.4": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@useoptic/api-checks/-/api-checks-0.23.4.tgz#b92b274d8e206aca093c52dae90ae3ce108103bf" - integrity sha512-XJcj8WGKWYGJhcF7bqNpsDZtrK9jlPVLnYWAc/FwLJYyIfLHMBFTbbO58DlJiY3bVXjespGJ8+StBv0Ghbmldg== +"@useoptic/api-checks@0.23.5": + version "0.23.5" + resolved "https://registry.yarnpkg.com/@useoptic/api-checks/-/api-checks-0.23.5.tgz#9676b5aab29281f679b56465f3dcb717ef99c44a" + integrity sha512-6bKCkRpsuZy9ter/uQ7gxVwmV6Ob7YL1I3IG8kLpaXwekmgA/Conz647cIFGaF2+Fhj0nNT1ufrWyUL7YNp2TQ== dependencies: "@babel/runtime" "^7.17.2" "@octokit/rest" "^18.12.0" "@sentry/node" "^6.15.0" "@stoplight/spectral-core" "^1.8.1" "@stoplight/spectral-rulesets" "^1.3.2" - "@useoptic/json-pointer-helpers" "0.23.4" - "@useoptic/openapi-io" "0.23.4" - "@useoptic/openapi-utilities" "0.23.4" + "@useoptic/json-pointer-helpers" "0.23.5" + "@useoptic/openapi-io" "0.23.5" + "@useoptic/openapi-utilities" "0.23.5" analytics-node "^6.0.0" chai "^4.3.4" chalk "^4.1.2" @@ -2108,21 +2108,21 @@ ts-invariant "^0.9.4" uuid "^8.3.2" -"@useoptic/json-pointer-helpers@0.23.4": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@useoptic/json-pointer-helpers/-/json-pointer-helpers-0.23.4.tgz#ec5126df4ce8caf0edbdf0c23bc8af8ececaa61e" - integrity sha512-A6vBspFOFx3F4+JtU4GaqmuJNbwtQFrbSlW0+tj+VBY27Sl67Vf/amelibXjXFfUrlmnuJ2uo4Q1Hy2Z1RrTGQ== +"@useoptic/json-pointer-helpers@0.23.5": + version "0.23.5" + resolved "https://registry.yarnpkg.com/@useoptic/json-pointer-helpers/-/json-pointer-helpers-0.23.5.tgz#464e2ff0ffb4eadb0b9335f1f9ba2d4d4cd7c320" + integrity sha512-irfsC8JyMb0C1g3Y5ioI16tdKWa0z51lVIAsWQm+XI6MFujsOe9TApaVMV1RoRiug0nOT+50hBUYHPMhB0BjMA== dependencies: jsonpointer "^5.0.0" -"@useoptic/openapi-cli@0.23.4": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@useoptic/openapi-cli/-/openapi-cli-0.23.4.tgz#030054a0c4d3c5c986397c63ea761d3402b35fff" - integrity sha512-/LKNUatGEezCLnsZ9BtGR0+W0KTnxd9POugGSlAax6bE8r79r13aqMscTFq+E0oohgRZmM2S0xY8NfBNiSSfXw== +"@useoptic/openapi-cli@0.23.5": + version "0.23.5" + resolved "https://registry.yarnpkg.com/@useoptic/openapi-cli/-/openapi-cli-0.23.5.tgz#72b84ee0f80689724f774483967b0b3f1bf9f779" + integrity sha512-ggBdre+zcToJX7ilBPMLKj9tX3u4a1EKGAGRAa9vZ9mrXJAX10X7RDqFjAJBNp2o4uE7NZlTydDSsggSyfm3dQ== dependencies: - "@useoptic/json-pointer-helpers" "0.23.4" - "@useoptic/openapi-io" "0.23.4" - "@useoptic/openapi-utilities" "0.23.4" + "@useoptic/json-pointer-helpers" "0.23.5" + "@useoptic/openapi-io" "0.23.5" + "@useoptic/openapi-utilities" "0.23.5" analytics-node "^6.0.0" axax "^0.2.2" commander "^9.0.0" @@ -2131,15 +2131,15 @@ json-schema-traverse "^1.0.0" ts-invariant "^0.9.4" -"@useoptic/openapi-io@0.23.4": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@useoptic/openapi-io/-/openapi-io-0.23.4.tgz#9d150fd7d474e6f5f44f19ff3fcd91b2b4b6a823" - integrity sha512-TZHhIzd8cXTkdKaVxfE21l5PR/rp67unXALna0w0Jt3AW8OC0J/TeF1b36zVOnR9KX3UuJqvEHLs7m5YEOQHMg== +"@useoptic/openapi-io@0.23.5": + version "0.23.5" + resolved "https://registry.yarnpkg.com/@useoptic/openapi-io/-/openapi-io-0.23.5.tgz#82643e344e6fd55d21ec1cd31ec805a545e1f07e" + integrity sha512-cYzbvJvKGQhWiBwleuJLuuGZ/3GXqWA3A09trvd0hDXAETJnUuS7A++TTM2ksTeA8NNa5O/2vqvmB1ZmXAuQeA== dependencies: "@apidevtools/json-schema-ref-parser" "^9.0.9" "@jsdevtools/ono" "^7.1.3" - "@useoptic/json-pointer-helpers" "0.23.4" - "@useoptic/openapi-utilities" "0.23.4" + "@useoptic/json-pointer-helpers" "0.23.5" + "@useoptic/openapi-utilities" "0.23.5" copyfiles "^2.4.1" crypto-js "^4.1.1" fast-deep-equal "^3.1.3" @@ -2153,12 +2153,12 @@ ts-invariant "^0.9.3" yaml-ast-parser "^0.0.43" -"@useoptic/openapi-utilities@0.23.4": - version "0.23.4" - resolved "https://registry.yarnpkg.com/@useoptic/openapi-utilities/-/openapi-utilities-0.23.4.tgz#377567b280afb761832416ec95eddd891fb2c316" - integrity sha512-Sp+Mkv/sG3lD6ybF04R4vi1XAqQO77e0nqyBj61ZJAwvELJcFOYTtfh2VN1vC+xN5mo8zS9wKRxv7YBQsITk0A== +"@useoptic/openapi-utilities@0.23.5": + version "0.23.5" + resolved "https://registry.yarnpkg.com/@useoptic/openapi-utilities/-/openapi-utilities-0.23.5.tgz#c2a00e536885ef62293a641b2dabe7a05bf1247d" + integrity sha512-lv5g+djoLq/ANxP/F6dLwc06eZIYCTuBSrJjZW44IYicZz2JRqh+oQQ1A2Nl4iqYs+51YQsguitU9LNNyC9L3w== dependencies: - "@useoptic/json-pointer-helpers" "0.23.4" + "@useoptic/json-pointer-helpers" "0.23.5" fast-deep-equal "^3.1.3" js-yaml "^4.1.0" lodash.sortby "^4.7.0"