@ez4/gateway 0.26.0 → 0.27.0

package/dist/library.cjs

@@ -12,10 +12,10 @@ InvalidPreferencesTypeError:()=>V,InvalidQueryTypeError:()=>ce,InvalidRequestTyp
 InvalidResponseTypeError:()=>W,InvalidRouteErrorTypeError:()=>P,ServiceType:()=>Me,
 getHttpAuthRequest:()=>Ge,getHttpAuthResponse:()=>Ne,getHttpAuthorizer:()=>We,getHttpBody:()=>oe,
 getHttpCache:()=>Le,getHttpCors:()=>_e,getHttpHandler:()=>Xe,getHttpHandlerRequest:()=>Ke,
-getHttpHandlerResponse:()=>Ve,getHttpHeaders:()=>ee,getHttpIdentity:()=>w,getHttpParameters:()=>Qe,
+getHttpHandlerResponse:()=>Ve,getHttpHeaders:()=>ee,getHttpIdentity:()=>O,getHttpParameters:()=>Qe,
 getHttpQuery:()=>Je,getHttpRoutes:()=>Ze,getHttpServices:()=>er,isHttpService:()=>Lr,
 registerTriggers:()=>dt});module.exports=$r(Tt);var Jr=require("@ez4/common/library"),Gr=require("@ez4/schema/library"),Kr=require("@ez4/project/library");var g=require("@ez4/common/library"),Vr=require("@ez4/reflection");var Me="@ez4/http",Lr=p(e=>e.type===Me,"isHttpService");var rr=require("@ez4/common/library");var N=class extends rr.IncompleteTypeError{static{p(this,"IncompleteServiceError")}constructor(r,t){
-super("Incomplete service",r,t)}};var d=require("@ez4/common/library"),j=require("@ez4/reflection");var M=require("@ez4/common/library"),R=require("@ez4/reflection");var a=require("@ez4/common/library"),v=require("@ez4/reflection");var et=new Set(["ANY","GET","POST","PUT","PATCH","DELETE","OPTIONS"]),tr=p(e=>{let[
+super("Incomplete service",r,t)}};var d=require("@ez4/common/library"),w=require("@ez4/reflection");var M=require("@ez4/common/library"),R=require("@ez4/reflection");var a=require("@ez4/common/library"),v=require("@ez4/reflection");var et=new Set(["ANY","GET","POST","PUT","PATCH","DELETE","OPTIONS"]),tr=p(e=>{let[
 r]=e.split(" ",2);return et.has(r)},"isHttpPath"),or=p(e=>(0,a.isClassDeclaration)(
 e)&&(0,a.hasHeritageType)(e,"Http.Service"),"isHttpService"),nr=p(e=>(0,a.isModelDeclaration)(
 e)&&(0,a.hasHeritageType)(e,"Http.Route"),"isHttpRoute");var pr=p(e=>(0,a.hasHeritageType)(e,"Http.Defaults"),"isHttpDefaults"),sr=p(e=>(0,a.hasHeritageType)(
@@ -43,11 +43,11 @@ i.name,e.file));let l=tt(i,c,r,o,n);l&&Object.assign(s,l)}return(0,be.isEmptyObj
 s)?null:s},"getTypeFromMembers"),tt=p((e,r,t,o,n)=>{let s=(0,S.getPropertyTuple)(
 e)??[],i={};for(let c of s){if(!(0,x.isTypeReference)(c)){n.push(new P(t.file));
 continue}let l=(0,S.getReferenceType)(c,o);if(!l||!(0,x.isTypeClass)(l)){n.push(
-new P(t.file));continue}i[l.name]=r}return i},"getErrorClasses");var hr=p((e,r,t,o)=>{if(!(0,j.isTypeReference)(e))return Hr(e,r,t,o);let n=(0,d.getReferenceType)(
-e,t);return n?Hr(n,r,t,o):null},"getHttpDefaults"),Hr=p((e,r,t,o)=>(0,j.isTypeObject)(
+new P(t.file));continue}i[l.name]=r}return i},"getErrorClasses");var hr=p((e,r,t,o)=>{if(!(0,w.isTypeReference)(e))return Hr(e,r,t,o);let n=(0,d.getReferenceType)(
+e,t);return n?Hr(n,r,t,o):null},"getHttpDefaults"),Hr=p((e,r,t,o)=>(0,w.isTypeObject)(
 e)?br(r,(0,d.getObjectMembers)(e),t,o):(0,d.isModelDeclaration)(e)?pr(e)?br(r,(0,d.getModelMembers)(
 e),t,o):(o.push(new G(e.name,r.file)),null):(o.push(new J(r.file)),null),"getTyp\
-eDefaults"),br=p((e,r,t,o)=>{let n={};for(let s of r)if(!(!(0,j.isModelProperty)(
+eDefaults"),br=p((e,r,t,o)=>{let n={};for(let s of r)if(!(!(0,w.isModelProperty)(
 s)||s.inherited))switch(s.name){default:o.push(new d.InvalidServicePropertyError(
 e.name,s.name,e.file));break;case"httpErrors":n.httpErrors=he(s.value,e,t,o);break;case"\
 preferences":n.preferences=He(s.value,e,t,o);break;case"memory":case"logRetentio\
@@ -63,34 +63,34 @@ ponseTypeError")}};var h=require("@ez4/reflection"),ve=require("@ez4/common/libr
 super("Invalid identity",void 0,"Http.Identity",r)}},_=class extends Ie.IncorrectTypeError{constructor(t,o){
 super("Incorrect identity",t,"Http.Identity",o);this.identityType=t}static{p(this,
 "IncorrectIdentityTypeError")}};var Ee=require("@ez4/schema/library");var f=p((e,r)=>{let t=(0,Ee.getObjectSchema)(e,r);return t&&(0,Ee.isObjectSchema)(
-t)?t:null},"getSchemaFromType");var w=p((e,r,t,o)=>{if((0,h.isTypeUndefined)(e))return null;if(!(0,h.isTypeReference)(
+t)?t:null},"getSchemaFromType");var O=p((e,r,t,o)=>{if((0,h.isTypeUndefined)(e))return null;if(!(0,h.isTypeReference)(
 e))return xr(e,r,t,o);let n=(0,ve.getReferenceType)(e,t);return n?xr(n,r,t,o):null},
 "getHttpIdentity"),xr=p((e,r,t,o)=>{if((0,h.isTypeUnion)(e))return ot(e.elements,
 r,t,o);if((0,h.isTypeObject)(e)||(0,h.isTypeIntersection)(e))return f(e,t);if(!(0,ve.isModelDeclaration)(
 e))return o.push(new Z(r.file)),null;if(!cr(e))return o.push(new _(e.name,r.file)),
 null;let n=f(e,t);return n&&(n.definitions={...n.definitions,extensible:!0}),n},
-"getTypeIdentity"),ot=p((e,r,t,o)=>{let n=[];for(let s of e){let i=w(s,r,t,o);i&&
+"getTypeIdentity"),ot=p((e,r,t,o)=>{let n=[];for(let s of e){let i=O(s,r,t,o);i&&
 n.push(i)}return n.length>1?(0,Ir.createUnionSchema)({elements:n}):n[0]},"getIde\
-ntityFromUnion");var O=require("@ez4/reflection"),Re=require("@ez4/common/library");var Ae=require("@ez4/common/library");var $=class extends Ae.InvalidTypeError{static{p(this,"InvalidHeadersTypeError")}constructor(r){
+ntityFromUnion");var z=require("@ez4/reflection"),Re=require("@ez4/common/library");var Ae=require("@ez4/common/library");var $=class extends Ae.InvalidTypeError{static{p(this,"InvalidHeadersTypeError")}constructor(r){
 super("Invalid headers",void 0,"Http.Headers",r)}},L=class extends Ae.IncorrectTypeError{constructor(t,o){
 super("Incorrect headers",t,"Http.Headers",o);this.headersType=t}static{p(this,"\
-IncorrectHeadersTypeError")}};var ee=p((e,r,t,o)=>{if(!(0,O.isTypeReference)(e))return Er(e,r,t,o);let n=(0,Re.getReferenceType)(
-e,t);return n?Er(n,r,t,o):null},"getHttpHeaders"),Er=p((e,r,t,o)=>(0,O.isTypeObject)(
-e)||(0,O.isTypeIntersection)(e)?f(e,t):(0,Re.isModelDeclaration)(e)?ir(e)?f(e,t):
-(o.push(new L(e.name,r.file)),null):(o.push(new $(r.file)),null),"getTypeHeaders");var z=require("@ez4/schema/library"),je=require("@ez4/common/library"),y=require("@ez4/reflection");var Pe=require("@ez4/common/library");var re=class extends Pe.InvalidTypeError{static{p(this,"InvalidBodyTypeError")}constructor(r){
+IncorrectHeadersTypeError")}};var ee=p((e,r,t,o)=>{if(!(0,z.isTypeReference)(e))return Er(e,r,t,o);let n=(0,Re.getReferenceType)(
+e,t);return n?Er(n,r,t,o):null},"getHttpHeaders"),Er=p((e,r,t,o)=>(0,z.isTypeObject)(
+e)||(0,z.isTypeIntersection)(e)?f(e,t):(0,Re.isModelDeclaration)(e)?ir(e)?f(e,t):
+(o.push(new L(e.name,r.file)),null):(o.push(new $(r.file)),null),"getTypeHeaders");var j=require("@ez4/schema/library"),we=require("@ez4/common/library"),y=require("@ez4/reflection");var Pe=require("@ez4/common/library");var re=class extends Pe.InvalidTypeError{static{p(this,"InvalidBodyTypeError")}constructor(r){
 super("Invalid body",void 0,"Http.JsonBody",r)}},te=class extends Pe.IncorrectTypeError{constructor(t,o){
 super("Incorrect body",t,"Http.JsonBody",o);this.bodyType=t}static{p(this,"Incor\
 rectBodyTypeError")}};var oe=p((e,r,t,o)=>Ue(e,t,n=>Fe(n)??Be(n,r,t,o)),"getHttpBody"),Ue=p((e,r,t)=>{
 if((0,y.isTypeUndefined)(e))return null;if(!(0,y.isTypeReference)(e))return t(e);
-let o=(0,je.getReferenceType)(e,r);return o?t(o):null},"getTypeBody"),Fe=p(e=>(0,y.isTypeScalar)(
-e)?(0,z.getScalarSchema)(e):null,"getScalarTypeBody"),Be=p((e,r,t,o)=>(0,y.isTypeUnion)(
+let o=(0,we.getReferenceType)(e,r);return o?t(o):null},"getTypeBody"),Fe=p(e=>(0,y.isTypeScalar)(
+e)?(0,j.getScalarSchema)(e):null,"getScalarTypeBody"),Be=p((e,r,t,o)=>(0,y.isTypeUnion)(
 e)?nt(e.elements,t,n=>Fe(n)??Be(n,r,t,o)):(0,y.isTypeArray)(e)?pt(e.element,t,n=>Fe(
-n)??Be(n,r,t,o)):(0,y.isTypeObject)(e)||(0,y.isTypeIntersection)(e)?f(e,t):(0,je.isModelDeclaration)(
+n)??Be(n,r,t,o)):(0,y.isTypeObject)(e)||(0,y.isTypeIntersection)(e)?f(e,t):(0,we.isModelDeclaration)(
 e)?ar(e)?f(e,t):(o.push(new te(e.name,e.file)),null):(o.push(new re(r.file)),null),
 "getCompoundTypeBody"),nt=p((e,r,t)=>{let o={optional:!1,elements:[]};for(let n of e){
 if((0,y.isTypeUndefined)(n)){o.optional=!0;continue}let s=Ue(n,r,t);s&&o.elements.
-push(s)}return o.elements.length?(0,z.createUnionSchema)(o):null},"getUnionTypeB\
-ody"),pt=p((e,r,t)=>{let o=Ue(e,r,t);return o?(0,z.createArraySchema)({element:o}):
+push(s)}return o.elements.length?(0,j.createUnionSchema)(o):null},"getUnionTypeB\
+ody"),pt=p((e,r,t)=>{let o=Ue(e,r,t);return o?(0,j.createArraySchema)({element:o}):
 null},"getArrayTypeBody");var Ne=p((e,r,t,o)=>{let n=Pr(e,r,t,o,"Http.AuthResponse");return n&&st(n)?n:null},
 "getHttpAuthResponse"),Ve=p((e,r,t,o)=>{let n=Pr(e,r,t,o,"Http.Response");return n&&
 it(n)?n:null},"getHttpHandlerResponse"),Pr=p((e,r,t,o,n)=>{if(!(0,C.isTypeReference)(
@@ -103,38 +103,38 @@ e,n)?Ar(e,r,(0,T.getModelMembers)(e),t,o):(o.push(new X(e.name,n,e.file)),null):
 if(!(!(0,C.isModelProperty)(i)||i.inherited))switch(i.name){default:n.push(new T.InvalidServicePropertyError(
 r.name,i.name,e.file));break;case"status":s.status=(0,T.getPropertyNumber)(i);break;case"\
 headers":{s.headers=ee(i.value,e,o,n),s.headers&&i.description&&(s.headers.description=
-i.description);break}case"identity":{s.identity=w(i.value,e,o,n),s.identity&&i.description&&
+i.description);break}case"identity":{s.identity=O(i.value,e,o,n),s.identity&&i.description&&
 (s.identity.description=i.description);break}case"body":{s.body=oe(i.value,e,o,n),
 s.body&&i.description&&(s.body.description=i.description);break}}return s},"getT\
-ypeFromMembers");var I=require("@ez4/reflection"),H=require("@ez4/common/library");var we=require("@ez4/common/library");var ne=class extends we.InvalidTypeError{constructor(t,o){super("Invalid route r\
-equest",void 0,t,o);this.baseType=t}static{p(this,"InvalidRequestTypeError")}},pe=class extends we.IncorrectTypeError{constructor(t,o,n){
+ypeFromMembers");var I=require("@ez4/reflection"),H=require("@ez4/common/library");var Oe=require("@ez4/common/library");var ne=class extends Oe.InvalidTypeError{constructor(t,o){super("Invalid route r\
+equest",void 0,t,o);this.baseType=t}static{p(this,"InvalidRequestTypeError")}},pe=class extends Oe.IncorrectTypeError{constructor(t,o,n){
 super("Incorrect route request",t,o,n);this.requestType=t;this.baseType=o}static{
-p(this,"IncorrectRequestTypeError")}};var k=require("@ez4/reflection"),ze=require("@ez4/common/library");var Oe=require("@ez4/common/library");var se=class extends Oe.InvalidTypeError{static{p(this,"InvalidParameterTypeErro\
+p(this,"IncorrectRequestTypeError")}};var k=require("@ez4/reflection"),je=require("@ez4/common/library");var ze=require("@ez4/common/library");var se=class extends ze.InvalidTypeError{static{p(this,"InvalidParameterTypeErro\
 r")}constructor(r){super("Invalid request parameters",void 0,"Http.PathParameter\
-s",r)}},ie=class extends Oe.IncorrectTypeError{constructor(t,o){super("Incorrect\
+s",r)}},ie=class extends ze.IncorrectTypeError{constructor(t,o){super("Incorrect\
  request parameters",t,"Http.PathParameters",o);this.parametersType=t}static{p(this,
-"IncorrectParameterTypeError")}};var Qe=p((e,r,t,o)=>{if(!(0,k.isTypeReference)(e))return jr(e,r,t,o);let n=(0,ze.getReferenceType)(
-e,t);return n?jr(n,r,t,o):null},"getHttpParameters"),jr=p((e,r,t,o)=>(0,k.isTypeObject)(
-e)||(0,k.isTypeIntersection)(e)?f(e,t):(0,ze.isModelDeclaration)(e)?mr(e)?f(e,t):
+"IncorrectParameterTypeError")}};var Qe=p((e,r,t,o)=>{if(!(0,k.isTypeReference)(e))return wr(e,r,t,o);let n=(0,je.getReferenceType)(
+e,t);return n?wr(n,r,t,o):null},"getHttpParameters"),wr=p((e,r,t,o)=>(0,k.isTypeObject)(
+e)||(0,k.isTypeIntersection)(e)?f(e,t):(0,je.isModelDeclaration)(e)?mr(e)?f(e,t):
 (o.push(new ie(e.name,e.file)),null):(o.push(new se(r.file)),null),"getTypeParam\
 eter");var q=require("@ez4/reflection"),ke=require("@ez4/common/library");var Ce=require("@ez4/common/library");var ce=class extends Ce.InvalidTypeError{static{p(this,"InvalidQueryTypeError")}constructor(r){
 super("Invalid request query strings",void 0,"Http.QueryStrings",r)}},le=class extends Ce.IncorrectTypeError{constructor(t,o){
 super("Incorrect request query strings",t,"Http.QueryStrings",o);this.queryType=
-t}static{p(this,"IncorrectQueryTypeError")}};var Je=p((e,r,t,o)=>{if(!(0,q.isTypeReference)(e))return wr(e,r,t,o);let n=(0,ke.getReferenceType)(
-e,t);return n?wr(n,r,t,o):null},"getHttpQuery"),wr=p((e,r,t,o)=>(0,q.isTypeObject)(
+t}static{p(this,"IncorrectQueryTypeError")}};var Je=p((e,r,t,o)=>{if(!(0,q.isTypeReference)(e))return Or(e,r,t,o);let n=(0,ke.getReferenceType)(
+e,t);return n?Or(n,r,t,o):null},"getHttpQuery"),Or=p((e,r,t,o)=>(0,q.isTypeObject)(
 e)||(0,q.isTypeIntersection)(e)?f(e,t):(0,ke.isModelDeclaration)(e)?lr(e)?f(e,t):
 (o.push(new le(e.name,r.file)),null):(o.push(new ce(r.file)),null),"getTypeQuery");var Ge=p((e,r,t,o)=>Ye(e,r,t,o,"Http.AuthRequest"),"getHttpAuthRequest"),Ke=p((e,r,t,o)=>Ye(
 e,r,t,o,"Http.Request"),"getHttpHandlerRequest"),Ye=p((e,r,t,o,n)=>{if((0,I.isTypeIntersection)(
 e)&&e.elements.length>0)return Ye(e.elements[0],r,t,o,n);if(!(0,I.isTypeReference)(
-e))return Or(e,r,t,o,n);let s=(0,H.getReferenceType)(e,t);return s?Or(s,r,t,o,n):
-null},"getHttpRequest"),Or=p((e,r,t,o,n)=>(0,I.isTypeObject)(e)?zr(e,r,(0,H.getObjectMembers)(
-e),t,o):(0,H.isModelDeclaration)(e)?(0,H.hasHeritageType)(e,n)?zr(e,r,(0,H.getModelMembers)(
+e))return zr(e,r,t,o,n);let s=(0,H.getReferenceType)(e,t);return s?zr(s,r,t,o,n):
+null},"getHttpRequest"),zr=p((e,r,t,o,n)=>(0,I.isTypeObject)(e)?jr(e,r,(0,H.getObjectMembers)(
+e),t,o):(0,H.isModelDeclaration)(e)?(0,H.hasHeritageType)(e,n)?jr(e,r,(0,H.getModelMembers)(
 e),t,o):(o.push(new pe(e.name,n,e.file)),null):(o.push(new ne(n,r.file)),null),"\
-getTypeRequest"),zr=p((e,r,t,o,n)=>{let s={};for(let i of t)if(!(!(0,I.isModelProperty)(
+getTypeRequest"),jr=p((e,r,t,o,n)=>{let s={};for(let i of t)if(!(!(0,I.isModelProperty)(
 i)||i.inherited))switch(i.name){default:n.push(new H.InvalidServicePropertyError(
 r.name,i.name,e.file));break;case"headers":{s.headers=ee(i.value,e,o,n),s.headers&&
 i.description&&(s.headers.description=i.description);break}case"identity":{s.identity=
-w(i.value,e,o,n),s.identity&&i.description&&(s.identity.description=i.description);
+O(i.value,e,o,n),s.identity&&i.description&&(s.identity.description=i.description);
 break}case"query":{s.query=Je(i.value,e,o,n),s.query&&i.description&&(s.query.description=
 i.description);break}case"parameters":{s.parameters=Qe(i.value,e,o,n),s.parameters&&
 i.description&&(s.parameters.description=i.description);break}case"body":{s.body=

package/dist/library.d.ts

@@ -1,31 +1,31 @@
-export * from './triggers/register.js';
-export * from './metadata/service.js';
-export * from './metadata/route.js';
-export * from './metadata/handler.js';
-export * from './metadata/identity.js';
-export * from './metadata/authorizer.js';
-export * from './metadata/request.js';
-export * from './metadata/response.js';
-export * from './metadata/headers.js';
-export * from './metadata/parameters.js';
-export * from './metadata/query.js';
-export * from './metadata/body.js';
-export * from './metadata/cors.js';
-export * from './metadata/cache.js';
-export * from './errors/service.js';
-export * from './errors/defaults.js';
-export * from './errors/preferences.js';
-export * from './errors/route.js';
-export * from './errors/handler.js';
-export * from './errors/identity.js';
-export * from './errors/authorizer.js';
-export * from './errors/request.js';
-export * from './errors/response.js';
-export * from './errors/headers.js';
-export * from './errors/parameters.js';
-export * from './errors/query.js';
-export * from './errors/body.js';
-export * from './errors/cors.js';
-export * from './errors/cache.js';
-export * from './types/common.js';
-export * from './types/service.js';
+export * from './triggers/register';
+export * from './metadata/service';
+export * from './metadata/route';
+export * from './metadata/handler';
+export * from './metadata/identity';
+export * from './metadata/authorizer';
+export * from './metadata/request';
+export * from './metadata/response';
+export * from './metadata/headers';
+export * from './metadata/parameters';
+export * from './metadata/query';
+export * from './metadata/body';
+export * from './metadata/cors';
+export * from './metadata/cache';
+export * from './errors/service';
+export * from './errors/defaults';
+export * from './errors/preferences';
+export * from './errors/route';
+export * from './errors/handler';
+export * from './errors/identity';
+export * from './errors/authorizer';
+export * from './errors/request';
+export * from './errors/response';
+export * from './errors/headers';
+export * from './errors/parameters';
+export * from './errors/query';
+export * from './errors/body';
+export * from './errors/cors';
+export * from './errors/cache';
+export * from './types/common';
+export * from './types/service';

package/dist/library.mjs

@@ -4,7 +4,7 @@ getLinkedVariableList as rn,getModelMembers as tn,getPropertyString as on,Invali
 import{isModelProperty as pn}from"@ez4/reflection";var Y="@ez4/http",Tn=p(e=>e.type===Y,"isHttpService");import{IncompleteTypeError as er}from"@ez4/common/library";var d=class extends er{static{p(this,"IncompleteServiceError")}constructor(t,r){
 super("Incomplete service",t,r)}};import{InvalidServicePropertyError as xr,isModelDeclaration as Ir,getPropertyNumber as Er,
 getObjectMembers as vr,getModelMembers as Ar,getServiceListener as Rr,getReferenceType as Pr}from"@ez4/common/library";
-import{isModelProperty as jr,isTypeObject as wr,isTypeReference as Or}from"@ez4/reflection";import{InvalidServicePropertyError as nr,isModelDeclaration as pr,getObjectMembers as sr,
+import{isModelProperty as wr,isTypeObject as Or,isTypeReference as zr}from"@ez4/reflection";import{InvalidServicePropertyError as nr,isModelDeclaration as pr,getObjectMembers as sr,
 getModelMembers as ir,getReferenceType as cr,getPropertyStringIn as lr}from"@ez4/common/library";
 import{isModelProperty as mr,isTypeObject as ar,isTypeReference as ur}from"@ez4/reflection";import{hasHeritageType as a,isClassDeclaration as rr,isModelDeclaration as tr}from"@ez4/common/library";
 import{isTypeCallback as $,isTypeFunction as L}from"@ez4/reflection";var or=new Set(["ANY","GET","POST","PUT","PATCH","DELETE","OPTIONS"]),ee=p(e=>{let[
@@ -30,17 +30,17 @@ let c=parseInt(i.name,10);Tr(c)||n.push(new fr(t.name,i.name,e.file));let l=Sr(i
 c,t,o,n);l&&Object.assign(s,l)}return gr(s)?null:s},"getTypeFromMembers"),Sr=p((e,t,r,o,n)=>{
 let s=dr(e)??[],i={};for(let c of s){if(!Me(c)){n.push(new f(r.file));continue}let l=ge(
 c,o);if(!l||!Hr(l)){n.push(new f(r.file));continue}i[l.name]=t}return i},"getErr\
-orClasses");var he=p((e,t,r,o)=>{if(!Or(e))return He(e,t,r,o);let n=Pr(e,r);return n?He(n,t,
-r,o):null},"getHttpDefaults"),He=p((e,t,r,o)=>wr(e)?be(t,vr(e),r,o):Ir(e)?oe(e)?
+orClasses");var he=p((e,t,r,o)=>{if(!zr(e))return He(e,t,r,o);let n=Pr(e,r);return n?He(n,t,
+r,o):null},"getHttpDefaults"),He=p((e,t,r,o)=>Or(e)?be(t,vr(e),r,o):Ir(e)?oe(e)?
 be(t,Ar(e),r,o):(o.push(new h(e.name,t.file)),null):(o.push(new b(t.file)),null),
-"getTypeDefaults"),be=p((e,t,r,o)=>{let n={};for(let s of t)if(!(!jr(s)||s.inherited))
+"getTypeDefaults"),be=p((e,t,r,o)=>{let n={};for(let s of t)if(!(!wr(s)||s.inherited))
 switch(s.name){default:o.push(new xr(e.name,s.name,e.file));break;case"httpError\
 s":n.httpErrors=H(s.value,e,r,o);break;case"preferences":n.preferences=T(s.value,
 e,r,o);break;case"memory":case"logRetention":case"timeout":n[s.name]=Er(s);break;case"\
 listener":n.listener=Rr(s.value,o);break}return n},"getTypeFromMembers");import{isModelProperty as io,isTypeObject as co,isTypeReference as lo,isTypeTuple as mo}from"@ez4/reflection";
 import{InvalidServicePropertyError as ao,getLinkedVariableList as uo,getPropertyBoolean as fo,
 getPropertyNumber as yo,getPropertyString as To,getObjectMembers as go,getModelMembers as Mo,
-getServiceListener as Ho,getReferenceType as bo,getPropertyTuple as ho}from"@ez4/common/library";import{IncompleteTypeError as zr,TypeError as Cr}from"@ez4/common/library";var S=class extends zr{static{p(this,"IncompleteRouteError")}constructor(t,r){super(
+getServiceListener as Ho,getReferenceType as bo,getPropertyTuple as ho}from"@ez4/common/library";import{IncompleteTypeError as jr,TypeError as Cr}from"@ez4/common/library";var S=class extends jr{static{p(this,"IncompleteRouteError")}constructor(t,r){super(
 "Incomplete gateway route",t,r)}},f=class extends Cr{static{p(this,"InvalidRoute\
 ErrorTypeError")}constructor(t){super("Invalid route error type.",t)}};import{IncompleteTypeError as kr}from"@ez4/common/library";var x=class extends kr{static{p(this,"IncompleteAuthorizerError")}constructor(t,r){
 super("Incomplete route authorizer",t,r)}};import{InvalidServicePropertyError as Ht,isModelDeclaration as bt,hasHeritageType as ht,
@@ -64,53 +64,53 @@ n[0]},"getIdentityFromUnion");import{isTypeIntersection as Lr,isTypeObject as et
 import{getReferenceType as tt,isModelDeclaration as ot}from"@ez4/common/library";import{IncorrectTypeError as _r,InvalidTypeError as $r}from"@ez4/common/library";var R=class extends $r{static{p(this,"InvalidHeadersTypeError")}constructor(t){super(
 "Invalid headers",void 0,"Http.Headers",t)}},P=class extends _r{constructor(r,o){
 super("Incorrect headers",r,"Http.Headers",o);this.headersType=r}static{p(this,"\
-IncorrectHeadersTypeError")}};var j=p((e,t,r,o)=>{if(!rt(e))return xe(e,t,r,o);let n=tt(e,r);return n?xe(n,t,r,
+IncorrectHeadersTypeError")}};var w=p((e,t,r,o)=>{if(!rt(e))return xe(e,t,r,o);let n=tt(e,r);return n?xe(n,t,r,
 o):null},"getHttpHeaders"),xe=p((e,t,r,o)=>et(e)||Lr(e)?m(e,r):ot(e)?pe(e)?m(e,r):
 (o.push(new P(e.name,t.file)),null):(o.push(new R(t.file)),null),"getTypeHeaders");import{createUnionSchema as st,getScalarSchema as it,createArraySchema as ct}from"@ez4/schema/library";
 import{getReferenceType as lt,isModelDeclaration as mt}from"@ez4/common/library";
 import{isTypeArray as at,isTypeIntersection as ut,isTypeObject as ft,isTypeReference as yt,
-isTypeScalar as dt,isTypeUndefined as Ie,isTypeUnion as Tt}from"@ez4/reflection";import{IncorrectTypeError as nt,InvalidTypeError as pt}from"@ez4/common/library";var w=class extends pt{static{p(this,"InvalidBodyTypeError")}constructor(t){super(
-"Invalid body",void 0,"Http.JsonBody",t)}},O=class extends nt{constructor(r,o){super(
+isTypeScalar as dt,isTypeUndefined as Ie,isTypeUnion as Tt}from"@ez4/reflection";import{IncorrectTypeError as nt,InvalidTypeError as pt}from"@ez4/common/library";var O=class extends pt{static{p(this,"InvalidBodyTypeError")}constructor(t){super(
+"Invalid body",void 0,"Http.JsonBody",t)}},z=class extends nt{constructor(r,o){super(
 "Incorrect body",r,"Http.JsonBody",o);this.bodyType=r}static{p(this,"IncorrectBo\
-dyTypeError")}};var z=p((e,t,r,o)=>Z(e,r,n=>W(n)??X(n,t,r,o)),"getHttpBody"),Z=p((e,t,r)=>{if(Ie(
+dyTypeError")}};var j=p((e,t,r,o)=>Z(e,r,n=>W(n)??X(n,t,r,o)),"getHttpBody"),Z=p((e,t,r)=>{if(Ie(
 e))return null;if(!yt(e))return r(e);let o=lt(e,t);return o?r(o):null},"getTypeB\
 ody"),W=p(e=>dt(e)?it(e):null,"getScalarTypeBody"),X=p((e,t,r,o)=>Tt(e)?gt(e.elements,
 r,n=>W(n)??X(n,t,r,o)):at(e)?Mt(e.element,r,n=>W(n)??X(n,t,r,o)):ft(e)||ut(e)?m(
-e,r):mt(e)?le(e)?m(e,r):(o.push(new O(e.name,e.file)),null):(o.push(new w(t.file)),
+e,r):mt(e)?le(e)?m(e,r):(o.push(new z(e.name,e.file)),null):(o.push(new O(t.file)),
 null),"getCompoundTypeBody"),gt=p((e,t,r)=>{let o={optional:!1,elements:[]};for(let n of e){
 if(Ie(n)){o.optional=!0;continue}let s=Z(n,t,r);s&&o.elements.push(s)}return o.elements.
 length?st(o):null},"getUnionTypeBody"),Mt=p((e,t,r)=>{let o=Z(e,t,r);return o?ct(
-{element:o}):null},"getArrayTypeBody");var Ae=p((e,t,r,o)=>{let n=Pe(e,t,r,o,"Http.AuthResponse");return n&&jt(n)?n:null},
+{element:o}):null},"getArrayTypeBody");var Ae=p((e,t,r,o)=>{let n=Pe(e,t,r,o,"Http.AuthResponse");return n&&wt(n)?n:null},
 "getHttpAuthResponse"),Re=p((e,t,r,o)=>{let n=Pe(e,t,r,o,"Http.Response");return n&&
-wt(n)?n:null},"getHttpHandlerResponse"),Pe=p((e,t,r,o,n)=>{if(!Rt(e))return Ee(e,
-t,r,o,n);let s=Et(e,r);return s?Ee(s,t,r,o,n):null},"getHttpResponse"),jt=p(e=>!!e.
-identity,"isValidAuthResponse"),wt=p(e=>Pt(e.status),"isValidHandlerResponse"),Ee=p(
+Ot(n)?n:null},"getHttpHandlerResponse"),Pe=p((e,t,r,o,n)=>{if(!Rt(e))return Ee(e,
+t,r,o,n);let s=Et(e,r);return s?Ee(s,t,r,o,n):null},"getHttpResponse"),wt=p(e=>!!e.
+identity,"isValidAuthResponse"),Ot=p(e=>Pt(e.status),"isValidHandlerResponse"),Ee=p(
 (e,t,r,o,n)=>At(e)?ve(e,t,xt(e),r,o):bt(e)?ht(e,n)?ve(e,t,St(e),r,o):(o.push(new E(
 e.name,n,e.file)),null):(o.push(new I(n,t.file)),null),"getTypeResponse"),ve=p((e,t,r,o,n)=>{
 let s={};for(let i of r)if(!(!vt(i)||i.inherited))switch(i.name){default:n.push(
 new Ht(t.name,i.name,e.file));break;case"status":s.status=It(i);break;case"heade\
-rs":{s.headers=j(i.value,e,o,n),s.headers&&i.description&&(s.headers.description=
+rs":{s.headers=w(i.value,e,o,n),s.headers&&i.description&&(s.headers.description=
 i.description);break}case"identity":{s.identity=y(i.value,e,o,n),s.identity&&i.description&&
-(s.identity.description=i.description);break}case"body":{s.body=z(i.value,e,o,n),
+(s.identity.description=i.description);break}case"body":{s.body=j(i.value,e,o,n),
 s.body&&i.description&&(s.body.description=i.description);break}}return s},"getT\
 ypeFromMembers");import{isModelProperty as Wt,isTypeIntersection as Xt,isTypeObject as Zt,isTypeReference as _t}from"@ez4/reflection";
 import{InvalidServicePropertyError as $t,isModelDeclaration as Lt,hasHeritageType as eo,
-getObjectMembers as ro,getModelMembers as to,getReferenceType as oo}from"@ez4/common/library";import{IncorrectTypeError as Ot,InvalidTypeError as zt}from"@ez4/common/library";var C=class extends zt{constructor(r,o){super("Invalid route request",void 0,r,o);
-this.baseType=r}static{p(this,"InvalidRequestTypeError")}},k=class extends Ot{constructor(r,o,n){
+getObjectMembers as ro,getModelMembers as to,getReferenceType as oo}from"@ez4/common/library";import{IncorrectTypeError as zt,InvalidTypeError as jt}from"@ez4/common/library";var C=class extends jt{constructor(r,o){super("Invalid route request",void 0,r,o);
+this.baseType=r}static{p(this,"InvalidRequestTypeError")}},k=class extends zt{constructor(r,o,n){
 super("Incorrect route request",r,o,n);this.requestType=r;this.baseType=o}static{
 p(this,"IncorrectRequestTypeError")}};import{isTypeIntersection as qt,isTypeObject as Dt,isTypeReference as Ft}from"@ez4/reflection";
 import{getReferenceType as Bt,isModelDeclaration as Ut}from"@ez4/common/library";import{IncorrectTypeError as Ct,InvalidTypeError as kt}from"@ez4/common/library";var q=class extends kt{static{p(this,"InvalidParameterTypeError")}constructor(t){
 super("Invalid request parameters",void 0,"Http.PathParameters",t)}},D=class extends Ct{constructor(r,o){
 super("Incorrect request parameters",r,"Http.PathParameters",o);this.parametersType=
-r}static{p(this,"IncorrectParameterTypeError")}};var we=p((e,t,r,o)=>{if(!Ft(e))return je(e,t,r,o);let n=Bt(e,r);return n?je(n,t,
-r,o):null},"getHttpParameters"),je=p((e,t,r,o)=>Dt(e)||qt(e)?m(e,r):Ut(e)?ce(e)?
+r}static{p(this,"IncorrectParameterTypeError")}};var Oe=p((e,t,r,o)=>{if(!Ft(e))return we(e,t,r,o);let n=Bt(e,r);return n?we(n,t,
+r,o):null},"getHttpParameters"),we=p((e,t,r,o)=>Dt(e)||qt(e)?m(e,r):Ut(e)?ce(e)?
 m(e,r):(o.push(new D(e.name,e.file)),null):(o.push(new q(t.file)),null),"getType\
 Parameter");import{isTypeIntersection as Qt,isTypeObject as Jt,isTypeReference as Gt}from"@ez4/reflection";
 import{getReferenceType as Kt,isModelDeclaration as Yt}from"@ez4/common/library";import{IncorrectTypeError as Nt,InvalidTypeError as Vt}from"@ez4/common/library";var F=class extends Vt{static{p(this,"InvalidQueryTypeError")}constructor(t){super(
 "Invalid request query strings",void 0,"Http.QueryStrings",t)}},B=class extends Nt{constructor(r,o){
 super("Incorrect request query strings",r,"Http.QueryStrings",o);this.queryType=
-r}static{p(this,"IncorrectQueryTypeError")}};var ze=p((e,t,r,o)=>{if(!Gt(e))return Oe(e,t,r,o);let n=Kt(e,r);return n?Oe(n,t,
-r,o):null},"getHttpQuery"),Oe=p((e,t,r,o)=>Jt(e)||Qt(e)?m(e,r):Yt(e)?ie(e)?m(e,r):
+r}static{p(this,"IncorrectQueryTypeError")}};var je=p((e,t,r,o)=>{if(!Gt(e))return ze(e,t,r,o);let n=Kt(e,r);return n?ze(n,t,
+r,o):null},"getHttpQuery"),ze=p((e,t,r,o)=>Jt(e)||Qt(e)?m(e,r):Yt(e)?ie(e)?m(e,r):
 (o.push(new B(e.name,t.file)),null):(o.push(new F(t.file)),null),"getTypeQuery");var qe=p((e,t,r,o)=>_(e,t,r,o,"Http.AuthRequest"),"getHttpAuthRequest"),De=p((e,t,r,o)=>_(
 e,t,r,o,"Http.Request"),"getHttpHandlerRequest"),_=p((e,t,r,o,n)=>{if(Xt(e)&&e.elements.
 length>0)return _(e.elements[0],t,r,o,n);if(!_t(e))return Ce(e,t,r,o,n);let s=oo(
@@ -118,12 +118,12 @@ e,r);return s?Ce(s,t,r,o,n):null},"getHttpRequest"),Ce=p((e,t,r,o,n)=>Zt(e)?ke(e
 t,ro(e),r,o):Lt(e)?eo(e,n)?ke(e,t,to(e),r,o):(o.push(new k(e.name,n,e.file)),null):
 (o.push(new C(n,t.file)),null),"getTypeRequest"),ke=p((e,t,r,o,n)=>{let s={};for(let i of r)
 if(!(!Wt(i)||i.inherited))switch(i.name){default:n.push(new $t(t.name,i.name,e.file));
-break;case"headers":{s.headers=j(i.value,e,o,n),s.headers&&i.description&&(s.headers.
+break;case"headers":{s.headers=w(i.value,e,o,n),s.headers&&i.description&&(s.headers.
 description=i.description);break}case"identity":{s.identity=y(i.value,e,o,n),s.identity&&
 i.description&&(s.identity.description=i.description);break}case"query":{s.query=
-ze(i.value,e,o,n),s.query&&i.description&&(s.query.description=i.description);break}case"\
-parameters":{s.parameters=we(i.value,e,o,n),s.parameters&&i.description&&(s.parameters.
-description=i.description);break}case"body":{s.body=z(i.value,e,o,n),s.body&&i.description&&
+je(i.value,e,o,n),s.query&&i.description&&(s.query.description=i.description);break}case"\
+parameters":{s.parameters=Oe(i.value,e,o,n),s.parameters&&i.description&&(s.parameters.
+description=i.description);break}case"body":{s.body=j(i.value,e,o,n),s.body&&i.description&&
 (s.body.description=i.description);break}}return s},"getTypeFromMembers");var Fe=p((e,t,r,o)=>{if(!ue(e))return null;let{description:n,module:s}=e,i={...n&&
 {description:n},...s&&{module:s}},c=new Set(["name","file"]);if((i.name=e.name)&&
 c.delete("name"),(i.file=e.file)&&c.delete("file"),e.parameters){let[{value:l}]=e.
@@ -150,7 +150,7 @@ T(c.value,t,o,n);break;case"memory":case"logRetention":case"timeout":s[c.name]=y
 c);break;case"cors":s.cors=fo(c);break;case"listener":s.listener=Ho(c.value,n);break;case"\
 variables":s.variables=uo(c,n);break}return xo(s)?s:(n.push(new S([...i],e.file)),
 null)},"getTypeFromMembers");import{InvalidServicePropertyError as Ao,isModelDeclaration as Ro,getModelMembers as Po,
-getObjectMembers as jo,getPropertyBoolean as wo,getPropertyStringList as Oo,getPropertyNumber as zo,
+getObjectMembers as wo,getPropertyBoolean as Oo,getPropertyStringList as zo,getPropertyNumber as jo,
 getReferenceType as Co}from"@ez4/common/library";import{isModelProperty as ko,isTypeObject as qo,
 isTypeReference as Do}from"@ez4/reflection";import{IncompleteTypeError as Io,IncorrectTypeError as Eo,InvalidTypeError as vo}from"@ez4/common/library";var N=class extends Io{static{p(this,"IncompleteCorsError")}constructor(t,r){super(
 "Incomplete HTTP CORS",t,r)}},V=class extends vo{static{p(this,"InvalidCorsTypeE\
@@ -158,12 +158,12 @@ rror")}constructor(t){super("Invalid HTTP CORS type",void 0,"Http.Cors",t)}},Q=c
 super("Incorrect HTTP CORS type",r,"Http.Cors",o);this.fallbackType=r}static{p(this,
 "IncorrectCorsTypeError")}};var Ke=p((e,t,r,o)=>{if(!Do(e))return Je(e,t,o);let n=Co(e,r);return n?Je(n,t,o):
 null},"getHttpCors"),Fo=p(e=>!!e.allowOrigins?.length,"isValidCors"),Je=p((e,t,r)=>qo(
-e)?Ge(e,t,jo(e),r):Ro(e)?me(e)?Ge(e,t,Po(e),r):(r.push(new Q(e.name,e.file)),null):
+e)?Ge(e,t,wo(e),r):Ro(e)?me(e)?Ge(e,t,Po(e),r):(r.push(new Q(e.name,e.file)),null):
 (r.push(new V(t.file)),null),"getTypeCors"),Ge=p((e,t,r,o)=>{let n={},s=new Set(
 ["allowOrigins"]);for(let i of r)if(!(!ko(i)||i.inherited))switch(i.name){default:
 o.push(new Ao(t.name,i.name,e.file));break;case"allowOrigins":case"allowMethods":case"\
-allowHeaders":case"exposeHeaders":n[i.name]=Oo(i);break;case"allowCredentials":n.
-allowCredentials=wo(i);break;case"maxAge":n.maxAge=zo(i);break}return Fo(n)?n:(o.
+allowHeaders":case"exposeHeaders":n[i.name]=zo(i);break;case"allowCredentials":n.
+allowCredentials=Oo(i);break;case"maxAge":n.maxAge=jo(i);break}return Fo(n)?n:(o.
 push(new N([...s],e.file)),null)},"getTypeFromMembers");import{InvalidServicePropertyError as Vo,isModelDeclaration as Qo,getModelMembers as Jo,
 getObjectMembers as Go,getPropertyNumber as Ko,getReferenceType as Yo}from"@ez4/common/library";
 import{isModelProperty as Wo,isTypeObject as Xo,isTypeReference as Zo}from"@ez4/reflection";
@@ -187,7 +187,7 @@ ts":s.defaults=he(l.value,n,e,r);break;case"cache":s.cache=Ze(l.value,n,e,r);bre
 cors":s.cors=Ke(l.value,n,e,r);break;case"variables":s.variables=rn(l,r);break;case"\
 services":s.services=en(l,e,r);break}if(!sn(s)){r.push(new d([...i],c));continue}
 if(t[n.name]){r.push(new $o(n.name,c));continue}t[n.name]=s}return{services:t,errors:r}},
