This commit is contained in:
Vladimir Gorej
2023-03-08 11:08:49 +01:00
parent 187b0e743d
commit 0d0e6d9b23
2 changed files with 28 additions and 14 deletions

View File

@@ -34,7 +34,6 @@
"build:es:bundle": "webpack --color --config webpack/es-bundle.babel.js", "build:es:bundle": "webpack --color --config webpack/es-bundle.babel.js",
"build:es:bundle:core": "webpack --color --config webpack/es-bundle-core.babel.js", "build:es:bundle:core": "webpack --color --config webpack/es-bundle-core.babel.js",
"clean": "rimraf ./dist", "clean": "rimraf ./dist",
"predev": "npm install",
"postinstall": "patch-package", "postinstall": "patch-package",
"dev": "webpack serve --config webpack/dev.babel.js", "dev": "webpack serve --config webpack/dev.babel.js",
"deps-license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv", "deps-license": "license-checker --production --csv --out $npm_package_config_deps_check_dir/licenses.csv && license-checker --development --csv --out $npm_package_config_deps_check_dir/licenses-dev.csv",

View File

@@ -1,7 +1,11 @@
import resolve from "swagger-client/es/resolver" import genericResolveStrategy from "swagger-client/es/resolver/strategies/generic"
import openApi2ResolveStrategy from "swagger-client/es/resolver/strategies/openapi-2"
import openApi30ResolveStrategy from "swagger-client/es/resolver/strategies/openapi-3-0"
import openApi31ApiDOMResolveStrategy from "swagger-client/es/resolver/strategies/openapi-3-1-apidom"
import { makeResolve } from "swagger-client/es/resolver"
import { execute, buildRequest } from "swagger-client/es/execute" import { execute, buildRequest } from "swagger-client/es/execute"
import Http, { makeHttp, serializeRes } from "swagger-client/es/http" import Http, { makeHttp, serializeRes } from "swagger-client/es/http"
import resolveSubtree from "swagger-client/es/subtree-resolver" import { makeResolveSubtree } from "swagger-client/es/subtree-resolver"
import { opId } from "swagger-client/es/helpers" import { opId } from "swagger-client/es/helpers"
import { loaded } from "./configs-wrap-actions" import { loaded } from "./configs-wrap-actions"
@@ -11,19 +15,30 @@ export default function({ configs, getConfigs }) {
fetch: makeHttp(Http, configs.preFetch, configs.postFetch), fetch: makeHttp(Http, configs.preFetch, configs.postFetch),
buildRequest, buildRequest,
execute, execute,
resolve, resolve: makeResolve({
resolveSubtree: (obj, path, opts, ...rest) => { strategies: [
if(opts === undefined) { openApi31ApiDOMResolveStrategy,
const freshConfigs = getConfigs() openApi30ResolveStrategy,
opts = { openApi2ResolveStrategy,
modelPropertyMacro: freshConfigs.modelPropertyMacro, genericResolveStrategy,
parameterMacro: freshConfigs.parameterMacro, ],
requestInterceptor: freshConfigs.requestInterceptor, }),
responseInterceptor: freshConfigs.responseInterceptor resolveSubtree: async (obj, path, options = {}) => {
} const freshConfigs = getConfigs()
const defaultOptions = {
modelPropertyMacro: freshConfigs.modelPropertyMacro,
parameterMacro: freshConfigs.parameterMacro,
requestInterceptor: freshConfigs.requestInterceptor,
responseInterceptor: freshConfigs.responseInterceptor,
strategies: [
openApi31ApiDOMResolveStrategy,
openApi30ResolveStrategy,
openApi2ResolveStrategy,
genericResolveStrategy,
],
} }
return resolveSubtree(obj, path, opts, ...rest) return makeResolveSubtree(defaultOptions)(obj, path, options)
}, },
serializeRes, serializeRes,
opId opId