@ez4/gateway 0.37.0 → 0.38.0

package/dist/metadata/http/defaults.d.ts

@@ -1,4 +1,4 @@
 import type { AllType, ReflectionTypes, TypeModel } from '@ez4/reflection';
-import { type HttpDefaults } from './types';
+import type { HttpDefaults } from './types';
 export declare const isHttpDefaultsDeclaration: (type: TypeModel) => boolean;
 export declare const getHttpDefaultsMetadata: (type: AllType, parent: TypeModel, reflection: ReflectionTypes, errorList: Error[]) => HttpDefaults | undefined;

package/dist/metadata/http/types.d.ts

@@ -1,7 +1,7 @@
 import type { ArraySchema, NamingStyle, ObjectSchema, ScalarSchema, UnionSchema } from '@ez4/schema';
+import type { LinkedServices, LinkedVariables, ServiceMetadata } from '@ez4/project/library';
 import type { FunctionSignature, ServiceListener } from '@ez4/common/library';
-import type { LinkedServices, LinkedVariables } from '@ez4/project/library';
-import type { ServiceMetadata } from '@ez4/project/library';
+import type { ArchitectureType, RuntimeType } from '@ez4/project';
 import type { AuthorizationType } from '../../services/http/authorization';
 import type { HttpPath } from '../../services/http/path';
 import type { AuthHandler } from '../auth/types';