-"getHttpServices"),sn=p(e=>!!e.name&&!!e.routes&&!!e.extras,"isValidService");var $e=!1,ji=p(()=>{$e||(cn(),ln(),mn("@ez4/gateway",{"metadata:getServices":_e}),
+"getHttpServices"),sn=p(e=>!!e.name&&!!e.routes&&!!e.extras,"isValidService");var $e=!1,wi=p(()=>{$e||(cn(),ln(),mn("@ez4/gateway",{"metadata:getServices":_e}),
 $e=!0)},"registerTriggers");import{IncorrectTypeError as an,InvalidTypeError as un}from"@ez4/common/library";var b=class extends un{static{p(this,"InvalidDefaultsTypeError")}constructor(t){
 super("Invalid defaults",void 0,"Http.Defaults",t)}},h=class extends an{constructor(r,o){
 super("Incorrect defaults",r,"Http.Defaults",o);this.defaultsType=r}static{p(this,
@@ -196,16 +196,16 @@ super("Invalid preferences",void 0,"Http.Preferences",t)}},M=class extends fn{co
 super("Incorrect preferences",r,"Http.Preferences",o);this.preferencesType=r}static{
 p(this,"IncorrectPreferencesTypeError")}};export{x as IncompleteAuthorizerError,J as IncompleteCacheError,N as IncompleteCorsError,
 U as IncompleteHandlerError,S as IncompleteRouteError,d as IncompleteServiceError,
-O as IncorrectBodyTypeError,K as IncorrectCacheTypeError,Q as IncorrectCorsTypeError,
+z as IncorrectBodyTypeError,K as IncorrectCacheTypeError,Q as IncorrectCorsTypeError,
 h as IncorrectDefaultsTypeError,P as IncorrectHeadersTypeError,A as IncorrectIdentityTypeError,
 D as IncorrectParameterTypeError,M as IncorrectPreferencesTypeError,B as IncorrectQueryTypeError,
-k as IncorrectRequestTypeError,E as IncorrectResponseTypeError,w as InvalidBodyTypeError,
+k as IncorrectRequestTypeError,E as IncorrectResponseTypeError,O as InvalidBodyTypeError,
 G as InvalidCacheTypeError,V as InvalidCorsTypeError,b as InvalidDefaultsTypeError,
 R as InvalidHeadersTypeError,v as InvalidIdentityTypeError,q as InvalidParameterTypeError,
 g as InvalidPreferencesTypeError,F as InvalidQueryTypeError,C as InvalidRequestTypeError,
 I as InvalidResponseTypeError,f as InvalidRouteErrorTypeError,Y as ServiceType,qe as getHttpAuthRequest,
-Ae as getHttpAuthResponse,Fe as getHttpAuthorizer,z as getHttpBody,Ze as getHttpCache,
+Ae as getHttpAuthResponse,Fe as getHttpAuthorizer,j as getHttpBody,Ze as getHttpCache,
 Ke as getHttpCors,Be as getHttpHandler,De as getHttpHandlerRequest,Re as getHttpHandlerResponse,
-j as getHttpHeaders,y as getHttpIdentity,we as getHttpParameters,ze as getHttpQuery,
-Ve as getHttpRoutes,_e as getHttpServices,Tn as isHttpService,ji as registerTriggers};
+w as getHttpHeaders,y as getHttpIdentity,Oe as getHttpParameters,je as getHttpQuery,
+Ve as getHttpRoutes,_e as getHttpServices,Tn as isHttpService,wi as registerTriggers};
 //# sourceMappingURL=library.mjs.map

package/dist/main.cjs

@@ -1,18 +1,18 @@
-"use strict";var u=Object.defineProperty;var R=Object.getOwnPropertyDescriptor;var l=Object.getOwnPropertyNames;var h=Object.prototype.hasOwnProperty;var p=(s,e)=>u(s,"name",{value:e,configurable:!0});var g=(s,e)=>{for(var t in e)u(s,t,{get:e[t],enumerable:!0})},S=(s,e,t,n)=>{if(e&&
-typeof e=="object"||typeof e=="function")for(let o of l(e))!h.call(s,o)&&o!==t&&
-u(s,o,{get:()=>e[o],enumerable:!(n=R(e,o))||n.enumerable});return s};var q=s=>S(u({},"__esModule",{value:!0}),s);var b={};g(b,{Http:()=>H,HttpBadRequestError:()=>c,HttpError:()=>r,HttpForbiddenError:()=>a,
-HttpInternalServerError:()=>d,HttpNotFoundError:()=>x,HttpUnauthorizedError:()=>i,
+"use strict";var u=Object.defineProperty;var l=Object.getOwnPropertyDescriptor;var h=Object.getOwnPropertyNames;var g=Object.prototype.hasOwnProperty;var p=(s,e)=>u(s,"name",{value:e,configurable:!0});var S=(s,e)=>{for(var t in e)u(s,t,{get:e[t],enumerable:!0})},q=(s,e,t,n)=>{if(e&&
+typeof e=="object"||typeof e=="function")for(let o of h(e))!g.call(s,o)&&o!==t&&
+u(s,o,{get:()=>e[o],enumerable:!(n=l(e,o))||n.enumerable});return s};var f=s=>q(u({},"__esModule",{value:!0}),s);var A={};S(A,{Http:()=>d,HttpBadRequestError:()=>c,HttpError:()=>r,HttpForbiddenError:()=>a,
+HttpInternalServerError:()=>H,HttpNotFoundError:()=>x,HttpUnauthorizedError:()=>i,
 HttpUnprocessableEntityError:()=>y,HttpUnsupportedMediaTypeError:()=>m});module.
-exports=q(b);var H;(s=>{})(H||={});var r=class extends Error{constructor(t,n,o){super(n);this.status=t;this.message=
-n;this.details=o}static{p(this,"HttpError")}},c=class extends r{static{p(this,"H\
-ttpBadRequestError")}constructor(e,t){super(400,e||"Bad request",t)}},i=class extends r{static{
-p(this,"HttpUnauthorizedError")}constructor(e,t){super(401,e||"Unauthorized",t)}},
-a=class extends r{static{p(this,"HttpForbiddenError")}constructor(e,t){super(403,
-e||"Forbidden",t)}},x=class extends r{static{p(this,"HttpNotFoundError")}constructor(e,t){
-super(404,e||"Not found",t)}},m=class extends r{static{p(this,"HttpUnsupportedMe\
-diaTypeError")}constructor(e,t){super(415,e||"Unsupported media type",t)}},y=class extends r{static{
-p(this,"HttpUnprocessableEntityError")}constructor(e,t){super(422,e||"Unprocessa\
-ble entity",t)}},d=class extends r{static{p(this,"HttpInternalServerError")}constructor(e,t){
-super(500,e||"Internal server error",t)}};0&&(module.exports={Http,HttpBadRequestError,HttpError,HttpForbiddenError,HttpInternalServerError,
+exports=f(A);var d;(s=>{})(d||={});var R=require("@ez4/common");var r=class extends R.ServiceError{constructor(t,n,o){super(n,o);this.status=t}static{
+p(this,"HttpError")}},c=class extends r{static{p(this,"HttpBadRequestError")}constructor(e,t){
+super(400,e||"Bad request",t)}},i=class extends r{static{p(this,"HttpUnauthorize\
+dError")}constructor(e,t){super(401,e||"Unauthorized",t)}},a=class extends r{static{
+p(this,"HttpForbiddenError")}constructor(e,t){super(403,e||"Forbidden",t)}},x=class extends r{static{
+p(this,"HttpNotFoundError")}constructor(e,t){super(404,e||"Not found",t)}},m=class extends r{static{
+p(this,"HttpUnsupportedMediaTypeError")}constructor(e,t){super(415,e||"Unsupport\
+ed media type",t)}},y=class extends r{static{p(this,"HttpUnprocessableEntityErro\
+r")}constructor(e,t){super(422,e||"Unprocessable entity",t)}},H=class extends r{static{
+p(this,"HttpInternalServerError")}constructor(e,t){super(500,e||"Internal server\
+ error",t)}};0&&(module.exports={Http,HttpBadRequestError,HttpError,HttpForbiddenError,HttpInternalServerError,
 HttpNotFoundError,HttpUnauthorizedError,HttpUnprocessableEntityError,HttpUnsupportedMediaTypeError});
 //# sourceMappingURL=main.cjs.map

package/dist/main.d.ts

@@ -1,2 +1,2 @@
-export * from './services/contract.js';
-export * from './services/errors.js';
+export * from './services/contract';
+export * from './services/errors';

package/dist/main.mjs

@@ -1,14 +1,14 @@
-var y=Object.defineProperty;var r=(s,e)=>y(s,"name",{value:e,configurable:!0});var d;(s=>{})(d||={});var p=class extends Error{constructor(t,m,H){super(m);this.status=t;this.message=
-m;this.details=H}static{r(this,"HttpError")}},o=class extends p{static{r(this,"H\
-ttpBadRequestError")}constructor(e,t){super(400,e||"Bad request",t)}},n=class extends p{static{
-r(this,"HttpUnauthorizedError")}constructor(e,t){super(401,e||"Unauthorized",t)}},
-u=class extends p{static{r(this,"HttpForbiddenError")}constructor(e,t){super(403,
-e||"Forbidden",t)}},c=class extends p{static{r(this,"HttpNotFoundError")}constructor(e,t){
-super(404,e||"Not found",t)}},i=class extends p{static{r(this,"HttpUnsupportedMe\
-diaTypeError")}constructor(e,t){super(415,e||"Unsupported media type",t)}},a=class extends p{static{
-r(this,"HttpUnprocessableEntityError")}constructor(e,t){super(422,e||"Unprocessa\
-ble entity",t)}},x=class extends p{static{r(this,"HttpInternalServerError")}constructor(e,t){
-super(500,e||"Internal server error",t)}};export{d as Http,o as HttpBadRequestError,p as HttpError,u as HttpForbiddenError,
+var H=Object.defineProperty;var r=(s,e)=>H(s,"name",{value:e,configurable:!0});var d;(s=>{})(d||={});import{ServiceError as R}from"@ez4/common";var p=class extends R{constructor(t,m,y){super(m,y);this.status=t}static{r(this,
+"HttpError")}},o=class extends p{static{r(this,"HttpBadRequestError")}constructor(e,t){
+super(400,e||"Bad request",t)}},n=class extends p{static{r(this,"HttpUnauthorize\
+dError")}constructor(e,t){super(401,e||"Unauthorized",t)}},u=class extends p{static{
+r(this,"HttpForbiddenError")}constructor(e,t){super(403,e||"Forbidden",t)}},c=class extends p{static{
+r(this,"HttpNotFoundError")}constructor(e,t){super(404,e||"Not found",t)}},i=class extends p{static{
+r(this,"HttpUnsupportedMediaTypeError")}constructor(e,t){super(415,e||"Unsupport\
+ed media type",t)}},a=class extends p{static{r(this,"HttpUnprocessableEntityErro\
+r")}constructor(e,t){super(422,e||"Unprocessable entity",t)}},x=class extends p{static{
+r(this,"HttpInternalServerError")}constructor(e,t){super(500,e||"Internal server\
+ error",t)}};export{d as Http,o as HttpBadRequestError,p as HttpError,u as HttpForbiddenError,
 x as HttpInternalServerError,c as HttpNotFoundError,n as HttpUnauthorizedError,a as HttpUnprocessableEntityError,
 i as HttpUnsupportedMediaTypeError};
 //# sourceMappingURL=main.mjs.map

package/dist/metadata/authorizer.d.ts

@@ -1,3 +1,3 @@
 import type { AllType, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpAuthorizer } from '../types/common.js';
+import type { HttpAuthorizer } from '../types/common';
 export declare const getHttpAuthorizer: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpAuthorizer | null;

package/dist/metadata/body.d.ts

@@ -1,5 +1,5 @@
 import type { AllType, SourceMap, TypeIntersection, TypeModel, TypeObject } from '@ez4/reflection';
 import type { ArraySchema, ObjectSchema, UnionSchema } from '@ez4/schema/library';
 type TypeParent = TypeObject | TypeModel | TypeIntersection;
-export declare const getHttpBody: (type: AllType, parent: TypeParent, reflection: SourceMap, errorList: Error[]) => import("@ez4/schema/library").BooleanSchema | import("@ez4/schema/library").NumberSchema | import("@ez4/schema/library").StringSchema | ObjectSchema | UnionSchema | ArraySchema | null;
+export declare const getHttpBody: (type: AllType, parent: TypeParent, reflection: SourceMap, errorList: Error[]) => import("@ez4/schema").BooleanSchema | import("@ez4/schema").NumberSchema | import("@ez4/schema").StringSchema | ObjectSchema | UnionSchema | ArraySchema | null;
 export {};

package/dist/metadata/cache.d.ts

@@ -1,3 +1,3 @@
 import type { AllType, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpCache } from '../types/common.js';
+import type { HttpCache } from '../types/common';
 export declare const getHttpCache: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpCache | null;

package/dist/metadata/cors.d.ts

@@ -1,3 +1,3 @@
 import type { AllType, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpCors } from '../types/common.js';
+import type { HttpCors } from '../types/common';
 export declare const getHttpCors: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpCors | null;

package/dist/metadata/defaults.d.ts

@@ -1,3 +1,3 @@
 import type { AllType, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpDefaults } from '../types/common.js';
+import type { HttpDefaults } from '../types/common';
 export declare const getHttpDefaults: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpDefaults | null;

package/dist/metadata/errors.d.ts

@@ -1,4 +1,4 @@
 import type { AllType, ModelProperty, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpErrors } from '../types/common.js';
+import type { HttpErrors } from '../types/common';
 export declare const getHttpErrors: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpErrors | null;
 export declare const getErrorClasses: (member: ModelProperty, errorCode: number, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpErrors;

package/dist/metadata/handler.d.ts

@@ -1,3 +1,3 @@
 import type { AllType, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpHandler } from '../types/common.js';
+import type { HttpHandler } from '../types/common';
 export declare const getHttpHandler: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpHandler | null;

package/dist/metadata/preferences.d.ts

@@ -1,3 +1,3 @@
 import type { AllType, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpPreferences } from '../types/common.js';
+import type { HttpPreferences } from '../types/common';
 export declare const getHttpPreferences: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpPreferences | undefined;

package/dist/metadata/request.d.ts

@@ -1,4 +1,4 @@
 import type { AllType, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpAuthRequest, HttpRequest } from '../types/common.js';
+import type { HttpAuthRequest, HttpRequest } from '../types/common';
 export declare const getHttpAuthRequest: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => (HttpAuthRequest & HttpRequest) | null;
 export declare const getHttpHandlerRequest: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => (HttpAuthRequest & HttpRequest) | null;

package/dist/metadata/response.d.ts

@@ -1,5 +1,5 @@
 import type { AllType, SourceMap, TypeModel } from '@ez4/reflection';
 import type { Incomplete } from '@ez4/utils';
-import type { HttpAuthResponse, HttpResponse } from '../types/common.js';
+import type { HttpAuthResponse, HttpResponse } from '../types/common';
 export declare const getHttpAuthResponse: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => Incomplete<HttpAuthResponse & HttpResponse> | null;
 export declare const getHttpHandlerResponse: (type: AllType, parent: TypeModel, reflection: SourceMap, errorList: Error[]) => HttpResponse | null;

package/dist/metadata/route.d.ts

@@ -1,3 +1,3 @@
 import type { ModelProperty, SourceMap, TypeModel } from '@ez4/reflection';
-import type { HttpRoute } from '../types/common.js';
+import type { HttpRoute } from '../types/common';
 export declare const getHttpRoutes: (parent: TypeModel, member: ModelProperty, reflection: SourceMap, errorList: Error[]) => HttpRoute[];

package/dist/metadata/schema.d.ts

@@ -1,2 +1,2 @@
 import type { SourceMap, TypeIntersection, TypeModel, TypeObject } from '@ez4/reflection';
-export declare const getSchemaFromType: (type: TypeObject | TypeModel | TypeIntersection, reflection: SourceMap) => import("@ez4/schema/library").ObjectSchema | null;
+export declare const getSchemaFromType: (type: TypeObject | TypeModel | TypeIntersection, reflection: SourceMap) => import("@ez4/schema").ObjectSchema | null;

package/dist/metadata/service.d.ts

@@ -1,5 +1,5 @@
 import type { SourceMap } from '@ez4/reflection';
-import type { HttpService } from '../types/service.js';
+import type { HttpService } from '../types/service';
 export declare const getHttpServices: (reflection: SourceMap) => {
     services: Record<string, HttpService>;
     errors: Error[];

package/dist/metadata/utils.d.ts

@@ -1,5 +1,5 @@
 import type { AllType, TypeCallback, TypeClass, TypeFunction, TypeModel } from '@ez4/reflection';
-import type { HttpPath } from '../types/common.js';
+import type { HttpPath } from '../types/common';
 export declare const isHttpPath: (path: string) => path is HttpPath;
 export declare const isHttpService: (type: AllType) => type is TypeClass;
 export declare const isHttpRoute: (type: AllType) => type is TypeModel;

package/dist/services/common.d.ts

@@ -1,6 +1,6 @@
 import type { Service } from '@ez4/common';
 import type { NamingStyle } from '@ez4/schema';
-import type { Http } from './contract.js';
+import type { Http } from './contract';
 /**
  * Contract for HTTP preferences.
  */

package/dist/services/contract.d.ts

@@ -1,8 +1,8 @@
 import type { Service as CommonService } from '@ez4/common';
 import type { LinkedVariables } from '@ez4/project/library';
-import type { HttpPath } from '../types/common.js';
-import type { HttpSuccessStatuses, HttpEmptySuccessResponse, HttpSuccessResponse } from './utils.js';
-import type { HttpHeaders, HttpIdentity, HttpPathParameters, HttpQueryStrings, HttpJsonBody, HttpRawBody, HttpPreferences, HttpAuthRequest, HttpAuthResponse, HttpRequest, HttpResponse, HttpErrors, HttpProvider, HttpIncoming, HttpListener, HttpAuthorizer, HttpHandler, HttpCache, HttpCors } from './common.js';
+import type { HttpPath } from '../types/common';
+import type { HttpSuccessStatuses, HttpEmptySuccessResponse, HttpSuccessResponse } from './utils';
+import type { HttpHeaders, HttpIdentity, HttpPathParameters, HttpQueryStrings, HttpJsonBody, HttpRawBody, HttpPreferences, HttpAuthRequest, HttpAuthResponse, HttpRequest, HttpResponse, HttpErrors, HttpProvider, HttpIncoming, HttpListener, HttpAuthorizer, HttpHandler, HttpCache, HttpCors } from './common';
 /**
  * Provide all contracts for a self-managed HTTP service.
  */

package/dist/services/errors.d.ts

@@ -1,11 +1,10 @@
+import { ServiceError } from '@ez4/common';
 /**
  * Default HTTP error.
  */
-export declare class HttpError extends Error {
+export declare class HttpError extends ServiceError {
     status: number;
-    message: string;
-    details?: string[] | undefined;
-    constructor(status: number, message: string, details?: string[] | undefined);
+    constructor(status: number, message: string, details?: string[]);
 }
 /**
  * HTTP Bad Request error.

package/dist/services/utils.d.ts

@@ -1,4 +1,4 @@
-import type { HttpResponse, HttpJsonBody, HttpRawBody } from './common.js';
+import type { HttpResponse, HttpJsonBody, HttpRawBody } from './common';
 export type HttpSuccessStatuses = 200 | 201 | 202 | 203 | 204 | 205 | 206 | 207 | 208;
 /**
  * Common HTTP success response without a response body.

package/dist/types/service.d.ts

@@ -1,5 +1,5 @@
 import type { ServiceMetadata } from '@ez4/project/library';
-import type { HttpRoute, HttpCors, HttpDefaults, HttpCache } from './common.js';
+import type { HttpRoute, HttpCors, HttpDefaults, HttpCache } from './common';
 export declare const ServiceType = "@ez4/http";
 export type HttpService = ServiceMetadata & {
     type: typeof ServiceType;

package/dist/utils/body.d.ts

@@ -1,4 +1,4 @@
 import type { AnySchema } from '@ez4/schema';
-import type { Http } from '../services/contract.js';
+import type { Http } from '../services/contract';
 export declare const getRequestBody: <T extends Http.JsonBody | Http.RawBody>(input: T | undefined, schema: AnySchema, preferences?: Http.Preferences | null) => Promise<T>;
 export declare const getResponseBody: (body: unknown, schema: AnySchema, preferences?: Http.Preferences) => unknown;

package/dist/utils.cjs

@@ -1,13 +1,13 @@
 "use strict";var d=Object.defineProperty;var q=Object.getOwnPropertyDescriptor;var C=Object.getOwnPropertyNames;var P=Object.prototype.hasOwnProperty;var n=(e,t)=>d(e,"name",{value:t,configurable:!0});var b=(e,t)=>{for(var r in t)d(e,r,{get:t[r],enumerable:!0})},z=(e,t,r,o)=>{if(t&&
 typeof t=="object"||typeof t=="function")for(let a of C(t))!P.call(e,a)&&a!==r&&
-d(e,a,{get:()=>t[a],enumerable:!(o=q(t,a))||o.enumerable});return e};var M=e=>z(d({},"__esModule",{value:!0}),e);var A={};b(A,{getHeaders:()=>O,getIdentity:()=>R,getJsonError:()=>$,getPathParameters:()=>j,
-getQueryStrings:()=>B,getRequestBody:()=>U,getResponseBody:()=>V});module.exports=
-M(A);var l=require("@ez4/transform"),s=require("@ez4/validator"),H=require("@ez4/gateway");var j=n(async(e,t)=>{let r=(0,l.transform)(e,t,(0,l.createTransformContext)({convert:!1})),
+d(e,a,{get:()=>t[a],enumerable:!(o=q(t,a))||o.enumerable});return e};var M=e=>z(d({},"__esModule",{value:!0}),e);var A={};b(A,{getHeaders:()=>O,getIdentity:()=>R,getJsonError:()=>$,getPathParameters:()=>B,
+getQueryStrings:()=>j,getRequestBody:()=>U,getResponseBody:()=>V});module.exports=
+M(A);var l=require("@ez4/transform"),s=require("@ez4/validator"),H=require("@ez4/gateway");var B=n(async(e,t)=>{let r=(0,l.transform)(e,t,(0,l.createTransformContext)({convert:!1})),
 o=await(0,s.validate)(r,t,(0,s.createValidatorContext)({property:"$path"}));if(o.
 length){let a=(0,s.getUniqueErrorMessages)(o);throw new H.HttpBadRequestError("M\
-alformed path parameters.",a)}return r},"getPathParameters");var g=require("@ez4/transform"),m=require("@ez4/validator"),w=require("@ez4/gateway");var B=n(async(e,t,r)=>{let o=r?.namingStyle,a=(0,g.createTransformContext)({convert:!0,
+alformed path parameters.",a)}return r},"getPathParameters");var g=require("@ez4/transform"),m=require("@ez4/validator"),w=require("@ez4/gateway");var j=n(async(e,t,r)=>{let o=r?.namingStyle,a=(0,g.createTransformContext)({convert:!0,
 inputStyle:o}),y=(0,g.transform)(e,t,a),x=(0,m.createValidatorContext)({property:"\
-$query"}),u=await(0,m.validate)(y,t,x);if(u.length){let T=(0,m.getUniqueErrorMessages)(
+$query",pathStyle:o}),u=await(0,m.validate)(y,t,x);if(u.length){let T=(0,m.getUniqueErrorMessages)(
 u);throw new w.HttpBadRequestError("Malformed query strings.",T)}return y},"getQ\
 ueryStrings");var h=require("@ez4/transform"),p=require("@ez4/validator"),S=require("@ez4/gateway");var O=n(async(e,t)=>{let r=(0,h.transform)(e,t,(0,h.createTransformContext)({convert:!1})),
 o=await(0,p.validate)(r,t,(0,p.createValidatorContext)({property:"$header"}));if(o.

package/dist/utils.d.ts

@@ -1,6 +1,6 @@
-export * from './utils/parameters.js';
-export * from './utils/query.js';
-export * from './utils/headers.js';
-export * from './utils/identity.js';
-export * from './utils/body.js';
-export * from './utils/errors.js';
+export * from './utils/parameters';
+export * from './utils/query';
+export * from './utils/headers';
+export * from './utils/identity';
+export * from './utils/body';
+export * from './utils/errors';

package/dist/utils.mjs

@@ -5,13 +5,13 @@ th"}));if(o.length){let n=h(o);throw new u("Malformed path parameters.",n)}retur
 "getPathParameters");import{createTransformContext as T,transform as H}from"@ez4/transform";import{validate as w,
 createValidatorContext as S,getUniqueErrorMessages as v}from"@ez4/validator";import{
 HttpBadRequestError as E}from"@ez4/gateway";var W=a(async(e,t,r)=>{let o=r?.namingStyle,n=T({convert:!0,inputStyle:o}),s=H(e,
-t,n),m=S({property:"$query"}),p=await w(s,t,m);if(p.length){let i=v(p);throw new E(
-"Malformed query strings.",i)}return s},"getQueryStrings");import{createTransformContext as q,transform as C}from"@ez4/transform";import{validate as P,
+t,n),m=S({property:"$query",pathStyle:o}),p=await w(s,t,m);if(p.length){let i=v(
+p);throw new E("Malformed query strings.",i)}return s},"getQueryStrings");import{createTransformContext as q,transform as C}from"@ez4/transform";import{validate as P,
 createValidatorContext as b,getUniqueErrorMessages as z}from"@ez4/validator";import{
 HttpBadRequestError as M}from"@ez4/gateway";var et=a(async(e,t)=>{let r=C(e,t,q({convert:!1})),o=await P(r,t,b({property:"$h\
 eader"}));if(o.length){let n=z(o);throw new M("Malformed request headers.",n)}return r},
-"getHeaders");import{validate as j,createValidatorContext as B,getUniqueErrorMessages as O}from"@ez4/validator";
-import{HttpBadRequestError as R}from"@ez4/gateway";var st=a(async(e,t)=>{let r=await j(e,t,B({property:"$identity"}));if(r.length){
+"getHeaders");import{validate as B,createValidatorContext as j,getUniqueErrorMessages as O}from"@ez4/validator";
+import{HttpBadRequestError as R}from"@ez4/gateway";var st=a(async(e,t)=>{let r=await B(e,t,j({property:"$identity"}));if(r.length){
 let o=O(r);throw new R("Malformed authorizer identity.",o)}return e},"getIdentit\
 y");import{createTransformContext as c,transform as f}from"@ez4/transform";import{validate as U,
 createValidatorContext as V,getUniqueErrorMessages as $}from"@ez4/validator";import{

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ez4/gateway",
   "description": "EZ4: Components to build gateway services",
-  "version": "0.26.0",
+  "version": "0.27.0",
   "author": "Silas B.",
   "license": "MIT",
   "type": "module",
@@ -11,7 +11,7 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/sbalmt/ez4.git",
-    "directory": "packages/gateway"
+    "directory": "contracts/gateway"
   },
   "engines": {
     "node": ">=22.7"
@@ -34,26 +34,25 @@
     }
   },
   "workspaces": [
-    "packages/*"
+    "foundation/*",
+    "contracts/*"
   ],
   "scripts": {
     "lint": "eslint --cache",
     "clean": "rm -f *.tsbuildinfo && rm -rf dist/*",
-    "build": "tsc -p tsconfig.json && node tools/bundler.mjs",
-    "test": "npm run test:types && node --test --import ../../tools/tsnode.mjs test/*.spec.ts",
-    "test:only": "npm run test:types && node --test-only --test --import ../../tools/tsnode.mjs test/*.spec.ts",
-    "test:types": "npm run build && tsc -p tsconfig.test.json",
+    "build": "tsc && node tools/bundler.mjs",
+    "test": "npm run build && ez4 test",
     "local:publish": "npm run build && npm run clean:registry && npm publish --registry http://localhost:4873",
     "clean:registry": "rm -rf ../../.registry/@ez4/gateway",
     "live:publish": "npm run build && npm publish --access public"
   },
   "dependencies": {
-    "@ez4/common": "^0.26.0",
-    "@ez4/project": "^0.26.0",
-    "@ez4/reflection": "^0.26.0",
-    "@ez4/schema": "^0.26.0",
-    "@ez4/transform": "^0.26.0",
-    "@ez4/utils": "^0.26.0",
-    "@ez4/validator": "^0.26.0"
+    "@ez4/common": "^0.27.0",
+    "@ez4/project": "^0.27.0",
+    "@ez4/reflection": "^0.27.0",
+    "@ez4/schema": "^0.27.0",
+    "@ez4/transform": "^0.27.0",
+    "@ez4/utils": "^0.27.0",
+    "@ez4/validator": "^0.27.0"
   }
 }