express-zod-api 30.0.1 → 30.0.3

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.
package/CHANGELOG.md CHANGED
@@ -2,6 +2,16 @@
2
2
 
3
3
  ## Version 30
4
4
 
5
+ ### v30.0.3
6
+
7
+ - Fixed the Integration generator to escape the `*/` sequence in JSDoc (from schema descriptions):
8
+ - The issue was found and reported by [@trackoor](https://github.com/trackoor).
9
+
10
+ ### v30.0.2
11
+
12
+ - Fixed the Integration generator for tuples with a rest element (missing array type):
13
+ - The issue was found and reported by [@trackoor](https://github.com/trackoor).
14
+
5
15
  ### v30.0.1
6
16
 
7
17
  - Fixed the Integration generator to handle `z.literal()` with a negative numeric argument:
package/dist/index.js CHANGED
@@ -3,4 +3,4 @@ import{A as e,B as t,C as n,D as r,E as i,H as a,L as o,M as s,O as c,P as l,Q a
3
3
  `+i.join(`
4
4
  `)+`
5
5
 
6
- `)},$=e=>{e.startupLogo!==!1&&pt(process.stdout);let t=e.errorHandler||N,n=Ve(e.logger)?e.logger:new q(e.logger);n.debug(`Running`,{build:`v30.0.1`,env:u.env}),u.isProduction&&n instanceof q&&n.warn(`Using the built-in logger in production may degrade performance due to synchronous printing. Consider installing a professional logging solution, such as Pino or Winston.`),dt(n);let r=ct({logger:n,config:e}),i={getLogger:lt(n),errorHandler:t},a=tt(i),o=et(i);return{...i,logger:n,notFoundHandler:a,catcher:o,loggingMiddleware:r}},mt=(e,t)=>{let{logger:n,getLogger:r,notFoundHandler:i,loggingMiddleware:a}=$(e),o=e.app.use(a);return e.cors&&o.use(it(e.cors)),Y({app:o,routing:t,getLogger:r,config:e}),{notFoundHandler:i,logger:n}},ht=(e,t)=>{let{logger:n,getLogger:r,notFoundHandler:i,catcher:a,loggingMiddleware:o}=$(e),s=j().disable(`x-powered-by`).set(`query parser`,e.queryParser??`simple`).use(o);if(e.beforeParsers?.({app:s,getLogger:r}),e.compression){let t=T(`compression`);s.use(t(typeof e.compression==`object`?e.compression:void 0))}return e.cookies&&s.use(rt({config:e})),e.cors&&s.use(it(e.cors)),s.use(e.jsonParser||j.json()).use(e.formParser||j.urlencoded()).use(e.rawParser||j.raw(),st),e.upload&&s.use(...ot({config:e,getLogger:r})),e.beforeRouting?.({app:s,getLogger:r}),Y({app:s,routing:t,getLogger:r,config:e}),e.afterRouting?.({app:s,getLogger:r}),s.use(a,i),{app:s,logger:n}},gt=(e,t)=>{let{app:n,logger:r}=ht(e,t),i=[],a=(e,t)=>()=>e.listen(t,()=>r.info(`Listening`,t)),o=[];if(e.http){let t=Te.createServer(n);i.push(t),o.push(a(t,e.http.listen))}if(e.https){let t=Ee.createServer(e.https.options,n);i.push(t),o.push(a(t,e.https.listen))}return i.length||r.warn(`No servers configured.`),e.gracefulShutdown&&ft({logger:r,servers:i,options:e.gracefulShutdown===!0?{}:e.gracefulShutdown}),{app:n,logger:r,servers:o.map(e=>e())}},_t=e=>Oe({...e,headers:{"content-type":b.json,...e?.headers}}),vt=e=>ke(e),yt=e=>{let t={warn:[],error:[],info:[],debug:[]};return new Proxy(e||{},{get(e,n,r){return n===`_getLogs`?()=>t:G(n)?(...e)=>t[n].push(e):Reflect.get(e,n,r)},has(e,t){return G(t)||t===`_getLogs`?!0:Reflect.has(e,t)}})},bt=({requestProps:e,responseOptions:t,configProps:n,loggerProps:r})=>{let i=_t(e),a=vt({req:i,...t});a.req=t?.req||i,i.res=a;let o=yt(r);return{requestMock:i,responseMock:a,loggerMock:o,configMock:{cors:!1,logger:o,...n}}},xt=async({endpoint:e,...t})=>{let{requestMock:n,responseMock:r,loggerMock:i,configMock:a}=bt(t);return await e.execute({request:n,response:r,config:a,logger:i}),{requestMock:n,responseMock:r,loggerMock:i}},St=async({middleware:e,ctx:t={},...n})=>{let{configMock:r,...i}=bt(n),{inputSources:o,errorHandler:s=N}=r,c=a(i.requestMock,o),l={request:i.requestMock,response:i.responseMock,logger:i.loggerMock,input:c,ctx:t};try{let t=await e.execute({...l,config:r});return{...i,output:t}}catch(e){return await s.execute({...l,error:p(e),output:null}),{...i,output:{}}}},Ct=(e,t)=>D.object({data:t,event:D.literal(e),id:D.string().optional(),retry:D.int().positive().optional()}),wt=/[\r\n\0]/g,Tt=({events:e,event:t,data:n,id:r,retry:i})=>{if(!Object.prototype.hasOwnProperty.call(e,t))throw Error(`Unknown event: ${t}`);let a=e[t].parse(n),o=`event: ${t}\n`;return r!==void 0&&(o+=`id: ${r}\n`),i!==void 0&&(o+=`retry: ${i}\n`),o+`data: ${JSON.stringify(a)}\n\n`},Et=e=>e.headersSent||e.writeHead(200,{connection:`keep-alive`,"content-type":b.sse,"cache-control":`no-cache`}),Dt=(e,{eventId:t=!1,retry:n}={})=>{let r=0,i;if(n!==void 0&&!(Number.isInteger(n)&&n>0))throw Error(`Invalid SSE retry value "${n}": must be a positive integer.`);return t&&(i=typeof t==`function`?(e,n)=>t(e,n).replace(wt,``):(e,t)=>`${e}##${t}`),new _({handler:async({request:t,response:a})=>{let o=new AbortController,s=setTimeout(()=>Et(a),1e4);return t.once(`close`,()=>{clearTimeout(s),o.abort()}),{isClosed:()=>a.writableEnded||a.closed,signal:o.signal,lastEventId:i&&t.get(`last-event-id`),emit:(t,o)=>{Et(a);let s=Tt({events:e,data:o,retry:n,id:i&&i(String(t),++r),event:String(t)});a.write(s,`utf-8`),a.flush?.()}}}})},Ot=e=>new M({positive:()=>{let[t,...n]=Object.entries(e).map(([e,t])=>Ct(e,t));if(!t)throw new c(/* @__PURE__ */ Error(`At least one SSE event is required.`));return{mimeType:b.sse,schema:n.length?D.discriminatedUnion(`event`,[t,...n]):t}},negative:{mimeType:`text/plain`,schema:D.string()},handler:async({response:e,error:t,logger:n,request:r,input:i})=>{if(t){let a=x(t);v(a,n,r,i),e.headersSent||e.status(a.statusCode).type(`text/plain`).write(m(a),`utf-8`)}e.end()}});var kt=class extends H{constructor(e,t){let n=Object.fromEntries(Object.entries(e).map(([e,t])=>{if(e.match(wt))throw Error(`Invalid SSE event name "${e}": must not contain line breaks or null characters.`);return[e,w(t)]}));super(Ot(n)),this.middlewares=[Dt(n,t)]}};const At=[`total`,`limit`,`offset`],jt=[`nextCursor`,`limit`];function Mt({style:e,itemSchema:t,itemsName:n=`items`,maxLimit:r=100,defaultLimit:i=20}){if(!Number.isInteger(r)||r<1)throw Error(`ez.paginated: maxLimit must be a positive integer`);if(!Number.isInteger(i)||i<1)throw Error(`ez.paginated: defaultLimit must be a positive integer`);if(i>r)throw Error(`ez.paginated: defaultLimit must not be greater than maxLimit`);if(e===`offset`&&At.includes(n))throw Error(`ez.paginated: itemsName must not match reserved keys for offset output (${At.join(`, `)})`);if(e===`cursor`&&jt.includes(n))throw Error(`ez.paginated: itemsName must not match reserved keys for cursor output (${jt.join(`, `)})`);let a=D.coerce.number().int().min(1).max(r).default(i).describe(`Page size (number of ${n} per page)`);if(e===`offset`){let e=D.coerce.number().int().min(0).default(0).describe(`Number of ${n} to skip`);return{input:D.object({limit:a,offset:e}),output:D.object({[n]:D.array(t).describe(`Page of ${n}`),total:D.number().int().min(0).describe(`Total number of ${n}`),limit:D.number().int().min(1).describe(`Page size used`),offset:D.number().int().min(0).describe(`Offset used`)})}}let o=D.string().optional().describe(`Cursor for the next page; omit for first page`);return{input:D.object({cursor:o,limit:a}),output:D.object({[n]:D.array(t).describe(`Page of ${n}`),nextCursor:D.string().nullable().describe(`Cursor for the next page, or null if no more pages`),limit:D.number().int().min(1).describe(`Page size used`)})}}const Nt={dateIn:s,dateOut:e,form:te,upload:n,raw:ue,buffer:l,paginated:Mt};export{q as BuiltinLogger,H as EndpointsFactory,kt as EventStreamFactory,d as InputValidationError,_ as Middleware,i as MissingPeerError,r as OutputValidationError,M as ResultHandler,ie as RoutingError,ne as ServeStatic,Be as arrayEndpointsFactory,L as arrayResultHandler,mt as attachRouting,re as createApiResponse,z as createCacheMiddleware,Ae as createConfig,B as createCookieMiddleware,V as createRateLimitMiddleware,gt as createServer,Re as defaultEndpointsFactory,N as defaultResultHandler,x as ensureHttpError,Nt as ez,ee as getMessageFromError,ze as legacyEndpointsFactory,F as legacyResultHandler,xt as testEndpoint,St as testMiddleware};
6
+ `)},$=e=>{e.startupLogo!==!1&&pt(process.stdout);let t=e.errorHandler||N,n=Ve(e.logger)?e.logger:new q(e.logger);n.debug(`Running`,{build:`v30.0.3`,env:u.env}),u.isProduction&&n instanceof q&&n.warn(`Using the built-in logger in production may degrade performance due to synchronous printing. Consider installing a professional logging solution, such as Pino or Winston.`),dt(n);let r=ct({logger:n,config:e}),i={getLogger:lt(n),errorHandler:t},a=tt(i),o=et(i);return{...i,logger:n,notFoundHandler:a,catcher:o,loggingMiddleware:r}},mt=(e,t)=>{let{logger:n,getLogger:r,notFoundHandler:i,loggingMiddleware:a}=$(e),o=e.app.use(a);return e.cors&&o.use(it(e.cors)),Y({app:o,routing:t,getLogger:r,config:e}),{notFoundHandler:i,logger:n}},ht=(e,t)=>{let{logger:n,getLogger:r,notFoundHandler:i,catcher:a,loggingMiddleware:o}=$(e),s=j().disable(`x-powered-by`).set(`query parser`,e.queryParser??`simple`).use(o);if(e.beforeParsers?.({app:s,getLogger:r}),e.compression){let t=T(`compression`);s.use(t(typeof e.compression==`object`?e.compression:void 0))}return e.cookies&&s.use(rt({config:e})),e.cors&&s.use(it(e.cors)),s.use(e.jsonParser||j.json()).use(e.formParser||j.urlencoded()).use(e.rawParser||j.raw(),st),e.upload&&s.use(...ot({config:e,getLogger:r})),e.beforeRouting?.({app:s,getLogger:r}),Y({app:s,routing:t,getLogger:r,config:e}),e.afterRouting?.({app:s,getLogger:r}),s.use(a,i),{app:s,logger:n}},gt=(e,t)=>{let{app:n,logger:r}=ht(e,t),i=[],a=(e,t)=>()=>e.listen(t,()=>r.info(`Listening`,t)),o=[];if(e.http){let t=Te.createServer(n);i.push(t),o.push(a(t,e.http.listen))}if(e.https){let t=Ee.createServer(e.https.options,n);i.push(t),o.push(a(t,e.https.listen))}return i.length||r.warn(`No servers configured.`),e.gracefulShutdown&&ft({logger:r,servers:i,options:e.gracefulShutdown===!0?{}:e.gracefulShutdown}),{app:n,logger:r,servers:o.map(e=>e())}},_t=e=>Oe({...e,headers:{"content-type":b.json,...e?.headers}}),vt=e=>ke(e),yt=e=>{let t={warn:[],error:[],info:[],debug:[]};return new Proxy(e||{},{get(e,n,r){return n===`_getLogs`?()=>t:G(n)?(...e)=>t[n].push(e):Reflect.get(e,n,r)},has(e,t){return G(t)||t===`_getLogs`?!0:Reflect.has(e,t)}})},bt=({requestProps:e,responseOptions:t,configProps:n,loggerProps:r})=>{let i=_t(e),a=vt({req:i,...t});a.req=t?.req||i,i.res=a;let o=yt(r);return{requestMock:i,responseMock:a,loggerMock:o,configMock:{cors:!1,logger:o,...n}}},xt=async({endpoint:e,...t})=>{let{requestMock:n,responseMock:r,loggerMock:i,configMock:a}=bt(t);return await e.execute({request:n,response:r,config:a,logger:i}),{requestMock:n,responseMock:r,loggerMock:i}},St=async({middleware:e,ctx:t={},...n})=>{let{configMock:r,...i}=bt(n),{inputSources:o,errorHandler:s=N}=r,c=a(i.requestMock,o),l={request:i.requestMock,response:i.responseMock,logger:i.loggerMock,input:c,ctx:t};try{let t=await e.execute({...l,config:r});return{...i,output:t}}catch(e){return await s.execute({...l,error:p(e),output:null}),{...i,output:{}}}},Ct=(e,t)=>D.object({data:t,event:D.literal(e),id:D.string().optional(),retry:D.int().positive().optional()}),wt=/[\r\n\0]/g,Tt=({events:e,event:t,data:n,id:r,retry:i})=>{if(!Object.prototype.hasOwnProperty.call(e,t))throw Error(`Unknown event: ${t}`);let a=e[t].parse(n),o=`event: ${t}\n`;return r!==void 0&&(o+=`id: ${r}\n`),i!==void 0&&(o+=`retry: ${i}\n`),o+`data: ${JSON.stringify(a)}\n\n`},Et=e=>e.headersSent||e.writeHead(200,{connection:`keep-alive`,"content-type":b.sse,"cache-control":`no-cache`}),Dt=(e,{eventId:t=!1,retry:n}={})=>{let r=0,i;if(n!==void 0&&!(Number.isInteger(n)&&n>0))throw Error(`Invalid SSE retry value "${n}": must be a positive integer.`);return t&&(i=typeof t==`function`?(e,n)=>t(e,n).replace(wt,``):(e,t)=>`${e}##${t}`),new _({handler:async({request:t,response:a})=>{let o=new AbortController,s=setTimeout(()=>Et(a),1e4);return t.once(`close`,()=>{clearTimeout(s),o.abort()}),{isClosed:()=>a.writableEnded||a.closed,signal:o.signal,lastEventId:i&&t.get(`last-event-id`),emit:(t,o)=>{Et(a);let s=Tt({events:e,data:o,retry:n,id:i&&i(String(t),++r),event:String(t)});a.write(s,`utf-8`),a.flush?.()}}}})},Ot=e=>new M({positive:()=>{let[t,...n]=Object.entries(e).map(([e,t])=>Ct(e,t));if(!t)throw new c(/* @__PURE__ */ Error(`At least one SSE event is required.`));return{mimeType:b.sse,schema:n.length?D.discriminatedUnion(`event`,[t,...n]):t}},negative:{mimeType:`text/plain`,schema:D.string()},handler:async({response:e,error:t,logger:n,request:r,input:i})=>{if(t){let a=x(t);v(a,n,r,i),e.headersSent||e.status(a.statusCode).type(`text/plain`).write(m(a),`utf-8`)}e.end()}});var kt=class extends H{constructor(e,t){let n=Object.fromEntries(Object.entries(e).map(([e,t])=>{if(e.match(wt))throw Error(`Invalid SSE event name "${e}": must not contain line breaks or null characters.`);return[e,w(t)]}));super(Ot(n)),this.middlewares=[Dt(n,t)]}};const At=[`total`,`limit`,`offset`],jt=[`nextCursor`,`limit`];function Mt({style:e,itemSchema:t,itemsName:n=`items`,maxLimit:r=100,defaultLimit:i=20}){if(!Number.isInteger(r)||r<1)throw Error(`ez.paginated: maxLimit must be a positive integer`);if(!Number.isInteger(i)||i<1)throw Error(`ez.paginated: defaultLimit must be a positive integer`);if(i>r)throw Error(`ez.paginated: defaultLimit must not be greater than maxLimit`);if(e===`offset`&&At.includes(n))throw Error(`ez.paginated: itemsName must not match reserved keys for offset output (${At.join(`, `)})`);if(e===`cursor`&&jt.includes(n))throw Error(`ez.paginated: itemsName must not match reserved keys for cursor output (${jt.join(`, `)})`);let a=D.coerce.number().int().min(1).max(r).default(i).describe(`Page size (number of ${n} per page)`);if(e===`offset`){let e=D.coerce.number().int().min(0).default(0).describe(`Number of ${n} to skip`);return{input:D.object({limit:a,offset:e}),output:D.object({[n]:D.array(t).describe(`Page of ${n}`),total:D.number().int().min(0).describe(`Total number of ${n}`),limit:D.number().int().min(1).describe(`Page size used`),offset:D.number().int().min(0).describe(`Offset used`)})}}let o=D.string().optional().describe(`Cursor for the next page; omit for first page`);return{input:D.object({cursor:o,limit:a}),output:D.object({[n]:D.array(t).describe(`Page of ${n}`),nextCursor:D.string().nullable().describe(`Cursor for the next page, or null if no more pages`),limit:D.number().int().min(1).describe(`Page size used`)})}}const Nt={dateIn:s,dateOut:e,form:te,upload:n,raw:ue,buffer:l,paginated:Mt};export{q as BuiltinLogger,H as EndpointsFactory,kt as EventStreamFactory,d as InputValidationError,_ as Middleware,i as MissingPeerError,r as OutputValidationError,M as ResultHandler,ie as RoutingError,ne as ServeStatic,Be as arrayEndpointsFactory,L as arrayResultHandler,mt as attachRouting,re as createApiResponse,z as createCacheMiddleware,Ae as createConfig,B as createCookieMiddleware,V as createRateLimitMiddleware,gt as createServer,Re as defaultEndpointsFactory,N as defaultResultHandler,x as ensureHttpError,Nt as ez,ee as getMessageFromError,ze as legacyEndpointsFactory,F as legacyResultHandler,xt as testEndpoint,St as testMiddleware};
@@ -6,7 +6,7 @@ import{$ as e,F as t,I as n,J as r,K as i,N as a,Y as o,b as s,j as c,n as l,p a
6
6
  `)};makeDefaultImplementation=e=>{let t=`${x.method}, ${x.path}, ${x.params}, ${x.ctx}`,n=C([`get`,`head`,`delete`]).join(`, `),r=`!${x.hasBody} || ${x.hasFiles} ? ${x.undefined} : { "Content-Type": ${x.isBlob} ? "${f.raw}" : "${f.json}" };`,i=`${x.response}.${w(`headers`)}.${w(`get`)}("content-type")`,a=`\`?\${new ${URLSearchParams.name}(${x.params})}\``;return[`const ${x.defaultImplementation}: ${x.Implementation}<${x.DefaultContext}> = async (${t}) => {`,` const ${x.isBlob} = ${x.params} instanceof Blob;`,` const ${x.hasFiles} = !${x.isBlob} && Object.${w(`values`)}(${x.params}).${w(`some`)}((one) => one instanceof Blob || one instanceof ${x.File});`,` const ${x.hasBody} = ![${n}].includes(${x.method});`,` const ${x.searchParams} = ${x.isBlob} || ${x.hasBody} ? "" : ${a};`,` const ${x.headers} = ${r}`,` let ${x.body}: RequestInit["${x.body}"] = ${x.undefined};`,` if (${x.hasBody}) {`,` if (${x.isBlob}) {`,` ${x.body} = ${x.params};`,` } else if (${x.hasFiles}) {`,` ${x.body} = new ${FormData.name}();`,` for (const [${x.key}, ${x.value}] of Object.${w(`entries`)}(${x.params}))`,` if (${x.value} !== undefined) ${x.body}.${w(`append`)}(${x.key}, ${x.value});`,` } else {`,` ${x.body} = JSON.${w(`stringify`)}(${x.params});`,` }`,` }`,` let init: RequestInit = {`,` ${w(`method`)}: ${x.method}.${w(`toUpperCase`)}(),`,` ${w(`credentials`)}: ${e?`"include"`:x.undefined},`,` ${x.headers},`,` ${x.body},`,` };`,` if (${x.ctx}?.${x.override}) init = ${x.ctx}.${x.override}(init);`,` const ${x.response} = await ${fetch.name}(`,` new ${URL.name}(\`\${${x.path}}\${${x.searchParams}}\`, "${this.serverUrl}"),`,` init,`,` );`,` const { ${w(`status`)} } = ${x.response};`,` const ${x.contentType} = ${i};`,` if (${x.method} === "head" || !${x.contentType}) return { ${w(`status`)}, data: undefined };`,` const ${x.data} = await (${x.contentType}.${w(`startsWith`)}("${f.json}") ?`,` ${x.response}.${w(`json`)}() : `,` ${x.contentType}.${w(`startsWith`)}("text/") ? `,` ${x.response}.${w(`text`)}() : `,` ${x.response}.${w(`blob`)}());`,` return { ${w(`status`)}, ${x.data} };`,`};`].join(`
7
7
  `)};makeSubscriptionClass=(e,t)=>{let n=`${x.substitute}(${x.parseRequest}(${x.request})[1], ${x.params})`,r=`Extract<R, { ${w(`event`)}: E }>["${w(`data`)}"]`,i=`(${x.msg} as ${MessageEvent.name}).${w(`data`)}`;return[`export class ${e}<`,` K extends Extract<${x.Request}, \`get \${string}\`>,`,` R extends Extract<${S.positive}[K], { ${w(`event`)}: string }>,`,`> {`,` public ${x.source}: EventSource;`,` public constructor(${x.request}: K, ${x.params}: ${S.input}[K]) {`,` const [${x.path}, ${x.rest}] = ${n};`,` const ${x.searchParams} = \`?\${new ${URLSearchParams.name}(${x.rest})}\`;`,` this.${x.source} = new EventSource(`,` new URL(\`\${${x.path}}\${${x.searchParams}}\`, "${this.serverUrl}"),`,` { ${w(`withCredentials`)}: ${t?`true`:x.undefined} }`,` );`,` }`,` public ${x.on}<E extends R["${w(`event`)}"]>(`,` ${w(`event`)}: E,`,` ${x.handler}: (${x.data}: ${r}) => void | Promise<void>,`,` ) {`,` this.${x.source}.${w(`addEventListener`)}(${x.event}, (${x.msg}) =>`,` ${x.handler}(JSON.${w(`parse`)}(${i})),`,` );`,` return this;`,` }`,`}`].join(`
8
8
  `)};makeUsageStatements=(e,t)=>[`const ${x.client} = new ${e}();`,`const { ${w(`status`)}, ${x.discriminator}, ${x.data} } = await ${x.client}.${x.provide}("get /v1/user/retrieve", { id: "10" });`,`if (${w(`status`)} === 200) console.log(${x.data}.name); // success`,`else if (${w(`status`)} === 400 || ${x.discriminator} === "${T.error}") console.error(${x.data}.message); // error`,`new ${t}("get /v1/events/stream", {}).${x.on}("time", (time) => {});`].join(`
9
- `)};const E=b.factory,D=/^[A-Za-z_$][A-Za-z0-9_$]*$/,O=/* @__PURE__ */ new Set([b.SyntaxKind.AnyKeyword,b.SyntaxKind.BigIntKeyword,b.SyntaxKind.BooleanKeyword,b.SyntaxKind.NeverKeyword,b.SyntaxKind.NumberKeyword,b.SyntaxKind.ObjectKeyword,b.SyntaxKind.StringKeyword,b.SyntaxKind.SymbolKeyword,b.SyntaxKind.UndefinedKeyword,b.SyntaxKind.UnknownKeyword,b.SyntaxKind.VoidKeyword]),k=e=>typeof e==`number`?e<0?E.createPrefixUnaryExpression(b.SyntaxKind.MinusToken,E.createNumericLiteral(-e)):E.createNumericLiteral(e):typeof e==`bigint`?E.createBigIntLiteral(e.toString()):typeof e==`boolean`?e?E.createTrue():E.createFalse():e===null?E.createNull():E.createStringLiteral(e),A=e=>E.createIdentifier(e),j=e=>typeof e==`string`&&D.test(e)?A(e):k(e.toString()),M=(e,t)=>typeof e==`number`?E.createKeywordTypeNode(e):typeof e==`string`||b.isIdentifier(e)?E.createTypeReferenceNode(e,t&&y.map(M,t)):e,N=e=>{let t=/* @__PURE__ */ new Map;for(let n of e)t.set(te(n)?n.kind:n,n);return E.createUnionTypeNode(Array.from(t.values()))},te=e=>O.has(e.kind),ne=(e,t)=>b.addSyntheticLeadingComment(e,b.SyntaxKind.MultiLineCommentTrivia,`* ${t} `,!0),P=(e,t)=>{let n=b.createSourceFile(`print.ts`,``,b.ScriptTarget.Latest,!1,b.ScriptKind.TS);return b.createPrinter(t).printNode(b.EmitHint.Unspecified,e,n)},re=(e,t,{isOptional:n,hasUndefined:r=n,isDeprecated:i,comment:a}={})=>{let o=M(t),s=E.createPropertySignature(void 0,j(e),n?E.createToken(b.SyntaxKind.QuestionToken):void 0,r?N([o,M(b.SyntaxKind.UndefinedKeyword)]):o),c=y.reject(y.isNil,[i?`@deprecated`:void 0,a]);return c.length?ne(s,c.join(` `)):s},F=e=>E.createLiteralTypeNode(k(e)),I=(e,{rules:t,onMissing:r,ctx:i={}})=>{let a=n(e),o=a&&a in t?t[a]:t[e._zod.def.type],s=e=>I(e,{ctx:i,rules:t,onMissing:r});return o?o(e,{...i,next:s}):r(e,i)},L={name:y.path([`name`,`text`]),type:y.path([`type`]),optional:y.path([`questionToken`])},R=({_zod:{def:e}})=>{let t=e.values.map(e=>e===void 0?M(b.SyntaxKind.UndefinedKeyword):F(e));return t.length===1?t[0]:N(t)},z=({_zod:{def:e}},{next:t})=>{let{parts:n}=e,i=0,a=()=>{let e=``;for(;i<n.length;){let t=n[i];if(r(t))break;i++,e+=t??``}return e},o=E.createTemplateHead(a()),s=[];for(;i<n.length;){let e=t(n[i++]),r=a(),o=i<n.length?E.createTemplateMiddle:E.createTemplateTail;s.push(E.createTemplateLiteralTypeSpan(e,o(r)))}return s.length?E.createTemplateLiteralType(o,s):F(o.text)},B=(e,{isResponse:t,next:n})=>{let r=Object.entries(e._zod.def.shape).map(([e,r])=>{let{description:i,deprecated:a}=_.get(r)||{},o=(t?r._zod.optout:r._zod.optin)!==void 0,s=o&&!(r instanceof v.core.$ZodExactOptional);return re(e,n(r),{comment:i,isDeprecated:a,isOptional:o,hasUndefined:s})});return E.createTypeLiteralNode(r)},V=({_zod:{def:e}},{next:t})=>E.createArrayTypeNode(t(e.element)),H=({_zod:{def:e}})=>N(y.map(F,Object.values(e.entries))),U=({_zod:{def:e}},{next:t})=>N(e.options.map(t)),W=({_zod:{def:e}},{next:t})=>N([t(e.innerType),F(null)]),G=({_zod:{def:e}},{next:t})=>E.createTupleTypeNode(e.items.map(t).concat(e.rest===null?[]:E.createRestTypeNode(t(e.rest)))),K=({_zod:{def:e}},{next:t})=>{let[n,r]=[e.keyType,e.valueType].map(t),i=M(`Record`,[n,r]);return e.mode===`loose`?E.createIntersectionTypeNode([i,M(`Record`,[`PropertyKey`,r])]):i},q=y.tryCatch(e=>{if(!e.every(b.isTypeLiteralNode))throw Error(`Not objects`);let t=y.chain(y.prop(`members`),e),n=y.uniqWith((...e)=>{if(!y.eqBy(L.name,...e))return!1;if(y.both(y.eqBy(L.type),y.eqBy(L.optional))(...e))return!0;throw Error(`Has conflicting prop`)},t);return E.createTypeLiteralNode(n)},(e,t)=>E.createIntersectionTypeNode(t)),J=({_zod:{def:e}},{next:t})=>q([e.left,e.right].map(t)),Y=e=>()=>M(e),X=({_zod:{def:e}},{next:t})=>t(e.innerType),Z=e=>M(e?b.SyntaxKind.UnknownKeyword:b.SyntaxKind.AnyKeyword),ie=({_zod:{def:e}},{next:t,isResponse:n})=>{let a=e[n?`out`:`in`],o=e[n?`in`:`out`];if(!r(a,`transform`))return t(a);let s=t(o),c={[b.SyntaxKind.AnyKeyword]:``,[b.SyntaxKind.BigIntKeyword]:BigInt(0),[b.SyntaxKind.BooleanKeyword]:!1,[b.SyntaxKind.NumberKeyword]:0,[b.SyntaxKind.ObjectKeyword]:{},[b.SyntaxKind.StringKeyword]:``,[b.SyntaxKind.UndefinedKeyword]:void 0}[s.kind],l=i(a,c),u={number:b.SyntaxKind.NumberKeyword,bigint:b.SyntaxKind.BigIntKeyword,boolean:b.SyntaxKind.BooleanKeyword,string:b.SyntaxKind.StringKeyword,undefined:b.SyntaxKind.UndefinedKeyword,object:b.SyntaxKind.ObjectKeyword};return M(l&&u[l]||Z(n))},ae=()=>F(null),oe=({_zod:{def:e}},{next:t})=>t(e.getter()),se=()=>M(`Blob`),Q=(e,{next:t})=>t(e._zod.def.shape.raw),ce={string:Y(b.SyntaxKind.StringKeyword),number:Y(b.SyntaxKind.NumberKeyword),bigint:Y(b.SyntaxKind.BigIntKeyword),boolean:Y(b.SyntaxKind.BooleanKeyword),any:Y(b.SyntaxKind.AnyKeyword),undefined:Y(b.SyntaxKind.UndefinedKeyword),[a]:Y(b.SyntaxKind.StringKeyword),[c]:Y(b.SyntaxKind.StringKeyword),never:Y(b.SyntaxKind.NeverKeyword),void:Y(b.SyntaxKind.UndefinedKeyword),unknown:Y(b.SyntaxKind.UnknownKeyword),null:ae,array:V,tuple:G,record:K,object:B,literal:R,template_literal:z,intersection:J,union:U,default:X,enum:H,optional:X,nonoptional:X,nullable:W,catch:X,pipe:ie,lazy:oe,readonly:X,[t]:se,[s]:Q},le=e=>(t,n)=>{let i=()=>e(t,n);return r(t,`lazy`)?n.makeAlias(t._zod.def.getter,i):r(t,`object`)&&h(t,{io:n.isResponse?`output`:`input`})?n.makeAlias(t,i):i()},$=(e,{brandHandling:t,ctx:n})=>{let r={...t,...ce};for(let e of[`object`,`lazy`])r[e]=le(r[e]);return I(e,{rules:r,onMissing:({},{isResponse:e})=>Z(e),ctx:n})};var ue=class extends ee{#e=[];#t=/* @__PURE__ */ new Map([[!1,/* @__PURE__ */ new Map],[!0,/* @__PURE__ */ new Map]]);#n;#r(e,t,n){let r=this.#t.get(e),i=r.get(t);if(!i){i=`${e?`Response`:`Input`}Type${r.size+1}`,r.set(t,i);let a=n();this.#e.push(e=>`type ${i} = ${P(a,e)};`)}return M(i)}constructor({routing:t,config:n,brandHandling:r,variant:i=`client`,clientClassName:a=`Client`,subscriptionClassName:s=`Subscription`,serverUrl:c=`https://example.com`,noBodySchema:f=v.undefined(),hasHeadMethod:m=!0,hasCredentials:h=!1}){super(c);let g={brandHandling:r,ctx:{isResponse:!1,makeAlias:this.#r.bind(this,!1)}},_={brandHandling:r,ctx:{isResponse:!0,makeAlias:this.#r.bind(this,!0)}},y=!1,b=(t,n,r)=>{let i=o.bind(null,t,n),{isDeprecated:a,inputSchema:s,tags:c}=r,l=`${t} ${n}`,p=i(`input`),m=d(r.security,`cookie`);m.size&&(y=!0);let h=$(s,g);this.#e.push(e=>{let t=P(h,e);return[`/** ${l} */`,`type ${p} = ${m.size?this.makeOmit(t,m,`security cookies`):t};`].join(`
9
+ `)};const E=b.factory,D=/^[A-Za-z_$][A-Za-z0-9_$]*$/,O=/* @__PURE__ */ new Set([b.SyntaxKind.AnyKeyword,b.SyntaxKind.BigIntKeyword,b.SyntaxKind.BooleanKeyword,b.SyntaxKind.NeverKeyword,b.SyntaxKind.NumberKeyword,b.SyntaxKind.ObjectKeyword,b.SyntaxKind.StringKeyword,b.SyntaxKind.SymbolKeyword,b.SyntaxKind.UndefinedKeyword,b.SyntaxKind.UnknownKeyword,b.SyntaxKind.VoidKeyword]),k=e=>typeof e==`number`?e<0?E.createPrefixUnaryExpression(b.SyntaxKind.MinusToken,E.createNumericLiteral(-e)):E.createNumericLiteral(e):typeof e==`bigint`?E.createBigIntLiteral(e.toString()):typeof e==`boolean`?e?E.createTrue():E.createFalse():e===null?E.createNull():E.createStringLiteral(e),A=e=>E.createIdentifier(e),j=e=>typeof e==`string`&&D.test(e)?A(e):k(e.toString()),M=(e,t)=>typeof e==`number`?E.createKeywordTypeNode(e):typeof e==`string`||b.isIdentifier(e)?E.createTypeReferenceNode(e,t&&y.map(M,t)):e,N=e=>{let t=/* @__PURE__ */ new Map;for(let n of e)t.set(te(n)?n.kind:n,n);return E.createUnionTypeNode(Array.from(t.values()))},te=e=>O.has(e.kind),ne=(e,t)=>b.addSyntheticLeadingComment(e,b.SyntaxKind.MultiLineCommentTrivia,`* ${t.replaceAll(`*/`,`*\\/`)} `,!0),P=(e,t)=>{let n=b.createSourceFile(`print.ts`,``,b.ScriptTarget.Latest,!1,b.ScriptKind.TS);return b.createPrinter(t).printNode(b.EmitHint.Unspecified,e,n)},re=(e,t,{isOptional:n,hasUndefined:r=n,isDeprecated:i,comment:a}={})=>{let o=M(t),s=E.createPropertySignature(void 0,j(e),n?E.createToken(b.SyntaxKind.QuestionToken):void 0,r?N([o,M(b.SyntaxKind.UndefinedKeyword)]):o),c=y.reject(y.isNil,[i?`@deprecated`:void 0,a]);return c.length?ne(s,c.join(` `)):s},F=e=>E.createLiteralTypeNode(k(e)),I=(e,{rules:t,onMissing:r,ctx:i={}})=>{let a=n(e),o=a&&a in t?t[a]:t[e._zod.def.type],s=e=>I(e,{ctx:i,rules:t,onMissing:r});return o?o(e,{...i,next:s}):r(e,i)},L={name:y.path([`name`,`text`]),type:y.path([`type`]),optional:y.path([`questionToken`])},R=({_zod:{def:e}})=>{let t=e.values.map(e=>e===void 0?M(b.SyntaxKind.UndefinedKeyword):F(e));return t.length===1?t[0]:N(t)},z=({_zod:{def:e}},{next:t})=>{let{parts:n}=e,i=0,a=()=>{let e=``;for(;i<n.length;){let t=n[i];if(r(t))break;i++,e+=t??``}return e},o=E.createTemplateHead(a()),s=[];for(;i<n.length;){let e=t(n[i++]),r=a(),o=i<n.length?E.createTemplateMiddle:E.createTemplateTail;s.push(E.createTemplateLiteralTypeSpan(e,o(r)))}return s.length?E.createTemplateLiteralType(o,s):F(o.text)},B=(e,{isResponse:t,next:n})=>{let r=Object.entries(e._zod.def.shape).map(([e,r])=>{let{description:i,deprecated:a}=_.get(r)||{},o=(t?r._zod.optout:r._zod.optin)!==void 0,s=o&&!(r instanceof v.core.$ZodExactOptional);return re(e,n(r),{comment:i,isDeprecated:a,isOptional:o,hasUndefined:s})});return E.createTypeLiteralNode(r)},V=({_zod:{def:e}},{next:t})=>E.createArrayTypeNode(t(e.element)),H=({_zod:{def:e}})=>N(y.map(F,Object.values(e.entries))),U=({_zod:{def:e}},{next:t})=>N(e.options.map(t)),W=({_zod:{def:e}},{next:t})=>N([t(e.innerType),F(null)]),G=({_zod:{def:e}},{next:t})=>{let n=e.items.map(t);return e.rest&&n.push(E.createRestTypeNode(t(v.array(e.rest)))),E.createTupleTypeNode(n)},K=({_zod:{def:e}},{next:t})=>{let[n,r]=[e.keyType,e.valueType].map(t),i=M(`Record`,[n,r]);return e.mode===`loose`?E.createIntersectionTypeNode([i,M(`Record`,[`PropertyKey`,r])]):i},q=y.tryCatch(e=>{if(!e.every(b.isTypeLiteralNode))throw Error(`Not objects`);let t=y.chain(y.prop(`members`),e),n=y.uniqWith((...e)=>{if(!y.eqBy(L.name,...e))return!1;if(y.both(y.eqBy(L.type),y.eqBy(L.optional))(...e))return!0;throw Error(`Has conflicting prop`)},t);return E.createTypeLiteralNode(n)},(e,t)=>E.createIntersectionTypeNode(t)),J=({_zod:{def:e}},{next:t})=>q([e.left,e.right].map(t)),Y=e=>()=>M(e),X=({_zod:{def:e}},{next:t})=>t(e.innerType),Z=e=>M(e?b.SyntaxKind.UnknownKeyword:b.SyntaxKind.AnyKeyword),ie=({_zod:{def:e}},{next:t,isResponse:n})=>{let a=e[n?`out`:`in`],o=e[n?`in`:`out`];if(!r(a,`transform`))return t(a);let s=t(o),c={[b.SyntaxKind.AnyKeyword]:``,[b.SyntaxKind.BigIntKeyword]:BigInt(0),[b.SyntaxKind.BooleanKeyword]:!1,[b.SyntaxKind.NumberKeyword]:0,[b.SyntaxKind.ObjectKeyword]:{},[b.SyntaxKind.StringKeyword]:``,[b.SyntaxKind.UndefinedKeyword]:void 0}[s.kind],l=i(a,c),u={number:b.SyntaxKind.NumberKeyword,bigint:b.SyntaxKind.BigIntKeyword,boolean:b.SyntaxKind.BooleanKeyword,string:b.SyntaxKind.StringKeyword,undefined:b.SyntaxKind.UndefinedKeyword,object:b.SyntaxKind.ObjectKeyword};return M(l&&u[l]||Z(n))},ae=()=>F(null),oe=({_zod:{def:e}},{next:t})=>t(e.getter()),se=()=>M(`Blob`),Q=(e,{next:t})=>t(e._zod.def.shape.raw),ce={string:Y(b.SyntaxKind.StringKeyword),number:Y(b.SyntaxKind.NumberKeyword),bigint:Y(b.SyntaxKind.BigIntKeyword),boolean:Y(b.SyntaxKind.BooleanKeyword),any:Y(b.SyntaxKind.AnyKeyword),undefined:Y(b.SyntaxKind.UndefinedKeyword),[a]:Y(b.SyntaxKind.StringKeyword),[c]:Y(b.SyntaxKind.StringKeyword),never:Y(b.SyntaxKind.NeverKeyword),void:Y(b.SyntaxKind.UndefinedKeyword),unknown:Y(b.SyntaxKind.UnknownKeyword),null:ae,array:V,tuple:G,record:K,object:B,literal:R,template_literal:z,intersection:J,union:U,default:X,enum:H,optional:X,nonoptional:X,nullable:W,catch:X,pipe:ie,lazy:oe,readonly:X,[t]:se,[s]:Q},le=e=>(t,n)=>{let i=()=>e(t,n);return r(t,`lazy`)?n.makeAlias(t._zod.def.getter,i):r(t,`object`)&&h(t,{io:n.isResponse?`output`:`input`})?n.makeAlias(t,i):i()},$=(e,{brandHandling:t,ctx:n})=>{let r={...t,...ce};for(let e of[`object`,`lazy`])r[e]=le(r[e]);return I(e,{rules:r,onMissing:({},{isResponse:e})=>Z(e),ctx:n})};var ue=class extends ee{#e=[];#t=/* @__PURE__ */ new Map([[!1,/* @__PURE__ */ new Map],[!0,/* @__PURE__ */ new Map]]);#n;#r(e,t,n){let r=this.#t.get(e),i=r.get(t);if(!i){i=`${e?`Response`:`Input`}Type${r.size+1}`,r.set(t,i);let a=n();this.#e.push(e=>`type ${i} = ${P(a,e)};`)}return M(i)}constructor({routing:t,config:n,brandHandling:r,variant:i=`client`,clientClassName:a=`Client`,subscriptionClassName:s=`Subscription`,serverUrl:c=`https://example.com`,noBodySchema:f=v.undefined(),hasHeadMethod:m=!0,hasCredentials:h=!1}){super(c);let g={brandHandling:r,ctx:{isResponse:!1,makeAlias:this.#r.bind(this,!1)}},_={brandHandling:r,ctx:{isResponse:!0,makeAlias:this.#r.bind(this,!0)}},y=!1,b=(t,n,r)=>{let i=o.bind(null,t,n),{isDeprecated:a,inputSchema:s,tags:c}=r,l=`${t} ${n}`,p=i(`input`),m=d(r.security,`cookie`);m.size&&(y=!0);let h=$(s,g);this.#e.push(e=>{let t=P(h,e);return[`/** ${l} */`,`type ${p} = ${m.size?this.makeOmit(t,m,`security cookies`):t};`].join(`
10
10
  `)});let v={positive:/* @__PURE__ */ new Set,negative:/* @__PURE__ */ new Set,encoded:/* @__PURE__ */ new Set};for(let n of u){let a=r.getResponses(n);for(let[r,{schema:o,mimeTypes:s,statusCodes:c}]of a.entries()){let a=e(t,s),u=i(n,`variant`,`${r+1}`),d=$(a?o:f,_);this.#e.push(e=>`/** ${l} */\ntype ${u} = ${P(d,e)};`),v[n].add(u),v.encoded.add(this.makeDiscriminator(c,n,u))}}this.paths.add(n);let b={input:p,positive:Array.from(v.positive).join(` | `),negative:Array.from(v.negative).join(` | `),response:`${S.encoded}["${l}"]["data"]`,encoded:Array.from(v.encoded).join(` | `)};this.registry.set(l,{isDeprecated:a,store:b}),this.tags.set(l,c)};p({routing:t,config:n,onEndpoint:m?l(b):b}),this.#e.push(this.makePathType(),this.makeMethodType(),...this.makePublicInterfaces(),this.makeRequestType()),i!==`types`&&(this.#e.push(this.makeEndpointTags(),this.makeParseRequestFn(),this.makeSubstituteFn(),this.makeImplementationType(),this.makePaginationType(),this.makeDefaultContextType(),this.makeDefaultImplementation(h&&y),this.makeClientClass(a),this.makeSubscriptionClass(s,h&&y)),this.#n=this.makeUsageStatements(a,s))}print(e){let t=this.#e.map(t=>typeof t==`function`?t(e):t);return this.#n&&t.push(`// Usage example:\n/*\n${this.#n}*/`),t.join(`
11
11
 
12
12
  `)}async printFormatted({printerOptions:e,format:t}={}){let n=t;if(!n){try{let e=g(`prettier`).format;n=t=>e(t,{filepath:`client.ts`})}catch{}try{let e=g(`oxfmt`).format;n=async t=>{let{code:n,errors:r}=await e(`client.ts`,t);if(r.length)throw Error(`OxFmt failed to format the code`,{cause:r});return n}}catch{}}this.#n&&n&&(this.#n=await n(this.#n));let r=this.print(e);return n?n(r):r}};export{ue as Integration};
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "express-zod-api",
3
- "version": "30.0.1",
3
+ "version": "30.0.3",
4
4
  "description": "A Typescript framework to help you get an API server up and running with I/O schema validation and custom middlewares in minutes.",
5
5
  "license": "MIT",
6
6
  "repository": {