@effect-app/infra 2.26.1 → 2.27.1

package/CHANGELOG.md

@@ -1,5 +1,25 @@
 # @effect-app/infra
 
+## 2.27.1
+
+### Patch Changes
+
+- Updated dependencies [a30da33]
+- Updated dependencies [9301abb]
+  - effect-app@2.14.0
+
+## 2.27.0
+
+### Minor Changes
+
+- 5d3278c: make routing7 the default
+
+### Patch Changes
+
+- 125e2ea: update packages
+- Updated dependencies [125e2ea]
+  - effect-app@2.13.3
+
 ## 2.26.1
 
 ### Patch Changes

package/_cjs/api/routing.cjs

@@ -11,6 +11,8 @@ var _utils = require("effect-app/utils");
 var _errorReporter = require("../errorReporter.cjs");
 var _logger = require("../logger.cjs");
 var _DynamicMiddleware = require("./routing/DynamicMiddleware.cjs");
+var _utils2 = require("./routing/utils.cjs");
+const optimisticConcurrencySchedule = _effectApp.Schedule.once && _effectApp.Schedule.recurWhile(a => a._tag === "OptimisticConcurrencyException");
 const logRequestError = (0, _errorReporter.logError)("Request");
 const reportRequestError = (0, _errorReporter.reportError)("Request");
 /**
@@ -112,6 +114,9 @@ const makeRouter = (middleware, devMode) => {
         const mapped = (0, _utils.typedKeysOf)(filtered).reduce((acc, cur) => {
           const handler = controllers[cur];
           const req = rsc[cur];
+          const method = (0, _utils2.determineMethod)(String(cur), req);
+          const isCommand = method._tag === "command";
+          const handle = isCommand ? req => _effectApp.Effect.retry(handler.handler(req), optimisticConcurrencySchedule) : req => _effectApp.Effect.interruptible(handler.handler(req));
           acc[cur] = rpc.effect(handler._tag === "raw" ? class extends req {
             static success = _effectApp.S.encodedSchema(req.success);
             get [_effectApp.Schema.symbolSerializable]() {
@@ -130,7 +135,7 @@ const makeRouter = (middleware, devMode) => {
             return prev;
           }, {})).pipe(
           // can't use andThen due to some being a function and effect
-          _effectApp.Effect.zipRight(handler.handler(req)), _effectApp.Effect.tapErrorCause(cause => _effectApp.Cause.isFailure(cause) ? logRequestError(cause) : _effectApp.Effect.void), _effectApp.Effect.tapDefect(cause => _effectApp.Effect.all([reportRequestError(cause, {
+          _effectApp.Effect.zipRight(handle(req)), _effectApp.Effect.tapErrorCause(cause => _effectApp.Cause.isFailure(cause) ? logRequestError(cause) : _effectApp.Effect.void), _effectApp.Effect.tapDefect(cause => _effectApp.Effect.all([reportRequestError(cause, {
             action: `${meta.moduleName}.${req._tag}`
           }), _rpc.Rpc.currentHeaders.pipe(_effectApp.Effect.andThen(headers => {
             return _logger.InfraLogger.logError("Finished request", cause).pipe(_effectApp.Effect.annotateLogs({
@@ -155,9 +160,7 @@ const makeRouter = (middleware, devMode) => {
         const httpApp = toHttpApp(rpcRouter, {
           spanPrefix: rsc.meta.moduleName + "."
         });
-        yield* router.all("/", httpApp,
-        // TODO: not queries.
-        {
+        yield* router.all("/", httpApp, {
           uninterruptible: true
         });
       }));
@@ -184,8 +187,13 @@ const makeRouter = (middleware, devMode) => {
         return this;
       }
     };
+    const router3 = obj => (0, _utils.typedKeysOf)(obj).reduce((acc, cur) => {
+      acc[cur] = "raw" in obj[cur] ? items[cur].raw(obj[cur].raw) : items[cur](obj[cur]);
+      return acc;
+    }, {});
     return Object.assign(effect, items, {
-      router
+      router,
+      router3
     });
   }
   function matchAll(handlers, requestLayer) {
@@ -203,7 +211,8 @@ const makeRouter = (middleware, devMode) => {
   }
   return {
     matchAll,
-    matchFor
+    matchFor: rsc => matchFor(rsc).router3,
+    Router: matchFor
   };
 };
 exports.makeRouter = makeRouter;

package/_cjs/api/routing.cjs.map

@@ -1 +1 @@
-{"version":3,"file":"routing.cjs","names":["_rpc","require","_effectApp","_http","_utils","_errorReporter","_logger","_DynamicMiddleware","logRequestError","logError","reportRequestError","reportError","toHttpApp","self","options","handler","RpcRouter","toHandler","Effect","withFiberRuntime","fiber","context","getFiberRef","FiberRef","currentContext","request","Context","unsafeGet","HttpServerRequest","flatMap","json","_","pipe","Stream","provideContext","runCollect","map","Chunk","toReadonlyArray","andThen","status","r","flat","results","Array","isArray","some","_tag","cause","HttpServerResponse","orDie","tapDefect","exports","RouterSymbol","Symbol","makeMiddleware","content","makeRouter","middleware","devMode","matchFor","rsc","meta","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","items","prev","Object","assign","fnOrEffect","stack","Error","split","slice","join","isEffect","success","successRaw","S","encodedSchema","failure","raw","req","ctx","Response","f","layers","make","Router","HttpRouter","Tag","moduleName","layer","use","router","gen","controllers","rpc","makeRpc","mapped","effect","Schema","symbolSerializable","constructor","symbolWithResult","annotateCurrentSpan","entries","key","value","length","substring","undefined","keys","zipRight","tapErrorCause","Cause","isFailure","void","all","action","Rpc","currentHeaders","headers","InfraLogger","annotateLogs","pretty","catchAllDefect","die","withSpan","captureStackTrace","rpcRouter","values","httpApp","spanPrefix","uninterruptible","routes","Layer","provideMerge","Live","isNonEmptyReadonlyArray","provide","dependencies","m","total","accum","add","a","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}
+{"version":3,"file":"routing.cjs","names":["_rpc","require","_effectApp","_http","_utils","_errorReporter","_logger","_DynamicMiddleware","_utils2","optimisticConcurrencySchedule","Schedule","once","recurWhile","a","_tag","logRequestError","logError","reportRequestError","reportError","toHttpApp","self","options","handler","RpcRouter","toHandler","Effect","withFiberRuntime","fiber","context","getFiberRef","FiberRef","currentContext","request","Context","unsafeGet","HttpServerRequest","flatMap","json","_","pipe","Stream","provideContext","runCollect","map","Chunk","toReadonlyArray","andThen","status","r","flat","results","Array","isArray","some","cause","HttpServerResponse","orDie","tapDefect","exports","RouterSymbol","Symbol","makeMiddleware","content","makeRouter","middleware","devMode","matchFor","rsc","meta","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","items","prev","Object","assign","fnOrEffect","stack","Error","split","slice","join","isEffect","success","successRaw","S","encodedSchema","failure","raw","req","ctx","Response","f","layers","make","Router","HttpRouter","Tag","moduleName","layer","use","router","gen","controllers","rpc","makeRpc","mapped","method","determineMethod","String","isCommand","handle","retry","interruptible","effect","Schema","symbolSerializable","constructor","symbolWithResult","annotateCurrentSpan","entries","key","value","length","substring","undefined","keys","zipRight","tapErrorCause","Cause","isFailure","void","all","action","Rpc","currentHeaders","headers","InfraLogger","annotateLogs","pretty","catchAllDefect","die","withSpan","captureStackTrace","rpcRouter","values","httpApp","spanPrefix","uninterruptible","routes","Layer","provideMerge","Live","isNonEmptyReadonlyArray","provide","dependencies","m","total","accum","add","router3","obj","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/api/{routing7.cjs → routing.legacy2.cjs}

@@ -11,8 +11,6 @@ var _utils = require("effect-app/utils");
 var _errorReporter = require("../errorReporter.cjs");
 var _logger = require("../logger.cjs");
 var _DynamicMiddleware = require("./routing/DynamicMiddleware.cjs");
-var _utils2 = require("./routing/utils.cjs");
-const optimisticConcurrencySchedule = _effectApp.Schedule.once && _effectApp.Schedule.recurWhile(a => a._tag === "OptimisticConcurrencyException");
 const logRequestError = (0, _errorReporter.logError)("Request");
 const reportRequestError = (0, _errorReporter.reportError)("Request");
 /**
@@ -114,9 +112,6 @@ const makeRouter = (middleware, devMode) => {
         const mapped = (0, _utils.typedKeysOf)(filtered).reduce((acc, cur) => {
           const handler = controllers[cur];
           const req = rsc[cur];
-          const method = (0, _utils2.determineMethod)(String(cur), req);
-          const isCommand = method._tag === "command";
-          const handle = isCommand ? req => _effectApp.Effect.retry(handler.handler(req), optimisticConcurrencySchedule) : req => _effectApp.Effect.interruptible(handler.handler(req));
           acc[cur] = rpc.effect(handler._tag === "raw" ? class extends req {
             static success = _effectApp.S.encodedSchema(req.success);
             get [_effectApp.Schema.symbolSerializable]() {
@@ -135,7 +130,7 @@ const makeRouter = (middleware, devMode) => {
             return prev;
           }, {})).pipe(
           // can't use andThen due to some being a function and effect
-          _effectApp.Effect.zipRight(handle(req)), _effectApp.Effect.tapErrorCause(cause => _effectApp.Cause.isFailure(cause) ? logRequestError(cause) : _effectApp.Effect.void), _effectApp.Effect.tapDefect(cause => _effectApp.Effect.all([reportRequestError(cause, {
+          _effectApp.Effect.zipRight(handler.handler(req)), _effectApp.Effect.tapErrorCause(cause => _effectApp.Cause.isFailure(cause) ? logRequestError(cause) : _effectApp.Effect.void), _effectApp.Effect.tapDefect(cause => _effectApp.Effect.all([reportRequestError(cause, {
             action: `${meta.moduleName}.${req._tag}`
           }), _rpc.Rpc.currentHeaders.pipe(_effectApp.Effect.andThen(headers => {
             return _logger.InfraLogger.logError("Finished request", cause).pipe(_effectApp.Effect.annotateLogs({
@@ -160,7 +155,9 @@ const makeRouter = (middleware, devMode) => {
         const httpApp = toHttpApp(rpcRouter, {
           spanPrefix: rsc.meta.moduleName + "."
         });
-        yield* router.all("/", httpApp, {
+        yield* router.all("/", httpApp,
+        // TODO: not queries.
+        {
           uninterruptible: true
         });
       }));
@@ -187,13 +184,8 @@ const makeRouter = (middleware, devMode) => {
         return this;
       }
     };
-    const router3 = obj => (0, _utils.typedKeysOf)(obj).reduce((acc, cur) => {
-      acc[cur] = "raw" in obj[cur] ? items[cur].raw(obj[cur].raw) : items[cur](obj[cur]);
-      return acc;
-    }, {});
     return Object.assign(effect, items, {
-      router,
-      router3
+      router
     });
   }
   function matchAll(handlers, requestLayer) {
@@ -211,9 +203,8 @@ const makeRouter = (middleware, devMode) => {
   }
   return {
     matchAll,
-    matchFor: rsc => matchFor(rsc).router3,
-    Router: matchFor
+    matchFor
   };
 };
 exports.makeRouter = makeRouter;
-//# sourceMappingURL=routing7.cjs.map
+//# sourceMappingURL=routing.legacy2.cjs.map

package/_cjs/api/routing.legacy2.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"routing.legacy2.cjs","names":["_rpc","require","_effectApp","_http","_utils","_errorReporter","_logger","_DynamicMiddleware","logRequestError","logError","reportRequestError","reportError","toHttpApp","self","options","handler","RpcRouter","toHandler","Effect","withFiberRuntime","fiber","context","getFiberRef","FiberRef","currentContext","request","Context","unsafeGet","HttpServerRequest","flatMap","json","_","pipe","Stream","provideContext","runCollect","map","Chunk","toReadonlyArray","andThen","status","r","flat","results","Array","isArray","some","_tag","cause","HttpServerResponse","orDie","tapDefect","exports","RouterSymbol","Symbol","makeMiddleware","content","makeRouter","middleware","devMode","matchFor","rsc","meta","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","items","prev","Object","assign","fnOrEffect","stack","Error","split","slice","join","isEffect","success","successRaw","S","encodedSchema","failure","raw","req","ctx","Response","f","layers","make","Router","HttpRouter","Tag","moduleName","layer","use","router","gen","controllers","rpc","makeRpc","mapped","effect","Schema","symbolSerializable","constructor","symbolWithResult","annotateCurrentSpan","entries","key","value","length","substring","undefined","keys","zipRight","tapErrorCause","Cause","isFailure","void","all","action","Rpc","currentHeaders","headers","InfraLogger","annotateLogs","pretty","catchAllDefect","die","withSpan","captureStackTrace","rpcRouter","values","httpApp","spanPrefix","uninterruptible","routes","Layer","provideMerge","Live","isNonEmptyReadonlyArray","provide","dependencies","m","total","accum","add","a","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing.legacy2.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/_cjs/api/{routing6.cjs → routing.legacy3.cjs}

@@ -211,4 +211,4 @@ const makeRouter = (middleware, devMode) => {
   };
 };
 exports.makeRouter = makeRouter;
-//# sourceMappingURL=routing6.cjs.map
+//# sourceMappingURL=routing.legacy3.cjs.map

package/_cjs/api/routing.legacy3.cjs.map

@@ -0,0 +1 @@
+{"version":3,"file":"routing.legacy3.cjs","names":["_rpc","require","_effectApp","_http","_utils","_errorReporter","_logger","_DynamicMiddleware","logRequestError","logError","reportRequestError","reportError","toHttpApp","self","options","handler","RpcRouter","toHandler","Effect","withFiberRuntime","fiber","context","getFiberRef","FiberRef","currentContext","request","Context","unsafeGet","HttpServerRequest","flatMap","json","_","pipe","Stream","provideContext","runCollect","map","Chunk","toReadonlyArray","andThen","status","r","flat","results","Array","isArray","some","_tag","cause","HttpServerResponse","orDie","tapDefect","exports","RouterSymbol","Symbol","makeMiddleware","content","makeRouter","middleware","devMode","matchFor","rsc","meta","filtered","typedKeysOf","reduce","acc","cur","Predicate","isObject","items","prev","Object","assign","fnOrEffect","stack","Error","split","slice","join","isEffect","success","successRaw","S","encodedSchema","failure","raw","req","ctx","Response","f","layers","make","Router","HttpRouter","Tag","moduleName","layer","use","router","gen","controllers","rpc","makeRpc","mapped","effect","Schema","symbolSerializable","constructor","symbolWithResult","annotateCurrentSpan","entries","key","value","length","substring","undefined","keys","zipRight","tapErrorCause","Cause","isFailure","void","all","action","Rpc","currentHeaders","headers","InfraLogger","annotateLogs","pretty","catchAllDefect","die","withSpan","captureStackTrace","rpcRouter","values","httpApp","spanPrefix","uninterruptible","routes","Layer","provideMerge","Live","isNonEmptyReadonlyArray","provide","dependencies","m","total","accum","router2","it","matchAll","handlers","requestLayer","routers","typedValuesOf","rootRouter","route","mount","flow"],"sources":["../../src/api/routing.legacy3.ts"],"sourcesContent":[null],"mappings":"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","ignoreList":[]}

package/dist/Model/Repository/internal/internal.d.ts

@@ -22,12 +22,12 @@ export declare function makeRepoInternal<Evt = never>(): <ItemType extends strin
         config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
             partitionValue?: (a: Encoded) => string;
         };
-    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<R, RCtx>, RPublish>, E, R | StoreMaker | RInitial>;
+    }) => Effect.Effect<Repository<T, Encoded, Evt, ItemType, IdKey, Exclude<R, RCtx>, RPublish>, E, StoreMaker | R | RInitial>;
     Q: Q.Query<Encoded>;
 };
 export declare function makeStore<Encoded extends FieldValues>(): <ItemType extends string, R, E, T, IdKey extends keyof Encoded>(name: ItemType, schema: S.Schema<T, E, R>, mapTo: (e: E, etag: string | undefined) => Encoded, idKey: IdKey) => <RInitial = never, EInitial = never>(makeInitial?: Effect<readonly T[], EInitial, RInitial>, config?: Omit<StoreConfig<Encoded>, "partitionValue"> & {
     partitionValue?: (a: Encoded) => string;
-}) => Effect.Effect<import("../../../Store.js").Store<IdKey, Encoded, PersistenceModelType<Encoded>>, EInitial, R | StoreMaker | RInitial>;
+}) => Effect.Effect<import("../../../Store.js").Store<IdKey, Encoded, PersistenceModelType<Encoded>>, EInitial, StoreMaker | R | RInitial>;
 export interface Repos<T, Encoded extends {
     id: string;
 }, RSchema, Evt, ItemType extends string, IdKey extends keyof T, RPublish> {

package/dist/Operations.d.ts

@@ -56,15 +56,15 @@ declare const Operations_base: (abstract new (service: {
     update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
 }>) & {
     toLayer: {
-        (): Layer.Layer<Operations, never, OperationsRepo | RequestFiberSet>;
+        (): Layer.Layer<Operations, never, RequestFiberSet | OperationsRepo>;
         <E_1, R_1>(eff: Effect.Effect<Omit<Operations, keyof Context.TagClassShape<any, any>>, E_1, R_1>): Layer.Layer<Operations, E_1, R_1>;
     };
     toLayerScoped: {
-        (): Layer.Layer<Operations, never, OperationsRepo | RequestFiberSet>;
+        (): Layer.Layer<Operations, never, RequestFiberSet | OperationsRepo>;
         <E_1, R_2>(eff: Effect.Effect<Context.TagClassShape<any, any>, E_1, R_2>): Layer.Layer<Operations, E_1, Exclude<R_2, Scope.Scope>>;
     };
     of: (service: Context.TagClassShape<any, any>) => Operations;
-    make: Effect.Effect<Operations, never, OperationsRepo | RequestFiberSet>;
+    make: Effect.Effect<Operations, never, RequestFiberSet | OperationsRepo>;
 } & Context.Tag<Operations, Operations> & {
     cleanup: Effect.Effect<void[], never, Operations>;
     register: (title: S.NonEmptyString2k) => Effect.Effect<S.StringId, never, Scope.Scope | Operations>;