@orval/swr 6.11.0-alpha.2 → 6.11.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/dist/index.d.ts +2 -4
  2. package/dist/index.js +18 -18
  3. package/package.json +2 -2
package/dist/index.d.ts CHANGED
@@ -1,10 +1,8 @@
1
- import { ClientDependenciesBuilder, ClientTitleBuilder, ClientHeaderBuilder, ClientFooterBuilder, ClientBuilder, ClientGeneratorsBuilder } from '@orval/core';
1
+ import { ClientDependenciesBuilder, ClientHeaderBuilder, ClientBuilder, ClientGeneratorsBuilder } from '@orval/core';
2
2
 
3
3
  declare const getSwrDependencies: ClientDependenciesBuilder;
4
- declare const generateSwrTitle: ClientTitleBuilder;
5
4
  declare const generateSwrHeader: ClientHeaderBuilder;
6
- declare const generateSwrFooter: ClientFooterBuilder;
7
5
  declare const generateSwr: ClientBuilder;
8
6
  declare const builder: () => () => ClientGeneratorsBuilder;
9
7
 
10
- export { builder, builder as default, generateSwr, generateSwrFooter, generateSwrHeader, generateSwrTitle, getSwrDependencies };
8
+ export { builder, builder as default, generateSwr, generateSwrHeader, getSwrDependencies };
package/dist/index.js CHANGED
@@ -1,17 +1,17 @@
1
- "use strict";Object.defineProperty(exports, "__esModule", {value: true});var _core = require('@orval/core');var V=[{exports:[{name:"axios",default:!0,values:!0,syntheticDefaultImport:!0},{name:"AxiosRequestConfig"},{name:"AxiosResponse"},{name:"AxiosError"}],dependency:"axios"}],M=[{exports:[{name:"useSwr",values:!0,default:!0},{name:"SWRConfiguration"},{name:"Key"}],dependency:"swr"}],N= exports.getSwrDependencies =e=>[...e?[]:V,...M],j=({headers:e,queryParams:s,operationName:i,response:o,mutator:r,body:n,props:a,verb:l,formData:w,formUrlEncoded:g,override:t},{route:$,context:y})=>{var O,S;let c=(t==null?void 0:t.requestOptions)!==!1,u=(t==null?void 0:t.formData)!==!1,p=(t==null?void 0:t.formUrlEncoded)!==!1,f=!!((S=(O=y.tsconfig)==null?void 0:O.compilerOptions)!=null&&S.exactOptionalPropertyTypes),A=_core.VERBS_WITH_BODY.includes(l),C=_core.isSyntheticDefaultImportsAllow.call(void 0, y.tsconfig),x=_core.generateFormDataAndUrlEncodedFunction.call(void 0, {formData:w,formUrlEncoded:g,body:n,isFormData:u,isFormUrlEncoded:p});if(r){let P=_core.generateMutatorConfig.call(void 0, {route:$,body:n,headers:e,queryParams:s,response:o,verb:l,isFormData:u,isFormUrlEncoded:p,hasSignal:!1,isBodyVerb:A,isExactOptionalPropertyTypes:f}),R=(r==null?void 0:r.bodyTypeName)&&n.definition?_core.toObjectString.call(void 0, a,"implementation").replace(new RegExp(`(\\w*):\\s?${n.definition}`),`$1: ${r.bodyTypeName}<${n.definition}>`):_core.toObjectString.call(void 0, a,"implementation"),D=c?_core.generateMutatorRequestOptions.call(void 0, t==null?void 0:t.requestOptions,r.hasSecondArg):"";return`export const ${i} = (
2
- ${R}
3
- ${c&&r.hasSecondArg?`options?: SecondParameter<typeof ${r.name}>`:""}) => {${x}
1
+ "use strict";Object.defineProperty(exports, "__esModule", {value: true});var _core = require('@orval/core');var V=[{exports:[{name:"axios",default:!0,values:!0,syntheticDefaultImport:!0},{name:"AxiosRequestConfig"},{name:"AxiosResponse"},{name:"AxiosError"}],dependency:"axios"}],M=[{exports:[{name:"useSwr",values:!0,default:!0},{name:"SWRConfiguration"},{name:"Key"}],dependency:"swr"}],N= exports.getSwrDependencies =e=>[...e?[]:V,...M],j=({headers:e,queryParams:s,operationName:i,response:o,mutator:r,body:n,props:a,verb:l,formData:y,formUrlEncoded:g,override:t},{route:u,context:w})=>{var x,E;let c=(t==null?void 0:t.requestOptions)!==!1,$=(t==null?void 0:t.formData)!==!1,p=(t==null?void 0:t.formUrlEncoded)!==!1,f=!!((E=(x=w.tsconfig)==null?void 0:x.compilerOptions)!=null&&E.exactOptionalPropertyTypes),T=_core.VERBS_WITH_BODY.includes(l),G=_core.isSyntheticDefaultImportsAllow.call(void 0, w.tsconfig),O=_core.generateFormDataAndUrlEncodedFunction.call(void 0, {formData:y,formUrlEncoded:g,body:n,isFormData:$,isFormUrlEncoded:p});if(r){let R=_core.generateMutatorConfig.call(void 0, {route:u,body:n,headers:e,queryParams:s,response:o,verb:l,isFormData:$,isFormUrlEncoded:p,hasSignal:!1,isBodyVerb:T,isExactOptionalPropertyTypes:f}),D=(r==null?void 0:r.bodyTypeName)&&n.definition?_core.toObjectString.call(void 0, a,"implementation").replace(new RegExp(`(\\w*):\\s?${n.definition}`),`$1: ${r.bodyTypeName}<${n.definition}>`):_core.toObjectString.call(void 0, a,"implementation"),q=c?_core.generateMutatorRequestOptions.call(void 0, t==null?void 0:t.requestOptions,r.hasSecondArg):"";return`export const ${i} = (
2
+ ${D}
3
+ ${c&&r.hasSecondArg?`options?: SecondParameter<typeof ${r.name}>`:""}) => {${O}
4
4
  return ${r.name}<${o.definition.success||"unknown"}>(
5
- ${P},
6
- ${D});
5
+ ${R},
6
+ ${q});
7
7
  }
8
- `}let G=_core.generateOptions.call(void 0, {route:$,body:n,headers:e,queryParams:s,response:o,verb:l,requestOptions:t==null?void 0:t.requestOptions,isFormData:u,isFormUrlEncoded:p,isExactOptionalPropertyTypes:f,hasSignal:!1});return`export const ${i} = (
8
+ `}let P=_core.generateOptions.call(void 0, {route:u,body:n,headers:e,queryParams:s,response:o,verb:l,requestOptions:t==null?void 0:t.requestOptions,isFormData:$,isFormUrlEncoded:p,isExactOptionalPropertyTypes:f,hasSignal:!1});return`export const ${i} = (
9
9
  ${_core.toObjectString.call(void 0, a,"implementation")} ${c?`options?: AxiosRequestConfig
10
- `:""} ): Promise<AxiosResponse<${o.definition.success||"unknown"}>> => {${x}
11
- return axios${C?"":".default"}.${l}(${G});
10
+ `:""} ): Promise<AxiosResponse<${o.definition.success||"unknown"}>> => {${O}
11
+ return axios${G?"":".default"}.${l}(${P});
12
12
  }
13
13
  `},W=({operationName:e,mutator:s,isRequestOptions:i})=>{let o=`SWRConfiguration<Awaited<ReturnType<typeof ${e}>>, TError> & { swrKey?: Key, enabled?: boolean }`;return i?`options?: { swr?:${o}, ${s?s!=null&&s.hasSecondArg?`request?: SecondParameter<typeof ${s.name}>`:"":"axios?: AxiosRequestConfig"} }
14
- `:`swrOptions?: ${o}`},_=({operationName:e,swrKeyFnName:s,swrProperties:i,swrKeyProperties:o,params:r,mutator:n,isRequestOptions:a,response:l,swrOptions:w,props:g})=>{var u;let t=_core.toObjectString.call(void 0, g,"implementation"),$=i,y=`const isEnabled = swrOptions?.enabled !== false${r.length?` && !!(${r.map(({name:p})=>p).join(" && ")})`:""}
14
+ `:`swrOptions?: ${o}`},_=({operationName:e,swrKeyFnName:s,swrProperties:i,swrKeyProperties:o,params:r,mutator:n,isRequestOptions:a,response:l,swrOptions:y,props:g})=>{var $;let t=_core.toObjectString.call(void 0, g,"implementation"),u=i,w=`const isEnabled = swrOptions?.enabled !== false${r.length?` && !!(${r.map(({name:p})=>p).join(" && ")})`:""}
15
15
  const swrKey = swrOptions?.swrKey ?? (() => isEnabled ? ${s}(${o}) : null);`,c=`AxiosError<${l.definition.errors||"unknown"}>`;return n&&(c=n.hasErrorType?`ErrorType<${l.definition.errors||"unknown"}>`:l.definition.errors||"unknown"),`
16
16
  export type ${_core.pascal.call(void 0, e)}QueryResult = NonNullable<Awaited<ReturnType<typeof ${e}>>>
17
17
  export type ${_core.pascal.call(void 0, e)}QueryError = ${c}
@@ -22,11 +22,11 @@ export const ${_core.camel.call(void 0, `use-${e}`)} = <TError = ${c}>(
22
22
 
23
23
  ${a?`const {swr: swrOptions${n?n!=null&&n.hasSecondArg?", request: requestOptions":"":", axios: axiosOptions"}} = options ?? {}`:""}
24
24
 
25
- ${y}
26
- const swrFn = () => ${e}(${$}${$?", ":""}${a?n?n!=null&&n.hasSecondArg?"requestOptions":"":"axiosOptions":""});
25
+ ${w}
26
+ const swrFn = () => ${e}(${u}${u?", ":""}${a?n?n!=null&&n.hasSecondArg?"requestOptions":"":"axiosOptions":""});
27
27
 
28
- const query = useSwr<Awaited<ReturnType<typeof swrFn>>, TError>(swrKey, swrFn, ${w.options?`{
29
- ${(u=_core.stringify.call(void 0, w.options))==null?void 0:u.slice(1,-1)}
28
+ const query = useSwr<Awaited<ReturnType<typeof swrFn>>, TError>(swrKey, swrFn, ${y.options?`{
29
+ ${($=_core.stringify.call(void 0, y.options))==null?void 0:$.slice(1,-1)}
30
30
  ...swrOptions
31
31
  }`:"swrOptions"})
32
32
 
@@ -35,10 +35,10 @@ export const ${_core.camel.call(void 0, `use-${e}`)} = <TError = ${c}>(
35
35
  ...query
36
36
  }
37
37
  }
38
- `},U=({queryParams:e,operationName:s,body:i,props:o,verb:r,params:n,override:a,mutator:l,response:w},{route:g})=>{let t=(a==null?void 0:a.requestOptions)!==!1;if(r!==_core.Verbs.GET)return"";let $=o.map(({name:p,type:f})=>f===_core.GetterPropType.BODY?i.implementation:p).join(","),y=o.filter(p=>p.type!==_core.GetterPropType.HEADER).map(({name:p,type:f})=>f===_core.GetterPropType.BODY?i.implementation:p).join(","),c=_core.camel.call(void 0, `get-${s}-key`),u=_core.toObjectString.call(void 0, o.filter(p=>p.type!==_core.GetterPropType.HEADER),"implementation");return`export const ${c} = (${u}) => [\`${g}\`${e?", ...(params ? [params]: [])":""}${i.implementation?`, ${i.implementation}`:""}];
38
+ `},U=({queryParams:e,operationName:s,body:i,props:o,verb:r,params:n,override:a,mutator:l,response:y},{route:g})=>{let t=(a==null?void 0:a.requestOptions)!==!1;if(r!==_core.Verbs.GET)return"";let u=o.map(({name:p,type:f})=>f===_core.GetterPropType.BODY?i.implementation:p).join(","),w=o.filter(p=>p.type!==_core.GetterPropType.HEADER).map(({name:p,type:f})=>f===_core.GetterPropType.BODY?i.implementation:p).join(","),c=_core.camel.call(void 0, `get-${s}-key`),$=_core.toObjectString.call(void 0, o.filter(p=>p.type!==_core.GetterPropType.HEADER),"implementation");return`export const ${c} = (${$}) => [\`${g}\`${e?", ...(params ? [params]: [])":""}${i.implementation?`, ${i.implementation}`:""}];
39
39
 
40
- ${_({operationName:s,swrKeyFnName:c,swrProperties:$,swrKeyProperties:y,params:n,props:o,mutator:l,isRequestOptions:t,response:w,swrOptions:a.swr})}
41
- `},Y= exports.generateSwrTitle =()=>"",Q= exports.generateSwrHeader =({isRequestOptions:e,isMutator:s,hasAwaitedType:i})=>`
40
+ ${_({operationName:s,swrKeyFnName:c,swrProperties:u,swrKeyProperties:w,params:n,props:o,mutator:l,isRequestOptions:t,response:y,swrOptions:a.swr})}
41
+ `},Y= exports.generateSwrHeader =({isRequestOptions:e,isMutator:s,hasAwaitedType:i})=>`
42
42
  ${i?"":`type AwaitedInput<T> = PromiseLike<T> | T;
43
43
 
44
44
  type Awaited<O> = O extends AwaitedInput<infer T> ? T : never;
@@ -52,6 +52,6 @@ export const ${_core.camel.call(void 0, `use-${e}`)} = <TError = ${c}>(
52
52
  ? P
53
53
  : never;
54
54
 
55
- `:""}`,L= exports.generateSwrFooter =()=>"",X= exports.generateSwr =(e,s)=>{let i=_core.generateVerbImports.call(void 0, e),o=j(e,s),r=U(e,s);return{implementation:`${o}
55
+ `:""}`,Q= exports.generateSwr =(e,s)=>{let i=_core.generateVerbImports.call(void 0, e),o=j(e,s),r=U(e,s);return{implementation:`${o}
56
56
 
57
- ${r}`,imports:i}},z={client:X,header:Q,dependencies:N,footer:L,title:Y},J= exports.builder =()=>()=>z,$e= exports.default =J;exports.builder = J; exports.default = $e; exports.generateSwr = X; exports.generateSwrFooter = L; exports.generateSwrHeader = Q; exports.generateSwrTitle = Y; exports.getSwrDependencies = N;
57
+ ${r}`,imports:i}},L={client:Q,header:Y,dependencies:N},X= exports.builder =()=>()=>L,ae= exports.default =X;exports.builder = X; exports.default = ae; exports.generateSwr = Q; exports.generateSwrHeader = Y; exports.getSwrDependencies = N;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@orval/swr",
3
- "version": "6.11.0-alpha.2",
3
+ "version": "6.11.0-alpha.4",
4
4
  "license": "MIT",
5
5
  "main": "./dist/index.js",
6
6
  "types": "./dist/index.d.ts",
@@ -13,6 +13,6 @@
13
13
  "lint": "eslint src/**/*.ts"
14
14
  },
15
15
  "dependencies": {
16
- "@orval/core": "6.11.0-alpha.2"
16
+ "@orval/core": "6.11.0-alpha.4"
17
17
  }
18
18
  }