diff --git a/.github/workflows/nodejs.yml b/.github/workflows/nodejs.yml index 438e4856..950fd958 100644 --- a/.github/workflows/nodejs.yml +++ b/.github/workflows/nodejs.yml @@ -8,8 +8,11 @@ jobs: runs-on: ${{ matrix.os }} strategy: matrix: - node-version: [12, 14] - os: [windows-latest, ubuntu-latest] + node-version: [10, 12, 14] + os: [ubuntu-latest] + include: + - os: windows-latest + node-version: 14 steps: - uses: actions/checkout@v2 - name: setup Node.js ${{ matrix.node-version }} diff --git a/CHANGELOG.md b/CHANGELOG.md index 87098f19..f848daf9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -2,6 +2,18 @@ All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines. +## [0.12.0](https://github.com/aspida/openapi2aspida/compare/v0.11.0...v0.12.0) (2020-11-07) + + +### Features + +* update aspida@0.22.2 ([e95a13b](https://github.com/aspida/openapi2aspida/commit/e95a13bd720651a78dfbf42c7ceb1d1f14e297c9)) + + +### Bug Fixes + +* convert allOf/oneOf/anyOf ([7cccbfb](https://github.com/aspida/openapi2aspida/commit/7cccbfb6fd75c29ddc4e16067c359120f2fb8763)) + ## [0.11.0](https://github.com/aspida/openapi2aspida/compare/v0.10.1...v0.11.0) (2020-09-02) diff --git a/package.json b/package.json index 188ef40f..3d03d5a9 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openapi2aspida", - "version": "0.11.0", + "version": "0.12.0", "description": "Convert OpenAPI 3.0 or Swagger 2.0 definitions into aspida", "author": "Solufa ", "license": "MIT", @@ -36,11 +36,6 @@ "openapi", "swagger" ], - "dependencies": { - "aspida": "^0.21.0", - "swagger-parser": "^10.0.1", - "swagger2openapi": "^7.0.0" - }, "eslintConfig": { "env": { "es6": true, @@ -89,25 +84,31 @@ } ] }, + "dependencies": { + "aspida": "^0.22.2", + "openapi-types": "^7.0.1", + "swagger-parser": "^10.0.2", + "swagger2openapi": "^7.0.3" + }, "devDependencies": { - "@types/jest": "^26.0.13", + "@types/jest": "^26.0.15", "@types/js-yaml": "^3.12.5", "@types/minimist": "^1.2.0", - "@typescript-eslint/eslint-plugin": "^4.0.1", - "@typescript-eslint/parser": "^4.0.1", - "eslint": "^7.8.1", - "eslint-config-prettier": "^6.11.0", - "eslint-config-standard": "^14.1.1", - "eslint-plugin-import": "^2.22.0", - "eslint-plugin-jest": "^23.20.0", + "@typescript-eslint/eslint-plugin": "^4.6.1", + "@typescript-eslint/parser": "^4.6.1", + "eslint": "^7.12.1", + "eslint-config-prettier": "^6.15.0", + "eslint-config-standard": "^16.0.1", + "eslint-plugin-import": "^2.22.1", + "eslint-plugin-jest": "^24.1.0", "eslint-plugin-node": "^11.1.0", "eslint-plugin-prettier": "^3.1.4", "eslint-plugin-promise": "^4.2.1", - "eslint-plugin-standard": "^4.0.1", - "jest": "^26.4.2", - "prettier": "^2.1.1", + "eslint-plugin-standard": "^4.0.2", + "jest": "^26.6.3", + "prettier": "^2.1.2", "standard-version": "^9.0.0", - "ts-jest": "^26.3.0", - "typescript": "^4.0.2" + "ts-jest": "^26.4.3", + "typescript": "^4.0.5" } } diff --git a/samples/externals/$api.ts b/samples/externals/$api.ts index 4254284a..5f21f1a9 100644 --- a/samples/externals/$api.ts +++ b/samples/externals/$api.ts @@ -77,7 +77,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods0['get']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH1}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${prefix0}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, phone_numbers: { _phone_number: (val2: string) => { diff --git a/samples/externals/users/$api.ts b/samples/externals/users/$api.ts index bf788247..fce66c3a 100644 --- a/samples/externals/users/$api.ts +++ b/samples/externals/users/$api.ts @@ -76,7 +76,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods0['get']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH1}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${prefix0}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, phone_numbers: { _phone_number: (val2: string) => { diff --git a/samples/freee/$api.ts b/samples/freee/$api.ts index c97634c1..956ab9e9 100644 --- a/samples/freee/$api.ts +++ b/samples/freee/$api.ts @@ -126,7 +126,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -138,7 +138,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, banks: { _id: (val1: number) => { @@ -157,7 +157,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods2['get']['query'], config?: T }) => fetch(prefix, PATH1, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods2['get']['query'] }) => - `${prefix}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, companies: { _id: (val2: number) => { @@ -173,7 +173,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods5['put']['reqBody'], config?: T }) => fetch(prefix, prefix2, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods5['get']['query'] }) => - `${prefix}${prefix2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option?: { config?: T }) => @@ -201,7 +201,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods9['delete']['query'], config?: T }) => fetch(prefix, prefix4, DELETE, option).send().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods9['delete']['query'] }) => - `${prefix}${prefix4}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix4}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, post: (option: { body: Methods8['post']['reqBody'], config?: T }) => @@ -224,7 +224,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods11['delete']['query'], config?: T }) => fetch(prefix, prefix5, DELETE, option).json().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods11['delete']['query'] }) => - `${prefix}${prefix5}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix5}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, post: (option: { body: Methods10['post']['reqBody'], config?: T }) => @@ -246,7 +246,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods7['delete']['query'], config?: T }) => fetch(prefix, prefix3, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods7['get']['query'] } | { method: 'delete'; query: Methods7['delete']['query'] }) => - `${prefix}${prefix3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods6['get']['query'], config?: T }) => @@ -258,7 +258,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods6['post']['reqBody'], config?: T }) => fetch(prefix, PATH3, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods6['get']['query'] }) => - `${prefix}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, expense_application_line_templates: { _id: (val6: number) => { @@ -278,7 +278,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods13['delete']['query'], config?: T }) => fetch(prefix, prefix6, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods13['get']['query'] } | { method: 'delete'; query: Methods13['delete']['query'] }) => - `${prefix}${prefix6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods12['get']['query'], config?: T }) => @@ -290,7 +290,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods12['post']['reqBody'], config?: T }) => fetch(prefix, PATH6, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods12['get']['query'] }) => - `${prefix}${PATH6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, expense_applications: { _id: (val7: number) => { @@ -310,7 +310,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods15['delete']['query'], config?: T }) => fetch(prefix, prefix7, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods15['get']['query'] } | { method: 'delete'; query: Methods15['delete']['query'] }) => - `${prefix}${prefix7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods14['get']['query'], config?: T }) => @@ -322,7 +322,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods14['post']['reqBody'], config?: T }) => fetch(prefix, PATH7, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods14['get']['query'] }) => - `${prefix}${PATH7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, forms: { selectables: { @@ -331,7 +331,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods16['get']['query'], config?: T }) => fetch(prefix, PATH8, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods16['get']['query'] }) => - `${prefix}${PATH8}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH8}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, invoices: { @@ -352,7 +352,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods18['delete']['query'], config?: T }) => fetch(prefix, prefix8, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods18['get']['query'] } | { method: 'delete'; query: Methods18['delete']['query'] }) => - `${prefix}${prefix8}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix8}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods17['get']['query'], config?: T }) => @@ -364,7 +364,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods17['post']['reqBody'], config?: T }) => fetch(prefix, PATH9, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods17['get']['query'] }) => - `${prefix}${PATH9}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH9}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, items: { _id: (val9: number) => { @@ -384,7 +384,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods20['delete']['query'], config?: T }) => fetch(prefix, prefix9, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods20['get']['query'] } | { method: 'delete'; query: Methods20['delete']['query'] }) => - `${prefix}${prefix9}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix9}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods19['get']['query'], config?: T }) => @@ -396,7 +396,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods19['post']['reqBody'], config?: T }) => fetch(prefix, PATH10, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods19['get']['query'] }) => - `${prefix}${PATH10}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH10}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, journals: { reports: { @@ -410,7 +410,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods22['get']['query'], config?: T }) => fetch(prefix, `${prefix10}${PATH13}`, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods22['get']['query'] }) => - `${prefix}${prefix10}${PATH13}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix10}${PATH13}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, status: { get: (option: { query: Methods23['get']['query'], config?: T }) => @@ -418,7 +418,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods23['get']['query'], config?: T }) => fetch(prefix, `${prefix10}${PATH14}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods23['get']['query'] }) => - `${prefix}${prefix10}${PATH14}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix10}${PATH14}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -428,7 +428,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods21['get']['query'], config?: T }) => fetch(prefix, PATH11, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods21['get']['query'] }) => - `${prefix}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, manual_journals: { _id: (val11: number) => { @@ -448,7 +448,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods25['delete']['query'], config?: T }) => fetch(prefix, prefix11, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods25['get']['query'] } | { method: 'delete'; query: Methods25['delete']['query'] }) => - `${prefix}${prefix11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods24['get']['query'], config?: T }) => @@ -460,7 +460,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods24['post']['reqBody'], config?: T }) => fetch(prefix, PATH15, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods24['get']['query'] }) => - `${prefix}${PATH15}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH15}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, partners: { _id: (val12: number) => { @@ -480,7 +480,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods27['delete']['query'], config?: T }) => fetch(prefix, prefix12, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods27['get']['query'] } | { method: 'delete'; query: Methods27['delete']['query'] }) => - `${prefix}${prefix12}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix12}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, code: { @@ -505,7 +505,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods26['post']['reqBody'], config?: T }) => fetch(prefix, PATH16, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods26['get']['query'] }) => - `${prefix}${PATH16}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH16}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, quotations: { _id: (val14: number) => { @@ -525,7 +525,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods30['delete']['query'], config?: T }) => fetch(prefix, prefix14, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods30['get']['query'] } | { method: 'delete'; query: Methods30['delete']['query'] }) => - `${prefix}${prefix14}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix14}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods29['get']['query'], config?: T }) => @@ -537,7 +537,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods29['post']['reqBody'], config?: T }) => fetch(prefix, PATH18, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods29['get']['query'] }) => - `${prefix}${PATH18}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH18}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, receipts: { _id: (val15: number) => { @@ -557,7 +557,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods32['delete']['query'], config?: T }) => fetch(prefix, prefix15, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods32['get']['query'] } | { method: 'delete'; query: Methods32['delete']['query'] }) => - `${prefix}${prefix15}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix15}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods31['get']['query'], config?: T }) => @@ -569,7 +569,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods31['post']['reqBody'], config?: T }) => fetch(prefix, PATH19, POST, option, 'FormData').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods31['get']['query'] }) => - `${prefix}${PATH19}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH19}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, reports: { trial_bs: { @@ -578,7 +578,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods33['get']['query'], config?: T }) => fetch(prefix, PATH20, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods33['get']['query'] }) => - `${prefix}${PATH20}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH20}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_bs_three_years: { get: (option: { query: Methods34['get']['query'], config?: T }) => @@ -586,7 +586,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods34['get']['query'], config?: T }) => fetch(prefix, PATH21, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods34['get']['query'] }) => - `${prefix}${PATH21}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH21}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_bs_two_years: { get: (option: { query: Methods35['get']['query'], config?: T }) => @@ -594,7 +594,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods35['get']['query'], config?: T }) => fetch(prefix, PATH22, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods35['get']['query'] }) => - `${prefix}${PATH22}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH22}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl: { get: (option: { query: Methods36['get']['query'], config?: T }) => @@ -602,7 +602,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods36['get']['query'], config?: T }) => fetch(prefix, PATH23, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods36['get']['query'] }) => - `${prefix}${PATH23}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH23}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_sections: { get: (option: { query: Methods37['get']['query'], config?: T }) => @@ -610,7 +610,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods37['get']['query'], config?: T }) => fetch(prefix, PATH24, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods37['get']['query'] }) => - `${prefix}${PATH24}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH24}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_three_years: { get: (option: { query: Methods38['get']['query'], config?: T }) => @@ -618,7 +618,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods38['get']['query'], config?: T }) => fetch(prefix, PATH25, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods38['get']['query'] }) => - `${prefix}${PATH25}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH25}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_two_years: { get: (option: { query: Methods39['get']['query'], config?: T }) => @@ -626,7 +626,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods39['get']['query'], config?: T }) => fetch(prefix, PATH26, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods39['get']['query'] }) => - `${prefix}${PATH26}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH26}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, sections: { @@ -647,7 +647,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods41['delete']['query'], config?: T }) => fetch(prefix, prefix16, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods41['get']['query'] } | { method: 'delete'; query: Methods41['delete']['query'] }) => - `${prefix}${prefix16}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix16}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods40['get']['query'], config?: T }) => @@ -659,7 +659,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods40['post']['reqBody'], config?: T }) => fetch(prefix, PATH27, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods40['get']['query'] }) => - `${prefix}${PATH27}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH27}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, segments: { _segment_id: (val17: number) => { @@ -680,7 +680,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods43['delete']['query'], config?: T }) => fetch(prefix, prefix18, DELETE, option).send().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods43['delete']['query'] }) => - `${prefix}${prefix18}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix18}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods42['get']['query'], config?: T }) => @@ -692,7 +692,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods42['post']['reqBody'], config?: T }) => fetch(prefix, `${prefix17}${PATH29}`, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods42['get']['query'] }) => - `${prefix}${prefix17}${PATH29}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix17}${PATH29}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -715,7 +715,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods45['delete']['query'], config?: T }) => fetch(prefix, prefix19, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods45['get']['query'] } | { method: 'delete'; query: Methods45['delete']['query'] }) => - `${prefix}${prefix19}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix19}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods44['get']['query'], config?: T }) => @@ -727,7 +727,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods44['post']['reqBody'], config?: T }) => fetch(prefix, PATH30, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods44['get']['query'] }) => - `${prefix}${PATH30}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH30}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, taxes: { codes: { @@ -780,7 +780,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods50['delete']['query'], config?: T }) => fetch(prefix, prefix22, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods50['get']['query'] } | { method: 'delete'; query: Methods50['delete']['query'] }) => - `${prefix}${prefix22}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix22}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods49['get']['query'], config?: T }) => @@ -792,7 +792,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods49['post']['reqBody'], config?: T }) => fetch(prefix, PATH33, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods49['get']['query'] }) => - `${prefix}${PATH33}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH33}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, users: { capabilities: { @@ -801,7 +801,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods52['get']['query'], config?: T }) => fetch(prefix, PATH35, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods52['get']['query'] }) => - `${prefix}${PATH35}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH35}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, me: { get: (option?: { query?: Methods53['get']['query'], config?: T }) => @@ -813,14 +813,14 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods53['put']['reqBody'], config?: T }) => fetch(prefix, PATH36, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods53['get']['query'] }) => - `${prefix}${PATH36}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH36}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option: { query: Methods51['get']['query'], config?: T }) => fetch(prefix, PATH34, GET, option).json(), $get: (option: { query: Methods51['get']['query'], config?: T }) => fetch(prefix, PATH34, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods51['get']['query'] }) => - `${prefix}${PATH34}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH34}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, wallet_txns: { _id: (val23: number) => { @@ -836,7 +836,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods55['delete']['query'], config?: T }) => fetch(prefix, prefix23, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods55['get']['query'] } | { method: 'delete'; query: Methods55['delete']['query'] }) => - `${prefix}${prefix23}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix23}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods54['get']['query'], config?: T }) => @@ -848,7 +848,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods54['post']['reqBody'], config?: T }) => fetch(prefix, PATH37, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods54['get']['query'] }) => - `${prefix}${PATH37}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH37}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, walletables: { _type: (val24: number | string) => { @@ -872,7 +872,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods57['delete']['query'], config?: T }) => fetch(prefix, prefix25, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods57['get']['query'] } | { method: 'put'; query: Methods57['put']['query'] } | { method: 'delete'; query: Methods57['delete']['query'] }) => - `${prefix}${prefix25}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix25}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -886,7 +886,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods56['post']['reqBody'], config?: T }) => fetch(prefix, PATH38, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods56['get']['query'] }) => - `${prefix}${PATH38}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH38}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/freee/@types.ts b/samples/freee/@types.ts index 680af338..d0b6bae4 100644 --- a/samples/freee/@types.ts +++ b/samples/freee/@types.ts @@ -1165,6 +1165,8 @@ export type forbiddenError = { export type badRequestError = { status_code?: number errors?: { + messages: Partial + type: 'status' | 'validation' | 'error' }[] } @@ -1172,6 +1174,8 @@ export type badRequestError = { export type badRequestNotFoundError = { status_code?: number errors?: { + messages: Partial + type: 'status' | 'validation' | 'error' }[] } @@ -1190,6 +1194,8 @@ export type tooManyRequestsError = { export type internalServerError = { status_code?: number errors?: { + messages: Partial + type: 'status' | 'validation' | 'error' }[] } diff --git a/samples/freee/api/$api.ts b/samples/freee/api/$api.ts index 70da0417..48240fd4 100644 --- a/samples/freee/api/$api.ts +++ b/samples/freee/api/$api.ts @@ -125,7 +125,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -137,7 +137,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, banks: { _id: (val1: number) => { @@ -156,7 +156,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods2['get']['query'], config?: T }) => fetch(prefix, PATH1, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods2['get']['query'] }) => - `${prefix}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, companies: { _id: (val2: number) => { @@ -172,7 +172,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods5['put']['reqBody'], config?: T }) => fetch(prefix, prefix2, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods5['get']['query'] }) => - `${prefix}${prefix2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option?: { config?: T }) => @@ -200,7 +200,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods9['delete']['query'], config?: T }) => fetch(prefix, prefix4, DELETE, option).send().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods9['delete']['query'] }) => - `${prefix}${prefix4}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix4}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, post: (option: { body: Methods8['post']['reqBody'], config?: T }) => @@ -223,7 +223,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods11['delete']['query'], config?: T }) => fetch(prefix, prefix5, DELETE, option).json().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods11['delete']['query'] }) => - `${prefix}${prefix5}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix5}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, post: (option: { body: Methods10['post']['reqBody'], config?: T }) => @@ -245,7 +245,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods7['delete']['query'], config?: T }) => fetch(prefix, prefix3, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods7['get']['query'] } | { method: 'delete'; query: Methods7['delete']['query'] }) => - `${prefix}${prefix3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods6['get']['query'], config?: T }) => @@ -257,7 +257,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods6['post']['reqBody'], config?: T }) => fetch(prefix, PATH3, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods6['get']['query'] }) => - `${prefix}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, expense_application_line_templates: { _id: (val6: number) => { @@ -277,7 +277,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods13['delete']['query'], config?: T }) => fetch(prefix, prefix6, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods13['get']['query'] } | { method: 'delete'; query: Methods13['delete']['query'] }) => - `${prefix}${prefix6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods12['get']['query'], config?: T }) => @@ -289,7 +289,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods12['post']['reqBody'], config?: T }) => fetch(prefix, PATH6, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods12['get']['query'] }) => - `${prefix}${PATH6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, expense_applications: { _id: (val7: number) => { @@ -309,7 +309,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods15['delete']['query'], config?: T }) => fetch(prefix, prefix7, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods15['get']['query'] } | { method: 'delete'; query: Methods15['delete']['query'] }) => - `${prefix}${prefix7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods14['get']['query'], config?: T }) => @@ -321,7 +321,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods14['post']['reqBody'], config?: T }) => fetch(prefix, PATH7, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods14['get']['query'] }) => - `${prefix}${PATH7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, forms: { selectables: { @@ -330,7 +330,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods16['get']['query'], config?: T }) => fetch(prefix, PATH8, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods16['get']['query'] }) => - `${prefix}${PATH8}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH8}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, invoices: { @@ -351,7 +351,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods18['delete']['query'], config?: T }) => fetch(prefix, prefix8, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods18['get']['query'] } | { method: 'delete'; query: Methods18['delete']['query'] }) => - `${prefix}${prefix8}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix8}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods17['get']['query'], config?: T }) => @@ -363,7 +363,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods17['post']['reqBody'], config?: T }) => fetch(prefix, PATH9, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods17['get']['query'] }) => - `${prefix}${PATH9}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH9}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, items: { _id: (val9: number) => { @@ -383,7 +383,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods20['delete']['query'], config?: T }) => fetch(prefix, prefix9, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods20['get']['query'] } | { method: 'delete'; query: Methods20['delete']['query'] }) => - `${prefix}${prefix9}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix9}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods19['get']['query'], config?: T }) => @@ -395,7 +395,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods19['post']['reqBody'], config?: T }) => fetch(prefix, PATH10, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods19['get']['query'] }) => - `${prefix}${PATH10}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH10}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, journals: { reports: { @@ -409,7 +409,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods22['get']['query'], config?: T }) => fetch(prefix, `${prefix10}${PATH13}`, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods22['get']['query'] }) => - `${prefix}${prefix10}${PATH13}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix10}${PATH13}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, status: { get: (option: { query: Methods23['get']['query'], config?: T }) => @@ -417,7 +417,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods23['get']['query'], config?: T }) => fetch(prefix, `${prefix10}${PATH14}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods23['get']['query'] }) => - `${prefix}${prefix10}${PATH14}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix10}${PATH14}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -427,7 +427,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods21['get']['query'], config?: T }) => fetch(prefix, PATH11, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods21['get']['query'] }) => - `${prefix}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, manual_journals: { _id: (val11: number) => { @@ -447,7 +447,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods25['delete']['query'], config?: T }) => fetch(prefix, prefix11, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods25['get']['query'] } | { method: 'delete'; query: Methods25['delete']['query'] }) => - `${prefix}${prefix11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods24['get']['query'], config?: T }) => @@ -459,7 +459,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods24['post']['reqBody'], config?: T }) => fetch(prefix, PATH15, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods24['get']['query'] }) => - `${prefix}${PATH15}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH15}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, partners: { _id: (val12: number) => { @@ -479,7 +479,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods27['delete']['query'], config?: T }) => fetch(prefix, prefix12, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods27['get']['query'] } | { method: 'delete'; query: Methods27['delete']['query'] }) => - `${prefix}${prefix12}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix12}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, code: { @@ -504,7 +504,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods26['post']['reqBody'], config?: T }) => fetch(prefix, PATH16, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods26['get']['query'] }) => - `${prefix}${PATH16}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH16}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, quotations: { _id: (val14: number) => { @@ -524,7 +524,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods30['delete']['query'], config?: T }) => fetch(prefix, prefix14, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods30['get']['query'] } | { method: 'delete'; query: Methods30['delete']['query'] }) => - `${prefix}${prefix14}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix14}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods29['get']['query'], config?: T }) => @@ -536,7 +536,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods29['post']['reqBody'], config?: T }) => fetch(prefix, PATH18, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods29['get']['query'] }) => - `${prefix}${PATH18}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH18}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, receipts: { _id: (val15: number) => { @@ -556,7 +556,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods32['delete']['query'], config?: T }) => fetch(prefix, prefix15, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods32['get']['query'] } | { method: 'delete'; query: Methods32['delete']['query'] }) => - `${prefix}${prefix15}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix15}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods31['get']['query'], config?: T }) => @@ -568,7 +568,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods31['post']['reqBody'], config?: T }) => fetch(prefix, PATH19, POST, option, 'FormData').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods31['get']['query'] }) => - `${prefix}${PATH19}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH19}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, reports: { trial_bs: { @@ -577,7 +577,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods33['get']['query'], config?: T }) => fetch(prefix, PATH20, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods33['get']['query'] }) => - `${prefix}${PATH20}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH20}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_bs_three_years: { get: (option: { query: Methods34['get']['query'], config?: T }) => @@ -585,7 +585,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods34['get']['query'], config?: T }) => fetch(prefix, PATH21, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods34['get']['query'] }) => - `${prefix}${PATH21}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH21}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_bs_two_years: { get: (option: { query: Methods35['get']['query'], config?: T }) => @@ -593,7 +593,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods35['get']['query'], config?: T }) => fetch(prefix, PATH22, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods35['get']['query'] }) => - `${prefix}${PATH22}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH22}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl: { get: (option: { query: Methods36['get']['query'], config?: T }) => @@ -601,7 +601,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods36['get']['query'], config?: T }) => fetch(prefix, PATH23, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods36['get']['query'] }) => - `${prefix}${PATH23}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH23}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_sections: { get: (option: { query: Methods37['get']['query'], config?: T }) => @@ -609,7 +609,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods37['get']['query'], config?: T }) => fetch(prefix, PATH24, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods37['get']['query'] }) => - `${prefix}${PATH24}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH24}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_three_years: { get: (option: { query: Methods38['get']['query'], config?: T }) => @@ -617,7 +617,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods38['get']['query'], config?: T }) => fetch(prefix, PATH25, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods38['get']['query'] }) => - `${prefix}${PATH25}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH25}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_two_years: { get: (option: { query: Methods39['get']['query'], config?: T }) => @@ -625,7 +625,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods39['get']['query'], config?: T }) => fetch(prefix, PATH26, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods39['get']['query'] }) => - `${prefix}${PATH26}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH26}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, sections: { @@ -646,7 +646,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods41['delete']['query'], config?: T }) => fetch(prefix, prefix16, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods41['get']['query'] } | { method: 'delete'; query: Methods41['delete']['query'] }) => - `${prefix}${prefix16}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix16}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods40['get']['query'], config?: T }) => @@ -658,7 +658,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods40['post']['reqBody'], config?: T }) => fetch(prefix, PATH27, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods40['get']['query'] }) => - `${prefix}${PATH27}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH27}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, segments: { _segment_id: (val17: number) => { @@ -679,7 +679,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods43['delete']['query'], config?: T }) => fetch(prefix, prefix18, DELETE, option).send().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods43['delete']['query'] }) => - `${prefix}${prefix18}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix18}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods42['get']['query'], config?: T }) => @@ -691,7 +691,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods42['post']['reqBody'], config?: T }) => fetch(prefix, `${prefix17}${PATH29}`, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods42['get']['query'] }) => - `${prefix}${prefix17}${PATH29}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix17}${PATH29}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -714,7 +714,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods45['delete']['query'], config?: T }) => fetch(prefix, prefix19, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods45['get']['query'] } | { method: 'delete'; query: Methods45['delete']['query'] }) => - `${prefix}${prefix19}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix19}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods44['get']['query'], config?: T }) => @@ -726,7 +726,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods44['post']['reqBody'], config?: T }) => fetch(prefix, PATH30, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods44['get']['query'] }) => - `${prefix}${PATH30}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH30}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, taxes: { codes: { @@ -779,7 +779,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods50['delete']['query'], config?: T }) => fetch(prefix, prefix22, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods50['get']['query'] } | { method: 'delete'; query: Methods50['delete']['query'] }) => - `${prefix}${prefix22}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix22}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods49['get']['query'], config?: T }) => @@ -791,7 +791,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods49['post']['reqBody'], config?: T }) => fetch(prefix, PATH33, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods49['get']['query'] }) => - `${prefix}${PATH33}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH33}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, users: { capabilities: { @@ -800,7 +800,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods52['get']['query'], config?: T }) => fetch(prefix, PATH35, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods52['get']['query'] }) => - `${prefix}${PATH35}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH35}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, me: { get: (option?: { query?: Methods53['get']['query'], config?: T }) => @@ -812,14 +812,14 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods53['put']['reqBody'], config?: T }) => fetch(prefix, PATH36, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods53['get']['query'] }) => - `${prefix}${PATH36}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH36}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option: { query: Methods51['get']['query'], config?: T }) => fetch(prefix, PATH34, GET, option).json(), $get: (option: { query: Methods51['get']['query'], config?: T }) => fetch(prefix, PATH34, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods51['get']['query'] }) => - `${prefix}${PATH34}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH34}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, wallet_txns: { _id: (val23: number) => { @@ -835,7 +835,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods55['delete']['query'], config?: T }) => fetch(prefix, prefix23, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods55['get']['query'] } | { method: 'delete'; query: Methods55['delete']['query'] }) => - `${prefix}${prefix23}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix23}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods54['get']['query'], config?: T }) => @@ -847,7 +847,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods54['post']['reqBody'], config?: T }) => fetch(prefix, PATH37, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods54['get']['query'] }) => - `${prefix}${PATH37}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH37}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, walletables: { _type: (val24: number | string) => { @@ -871,7 +871,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods57['delete']['query'], config?: T }) => fetch(prefix, prefix25, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods57['get']['query'] } | { method: 'put'; query: Methods57['put']['query'] } | { method: 'delete'; query: Methods57['delete']['query'] }) => - `${prefix}${prefix25}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix25}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -885,7 +885,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods56['post']['reqBody'], config?: T }) => fetch(prefix, PATH38, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods56['get']['query'] }) => - `${prefix}${PATH38}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH38}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/freee/api/1/$api.ts b/samples/freee/api/1/$api.ts index 8e9009ee..d556f077 100644 --- a/samples/freee/api/1/$api.ts +++ b/samples/freee/api/1/$api.ts @@ -124,7 +124,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -136,7 +136,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, banks: { _id: (val1: number) => { @@ -155,7 +155,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods2['get']['query'], config?: T }) => fetch(prefix, PATH1, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods2['get']['query'] }) => - `${prefix}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, companies: { _id: (val2: number) => { @@ -171,7 +171,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods5['put']['reqBody'], config?: T }) => fetch(prefix, prefix2, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods5['get']['query'] }) => - `${prefix}${prefix2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option?: { config?: T }) => @@ -199,7 +199,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods9['delete']['query'], config?: T }) => fetch(prefix, prefix4, DELETE, option).send().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods9['delete']['query'] }) => - `${prefix}${prefix4}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix4}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, post: (option: { body: Methods8['post']['reqBody'], config?: T }) => @@ -222,7 +222,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods11['delete']['query'], config?: T }) => fetch(prefix, prefix5, DELETE, option).json().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods11['delete']['query'] }) => - `${prefix}${prefix5}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix5}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, post: (option: { body: Methods10['post']['reqBody'], config?: T }) => @@ -244,7 +244,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods7['delete']['query'], config?: T }) => fetch(prefix, prefix3, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods7['get']['query'] } | { method: 'delete'; query: Methods7['delete']['query'] }) => - `${prefix}${prefix3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods6['get']['query'], config?: T }) => @@ -256,7 +256,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods6['post']['reqBody'], config?: T }) => fetch(prefix, PATH3, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods6['get']['query'] }) => - `${prefix}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, expense_application_line_templates: { _id: (val6: number) => { @@ -276,7 +276,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods13['delete']['query'], config?: T }) => fetch(prefix, prefix6, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods13['get']['query'] } | { method: 'delete'; query: Methods13['delete']['query'] }) => - `${prefix}${prefix6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods12['get']['query'], config?: T }) => @@ -288,7 +288,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods12['post']['reqBody'], config?: T }) => fetch(prefix, PATH6, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods12['get']['query'] }) => - `${prefix}${PATH6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, expense_applications: { _id: (val7: number) => { @@ -308,7 +308,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods15['delete']['query'], config?: T }) => fetch(prefix, prefix7, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods15['get']['query'] } | { method: 'delete'; query: Methods15['delete']['query'] }) => - `${prefix}${prefix7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods14['get']['query'], config?: T }) => @@ -320,7 +320,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods14['post']['reqBody'], config?: T }) => fetch(prefix, PATH7, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods14['get']['query'] }) => - `${prefix}${PATH7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, forms: { selectables: { @@ -329,7 +329,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods16['get']['query'], config?: T }) => fetch(prefix, PATH8, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods16['get']['query'] }) => - `${prefix}${PATH8}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH8}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, invoices: { @@ -350,7 +350,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods18['delete']['query'], config?: T }) => fetch(prefix, prefix8, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods18['get']['query'] } | { method: 'delete'; query: Methods18['delete']['query'] }) => - `${prefix}${prefix8}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix8}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods17['get']['query'], config?: T }) => @@ -362,7 +362,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods17['post']['reqBody'], config?: T }) => fetch(prefix, PATH9, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods17['get']['query'] }) => - `${prefix}${PATH9}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH9}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, items: { _id: (val9: number) => { @@ -382,7 +382,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods20['delete']['query'], config?: T }) => fetch(prefix, prefix9, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods20['get']['query'] } | { method: 'delete'; query: Methods20['delete']['query'] }) => - `${prefix}${prefix9}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix9}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods19['get']['query'], config?: T }) => @@ -394,7 +394,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods19['post']['reqBody'], config?: T }) => fetch(prefix, PATH10, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods19['get']['query'] }) => - `${prefix}${PATH10}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH10}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, journals: { reports: { @@ -408,7 +408,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods22['get']['query'], config?: T }) => fetch(prefix, `${prefix10}${PATH13}`, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods22['get']['query'] }) => - `${prefix}${prefix10}${PATH13}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix10}${PATH13}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, status: { get: (option: { query: Methods23['get']['query'], config?: T }) => @@ -416,7 +416,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods23['get']['query'], config?: T }) => fetch(prefix, `${prefix10}${PATH14}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods23['get']['query'] }) => - `${prefix}${prefix10}${PATH14}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix10}${PATH14}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -426,7 +426,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods21['get']['query'], config?: T }) => fetch(prefix, PATH11, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods21['get']['query'] }) => - `${prefix}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, manual_journals: { _id: (val11: number) => { @@ -446,7 +446,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods25['delete']['query'], config?: T }) => fetch(prefix, prefix11, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods25['get']['query'] } | { method: 'delete'; query: Methods25['delete']['query'] }) => - `${prefix}${prefix11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods24['get']['query'], config?: T }) => @@ -458,7 +458,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods24['post']['reqBody'], config?: T }) => fetch(prefix, PATH15, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods24['get']['query'] }) => - `${prefix}${PATH15}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH15}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, partners: { _id: (val12: number) => { @@ -478,7 +478,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods27['delete']['query'], config?: T }) => fetch(prefix, prefix12, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods27['get']['query'] } | { method: 'delete'; query: Methods27['delete']['query'] }) => - `${prefix}${prefix12}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix12}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, code: { @@ -503,7 +503,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods26['post']['reqBody'], config?: T }) => fetch(prefix, PATH16, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods26['get']['query'] }) => - `${prefix}${PATH16}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH16}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, quotations: { _id: (val14: number) => { @@ -523,7 +523,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods30['delete']['query'], config?: T }) => fetch(prefix, prefix14, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods30['get']['query'] } | { method: 'delete'; query: Methods30['delete']['query'] }) => - `${prefix}${prefix14}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix14}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods29['get']['query'], config?: T }) => @@ -535,7 +535,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods29['post']['reqBody'], config?: T }) => fetch(prefix, PATH18, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods29['get']['query'] }) => - `${prefix}${PATH18}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH18}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, receipts: { _id: (val15: number) => { @@ -555,7 +555,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods32['delete']['query'], config?: T }) => fetch(prefix, prefix15, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods32['get']['query'] } | { method: 'delete'; query: Methods32['delete']['query'] }) => - `${prefix}${prefix15}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix15}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods31['get']['query'], config?: T }) => @@ -567,7 +567,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods31['post']['reqBody'], config?: T }) => fetch(prefix, PATH19, POST, option, 'FormData').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods31['get']['query'] }) => - `${prefix}${PATH19}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH19}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, reports: { trial_bs: { @@ -576,7 +576,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods33['get']['query'], config?: T }) => fetch(prefix, PATH20, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods33['get']['query'] }) => - `${prefix}${PATH20}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH20}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_bs_three_years: { get: (option: { query: Methods34['get']['query'], config?: T }) => @@ -584,7 +584,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods34['get']['query'], config?: T }) => fetch(prefix, PATH21, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods34['get']['query'] }) => - `${prefix}${PATH21}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH21}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_bs_two_years: { get: (option: { query: Methods35['get']['query'], config?: T }) => @@ -592,7 +592,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods35['get']['query'], config?: T }) => fetch(prefix, PATH22, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods35['get']['query'] }) => - `${prefix}${PATH22}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH22}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl: { get: (option: { query: Methods36['get']['query'], config?: T }) => @@ -600,7 +600,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods36['get']['query'], config?: T }) => fetch(prefix, PATH23, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods36['get']['query'] }) => - `${prefix}${PATH23}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH23}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_sections: { get: (option: { query: Methods37['get']['query'], config?: T }) => @@ -608,7 +608,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods37['get']['query'], config?: T }) => fetch(prefix, PATH24, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods37['get']['query'] }) => - `${prefix}${PATH24}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH24}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_three_years: { get: (option: { query: Methods38['get']['query'], config?: T }) => @@ -616,7 +616,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods38['get']['query'], config?: T }) => fetch(prefix, PATH25, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods38['get']['query'] }) => - `${prefix}${PATH25}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH25}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_two_years: { get: (option: { query: Methods39['get']['query'], config?: T }) => @@ -624,7 +624,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods39['get']['query'], config?: T }) => fetch(prefix, PATH26, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods39['get']['query'] }) => - `${prefix}${PATH26}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH26}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, sections: { @@ -645,7 +645,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods41['delete']['query'], config?: T }) => fetch(prefix, prefix16, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods41['get']['query'] } | { method: 'delete'; query: Methods41['delete']['query'] }) => - `${prefix}${prefix16}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix16}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods40['get']['query'], config?: T }) => @@ -657,7 +657,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods40['post']['reqBody'], config?: T }) => fetch(prefix, PATH27, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods40['get']['query'] }) => - `${prefix}${PATH27}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH27}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, segments: { _segment_id: (val17: number) => { @@ -678,7 +678,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods43['delete']['query'], config?: T }) => fetch(prefix, prefix18, DELETE, option).send().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods43['delete']['query'] }) => - `${prefix}${prefix18}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix18}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods42['get']['query'], config?: T }) => @@ -690,7 +690,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods42['post']['reqBody'], config?: T }) => fetch(prefix, `${prefix17}${PATH29}`, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods42['get']['query'] }) => - `${prefix}${prefix17}${PATH29}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix17}${PATH29}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -713,7 +713,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods45['delete']['query'], config?: T }) => fetch(prefix, prefix19, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods45['get']['query'] } | { method: 'delete'; query: Methods45['delete']['query'] }) => - `${prefix}${prefix19}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix19}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods44['get']['query'], config?: T }) => @@ -725,7 +725,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods44['post']['reqBody'], config?: T }) => fetch(prefix, PATH30, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods44['get']['query'] }) => - `${prefix}${PATH30}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH30}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, taxes: { codes: { @@ -778,7 +778,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods50['delete']['query'], config?: T }) => fetch(prefix, prefix22, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods50['get']['query'] } | { method: 'delete'; query: Methods50['delete']['query'] }) => - `${prefix}${prefix22}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix22}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods49['get']['query'], config?: T }) => @@ -790,7 +790,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods49['post']['reqBody'], config?: T }) => fetch(prefix, PATH33, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods49['get']['query'] }) => - `${prefix}${PATH33}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH33}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, users: { capabilities: { @@ -799,7 +799,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods52['get']['query'], config?: T }) => fetch(prefix, PATH35, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods52['get']['query'] }) => - `${prefix}${PATH35}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH35}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, me: { get: (option?: { query?: Methods53['get']['query'], config?: T }) => @@ -811,14 +811,14 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods53['put']['reqBody'], config?: T }) => fetch(prefix, PATH36, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods53['get']['query'] }) => - `${prefix}${PATH36}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH36}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option: { query: Methods51['get']['query'], config?: T }) => fetch(prefix, PATH34, GET, option).json(), $get: (option: { query: Methods51['get']['query'], config?: T }) => fetch(prefix, PATH34, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods51['get']['query'] }) => - `${prefix}${PATH34}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH34}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, wallet_txns: { _id: (val23: number) => { @@ -834,7 +834,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods55['delete']['query'], config?: T }) => fetch(prefix, prefix23, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods55['get']['query'] } | { method: 'delete'; query: Methods55['delete']['query'] }) => - `${prefix}${prefix23}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix23}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods54['get']['query'], config?: T }) => @@ -846,7 +846,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods54['post']['reqBody'], config?: T }) => fetch(prefix, PATH37, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods54['get']['query'] }) => - `${prefix}${PATH37}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH37}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, walletables: { _type: (val24: number | string) => { @@ -870,7 +870,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods57['delete']['query'], config?: T }) => fetch(prefix, prefix25, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods57['get']['query'] } | { method: 'put'; query: Methods57['put']['query'] } | { method: 'delete'; query: Methods57['delete']['query'] }) => - `${prefix}${prefix25}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix25}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -884,7 +884,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods56['post']['reqBody'], config?: T }) => fetch(prefix, PATH38, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods56['get']['query'] }) => - `${prefix}${PATH38}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH38}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/freee/api/1/account_items/$api.ts b/samples/freee/api/1/account_items/$api.ts index 1d859d8e..089e7b21 100644 --- a/samples/freee/api/1/account_items/$api.ts +++ b/samples/freee/api/1/account_items/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/banks/$api.ts b/samples/freee/api/1/banks/$api.ts index 9426b1cd..76814ca4 100644 --- a/samples/freee/api/1/banks/$api.ts +++ b/samples/freee/api/1/banks/$api.ts @@ -25,7 +25,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/companies/$api.ts b/samples/freee/api/1/companies/$api.ts index 8e970348..dc4479cd 100644 --- a/samples/freee/api/1/companies/$api.ts +++ b/samples/freee/api/1/companies/$api.ts @@ -23,7 +23,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods1['put']['reqBody'], config?: T }) => fetch(prefix, prefix0, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option?: { config?: T }) => diff --git a/samples/freee/api/1/deals/$api.ts b/samples/freee/api/1/deals/$api.ts index 7804f90c..fe831ba1 100644 --- a/samples/freee/api/1/deals/$api.ts +++ b/samples/freee/api/1/deals/$api.ts @@ -36,7 +36,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods3['delete']['query'], config?: T }) => fetch(prefix, prefix1, DELETE, option).send().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods3['delete']['query'] }) => - `${prefix}${prefix1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, post: (option: { body: Methods2['post']['reqBody'], config?: T }) => @@ -59,7 +59,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods5['delete']['query'], config?: T }) => fetch(prefix, prefix2, DELETE, option).json().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods5['delete']['query'] }) => - `${prefix}${prefix2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, post: (option: { body: Methods4['post']['reqBody'], config?: T }) => @@ -81,7 +81,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -93,7 +93,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/expense_application_line_templates/$api.ts b/samples/freee/api/1/expense_application_line_templates/$api.ts index 56a87236..4f1441d0 100644 --- a/samples/freee/api/1/expense_application_line_templates/$api.ts +++ b/samples/freee/api/1/expense_application_line_templates/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/expense_applications/$api.ts b/samples/freee/api/1/expense_applications/$api.ts index 9a281185..bed31c11 100644 --- a/samples/freee/api/1/expense_applications/$api.ts +++ b/samples/freee/api/1/expense_applications/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/forms/$api.ts b/samples/freee/api/1/forms/$api.ts index a5219e0f..f22639ee 100644 --- a/samples/freee/api/1/forms/$api.ts +++ b/samples/freee/api/1/forms/$api.ts @@ -14,7 +14,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/freee/api/1/forms/selectables/$api.ts b/samples/freee/api/1/forms/selectables/$api.ts index 88b19901..8a1c4429 100644 --- a/samples/freee/api/1/forms/selectables/$api.ts +++ b/samples/freee/api/1/forms/selectables/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/invoices/$api.ts b/samples/freee/api/1/invoices/$api.ts index aaca0dde..9ea23f26 100644 --- a/samples/freee/api/1/invoices/$api.ts +++ b/samples/freee/api/1/invoices/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/items/$api.ts b/samples/freee/api/1/items/$api.ts index 3639db3f..53fbd0bf 100644 --- a/samples/freee/api/1/items/$api.ts +++ b/samples/freee/api/1/items/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/journals/$api.ts b/samples/freee/api/1/journals/$api.ts index 2c1a747c..a16f4885 100644 --- a/samples/freee/api/1/journals/$api.ts +++ b/samples/freee/api/1/journals/$api.ts @@ -24,7 +24,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH2}`, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, status: { get: (option: { query: Methods2['get']['query'], config?: T }) => @@ -32,7 +32,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods2['get']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH3}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods2['get']['query'] }) => - `${prefix}${prefix0}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -42,7 +42,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/journals/reports/$api.ts b/samples/freee/api/1/journals/reports/$api.ts index 44b53930..d30dbea5 100644 --- a/samples/freee/api/1/journals/reports/$api.ts +++ b/samples/freee/api/1/journals/reports/$api.ts @@ -21,7 +21,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH1}`, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${prefix0}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, status: { get: (option: { query: Methods1['get']['query'], config?: T }) => @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH2}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/freee/api/1/manual_journals/$api.ts b/samples/freee/api/1/manual_journals/$api.ts index 80d94117..72029346 100644 --- a/samples/freee/api/1/manual_journals/$api.ts +++ b/samples/freee/api/1/manual_journals/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/partners/$api.ts b/samples/freee/api/1/partners/$api.ts index 57482f7f..51f1384e 100644 --- a/samples/freee/api/1/partners/$api.ts +++ b/samples/freee/api/1/partners/$api.ts @@ -31,7 +31,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, code: { @@ -56,7 +56,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/quotations/$api.ts b/samples/freee/api/1/quotations/$api.ts index 5b17a6d0..3bb6002f 100644 --- a/samples/freee/api/1/quotations/$api.ts +++ b/samples/freee/api/1/quotations/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/receipts/$api.ts b/samples/freee/api/1/receipts/$api.ts index 4e1fa3e2..ab16e58a 100644 --- a/samples/freee/api/1/receipts/$api.ts +++ b/samples/freee/api/1/receipts/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'FormData').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/reports/$api.ts b/samples/freee/api/1/reports/$api.ts index 19d32d34..9cf90053 100644 --- a/samples/freee/api/1/reports/$api.ts +++ b/samples/freee/api/1/reports/$api.ts @@ -26,7 +26,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_bs_three_years: { get: (option: { query: Methods1['get']['query'], config?: T }) => @@ -34,7 +34,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, PATH1, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_bs_two_years: { get: (option: { query: Methods2['get']['query'], config?: T }) => @@ -42,7 +42,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods2['get']['query'], config?: T }) => fetch(prefix, PATH2, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods2['get']['query'] }) => - `${prefix}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl: { get: (option: { query: Methods3['get']['query'], config?: T }) => @@ -50,7 +50,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods3['get']['query'], config?: T }) => fetch(prefix, PATH3, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods3['get']['query'] }) => - `${prefix}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_sections: { get: (option: { query: Methods4['get']['query'], config?: T }) => @@ -58,7 +58,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods4['get']['query'], config?: T }) => fetch(prefix, PATH4, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods4['get']['query'] }) => - `${prefix}${PATH4}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH4}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_three_years: { get: (option: { query: Methods5['get']['query'], config?: T }) => @@ -66,7 +66,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods5['get']['query'], config?: T }) => fetch(prefix, PATH5, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods5['get']['query'] }) => - `${prefix}${PATH5}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH5}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, trial_pl_two_years: { get: (option: { query: Methods6['get']['query'], config?: T }) => @@ -74,7 +74,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods6['get']['query'], config?: T }) => fetch(prefix, PATH6, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods6['get']['query'] }) => - `${prefix}${PATH6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/freee/api/1/reports/trial_bs/$api.ts b/samples/freee/api/1/reports/trial_bs/$api.ts index e5451d71..d776e36f 100644 --- a/samples/freee/api/1/reports/trial_bs/$api.ts +++ b/samples/freee/api/1/reports/trial_bs/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/reports/trial_bs_three_years/$api.ts b/samples/freee/api/1/reports/trial_bs_three_years/$api.ts index 23a9e892..685cba3e 100644 --- a/samples/freee/api/1/reports/trial_bs_three_years/$api.ts +++ b/samples/freee/api/1/reports/trial_bs_three_years/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/reports/trial_bs_two_years/$api.ts b/samples/freee/api/1/reports/trial_bs_two_years/$api.ts index 10f77986..158077d8 100644 --- a/samples/freee/api/1/reports/trial_bs_two_years/$api.ts +++ b/samples/freee/api/1/reports/trial_bs_two_years/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/reports/trial_pl/$api.ts b/samples/freee/api/1/reports/trial_pl/$api.ts index 2805f4ef..eba0e17e 100644 --- a/samples/freee/api/1/reports/trial_pl/$api.ts +++ b/samples/freee/api/1/reports/trial_pl/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/reports/trial_pl_sections/$api.ts b/samples/freee/api/1/reports/trial_pl_sections/$api.ts index 5205492c..18d16393 100644 --- a/samples/freee/api/1/reports/trial_pl_sections/$api.ts +++ b/samples/freee/api/1/reports/trial_pl_sections/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/reports/trial_pl_three_years/$api.ts b/samples/freee/api/1/reports/trial_pl_three_years/$api.ts index 208d50c4..31176742 100644 --- a/samples/freee/api/1/reports/trial_pl_three_years/$api.ts +++ b/samples/freee/api/1/reports/trial_pl_three_years/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/reports/trial_pl_two_years/$api.ts b/samples/freee/api/1/reports/trial_pl_two_years/$api.ts index e7923012..57f18fd4 100644 --- a/samples/freee/api/1/reports/trial_pl_two_years/$api.ts +++ b/samples/freee/api/1/reports/trial_pl_two_years/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/sections/$api.ts b/samples/freee/api/1/sections/$api.ts index 3a711259..ebf0e01f 100644 --- a/samples/freee/api/1/sections/$api.ts +++ b/samples/freee/api/1/sections/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/segments/$api.ts b/samples/freee/api/1/segments/$api.ts index f03b194b..27439a2c 100644 --- a/samples/freee/api/1/segments/$api.ts +++ b/samples/freee/api/1/segments/$api.ts @@ -31,7 +31,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix1, DELETE, option).send().then(r => r.body), $path: (option?: { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -43,7 +43,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, `${prefix0}${PATH1}`, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${prefix0}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/freee/api/1/tags/$api.ts b/samples/freee/api/1/tags/$api.ts index b58bf403..44ead501 100644 --- a/samples/freee/api/1/tags/$api.ts +++ b/samples/freee/api/1/tags/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/transfers/$api.ts b/samples/freee/api/1/transfers/$api.ts index cd9cdac6..4c94dcac 100644 --- a/samples/freee/api/1/transfers/$api.ts +++ b/samples/freee/api/1/transfers/$api.ts @@ -29,7 +29,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/users/$api.ts b/samples/freee/api/1/users/$api.ts index 31c21181..c80534fb 100644 --- a/samples/freee/api/1/users/$api.ts +++ b/samples/freee/api/1/users/$api.ts @@ -19,7 +19,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, PATH1, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, me: { get: (option?: { query?: Methods2['get']['query'], config?: T }) => @@ -31,14 +31,14 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods2['put']['reqBody'], config?: T }) => fetch(prefix, PATH2, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods2['get']['query'] }) => - `${prefix}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json(), $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/users/capabilities/$api.ts b/samples/freee/api/1/users/capabilities/$api.ts index 8fc073cd..67de1678 100644 --- a/samples/freee/api/1/users/capabilities/$api.ts +++ b/samples/freee/api/1/users/capabilities/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/users/me/$api.ts b/samples/freee/api/1/users/me/$api.ts index dbd14da7..14990971 100644 --- a/samples/freee/api/1/users/me/$api.ts +++ b/samples/freee/api/1/users/me/$api.ts @@ -18,7 +18,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { body?: Methods0['put']['reqBody'], config?: T }) => fetch(prefix, PATH0, PUT, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/wallet_txns/$api.ts b/samples/freee/api/1/wallet_txns/$api.ts index 8f46fa4b..7a2237cc 100644 --- a/samples/freee/api/1/wallet_txns/$api.ts +++ b/samples/freee/api/1/wallet_txns/$api.ts @@ -24,7 +24,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -36,7 +36,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/freee/api/1/walletables/$api.ts b/samples/freee/api/1/walletables/$api.ts index 79b996f7..bd4f20ea 100644 --- a/samples/freee/api/1/walletables/$api.ts +++ b/samples/freee/api/1/walletables/$api.ts @@ -33,7 +33,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $delete: (option: { query: Methods1['delete']['query'], config?: T }) => fetch(prefix, prefix1, DELETE, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] } | { method: 'put'; query: Methods1['put']['query'] } | { method: 'delete'; query: Methods1['delete']['query'] }) => - `${prefix}${prefix1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -47,7 +47,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option, 'URLSearchParams').json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/openapi/$api.ts b/samples/openapi/$api.ts index 69e06304..0cbf7289 100644 --- a/samples/openapi/$api.ts +++ b/samples/openapi/$api.ts @@ -115,7 +115,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -123,7 +123,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -239,7 +239,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods13['get']['query'], headers?: Methods13['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix3}${PATH12}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods13['get']['query'] }) => - `${prefix}${prefix3}${PATH12}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${PATH12}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -283,7 +283,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods17['post']['reqBody'], headers?: Methods17['post']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix7}${PATH11}`, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods17['get']['query'] }) => - `${prefix}${prefix7}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, itemslist: { get: (option: { query: Methods21['get']['query'], headers?: Methods21['get']['reqHeaders'], config?: T }) => @@ -291,7 +291,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods21['get']['query'], headers?: Methods21['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix7}${PATH16}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods21['get']['query'] }) => - `${prefix}${prefix7}${PATH16}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${PATH16}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, users: { remove: { @@ -346,14 +346,14 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods24['get']['query'], headers?: Methods24['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix6}${PATH19}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods24['get']['query'] }) => - `${prefix}${prefix6}${PATH19}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix6}${PATH19}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option?: { query?: Methods14['get']['query'], headers?: Methods14['get']['reqHeaders'], config?: T }) => fetch(prefix, prefix6, GET, option).send(), $get: (option?: { query?: Methods14['get']['query'], headers?: Methods14['get']['reqHeaders'], config?: T }) => fetch(prefix, prefix6, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods14['get']['query'] }) => - `${prefix}${prefix6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option?: { query?: Methods11['get']['query'], headers?: Methods11['get']['reqHeaders'], config?: T }) => @@ -361,7 +361,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods11['get']['query'], headers?: Methods11['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH9, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods11['get']['query'] }) => - `${prefix}${PATH9}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH9}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, chats: { _chatId_0: (val8: number) => { @@ -422,7 +422,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods26['post']['reqBody'], headers?: Methods26['post']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix10}${PATH11}`, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods26['get']['query'] }) => - `${prefix}${prefix10}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix10}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -540,7 +540,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods45['get']['query'], headers?: Methods45['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH36, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods45['get']['query'] }) => - `${prefix}${PATH36}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH36}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option?: { headers?: Methods44['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH35, GET, option).json(), @@ -577,7 +577,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods46['get']['query'], headers?: Methods46['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix12}${PATH11}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods46['get']['query'] }) => - `${prefix}${prefix12}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix12}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/openapi/api/$api.ts b/samples/openapi/api/$api.ts index 52fca011..2b5312fa 100644 --- a/samples/openapi/api/$api.ts +++ b/samples/openapi/api/$api.ts @@ -114,7 +114,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -122,7 +122,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -238,7 +238,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods13['get']['query'], headers?: Methods13['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix3}${PATH12}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods13['get']['query'] }) => - `${prefix}${prefix3}${PATH12}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${PATH12}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -282,7 +282,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods17['post']['reqBody'], headers?: Methods17['post']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix7}${PATH11}`, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods17['get']['query'] }) => - `${prefix}${prefix7}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, itemslist: { get: (option: { query: Methods21['get']['query'], headers?: Methods21['get']['reqHeaders'], config?: T }) => @@ -290,7 +290,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods21['get']['query'], headers?: Methods21['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix7}${PATH16}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods21['get']['query'] }) => - `${prefix}${prefix7}${PATH16}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${PATH16}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, users: { remove: { @@ -345,14 +345,14 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods24['get']['query'], headers?: Methods24['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix6}${PATH19}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods24['get']['query'] }) => - `${prefix}${prefix6}${PATH19}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix6}${PATH19}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option?: { query?: Methods14['get']['query'], headers?: Methods14['get']['reqHeaders'], config?: T }) => fetch(prefix, prefix6, GET, option).send(), $get: (option?: { query?: Methods14['get']['query'], headers?: Methods14['get']['reqHeaders'], config?: T }) => fetch(prefix, prefix6, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods14['get']['query'] }) => - `${prefix}${prefix6}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix6}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option?: { query?: Methods11['get']['query'], headers?: Methods11['get']['reqHeaders'], config?: T }) => @@ -360,7 +360,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods11['get']['query'], headers?: Methods11['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH9, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods11['get']['query'] }) => - `${prefix}${PATH9}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH9}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, chats: { _chatId_0: (val8: number) => { @@ -421,7 +421,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods26['post']['reqBody'], headers?: Methods26['post']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix10}${PATH11}`, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods26['get']['query'] }) => - `${prefix}${prefix10}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix10}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -539,7 +539,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods45['get']['query'], headers?: Methods45['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH36, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods45['get']['query'] }) => - `${prefix}${PATH36}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH36}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option?: { headers?: Methods44['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH35, GET, option).json(), @@ -576,7 +576,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods46['get']['query'], headers?: Methods46['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix12}${PATH11}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods46['get']['query'] }) => - `${prefix}${prefix12}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix12}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/openapi/api/stream/$api.ts b/samples/openapi/api/stream/$api.ts index 7bfbe8ff..93fe4e6b 100644 --- a/samples/openapi/api/stream/$api.ts +++ b/samples/openapi/api/stream/$api.ts @@ -20,7 +20,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -28,7 +28,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/openapi/api/stream/v1/$api.ts b/samples/openapi/api/stream/v1/$api.ts index 13766fdb..5186e430 100644 --- a/samples/openapi/api/stream/v1/$api.ts +++ b/samples/openapi/api/stream/v1/$api.ts @@ -19,7 +19,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -27,7 +27,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/openapi/api/stream/v1/stories/$api.ts b/samples/openapi/api/stream/v1/stories/$api.ts index 5980b4d2..d4cda026 100644 --- a/samples/openapi/api/stream/v1/stories/$api.ts +++ b/samples/openapi/api/stream/v1/stories/$api.ts @@ -18,7 +18,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option: { query: Methods0['get']['query'], config?: T }) => @@ -26,7 +26,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/openapi/api/v3/$api.ts b/samples/openapi/api/v3/$api.ts index e7c721c5..e45d4882 100644 --- a/samples/openapi/api/v3/$api.ts +++ b/samples/openapi/api/v3/$api.ts @@ -123,7 +123,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods3['get']['query'], headers?: Methods3['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix0}${PATH4}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods3['get']['query'] }) => - `${prefix}${prefix0}${PATH4}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH4}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -167,7 +167,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods7['post']['reqBody'], headers?: Methods7['post']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix4}${PATH3}`, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods7['get']['query'] }) => - `${prefix}${prefix4}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix4}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, itemslist: { get: (option: { query: Methods11['get']['query'], headers?: Methods11['get']['reqHeaders'], config?: T }) => @@ -175,7 +175,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods11['get']['query'], headers?: Methods11['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix4}${PATH8}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods11['get']['query'] }) => - `${prefix}${prefix4}${PATH8}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix4}${PATH8}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, users: { remove: { @@ -230,14 +230,14 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods14['get']['query'], headers?: Methods14['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix3}${PATH11}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods14['get']['query'] }) => - `${prefix}${prefix3}${PATH11}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${PATH11}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option?: { query?: Methods4['get']['query'], headers?: Methods4['get']['reqHeaders'], config?: T }) => fetch(prefix, prefix3, GET, option).send(), $get: (option?: { query?: Methods4['get']['query'], headers?: Methods4['get']['reqHeaders'], config?: T }) => fetch(prefix, prefix3, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods4['get']['query'] }) => - `${prefix}${prefix3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option?: { query?: Methods1['get']['query'], headers?: Methods1['get']['reqHeaders'], config?: T }) => @@ -245,7 +245,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods1['get']['query'], headers?: Methods1['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH1, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, chats: { _chatId_0: (val5: number) => { @@ -306,7 +306,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods16['post']['reqBody'], headers?: Methods16['post']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix7}${PATH3}`, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods16['get']['query'] }) => - `${prefix}${prefix7}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -424,7 +424,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods35['get']['query'], headers?: Methods35['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH28, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods35['get']['query'] }) => - `${prefix}${PATH28}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH28}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option?: { headers?: Methods34['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH27, GET, option).json(), @@ -461,7 +461,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods36['get']['query'], headers?: Methods36['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix9}${PATH3}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods36['get']['query'] }) => - `${prefix}${prefix9}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix9}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/openapi/api/v3/channels/$api.ts b/samples/openapi/api/v3/channels/$api.ts index c2dfe4ee..466b3394 100644 --- a/samples/openapi/api/v3/channels/$api.ts +++ b/samples/openapi/api/v3/channels/$api.ts @@ -65,7 +65,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods2['get']['query'], headers?: Methods2['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix0}${PATH3}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods2['get']['query'] }) => - `${prefix}${prefix0}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, @@ -109,7 +109,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods6['post']['reqBody'], headers?: Methods6['post']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix4}${PATH2}`, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods6['get']['query'] }) => - `${prefix}${prefix4}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix4}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, itemslist: { get: (option: { query: Methods10['get']['query'], headers?: Methods10['get']['reqHeaders'], config?: T }) => @@ -117,7 +117,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods10['get']['query'], headers?: Methods10['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix4}${PATH7}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods10['get']['query'] }) => - `${prefix}${prefix4}${PATH7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix4}${PATH7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, users: { remove: { @@ -172,14 +172,14 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods13['get']['query'], headers?: Methods13['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix3}${PATH10}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods13['get']['query'] }) => - `${prefix}${prefix3}${PATH10}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${PATH10}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option?: { query?: Methods3['get']['query'], headers?: Methods3['get']['reqHeaders'], config?: T }) => fetch(prefix, prefix3, GET, option).send(), $get: (option?: { query?: Methods3['get']['query'], headers?: Methods3['get']['reqHeaders'], config?: T }) => fetch(prefix, prefix3, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods3['get']['query'] }) => - `${prefix}${prefix3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } }, get: (option?: { query?: Methods0['get']['query'], headers?: Methods0['get']['reqHeaders'], config?: T }) => @@ -187,7 +187,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods0['get']['query'], headers?: Methods0['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/openapi/api/v3/chats/$api.ts b/samples/openapi/api/v3/chats/$api.ts index 8a4d1295..d85234b7 100644 --- a/samples/openapi/api/v3/chats/$api.ts +++ b/samples/openapi/api/v3/chats/$api.ts @@ -77,7 +77,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods1['post']['reqBody'], headers?: Methods1['post']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix2}${PATH1}`, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix2}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix2}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } }, diff --git a/samples/openapi/api/v3/organisation/$api.ts b/samples/openapi/api/v3/organisation/$api.ts index 3c3e0251..8979ca04 100644 --- a/samples/openapi/api/v3/organisation/$api.ts +++ b/samples/openapi/api/v3/organisation/$api.ts @@ -16,7 +16,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods1['get']['query'], headers?: Methods1['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH1, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, get: (option?: { headers?: Methods0['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH0, GET, option).json(), diff --git a/samples/openapi/api/v3/organisation/users/$api.ts b/samples/openapi/api/v3/organisation/users/$api.ts index bdf90328..c4c485ea 100644 --- a/samples/openapi/api/v3/organisation/users/$api.ts +++ b/samples/openapi/api/v3/organisation/users/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], headers?: Methods0['get']['reqHeaders'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/openapi/api/v3/stories/$api.ts b/samples/openapi/api/v3/stories/$api.ts index ad6e2cbc..2e59cce8 100644 --- a/samples/openapi/api/v3/stories/$api.ts +++ b/samples/openapi/api/v3/stories/$api.ts @@ -41,7 +41,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods0['get']['query'], headers?: Methods0['get']['reqHeaders'], config?: T }) => fetch(prefix, `${prefix0}${PATH1}`, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${prefix0}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/simple/$api.ts b/samples/simple/$api.ts index 74396743..09abdd6a 100644 --- a/samples/simple/$api.ts +++ b/samples/simple/$api.ts @@ -44,7 +44,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { query?: Methods1['put']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH2}`, PUT, option).send().then(r => r.body), $path: (option?: { method: 'put'; query: Methods1['put']['query'] }) => - `${prefix}${prefix0}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, simple: { put: (option?: { config?: T }) => @@ -67,7 +67,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods3['post']['reqBody'], query?: Methods3['post']['query'], config?: T }) => fetch(prefix, `${prefix1}${PATH5}`, POST, option, 'Blob').send().then(r => r.body), $path: (option?: { method: 'post'; query: Methods3['post']['query'] }) => - `${prefix}${prefix1}${PATH5}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix1}${PATH5}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } @@ -83,7 +83,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods5['get']['query'], config?: T }) => fetch(prefix, `${prefix2}${PATH7}`, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods5['get']['query'] }) => - `${prefix}${prefix2}${PATH7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix2}${PATH7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, xyz: { get: (option?: { config?: T }) => diff --git a/samples/simple/dummy/$api.ts b/samples/simple/dummy/$api.ts index 3bf25f12..185e5139 100644 --- a/samples/simple/dummy/$api.ts +++ b/samples/simple/dummy/$api.ts @@ -30,7 +30,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $put: (option?: { query?: Methods1['put']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH2}`, PUT, option).send().then(r => r.body), $path: (option?: { method: 'put'; query: Methods1['put']['query'] }) => - `${prefix}${prefix0}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, simple: { put: (option?: { config?: T }) => diff --git a/samples/simple/file/$api.ts b/samples/simple/file/$api.ts index 3ec4c3de..7f67d81f 100644 --- a/samples/simple/file/$api.ts +++ b/samples/simple/file/$api.ts @@ -19,7 +19,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option?: { body?: Methods0['post']['reqBody'], query?: Methods0['post']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH1}`, POST, option, 'Blob').send().then(r => r.body), $path: (option?: { method: 'post'; query: Methods0['post']['query'] }) => - `${prefix}${prefix0}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/simple/user/$api.ts b/samples/simple/user/$api.ts index 4e94056f..5e5a5c88 100644 --- a/samples/simple/user/$api.ts +++ b/samples/simple/user/$api.ts @@ -25,7 +25,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods1['get']['query'], config?: T }) => fetch(prefix, `${prefix0}${PATH1}`, GET, option).send().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${prefix0}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, xyz: { get: (option?: { config?: T }) => diff --git a/samples/strapi/$api.ts b/samples/strapi/$api.ts index db11c29f..6c62b457 100644 --- a/samples/strapi/$api.ts +++ b/samples/strapi/$api.ts @@ -208,7 +208,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods14['get']['query'], config?: T }) => fetch(prefix, PATH14, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods14['get']['query'] }) => - `${prefix}${PATH14}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH14}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, users_permissions: { init: { @@ -254,7 +254,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods18['post']['reqBody'], config?: T }) => fetch(prefix, PATH17, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods18['get']['query'] }) => - `${prefix}${PATH17}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH17}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, search: { _id: (val7: string) => { @@ -266,7 +266,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods21['get']['query'], config?: T }) => fetch(prefix, prefix7, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods21['get']['query'] }) => - `${prefix}${prefix7}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix7}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/strapi/users-permissions/$api.ts b/samples/strapi/users-permissions/$api.ts index 4895e7e9..604cc781 100644 --- a/samples/strapi/users-permissions/$api.ts +++ b/samples/strapi/users-permissions/$api.ts @@ -60,7 +60,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods1['post']['reqBody'], config?: T }) => fetch(prefix, PATH1, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods1['get']['query'] }) => - `${prefix}${PATH1}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH1}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, search: { _id: (val2: string) => { @@ -72,7 +72,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods4['get']['query'], config?: T }) => fetch(prefix, prefix2, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods4['get']['query'] }) => - `${prefix}${prefix2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/strapi/users-permissions/roles/$api.ts b/samples/strapi/users-permissions/roles/$api.ts index 57a8d5f3..131c49b9 100644 --- a/samples/strapi/users-permissions/roles/$api.ts +++ b/samples/strapi/users-permissions/roles/$api.ts @@ -48,7 +48,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => fetch(prefix, PATH0, POST, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/strapi/users-permissions/search/$api.ts b/samples/strapi/users-permissions/search/$api.ts index 3a96a416..36e2564e 100644 --- a/samples/strapi/users-permissions/search/$api.ts +++ b/samples/strapi/users-permissions/search/$api.ts @@ -17,7 +17,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods0['get']['query'], config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${prefix0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${prefix0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } } diff --git a/samples/strapi/users/$api.ts b/samples/strapi/users/$api.ts index cdd58837..968407c7 100644 --- a/samples/strapi/users/$api.ts +++ b/samples/strapi/users/$api.ts @@ -44,7 +44,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { query?: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/swagger/$api.ts b/samples/swagger/$api.ts index 5d22ae9d..b71bab10 100644 --- a/samples/swagger/$api.ts +++ b/samples/swagger/$api.ts @@ -47,13 +47,13 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), post: (option?: { body?: Methods1['post']['reqBody'], config?: T }) => - fetch(prefix, prefix0, POST, option, 'URLSearchParams').send(), + fetch(prefix, prefix0, POST, option, 'URLSearchParams').send(), $post: (option?: { body?: Methods1['post']['reqBody'], config?: T }) => - fetch(prefix, prefix0, POST, option, 'URLSearchParams').send().then(r => r.body), + fetch(prefix, prefix0, POST, option, 'URLSearchParams').send().then(r => r.body), delete: (option?: { headers?: Methods1['delete']['reqHeaders'], config?: T }) => - fetch(prefix, prefix0, DELETE, option).send(), + fetch(prefix, prefix0, DELETE, option).send(), $delete: (option?: { headers?: Methods1['delete']['reqHeaders'], config?: T }) => - fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), + fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: () => `${prefix}${prefix0}` } }, @@ -63,16 +63,16 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods3['get']['query'], config?: T }) => fetch(prefix, PATH2, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods3['get']['query'] }) => - `${prefix}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send(), + fetch(prefix, PATH0, POST, option).send(), $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send().then(r => r.body), + fetch(prefix, PATH0, POST, option).send().then(r => r.body), put: (option: { body: Methods0['put']['reqBody'], config?: T }) => - fetch(prefix, PATH0, PUT, option).send(), + fetch(prefix, PATH0, PUT, option).send(), $put: (option: { body: Methods0['put']['reqBody'], config?: T }) => - fetch(prefix, PATH0, PUT, option).send().then(r => r.body), + fetch(prefix, PATH0, PUT, option).send().then(r => r.body), $path: () => `${prefix}${PATH0}` }, store: { @@ -93,9 +93,9 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { config?: T }) => fetch(prefix, prefix1, GET, option).json().then(r => r.body), delete: (option?: { config?: T }) => - fetch(prefix, prefix1, DELETE, option).send(), + fetch(prefix, prefix1, DELETE, option).send(), $delete: (option?: { config?: T }) => - fetch(prefix, prefix1, DELETE, option).send().then(r => r.body), + fetch(prefix, prefix1, DELETE, option).send().then(r => r.body), $path: () => `${prefix}${prefix1}` } }, @@ -116,28 +116,28 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { config?: T }) => fetch(prefix, prefix2, GET, option).json().then(r => r.body), put: (option: { body: Methods8['put']['reqBody'], config?: T }) => - fetch(prefix, prefix2, PUT, option).send(), + fetch(prefix, prefix2, PUT, option).send(), $put: (option: { body: Methods8['put']['reqBody'], config?: T }) => - fetch(prefix, prefix2, PUT, option).send().then(r => r.body), + fetch(prefix, prefix2, PUT, option).send().then(r => r.body), delete: (option?: { config?: T }) => - fetch(prefix, prefix2, DELETE, option).send(), + fetch(prefix, prefix2, DELETE, option).send(), $delete: (option?: { config?: T }) => - fetch(prefix, prefix2, DELETE, option).send().then(r => r.body), + fetch(prefix, prefix2, DELETE, option).send().then(r => r.body), $path: () => `${prefix}${prefix2}` } }, createWithArray: { post: (option: { body: Methods9['post']['reqBody'], config?: T }) => - fetch(prefix, PATH6, POST, option).send(), + fetch(prefix, PATH6, POST, option).send(), $post: (option: { body: Methods9['post']['reqBody'], config?: T }) => - fetch(prefix, PATH6, POST, option).send().then(r => r.body), + fetch(prefix, PATH6, POST, option).send().then(r => r.body), $path: () => `${prefix}${PATH6}` }, createWithList: { post: (option: { body: Methods10['post']['reqBody'], config?: T }) => - fetch(prefix, PATH7, POST, option).send(), + fetch(prefix, PATH7, POST, option).send(), $post: (option: { body: Methods10['post']['reqBody'], config?: T }) => - fetch(prefix, PATH7, POST, option).send().then(r => r.body), + fetch(prefix, PATH7, POST, option).send().then(r => r.body), $path: () => `${prefix}${PATH7}` }, login: { @@ -146,12 +146,12 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods11['get']['query'], config?: T }) => fetch(prefix, PATH8, GET, option).text().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods11['get']['query'] }) => - `${prefix}${PATH8}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH8}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, post: (option: { body: Methods7['post']['reqBody'], config?: T }) => - fetch(prefix, PATH5, POST, option).send(), + fetch(prefix, PATH5, POST, option).send(), $post: (option: { body: Methods7['post']['reqBody'], config?: T }) => - fetch(prefix, PATH5, POST, option).send().then(r => r.body), + fetch(prefix, PATH5, POST, option).send().then(r => r.body), $path: () => `${prefix}${PATH5}` } } diff --git a/samples/swagger/pet/$api.ts b/samples/swagger/pet/$api.ts index 226398b3..0f2e21e8 100644 --- a/samples/swagger/pet/$api.ts +++ b/samples/swagger/pet/$api.ts @@ -32,13 +32,13 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), post: (option?: { body?: Methods1['post']['reqBody'], config?: T }) => - fetch(prefix, prefix0, POST, option, 'URLSearchParams').send(), + fetch(prefix, prefix0, POST, option, 'URLSearchParams').send(), $post: (option?: { body?: Methods1['post']['reqBody'], config?: T }) => - fetch(prefix, prefix0, POST, option, 'URLSearchParams').send().then(r => r.body), + fetch(prefix, prefix0, POST, option, 'URLSearchParams').send().then(r => r.body), delete: (option?: { headers?: Methods1['delete']['reqHeaders'], config?: T }) => - fetch(prefix, prefix0, DELETE, option).send(), + fetch(prefix, prefix0, DELETE, option).send(), $delete: (option?: { headers?: Methods1['delete']['reqHeaders'], config?: T }) => - fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), + fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: () => `${prefix}${prefix0}` } }, @@ -48,16 +48,16 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods3['get']['query'], config?: T }) => fetch(prefix, PATH2, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods3['get']['query'] }) => - `${prefix}${PATH2}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH2}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send(), + fetch(prefix, PATH0, POST, option).send(), $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send().then(r => r.body), + fetch(prefix, PATH0, POST, option).send().then(r => r.body), put: (option: { body: Methods0['put']['reqBody'], config?: T }) => - fetch(prefix, PATH0, PUT, option).send(), + fetch(prefix, PATH0, PUT, option).send(), $put: (option: { body: Methods0['put']['reqBody'], config?: T }) => - fetch(prefix, PATH0, PUT, option).send().then(r => r.body), + fetch(prefix, PATH0, PUT, option).send().then(r => r.body), $path: () => `${prefix}${PATH0}` } } diff --git a/samples/swagger/pet/findByStatus/$api.ts b/samples/swagger/pet/findByStatus/$api.ts index e645bbfe..a555d59b 100644 --- a/samples/swagger/pet/findByStatus/$api.ts +++ b/samples/swagger/pet/findByStatus/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).json().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/samples/swagger/store/$api.ts b/samples/swagger/store/$api.ts index a888f82b..2dad0ae3 100644 --- a/samples/swagger/store/$api.ts +++ b/samples/swagger/store/$api.ts @@ -30,9 +30,9 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), delete: (option?: { config?: T }) => - fetch(prefix, prefix0, DELETE, option).send(), + fetch(prefix, prefix0, DELETE, option).send(), $delete: (option?: { config?: T }) => - fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), + fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: () => `${prefix}${prefix0}` } }, diff --git a/samples/swagger/store/order/$api.ts b/samples/swagger/store/order/$api.ts index e95d9c5e..d9d38e90 100644 --- a/samples/swagger/store/order/$api.ts +++ b/samples/swagger/store/order/$api.ts @@ -20,9 +20,9 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), delete: (option?: { config?: T }) => - fetch(prefix, prefix0, DELETE, option).send(), + fetch(prefix, prefix0, DELETE, option).send(), $delete: (option?: { config?: T }) => - fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), + fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: () => `${prefix}${prefix0}` } }, diff --git a/samples/swagger/user/$api.ts b/samples/swagger/user/$api.ts index 2fd20ab8..50307767 100644 --- a/samples/swagger/user/$api.ts +++ b/samples/swagger/user/$api.ts @@ -27,28 +27,28 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option?: { config?: T }) => fetch(prefix, prefix0, GET, option).json().then(r => r.body), put: (option: { body: Methods1['put']['reqBody'], config?: T }) => - fetch(prefix, prefix0, PUT, option).send(), + fetch(prefix, prefix0, PUT, option).send(), $put: (option: { body: Methods1['put']['reqBody'], config?: T }) => - fetch(prefix, prefix0, PUT, option).send().then(r => r.body), + fetch(prefix, prefix0, PUT, option).send().then(r => r.body), delete: (option?: { config?: T }) => - fetch(prefix, prefix0, DELETE, option).send(), + fetch(prefix, prefix0, DELETE, option).send(), $delete: (option?: { config?: T }) => - fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), + fetch(prefix, prefix0, DELETE, option).send().then(r => r.body), $path: () => `${prefix}${prefix0}` } }, createWithArray: { post: (option: { body: Methods2['post']['reqBody'], config?: T }) => - fetch(prefix, PATH1, POST, option).send(), + fetch(prefix, PATH1, POST, option).send(), $post: (option: { body: Methods2['post']['reqBody'], config?: T }) => - fetch(prefix, PATH1, POST, option).send().then(r => r.body), + fetch(prefix, PATH1, POST, option).send().then(r => r.body), $path: () => `${prefix}${PATH1}` }, createWithList: { post: (option: { body: Methods3['post']['reqBody'], config?: T }) => - fetch(prefix, PATH2, POST, option).send(), + fetch(prefix, PATH2, POST, option).send(), $post: (option: { body: Methods3['post']['reqBody'], config?: T }) => - fetch(prefix, PATH2, POST, option).send().then(r => r.body), + fetch(prefix, PATH2, POST, option).send().then(r => r.body), $path: () => `${prefix}${PATH2}` }, login: { @@ -57,12 +57,12 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods4['get']['query'], config?: T }) => fetch(prefix, PATH3, GET, option).text().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods4['get']['query'] }) => - `${prefix}${PATH3}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH3}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` }, post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send(), + fetch(prefix, PATH0, POST, option).send(), $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send().then(r => r.body), + fetch(prefix, PATH0, POST, option).send().then(r => r.body), $path: () => `${prefix}${PATH0}` } } diff --git a/samples/swagger/user/createWithArray/$api.ts b/samples/swagger/user/createWithArray/$api.ts index 28604e0d..dc1bcfca 100644 --- a/samples/swagger/user/createWithArray/$api.ts +++ b/samples/swagger/user/createWithArray/$api.ts @@ -9,9 +9,9 @@ const api = ({ baseURL, fetch }: AspidaClient) => { return { post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send(), + fetch(prefix, PATH0, POST, option).send(), $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send().then(r => r.body), + fetch(prefix, PATH0, POST, option).send().then(r => r.body), $path: () => `${prefix}${PATH0}` } } diff --git a/samples/swagger/user/createWithList/$api.ts b/samples/swagger/user/createWithList/$api.ts index 008188e1..42001a63 100644 --- a/samples/swagger/user/createWithList/$api.ts +++ b/samples/swagger/user/createWithList/$api.ts @@ -9,9 +9,9 @@ const api = ({ baseURL, fetch }: AspidaClient) => { return { post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send(), + fetch(prefix, PATH0, POST, option).send(), $post: (option: { body: Methods0['post']['reqBody'], config?: T }) => - fetch(prefix, PATH0, POST, option).send().then(r => r.body), + fetch(prefix, PATH0, POST, option).send().then(r => r.body), $path: () => `${prefix}${PATH0}` } } diff --git a/samples/swagger/user/login/$api.ts b/samples/swagger/user/login/$api.ts index 07b79a9b..fbea3b5f 100644 --- a/samples/swagger/user/login/$api.ts +++ b/samples/swagger/user/login/$api.ts @@ -13,7 +13,7 @@ const api = ({ baseURL, fetch }: AspidaClient) => { $get: (option: { query: Methods0['get']['query'], config?: T }) => fetch(prefix, PATH0, GET, option).text().then(r => r.body), $path: (option?: { method?: 'get'; query: Methods0['get']['query'] }) => - `${prefix}${PATH0}${option?.query ? `?${dataToURLString(option.query)}` : ''}` + `${prefix}${PATH0}${option && option.query ? `?${dataToURLString(option.query)}` : ''}` } } diff --git a/src/buildV3.ts b/src/buildV3.ts index b7d7218b..c5b8affd 100644 --- a/src/buildV3.ts +++ b/src/buildV3.ts @@ -87,7 +87,6 @@ export default (openapi: OpenAPIV3.Document) => { const prop = { name: getPropertyName(p.name), required: !!p.required, - isOneOf: false, values: [value] } @@ -110,7 +109,6 @@ export default (openapi: OpenAPIV3.Document) => { params.push({ name: 'reqHeaders', required: false, - isOneOf: false, values: [ ...reqRefHeaders, ...(reqHeaders.length @@ -124,7 +122,6 @@ export default (openapi: OpenAPIV3.Document) => { params.push({ name: 'query', required: queryRequired, - isOneOf: false, values: [ ...refQuery, ...(query.length ? [{ isArray: false, isEnum: false, value: query }] : []) @@ -139,7 +136,6 @@ export default (openapi: OpenAPIV3.Document) => { params.push({ name: 'status', required: true, - isOneOf: false, values: [{ isArray: false, isEnum: false, value: code }] }) @@ -152,7 +148,6 @@ export default (openapi: OpenAPIV3.Document) => { params.push({ name: 'resBody', required: true, - isOneOf: false, values: [val] }) } @@ -161,7 +156,6 @@ export default (openapi: OpenAPIV3.Document) => { params.push({ name: 'resHeaders', required: true, - isOneOf: false, values: [ { isArray: false, @@ -181,7 +175,6 @@ export default (openapi: OpenAPIV3.Document) => { val && { name: getPropertyName(header), required: true, - isOneOf: false, values: [val] } ) @@ -236,7 +229,6 @@ export default (openapi: OpenAPIV3.Document) => { params.push({ name: 'reqFormat', required: true, - isOneOf: false, values: [{ isArray: false, isEnum: false, value: reqFormat }] }) } @@ -245,7 +237,6 @@ export default (openapi: OpenAPIV3.Document) => { params.push({ name: 'reqBody', required, - isOneOf: false, values: [reqBody] }) } @@ -254,7 +245,6 @@ export default (openapi: OpenAPIV3.Document) => { return { name: method, required: true, - isOneOf: false, values: [{ isArray: false, isEnum: false, value: params }] } }) diff --git a/src/builderUtils/converters.ts b/src/builderUtils/converters.ts index a7f60080..00440d4d 100644 --- a/src/builderUtils/converters.ts +++ b/src/builderUtils/converters.ts @@ -38,7 +38,7 @@ export const getPropertyName = (name: string) => /^[a-zA-Z_$][0-9a-zA-Z_$]*$/.test(name) ? name : `'${name}'` const of2Values = (obj: OpenAPIV3.SchemaObject): PropValue[] | null => { - const values = (obj.oneOf || obj.allOf || []) + const values = (obj.oneOf || obj.allOf || obj.anyOf || []) .map(p => schema2value(p)) .filter(v => v) as PropValue[] return values.length ? values : null @@ -59,7 +59,6 @@ const object2value = (obj: OpenAPIV3.NonArraySchemaObject): Prop[] => { return { name: getPropertyName(name), required: !!obj.required?.includes(name), - isOneOf: false, values: [val] } }) @@ -72,7 +71,6 @@ const object2value = (obj: OpenAPIV3.NonArraySchemaObject): Prop[] => { ? { isArray: false, isEnum: false, - isOneOf: false, value: 'any' } : schema2value(additionalProps) @@ -81,7 +79,6 @@ const object2value = (obj: OpenAPIV3.NonArraySchemaObject): Prop[] => { value.push({ name: '[key: string]', required: true, - isOneOf: false, values: [val] }) } @@ -96,13 +93,13 @@ export const schema2value = ( let isArray = false let isEnum = false - let isOneOf + let hasOf: PropValue['hasOf'] let value: PropValue['value'] | null = null if (isRefObject(schema)) { value = $ref2Type(schema.$ref) - } else if (schema.oneOf || schema.allOf) { - isOneOf = !!schema.oneOf + } else if (schema.oneOf || schema.allOf || schema.anyOf) { + hasOf = schema.oneOf ? 'oneOf' : schema.allOf ? 'allOf' : 'anyOf' value = of2Values(schema) } else if (schema.enum) { isEnum = true @@ -121,8 +118,8 @@ export const schema2value = ( null: 'null', string: 'string', boolean: 'boolean' - }[schema.type] + }[schema.type ?? 'string'] } - return value ? { isArray, isEnum, isOneOf, value } : null + return value ? { isArray, isEnum, hasOf, value } : null } diff --git a/src/builderUtils/parameters2Props.ts b/src/builderUtils/parameters2Props.ts index a974188d..f8c2f221 100644 --- a/src/builderUtils/parameters2Props.ts +++ b/src/builderUtils/parameters2Props.ts @@ -26,7 +26,6 @@ export default (params: OpenAPIV3.ComponentsObject['parameters'], openapi: OpenA { name: getPropertyName(target.name), required: !!target.required, - isOneOf: false, values: [value] } ] diff --git a/src/builderUtils/props2String.ts b/src/builderUtils/props2String.ts index cc789982..3379b1ba 100644 --- a/src/builderUtils/props2String.ts +++ b/src/builderUtils/props2String.ts @@ -1,7 +1,7 @@ export type PropValue = { isArray: boolean isEnum: boolean - isOneOf?: boolean + hasOf?: 'oneOf' | 'allOf' | 'anyOf' // eslint-disable-next-line no-use-before-define value: Prop[] | string | string[] | PropValue | PropValue[] } @@ -9,20 +9,18 @@ export type PropValue = { export type Prop = { name: string required: boolean - isOneOf: boolean values: PropValue[] } const array2String = (val: PropValue, indent: string) => { - const hasMulti = - (val.isEnum || typeof val.isOneOf === 'boolean') && Array.isArray(val.value) && val.value.length + const hasMulti = (val.isEnum || val.hasOf) && Array.isArray(val.value) && val.value.length return `${hasMulti ? '(' : ''}${value2String(val, indent)}${hasMulti ? ')' : ''}[]` } export const value2String = (v: PropValue, indent: string): string => `${ - typeof v.isOneOf === 'boolean' - ? values2String(v.value as PropValue[], v.isOneOf, indent) + v.hasOf + ? values2String(v.value as PropValue[], v.hasOf, indent) : v.isArray ? array2String(v.value as PropValue, indent) : v.isEnum @@ -32,8 +30,10 @@ export const value2String = (v: PropValue, indent: string): string => : v.value }` -const values2String = (values: PropValue[], isOneOf: boolean, indent: string) => - values.map(a => value2String(a, indent)).join(isOneOf ? ' | ' : ' & ') +const values2String = (values: PropValue[], hasOf: PropValue['hasOf'], indent: string) => + `${hasOf === 'anyOf' ? 'Partial<' : ''}${values + .map(a => value2String(a, indent)) + .join(hasOf === 'oneOf' ? ' | ' : ' & ')}${hasOf === 'anyOf' ? '>' : ''}` const isMultiLine = (values: PropValue[]) => values.find(v => !v.isEnum && Array.isArray(v.value)) @@ -43,7 +43,7 @@ export const props2String = (props: Prop[], indent: string) => (p, i) => ` ${indent}${p.name}${p.required ? '' : '?'}: ${values2String( p.values, - p.isOneOf, + undefined, indent )}${ props.length - 1 === i || isMultiLine(p.values) || isMultiLine(props[i + 1].values) diff --git a/yarn.lock b/yarn.lock index 0b6b39ea..8d75226f 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2,7 +2,7 @@ # yarn lockfile v1 -"@apidevtools/json-schema-ref-parser@^9.0.5": +"@apidevtools/json-schema-ref-parser@^9.0.6": version "9.0.6" resolved "https://registry.yarnpkg.com/@apidevtools/json-schema-ref-parser/-/json-schema-ref-parser-9.0.6.tgz#5d9000a3ac1fd25404da886da6b266adcd99cf1c" integrity sha512-M3YgsLjI0lZxvrpeGVk9Ap032W6TPQkH6pRAZz81Ac3WUNF79VQooAFnp8umjvVzUmD93NkogxEwbSce7qMsUg== @@ -21,17 +21,16 @@ resolved "https://registry.yarnpkg.com/@apidevtools/swagger-methods/-/swagger-methods-3.0.2.tgz#b789a362e055b0340d04712eafe7027ddc1ac267" integrity sha512-QAkD5kK2b1WfjDS/UQn/qQkbwF31uqRjPTrsCs5ZG9BQGAkjwvqGFjjPqAuzac/IYzpPtRzjCP1WrTuAIjMrXg== -"@apidevtools/swagger-parser@10.0.1": - version "10.0.1" - resolved "https://registry.yarnpkg.com/@apidevtools/swagger-parser/-/swagger-parser-10.0.1.tgz#af3a02de99bcd4f76aa04d27721e56502d735c88" - integrity sha512-P5nva6hpXCK5NByGXbIJnFxd5FhQI9LGs+If0SMgKV+/5qlZnHH/B/6GtfnSPwSViRPL+7ARSzMcYIfGwjkW5Q== +"@apidevtools/swagger-parser@10.0.2": + version "10.0.2" + resolved "https://registry.yarnpkg.com/@apidevtools/swagger-parser/-/swagger-parser-10.0.2.tgz#f4145afb7c3a3bafe0376f003b5c3bdeae17a952" + integrity sha512-JFxcEyp8RlNHgBCE98nwuTkZT6eNFPc1aosWV6wPcQph72TSEEu1k3baJD4/x1qznU+JiDdz8F5pTwabZh+Dhg== dependencies: - "@apidevtools/json-schema-ref-parser" "^9.0.5" + "@apidevtools/json-schema-ref-parser" "^9.0.6" "@apidevtools/openapi-schemas" "^2.0.4" "@apidevtools/swagger-methods" "^3.0.2" "@jsdevtools/ono" "^7.1.3" call-me-maybe "^1.0.1" - openapi-types "^1.3.5" z-schema "^4.2.3" "@babel/code-frame@^7.0.0", "@babel/code-frame@^7.10.1": @@ -263,6 +262,13 @@ dependencies: "@babel/helper-plugin-utils" "^7.8.0" +"@babel/plugin-syntax-top-level-await@^7.8.3": + version "7.12.1" + resolved "https://registry.yarnpkg.com/@babel/plugin-syntax-top-level-await/-/plugin-syntax-top-level-await-7.12.1.tgz#dd6c0b357ac1bb142d98537450a319625d13d2a0" + integrity sha512-i7ooMZFS+a/Om0crxZodrTzNEPJHZrlMVGMTEpFAj6rYY/bKCddB0Dk/YxfPuYXOopuhKk/e1jV6h+WUU9XN3A== + dependencies: + "@babel/helper-plugin-utils" "^7.10.4" + "@babel/template@^7.10.1", "@babel/template@^7.3.3": version "7.10.1" resolved "https://registry.yarnpkg.com/@babel/template/-/template-7.10.1.tgz#e167154a94cb5f14b28dc58f5356d2162f539811" @@ -309,10 +315,10 @@ exec-sh "^0.3.2" minimist "^1.2.0" -"@eslint/eslintrc@^0.1.3": - version "0.1.3" - resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.1.3.tgz#7d1a2b2358552cc04834c0979bd4275362e37085" - integrity sha512-4YVwPkANLeNtRjMekzux1ci8hIaH5eGKktGqR0d3LWsKNn5B2X/1Z6Trxy7jQXl9EBGE6Yj02O+t09FMeRllaA== +"@eslint/eslintrc@^0.2.1": + version "0.2.1" + resolved "https://registry.yarnpkg.com/@eslint/eslintrc/-/eslintrc-0.2.1.tgz#f72069c330461a06684d119384435e12a5d76e3c" + integrity sha512-XRUeBZ5zBWLYgSANMpThFddrZZkEbGHgUdt5UJjZfnlN9BGCiUBrf+nvbRupSjMvqzwnQN0qwCmOxITt1cfywA== dependencies: ajv "^6.12.4" debug "^4.1.1" @@ -346,93 +352,100 @@ resolved "https://registry.yarnpkg.com/@istanbuljs/schema/-/schema-0.1.2.tgz#26520bf09abe4a5644cd5414e37125a8954241dd" integrity sha512-tsAQNx32a8CoFhjhijUIhI4kccIAgmGhy8LZMZgGfmXcpMbPRUqn5LWmgRttILi6yeGmBJd2xsPkFMs0PzgPCw== -"@jest/console@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.3.0.tgz#ed04063efb280c88ba87388b6f16427c0a85c856" - integrity sha512-/5Pn6sJev0nPUcAdpJHMVIsA8sKizL2ZkcKPE5+dJrCccks7tcM7c9wbgHudBJbxXLoTbqsHkG1Dofoem4F09w== +"@jest/console@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/console/-/console-26.6.2.tgz#4e04bc464014358b03ab4937805ee36a0aeb98f2" + integrity sha512-IY1R2i2aLsLr7Id3S6p2BA82GNWryt4oSvEXLAKc+L2zdi89dSkE8xC1C+0kpATG4JhBJREnQOH7/zmccM2B0g== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" "@types/node" "*" chalk "^4.0.0" - jest-message-util "^26.3.0" - jest-util "^26.3.0" + jest-message-util "^26.6.2" + jest-util "^26.6.2" slash "^3.0.0" -"@jest/core@^26.4.2": - version "26.4.2" - resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.4.2.tgz#85d0894f31ac29b5bab07aa86806d03dd3d33edc" - integrity sha512-sDva7YkeNprxJfepOctzS8cAk9TOekldh+5FhVuXS40+94SHbiicRO1VV2tSoRtgIo+POs/Cdyf8p76vPTd6dg== +"@jest/core@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/core/-/core-26.6.3.tgz#7639fcb3833d748a4656ada54bde193051e45fad" + integrity sha512-xvV1kKbhfUqFVuZ8Cyo+JPpipAHHAV3kcDBftiduK8EICXmTFddryy3P7NfZt8Pv37rA9nEJBKCCkglCPt/Xjw== dependencies: - "@jest/console" "^26.3.0" - "@jest/reporters" "^26.4.1" - "@jest/test-result" "^26.3.0" - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/console" "^26.6.2" + "@jest/reporters" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" - jest-changed-files "^26.3.0" - jest-config "^26.4.2" - jest-haste-map "^26.3.0" - jest-message-util "^26.3.0" + jest-changed-files "^26.6.2" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" jest-regex-util "^26.0.0" - jest-resolve "^26.4.0" - jest-resolve-dependencies "^26.4.2" - jest-runner "^26.4.2" - jest-runtime "^26.4.2" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - jest-validate "^26.4.2" - jest-watcher "^26.3.0" + jest-resolve "^26.6.2" + jest-resolve-dependencies "^26.6.3" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" + jest-watcher "^26.6.2" micromatch "^4.0.2" p-each-series "^2.1.0" rimraf "^3.0.0" slash "^3.0.0" strip-ansi "^6.0.0" -"@jest/environment@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.3.0.tgz#e6953ab711ae3e44754a025f838bde1a7fd236a0" - integrity sha512-EW+MFEo0DGHahf83RAaiqQx688qpXgl99wdb8Fy67ybyzHwR1a58LHcO376xQJHfmoXTu89M09dH3J509cx2AA== +"@jest/create-cache-key-function@^26.5.0": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/create-cache-key-function/-/create-cache-key-function-26.6.2.tgz#04cf439207a4fd12418d8aee551cddc86f9ac5f5" + integrity sha512-LgEuqU1f/7WEIPYqwLPIvvHuc1sB6gMVbT6zWhin3txYUNYK/kGQrC1F2WR4gR34YlI9bBtViTm5z98RqVZAaw== + dependencies: + "@jest/types" "^26.6.2" + +"@jest/environment@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/environment/-/environment-26.6.2.tgz#ba364cc72e221e79cc8f0a99555bf5d7577cf92c" + integrity sha512-nFy+fHl28zUrRsCeMB61VDThV1pVTtlEokBRgqPrcT1JNq4yRNIyTHfyht6PqtUvY9IsuLGTrbG8kPXjSZIZwA== dependencies: - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" - jest-mock "^26.3.0" + jest-mock "^26.6.2" -"@jest/fake-timers@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.3.0.tgz#f515d4667a6770f60ae06ae050f4e001126c666a" - integrity sha512-ZL9ytUiRwVP8ujfRepffokBvD2KbxbqMhrXSBhSdAhISCw3gOkuntisiSFv+A6HN0n0fF4cxzICEKZENLmW+1A== +"@jest/fake-timers@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/fake-timers/-/fake-timers-26.6.2.tgz#459c329bcf70cee4af4d7e3f3e67848123535aad" + integrity sha512-14Uleatt7jdzefLPYM3KLcnUl1ZNikaKq34enpb5XG9i81JpppDb5muZvonvKyrl7ftEHkKS5L5/eB/kxJ+bvA== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" "@sinonjs/fake-timers" "^6.0.1" "@types/node" "*" - jest-message-util "^26.3.0" - jest-mock "^26.3.0" - jest-util "^26.3.0" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" + jest-util "^26.6.2" -"@jest/globals@^26.4.2": - version "26.4.2" - resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.4.2.tgz#73c2a862ac691d998889a241beb3dc9cada40d4a" - integrity sha512-Ot5ouAlehhHLRhc+sDz2/9bmNv9p5ZWZ9LE1pXGGTCXBasmi5jnYjlgYcYt03FBwLmZXCZ7GrL29c33/XRQiow== +"@jest/globals@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/globals/-/globals-26.6.2.tgz#5b613b78a1aa2655ae908eba638cc96a20df720a" + integrity sha512-85Ltnm7HlB/KesBUuALwQ68YTU72w9H2xW9FjZ1eL1U3lhtefjjl5c2MiUbpXt/i6LaPRvoOFJ22yCBSfQ0JIA== dependencies: - "@jest/environment" "^26.3.0" - "@jest/types" "^26.3.0" - expect "^26.4.2" + "@jest/environment" "^26.6.2" + "@jest/types" "^26.6.2" + expect "^26.6.2" -"@jest/reporters@^26.4.1": - version "26.4.1" - resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.4.1.tgz#3b4d6faf28650f3965f8b97bc3d114077fb71795" - integrity sha512-aROTkCLU8++yiRGVxLsuDmZsQEKO6LprlrxtAuzvtpbIFl3eIjgIf3EUxDKgomkS25R9ZzwGEdB5weCcBZlrpQ== +"@jest/reporters@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/reporters/-/reporters-26.6.2.tgz#1f518b99637a5f18307bd3ecf9275f6882a667f6" + integrity sha512-h2bW53APG4HvkOnVMo8q3QXa6pcaNt1HkwVsOPMBV6LD/q9oSpxNSYZQYkAnjdMjrJ86UuYeLo+aEZClV6opnw== dependencies: "@bcoe/v8-coverage" "^0.2.3" - "@jest/console" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/console" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" chalk "^4.0.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" @@ -443,63 +456,63 @@ istanbul-lib-report "^3.0.0" istanbul-lib-source-maps "^4.0.0" istanbul-reports "^3.0.2" - jest-haste-map "^26.3.0" - jest-resolve "^26.4.0" - jest-util "^26.3.0" - jest-worker "^26.3.0" + jest-haste-map "^26.6.2" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" slash "^3.0.0" source-map "^0.6.0" string-length "^4.0.1" terminal-link "^2.0.0" - v8-to-istanbul "^5.0.1" + v8-to-istanbul "^7.0.0" optionalDependencies: node-notifier "^8.0.0" -"@jest/source-map@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.3.0.tgz#0e646e519883c14c551f7b5ae4ff5f1bfe4fc3d9" - integrity sha512-hWX5IHmMDWe1kyrKl7IhFwqOuAreIwHhbe44+XH2ZRHjrKIh0LO5eLQ/vxHFeAfRwJapmxuqlGAEYLadDq6ZGQ== +"@jest/source-map@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/source-map/-/source-map-26.6.2.tgz#29af5e1e2e324cafccc936f218309f54ab69d535" + integrity sha512-YwYcCwAnNmOVsZ8mr3GfnzdXDAl4LaenZP5z+G0c8bzC9/dugL8zRmxZzdoTl4IaS3CryS1uWnROLPFmb6lVvA== dependencies: callsites "^3.0.0" graceful-fs "^4.2.4" source-map "^0.6.0" -"@jest/test-result@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.3.0.tgz#46cde01fa10c0aaeb7431bf71e4a20d885bc7fdb" - integrity sha512-a8rbLqzW/q7HWheFVMtghXV79Xk+GWwOK1FrtimpI5n1la2SY0qHri3/b0/1F0Ve0/yJmV8pEhxDfVwiUBGtgg== +"@jest/test-result@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/test-result/-/test-result-26.6.2.tgz#55da58b62df134576cc95476efa5f7949e3f5f18" + integrity sha512-5O7H5c/7YlojphYNrK02LlDIV2GNPYisKwHm2QTKjNZeEzezCbwYs9swJySv2UfPMyZ0VdsmMv7jIlD/IKYQpQ== dependencies: - "@jest/console" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/console" "^26.6.2" + "@jest/types" "^26.6.2" "@types/istanbul-lib-coverage" "^2.0.0" collect-v8-coverage "^1.0.0" -"@jest/test-sequencer@^26.4.2": - version "26.4.2" - resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.4.2.tgz#58a3760a61eec758a2ce6080201424580d97cbba" - integrity sha512-83DRD8N3M0tOhz9h0bn6Kl6dSp+US6DazuVF8J9m21WAp5x7CqSMaNycMP0aemC/SH/pDQQddbsfHRTBXVUgog== +"@jest/test-sequencer@^26.6.3": + version "26.6.3" + resolved "https://registry.yarnpkg.com/@jest/test-sequencer/-/test-sequencer-26.6.3.tgz#98e8a45100863886d074205e8ffdc5a7eb582b17" + integrity sha512-YHlVIjP5nfEyjlrSr8t/YdNfU/1XEt7c5b4OxcXCjyRhjzLYu/rO69/WHPuYcbCWkz8kAeZVZp2N2+IOLLEPGw== dependencies: - "@jest/test-result" "^26.3.0" + "@jest/test-result" "^26.6.2" graceful-fs "^4.2.4" - jest-haste-map "^26.3.0" - jest-runner "^26.4.2" - jest-runtime "^26.4.2" + jest-haste-map "^26.6.2" + jest-runner "^26.6.3" + jest-runtime "^26.6.3" -"@jest/transform@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.3.0.tgz#c393e0e01459da8a8bfc6d2a7c2ece1a13e8ba55" - integrity sha512-Isj6NB68QorGoFWvcOjlUhpkT56PqNIsXKR7XfvoDlCANn/IANlh8DrKAA2l2JKC3yWSMH5wS0GwuQM20w3b2A== +"@jest/transform@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/transform/-/transform-26.6.2.tgz#5ac57c5fa1ad17b2aae83e73e45813894dcf2e4b" + integrity sha512-E9JjhUgNzvuQ+vVAL21vlyfy12gP0GhazGgJC4h6qUt1jSdUXGWJ1wfu/X7Sd8etSgxV4ovT1pb9v5D6QW4XgA== dependencies: "@babel/core" "^7.1.0" - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" babel-plugin-istanbul "^6.0.0" chalk "^4.0.0" convert-source-map "^1.4.0" fast-json-stable-stringify "^2.0.0" graceful-fs "^4.2.4" - jest-haste-map "^26.3.0" + jest-haste-map "^26.6.2" jest-regex-util "^26.0.0" - jest-util "^26.3.0" + jest-util "^26.6.2" micromatch "^4.0.2" pirates "^4.0.1" slash "^3.0.0" @@ -516,20 +529,10 @@ "@types/yargs" "^15.0.0" chalk "^3.0.0" -"@jest/types@^26.1.0": - version "26.1.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.1.0.tgz#f8afaaaeeb23b5cad49dd1f7779689941dcb6057" - integrity sha512-GXigDDsp6ZlNMhXQDeuy/iYCDsRIHJabWtDzvnn36+aqFfG14JmFV0e/iXxY4SP9vbXSiPNOWdehU5MeqrYHBQ== - dependencies: - "@types/istanbul-lib-coverage" "^2.0.0" - "@types/istanbul-reports" "^1.1.1" - "@types/yargs" "^15.0.0" - chalk "^4.0.0" - -"@jest/types@^26.3.0": - version "26.3.0" - resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.3.0.tgz#97627bf4bdb72c55346eef98e3b3f7ddc4941f71" - integrity sha512-BDPG23U0qDeAvU4f99haztXwdAg3hz4El95LkAM+tHAqqhiVzRpEGHHU8EDxT/AnxOrA65YjLBwDahdJ9pTLJQ== +"@jest/types@^26.6.2": + version "26.6.2" + resolved "https://registry.yarnpkg.com/@jest/types/-/types-26.6.2.tgz#bef5a532030e1d88a2f5a6d933f84e97226ed48e" + integrity sha512-fC6QCp7Sc5sX6g8Tvbmj4XUTbyrik0akgRy03yjXbQaBWWNWGE7SGtJk98m0N8nzegD/7SggrUlivxo5ax4KWQ== dependencies: "@types/istanbul-lib-coverage" "^2.0.0" "@types/istanbul-reports" "^3.0.0" @@ -621,6 +624,13 @@ dependencies: "@babel/types" "^7.3.0" +"@types/babel__traverse@^7.0.4": + version "7.0.15" + resolved "https://registry.yarnpkg.com/@types/babel__traverse/-/babel__traverse-7.0.15.tgz#db9e4238931eb69ef8aab0ad6523d4d4caa39d03" + integrity sha512-Pzh9O3sTK8V6I1olsXpCfj2k/ygO2q1X0vhhnDrEQyYLHZesWz+zMZMVcwXLCYf0U36EtmyYaFGPfXlTtDHe3A== + dependencies: + "@babel/types" "^7.3.0" + "@types/color-name@^1.1.1": version "1.1.1" resolved "https://registry.yarnpkg.com/@types/color-name/-/color-name-1.1.1.tgz#1c1261bbeaa10a8055bbc5d8ab84b7b2afc846a0" @@ -668,13 +678,13 @@ jest-diff "^25.2.1" pretty-format "^25.2.1" -"@types/jest@^26.0.13": - version "26.0.13" - resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.13.tgz#5a7b9d5312f5dd521a38329c38ee9d3802a0b85e" - integrity sha512-sCzjKow4z9LILc6DhBvn5AkIfmQzDZkgtVVKmGwVrs5tuid38ws281D4l+7x1kP487+FlKDh5kfMZ8WSPAdmdA== +"@types/jest@^26.0.15": + version "26.0.15" + resolved "https://registry.yarnpkg.com/@types/jest/-/jest-26.0.15.tgz#12e02c0372ad0548e07b9f4e19132b834cb1effe" + integrity sha512-s2VMReFXRg9XXxV+CW9e5Nz8fH2K1aEhwgjUqPPbQd7g95T0laAcvLv032EhFHIa5GHsZ8W7iJEQVaJq6k3Gog== dependencies: - jest-diff "^25.2.1" - pretty-format "^25.2.1" + jest-diff "^26.0.0" + pretty-format "^26.0.0" "@types/js-yaml@^3.12.5": version "3.12.5" @@ -711,10 +721,10 @@ resolved "https://registry.yarnpkg.com/@types/prettier/-/prettier-2.0.2.tgz#5bb52ee68d0f8efa9cc0099920e56be6cc4e37f3" integrity sha512-IkVfat549ggtkZUthUzEX49562eGikhSYeVGX97SkMFn+sTZrgRewXjQ4tPKFPCykZHkX1Zfd9OoELGqKU2jJA== -"@types/stack-utils@^1.0.1": - version "1.0.1" - resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-1.0.1.tgz#0a851d3bd96498fa25c33ab7278ed3bd65f06c3e" - integrity sha512-l42BggppR6zLmpfU6fq9HEa2oGPEI8yrSPL3GITjfRInppYFahObbIQOQK3UGxEnyQpltZLaPe75046NOZQikw== +"@types/stack-utils@^2.0.0": + version "2.0.0" + resolved "https://registry.yarnpkg.com/@types/stack-utils/-/stack-utils-2.0.0.tgz#7036640b4e21cc2f259ae826ce843d277dad8cff" + integrity sha512-RJJrrySY7A8havqpGObOB4W92QXKJo63/jFLLgpvOtsGUqbQZ9Sbgl35KMm1DjC6j7AvmmU2bIno+3IyEaemaw== "@types/yargs-parser@*": version "15.0.0" @@ -728,84 +738,61 @@ dependencies: "@types/yargs-parser" "*" -"@typescript-eslint/eslint-plugin@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.0.1.tgz#88bde9239e29d688315718552cf80a3490491017" - integrity sha512-pQZtXupCn11O4AwpYVUX4PDFfmIJl90ZgrEBg0CEcqlwvPiG0uY81fimr1oMFblZnpKAq6prrT9a59pj1x58rw== +"@typescript-eslint/eslint-plugin@^4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/eslint-plugin/-/eslint-plugin-4.6.1.tgz#99d77eb7a016fd5a5e749d2c44a7e4c317eb7da3" + integrity sha512-SNZyflefTMK2JyrPfFFzzoy2asLmZvZJ6+/L5cIqg4HfKGiW2Gr1Go1OyEVqne/U4QwmoasuMwppoBHWBWF2nA== dependencies: - "@typescript-eslint/experimental-utils" "4.0.1" - "@typescript-eslint/scope-manager" "4.0.1" + "@typescript-eslint/experimental-utils" "4.6.1" + "@typescript-eslint/scope-manager" "4.6.1" debug "^4.1.1" functional-red-black-tree "^1.0.1" regexpp "^3.0.0" semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/experimental-utils@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.0.1.tgz#7d9a3ab6821ad5274dad2186c1aa0d93afd696eb" - integrity sha512-gAqOjLiHoED79iYTt3F4uSHrYmg/GPz/zGezdB0jAdr6S6gwNiR/j7cTZ8nREKVzMVKLd9G3xbg1sV9GClW3sw== - dependencies: - "@types/json-schema" "^7.0.3" - "@typescript-eslint/scope-manager" "4.0.1" - "@typescript-eslint/types" "4.0.1" - "@typescript-eslint/typescript-estree" "4.0.1" - eslint-scope "^5.0.0" - eslint-utils "^2.0.0" - -"@typescript-eslint/experimental-utils@^2.5.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-2.34.0.tgz#d3524b644cdb40eebceca67f8cf3e4cc9c8f980f" - integrity sha512-eS6FTkq+wuMJ+sgtuNTtcqavWXqsflWcfBnlYhg/nS4aZ1leewkXGbvBhaapn1q6qf4M71bsR1tez5JTRMuqwA== +"@typescript-eslint/experimental-utils@4.6.1", "@typescript-eslint/experimental-utils@^4.0.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/experimental-utils/-/experimental-utils-4.6.1.tgz#a9c691dfd530a9570274fe68907c24c07a06c4aa" + integrity sha512-qyPqCFWlHZXkEBoV56UxHSoXW2qnTr4JrWVXOh3soBP3q0o7p4pUEMfInDwIa0dB/ypdtm7gLOS0hg0a73ijfg== dependencies: "@types/json-schema" "^7.0.3" - "@typescript-eslint/typescript-estree" "2.34.0" + "@typescript-eslint/scope-manager" "4.6.1" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/typescript-estree" "4.6.1" eslint-scope "^5.0.0" eslint-utils "^2.0.0" -"@typescript-eslint/parser@^4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.0.1.tgz#73772080db7a7a4534a35d719e006f503e664dc3" - integrity sha512-1+qLmXHNAWSQ7RB6fdSQszAiA7JTwzakj5cNYjBTUmpH2cqilxMZEIV+DRKjVZs8NzP3ALmKexB0w/ExjcK9Iw== +"@typescript-eslint/parser@^4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/parser/-/parser-4.6.1.tgz#b801bff67b536ecc4a840ac9289ba2be57e02428" + integrity sha512-lScKRPt1wM9UwyKkGKyQDqf0bh6jm8DQ5iN37urRIXDm16GEv+HGEmum2Fc423xlk5NUOkOpfTnKZc/tqKZkDQ== dependencies: - "@typescript-eslint/scope-manager" "4.0.1" - "@typescript-eslint/types" "4.0.1" - "@typescript-eslint/typescript-estree" "4.0.1" + "@typescript-eslint/scope-manager" "4.6.1" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/typescript-estree" "4.6.1" debug "^4.1.1" -"@typescript-eslint/scope-manager@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.0.1.tgz#24d93c3000bdfcc5a157dc4d32b742405a8631b5" - integrity sha512-u3YEXVJ8jsj7QCJk3om0Y457fy2euEOkkzxIB/LKU3MdyI+FJ2gI0M4aKEaXzwCSfNDiZ13a3lDo5DVozc+XLQ== +"@typescript-eslint/scope-manager@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/scope-manager/-/scope-manager-4.6.1.tgz#21872b91cbf7adfc7083f17b8041149148baf992" + integrity sha512-f95+80r6VdINYscJY1KDUEDcxZ3prAWHulL4qRDfNVD0I5QAVSGqFkwHERDoLYJJWmEAkUMdQVvx7/c2Hp+Bjg== dependencies: - "@typescript-eslint/types" "4.0.1" - "@typescript-eslint/visitor-keys" "4.0.1" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/visitor-keys" "4.6.1" -"@typescript-eslint/types@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.0.1.tgz#1cf72582f764931f085cb8230ff215980fe467b2" - integrity sha512-S+gD3fgbkZYW2rnbjugNMqibm9HpEjqZBZkTiI3PwbbNGWmAcxolWIUwZ0SKeG4Dy2ktpKKaI/6+HGYVH8Qrlg== - -"@typescript-eslint/typescript-estree@2.34.0": - version "2.34.0" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-2.34.0.tgz#14aeb6353b39ef0732cc7f1b8285294937cf37d5" - integrity sha512-OMAr+nJWKdlVM9LOqCqh3pQQPwxHAN7Du8DR6dmwCrAmxtiXQnhHJ6tBNtf+cggqfo51SG/FCwnKhXCIM7hnVg== - dependencies: - debug "^4.1.1" - eslint-visitor-keys "^1.1.0" - glob "^7.1.6" - is-glob "^4.0.1" - lodash "^4.17.15" - semver "^7.3.2" - tsutils "^3.17.1" +"@typescript-eslint/types@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/types/-/types-4.6.1.tgz#d3ad7478f53f22e7339dc006ab61aac131231552" + integrity sha512-k2ZCHhJ96YZyPIsykickez+OMHkz06xppVLfJ+DY90i532/Cx2Z+HiRMH8YZQo7a4zVd/TwNBuRCdXlGK4yo8w== -"@typescript-eslint/typescript-estree@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.0.1.tgz#29a43c7060641ec51c902d9f50ac7c5866ec479f" - integrity sha512-zGzleORFXrRWRJAMLTB2iJD1IZbCPkg4hsI8mGdpYlKaqzvKYSEWVAYh14eauaR+qIoZVWrXgYSXqLtTlxotiw== +"@typescript-eslint/typescript-estree@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/typescript-estree/-/typescript-estree-4.6.1.tgz#6025cce724329413f57e4959b2d676fceeca246f" + integrity sha512-/J/kxiyjQQKqEr5kuKLNQ1Finpfb8gf/NpbwqFFYEBjxOsZ621r9AqwS9UDRA1Rrr/eneX/YsbPAIhU2rFLjXQ== dependencies: - "@typescript-eslint/types" "4.0.1" - "@typescript-eslint/visitor-keys" "4.0.1" + "@typescript-eslint/types" "4.6.1" + "@typescript-eslint/visitor-keys" "4.6.1" debug "^4.1.1" globby "^11.0.1" is-glob "^4.0.1" @@ -813,12 +800,12 @@ semver "^7.3.2" tsutils "^3.17.1" -"@typescript-eslint/visitor-keys@4.0.1": - version "4.0.1" - resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.0.1.tgz#d4e8de62775f2a6db71c7e8539633680039fdd6c" - integrity sha512-yBSqd6FjnTzbg5RUy9J+9kJEyQjTI34JdGMJz+9ttlJzLCnGkBikxw+N5n2VDcc3CesbIEJ0MnZc5uRYnrEnCw== +"@typescript-eslint/visitor-keys@4.6.1": + version "4.6.1" + resolved "https://registry.yarnpkg.com/@typescript-eslint/visitor-keys/-/visitor-keys-4.6.1.tgz#6b125883402d8939df7b54528d879e88f7ba3614" + integrity sha512-owABze4toX7QXwOLT3/D5a8NecZEjEWU1srqxENTfqsY3bwVnl3YYbOh6s1rp2wQKO9RTHFGjKes08FgE7SVMw== dependencies: - "@typescript-eslint/types" "4.0.1" + "@typescript-eslint/types" "4.6.1" eslint-visitor-keys "^2.0.0" JSONStream@^1.0.4: @@ -1016,13 +1003,13 @@ asn1@~0.2.3: dependencies: safer-buffer "~2.1.0" -aspida@^0.21.0: - version "0.21.0" - resolved "https://registry.yarnpkg.com/aspida/-/aspida-0.21.0.tgz#1e957a06fc654d76c35c6499e32e1fc241387fd3" - integrity sha512-kzEytM0Ye/b523WWB5ajGtIJNis5XiA/3K5J0B7w0o7r5GcyhiKdtpcM7l/KYuojS8UUVPtJ5o909etLxfiFAw== +aspida@^0.22.2: + version "0.22.2" + resolved "https://registry.yarnpkg.com/aspida/-/aspida-0.22.2.tgz#3ecc42113cd7511672d08a0da96a250b9a2f783d" + integrity sha512-kqORcxtEM8/NZQe8TIqZD/0S5UiNjvn32eZ02jJLxglrj9XeSQno1oQKgvjwtlULwS5jM3G+o9NN+9bOdD1ZYA== dependencies: "@types/minimist" "^1.2.0" - chokidar "^3.4.2" + chokidar "^3.4.3" minimist "^1.2.5" assert-plus@1.0.0, assert-plus@^1.0.0: @@ -1060,16 +1047,16 @@ aws4@^1.8.0: resolved "https://registry.yarnpkg.com/aws4/-/aws4-1.10.0.tgz#a17b3a8ea811060e74d47d306122400ad4497ae2" integrity sha512-3YDiu347mtVtjpyV3u5kVqQLP242c06zwDOgpeRnybmXlYYsLbtTrUBUm8i8srONt+FWobl5aibnU1030PeeuA== -babel-jest@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.3.0.tgz#10d0ca4b529ca3e7d1417855ef7d7bd6fc0c3463" - integrity sha512-sxPnQGEyHAOPF8NcUsD0g7hDCnvLL2XyblRBcgrzTWBB/mAIpWow3n1bEL+VghnnZfreLhFSBsFluRoK2tRK4g== +babel-jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/babel-jest/-/babel-jest-26.6.3.tgz#d87d25cb0037577a0c89f82e5755c5d293c01056" + integrity sha512-pl4Q+GAVOHwvjrck6jKjvmGhnO3jHX/xuB9d27f+EJZ/6k+6nMuPjorrYp7s++bKKdANwzElBWnLWaObvTnaZA== dependencies: - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" "@types/babel__core" "^7.1.7" babel-plugin-istanbul "^6.0.0" - babel-preset-jest "^26.3.0" + babel-preset-jest "^26.6.2" chalk "^4.0.0" graceful-fs "^4.2.4" slash "^3.0.0" @@ -1085,20 +1072,20 @@ babel-plugin-istanbul@^6.0.0: istanbul-lib-instrument "^4.0.0" test-exclude "^6.0.0" -babel-plugin-jest-hoist@^26.2.0: - version "26.2.0" - resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.2.0.tgz#bdd0011df0d3d513e5e95f76bd53b51147aca2dd" - integrity sha512-B/hVMRv8Nh1sQ1a3EY8I0n4Y1Wty3NrR5ebOyVT302op+DOAau+xNEImGMsUWOC3++ZlMooCytKz+NgN8aKGbA== +babel-plugin-jest-hoist@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-plugin-jest-hoist/-/babel-plugin-jest-hoist-26.6.2.tgz#8185bd030348d254c6d7dd974355e6a28b21e62d" + integrity sha512-PO9t0697lNTmcEHH69mdtYiOIkkOlj9fySqfO3K1eCcdISevLAE0xY59VLLUj0SoiPiTX/JU2CYFpILydUa5Lw== dependencies: "@babel/template" "^7.3.3" "@babel/types" "^7.3.3" "@types/babel__core" "^7.0.0" "@types/babel__traverse" "^7.0.6" -babel-preset-current-node-syntax@^0.1.3: - version "0.1.3" - resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-0.1.3.tgz#b4b547acddbf963cba555ba9f9cbbb70bfd044da" - integrity sha512-uyexu1sVwcdFnyq9o8UQYsXwXflIh8LvrF5+cKrYam93ned1CStffB3+BEcsxGSgagoA3GEyjDqO4a/58hyPYQ== +babel-preset-current-node-syntax@^1.0.0: + version "1.0.0" + resolved "https://registry.yarnpkg.com/babel-preset-current-node-syntax/-/babel-preset-current-node-syntax-1.0.0.tgz#cf5feef29551253471cfa82fc8e0f5063df07a77" + integrity sha512-mGkvkpocWJes1CmMKtgGUwCeeq0pOhALyymozzDWYomHTbDLwueDYG6p4TK1YOeYHCzBzYPsWkgTto10JubI1Q== dependencies: "@babel/plugin-syntax-async-generators" "^7.8.4" "@babel/plugin-syntax-bigint" "^7.8.3" @@ -1111,14 +1098,15 @@ babel-preset-current-node-syntax@^0.1.3: "@babel/plugin-syntax-object-rest-spread" "^7.8.3" "@babel/plugin-syntax-optional-catch-binding" "^7.8.3" "@babel/plugin-syntax-optional-chaining" "^7.8.3" + "@babel/plugin-syntax-top-level-await" "^7.8.3" -babel-preset-jest@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.3.0.tgz#ed6344506225c065fd8a0b53e191986f74890776" - integrity sha512-5WPdf7nyYi2/eRxCbVrE1kKCWxgWY4RsPEbdJWFm7QsesFGqjdkyLeu1zRkwM1cxK6EPIlNd6d2AxLk7J+t4pw== +babel-preset-jest@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/babel-preset-jest/-/babel-preset-jest-26.6.2.tgz#747872b1171df032252426586881d62d31798fee" + integrity sha512-YvdtlVm9t3k777c5NPQIv6cxFFFapys25HiUmuSgHwIZhfifweR5c5Sf5nwE3MAbfu327CYSvps8Yx6ANLyleQ== dependencies: - babel-plugin-jest-hoist "^26.2.0" - babel-preset-current-node-syntax "^0.1.3" + babel-plugin-jest-hoist "^26.6.2" + babel-preset-current-node-syntax "^1.0.0" balanced-match@^1.0.0: version "1.0.0" @@ -1318,10 +1306,10 @@ char-regex@^1.0.2: resolved "https://registry.yarnpkg.com/char-regex/-/char-regex-1.0.2.tgz#d744358226217f981ed58f479b1d6bcc29545dcf" integrity sha512-kWWXztvZ5SBQV+eRgKFeh8q5sLuZY2+8WUIzlxWVTg+oGwY14qylx1KbKzHd8P6ZYkAg0xyIDU9JMHhyJMZ1jw== -chokidar@^3.4.2: - version "3.4.2" - resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.2.tgz#38dc8e658dec3809741eb3ef7bb0a47fe424232d" - integrity sha512-IZHaDeBeI+sZJRX7lGcXsdzgvZqKv6sECqsbErJA4mHWfpRrD8B97kSFN4cQz6nGBGiuFia1MKR4d6c1o8Cv7A== +chokidar@^3.4.3: + version "3.4.3" + resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.4.3.tgz#c1df38231448e45ca4ac588e6c79573ba6a57d5b" + integrity sha512-DtM3g7juCXQxFVSNPNByEC2+NImtBuxQQvWlHunpJIS5Ocr0lG306cC7FCi7cEA0fzmybPUIl4txBIobk1gGOQ== dependencies: anymatch "~3.1.1" braces "~3.0.2" @@ -1329,7 +1317,7 @@ chokidar@^3.4.2: is-binary-path "~2.1.0" is-glob "~4.0.1" normalize-path "~3.0.0" - readdirp "~3.4.0" + readdirp "~3.5.0" optionalDependencies: fsevents "~2.1.2" @@ -1338,6 +1326,11 @@ ci-info@^2.0.0: resolved "https://registry.yarnpkg.com/ci-info/-/ci-info-2.0.0.tgz#67a9e964be31a51e15e5010d58e6f12834002f46" integrity sha512-5tK7EtrZ0N+OLFMthtqOj4fI2Jeb88C4CAZPu25LDVUgXJ0A3Js4PMGqrn0JU1W0Mh1/Z8wZzYPxqUrXeBboCQ== +cjs-module-lexer@^0.6.0: + version "0.6.0" + resolved "https://registry.yarnpkg.com/cjs-module-lexer/-/cjs-module-lexer-0.6.0.tgz#4186fcca0eae175970aee870b9fe2d6cf8d5655f" + integrity sha512-uc2Vix1frTfnuzxxu1Hp4ktSvM3QaI4oXl4ZUqL1wjTu/BGki9TrCWoqLTg/drR1KwAEarXuRFCG2Svr1GxPFw== + class-utils@^0.3.5: version "0.3.6" resolved "https://registry.yarnpkg.com/class-utils/-/class-utils-0.3.6.tgz#f93369ae8b9a7ce02fd41faad0ca83033190c463" @@ -1795,10 +1788,10 @@ diff-sequences@^25.2.6: resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-25.2.6.tgz#5f467c00edd35352b7bca46d7927d60e687a76dd" integrity sha512-Hq8o7+6GaZeoFjtpgvRBUknSXNeJiCx7V9Fr94ZMljNiCr9n9L8H8aJqgWOQiDDGdyn29fRNcDdRVJ5fdyihfg== -diff-sequences@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.3.0.tgz#62a59b1b29ab7fd27cef2a33ae52abe73042d0a2" - integrity sha512-5j5vdRcw3CNctePNYN0Wy2e/JbWT6cAYnXv5OuqPhDpyCGc0uLu2TK0zOCJWNB9kOIfYMSpIulRaDgIi4HJ6Ig== +diff-sequences@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/diff-sequences/-/diff-sequences-26.6.2.tgz#48ba99157de1923412eed41db6b6d4aa9ca7c0b1" + integrity sha512-Mv/TDa3nZ9sbc5soK+OoA74BsS3mL37yixCvUAQkiuA4Wz6YtwP/K47n2rv2ovzHZvoiQeA5FTQOschKkEwB0Q== dir-glob@^3.0.1: version "3.0.1" @@ -1941,19 +1934,19 @@ escodegen@^1.14.1: optionalDependencies: source-map "~0.6.1" -eslint-config-prettier@^6.11.0: - version "6.11.0" - resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.11.0.tgz#f6d2238c1290d01c859a8b5c1f7d352a0b0da8b1" - integrity sha512-oB8cpLWSAjOVFEJhhyMZh6NOEOtBVziaqdDQ86+qhDHFbZXoRTM7pNSvFRfW/W/L/LrQ38C99J5CGuRBBzBsdA== +eslint-config-prettier@^6.15.0: + version "6.15.0" + resolved "https://registry.yarnpkg.com/eslint-config-prettier/-/eslint-config-prettier-6.15.0.tgz#7f93f6cb7d45a92f1537a70ecc06366e1ac6fed9" + integrity sha512-a1+kOYLR8wMGustcgAjdydMsQ2A/2ipRPwRKUmfYaSxc9ZPcrku080Ctl6zrZzZNs/U82MjSv+qKREkoq3bJaw== dependencies: get-stdin "^6.0.0" -eslint-config-standard@^14.1.1: - version "14.1.1" - resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-14.1.1.tgz#830a8e44e7aef7de67464979ad06b406026c56ea" - integrity sha512-Z9B+VR+JIXRxz21udPTL9HpFMyoMUEeX1G251EQ6e05WD9aPVtVBn09XUmZ259wCMlCDmYDSZG62Hhm+ZTJcUg== +eslint-config-standard@^16.0.1: + version "16.0.1" + resolved "https://registry.yarnpkg.com/eslint-config-standard/-/eslint-config-standard-16.0.1.tgz#9a385eea27f96b7918cb53f07e01e9d10cc56401" + integrity sha512-WBBiQQZdaPyL+4sPkGWhWrHCDtvJoU195B9j8yXE9uFQnX34gMXI5CeBRm95gx3PMEZPM5OpwET10hH4F4SxCA== -eslint-import-resolver-node@^0.3.3: +eslint-import-resolver-node@^0.3.4: version "0.3.4" resolved "https://registry.yarnpkg.com/eslint-import-resolver-node/-/eslint-import-resolver-node-0.3.4.tgz#85ffa81942c25012d8231096ddf679c03042c717" integrity sha512-ogtf+5AB/O+nM6DIeBUNr2fuT7ot9Qg/1harBfBtaP13ekEWFQEEMP94BCB7zaNW3gyY+8SHYF00rnqYwXKWOA== @@ -1977,17 +1970,17 @@ eslint-plugin-es@^3.0.0: eslint-utils "^2.0.0" regexpp "^3.0.0" -eslint-plugin-import@^2.22.0: - version "2.22.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.0.tgz#92f7736fe1fde3e2de77623c838dd992ff5ffb7e" - integrity sha512-66Fpf1Ln6aIS5Gr/55ts19eUuoDhAbZgnr6UxK5hbDx6l/QgQgx61AePq+BV4PP2uXQFClgMVzep5zZ94qqsxg== +eslint-plugin-import@^2.22.1: + version "2.22.1" + resolved "https://registry.yarnpkg.com/eslint-plugin-import/-/eslint-plugin-import-2.22.1.tgz#0896c7e6a0cf44109a2d97b95903c2bb689d7702" + integrity sha512-8K7JjINHOpH64ozkAhpT3sd+FswIZTfMZTjdx052pnWrgRCVfp8op9tbjpAk3DdUeI/Ba4C8OjdC0r90erHEOw== dependencies: array-includes "^3.1.1" array.prototype.flat "^1.2.3" contains-path "^0.1.0" debug "^2.6.9" doctrine "1.5.0" - eslint-import-resolver-node "^0.3.3" + eslint-import-resolver-node "^0.3.4" eslint-module-utils "^2.6.0" has "^1.0.3" minimatch "^3.0.4" @@ -1996,12 +1989,12 @@ eslint-plugin-import@^2.22.0: resolve "^1.17.0" tsconfig-paths "^3.9.0" -eslint-plugin-jest@^23.20.0: - version "23.20.0" - resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-23.20.0.tgz#e1d69c75f639e99d836642453c4e75ed22da4099" - integrity sha512-+6BGQt85OREevBDWCvhqj1yYA4+BFK4XnRZSGJionuEYmcglMZYLNNBBemwzbqUAckURaHdJSBcjHPyrtypZOw== +eslint-plugin-jest@^24.1.0: + version "24.1.0" + resolved "https://registry.yarnpkg.com/eslint-plugin-jest/-/eslint-plugin-jest-24.1.0.tgz#6708037d7602e5288ce877fd0103f329dc978361" + integrity sha512-827YJ+E8B9PvXu/0eiVSNFfxxndbKv+qE/3GSMhdorCaeaOehtqHGX2YDW9B85TEOre9n/zscledkFW/KbnyGg== dependencies: - "@typescript-eslint/experimental-utils" "^2.5.0" + "@typescript-eslint/experimental-utils" "^4.0.1" eslint-plugin-node@^11.1.0: version "11.1.0" @@ -2027,12 +2020,12 @@ eslint-plugin-promise@^4.2.1: resolved "https://registry.yarnpkg.com/eslint-plugin-promise/-/eslint-plugin-promise-4.2.1.tgz#845fd8b2260ad8f82564c1222fce44ad71d9418a" integrity sha512-VoM09vT7bfA7D+upt+FjeBO5eHIJQBUWki1aPvB+vbNiHS3+oGIJGIeyBtKQTME6UPXXy3vV07OL1tHd3ANuDw== -eslint-plugin-standard@^4.0.1: - version "4.0.1" - resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.1.tgz#ff0519f7ffaff114f76d1bd7c3996eef0f6e20b4" - integrity sha512-v/KBnfyaOMPmZc/dmc6ozOdWqekGp7bBGq4jLAecEfPGmfKiWS4sA8sC0LqiV9w5qmXAtXVn4M3p1jSyhY85SQ== +eslint-plugin-standard@^4.0.2: + version "4.0.2" + resolved "https://registry.yarnpkg.com/eslint-plugin-standard/-/eslint-plugin-standard-4.0.2.tgz#021211a9f077e63a6847e7bb9ab4247327ac8e0c" + integrity sha512-nKptN8l7jksXkwFk++PhJB3cCDTcXOEyhISIN86Ue2feJ1LFyY3PrY3/xT2keXlJSY5bpmbiTG0f885/YKAvTA== -eslint-scope@^5.0.0, eslint-scope@^5.1.0: +eslint-scope@^5.0.0: version "5.1.0" resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.0.tgz#d0f971dfe59c69e0cada684b23d49dbf82600ce5" integrity sha512-iiGRvtxWqgtx5m8EyQUJihBloE4EnYeGE/bz1wSPwJE6tZuJUtHlhqDM4Xj2ukE8Dyy1+HCZ4hE0fzIVMzb58w== @@ -2040,6 +2033,14 @@ eslint-scope@^5.0.0, eslint-scope@^5.1.0: esrecurse "^4.1.0" estraverse "^4.1.1" +eslint-scope@^5.1.1: + version "5.1.1" + resolved "https://registry.yarnpkg.com/eslint-scope/-/eslint-scope-5.1.1.tgz#e786e59a66cb92b3f6c1fb0d508aab174848f48c" + integrity sha512-2NxwbF/hZ0KpepYN0cNbo+FN6XoK7GaHlQhgx/hIZl6Va0bF45RQOOwhLIy8lQDbuCiadSLCBnH2CFYquit5bw== + dependencies: + esrecurse "^4.3.0" + estraverse "^4.1.1" + eslint-utils@^2.0.0, eslint-utils@^2.1.0: version "2.1.0" resolved "https://registry.yarnpkg.com/eslint-utils/-/eslint-utils-2.1.0.tgz#d2de5e03424e707dc10c74068ddedae708741b27" @@ -2057,22 +2058,22 @@ eslint-visitor-keys@^2.0.0: resolved "https://registry.yarnpkg.com/eslint-visitor-keys/-/eslint-visitor-keys-2.0.0.tgz#21fdc8fbcd9c795cc0321f0563702095751511a8" integrity sha512-QudtT6av5WXels9WjIM7qz1XD1cWGvX4gGXvp/zBn9nXG02D0utdU3Em2m/QjTnrsk6bBjmCygl3rmj118msQQ== -eslint@^7.8.1: - version "7.8.1" - resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.8.1.tgz#e59de3573fb6a5be8ff526c791571646d124a8fa" - integrity sha512-/2rX2pfhyUG0y+A123d0ccXtMm7DV7sH1m3lk9nk2DZ2LReq39FXHueR9xZwshE5MdfSf0xunSaMWRqyIA6M1w== +eslint@^7.12.1: + version "7.12.1" + resolved "https://registry.yarnpkg.com/eslint/-/eslint-7.12.1.tgz#bd9a81fa67a6cfd51656cdb88812ce49ccec5801" + integrity sha512-HlMTEdr/LicJfN08LB3nM1rRYliDXOmfoO4vj39xN6BLpFzF00hbwBoqHk8UcJ2M/3nlARZWy/mslvGEuZFvsg== dependencies: "@babel/code-frame" "^7.0.0" - "@eslint/eslintrc" "^0.1.3" + "@eslint/eslintrc" "^0.2.1" ajv "^6.10.0" chalk "^4.0.0" cross-spawn "^7.0.2" debug "^4.0.1" doctrine "^3.0.0" enquirer "^2.3.5" - eslint-scope "^5.1.0" + eslint-scope "^5.1.1" eslint-utils "^2.1.0" - eslint-visitor-keys "^1.3.0" + eslint-visitor-keys "^2.0.0" espree "^7.3.0" esquery "^1.2.0" esutils "^2.0.2" @@ -2128,6 +2129,13 @@ esrecurse@^4.1.0: dependencies: estraverse "^4.1.0" +esrecurse@^4.3.0: + version "4.3.0" + resolved "https://registry.yarnpkg.com/esrecurse/-/esrecurse-4.3.0.tgz#7ad7964d679abb28bee72cec63758b1c5d2c9921" + integrity sha512-KmfKL3b6G+RXvP8N1vr3Tq1kL/oCFgn2NYXEtqP8/L3pKapUA4G8cFVaoF3SU323CD4XypR/ffioHmkti6/Tag== + dependencies: + estraverse "^5.2.0" + estraverse@^4.1.0, estraverse@^4.1.1, estraverse@^4.2.0: version "4.3.0" resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-4.3.0.tgz#398ad3f3c5a24948be7725e83d11a7de28cdbd1d" @@ -2138,6 +2146,11 @@ estraverse@^5.1.0: resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.1.0.tgz#374309d39fd935ae500e7b92e8a6b4c720e59642" integrity sha512-FyohXK+R0vE+y1nHLoBM7ZTyqRpqAlhdZHCWIWEviFLiGB8b04H6bQs8G+XTthacvT8VuwvteiP7RJSxMs8UEw== +estraverse@^5.2.0: + version "5.2.0" + resolved "https://registry.yarnpkg.com/estraverse/-/estraverse-5.2.0.tgz#307df42547e6cc7324d3cf03c155d5cdb8c53880" + integrity sha512-BxbNGGNm0RyRYvUdHpIwv9IWzeM9XClbOxwoATuFdOE7ZE6wHL+HQ5T8hoPM+zHvmKzzsEqhgy0GrQ5X13afiQ== + esutils@^2.0.2: version "2.0.3" resolved "https://registry.yarnpkg.com/esutils/-/esutils-2.0.3.tgz#74d2eb4de0b8da1293711910d50775b9b710ef64" @@ -2194,16 +2207,16 @@ expand-brackets@^2.1.4: snapdragon "^0.8.1" to-regex "^3.0.1" -expect@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/expect/-/expect-26.4.2.tgz#36db120928a5a2d7d9736643032de32f24e1b2a1" - integrity sha512-IlJ3X52Z0lDHm7gjEp+m76uX46ldH5VpqmU0006vqDju/285twh7zaWMRhs67VpQhBwjjMchk+p5aA0VkERCAA== +expect@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/expect/-/expect-26.6.2.tgz#c6b996bf26bf3fe18b67b2d0f51fc981ba934417" + integrity sha512-9/hlOBkQl2l/PLHJx6JjoDF6xPKcJEsUlWKb23rKE7KzeDqUZKXKNMW27KIue5JMdBV9HgmoJPcc8HtO85t9IA== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" ansi-styles "^4.0.0" jest-get-type "^26.3.0" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" jest-regex-util "^26.0.0" extend-shallow@^2.0.1: @@ -2540,7 +2553,7 @@ glob-parent@^5.0.0, glob-parent@^5.1.0, glob-parent@~5.1.0: dependencies: is-glob "^4.0.1" -glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4, glob@^7.1.6: +glob@^7.0.0, glob@^7.1.1, glob@^7.1.2, glob@^7.1.3, glob@^7.1.4: version "7.1.6" resolved "https://registry.yarnpkg.com/glob/-/glob-7.1.6.tgz#141f33b81a7c2492e125594307480c46679278a6" integrity sha512-LwaxwyZ72Lk7vZINtNNrywX0ZuLyStrdDtabefZKAY5ZGJhVtgdznluResxNmPitE0SAO+O26sWTHeKSI2wMBA== @@ -2836,6 +2849,13 @@ is-ci@^2.0.0: dependencies: ci-info "^2.0.0" +is-core-module@^2.0.0: + version "2.1.0" + resolved "https://registry.yarnpkg.com/is-core-module/-/is-core-module-2.1.0.tgz#a4cc031d9b1aca63eecbd18a650e13cb4eeab946" + integrity sha512-YcV7BgVMRFRua2FqQzKtTDMz8iCuLEyGKjr70q8Zm1yy2qKcurbFEd79PAdHV77oL3NrAaOVQIbMmiHQCHB7ZA== + dependencies: + has "^1.0.3" + is-data-descriptor@^0.1.4: version "0.1.4" resolved "https://registry.yarnpkg.com/is-data-descriptor/-/is-data-descriptor-0.1.4.tgz#0b5ee648388e2c860282e793f1856fec3f301b56" @@ -3082,57 +3102,57 @@ istanbul-reports@^3.0.2: html-escaper "^2.0.0" istanbul-lib-report "^3.0.0" -jest-changed-files@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.3.0.tgz#68fb2a7eb125f50839dab1f5a17db3607fe195b1" - integrity sha512-1C4R4nijgPltX6fugKxM4oQ18zimS7LqQ+zTTY8lMCMFPrxqBFb7KJH0Z2fRQJvw2Slbaipsqq7s1mgX5Iot+g== +jest-changed-files@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-changed-files/-/jest-changed-files-26.6.2.tgz#f6198479e1cc66f22f9ae1e22acaa0b429c042d0" + integrity sha512-fDS7szLcY9sCtIip8Fjry9oGf3I2ht/QT21bAHm5Dmf0mD4X3ReNUf17y+bO6fR8WgbIZTlbyG1ak/53cbRzKQ== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" execa "^4.0.0" throat "^5.0.0" -jest-cli@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.4.2.tgz#24afc6e4dfc25cde4c7ec4226fb7db5f157c21da" - integrity sha512-zb+lGd/SfrPvoRSC/0LWdaWCnscXc1mGYW//NP4/tmBvRPT3VntZ2jtKUONsRi59zc5JqmsSajA9ewJKFYp8Cw== +jest-cli@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-cli/-/jest-cli-26.6.3.tgz#43117cfef24bc4cd691a174a8796a532e135e92a" + integrity sha512-GF9noBSa9t08pSyl3CY4frMrqp+aQXFGFkf5hEPbh/pIUFYWMK6ZLTfbmadxJVcJrdRoChlWQsA2VkJcDFK8hg== dependencies: - "@jest/core" "^26.4.2" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/core" "^26.6.3" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" chalk "^4.0.0" exit "^0.1.2" graceful-fs "^4.2.4" import-local "^3.0.2" is-ci "^2.0.0" - jest-config "^26.4.2" - jest-util "^26.3.0" - jest-validate "^26.4.2" + jest-config "^26.6.3" + jest-util "^26.6.2" + jest-validate "^26.6.2" prompts "^2.0.1" - yargs "^15.3.1" + yargs "^15.4.1" -jest-config@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.4.2.tgz#da0cbb7dc2c131ffe831f0f7f2a36256e6086558" - integrity sha512-QBf7YGLuToiM8PmTnJEdRxyYy3mHWLh24LJZKVdXZ2PNdizSe1B/E8bVm+HYcjbEzGuVXDv/di+EzdO/6Gq80A== +jest-config@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-config/-/jest-config-26.6.3.tgz#64f41444eef9eb03dc51d5c53b75c8c71f645349" + integrity sha512-t5qdIj/bCj2j7NFVHb2nFB4aUdfucDn3JRKgrZnplb8nieAirAzRSHP8uDEd+qV6ygzg9Pz4YG7UTJf94LPSyg== dependencies: "@babel/core" "^7.1.0" - "@jest/test-sequencer" "^26.4.2" - "@jest/types" "^26.3.0" - babel-jest "^26.3.0" + "@jest/test-sequencer" "^26.6.3" + "@jest/types" "^26.6.2" + babel-jest "^26.6.3" chalk "^4.0.0" deepmerge "^4.2.2" glob "^7.1.1" graceful-fs "^4.2.4" - jest-environment-jsdom "^26.3.0" - jest-environment-node "^26.3.0" + jest-environment-jsdom "^26.6.2" + jest-environment-node "^26.6.2" jest-get-type "^26.3.0" - jest-jasmine2 "^26.4.2" + jest-jasmine2 "^26.6.3" jest-regex-util "^26.0.0" - jest-resolve "^26.4.0" - jest-util "^26.3.0" - jest-validate "^26.4.2" + jest-resolve "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" micromatch "^4.0.2" - pretty-format "^26.4.2" + pretty-format "^26.6.2" jest-diff@^25.2.1: version "25.5.0" @@ -3144,15 +3164,15 @@ jest-diff@^25.2.1: jest-get-type "^25.2.6" pretty-format "^25.5.0" -jest-diff@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.4.2.tgz#a1b7b303bcc534aabdb3bd4a7caf594ac059f5aa" - integrity sha512-6T1XQY8U28WH0Z5rGpQ+VqZSZz8EN8rZcBtfvXaOkbwxIEeRre6qnuZQlbY1AJ4MKDxQF8EkrCvK+hL/VkyYLQ== +jest-diff@^26.0.0, jest-diff@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-diff/-/jest-diff-26.6.2.tgz#1aa7468b52c3a68d7d5c5fdcdfcd5e49bd164394" + integrity sha512-6m+9Z3Gv9wN0WFVasqjCL/06+EFCMTqDEUl/b87HYK2rAPTyfz4ZIuSlPhY51PIQRWx5TaxeF1qmXKe9gfN3sA== dependencies: chalk "^4.0.0" - diff-sequences "^26.3.0" + diff-sequences "^26.6.2" jest-get-type "^26.3.0" - pretty-format "^26.4.2" + pretty-format "^26.6.2" jest-docblock@^26.0.0: version "26.0.0" @@ -3161,41 +3181,41 @@ jest-docblock@^26.0.0: dependencies: detect-newline "^3.0.0" -jest-each@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.4.2.tgz#bb14f7f4304f2bb2e2b81f783f989449b8b6ffae" - integrity sha512-p15rt8r8cUcRY0Mvo1fpkOGYm7iI8S6ySxgIdfh3oOIv+gHwrHTy5VWCGOecWUhDsit4Nz8avJWdT07WLpbwDA== +jest-each@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-each/-/jest-each-26.6.2.tgz#02526438a77a67401c8a6382dfe5999952c167cb" + integrity sha512-Mer/f0KaATbjl8MCJ+0GEpNdqmnVmDYqCTJYTvoo7rqmRiDllmp2AYN+06F93nXcY3ur9ShIjS+CO/uD+BbH4A== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" chalk "^4.0.0" jest-get-type "^26.3.0" - jest-util "^26.3.0" - pretty-format "^26.4.2" + jest-util "^26.6.2" + pretty-format "^26.6.2" -jest-environment-jsdom@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.3.0.tgz#3b749ba0f3a78e92ba2c9ce519e16e5dd515220c" - integrity sha512-zra8He2btIMJkAzvLaiZ9QwEPGEetbxqmjEBQwhH3CA+Hhhu0jSiEJxnJMbX28TGUvPLxBt/zyaTLrOPF4yMJA== +jest-environment-jsdom@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-jsdom/-/jest-environment-jsdom-26.6.2.tgz#78d09fe9cf019a357009b9b7e1f101d23bd1da3e" + integrity sha512-jgPqCruTlt3Kwqg5/WVFyHIOJHsiAvhcp2qiR2QQstuG9yWox5+iHpU3ZrcBxW14T4fe5Z68jAfLRh7joCSP2Q== dependencies: - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" - jest-mock "^26.3.0" - jest-util "^26.3.0" - jsdom "^16.2.2" - -jest-environment-node@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.3.0.tgz#56c6cfb506d1597f94ee8d717072bda7228df849" - integrity sha512-c9BvYoo+FGcMj5FunbBgtBnbR5qk3uky8PKyRVpSfe2/8+LrNQMiXX53z6q2kY+j15SkjQCOSL/6LHnCPLVHNw== - dependencies: - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/types" "^26.3.0" + jest-mock "^26.6.2" + jest-util "^26.6.2" + jsdom "^16.4.0" + +jest-environment-node@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-environment-node/-/jest-environment-node-26.6.2.tgz#824e4c7fb4944646356f11ac75b229b0035f2b0c" + integrity sha512-zhtMio3Exty18dy8ee8eJ9kjnRyZC1N4C1Nt/VShN1apyXc8rWGtJ9lI7vqiWcyyXS4BVSEn9lxAM2D+07/Tag== + dependencies: + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" - jest-mock "^26.3.0" - jest-util "^26.3.0" + jest-mock "^26.6.2" + jest-util "^26.6.2" jest-get-type@^25.2.6: version "25.2.6" @@ -3207,89 +3227,90 @@ jest-get-type@^26.3.0: resolved "https://registry.yarnpkg.com/jest-get-type/-/jest-get-type-26.3.0.tgz#e97dc3c3f53c2b406ca7afaed4493b1d099199e0" integrity sha512-TpfaviN1R2pQWkIihlfEanwOXK0zcxrKEE4MlU6Tn7keoXdN6/3gK/xl0yEh8DOunn5pOVGKf8hB4R9gVh04ig== -jest-haste-map@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.3.0.tgz#c51a3b40100d53ab777bfdad382d2e7a00e5c726" - integrity sha512-DHWBpTJgJhLLGwE5Z1ZaqLTYqeODQIZpby0zMBsCU9iRFHYyhklYqP4EiG73j5dkbaAdSZhgB938mL51Q5LeZA== +jest-haste-map@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-haste-map/-/jest-haste-map-26.6.2.tgz#dd7e60fe7dc0e9f911a23d79c5ff7fb5c2cafeaa" + integrity sha512-easWIJXIw71B2RdR8kgqpjQrbMRWQBgiBwXYEhtGUTaX+doCjBheluShdDMeR8IMfJiTqH4+zfhtg29apJf/8w== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" "@types/graceful-fs" "^4.1.2" "@types/node" "*" anymatch "^3.0.3" fb-watchman "^2.0.0" graceful-fs "^4.2.4" jest-regex-util "^26.0.0" - jest-serializer "^26.3.0" - jest-util "^26.3.0" - jest-worker "^26.3.0" + jest-serializer "^26.6.2" + jest-util "^26.6.2" + jest-worker "^26.6.2" micromatch "^4.0.2" sane "^4.0.3" walker "^1.0.7" optionalDependencies: fsevents "^2.1.2" -jest-jasmine2@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.4.2.tgz#18a9d5bec30904267ac5e9797570932aec1e2257" - integrity sha512-z7H4EpCldHN1J8fNgsja58QftxBSL+JcwZmaXIvV9WKIM+x49F4GLHu/+BQh2kzRKHAgaN/E82od+8rTOBPyPA== +jest-jasmine2@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-jasmine2/-/jest-jasmine2-26.6.3.tgz#adc3cf915deacb5212c93b9f3547cd12958f2edd" + integrity sha512-kPKUrQtc8aYwBV7CqBg5pu+tmYXlvFlSFYn18ev4gPFtrRzB15N2gW/Roew3187q2w2eHuu0MU9TJz6w0/nPEg== dependencies: "@babel/traverse" "^7.1.0" - "@jest/environment" "^26.3.0" - "@jest/source-map" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/environment" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" chalk "^4.0.0" co "^4.6.0" - expect "^26.4.2" + expect "^26.6.2" is-generator-fn "^2.0.0" - jest-each "^26.4.2" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" - jest-runtime "^26.4.2" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - pretty-format "^26.4.2" + jest-each "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-runtime "^26.6.3" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + pretty-format "^26.6.2" throat "^5.0.0" -jest-leak-detector@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.4.2.tgz#c73e2fa8757bf905f6f66fb9e0070b70fa0f573f" - integrity sha512-akzGcxwxtE+9ZJZRW+M2o+nTNnmQZxrHJxX/HjgDaU5+PLmY1qnQPnMjgADPGCRPhB+Yawe1iij0REe+k/aHoA== +jest-leak-detector@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-leak-detector/-/jest-leak-detector-26.6.2.tgz#7717cf118b92238f2eba65054c8a0c9c653a91af" + integrity sha512-i4xlXpsVSMeKvg2cEKdfhh0H39qlJlP5Ex1yQxwF9ubahboQYMgTtz5oML35AVA3B4Eu+YsmwaiKVev9KCvLxg== dependencies: jest-get-type "^26.3.0" - pretty-format "^26.4.2" + pretty-format "^26.6.2" -jest-matcher-utils@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.4.2.tgz#fa81f3693f7cb67e5fc1537317525ef3b85f4b06" - integrity sha512-KcbNqWfWUG24R7tu9WcAOKKdiXiXCbMvQYT6iodZ9k1f7065k0keUOW6XpJMMvah+hTfqkhJhRXmA3r3zMAg0Q== +jest-matcher-utils@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-matcher-utils/-/jest-matcher-utils-26.6.2.tgz#8e6fd6e863c8b2d31ac6472eeb237bc595e53e7a" + integrity sha512-llnc8vQgYcNqDrqRDXWwMr9i7rS5XFiCwvh6DTP7Jqa2mqpcCBBlpCbn+trkG0KNhPu/h8rzyBkriOtBstvWhw== dependencies: chalk "^4.0.0" - jest-diff "^26.4.2" + jest-diff "^26.6.2" jest-get-type "^26.3.0" - pretty-format "^26.4.2" + pretty-format "^26.6.2" -jest-message-util@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.3.0.tgz#3bdb538af27bb417f2d4d16557606fd082d5841a" - integrity sha512-xIavRYqr4/otGOiLxLZGj3ieMmjcNE73Ui+LdSW/Y790j5acqCsAdDiLIbzHCZMpN07JOENRWX5DcU+OQ+TjTA== +jest-message-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-message-util/-/jest-message-util-26.6.2.tgz#58173744ad6fc0506b5d21150b9be56ef001ca07" + integrity sha512-rGiLePzQ3AzwUshu2+Rn+UMFk0pHN58sOG+IaJbk5Jxuqo3NYO1U2/MIR4S1sKgsoYSXSzdtSa0TgrmtUwEbmA== dependencies: "@babel/code-frame" "^7.0.0" - "@jest/types" "^26.3.0" - "@types/stack-utils" "^1.0.1" + "@jest/types" "^26.6.2" + "@types/stack-utils" "^2.0.0" chalk "^4.0.0" graceful-fs "^4.2.4" micromatch "^4.0.2" + pretty-format "^26.6.2" slash "^3.0.0" stack-utils "^2.0.2" -jest-mock@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.3.0.tgz#ee62207c3c5ebe5f35b760e1267fee19a1cfdeba" - integrity sha512-PeaRrg8Dc6mnS35gOo/CbZovoDPKAeB1FICZiuagAgGvbWdNNyjQjkOaGUa/3N3JtpQ/Mh9P4A2D4Fv51NnP8Q== +jest-mock@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-mock/-/jest-mock-26.6.2.tgz#d6cb712b041ed47fe0d9b6fc3474bc6543feb302" + integrity sha512-YyFjePHHp1LzpzYcmgqkJ0nm0gg/lJx2aZFzFy1S6eUqNjXsOqTK10zNRff2dNfssgokjkG65OlWNcIlgd3zew== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" "@types/node" "*" jest-pnp-resolver@^1.2.2: @@ -3302,181 +3323,172 @@ jest-regex-util@^26.0.0: resolved "https://registry.yarnpkg.com/jest-regex-util/-/jest-regex-util-26.0.0.tgz#d25e7184b36e39fd466c3bc41be0971e821fee28" integrity sha512-Gv3ZIs/nA48/Zvjrl34bf+oD76JHiGDUxNOVgUjh3j890sblXryjY4rss71fPtD/njchl6PSE2hIhvyWa1eT0A== -jest-resolve-dependencies@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.4.2.tgz#739bdb027c14befb2fe5aabbd03f7bab355f1dc5" - integrity sha512-ADHaOwqEcVc71uTfySzSowA/RdxUpCxhxa2FNLiin9vWLB1uLPad3we+JSSROq5+SrL9iYPdZZF8bdKM7XABTQ== +jest-resolve-dependencies@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-resolve-dependencies/-/jest-resolve-dependencies-26.6.3.tgz#6680859ee5d22ee5dcd961fe4871f59f4c784fb6" + integrity sha512-pVwUjJkxbhe4RY8QEWzN3vns2kqyuldKpxlxJlzEYfKSvY6/bMvxoFrYYzUO1Gx28yKWN37qyV7rIoIp2h8fTg== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" jest-regex-util "^26.0.0" - jest-snapshot "^26.4.2" + jest-snapshot "^26.6.2" -jest-resolve@^26.4.0: - version "26.4.0" - resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.4.0.tgz#6dc0af7fb93e65b73fec0368ca2b76f3eb59a6d7" - integrity sha512-bn/JoZTEXRSlEx3+SfgZcJAVuTMOksYq9xe9O6s4Ekg84aKBObEaVXKOEilULRqviSLAYJldnoWV9c07kwtiCg== +jest-resolve@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-resolve/-/jest-resolve-26.6.2.tgz#a3ab1517217f469b504f1b56603c5bb541fbb507" + integrity sha512-sOxsZOq25mT1wRsfHcbtkInS+Ek7Q8jCHUB0ZUTP0tc/c41QHriU/NunqMfCUWsL4H3MHpvQD4QR9kSYhS7UvQ== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" chalk "^4.0.0" graceful-fs "^4.2.4" jest-pnp-resolver "^1.2.2" - jest-util "^26.3.0" + jest-util "^26.6.2" read-pkg-up "^7.0.1" - resolve "^1.17.0" + resolve "^1.18.1" slash "^3.0.0" -jest-runner@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.4.2.tgz#c3ec5482c8edd31973bd3935df5a449a45b5b853" - integrity sha512-FgjDHeVknDjw1gRAYaoUoShe1K3XUuFMkIaXbdhEys+1O4bEJS8Avmn4lBwoMfL8O5oFTdWYKcf3tEJyyYyk8g== +jest-runner@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runner/-/jest-runner-26.6.3.tgz#2d1fed3d46e10f233fd1dbd3bfaa3fe8924be159" + integrity sha512-atgKpRHnaA2OvByG/HpGA4g6CSPS/1LK0jK3gATJAoptC1ojltpmVlYC3TYgdmGp+GLuhzpH30Gvs36szSL2JQ== dependencies: - "@jest/console" "^26.3.0" - "@jest/environment" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" chalk "^4.0.0" emittery "^0.7.1" exit "^0.1.2" graceful-fs "^4.2.4" - jest-config "^26.4.2" + jest-config "^26.6.3" jest-docblock "^26.0.0" - jest-haste-map "^26.3.0" - jest-leak-detector "^26.4.2" - jest-message-util "^26.3.0" - jest-resolve "^26.4.0" - jest-runtime "^26.4.2" - jest-util "^26.3.0" - jest-worker "^26.3.0" + jest-haste-map "^26.6.2" + jest-leak-detector "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" + jest-runtime "^26.6.3" + jest-util "^26.6.2" + jest-worker "^26.6.2" source-map-support "^0.5.6" throat "^5.0.0" -jest-runtime@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.4.2.tgz#94ce17890353c92e4206580c73a8f0c024c33c42" - integrity sha512-4Pe7Uk5a80FnbHwSOk7ojNCJvz3Ks2CNQWT5Z7MJo4tX0jb3V/LThKvD9tKPNVNyeMH98J/nzGlcwc00R2dSHQ== - dependencies: - "@jest/console" "^26.3.0" - "@jest/environment" "^26.3.0" - "@jest/fake-timers" "^26.3.0" - "@jest/globals" "^26.4.2" - "@jest/source-map" "^26.3.0" - "@jest/test-result" "^26.3.0" - "@jest/transform" "^26.3.0" - "@jest/types" "^26.3.0" +jest-runtime@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest-runtime/-/jest-runtime-26.6.3.tgz#4f64efbcfac398331b74b4b3c82d27d401b8fa2b" + integrity sha512-lrzyR3N8sacTAMeonbqpnSka1dHNux2uk0qqDXVkMv2c/A3wYnvQ4EXuI013Y6+gSKSCxdaczvf4HF0mVXHRdw== + dependencies: + "@jest/console" "^26.6.2" + "@jest/environment" "^26.6.2" + "@jest/fake-timers" "^26.6.2" + "@jest/globals" "^26.6.2" + "@jest/source-map" "^26.6.2" + "@jest/test-result" "^26.6.2" + "@jest/transform" "^26.6.2" + "@jest/types" "^26.6.2" "@types/yargs" "^15.0.0" chalk "^4.0.0" + cjs-module-lexer "^0.6.0" collect-v8-coverage "^1.0.0" exit "^0.1.2" glob "^7.1.3" graceful-fs "^4.2.4" - jest-config "^26.4.2" - jest-haste-map "^26.3.0" - jest-message-util "^26.3.0" - jest-mock "^26.3.0" + jest-config "^26.6.3" + jest-haste-map "^26.6.2" + jest-message-util "^26.6.2" + jest-mock "^26.6.2" jest-regex-util "^26.0.0" - jest-resolve "^26.4.0" - jest-snapshot "^26.4.2" - jest-util "^26.3.0" - jest-validate "^26.4.2" + jest-resolve "^26.6.2" + jest-snapshot "^26.6.2" + jest-util "^26.6.2" + jest-validate "^26.6.2" slash "^3.0.0" strip-bom "^4.0.0" - yargs "^15.3.1" + yargs "^15.4.1" -jest-serializer@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.3.0.tgz#1c9d5e1b74d6e5f7e7f9627080fa205d976c33ef" - integrity sha512-IDRBQBLPlKa4flg77fqg0n/pH87tcRKwe8zxOVTWISxGpPHYkRZ1dXKyh04JOja7gppc60+soKVZ791mruVdow== +jest-serializer@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-serializer/-/jest-serializer-26.6.2.tgz#d139aafd46957d3a448f3a6cdabe2919ba0742d1" + integrity sha512-S5wqyz0DXnNJPd/xfIzZ5Xnp1HrJWBczg8mMfMpN78OJ5eDxXyf+Ygld9wX1DnUWbIbhM1YDY95NjR4CBXkb2g== dependencies: "@types/node" "*" graceful-fs "^4.2.4" -jest-snapshot@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.4.2.tgz#87d3ac2f2bd87ea8003602fbebd8fcb9e94104f6" - integrity sha512-N6Uub8FccKlf5SBFnL2Ri/xofbaA68Cc3MGjP/NuwgnsvWh+9hLIR/DhrxbSiKXMY9vUW5dI6EW1eHaDHqe9sg== +jest-snapshot@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-snapshot/-/jest-snapshot-26.6.2.tgz#f3b0af1acb223316850bd14e1beea9837fb39c84" + integrity sha512-OLhxz05EzUtsAmOMzuupt1lHYXCNib0ECyuZ/PZOx9TrZcC8vL0x+DUG3TL+GLX3yHG45e6YGjIm0XwDc3q3og== dependencies: "@babel/types" "^7.0.0" - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" + "@types/babel__traverse" "^7.0.4" "@types/prettier" "^2.0.0" chalk "^4.0.0" - expect "^26.4.2" + expect "^26.6.2" graceful-fs "^4.2.4" - jest-diff "^26.4.2" + jest-diff "^26.6.2" jest-get-type "^26.3.0" - jest-haste-map "^26.3.0" - jest-matcher-utils "^26.4.2" - jest-message-util "^26.3.0" - jest-resolve "^26.4.0" + jest-haste-map "^26.6.2" + jest-matcher-utils "^26.6.2" + jest-message-util "^26.6.2" + jest-resolve "^26.6.2" natural-compare "^1.4.0" - pretty-format "^26.4.2" + pretty-format "^26.6.2" semver "^7.3.2" -jest-util@26.x: - version "26.1.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.1.0.tgz#80e85d4ba820decacf41a691c2042d5276e5d8d8" - integrity sha512-rNMOwFQevljfNGvbzNQAxdmXQ+NawW/J72dmddsK0E8vgxXCMtwQ/EH0BiWEIxh0hhMcTsxwAxINt7Lh46Uzbg== - dependencies: - "@jest/types" "^26.1.0" - chalk "^4.0.0" - graceful-fs "^4.2.4" - is-ci "^2.0.0" - micromatch "^4.0.2" - -jest-util@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.3.0.tgz#a8974b191df30e2bf523ebbfdbaeb8efca535b3e" - integrity sha512-4zpn6bwV0+AMFN0IYhH/wnzIQzRaYVrz1A8sYnRnj4UXDXbOVtWmlaZkO9mipFqZ13okIfN87aDoJWB7VH6hcw== +jest-util@^26.1.0, jest-util@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-util/-/jest-util-26.6.2.tgz#907535dbe4d5a6cb4c47ac9b926f6af29576cbc1" + integrity sha512-MDW0fKfsn0OI7MS7Euz6h8HNDXVQ0gaM9uW6RjfDmd1DAFcaxX9OqIakHIqhbnmF08Cf2DLDG+ulq8YQQ0Lp0Q== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" "@types/node" "*" chalk "^4.0.0" graceful-fs "^4.2.4" is-ci "^2.0.0" micromatch "^4.0.2" -jest-validate@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.4.2.tgz#e871b0dfe97747133014dcf6445ee8018398f39c" - integrity sha512-blft+xDX7XXghfhY0mrsBCYhX365n8K5wNDC4XAcNKqqjEzsRUSXP44m6PL0QJEW2crxQFLLztVnJ4j7oPlQrQ== +jest-validate@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-validate/-/jest-validate-26.6.2.tgz#23d380971587150467342911c3d7b4ac57ab20ec" + integrity sha512-NEYZ9Aeyj0i5rQqbq+tpIOom0YS1u2MVu6+euBsvpgIme+FOfRmoC4R5p0JiAUpaFvFy24xgrpMknarR/93XjQ== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" camelcase "^6.0.0" chalk "^4.0.0" jest-get-type "^26.3.0" leven "^3.1.0" - pretty-format "^26.4.2" + pretty-format "^26.6.2" -jest-watcher@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.3.0.tgz#f8ef3068ddb8af160ef868400318dc4a898eed08" - integrity sha512-XnLdKmyCGJ3VoF6G/p5ohbJ04q/vv5aH9ENI+i6BL0uu9WWB6Z7Z2lhQQk0d2AVZcRGp1yW+/TsoToMhBFPRdQ== +jest-watcher@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-watcher/-/jest-watcher-26.6.2.tgz#a5b683b8f9d68dbcb1d7dae32172d2cca0592975" + integrity sha512-WKJob0P/Em2csiVthsI68p6aGKTIcsfjH9Gsx1f0A3Italz43e3ho0geSAVsmj09RWOELP1AZ/DXyJgOgDKxXQ== dependencies: - "@jest/test-result" "^26.3.0" - "@jest/types" "^26.3.0" + "@jest/test-result" "^26.6.2" + "@jest/types" "^26.6.2" "@types/node" "*" ansi-escapes "^4.2.1" chalk "^4.0.0" - jest-util "^26.3.0" + jest-util "^26.6.2" string-length "^4.0.1" -jest-worker@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.3.0.tgz#7c8a97e4f4364b4f05ed8bca8ca0c24de091871f" - integrity sha512-Vmpn2F6IASefL+DVBhPzI2J9/GJUsqzomdeN+P+dK8/jKxbh8R3BtFnx3FIta7wYlPU62cpJMJQo4kuOowcMnw== +jest-worker@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/jest-worker/-/jest-worker-26.6.2.tgz#7f72cbc4d643c365e27b9fd775f9d0eaa9c7a8ed" + integrity sha512-KWYVV1c4i+jbMpaBC+U++4Va0cp8OisU185o73T1vo99hqi7w8tSJfUXYswwqqrjzwxa6KpRK54WhPvwf5w6PQ== dependencies: "@types/node" "*" merge-stream "^2.0.0" supports-color "^7.0.0" -jest@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/jest/-/jest-26.4.2.tgz#7e8bfb348ec33f5459adeaffc1a25d5752d9d312" - integrity sha512-LLCjPrUh98Ik8CzW8LLVnSCfLaiY+wbK53U7VxnFSX7Q+kWC4noVeDvGWIFw0Amfq1lq2VfGm7YHWSLBV62MJw== +jest@^26.6.3: + version "26.6.3" + resolved "https://registry.yarnpkg.com/jest/-/jest-26.6.3.tgz#40e8fdbe48f00dfa1f0ce8121ca74b88ac9148ef" + integrity sha512-lGS5PXGAzR4RF7V5+XObhqz2KZIDUA1yD0DG6pBVmy10eh0ZIXQImRuzocsI/N2XZ1GrLFwTS27In2i2jlpq1Q== dependencies: - "@jest/core" "^26.4.2" + "@jest/core" "^26.6.3" import-local "^3.0.2" - jest-cli "^26.4.2" + jest-cli "^26.6.3" js-tokens@^4.0.0: version "4.0.0" @@ -3496,10 +3508,10 @@ jsbn@~0.1.0: resolved "https://registry.yarnpkg.com/jsbn/-/jsbn-0.1.1.tgz#a5e654c2e5a2deb5f201d96cefbca80c0ef2f513" integrity sha1-peZUwuWi3rXyAdls77yoDA7y9RM= -jsdom@^16.2.2: - version "16.3.0" - resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.3.0.tgz#75690b7dac36c67be49c336dcd7219bbbed0810c" - integrity sha512-zggeX5UuEknpdZzv15+MS1dPYG0J/TftiiNunOeNxSl3qr8Z6cIlQpN0IdJa44z9aFxZRIVqRncvEhQ7X5DtZg== +jsdom@^16.4.0: + version "16.4.0" + resolved "https://registry.yarnpkg.com/jsdom/-/jsdom-16.4.0.tgz#36005bde2d136f73eee1a830c6d45e55408edddb" + integrity sha512-lYMm3wYdgPhrl7pDcRmvzPhhrGVBeVhPIqeHjzeiHN3DFmD1RBpbExbi8vU7BJdH8VAZYovR8DMt0PNNDM7k8w== dependencies: abab "^2.0.3" acorn "^7.1.1" @@ -4012,6 +4024,11 @@ node-fetch-h2@^2.3.0: dependencies: http2-client "^1.2.5" +node-fetch@^2.6.1: + version "2.6.1" + resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052" + integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw== + node-int64@^0.4.0: version "0.4.0" resolved "https://registry.yarnpkg.com/node-int64/-/node-int64-0.4.0.tgz#87a9065cdb355d3182d8f94ce11188b825c68a3b" @@ -4099,19 +4116,19 @@ oas-kit-common@^1.0.8: dependencies: fast-safe-stringify "^2.0.7" -oas-linter@^3.2.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/oas-linter/-/oas-linter-3.2.0.tgz#82d2e586da00adc24c44e44de4b31a6f6ba5cc7e" - integrity sha512-LP5F1dhjULEJV5oGRg6ROztH2FddzttrrUEwq5J2GB2Zy938mg0vwt1+Rthn/qqDHtj4Qgq21duNGHh+Ew1wUg== +oas-linter@^3.2.1: + version "3.2.1" + resolved "https://registry.yarnpkg.com/oas-linter/-/oas-linter-3.2.1.tgz#1a6d9117d146805b58e56df479861de0293b6e5b" + integrity sha512-e5G6bbq3Nrfxm+SDPR5AiZ6n2smVUmhLA1OgI2/Bl8e2ywfWsKw/yuqrwiXXiNHb1wdM/GyPMX6QjCGJODlaaA== dependencies: "@exodus/schemasafe" "^1.0.0-rc.2" should "^13.2.1" yaml "^1.10.0" -oas-resolver@^2.4.4: - version "2.4.4" - resolved "https://registry.yarnpkg.com/oas-resolver/-/oas-resolver-2.4.4.tgz#d4161f0826a4ea77976608b68843d1cf8eca657b" - integrity sha512-670+SM5CXYrjI547cgUeQTdB1wJb2gyrJ7bnGywQMrmciKXhXj/EFbE/8c8wed+j1WmGAh7xS+QdQxiuIlNqlw== +oas-resolver@^2.5.2: + version "2.5.2" + resolved "https://registry.yarnpkg.com/oas-resolver/-/oas-resolver-2.5.2.tgz#62d26f8db7a4afd697f27ae9b283e79300dd2366" + integrity sha512-dEuG5nE9IMl0FQNQuROsoriP4/944PajSBKAoZMyp9b2eXfmPv9ZKeHRCKjf5RWLm0GezaPKcdCLbB0/Xiqtdw== dependencies: node-fetch-h2 "^2.3.0" oas-kit-common "^1.0.8" @@ -4124,15 +4141,15 @@ oas-schema-walker@^1.1.5: resolved "https://registry.yarnpkg.com/oas-schema-walker/-/oas-schema-walker-1.1.5.tgz#74c3cd47b70ff8e0b19adada14455b5d3ac38a22" integrity sha512-2yucenq1a9YPmeNExoUa9Qwrt9RFkjqaMAA1X+U7sbb0AqBeTIdMHky9SQQ6iN94bO5NW0W4TRYXerG+BdAvAQ== -oas-validator@^5.0.0: - version "5.0.0" - resolved "https://registry.yarnpkg.com/oas-validator/-/oas-validator-5.0.0.tgz#0998a16b8e56952908418325040f77f77d19f7dc" - integrity sha512-eg09qYTb5xBNlQv4k+nICaMc7/RHZ9McOUma/zIBj/hzSDFCIFkKjJpJpVQw6wF4Z69AXl8fHShpAZY2rTe5kw== +oas-validator@^5.0.3: + version "5.0.3" + resolved "https://registry.yarnpkg.com/oas-validator/-/oas-validator-5.0.3.tgz#b128d1e0cf7f734e98dbd5fc16037c6907261d93" + integrity sha512-PYhenXnQr/T+MmrzBT+cTnyOcIZ4wVzvjS/gvbZZNexnhl1Gu/UiCg6rsEmBetE9CfthoxG0gfGTUSYPRmUlWA== dependencies: call-me-maybe "^1.0.1" oas-kit-common "^1.0.8" - oas-linter "^3.2.0" - oas-resolver "^2.4.4" + oas-linter "^3.2.1" + oas-resolver "^2.5.2" oas-schema-walker "^1.1.5" reftools "^1.1.6" should "^13.2.1" @@ -4215,10 +4232,10 @@ onetime@^5.1.0: dependencies: mimic-fn "^2.1.0" -openapi-types@^1.3.5: - version "1.3.5" - resolved "https://registry.yarnpkg.com/openapi-types/-/openapi-types-1.3.5.tgz#6718cfbc857fe6c6f1471f65b32bdebb9c10ce40" - integrity sha512-11oi4zYorsgvg5yBarZplAqbpev5HkuVNPlZaPTknPDzAynq+lnJdXAmruGWP0s+dNYZS7bjM+xrTpJw7184Fg== +openapi-types@^7.0.1: + version "7.0.1" + resolved "https://registry.yarnpkg.com/openapi-types/-/openapi-types-7.0.1.tgz#966bcacfd14119fa12000dbc9d588bfd8df2e4d1" + integrity sha512-6pi4/Fw+JIW1HHda2Ij7LRJ5QJ8f6YzaXnsRA6m44BJz8nLq/j5gVFzPBKJo+uOFhAeHqZC/3uzhTpYPga3Q/A== optionator@^0.8.1: version "0.8.3" @@ -4486,10 +4503,10 @@ prettier-linter-helpers@^1.0.0: dependencies: fast-diff "^1.1.2" -prettier@^2.1.1: - version "2.1.1" - resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.1.tgz#d9485dd5e499daa6cb547023b87a6cf51bee37d6" - integrity sha512-9bY+5ZWCfqj3ghYBLxApy2zf6m+NJo5GzmLTpr9FsApsfjriNnS2dahWReHMi7qNPhhHl9SYHJs2cHZLgexNIw== +prettier@^2.1.2: + version "2.1.2" + resolved "https://registry.yarnpkg.com/prettier/-/prettier-2.1.2.tgz#3050700dae2e4c8b67c4c3f666cdb8af405e1ce5" + integrity sha512-16c7K+x4qVlJg9rEbXl7HEGmQyZlG4R9AgP+oHKRMsMsuk8s+ATStlf1NpDqyBI1HpVyfjLOeMhH2LvuNvV5Vg== pretty-format@^25.2.1, pretty-format@^25.5.0: version "25.5.0" @@ -4501,15 +4518,15 @@ pretty-format@^25.2.1, pretty-format@^25.5.0: ansi-styles "^4.0.0" react-is "^16.12.0" -pretty-format@^26.4.2: - version "26.4.2" - resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.4.2.tgz#d081d032b398e801e2012af2df1214ef75a81237" - integrity sha512-zK6Gd8zDsEiVydOCGLkoBoZuqv8VTiHyAbKznXe/gaph/DAeZOmit9yMfgIz5adIgAMMs5XfoYSwAX3jcCO1tA== +pretty-format@^26.0.0, pretty-format@^26.6.2: + version "26.6.2" + resolved "https://registry.yarnpkg.com/pretty-format/-/pretty-format-26.6.2.tgz#e35c2705f14cb7fe2fe94fa078345b444120fc93" + integrity sha512-7AeGuCYNGmycyQbCqd/3PWH4eOoX/OiCa0uphp57NVTeAGdJGaAliecxwBDHYQCIvrW7aDBZCYeNTP/WX69mkg== dependencies: - "@jest/types" "^26.3.0" + "@jest/types" "^26.6.2" ansi-regex "^5.0.0" ansi-styles "^4.0.0" - react-is "^16.12.0" + react-is "^17.0.1" process-nextick-args@~2.0.0: version "2.0.1" @@ -4572,6 +4589,11 @@ react-is@^16.12.0: resolved "https://registry.yarnpkg.com/react-is/-/react-is-16.13.1.tgz#789729a4dc36de2999dc156dd6c1d9c18cea56a4" integrity sha512-24e6ynE2H+OKt4kqsOvNd8kBpV65zoxbA4BVsEOB3ARVWQki/DHzaUoC5KuON/BiccDaCCTZBuOcfZs70kR8bQ== +react-is@^17.0.1: + version "17.0.1" + resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.1.tgz#5b3531bd76a645a4c9fb6e693ed36419e3301339" + integrity sha512-NAnt2iGDXohE5LI7uBnLnqvLQMtzhkiAOLXTmv+qnF9Ky7xAPcX8Up/xWIhxvLVGJvuLiNc4xQLtuqDRzb4fSA== + read-pkg-up@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/read-pkg-up/-/read-pkg-up-1.0.1.tgz#9d63c13276c065918d57f002a57f40a1b643fb02" @@ -4664,10 +4686,10 @@ readable-stream@~2.3.6: string_decoder "~1.1.1" util-deprecate "~1.0.1" -readdirp@~3.4.0: - version "3.4.0" - resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.4.0.tgz#9fdccdf9e9155805449221ac645e8303ab5b9ada" - integrity sha512-0xe001vZBnJEK+uKcj8qOhyAKPzIT+gStxWr3LCB0DwcXR5NZJ3IaC+yGnHCYzB/S7ov3m3EEbZI2zeNvX+hGQ== +readdirp@~3.5.0: + version "3.5.0" + resolved "https://registry.yarnpkg.com/readdirp/-/readdirp-3.5.0.tgz#9ba74c019b15d365278d2e91bb8c48d7b4d42c9e" + integrity sha512-cMhu7c/8rdhkHXWsY+osBhfSy0JikwpHK/5+imo+LpeasTF8ouErHrlYkwT0++njiyuDvc7OFY5T3ukvZ8qmFQ== dependencies: picomatch "^2.2.1" @@ -4823,6 +4845,14 @@ resolve@^1.1.6, resolve@^1.10.0, resolve@^1.10.1, resolve@^1.13.1, resolve@^1.17 dependencies: path-parse "^1.0.6" +resolve@^1.18.1: + version "1.18.1" + resolved "https://registry.yarnpkg.com/resolve/-/resolve-1.18.1.tgz#018fcb2c5b207d2a6424aee361c5a266da8f4130" + integrity sha512-lDfCPaMKfOJXjy0dPayzPdF1phampNWr3qFCjAu+rw/qbQmr5jWH5xN2hwh9QKfw9E5v4hwV7A+jrCmL8yjjqA== + dependencies: + is-core-module "^2.0.0" + path-parse "^1.0.6" + ret@~0.1.10: version "0.1.15" resolved "https://registry.yarnpkg.com/ret/-/ret-0.1.15.tgz#b8a4825d5bdb1fc3f6f53c2bc33f81388681c7bc" @@ -5380,25 +5410,26 @@ supports-hyperlinks@^2.0.0: has-flag "^4.0.0" supports-color "^7.0.0" -swagger-parser@^10.0.1: - version "10.0.1" - resolved "https://registry.yarnpkg.com/swagger-parser/-/swagger-parser-10.0.1.tgz#ad3839e106bfcd436a04711cf2e20b778e4c1f39" - integrity sha512-N9Bx/KVlP28xSdnLdrZfa5tuWZZNtWQ+oWmHJz4XJhyD5j12VdOtO7Jok42hCF1rDQHBfjObwJxtbm4Pn88r3Q== +swagger-parser@^10.0.2: + version "10.0.2" + resolved "https://registry.yarnpkg.com/swagger-parser/-/swagger-parser-10.0.2.tgz#d7f18faa09c9c145e938977c9bd6c3435998b667" + integrity sha512-9jHkHM+QXyLGFLk1DkXBwV+4HyNm0Za3b8/zk/+mjr8jgOSiqm3FOTHBSDsBjtn9scdL+8eWcHdupp2NLM8tDw== dependencies: - "@apidevtools/swagger-parser" "10.0.1" + "@apidevtools/swagger-parser" "10.0.2" -swagger2openapi@^7.0.0: - version "7.0.0" - resolved "https://registry.yarnpkg.com/swagger2openapi/-/swagger2openapi-7.0.0.tgz#c1eb73348d8b6c7d9f09ebe69d7d7c5819783018" - integrity sha512-1sG0pl5mRRq5mld+m5Ja5R67pJAR383ExXP3h9Qu/elpadgU0vgAQhr+DvqlV6l63YF7fRCtHvrCVsHn5huQQw== +swagger2openapi@^7.0.3: + version "7.0.3" + resolved "https://registry.yarnpkg.com/swagger2openapi/-/swagger2openapi-7.0.3.tgz#aa16cf00ea368028f6f41fcab3074cff223cfb8a" + integrity sha512-JSFUmXSR7Qx9WwSKCEqaL4oQfhLLCU2r8Zgf30g15FdSkihItZ6fKFnqSsfqQ6MsmnLlcBf8+OhnQHbi1R0ydg== dependencies: call-me-maybe "^1.0.1" + node-fetch "^2.6.1" node-fetch-h2 "^2.3.0" node-readfiles "^0.2.0" oas-kit-common "^1.0.8" - oas-resolver "^2.4.4" + oas-resolver "^2.5.2" oas-schema-walker "^1.1.5" - oas-validator "^5.0.0" + oas-validator "^5.0.3" reftools "^1.1.6" yaml "^1.10.0" yargs "^15.3.1" @@ -5556,22 +5587,23 @@ trim-off-newlines@^1.0.0: resolved "https://registry.yarnpkg.com/trim-off-newlines/-/trim-off-newlines-1.0.1.tgz#9f9ba9d9efa8764c387698bcbfeb2c848f11adb3" integrity sha1-n5up2e+odkw4dpi8v+sshI8RrbM= -ts-jest@^26.3.0: - version "26.3.0" - resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.3.0.tgz#6b2845045347dce394f069bb59358253bc1338a9" - integrity sha512-Jq2uKfx6bPd9+JDpZNMBJMdMQUC3sJ08acISj8NXlVgR2d5OqslEHOR2KHMgwymu8h50+lKIm0m0xj/ioYdW2Q== +ts-jest@^26.4.3: + version "26.4.3" + resolved "https://registry.yarnpkg.com/ts-jest/-/ts-jest-26.4.3.tgz#d153a616033e7ec8544b97ddbe2638cbe38d53db" + integrity sha512-pFDkOKFGY+nL9v5pkhm+BIFpoAuno96ff7GMnIYr/3L6slFOS365SI0fGEVYx2RKGji5M2elxhWjDMPVcOCdSw== dependencies: + "@jest/create-cache-key-function" "^26.5.0" "@types/jest" "26.x" bs-logger "0.x" buffer-from "1.x" fast-json-stable-stringify "2.x" - jest-util "26.x" + jest-util "^26.1.0" json5 "2.x" lodash.memoize "4.x" make-error "1.x" mkdirp "1.x" semver "7.x" - yargs-parser "18.x" + yargs-parser "20.x" tsconfig-paths@^3.9.0: version "3.9.0" @@ -5658,10 +5690,10 @@ typedarray@^0.0.6: resolved "https://registry.yarnpkg.com/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777" integrity sha1-hnrHTjhkGHsdPUfZlqeOxciDB3c= -typescript@^4.0.2: - version "4.0.2" - resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.2.tgz#7ea7c88777c723c681e33bf7988be5d008d05ac2" - integrity sha512-e4ERvRV2wb+rRZ/IQeb3jm2VxBsirQLpQhdxplZ2MEzGvDkkMmPglecnNDfSUBivMjP93vRbngYYDQqQ/78bcQ== +typescript@^4.0.5: + version "4.0.5" + resolved "https://registry.yarnpkg.com/typescript/-/typescript-4.0.5.tgz#ae9dddfd1069f1cb5beb3ef3b2170dd7c1332389" + integrity sha512-ywmr/VrTVCmNTJ6iV2LwIrfG1P+lv6luD8sUJs+2eI9NLGigaN+nUQc13iHqisq7bra9lnmUSYqbJvegraBOPQ== uglify-js@^3.1.4: version "3.9.4" @@ -5725,10 +5757,10 @@ v8-compile-cache@^2.0.3: resolved "https://registry.yarnpkg.com/v8-compile-cache/-/v8-compile-cache-2.1.0.tgz#e14de37b31a6d194f5690d67efc4e7f6fc6ab30e" integrity sha512-usZBT3PW+LOjM25wbqIlZwPeJV+3OSz3M1k1Ws8snlW39dZyYL9lOGC5FgPVHfk0jKmjiDV8Z0mIbVQPiwFs7g== -v8-to-istanbul@^5.0.1: - version "5.0.1" - resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-5.0.1.tgz#0608f5b49a481458625edb058488607f25498ba5" - integrity sha512-mbDNjuDajqYe3TXFk5qxcQy8L1msXNE37WTlLoqqpBfRsimbNcrlhQlDPntmECEcUvdC+AQ8CyMMf6EUx1r74Q== +v8-to-istanbul@^7.0.0: + version "7.0.0" + resolved "https://registry.yarnpkg.com/v8-to-istanbul/-/v8-to-istanbul-7.0.0.tgz#b4fe00e35649ef7785a9b7fcebcea05f37c332fc" + integrity sha512-fLL2rFuQpMtm9r8hrAV2apXX/WqHJ6+IC4/eQVdMDGBUgH/YMV4Gv3duk3kjmyg6uiQWBAA9nJwue4iJUOkHeA== dependencies: "@types/istanbul-lib-coverage" "^2.0.1" convert-source-map "^1.6.0" @@ -5898,7 +5930,12 @@ yaml@^1.10.0: resolved "https://registry.yarnpkg.com/yaml/-/yaml-1.10.0.tgz#3b593add944876077d4d683fee01081bd9fff31e" integrity sha512-yr2icI4glYaNG+KWONODapy2/jDdMSDnrONSjblABjD9B4Z5LgiircSt8m8sRZFNi08kG9Sm0uSHtEmP3zaEGg== -yargs-parser@18.x, yargs-parser@^18.1.1, yargs-parser@^18.1.3: +yargs-parser@20.x: + version "20.2.3" + resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-20.2.3.tgz#92419ba867b858c868acf8bae9bf74af0dd0ce26" + integrity sha512-emOFRT9WVHw03QSvN5qor9QQT9+sw5vwxfYweivSMHTcAXPefwVae2FjO7JJjj8hCE4CzPOPeFM83VwT29HCww== + +yargs-parser@^18.1.1, yargs-parser@^18.1.2, yargs-parser@^18.1.3: version "18.1.3" resolved "https://registry.yarnpkg.com/yargs-parser/-/yargs-parser-18.1.3.tgz#be68c4975c6b2abf469236b0c870362fab09a7b0" integrity sha512-o50j0JeToy/4K6OZcaQmW6lyXXKhq7csREXcDwk2omFPJEwUNOVtJKvmDr9EI1fAJZUyZcRF7kxGBWmRXudrCQ== @@ -5923,6 +5960,23 @@ yargs@^15.3.1: y18n "^4.0.0" yargs-parser "^18.1.1" +yargs@^15.4.1: + version "15.4.1" + resolved "https://registry.yarnpkg.com/yargs/-/yargs-15.4.1.tgz#0d87a16de01aee9d8bec2bfbf74f67851730f4f8" + integrity sha512-aePbxDmcYW++PaqBsJ+HYUFwCdv4LVvdnhBy78E57PIor8/OVvhMrADFFEDh8DHDFRv/O9i3lPhsENjO7QX0+A== + dependencies: + cliui "^6.0.0" + decamelize "^1.2.0" + find-up "^4.1.0" + get-caller-file "^2.0.1" + require-directory "^2.1.1" + require-main-filename "^2.0.0" + set-blocking "^2.0.0" + string-width "^4.2.0" + which-module "^2.0.0" + y18n "^4.0.0" + yargs-parser "^18.1.2" + z-schema@^4.2.3: version "4.2.3" resolved "https://registry.yarnpkg.com/z-schema/-/z-schema-4.2.3.tgz#85f7eea7e6d4fe59a483462a98f511bd78fe9882"