@@ -57,18 +57,12 @@ export type HttpHandler = FunctionSignature & {
 export type HttpErrors = {
     [name: string]: number;
 };
-export type HttpRoute = {
+export type HttpRoute = HttpDefaults & {
     name?: string;
     path: HttpPath;
     handler: HttpHandler;
-    listener?: ServiceListener;
     authorizer?: AuthHandler;
     variables?: LinkedVariables;
-    httpErrors?: HttpErrors;
-    preferences?: HttpPreferences;
-    logRetention?: number;
-    timeout?: number;
-    memory?: number;
     cors?: boolean;
     disabled?: boolean;
 };
@@ -76,6 +70,8 @@ export type HttpDefaults = {
     listener?: ServiceListener;
     httpErrors?: HttpErrors;
     preferences?: HttpPreferences;
+    architecture?: ArchitectureType;
+    runtime?: RuntimeType;
     logRetention?: number;
     timeout?: number;
     memory?: number;

package/dist/metadata/ws/types.d.ts

@@ -1,6 +1,7 @@
 import type { ArraySchema, NamingStyle, ObjectSchema, ScalarSchema, UnionSchema } from '@ez4/schema';
-import type { LinkedVariables, ServiceMetadata } from '@ez4/project/library';
 import type { FunctionSignature, ServiceListener } from '@ez4/common/library';
+import type { LinkedVariables, ServiceMetadata } from '@ez4/project/library';
+import type { ArchitectureType, RuntimeType } from '@ez4/project';
 import type { AuthHandler } from '../auth/types';
 export declare const WsServiceType = "@ez4/ws";
 export declare const WsNamespaceType = "Ws";
@@ -16,24 +17,14 @@ export type WsService = Omit<ServiceMetadata, 'variables' | 'services'> & Requir
     disconnect: WsConnection;
     message: WsMessage;
 };
-export type WsConnection = {
+export type WsConnection = WsDefaults & {
     handler: WsHandler;
-    listener?: ServiceListener;
     authorizer?: AuthHandler;
     variables?: LinkedVariables;
-    preferences?: WsPreferences;
-    logRetention?: number;
-    timeout?: number;
-    memory?: number;
 };
-export type WsMessage = {
+export type WsMessage = WsDefaults & {
     handler: WsHandler;
-    listener?: ServiceListener;
     variables?: LinkedVariables;
-    preferences?: WsPreferences;
-    logRetention?: number;
-    timeout?: number;
-    memory?: number;
 };
 export type WsHandler = FunctionSignature & {
     request?: WsRequest | WsEvent;
@@ -58,13 +49,12 @@ export type WsPreferences = {
 export type WsDefaults = {
     listener?: ServiceListener;
     preferences?: WsPreferences;
+    architecture?: ArchitectureType;
+    runtime?: RuntimeType;
     logRetention?: number;
     timeout?: number;
     memory?: number;
 };
-export type WsCache = {
-    authorizerTTL?: number;
-};
 export declare const isWsService: (service: ServiceMetadata) => service is WsService;
 export declare const createWsService: (name: string) => {
     variables: {};

package/dist/services/defaults.d.ts

@@ -1,3 +1,4 @@
+import type { ArchitectureType, RuntimeType } from '@ez4/project';
 import type { WebPreferences } from './preferences';
 /**
  * Default service parameters.
@@ -19,4 +20,12 @@ export interface WebDefaults {
      * Default amount of memory available (in megabytes) for handlers.
      */
     readonly memory?: number;
+    /**
+     * Default architecture for all the API functions.
+     */
+    readonly architecture?: ArchitectureType;
+    /**
+     * Default runtime for all the API functions.
+     */
+    readonly runtime?: RuntimeType;
 }

package/dist/services/http/contract.d.ts

@@ -7,9 +7,9 @@ import type { AuthIdentity } from '../auth/identity';
 import type { AuthCache } from '../auth/cache';
 import type { WebHeaders } from '../headers';
 import type { WebQueryStrings } from '../query';
-import type { WebPreferences } from '../preferences';
 import type { WebPathParameters } from '../parameters';
 import type { WebJsonBody, WebRawBody } from '../body';
+import type { WebPreferences } from '../preferences';
 import type { HttpSuccessStatuses, HttpSuccessEmptyResponse, HttpSuccessResponse, HttpEmptyRequest } from './utils';
 import type { HttpAuthorization } from './authorization';
 import type { HttpDefaults } from './defaults';

package/dist/services/http/incoming.d.ts

@@ -4,9 +4,13 @@ import type { HttpRequest } from './request';
  */
 export type HttpIncoming<T extends HttpRequest> = T & {
     /**
-     * Request tracking Id.
+     *  Unique identifier for the request.
      */
     readonly requestId: string;
+    /**
+     * Unique identifier across multiple services.
+     */
+    readonly traceId?: string;
     /**
      * Determines whether request is base64 encoded or not.
      */

package/dist/services/target.d.ts

@@ -1,3 +1,4 @@
+import type { ArchitectureType, RuntimeType } from '@ez4/project';
 import type { LinkedVariables } from '@ez4/project/library';
 import type { WebPreferences } from './preferences';
 /**
@@ -24,4 +25,12 @@ export interface WebTarget {
      * Amount of memory available (in megabytes) for the handler.
      */
     readonly memory?: number;
+    /**
+     * Architecture for the API function.
+     */
+    readonly architecture?: ArchitectureType;
+    /**
+     * Runtime for the API function.
+     */
+    readonly runtime?: RuntimeType;
 }

package/dist/services/ws/incoming.d.ts

@@ -5,9 +5,13 @@ import type { WsEvent } from './event';
  */
 export type WsIncoming<T extends WsRequest | WsEvent> = T & {
     /**
-     * Request tracking Id.
+     *  Unique identifier for the request.
      */
     readonly requestId: string;
+    /**
+     * Unique identifier across multiple services.
+     */
+    readonly traceId?: string;
     /**
      * Request connection Id.
      */

package/dist/utils.cjs

@@ -17,8 +17,8 @@ for(let o in e){let n=t&&(0,b.getSchemaProperty)(t,o),s=$(e[o],n);s&&r.push(`${o
 gs"),$=a((e,t)=>{if(!(0,h.isNullish)(e))return e instanceof Date?e.toISOString():
 e instanceof Array&&(!t||!(0,b.isArraySchema)(t)||!t.definitions?.encoded)?e.map(
 n=>$(n,t)).filter(n=>(0,h.isNotNullish)(n)).join(","):e instanceof Object?(0,h.base64Encode)(
-JSON.stringify(e)):`${e}`},"serializeQueryStringValue");var m=require("@ez4/transform"),g=require("@ez4/validator"),w=require("@ez4/schema"),
-q=require("@ez4/utils"),M=require("@ez4/gateway");var P=a((e,t,r)=>{if(!t||(0,w.isScalarSchema)(t))return{body:e.toString(),json:!1};
+JSON.stringify(e)):`${e}`},"serializeQueryStringValue");var m=require("@ez4/transform"),g=require("@ez4/validator"),v=require("@ez4/schema"),
+q=require("@ez4/utils"),M=require("@ez4/gateway");var P=a((e,t,r)=>{if(!t||(0,v.isScalarSchema)(t))return{body:e.toString(),json:!1};
 let o=(0,m.createTransformContext)({outputStyle:r?.namingStyle,convert:!1}),n=(0,m.transform)(
 e,t,o);return{body:JSON.stringify(n),json:!0}},"prepareRequestBody"),Y=a(async(e,t,r,o)=>{
 let n=r?.namingStyle,s=(0,m.createTransformContext)({convert:!1,inputStyle:n}),d=(0,g.createValidatorContext)(
@@ -26,8 +26,8 @@ let n=r?.namingStyle,s=(0,m.createTransformContext)({convert:!1,inputStyle:n}),d
 l,y.schema,s),y):o?.(l,y),"useCustomValidation"),property:"$body",inputStyle:n}),
 c=await(0,g.validate)(e,t,d);if(c.length){let l=(0,g.getUniqueErrorMessages)(c);
 throw new M.HttpBadRequestError("Malformed body payload.",l)}return(0,m.transform)(
-e,t,s)},"resolveRequestBody"),V=a((e,t,r)=>{if(!t||(0,w.isScalarSchema)(t))return e;
-let o=JSON.parse(e),n=(0,m.createTransformContext)({outputStyle:w.NamingStyle.Preserve,
+e,t,s)},"resolveRequestBody"),V=a((e,t,r)=>{if(!t||(0,v.isScalarSchema)(t))return e;
+let o=JSON.parse(e),n=(0,m.createTransformContext)({outputStyle:v.NamingStyle.Preserve,
 inputStyle:r?.namingStyle,convert:!1});return(0,m.transform)(o,t,n)},"prepareRes\
 ponseBody"),Z=a((e,t,r)=>{let o=r?.namingStyle,n=(0,m.createTransformContext)({convert:!1,
 outputStyle:o});return(0,m.transform)(e,t,n)},"resolveResponseBody");var R=require("@ez4/transform"),x=require("@ez4/validator"),Q=require("@ez4/gateway");var z=a((e,t)=>e.replaceAll(/\{(\w+)\}/g,(r,o)=>o in t?`${t[o]}`:`{${o}}`),"prep\
@@ -38,17 +38,17 @@ throw new Q.HttpBadRequestError("Malformed path parameters.",p)}return o},"resol
 vePathParameters");var i=require("@ez4/gateway");var et=a(({status:e,message:t,details:r})=>({status:e,body:{type:"error",message:t,
 details:r}}),"getJsonError"),O=a((e,t,r)=>{switch(e){case 400:return new i.HttpBadRequestError(
 t,r);case 401:return new i.HttpUnauthorizedError(t,r);case 403:return new i.HttpForbiddenError(
-t,r);case 404:return new i.HttpNotFoundError(t,r);case 415:return new i.HttpUnsupportedMediaTypeError(
-t,r);case 422:return new i.HttpUnprocessableEntityError(t,r);default:return new i.HttpError(
-e,t,r)}},"getHttpException");var rt=a((e,t,r)=>{let{parameters:o,query:n,querySchema:s,namingStyle:p}=r,d=o?z(
+t,r);case 404:return new i.HttpNotFoundError(t,r);case 409:return new i.HttpConflictError(
+t,r);case 415:return new i.HttpUnsupportedMediaTypeError(t,r);case 422:return new i.HttpUnprocessableEntityError(
+t,r);default:return new i.HttpError(e,t,r)}},"getHttpException");var rt=a((e,t,r)=>{let{parameters:o,query:n,querySchema:s,namingStyle:p}=r,d=o?z(
 t,o):t,c=n&&j(n,s,{namingStyle:p}),u=[e];return d&&u.push(d),c&&u.push("?",c),u.
 join("")},"getClientRequestUrl"),ot=a(async(e,t,r)=>{let{authorization:o,headers:n,
 body:s,bodySchema:p,responseSchema:d,namingStyle:c,timeout:u=20}=r,l=s?P(s,p,{namingStyle:c}):
 void 0,y=new AbortController,F=setTimeout(()=>y?.abort("Request timed out"),u*1e3),
-v=await fetch(e,{signal:y?.signal,body:l?.body,method:t,headers:{...n,...o&&{[o.
+w=await fetch(e,{signal:y?.signal,body:l?.body,method:t,headers:{...n,...o&&{[o.
 header]:o.value},...l?.json&&{"content-type":"application/json"}}});if(clearTimeout(
-F),!v.ok){let U=await v.json();throw O(v.status,U.message,U.details)}let A=await v.
-text();return{status:v.status,...A&&{body:V(A,d,{namingStyle:c})}}},"sendClientR\
+F),!w.ok){let U=await w.json();throw O(w.status,U.message,U.details)}let A=await w.
+text();return{status:w.status,...A&&{body:V(A,d,{namingStyle:c})}}},"sendClientR\
 equest");var E=require("@ez4/transform"),H=require("@ez4/validator"),I=require("@ez4/gateway");var nt=a(async(e,t,r)=>{let o=(0,E.transform)(e,t,(0,E.createTransformContext)({
 convert:!1})),n=(0,H.createValidatorContext)({property:"$header",onCustomValidation:r}),
 s=await(0,H.validate)(o,t,n);if(s.length){let p=(0,H.getUniqueErrorMessages)(s);

package/dist/utils.mjs

@@ -6,51 +6,51 @@ n=H(e,t,o);return g(n,t)},"prepareQueryStrings"),vt=a(async(e,t,r,o)=>{let n=r?.
 namingStyle,s=x({convert:!0,inputStyle:n}),i=H(e,t,s),m=z({property:"$query",pathStyle:n,
 onCustomValidation:o}),p=await V(i,t,m);if(p.length){let l=O(p);throw new M("Mal\
 formed query strings.",l)}return i},"resolveQueryStrings"),g=a((e,t)=>{let r=[];
-for(let o in e){let n=t&&N(t,o),s=v(e[o],n);s&&r.push(`${o}=${encodeURIComponent(
-s)}`)}if(r.length)return r.join("&")},"serializeQueryStrings"),v=a((e,t)=>{if(!B(
+for(let o in e){let n=t&&N(t,o),s=w(e[o],n);s&&r.push(`${o}=${encodeURIComponent(
+s)}`)}if(r.length)return r.join("&")},"serializeQueryStrings"),w=a((e,t)=>{if(!B(
 e))return e instanceof Date?e.toISOString():e instanceof Array&&(!t||!$(t)||!t.definitions?.
-encoded)?e.map(n=>v(n,t)).filter(n=>U(n)).join(","):e instanceof Object?A(JSON.stringify(
+encoded)?e.map(n=>w(n,t)).filter(n=>U(n)).join(","):e instanceof Object?A(JSON.stringify(
 e)):`${e}`},"serializeQueryStringValue");import{createTransformContext as f,transform as y}from"@ez4/transform";import{validate as Q,
 createValidatorContext as I,getUniqueErrorMessages as J}from"@ez4/validator";import{
-isScalarSchema as w,NamingStyle as k}from"@ez4/schema";import{isAnyArray as F,isAnyObject as D}from"@ez4/utils";
-import{HttpBadRequestError as _}from"@ez4/gateway";var T=a((e,t,r)=>{if(!t||w(t))return{body:e.toString(),json:!1};let o=f({outputStyle:r?.
+isScalarSchema as v,NamingStyle as k}from"@ez4/schema";import{isAnyArray as F,isAnyObject as D}from"@ez4/utils";
+import{HttpBadRequestError as _}from"@ez4/gateway";var T=a((e,t,r)=>{if(!t||v(t))return{body:e.toString(),json:!1};let o=f({outputStyle:r?.
 namingStyle,convert:!1}),n=y(e,t,o);return{body:JSON.stringify(n),json:!0}},"pre\
-pareRequestBody"),Pt=a(async(e,t,r,o)=>{let n=r?.namingStyle,s=f({convert:!1,inputStyle:n}),
+pareRequestBody"),Vt=a(async(e,t,r,o)=>{let n=r?.namingStyle,s=f({convert:!1,inputStyle:n}),
 m=I({onCustomValidation:a((c,d)=>D(c)||F(c)?o?.(y(c,d.schema,s),d):o?.(c,d),"use\
 CustomValidation"),property:"$body",inputStyle:n}),p=await Q(e,t,m);if(p.length){
 let c=J(p);throw new _("Malformed body payload.",c)}return y(e,t,s)},"resolveReq\
-uestBody"),b=a((e,t,r)=>{if(!t||w(t))return e;let o=JSON.parse(e),n=f({outputStyle:k.
+uestBody"),b=a((e,t,r)=>{if(!t||v(t))return e;let o=JSON.parse(e),n=f({outputStyle:k.
 Preserve,inputStyle:r?.namingStyle,convert:!1});return y(o,t,n)},"prepareRespons\
-eBody"),Vt=a((e,t,r)=>{let o=r?.namingStyle,n=f({convert:!1,outputStyle:o});return y(
+eBody"),zt=a((e,t,r)=>{let o=r?.namingStyle,n=f({convert:!1,outputStyle:o});return y(
 e,t,n)},"resolveResponseBody");import{createTransformContext as G,transform as K}from"@ez4/transform";import{validate as L,
 getUniqueErrorMessages as W,createValidatorContext as X}from"@ez4/validator";import{
 HttpBadRequestError as Y}from"@ez4/gateway";var q=a((e,t)=>e.replaceAll(/\{(\w+)\}/g,(r,o)=>o in t?`${t[o]}`:`{${o}}`),"prep\
-arePathParameters"),Nt=a(async(e,t,r)=>{let o=K(e,t,G({convert:!1})),n=X({property:"\
+arePathParameters"),$t=a(async(e,t,r)=>{let o=K(e,t,G({convert:!1})),n=X({property:"\
 $path",onCustomValidation:r}),s=await L(o,t,n);if(s.length){let i=W(s);throw new Y(
 "Malformed path parameters.",i)}return o},"resolvePathParameters");import{HttpBadRequestError as Z,HttpUnauthorizedError as tt,HttpForbiddenError as et,
-HttpNotFoundError as rt,HttpUnsupportedMediaTypeError as ot,HttpUnprocessableEntityError as nt,
-HttpError as at}from"@ez4/gateway";var It=a(({status:e,message:t,details:r})=>({status:e,body:{type:"error",message:t,
+HttpNotFoundError as rt,HttpConflictError as ot,HttpUnsupportedMediaTypeError as nt,
+HttpUnprocessableEntityError as at,HttpError as st}from"@ez4/gateway";var Jt=a(({status:e,message:t,details:r})=>({status:e,body:{type:"error",message:t,
 details:r}}),"getJsonError"),R=a((e,t,r)=>{switch(e){case 400:return new Z(t,r);case 401:
-return new tt(t,r);case 403:return new et(t,r);case 404:return new rt(t,r);case 415:
-return new ot(t,r);case 422:return new nt(t,r);default:return new at(e,t,r)}},"g\
-etHttpException");var Kt=a((e,t,r)=>{let{parameters:o,query:n,querySchema:s,namingStyle:i}=r,m=o?q(
+return new tt(t,r);case 403:return new et(t,r);case 404:return new rt(t,r);case 409:
+return new ot(t,r);case 415:return new nt(t,r);case 422:return new at(t,r);default:
+return new st(e,t,r)}},"getHttpException");var Lt=a((e,t,r)=>{let{parameters:o,query:n,querySchema:s,namingStyle:i}=r,m=o?q(
 t,o):t,p=n&&C(n,s,{namingStyle:i}),l=[e];return m&&l.push(m),p&&l.push("?",p),l.
-join("")},"getClientRequestUrl"),Lt=a(async(e,t,r)=>{let{authorization:o,headers:n,
+join("")},"getClientRequestUrl"),Wt=a(async(e,t,r)=>{let{authorization:o,headers:n,
 body:s,bodySchema:i,responseSchema:m,namingStyle:p,timeout:l=20}=r,c=s?T(s,i,{namingStyle:p}):
 void 0,d=new AbortController,j=setTimeout(()=>d?.abort("Request timed out"),l*1e3),
 u=await fetch(e,{signal:d?.signal,body:c?.body,method:t,headers:{...n,...o&&{[o.
 header]:o.value},...c?.json&&{"content-type":"application/json"}}});if(clearTimeout(
 j),!u.ok){let h=await u.json();throw R(u.status,h.message,h.details)}let S=await u.
 text();return{status:u.status,...S&&{body:b(S,m,{namingStyle:p})}}},"sendClientR\
-equest");import{createTransformContext as st,transform as it}from"@ez4/transform";import{
-validate as pt,createValidatorContext as ct,getUniqueErrorMessages as mt}from"@ez4/validator";
-import{HttpBadRequestError as lt}from"@ez4/gateway";var ee=a(async(e,t,r)=>{let o=it(e,t,st({convert:!1})),n=ct({property:"$header",
-onCustomValidation:r}),s=await pt(o,t,n);if(s.length){let i=mt(s);throw new lt("\
-Malformed request headers.",i)}return o},"resolveHeaders");import{validate as dt,createValidatorContext as ut,getUniqueErrorMessages as yt}from"@ez4/validator";
-import{HttpBadRequestError as ft}from"@ez4/gateway";var se=a(async(e,t,r)=>{let o=ut({property:"$identity",onCustomValidation:r}),n=await dt(
-e,t,o);if(n.length){let s=yt(n);throw new ft("Malformed authorizer identity.",s)}
-return e},"resolveIdentity");var E=a(e=>`@${e}`,"getValidatorName");var de=a(async(e,t,r)=>{let o=t[E(r)];o&&await o.validate(e)},"resolveValidation");export{Kt as getClientRequestUrl,R as getHttpException,It as getJsonError,q as preparePathParameters,
-C as prepareQueryStrings,T as prepareRequestBody,b as prepareResponseBody,ee as resolveHeaders,
-se as resolveIdentity,Nt as resolvePathParameters,vt as resolveQueryStrings,Pt as resolveRequestBody,
-Vt as resolveResponseBody,de as resolveValidation,Lt as sendClientRequest};
+equest");import{createTransformContext as it,transform as pt}from"@ez4/transform";import{
+validate as ct,createValidatorContext as mt,getUniqueErrorMessages as lt}from"@ez4/validator";
+import{HttpBadRequestError as dt}from"@ez4/gateway";var re=a(async(e,t,r)=>{let o=pt(e,t,it({convert:!1})),n=mt({property:"$header",
+onCustomValidation:r}),s=await ct(o,t,n);if(s.length){let i=lt(s);throw new dt("\
+Malformed request headers.",i)}return o},"resolveHeaders");import{validate as ut,createValidatorContext as yt,getUniqueErrorMessages as ft}from"@ez4/validator";
+import{HttpBadRequestError as St}from"@ez4/gateway";var ie=a(async(e,t,r)=>{let o=yt({property:"$identity",onCustomValidation:r}),n=await ut(
+e,t,o);if(n.length){let s=ft(n);throw new St("Malformed authorizer identity.",s)}
+return e},"resolveIdentity");var E=a(e=>`@${e}`,"getValidatorName");var ue=a(async(e,t,r)=>{let o=t[E(r)];o&&await o.validate(e)},"resolveValidation");export{Lt as getClientRequestUrl,R as getHttpException,Jt as getJsonError,q as preparePathParameters,
+C as prepareQueryStrings,T as prepareRequestBody,b as prepareResponseBody,re as resolveHeaders,
+ie as resolveIdentity,$t as resolvePathParameters,vt as resolveQueryStrings,Vt as resolveRequestBody,
+zt as resolveResponseBody,ue as resolveValidation,Wt as sendClientRequest};
 //# sourceMappingURL=utils.mjs.map

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@ez4/gateway",
   "description": "EZ4: Components to build gateway services",
-  "version": "0.37.0",
+  "version": "0.38.0",
   "author": "Silas B.",
   "license": "MIT",
   "type": "module",
@@ -51,12 +51,12 @@
     "live:publish": "npm run build && npm publish --access public"
   },
   "dependencies": {
-    "@ez4/common": "^0.37.0",
-    "@ez4/project": "^0.37.0",
-    "@ez4/reflection": "^0.37.0",
-    "@ez4/schema": "^0.37.0",
-    "@ez4/transform": "^0.37.0",
-    "@ez4/utils": "^0.37.0",
-    "@ez4/validator": "^0.37.0"
+    "@ez4/common": "^0.38.0",
+    "@ez4/project": "^0.38.0",
+    "@ez4/reflection": "^0.38.0",
+    "@ez4/schema": "^0.38.0",
+    "@ez4/transform": "^0.38.0",
+    "@ez4/utils": "^0.38.0",
+    "@ez4/validator": "^0.38.0"
   }
 }