@orval/core 6.14.3 → 6.14.4

package/dist/index.js

@@ -42,7 +42,7 @@ ${n}} as const;
  }`;else{let g=A({schema:e.additionalProperties,name:t,context:r});n.value+=`
   [key: string]: ${g.value};
 }`}else n.value+=`
-}`;n.value+=s}return n},{imports:[],schemas:[],value:"",isEnum:!1,type:"object",isRef:!1,schema:{},hasReadonlyProps:!1});if(e.additionalProperties){if(ie(e.additionalProperties))return{value:"{ [key: string]: any }"+s,imports:[],schemas:[],isEnum:!1,type:"object",isRef:!1,hasReadonlyProps:e.readOnly||!1};let n=A({schema:e.additionalProperties,name:t,context:r});return{value:`{[key: string]: ${n.value}}`+s,imports:_nullishCoalesce(n.imports, () => ([])),schemas:_nullishCoalesce(n.schemas, () => ([])),isEnum:!1,type:"object",isRef:!1,hasReadonlyProps:n.hasReadonlyProps}}return{value:e.type==="object"?"{ [key: string]: any }":"unknown"+s,imports:[],schemas:[],isEnum:!1,type:"object",isRef:!1,hasReadonlyProps:e.readOnly||!1}};var X=({item:e,name:t,context:r})=>{let s=e.nullable?" | null":"";switch(!e.type&&e.items&&(e.type="array"),e.type){case"number":case"integer":{let n="number",o=!1;return e.enum&&(n=e.enum.map(a=>`${a}`).join(" | "),o=!0),{value:n+s,isEnum:o,type:"number",schemas:[],imports:[],isRef:!1,hasReadonlyProps:e.readOnly||!1}}case"boolean":return{value:"boolean"+s,type:"boolean",isEnum:!1,schemas:[],imports:[],isRef:!1,hasReadonlyProps:e.readOnly||!1};case"array":{let{value:n,...o}=Mt({schema:e,name:t,context:r});return{value:n+s,...o}}case"string":{let n="string",o=!1;return e.enum&&(n=`'${e.enum.map(a=>N(a)?Ke(a):`${a}`).filter(Boolean).join("' | '")}'`,o=!0),e.format==="binary"&&(n="Blob"),r.override.useDates&&(e.format==="date"||e.format==="date-time")&&(n="Date"),{value:n+s,isEnum:o,type:"string",imports:[],schemas:[],isRef:!1,hasReadonlyProps:e.readOnly||!1}}case"null":return{value:"null",isEnum:!1,type:"null",imports:[],schemas:[],isRef:!1,hasReadonlyProps:e.readOnly||!1};case"object":default:{if(e.enum)return{value:`'${e.enum.map(m=>N(m)?Ke(m):`${m}`).filter(Boolean).join("' | '")}'`+s,isEnum:!0,type:"string",imports:[],schemas:[],isRef:!1,hasReadonlyProps:e.readOnly||!1};let{value:n,...o}=It({item:e,name:t,context:r,nullable:s});return{value:n,...o}}}};var Ur=({resolvedData:e,resolvedValue:t,separator:r})=>e.isEnum.every(n=>n)?`${e.values.join(" | ")}${t?` | ${t.value}`:""}`:r==="allOf"?`${e.values.join(" & ")}${t?` & ${t.value}`:""}`:t?`(${e.values.join(` & ${t.value}) | (`)} & ${t.value})`:e.values.join(" | "),Qe= exports.combineSchemas =({name:e,schema:t,separator:r,context:s,nullable:n})=>{let o=_nullishCoalesce(t[r], () => ([])),a=o.reduce((c,l)=>{let u=e?e+h(r):void 0;u&&c.schemas.length&&(u=u+h($e(c.schemas.length+1)));let f=V({schema:l,propName:u,combined:!0,context:s});return c.values.push(f.value),c.imports.push(...f.imports),c.schemas.push(...f.schemas),c.isEnum.push(f.isEnum),c.types.push(f.type),c.isRef.push(f.isRef),c.originalSchema.push(f.originalSchema),c.hasReadonlyProps||=f.hasReadonlyProps,c},{values:[],imports:[],schemas:[],isEnum:[],isRef:[],types:[],originalSchema:[],hasReadonlyProps:!1}),m=a.isEnum.every(c=>c),i;t.properties&&(i=X({item:_lodashomit2.default.call(void 0, t,r),name:e,context:s}));let p=Ur({resolvedData:a,separator:r,resolvedValue:i});if(m&&e&&o.length>1){let c=`
+}`;n.value+=s}return n},{imports:[],schemas:[],value:"",isEnum:!1,type:"object",isRef:!1,schema:{},hasReadonlyProps:!1});if(e.additionalProperties){if(ie(e.additionalProperties))return{value:"{ [key: string]: any }"+s,imports:[],schemas:[],isEnum:!1,type:"object",isRef:!1,hasReadonlyProps:e.readOnly||!1};let n=A({schema:e.additionalProperties,name:t,context:r});return{value:`{[key: string]: ${n.value}}`+s,imports:_nullishCoalesce(n.imports, () => ([])),schemas:_nullishCoalesce(n.schemas, () => ([])),isEnum:!1,type:"object",isRef:!1,hasReadonlyProps:n.hasReadonlyProps}}return{value:e.type==="object"?"{ [key: string]: any }":"unknown"+s,imports:[],schemas:[],isEnum:!1,type:"object",isRef:!1,hasReadonlyProps:e.readOnly||!1}};var X=({item:e,name:t,context:r})=>{let s=e.nullable?" | null":"";switch(!e.type&&e.items&&(e.type="array"),e.type){case"number":case"integer":{let n=e.format==="int64"?"bigint":"number",o=!1;return e.enum&&(n=e.enum.map(a=>`${a}`).join(" | "),o=!0),{value:n+s,isEnum:o,type:"number",schemas:[],imports:[],isRef:!1,hasReadonlyProps:e.readOnly||!1}}case"boolean":return{value:"boolean"+s,type:"boolean",isEnum:!1,schemas:[],imports:[],isRef:!1,hasReadonlyProps:e.readOnly||!1};case"array":{let{value:n,...o}=Mt({schema:e,name:t,context:r});return{value:n+s,...o}}case"string":{let n="string",o=!1;return e.enum&&(n=`'${e.enum.map(a=>N(a)?Ke(a):`${a}`).filter(Boolean).join("' | '")}'`,o=!0),e.format==="binary"&&(n="Blob"),r.override.useDates&&(e.format==="date"||e.format==="date-time")&&(n="Date"),{value:n+s,isEnum:o,type:"string",imports:[],schemas:[],isRef:!1,hasReadonlyProps:e.readOnly||!1}}case"null":return{value:"null",isEnum:!1,type:"null",imports:[],schemas:[],isRef:!1,hasReadonlyProps:e.readOnly||!1};case"object":default:{if(e.enum)return{value:`'${e.enum.map(m=>N(m)?Ke(m):`${m}`).filter(Boolean).join("' | '")}'`+s,isEnum:!0,type:"string",imports:[],schemas:[],isRef:!1,hasReadonlyProps:e.readOnly||!1};let{value:n,...o}=It({item:e,name:t,context:r,nullable:s});return{value:n,...o}}}};var Ur=({resolvedData:e,resolvedValue:t,separator:r})=>e.isEnum.every(n=>n)?`${e.values.join(" | ")}${t?` | ${t.value}`:""}`:r==="allOf"?`${e.values.join(" & ")}${t?` & ${t.value}`:""}`:t?`(${e.values.join(` & ${t.value}) | (`)} & ${t.value})`:e.values.join(" | "),Qe= exports.combineSchemas =({name:e,schema:t,separator:r,context:s,nullable:n})=>{let o=_nullishCoalesce(t[r], () => ([])),a=o.reduce((c,l)=>{let u=e?e+h(r):void 0;u&&c.schemas.length&&(u=u+h($e(c.schemas.length+1)));let f=V({schema:l,propName:u,combined:!0,context:s});return c.values.push(f.value),c.imports.push(...f.imports),c.schemas.push(...f.schemas),c.isEnum.push(f.isEnum),c.types.push(f.type),c.isRef.push(f.isRef),c.originalSchema.push(f.originalSchema),c.hasReadonlyProps||=f.hasReadonlyProps,c},{values:[],imports:[],schemas:[],isEnum:[],isRef:[],types:[],originalSchema:[],hasReadonlyProps:!1}),m=a.isEnum.every(c=>c),i;t.properties&&(i=X({item:_lodashomit2.default.call(void 0, t,r),name:e,context:s}));let p=Ur({resolvedData:a,separator:r,resolvedValue:i});if(m&&e&&o.length>1){let c=`
 
 // eslint-disable-next-line @typescript-eslint/no-redeclare
 export const ${h(e)} = ${zr(a)}`;return{value:`typeof ${h(e)}[keyof typeof ${h(e)}] ${n};`+c,imports:a.imports.map(l=>({...l,values:!0})),schemas:a.schemas,isEnum:!1,type:"object",isRef:!1,hasReadonlyProps:a.hasReadonlyProps}}return{value:p+n,imports:i?[...a.imports,...i.imports]:a.imports,schemas:i?[...a.schemas,...i.schemas]:a.schemas,isEnum:!1,type:"object",isRef:!1,hasReadonlyProps:_optionalChain([a, 'optionalAccess', _53 => _53.hasReadonlyProps])||_optionalChain([i, 'optionalAccess', _54 => _54.hasReadonlyProps])||!1}},zr=({values:e,isRef:t,originalSchema:r})=>e.length===1?t[0]?e[0]:`{${Re(e[0])}} as const`:`{${e.map((n,o)=>{if(t[o])return`...${n},`;let a=_optionalChain([r, 'access', _55 => _55[o], 'optionalAccess', _56 => _56["x-enumNames"]]);return Re(n,a)}).join("")}} as const`;var Dt=(e,t)=>{let r={...e};for(let s of Object.values(r))if(_optionalChain([s, 'access', _57 => _57.discriminator, 'optionalAccess', _58 => _58.mapping])){let{mapping:n,propertyName:o}=s.discriminator;for(let[a,m]of Object.entries(n)){let i;try{let{name:p}=oe(m,t);i=r[p]}catch (e2){i=r[m]}!i||(i.properties={...i.properties,[o]:{type:"string",enum:[a]}},i.required=[..._nullishCoalesce(i.required, () => ([])),o])}}return r};var kt=(e,t,r)=>e.operationId?e.operationId:h([r,...t.split("/").map(s=>v(s,{dash:!0,underscore:"-",dot:"-",whitespace:"-"}))].join("-"));var Nt=({parameters:e=[],context:t})=>e.reduce((r,s)=>{if(w(s)){let{schema:n,imports:o}=D(s,t);(n.in==="path"||n.in==="query"||n.in==="header")&&r[n.in].push({parameter:n,imports:o})}else(s.in==="query"||s.in==="path"||s.in==="header")&&r[s.in].push({parameter:s,imports:[]});return r},{path:[],query:[],header:[]});var Lr=e=>{let t,r=[],s=/\{(.*?)\}/g;for(;(t=s.exec(e))!==null;)r.push(t[1]);return r},At= exports.getParams =({route:e,pathParams:t=[],operationId:r,context:s})=>Lr(e).map(o=>{let a=t.find(({parameter:d})=>v(x(d.name),{es5keyword:!0,underscore:!0,dash:!0})===o);if(!a)throw new Error(`The path params ${o} can't be found in parameters (${r})`);let{name:m,required:i=!1,schema:p}=a.parameter,c=v(x(m),{es5keyword:!0});if(!p)return{name:c,definition:`${c}${i?"":"?"}: unknown`,implementation:`${c}${i?"":"?"}: unknown`,default:!1,required:i,imports:[]};let l=A({schema:p,context:{...s,...a.imports.length?{specKey:a.imports[0].specKey}:{}}}),u=`${c}${!i||l.originalSchema.default?"?":""}: ${l.value}`,f=`${c}${!i&&!l.originalSchema.default?"?":""}${l.originalSchema.default?`= ${_(l.originalSchema.default)}`:`: ${l.value}`}`;return{name:c,definition:u,implementation:f,default:l.originalSchema.default,required:i,imports:l.imports,originalSchema:l.originalSchema}});var Ft=({body:e,queryParams:t,params:r,headers:s})=>{let n={name:e.implementation,definition:`${e.implementation}: ${e.definition}`,implementation:`${e.implementation}: ${e.definition}`,default:!1,required:!0,type:ae.BODY},o={name:"params",definition:`params${_optionalChain([t, 'optionalAccess', _59 => _59.isOptional])?"?":""}: ${_optionalChain([t, 'optionalAccess', _60 => _60.schema, 'access', _61 => _61.name])}`,implementation:`params${_optionalChain([t, 'optionalAccess', _62 => _62.isOptional])?"?":""}: ${_optionalChain([t, 'optionalAccess', _63 => _63.schema, 'access', _64 => _64.name])}`,default:!1,required:pe(_optionalChain([t, 'optionalAccess', _65 => _65.isOptional]))?!1:!_optionalChain([t, 'optionalAccess', _66 => _66.isOptional]),type:ae.QUERY_PARAM},a={name:"headers",definition:`headers${_optionalChain([s, 'optionalAccess', _67 => _67.isOptional])?"?":""}: ${_optionalChain([s, 'optionalAccess', _68 => _68.schema, 'access', _69 => _69.name])}`,implementation:`headers${_optionalChain([s, 'optionalAccess', _70 => _70.isOptional])?"?":""}: ${_optionalChain([s, 'optionalAccess', _71 => _71.schema, 'access', _72 => _72.name])}`,default:!1,required:pe(_optionalChain([s, 'optionalAccess', _73 => _73.isOptional]))?!1:!_optionalChain([s, 'optionalAccess', _74 => _74.isOptional]),type:ae.HEADER},m=[...r.map(p=>({...p,type:ae.PARAM})),...e.definition?[n]:[],...t?[o]:[],...s?[a]:[]];return vt(m)};var _r=(e,t,r)=>e.map(({parameter:s,imports:n})=>{let{name:o,required:a,schema:m,content:i}=s,p=v(`${h(t)}${h(o)}`,{underscore:"_",whitespace:"_",dash:!0,es5keyword:!0,es5IdentifierName:!0}),c=m||i["application/json"].schema,l=A({schema:c,context:r,name:p}),u=Pe(o),f=T(s);if(n.length)return{definition:`${f}${u}${!a||c.default?"?":""}: ${n[0].name};`,imports:n,schemas:[],originalSchema:l.originalSchema};if(l.isEnum&&!l.isRef){let y=p,g=ne(l.value,y,_optionalChain([l, 'access', _75 => _75.originalSchema, 'optionalAccess', _76 => _76["x-enumNames"]]));return{definition:`${f}${u}${!a||c.default?"?":""}: ${y};`,imports:[{name:y}],schemas:[...l.schemas,{name:y,model:g,imports:l.imports}],originalSchema:l.originalSchema}}return{definition:`${f}${u}${!a||c.default?"?":""}: ${l.value};`,imports:l.imports,schemas:l.schemas,originalSchema:l.originalSchema}}),He= exports.getQueryParams =({queryParams:e=[],operationName:t,context:r,suffix:s="params"})=>{if(!e.length)return;let n=_r(e,t,r),o=n.flatMap(({imports:l})=>l),a=n.flatMap(({schemas:l})=>l),m=`${h(t)}${h(s)}`,i=n.map(({definition:l})=>l).join(`

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@orval/core",
-  "version": "6.14.3",
+  "version": "6.14.4",
   "license": "MIT",
   "main": "./dist/index.js",
   "types": "./dist/index.d.ts",