From 4bf7831707357e9826a686ec44df9139a7b4e726 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Vladim=C3=ADr=20Gorej?= Date: Wed, 20 Dec 2023 11:31:42 +0100 Subject: [PATCH] chore(deps): bump reselect from 4.1.8 to 5.0.1 (#9430) Closes #9419 --- package-lock.json | 26 ++++++++---- package.json | 2 +- src/core/plugins/oas3/selectors.js | 4 +- .../oas3/spec-extensions/wrap-selectors.js | 3 +- src/core/plugins/oas31/selectors.js | 10 +++-- .../oas31/spec-extensions/selectors.js | 40 ++++++++++++------- src/core/plugins/spec/selectors.js | 11 +++-- 7 files changed, 62 insertions(+), 34 deletions(-) diff --git a/package-lock.json b/package-lock.json index dee9a409..a80bdc26 100644 --- a/package-lock.json +++ b/package-lock.json @@ -38,7 +38,7 @@ "redux": "^5.0.0", "redux-immutable": "^4.0.0", "remarkable": "^2.0.1", - "reselect": "^4.1.8", + "reselect": "^5.0.1", "serialize-error": "^8.1.0", "sha.js": "^2.4.11", "swagger-client": "^3.24.6", @@ -8092,6 +8092,12 @@ "node": ">=10" } }, + "node_modules/babel-plugin-module-resolver/node_modules/reselect": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", + "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==", + "dev": true + }, "node_modules/babel-plugin-polyfill-corejs2": { "version": "0.4.6", "resolved": "https://registry.npmjs.org/babel-plugin-polyfill-corejs2/-/babel-plugin-polyfill-corejs2-0.4.6.tgz", @@ -25998,9 +26004,9 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" }, "node_modules/reselect": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", - "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.0.1.tgz", + "integrity": "sha512-D72j2ubjgHpvuCiORWkOUxndHJrxDaSolheiz5CO+roz8ka97/4msh2E8F5qay4GawR5vzBt5MkbDHT+Rdy/Wg==" }, "node_modules/resolve": { "version": "1.22.8", @@ -35987,6 +35993,12 @@ "requires": { "brace-expansion": "^2.0.1" } + }, + "reselect": { + "version": "4.1.8", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", + "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==", + "dev": true } } }, @@ -49009,9 +49021,9 @@ "integrity": "sha512-KigOCHcocU3XODJxsu8i/j8T9tzT4adHiecwORRQ0ZZFcp7ahwXuRU1m+yuO90C5ZUyGeGfocHDI14M3L3yDAQ==" }, "reselect": { - "version": "4.1.8", - "resolved": "https://registry.npmjs.org/reselect/-/reselect-4.1.8.tgz", - "integrity": "sha512-ab9EmR80F/zQTMNeneUr4cv+jSwPJgIlvEmVwLerwrWVbpLlBuls9XHzIeTFy4cegU2NHBp3va0LKOzU5qFEYQ==" + "version": "5.0.1", + "resolved": "https://registry.npmjs.org/reselect/-/reselect-5.0.1.tgz", + "integrity": "sha512-D72j2ubjgHpvuCiORWkOUxndHJrxDaSolheiz5CO+roz8ka97/4msh2E8F5qay4GawR5vzBt5MkbDHT+Rdy/Wg==" }, "resolve": { "version": "1.22.8", diff --git a/package.json b/package.json index 637dee67..e3a8a03c 100644 --- a/package.json +++ b/package.json @@ -102,7 +102,7 @@ "redux": "^5.0.0", "redux-immutable": "^4.0.0", "remarkable": "^2.0.1", - "reselect": "^4.1.8", + "reselect": "^5.0.1", "serialize-error": "^8.1.0", "sha.js": "^2.4.11", "swagger-client": "^3.24.6", diff --git a/src/core/plugins/oas3/selectors.js b/src/core/plugins/oas3/selectors.js index 8dce935a..d902a2db 100644 --- a/src/core/plugins/oas3/selectors.js +++ b/src/core/plugins/oas3/selectors.js @@ -2,7 +2,7 @@ * @prettier */ import { OrderedMap, Map, List } from "immutable" -import { createSelector } from "reselect" +import constant from "lodash/constant" import { getDefaultRequestBodyValue } from "./components/request-body" import { stringify } from "core/utils" @@ -295,7 +295,7 @@ export const validateShallowRequired = ( return missingRequiredKeys } -export const validOperationMethods = createSelector(() => [ +export const validOperationMethods = constant([ "get", "put", "post", diff --git a/src/core/plugins/oas3/spec-extensions/wrap-selectors.js b/src/core/plugins/oas3/spec-extensions/wrap-selectors.js index d6ba9d8d..e2d54b2b 100644 --- a/src/core/plugins/oas3/spec-extensions/wrap-selectors.js +++ b/src/core/plugins/oas3/spec-extensions/wrap-selectors.js @@ -2,6 +2,7 @@ * @prettier */ import { createSelector } from "reselect" +import constant from "lodash/constant" import { specJsonWithResolvedSubtrees } from "../../spec/selectors" import { Map } from "immutable" @@ -23,7 +24,7 @@ function onlyOAS3(selector) { } } -const nullSelector = createSelector(() => null) +const nullSelector = constant(null) const OAS3NullSelector = onlyOAS3(nullSelector) diff --git a/src/core/plugins/oas31/selectors.js b/src/core/plugins/oas31/selectors.js index 4d96237c..13021610 100644 --- a/src/core/plugins/oas31/selectors.js +++ b/src/core/plugins/oas31/selectors.js @@ -6,10 +6,12 @@ import { createSelector } from "reselect" import { safeBuildUrl } from "core/utils/url" export const selectLicenseUrl = createSelector( - (state, system) => system.specSelectors.url(), - (state, system) => system.oas3Selectors.selectedServer(), - (state, system) => system.specSelectors.selectLicenseUrlField(), - (state, system) => system.specSelectors.selectLicenseIdentifierField(), + [ + (state, system) => system.specSelectors.url(), + (state, system) => system.oas3Selectors.selectedServer(), + (state, system) => system.specSelectors.selectLicenseUrlField(), + (state, system) => system.specSelectors.selectLicenseIdentifierField(), + ], (specUrl, selectedServer, url, identifier) => { if (url) { return safeBuildUrl(url, specUrl, { selectedServer }) diff --git a/src/core/plugins/oas31/spec-extensions/selectors.js b/src/core/plugins/oas31/spec-extensions/selectors.js index 43770b01..fed71ddf 100644 --- a/src/core/plugins/oas31/spec-extensions/selectors.js +++ b/src/core/plugins/oas31/spec-extensions/selectors.js @@ -24,9 +24,11 @@ export const webhooks = () => (system) => { * resolution happens. */ export const selectWebhooksOperations = createSelector( - (state, system) => system.specSelectors.webhooks(), - (state, system) => system.specSelectors.validOperationMethods(), - (state, system) => system.specSelectors.specResolvedSubtree(["webhooks"]), + [ + (state, system) => system.specSelectors.webhooks(), + (state, system) => system.specSelectors.validOperationMethods(), + (state, system) => system.specSelectors.specResolvedSubtree(["webhooks"]), + ], (webhooks, validOperationMethods) => { if (!Map.isMap(webhooks)) return {} @@ -65,9 +67,11 @@ export const selectLicenseUrlField = () => (system) => { } export const selectLicenseUrl = createSelector( - (state, system) => system.specSelectors.url(), - (state, system) => system.oas3Selectors.selectedServer(), - (state, system) => system.specSelectors.selectLicenseUrlField(), + [ + (state, system) => system.specSelectors.url(), + (state, system) => system.oas3Selectors.selectedServer(), + (state, system) => system.specSelectors.selectLicenseUrlField(), + ], (specUrl, selectedServer, url) => { if (url) { return safeBuildUrl(url, specUrl, { selectedServer }) @@ -98,9 +102,11 @@ export const selectContactUrlField = () => (system) => { } export const selectContactUrl = createSelector( - (state, system) => system.specSelectors.url(), - (state, system) => system.oas3Selectors.selectedServer(), - (state, system) => system.specSelectors.selectContactUrlField(), + [ + (state, system) => system.specSelectors.url(), + (state, system) => system.oas3Selectors.selectedServer(), + (state, system) => system.specSelectors.selectContactUrlField(), + ], (specUrl, selectedServer, url) => { if (url) { return safeBuildUrl(url, specUrl, { selectedServer }) @@ -127,9 +133,11 @@ export const selectInfoTermsOfServiceField = () => (system) => { } export const selectInfoTermsOfServiceUrl = createSelector( - (state, system) => system.specSelectors.url(), - (state, system) => system.oas3Selectors.selectedServer(), - (state, system) => system.specSelectors.selectInfoTermsOfServiceField(), + [ + (state, system) => system.specSelectors.url(), + (state, system) => system.oas3Selectors.selectedServer(), + (state, system) => system.specSelectors.selectInfoTermsOfServiceField(), + ], (specUrl, selectedServer, termsOfService) => { if (termsOfService) { return safeBuildUrl(termsOfService, specUrl, { selectedServer }) @@ -148,9 +156,11 @@ export const selectExternalDocsUrlField = () => (system) => { } export const selectExternalDocsUrl = createSelector( - (state, system) => system.specSelectors.url(), - (state, system) => system.oas3Selectors.selectedServer(), - (state, system) => system.specSelectors.selectExternalDocsUrlField(), + [ + (state, system) => system.specSelectors.url(), + (state, system) => system.oas3Selectors.selectedServer(), + (state, system) => system.specSelectors.selectExternalDocsUrlField(), + ], (specUrl, selectedServer, url) => { if (url) { return safeBuildUrl(url, specUrl, { selectedServer }) diff --git a/src/core/plugins/spec/selectors.js b/src/core/plugins/spec/selectors.js index e8619aa7..837221c3 100644 --- a/src/core/plugins/spec/selectors.js +++ b/src/core/plugins/spec/selectors.js @@ -1,4 +1,5 @@ import { createSelector } from "reselect" +import constant from "lodash/constant" import { sorters, paramToIdentifier } from "core/utils" import { fromJS, Set, Map, OrderedMap, List } from "immutable" @@ -118,7 +119,7 @@ export const paths = createSelector( spec => spec.get("paths") ) -export const validOperationMethods = createSelector(() => ["get", "put", "post", "delete", "options", "head", "patch"]) +export const validOperationMethods = constant(["get", "put", "post", "delete", "options", "head", "patch"]) export const operations = createSelector( paths, @@ -204,9 +205,11 @@ export const schemes = createSelector( ) export const operationsWithRootInherited = createSelector( - operations, - consumes, - produces, + [ + operations, + consumes, + produces + ], (operations, consumes, produces) => { return operations.map( ops => ops.update("operation", op => { if(op) {