@effect-app/infra 2.84.0 → 2.85.0

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @effect-app/infra
 
+## 2.85.0
+
+### Minor Changes
+
+- 00bf1b7: allow multiple dynamic middleware at once
+
 ## 2.84.0
 
 ### Minor Changes

package/dist/api/routing/middleware/middleware-api.d.ts

@@ -6,8 +6,8 @@ export declare const contextMap: <RequestContextMap>() => <K extends keyof Reque
     settings: RequestContextMap[typeof a];
 };
 type DynamicMiddlewareMakerrsss<RequestContext extends Record<string, RPCContextMap.Any>, Provided extends keyof RequestContext, Middlewares extends NonEmptyReadonlyArray<GenericMiddlewareMaker>, DynamicMiddlewareProviders extends RequestContextMapProvider<RequestContext>> = keyof Omit<RequestContext, Provided> extends never ? ReturnType<typeof makeMiddlewareBasic<RequestContext, DynamicMiddlewareProviders, Middlewares>> : {
-    addDynamicMiddleware: <MW extends DynamicMiddlewareMaker<RequestContext>>(a: MW) => DynamicMiddlewareMakerrsss<RequestContext, Provided | MW["dynamic"]["key"], Middlewares, DynamicMiddlewareProviders & {
-        [K in MW["dynamic"]["key"]]: MW;
+    addDynamicMiddleware: <MW extends NonEmptyReadonlyArray<DynamicMiddlewareMaker<RequestContext>>>(...middlewares: MW) => DynamicMiddlewareMakerrsss<RequestContext, Provided | MW[number]["dynamic"]["key"], Middlewares, DynamicMiddlewareProviders & {
+        [K in keyof MW as MW[K] extends DynamicMiddlewareMaker<RequestContext> ? MW[K]["dynamic"]["key"] : never]: MW[K];
     }>;
 };
 export declare const makeNewMiddleware: <RequestContextMap extends Record<string, RPCContextMap.Any>>() => <Middlewares extends NonEmptyReadonlyArray<GenericMiddlewareMaker>>(...genericMiddlewares: Middlewares) => DynamicMiddlewareMakerrsss<RequestContextMap, never, Middlewares, never>;

package/dist/api/routing/middleware/middleware-api.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware-api.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAkB,KAAK,mBAAmB,EAAE,KAAK,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AAIrK,eAAO,MAAM,UAAU,GAAI,iBAAiB,QAAQ,CAAC,SAAS,MAAM,iBAAiB,EAAE,GAAG,CAAC;;cAEhE,iBAAiB,CAAC,OAAO,CAAC,CAAC;CACpD,CAAA;AAEF,KAAK,0BAA0B,CAC7B,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EACxD,QAAQ,SAAS,MAAM,cAAc,EACrC,WAAW,SAAS,qBAAqB,CAAC,sBAAsB,CAAC,EACjE,0BAA0B,SAAS,yBAAyB,CAAC,cAAc,CAAC,IAC1E,MAAM,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,SAAS,KAAK,GAClD,UAAU,CAAC,OAAO,mBAAmB,CAAC,cAAc,EAAE,0BAA0B,EAAE,WAAW,CAAC,CAAC,GAC/F;IACA,oBAAoB,EAAE,CAAC,EAAE,SAAS,sBAAsB,CAAC,cAAc,CAAC,EACtE,CAAC,EAAE,EAAE,KACF,0BAA0B,CAC7B,cAAc,EACd,QAAQ,GAAG,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,EAC/B,WAAW,EACX,0BAA0B,GAAG;SAAG,CAAC,IAAI,EAAE,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE;KAAE,CACjE,CAAA;CACF,CAAA;AAEH,eAAO,MAAM,iBAAiB,EAAE,CAC9B,iBAAiB,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,OACtD,CAAC,WAAW,SAAS,qBAAqB,CAAC,sBAAsB,CAAC,EACvE,GAAG,kBAAkB,EAAE,WAAW,KAC/B,0BAA0B,CAAC,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,CAW3E,CAAA"}
+{"version":3,"file":"middleware-api.d.ts","sourceRoot":"","sources":["../../../../src/api/routing/middleware/middleware-api.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAA;AACvD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,mBAAmB,CAAA;AACtD,OAAO,EAAE,KAAK,sBAAsB,EAAE,KAAK,sBAAsB,EAAkB,KAAK,mBAAmB,EAAE,KAAK,yBAAyB,EAAE,MAAM,kBAAkB,CAAA;AAIrK,eAAO,MAAM,UAAU,GAAI,iBAAiB,QAAQ,CAAC,SAAS,MAAM,iBAAiB,EAAE,GAAG,CAAC;;cAEhE,iBAAiB,CAAC,OAAO,CAAC,CAAC;CACpD,CAAA;AAEF,KAAK,0BAA0B,CAC7B,cAAc,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,EACxD,QAAQ,SAAS,MAAM,cAAc,EACrC,WAAW,SAAS,qBAAqB,CAAC,sBAAsB,CAAC,EACjE,0BAA0B,SAAS,yBAAyB,CAAC,cAAc,CAAC,IAC1E,MAAM,IAAI,CAAC,cAAc,EAAE,QAAQ,CAAC,SAAS,KAAK,GAClD,UAAU,CAAC,OAAO,mBAAmB,CAAC,cAAc,EAAE,0BAA0B,EAAE,WAAW,CAAC,CAAC,GAC/F;IACA,oBAAoB,EAAE,CAAC,EAAE,SAAS,qBAAqB,CAAC,sBAAsB,CAAC,cAAc,CAAC,CAAC,EAC7F,GAAG,WAAW,EAAE,EAAE,KACf,0BAA0B,CAC7B,cAAc,EACd,QAAQ,GAAG,EAAE,CAAC,MAAM,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,EACvC,WAAW,EACT,0BAA0B,GAC1B;SACC,CAAC,IAAI,MAAM,EAAE,IAAI,EAAE,CAAC,CAAC,CAAC,SAAS,sBAAsB,CAAC,cAAc,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,KAAK,CAAC,GAAG,KAAK,GAAG,EAAE,CAAC,CAAC,CAAC;KACjH,CACF,CAAA;CACF,CAAA;AAEH,eAAO,MAAM,iBAAiB,EAAE,CAC9B,iBAAiB,SAAS,MAAM,CAAC,MAAM,EAAE,aAAa,CAAC,GAAG,CAAC,OACtD,CAAC,WAAW,SAAS,qBAAqB,CAAC,sBAAsB,CAAC,EACvE,GAAG,kBAAkB,EAAE,WAAW,KAC/B,0BAA0B,CAAC,iBAAiB,EAAE,KAAK,EAAE,WAAW,EAAE,KAAK,CAa3E,CAAA"}

package/dist/api/routing/middleware/middleware-api.js

@@ -9,12 +9,14 @@ export const makeNewMiddleware = () => (...genericMiddlewares) => {
     const dynamicMiddlewares = {};
     const make = makeMiddleware();
     const it = {
-        addDynamicMiddleware: (a) => {
-            console.log("Adding dynamic middleware", a, a.dynamic, Object.keys(a));
-            dynamicMiddlewares[a.dynamic.key] = a;
+        addDynamicMiddleware: (...middlewares) => {
+            for (const a of middlewares) {
+                console.log("Adding dynamic middleware", a, a.dynamic, Object.keys(a));
+                dynamicMiddlewares[a.dynamic.key] = a;
+            }
             return Object.assign(make({ genericMiddlewares: genericMiddlewares, dynamicMiddlewares }), it);
         }
     };
     return it;
 };
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS1hcGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvbWlkZGxld2FyZS9taWRkbGV3YXJlLWFwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQTRELGNBQWMsRUFBNEQsTUFBTSxrQkFBa0IsQ0FBQTtBQUVySyxzSEFBc0g7QUFDdEgsb0hBQW9IO0FBQ3BILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxHQUFzQixFQUFFLENBQUMsQ0FBb0MsQ0FBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQy9GLEdBQUcsRUFBRSxDQUFDO0lBQ04sUUFBUSxFQUFFLElBQTBDO0NBQ3JELENBQUMsQ0FBQTtBQW9CRixNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FJa0QsR0FBRyxFQUFFLENBQUMsQ0FBQyxHQUFHLGtCQUFrQixFQUFFLEVBQUU7SUFDOUcsTUFBTSxrQkFBa0IsR0FBMkIsRUFBUyxDQUFBO0lBQzVELE1BQU0sSUFBSSxHQUFHLGNBQWMsRUFBTyxDQUFBO0lBQ2xDLE1BQU0sRUFBRSxHQUFHO1FBQ1Qsb0JBQW9CLEVBQUUsQ0FBQyxDQUFNLEVBQUUsRUFBRTtZQUMvQixPQUFPLENBQUMsR0FBRyxDQUFDLDJCQUEyQixFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FDckU7WUFBQyxrQkFBMEIsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQTtZQUMvQyxPQUFPLE1BQU0sQ0FBQyxNQUFNLENBQUMsSUFBSSxDQUFDLEVBQUUsa0JBQWtCLEVBQUUsa0JBQXlCLEVBQUUsa0JBQWtCLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFBO1FBQ3ZHLENBQUM7S0FDRixDQUFBO0lBQ0QsT0FBTyxFQUFTLENBQUE7QUFDbEIsQ0FBQyxDQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWlkZGxld2FyZS1hcGkuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi8uLi9zcmMvYXBpL3JvdXRpbmcvbWlkZGxld2FyZS9taWRkbGV3YXJlLWFwaS50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFFQSxPQUFPLEVBQTRELGNBQWMsRUFBNEQsTUFBTSxrQkFBa0IsQ0FBQTtBQUVySyxzSEFBc0g7QUFDdEgsb0hBQW9IO0FBQ3BILE1BQU0sQ0FBQyxNQUFNLFVBQVUsR0FBRyxHQUFzQixFQUFFLENBQUMsQ0FBb0MsQ0FBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO0lBQy9GLEdBQUcsRUFBRSxDQUFDO0lBQ04sUUFBUSxFQUFFLElBQTBDO0NBQ3JELENBQUMsQ0FBQTtBQXVCRixNQUFNLENBQUMsTUFBTSxpQkFBaUIsR0FJa0QsR0FBRyxFQUFFLENBQUMsQ0FBQyxHQUFHLGtCQUFrQixFQUFFLEVBQUU7SUFDOUcsTUFBTSxrQkFBa0IsR0FBd0IsRUFBUyxDQUFBO0lBQ3pELE1BQU0sSUFBSSxHQUFHLGNBQWMsRUFBTyxDQUFBO0lBQ2xDLE1BQU0sRUFBRSxHQUFHO1FBQ1Qsb0JBQW9CLEVBQUUsQ0FBQyxHQUFHLFdBQWtCLEVBQUUsRUFBRTtZQUM5QyxLQUFLLE1BQU0sQ0FBQyxJQUFJLFdBQVcsRUFBRSxDQUFDO2dCQUM1QixPQUFPLENBQUMsR0FBRyxDQUFDLDJCQUEyQixFQUFFLENBQUMsRUFBRSxDQUFDLENBQUMsT0FBTyxFQUFFLE1BQU0sQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtnQkFDdEUsa0JBQWtCLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FBQyxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUE7WUFDdkMsQ0FBQztZQUNELE9BQU8sTUFBTSxDQUFDLE1BQU0sQ0FBQyxJQUFJLENBQUMsRUFBRSxrQkFBa0IsRUFBRSxrQkFBeUIsRUFBRSxrQkFBa0IsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUE7UUFDdkcsQ0FBQztLQUNGLENBQUE7SUFDRCxPQUFPLEVBQVMsQ0FBQTtBQUNsQixDQUFDLENBQUEifQ==

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@effect-app/infra",
-  "version": "2.84.0",
+  "version": "2.85.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {

package/src/api/routing/middleware/middleware-api.ts

@@ -17,14 +17,17 @@ type DynamicMiddlewareMakerrsss<
 > = keyof Omit<RequestContext, Provided> extends never
   ? ReturnType<typeof makeMiddlewareBasic<RequestContext, DynamicMiddlewareProviders, Middlewares>>
   : {
-    addDynamicMiddleware: <MW extends DynamicMiddlewareMaker<RequestContext>>(
-      a: MW
+    addDynamicMiddleware: <MW extends NonEmptyReadonlyArray<DynamicMiddlewareMaker<RequestContext>>>(
+      ...middlewares: MW
     ) => DynamicMiddlewareMakerrsss<
       RequestContext,
-      Provided | MW["dynamic"]["key"],
+      Provided | MW[number]["dynamic"]["key"],
       Middlewares,
-      DynamicMiddlewareProviders & { [K in MW["dynamic"]["key"]]: MW }
-    > // TODO: any of RequestContecxtMap, and track them, so remove the ones provided
+      & DynamicMiddlewareProviders
+      & {
+        [K in keyof MW as MW[K] extends DynamicMiddlewareMaker<RequestContext> ? MW[K]["dynamic"]["key"] : never]: MW[K]
+      }
+    >
   }
 
 export const makeNewMiddleware: <
@@ -32,12 +35,14 @@ export const makeNewMiddleware: <
 >() => <Middlewares extends NonEmptyReadonlyArray<GenericMiddlewareMaker>>(
   ...genericMiddlewares: Middlewares
 ) => DynamicMiddlewareMakerrsss<RequestContextMap, never, Middlewares, never> = () => (...genericMiddlewares) => {
-  const dynamicMiddlewares: Record<keyof any, any> = {} as any
+  const dynamicMiddlewares: Record<string, any> = {} as any
   const make = makeMiddleware<any>()
   const it = {
-    addDynamicMiddleware: (a: any) => {
-      console.log("Adding dynamic middleware", a, a.dynamic, Object.keys(a))
-      ;(dynamicMiddlewares as any)[a.dynamic.key] = a
+    addDynamicMiddleware: (...middlewares: any[]) => {
+      for (const a of middlewares) {
+        console.log("Adding dynamic middleware", a, a.dynamic, Object.keys(a))
+        dynamicMiddlewares[a.dynamic.key] = a
+      }
       return Object.assign(make({ genericMiddlewares: genericMiddlewares as any, dynamicMiddlewares }), it)
     }
   }

package/test/controller.test.ts

@@ -207,8 +207,7 @@ const middleware2 = makeMiddleware<RequestContextMap>()({
 export const middleware3 = makeNewMiddleware<RequestContextMap>()(
   ...genericMiddlewares
 )
-  .addDynamicMiddleware(AllowAnonymous)
-  .addDynamicMiddleware(RequireRoles)
+  .addDynamicMiddleware(AllowAnonymous, RequireRoles)
   .addDynamicMiddleware(Test)
 
 expectTypeOf(middleware3).toEqualTypeOf<typeof middleware2>()

package/test/dist/controller.test.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,WAAW,EAAE,KAAK,UAAU,EAAc,MAAM,+BAA+B,CAAA;AAC7F,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,kCAAkC,CAAA;AAEtE,OAAO,EAAE,KAAK,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,CAAC,EAAE,KAAK,EAAE,MAAM,YAAY,CAAA;AACjF,OAAO,EAAoC,KAAK,aAAa,EAAE,iBAAiB,EAAE,MAAM,mBAAmB,CAAA;AAE3G,OAAO,EAAiG,UAAU,EAAO,MAAM,kCAAkC,CAAA;AAEjK,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;;;;;;;;;;;;;AAE7C,qBAAa,WAAY,SAAQ,gBAKhC;CACA;;;;;;AAED,qBAAa,gBAAiB,SAAQ,qBAEpC;CAAG;;;;AAEL,qBAAa,YAAa,SAAQ,iBAAmD;CAAG;;;;AACxF,qBAAa,YAAa,SAAQ,iBAAmD;CAAG;AAExF,MAAM,WAAW,GAAG;IAClB,OAAO,EAAE,cAAc,CAAA;CACxB;;;;;;;;;;;;;;;;;;;;;;;;;AAED,qBAAa,IAAK,SAAQ,SAA2D;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;AACxF,qBAAa,QAAS,SAAQ,aAAmE;CAAG;AA4CpG,MAAM,MAAM,iBAAiB,GAAG;IAC9B,cAAc,EAAE,aAAa,CAAC,QAAQ,CAAC,WAAW,EAAE,OAAO,gBAAgB,CAAC,CAAA;IAC5E,YAAY,EAAE,aAAa,CAAC,MAAM,CAAC,KAAK,EAAE,OAAO,iBAAiB,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC,CAAA;IAClF,IAAI,EAAE,aAAa,CAAC,KAAK,EAAE,OAAO,CAAC,CAAC,KAAK,CAAC,CAAA;CAC3C,CAAA;;;;;;;;;AAKD,cAAM,cAAe,SAAQ,mBAqB3B;CACD;;;;;;;;;;AAGD,cAAM,YAAa,SAAQ,iBAoBzB;CACD;;;;;;;;;AAED,cAAM,IAAK,SAAQ,SAMjB;CAAG;;;;;;;AAEL,qBAAa,eAAgB,SAAQ,oBAYnC;CACD;AAoDD,eAAO,MAAM,WAAW;;;;;CAKK,CAAA;AAI7B,MAAM,MAAM,aAAa,GAAG;IAC1B,yCAAyC;IACzC,cAAc,CAAC,EAAE,IAAI,CAAA;IACrB,iEAAiE;IACjE,UAAU,CAAC,EAAE,SAAS,MAAM,EAAE,CAAA;CAC/B,CAAA;AACD,eAAO,MAAuB,GAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAI/B,CAAA;;;;;;;;;;AAEF,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;AACtE,qBAAa,GAAI,SAAQ,QAA0C;CAAG;;;;;;;;;;;;AAEtE,qBAAa,WAAY,SAAQ,gBAEV;CAAG;;;;;;;;;;;;AAgB1B,qBAAa,YAAa,SAAQ,iBAET;CAAG;;;;;;;;;;;;AAE5B,qBAAa,aAAc,SAAQ,kBAEA;CAAG;;;;;AAItC,qBAAa,gBAAiB,SAAQ,qBAKpC;CAAG;;;;;AASL,qBAAa,aAAc,SAAQ,kBAOjC;CAAG;;;;;AAEL,qBAAa,iBAAkB,SAAQ,sBAKrC;CAAG;AAEL,eAAO,MAAQ,MAAM;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAAE,QAAQ;;;;;2HAAE,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uCAAiC,CAAA;AAE1E,eAAO,MAAM,EAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAAgC,CAAA;AAyJ/C,eAAO,MAAM,kBAAkB;;;;;;;;;;CAI7B,CAAA"}
+{"version":3,"file":"controller.test.d.ts","sourceRoot":"","sources":["../controller.test.ts"],"names":[],"mappings":"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"}