@effect-app/infra 0.132.2 → 0.133.0-next.0

package/dist/services/simpledb/redisdb.js

@@ -1,10 +1,11 @@
 import * as tsplus_module_1 from "effect/Effect";
-import * as tsplus_module_2 from "@effect-app/core/Effect";
-import * as tsplus_module_3 from "effect/Option";
+import * as tsplus_module_2 from "@effect/schema/Parser";
+import * as tsplus_module_3 from "@effect-app/core/Effect";
+import * as tsplus_module_4 from "effect/Option";
 /* eslint-disable @typescript-eslint/no-explicit-any */
-import { flow, pipe } from "@effect-app/core/Function";
+import { flow } from "@effect-app/core/Function";
 import { RedisClient } from "@effect-app/infra-adapters/redis-client";
-import * as S from "@effect-app/schema";
+import * as S from "@effect-app/prelude/schema";
 import { ConnectionException, CouldNotAquireDbLockException, getIndexName, getRecordName } from "./shared.js";
 import * as simpledb from "./simpledb.js";
 const ttl = 10 * 1000;
@@ -17,26 +18,26 @@ export function createContext() {
             save: simpledb.store(find, store, lockRedisRecord, type)
         };
         function find(id) {
-            return tsplus_module_1.orDie(tsplus_module_2.flatMapOption(tsplus_module_1.flatMap(RedisClient, (_) => _.hmgetAll(getKey(id))), (v) => tsplus_module_1.mapError(tsplus_module_1.map(pipe(RedisSerializedDBRecord.Parser, S.condemnFail)(v), ({ data, version }) => ({
+            return tsplus_module_1.orDie(tsplus_module_3.flatMapOption(tsplus_module_1.flatMap(RedisClient, (_) => _.hmgetAll(getKey(id))), (v) => tsplus_module_1.mapError(tsplus_module_1.map(tsplus_module_2.parse(RedisSerializedDBRecord)(v), ({ data, version }) => ({
                 data: JSON.parse(data),
                 version
             })), (e) => new ConnectionException(new Error(e.toString())))));
         }
         function store(record, currentVersion) {
-            const version = tsplus_module_3.getOrElse(tsplus_module_3.map(currentVersion, (cv) => (parseInt(cv) + 1).toString()), () => "1");
-            return tsplus_module_3.match(currentVersion, {
-                onNone: () => tsplus_module_1.scoped(tsplus_module_1.zipRight(lockIndex(record), tsplus_module_1.map(tsplus_module_1.orDie(tsplus_module_1.zipRight(tsplus_module_1.flatMap(tsplus_module_1.zipRight(tsplus_module_2.zipRightOption(getIndex(record), tsplus_module_1.fail(() => new Error("Combination already exists, abort"))), getData(record))
+            const version = tsplus_module_4.getOrElse(tsplus_module_4.map(currentVersion, (cv) => (parseInt(cv) + 1).toString()), () => "1");
+            return tsplus_module_4.match(currentVersion, {
+                onNone: () => tsplus_module_1.scoped(tsplus_module_1.zipRight(lockIndex(record), tsplus_module_1.map(tsplus_module_1.orDie(tsplus_module_1.zipRight(tsplus_module_1.flatMap(tsplus_module_1.zipRight(tsplus_module_3.zipRightOption(getIndex(record), tsplus_module_1.fail(() => new Error("Combination already exists, abort"))), getData(record))
                 // TODO: instead use MULTI & EXEC to make it in one command?
-                , (data) => hmSetRec(getKey(record.id), {
+                , (data) => hmSetRec(getKey(record.id), new RedisSerializedDBRecord({
                     version,
                     timestamp: new Date(),
                     data
-                })), setIndex(record))), () => ({ version, data: record })))),
-                onSome: () => tsplus_module_1.map(tsplus_module_1.orDie(tsplus_module_1.flatMap(getData(record), (data) => hmSetRec(getKey(record.id), {
+                }))), setIndex(record))), () => ({ version, data: record })))),
+                onSome: () => tsplus_module_1.map(tsplus_module_1.orDie(tsplus_module_1.flatMap(getData(record), (data) => hmSetRec(getKey(record.id), new RedisSerializedDBRecord({
                     version,
                     timestamp: new Date(),
                     data
-                }))), () => ({ version, data: record }))
+                })))), () => ({ version, data: record }))
             });
         }
         function getIndex(record) {
@@ -52,7 +53,7 @@ export function createContext() {
             return lockRedisIdx(index);
         }
         function getIdx(index) {
-            return tsplus_module_1.flatMap(RedisClient, (_) => tsplus_module_1.map(_.hget(getIdxKey(index), index.key), (_) => tsplus_module_3.map(_, (i) => i)));
+            return tsplus_module_1.flatMap(RedisClient, (_) => tsplus_module_1.map(_.hget(getIdxKey(index), index.key), (_) => tsplus_module_4.map(_, (i) => i)));
         }
         function setIdx(index, r) {
             return tsplus_module_1.flatMap(RedisClient, (_) => _.hset(getIdxKey(index), index.key, r.id));
@@ -93,7 +94,7 @@ export function createContext() {
         }
     };
     function hmSetRec(key, val) {
-        const enc = RedisSerializedDBRecord.encodeSync(val);
+        const enc = tsplus_module_2.encodeSync(RedisSerializedDBRecord)(val);
         return tsplus_module_1.flatMap(RedisClient, ({ client }) => tsplus_module_1.uninterruptible(tsplus_module_1.async((res) => {
             client.hmset(key, "version", enc.version, "timestamp", enc.timestamp, "data", enc.data, (err) => err
                 ? res(new ConnectionException(err))
@@ -103,8 +104,8 @@ export function createContext() {
 }
 export class RedisSerializedDBRecord extends S.Class()({
     version: S.string,
-    timestamp: S.date,
+    timestamp: S.Date,
     data: S.string
 }) {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXNkYi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvc2ltcGxlZGIvcmVkaXNkYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7QUFBQSx1REFBdUQ7QUFFdkQsT0FBTyxFQUFFLElBQUksRUFBRSxJQUFJLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUN0RCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0seUNBQXlDLENBQUE7QUFDckUsT0FBTyxLQUFLLENBQUMsTUFBTSxvQkFBb0IsQ0FBQTtBQUd2QyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsNkJBQTZCLEVBQUUsWUFBWSxFQUFFLGFBQWEsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUM3RyxPQUFPLEtBQUssUUFBUSxNQUFNLGVBQWUsQ0FBQTtBQUV6QyxNQUFNLEdBQUcsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFBO0FBRXJCLE1BQU0sVUFBVSxhQUFhO0lBQzNCLE9BQU8sQ0FDTCxJQUFZLEVBQ1osTUFBaUQsRUFDakQsTUFBOEMsRUFDOUMsYUFBcUIsRUFDckIsWUFBNkIsRUFDN0IsRUFBRTtRQUNGLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLG9CQUFBLENBQUMsRUFBSyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtRQUMxRCxPQUFPO1lBQ0wsSUFBSSxFQUFFLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUM7WUFDdkMsV0FBVyxFQUFFLE1BQU07WUFDbkIsSUFBSSxFQUFFLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsSUFBSSxDQUFDO1NBQ3pELENBQUE7UUFFRCxTQUFTLElBQUksQ0FBQyxFQUFVO1lBQ3RCLDZCQUFPLDhCQUFBLHdCQUFBLFdBQVcsRUFDUCxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxFQUMzQixDQUFDLENBQUMsRUFBRSxFQUFFLENBQ2hCLHlCQUFBLG9CQUFBLElBQUksQ0FDRix1QkFBdUIsQ0FBQyxNQUFNLEVBQzlCLENBQUMsQ0FBQyxXQUFXLENBQ2QsQ0FBQyxDQUFDLENBQUMsRUFDRyxDQUFDLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxFQUFFLEVBQUUsQ0FBQyxDQUFDO2dCQUMzQixJQUFJLEVBQUUsSUFBSSxDQUFDLEtBQUssQ0FBQyxJQUFJLENBQU87Z0JBQzVCLE9BQU87YUFDUixDQUFDLENBQUMsRUFDTyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsSUFBSSxtQkFBbUIsQ0FBQyxJQUFJLEtBQUssQ0FBQyxDQUFDLENBQUMsUUFBUSxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQ3JFLEVBQ0s7UUFDVixDQUFDO1FBQ0QsU0FBUyxLQUFLLENBQUMsTUFBUyxFQUFFLGNBQThCO1lBQ3RELE1BQU0sT0FBTyxHQUFHLDBCQUFBLG9CQUFBLGNBQWMsRUFDdkIsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLFFBQVEsRUFBRSxDQUFDLEVBQ2hDLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1lBQ3ZCLE9BQU8sc0JBQUEsY0FBYyxFQUNuQjtnQkFDRSxNQUFNLEVBQUUsR0FBRyxFQUFFLHdCQUNYLHlCQUFBLFNBQVMsQ0FBQyxNQUFNLENBQUMsRUFFYiwwQ0FBQSx5QkFBQSx3QkFBQSx5QkFBQSwrQkFBQSxRQUFRLENBQUMsTUFBTSxDQUFDLEVBRVoscUJBQVksR0FBRyxFQUFFLENBQUMsSUFBSSxLQUFLLENBQUMsbUNBQW1DLENBQUMsQ0FBQyxDQUNsRSxFQUNTLE9BQU8sQ0FBQyxNQUFNLENBQUMsQ0FBQztnQkFDMUIsNERBQTREO2tCQUNuRCxDQUFDLElBQUksRUFBRSxFQUFFLENBQ2hCLFFBQVEsQ0FBQyxNQUFNLENBQUMsTUFBTSxDQUFDLEVBQUUsQ0FBQyxFQUFFO29CQUMxQixPQUFPO29CQUNQLFNBQVMsRUFBRSxJQUFJLElBQUksRUFBRTtvQkFDckIsSUFBSTtpQkFDTCxDQUFDLENBQ0gsRUFDUyxRQUFRLENBQUMsTUFBTSxDQUFDLENBQUMsR0FFdEIsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSxFQUFzQixDQUFBLENBQUMsQ0FDN0QsQ0FDTTtnQkFDWCxNQUFNLEVBQUUsR0FBRyxFQUFFLENBQ1gsMENBQUEsd0JBQUEsT0FBTyxDQUFDLE1BQU0sQ0FBQyxFQUNKLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FDaEIsUUFBUSxDQUFDLE1BQU0sQ0FBQyxNQUFNLENBQUMsRUFBRSxDQUFDLEVBQUU7b0JBQzFCLE9BQU87b0JBQ1AsU0FBUyxFQUFFLElBQUksSUFBSSxFQUFFO29CQUNyQixJQUFJO2lCQUNMLENBQUMsQ0FDSCxHQUVJLEdBQUcsRUFBRSxDQUFDLENBQUMsRUFBRSxPQUFPLEVBQUUsSUFBSSxFQUFFLE1BQU0sRUFBc0IsQ0FBQSxDQUFDO2FBQy9ELENBQ0YsQ0FBQTtRQUNILENBQUM7UUFFRCxTQUFTLFFBQVEsQ0FBQyxNQUFTO1lBQ3pCLE1BQU0sS0FBSyxHQUFHLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQTtZQUNsQyxPQUFPLE1BQU0sQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUN0QixDQUFDO1FBRUQsU0FBUyxRQUFRLENBQUMsTUFBUztZQUN6QixNQUFNLEtBQUssR0FBRyxZQUFZLENBQUMsTUFBTSxDQUFDLENBQUE7WUFDbEMsT0FBTyxNQUFNLENBQUMsS0FBSyxFQUFFLE1BQU0sQ0FBQyxDQUFBO1FBQzlCLENBQUM7UUFFRCxTQUFTLFNBQVMsQ0FBQyxNQUFTO1lBQzFCLE1BQU0sS0FBSyxHQUFHLFlBQVksQ0FBQyxNQUFNLENBQUMsQ0FBQTtZQUNsQyxPQUFPLFlBQVksQ0FBQyxLQUFLLENBQUMsQ0FBQTtRQUM1QixDQUFDO1FBRUQsU0FBUyxNQUFNLENBQUMsS0FBWTtZQUMxQixPQUFPLHdCQUFBLFdBQVcsRUFBUyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsb0JBQUEsQ0FBQyxDQUFDLElBQUksQ0FBQyxTQUFTLENBQUMsS0FBSyxDQUFDLEVBQUUsS0FBSyxDQUFDLEdBQUcsQ0FBQyxFQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxvQkFBQSxDQUFDLEVBQUssQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQTtRQUM1RyxDQUFDO1FBRUQsU0FBUyxNQUFNLENBQUMsS0FBWSxFQUFFLENBQUk7WUFDaEMsT0FBTyx3QkFBQSxXQUFXLEVBQVMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsU0FBUyxDQUFDLEtBQUssQ0FBQyxFQUFFLEtBQUssQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDOUUsQ0FBQztRQUVELFNBQVMsWUFBWSxDQUFDLEtBQVk7WUFDaEMsTUFBTSxPQUFPLEdBQUcsYUFBYSxDQUFDLEtBQUssQ0FBQyxDQUFBO1lBQ3BDLFVBQVU7WUFDVixPQUFPLCtCQUFBLHdCQUFBLHdCQUFBLFdBQVcsRUFDUCxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUFDLDJCQUFrQixHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sRUFBRSxHQUFHLENBQTZCLENBQUMsQ0FBQyxFQUMzRjtnQkFDUCxTQUFTLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLElBQUksNkJBQTZCLENBQUMsSUFBSSxFQUFFLE9BQU8sRUFBRSxHQUFZLENBQUM7Z0JBQ2xGLFVBQVU7Z0JBQ1YsU0FBUyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO29CQUNwQixPQUFPLHdCQUFFLDJCQUNLLEdBQUcsRUFBRSxDQUFDLElBQUksQ0FBQyxNQUFNLEVBQThCLENBQUMsQ0FDdEQ7aUJBQ1QsQ0FBQzthQUNILENBQUMsRUFFQSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFDLE9BQU8sQ0FDakIsQ0FBQTtRQUNMLENBQUM7UUFFRCxTQUFTLGVBQWUsQ0FBQyxFQUFVO1lBQ2pDLFVBQVU7WUFDVixPQUFPLCtCQUFBLHdCQUFBLHdCQUFBLFdBQVcsRUFDUCxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxDQUNwQiwyQkFDRSxHQUFHLEVBQUUsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLFVBQVUsQ0FBQyxFQUFFLENBQUMsRUFBRSxHQUFHLENBQTZCLENBQ2pFLENBQ0YsRUFDUTtnQkFDUCxTQUFTLEVBQUUsQ0FBQyxHQUFHLEVBQUUsRUFBRSxDQUFDLElBQUksNkJBQTZCLENBQUMsSUFBSSxFQUFFLEVBQUUsRUFBRSxHQUFZLENBQUM7Z0JBQzdFLFVBQVU7Z0JBQ1YsU0FBUyxFQUFFLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxDQUFDO29CQUNwQixPQUFPO29CQUNQLE9BQU8sd0JBQUUsMkJBQ0ssR0FBRyxFQUFFLENBQUMsSUFBSSxDQUFDLE1BQU0sRUFBOEIsQ0FBQyxDQUN0RDtpQkFDVCxDQUFDO2FBQ0gsQ0FBQyxFQUVBLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDLENBQUMsT0FBTyxDQUNqQixDQUFBO1FBQ0wsQ0FBQztRQUVELFNBQVMsTUFBTSxDQUFDLEVBQVU7WUFDeEIsT0FBTyxJQUFJLGFBQWEsSUFBSSxhQUFhLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUE7UUFDdkQsQ0FBQztRQUVELFNBQVMsVUFBVSxDQUFDLEVBQVU7WUFDNUIsT0FBTyxJQUFJLGFBQWEsVUFBVSxhQUFhLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxFQUFFLENBQUE7UUFDN0QsQ0FBQztRQUVELFNBQVMsU0FBUyxDQUFDLEtBQVk7WUFDN0IsT0FBTyxJQUFJLGFBQWEsSUFBSSxZQUFZLENBQUMsSUFBSSxFQUFFLEtBQUssQ0FBQyxHQUFHLENBQUMsRUFBRSxDQUFBO1FBQzdELENBQUM7UUFDRCxTQUFTLGFBQWEsQ0FBQyxLQUFZO1lBQ2pDLE9BQU8sSUFBSSxhQUFhLFVBQVUsWUFBWSxDQUFDLElBQUksRUFBRSxLQUFLLENBQUMsR0FBRyxDQUFDLElBQUksS0FBSyxDQUFDLEdBQUcsRUFBRSxDQUFBO1FBQ2hGLENBQUM7SUFDSCxDQUFDLENBQUE7SUFFRCxTQUFTLFFBQVEsQ0FBQyxHQUFXLEVBQUUsR0FBNEI7UUFDekQsTUFBTSxHQUFHLEdBQUcsdUJBQXVCLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFBO1FBQ25ELE9BQU8sd0JBQUEsV0FBVyxFQUFTLENBQUMsRUFBRSxNQUFNLEVBQUUsRUFBRSxFQUFFLGlDQUN4QyxzQkFDMkMsQ0FBQyxHQUFHLEVBQUUsRUFBRTtZQUMvQyxNQUFNLENBQUMsS0FBSyxDQUNWLEdBQUcsRUFDSCxTQUFTLEVBQ1QsR0FBRyxDQUFDLE9BQU8sRUFDWCxXQUFXLEVBQ1gsR0FBRyxDQUFDLFNBQVMsRUFDYixNQUFNLEVBQ04sR0FBRyxDQUFDLElBQUksRUFDUixDQUFDLEdBQUcsRUFBRSxFQUFFLENBQ04sR0FBRztnQkFDRCxDQUFDLENBQUMsR0FBRyxDQUFDLElBQUksbUJBQW1CLENBQUMsR0FBRyxDQUFDLENBQUM7Z0JBQ25DLENBQUMsQ0FBQyxHQUFHLENBQUMsMkJBQU8sS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUMxQixDQUFBO1FBQ0gsQ0FBQyxDQUFDLENBQ2MsQ0FDbkIsQ0FBQTtJQUNILENBQUM7QUFDSCxDQUFDO0FBRUQsTUFBTSxPQUFPLHVCQUF3QixTQUFRLENBQUMsQ0FBQyxLQUFLLEVBQTJCLENBQUM7SUFDOUUsT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNO0lBQ2pCLFNBQVMsRUFBRSxDQUFDLENBQUMsSUFBSTtJQUNqQixJQUFJLEVBQUUsQ0FBQyxDQUFDLE1BQU07Q0FDZixDQUFDO0NBQUcifQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmVkaXNkYi5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvc2ltcGxlZGIvcmVkaXNkYi50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7O0FBQUEsdURBQXVEO0FBRXZELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUNoRCxPQUFPLEVBQUUsV0FBVyxFQUFFLE1BQU0seUNBQXlDLENBQUE7QUFDckUsT0FBTyxLQUFLLENBQUMsTUFBTSw0QkFBNEIsQ0FBQTtBQUcvQyxPQUFPLEVBQUUsbUJBQW1CLEVBQUUsNkJBQTZCLEVBQUUsWUFBWSxFQUFFLGFBQWEsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUM3RyxPQUFPLEtBQUssUUFBUSxNQUFNLGVBQWUsQ0FBQTtBQUV6QyxNQUFNLEdBQUcsR0FBRyxFQUFFLEdBQUcsSUFBSSxDQUFBO0FBRXJCLE1BQU0sVUFBVSxhQUFhO0lBQzNCLE9BQU8sQ0FDTCxJQUFZLEVBQ1osTUFBaUQsRUFDakQsTUFBOEMsRUFDOUMsYUFBcUIsRUFDckIsWUFBNkIsRUFDN0IsRUFBRTtRQUNGLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxNQUFNLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLG9CQUFBLENBQUMsRUFBSyxJQUFJLENBQUMsU0FBUyxDQUFDLENBQUMsQ0FBQTtRQUMxRCxPQUFPO1lBQ0wsSUFBSSxFQUFFLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxFQUFFLE1BQU0sRUFBRSxJQUFJLENBQUM7WUFDdkMsV0FBVyxFQUFFLE1BQU07WUFDbkIsSUFBSSxFQUFFLFFBQVEsQ0FBQyxLQUFLLENBQUMsSUFBSSxFQUFFLEtBQUssRUFBRSxlQUFlLEVBQUUsSUFBSSxDQUFDO1NBQ3pELENBQUE7UUFFRCxTQUFTLElBQUksQ0FBQyxFQUFVO1lBQ3RCLDZCQUFPLDhCQUFBLHdCQUFBLFdBQVcsRUFDUCxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMs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

package/dist/services/simpledb/shared.d.ts

@@ -1,8 +1,8 @@
 import { Data } from "effect/Data";
+import { Schema } from "@effect-app/prelude/schema";
 import { Effect } from "effect/Effect";
 import { Option } from "@effect-app/core/Option";
-import * as S from "@effect-app/schema";
-import type { SchemaAny } from "@effect-app/schema";
+import * as S from "@effect-app/prelude/schema";
 declare const CouldNotAquireDbLockException_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").Equals<Omit<A, keyof import("effect/Equal").Equal>, {}> extends true ? void : { readonly [P in keyof A as P extends "_tag" | keyof import("effect/Equal").Equal ? never : P]: A[P]; }) => import("effect/Cause").YieldableError & {
     readonly _tag: "CouldNotAquireDbLockException";
 } & Readonly<A>;
@@ -37,22 +37,30 @@ export declare class ConnectionException extends ConnectionException_base<{
 export interface DBRecord<TKey extends string> {
     id: TKey;
 }
-declare const SerializedDBRecord_base: S.Class<SerializedDBRecord, S.SchemaProperties<S.ToProps<{
-    version: S.SchemaDefaultSchema<unknown, string, string, string, {}>;
-    timestamp: S.SchemaDefaultSchema<unknown, Date, Date, string, {}>;
-    data: S.SchemaDefaultSchema<unknown, string, string, string, {}>;
-}>>> & S.PropsExtensions<S.ToProps<{
-    version: S.SchemaDefaultSchema<unknown, string, string, string, {}>;
-    timestamp: S.SchemaDefaultSchema<unknown, Date, Date, string, {}>;
-    data: S.SchemaDefaultSchema<unknown, string, string, string, {}>;
-}>>;
+declare const SerializedDBRecord_base: S.Class<{
+    readonly data: string;
+    readonly version: string;
+    readonly timestamp: string;
+}, {
+    readonly data: string;
+    readonly version: string;
+    readonly timestamp: Date;
+}, {
+    readonly data: string;
+    readonly version: string;
+    readonly timestamp: Date;
+}, SerializedDBRecord, import("effect/Data").Case>;
 export declare class SerializedDBRecord extends SerializedDBRecord_base {
 }
-export declare function makeSerialisedDBRecord(s: SchemaAny): S.SchemaProperties<S.ToProps<{
-    version: S.SchemaDefaultSchema<unknown, number, number, number, {}>;
-    timestamp: S.SchemaDefaultSchema<unknown, Date, Date, string, {}>;
-    data: S.SchemaAny;
-}>>;
+export declare function makeSerialisedDBRecord(s: Schema<any, any>): S.Schema<{
+    readonly data: any;
+    readonly version: number;
+    readonly timestamp: string;
+}, {
+    readonly data: any;
+    readonly version: number;
+    readonly timestamp: Date;
+}>;
 export interface CachedRecord<T> {
     version: string;
     data: T;

package/dist/services/simpledb/shared.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../_src/services/simpledb/shared.ts"],"names":[],"mappings":";;;AAAA,OAAO,KAAK,CAAC,MAAM,oBAAoB,CAAA;AACvC,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,oBAAoB,CAAA;;;;AAEnD,qBAAa,6BACX,SAAQ,mCAAkD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;gBAE1G,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK;CAGnD;;;;AAED,qBAAa,uBACX,SAAQ,6BAA4C;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;gBAEtF,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGrC;;;;AAED,qBAAa,mBAAoB,SAAQ,yBAAwC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;IACjH,QAAQ,CAAC,SAAS,yBAAwB;gBAC9B,KAAK,EAAE,KAAK;CAGzB;AAED,MAAM,WAAW,QAAQ,CAAC,IAAI,SAAS,MAAM;IAC3C,EAAE,EAAE,IAAI,CAAA;CACT;;;;;;;;;;AAED,qBAAa,kBAAmB,SAAQ,uBAItC;CAAG;AAGL,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,SAAS;;;;IAMlD;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,CAAC,CAAA;CACR;AAED,MAAM,WAAW,KAAK;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAEpD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAErD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,CAAC,wBAU9B;AAED,MAAM,WAAW,SAAS,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAChD,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAClD,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CACnD"}
+{"version":3,"file":"shared.d.ts","sourceRoot":"","sources":["../../../_src/services/simpledb/shared.ts"],"names":[],"mappings":";;;;AAAA,OAAO,KAAK,CAAC,MAAM,4BAA4B,CAAA;;;;AAE/C,qBAAa,6BACX,SAAQ,mCAAkD;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;gBAE1G,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK;CAGnD;;;;AAED,qBAAa,uBACX,SAAQ,6BAA4C;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,EAAE,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;gBAEtF,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM;CAGrC;;;;AAED,qBAAa,mBAAoB,SAAQ,yBAAwC;IAAE,KAAK,EAAE,KAAK,CAAC;IAAC,OAAO,EAAE,MAAM,CAAA;CAAE,CAAC;IACjH,QAAQ,CAAC,SAAS,yBAAwB;gBAC9B,KAAK,EAAE,KAAK;CAGzB;AAED,MAAM,WAAW,QAAQ,CAAC,IAAI,SAAS,MAAM;IAC3C,EAAE,EAAE,IAAI,CAAA;CACT;;;;;;;;;;;;;;AAED,qBAAa,kBAAmB,SAAQ,uBAItC;CAAG;AAGL,wBAAgB,sBAAsB,CAAC,CAAC,EAAE,MAAM,CAAC,GAAG,EAAE,GAAG,CAAC;;;;;;;;GAMzD;AAED,MAAM,WAAW,YAAY,CAAC,CAAC;IAC7B,OAAO,EAAE,MAAM,CAAA;IACf,IAAI,EAAE,CAAC,CAAA;CACR;AAED,MAAM,WAAW,KAAK;IACpB,GAAG,EAAE,MAAM,CAAA;IACX,GAAG,EAAE,MAAM,CAAA;CACZ;AAED,wBAAgB,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAEpD;AAED,wBAAgB,aAAa,CAAC,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,MAAM,UAErD;AAED,wBAAgB,OAAO,CAAC,IAAI,EAAE,CAAC,wBAU9B;AAED,MAAM,WAAW,SAAS,CAAC,IAAI,EAAE,CAAC;IAChC,CAAC,MAAM,CAAC,QAAQ,CAAC,IAAI,gBAAgB,CAAC,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,CAAA;IAChD,IAAI,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,CAAC,CAAC,CAAA;IAClD,GAAG,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,CAAC,EAAE,CAAC,KAAK,MAAM,CAAC,KAAK,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CACnD"}

package/dist/services/simpledb/shared.js

@@ -1,7 +1,7 @@
 import * as tsplus_module_1 from "effect/Data";
 import * as tsplus_module_2 from "effect/Option";
 import * as tsplus_module_3 from "effect/Effect";
-import * as S from "@effect-app/schema";
+import * as S from "@effect-app/prelude/schema";
 export class CouldNotAquireDbLockException extends tsplus_module_1.TaggedError("CouldNotAquireDbLockException") {
     constructor(type, id, error) {
         super({ type, id, error, message: `Couldn't lock db record ${type}: ${id}` });
@@ -20,7 +20,7 @@ export class ConnectionException extends tsplus_module_1.TaggedError("Connection
 }
 export class SerializedDBRecord extends S.Class()({
     version: S.string,
-    timestamp: S.date,
+    timestamp: S.Date,
     data: S.string
 }) {
 }
@@ -28,7 +28,7 @@ export class SerializedDBRecord extends S.Class()({
 export function makeSerialisedDBRecord(s) {
     return S.struct({
         version: S.number,
-        timestamp: S.date,
+        timestamp: S.Date,
         data: s
     });
 }
@@ -48,4 +48,4 @@ export function makeMap() {
         })
     };
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vX3NyYy9zZXJ2aWNlcy9zaW1wbGVkYi9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsT0FBTyxLQUFLLENBQUMsTUFBTSxvQkFBb0IsQ0FBQTtBQUd2QyxNQUFNLE9BQU8sNkJBQ1gsU0FBUSw0QkFBaUIsK0JBQStCLENBQThEO0lBRXRILFlBQVksSUFBWSxFQUFFLEVBQVUsRUFBRSxLQUFZO1FBQ2hELEtBQUssQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSwyQkFBMkIsSUFBSSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUMvRSxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sdUJBQ1gsU0FBUSw0QkFBaUIseUJBQXlCLENBQWdEO0lBRWxHLFlBQVksSUFBWSxFQUFFLEVBQVU7UUFDbEMsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsWUFBWSxJQUFJLElBQUksRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUE7SUFDdkUsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLG1CQUFvQixTQUFRLDRCQUFpQixxQkFBcUIsQ0FBb0M7SUFFakgsWUFBWSxLQUFZO1FBQ3RCLEtBQUssQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsQ0FBQyxDQUFBO1FBRmhELGNBQVMsR0FBRyxxQkFBcUIsQ0FBQTtJQUcxQyxDQUFDO0NBQ0Y7QUFNRCxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsQ0FBQyxDQUFDLEtBQUssRUFBc0IsQ0FBQztJQUNwRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLE1BQU07SUFDakIsU0FBUyxFQUFFLENBQUMsQ0FBQyxJQUFJO0lBQ2pCLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTTtDQUNmLENBQUM7Q0FBRztBQUVMLDRCQUE0QjtBQUM1QixNQUFNLFVBQVUsc0JBQXNCLENBQUMsQ0FBWTtJQUNqRCxPQUFPLENBQUMsQ0FBQyxNQUFNLENBQUM7UUFDZCxPQUFPLEVBQUUsQ0FBQyxDQUFDLE1BQU07UUFDakIsU0FBUyxFQUFFLENBQUMsQ0FBQyxJQUFJO1FBQ2pCLElBQUksRUFBRSxDQUFDO0tBQ1IsQ0FBQyxDQUFBO0FBQ0osQ0FBQztBQVlELE1BQU0sVUFBVSxZQUFZLENBQUMsSUFBWSxFQUFFLEVBQVU7SUFDbkQsT0FBTyxHQUFHLElBQUksUUFBUSxFQUFFLEVBQUUsQ0FBQTtBQUM1QixDQUFDO0FBRUQsTUFBTSxVQUFVLGFBQWEsQ0FBQyxJQUFZLEVBQUUsRUFBVTtJQUNwRCxPQUFPLEdBQUcsSUFBSSxNQUFNLEVBQUUsRUFBRSxDQUFBO0FBQzFCLENBQUM7QUFFRCxNQUFNLFVBQVUsT0FBTztJQUNyQixNQUFNLEdBQUcsR0FBRyxJQUFJLEdBQUcsRUFBVyxDQUFBO0lBQzlCLE9BQU87UUFDTCxJQUFJLEVBQUUsQ0FBQyxDQUFPLEVBQUUsRUFBRSxDQUFDLDJCQUFPLDZCQUFvQixHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDMUQsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUUsR0FBRyxFQUFFLENBQUMsR0FBRyxDQUFDLE1BQU0sQ0FBQyxRQUFRLENBQUMsRUFBRTtRQUMvQyxHQUFHLEVBQUUsQ0FBQyxDQUFPLEVBQUUsQ0FBSSxFQUFFLEVBQUUsQ0FDckIscUJBQVksR0FBRyxFQUFFO1lBQ2YsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUE7UUFDZixDQUFDLENBQUM7S0FDaUIsQ0FBQTtBQUN6QixDQUFDIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2hhcmVkLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vX3NyYy9zZXJ2aWNlcy9zaW1wbGVkYi9zaGFyZWQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsT0FBTyxLQUFLLENBQUMsTUFBTSw0QkFBNEIsQ0FBQTtBQUUvQyxNQUFNLE9BQU8sNkJBQ1gsU0FBUSw0QkFBaUIsK0JBQStCLENBQThEO0lBRXRILFlBQVksSUFBWSxFQUFFLEVBQVUsRUFBRSxLQUFZO1FBQ2hELEtBQUssQ0FBQyxFQUFFLElBQUksRUFBRSxFQUFFLEVBQUUsS0FBSyxFQUFFLE9BQU8sRUFBRSwyQkFBMkIsSUFBSSxLQUFLLEVBQUUsRUFBRSxFQUFFLENBQUMsQ0FBQTtJQUMvRSxDQUFDO0NBQ0Y7QUFFRCxNQUFNLE9BQU8sdUJBQ1gsU0FBUSw0QkFBaUIseUJBQXlCLENBQWdEO0lBRWxHLFlBQVksSUFBWSxFQUFFLEVBQVU7UUFDbEMsS0FBSyxDQUFDLEVBQUUsSUFBSSxFQUFFLEVBQUUsRUFBRSxPQUFPLEVBQUUsWUFBWSxJQUFJLElBQUksRUFBRSxpQkFBaUIsRUFBRSxDQUFDLENBQUE7SUFDdkUsQ0FBQztDQUNGO0FBRUQsTUFBTSxPQUFPLG1CQUFvQixTQUFRLDRCQUFpQixxQkFBcUIsQ0FBb0M7SUFFakgsWUFBWSxLQUFZO1FBQ3RCLEtBQUssQ0FBQyxFQUFFLEtBQUssRUFBRSxPQUFPLEVBQUUsNEJBQTRCLEVBQUUsQ0FBQyxDQUFBO1FBRmhELGNBQVMsR0FBRyxxQkFBcUIsQ0FBQTtJQUcxQyxDQUFDO0NBQ0Y7QUFNRCxNQUFNLE9BQU8sa0JBQW1CLFNBQVEsQ0FBQyxDQUFDLEtBQUssRUFBc0IsQ0FBQztJQUNwRSxPQUFPLEVBQUUsQ0FBQyxDQUFDLE1BQU07SUFDakIsU0FBUyxFQUFFLENBQUMsQ0FBQyxJQUFJO0lBQ2pCLElBQUksRUFBRSxDQUFDLENBQUMsTUFBTTtDQUNmLENBQUM7Q0FBRztBQUVMLDRCQUE0QjtBQUM1QixNQUFNLFVBQVUsc0JBQXNCLENBQUMsQ0FBbUI7SUFDeEQsT0FBTyxDQUFDLENBQUMsTUFBTSxDQUFDO1FBQ2QsT0FBTyxFQUFFLENBQUMsQ0FBQyxNQUFNO1FBQ2pCLFNBQVMsRUFBRSxDQUFDLENBQUMsSUFBSTtRQUNqQixJQUFJLEVBQUUsQ0FBQztLQUNSLENBQUMsQ0FBQTtBQUNKLENBQUM7QUFZRCxNQUFNLFVBQVUsWUFBWSxDQUFDLElBQVksRUFBRSxFQUFVO0lBQ25ELE9BQU8sR0FBRyxJQUFJLFFBQVEsRUFBRSxFQUFFLENBQUE7QUFDNUIsQ0FBQztBQUVELE1BQU0sVUFBVSxhQUFhLENBQUMsSUFBWSxFQUFFLEVBQVU7SUFDcEQsT0FBTyxHQUFHLElBQUksTUFBTSxFQUFFLEVBQUUsQ0FBQTtBQUMxQixDQUFDO0FBRUQsTUFBTSxVQUFVLE9BQU87SUFDckIsTUFBTSxHQUFHLEdBQUcsSUFBSSxHQUFHLEVBQVcsQ0FBQTtJQUM5QixPQUFPO1FBQ0wsSUFBSSxFQUFFLENBQUMsQ0FBTyxFQUFFLEVBQUUsQ0FBQywyQkFBTyw2QkFBb0IsR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO1FBQzFELENBQUMsTUFBTSxDQUFDLFFBQVEsQ0FBQyxFQUFFLEdBQUcsRUFBRSxDQUFDLEdBQUcsQ0FBQyxNQUFNLENBQUMsUUFBUSxDQUFDLEVBQUU7UUFDL0MsR0FBRyxFQUFFLENBQUMsQ0FBTyxFQUFFLENBQUksRUFBRSxFQUFFLENBQ3JCLHFCQUFZLEdBQUcsRUFBRTtZQUNmLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQ2YsQ0FBQyxDQUFDO0tBQ2lCLENBQUE7QUFDekIsQ0FBQyJ9

package/package.json

@@ -1,11 +1,12 @@
 {
   "name": "@effect-app/infra",
-  "version": "0.132.2",
+  "version": "0.133.0-next.0",
   "license": "MIT",
   "type": "module",
   "dependencies": {
     "@azure/cosmos": "^4.0.0",
     "@azure/service-bus": "^7.9.3",
+    "@effect/schema": "^0.56.1",
     "effect": "^2.0.0-next.62",
     "@faker-js/faker": "^8.3.1",
     "@sendgrid/helpers": "^8.0.0",
@@ -18,10 +19,10 @@
     "proper-lockfile": "^4.1.2",
     "pure-rand": "6.0.4",
     "redlock": "^4.2.0",
-    "@effect-app/core": "0.96.1",
-    "@effect-app/infra-adapters": "0.84.1",
-    "@effect-app/schema": "0.90.1",
-    "@effect-app/prelude": "0.106.1"
+    "@effect-app/schema": "0.150.0-next.0",
+    "@effect-app/infra-adapters": "0.85.0-next.0",
+    "@effect-app/core": "0.97.0-next.0",
+    "@effect-app/prelude": "0.107.0-next.0"
   },
   "devDependencies": {
     "@babel/cli": "^7.23.4",
@@ -39,7 +40,7 @@
     "ts-node": "^10.9.2",
     "typescript": "npm:@effect-app/typescript@5.4.0-tsplus.202311222",
     "vitest": "^1.1.0",
-    "@effect-app/compiler": "0.47.1"
+    "@effect-app/compiler": "0.48.0-next.0"
   },
   "peerDependencies": {
     "express": "^4.18.2"
@@ -132,26 +133,6 @@
         "default": "./_cjs/api/defaultErrorHandler.cjs"
       }
     },
-    "./api/express/makeJsonSchema": {
-      "import": {
-        "types": "./dist/api/express/makeJsonSchema.d.ts",
-        "default": "./dist/api/express/makeJsonSchema.js"
-      },
-      "require": {
-        "types": "./dist/api/express/makeJsonSchema.d.ts",
-        "default": "./_cjs/api/express/makeJsonSchema.cjs"
-      }
-    },
-    "./api/express/makeOpenApiSpecs": {
-      "import": {
-        "types": "./dist/api/express/makeOpenApiSpecs.d.ts",
-        "default": "./dist/api/express/makeOpenApiSpecs.js"
-      },
-      "require": {
-        "types": "./dist/api/express/makeOpenApiSpecs.d.ts",
-        "default": "./_cjs/api/express/makeOpenApiSpecs.cjs"
-      }
-    },
     "./api/express/schema/jwt": {
       "import": {
         "types": "./dist/api/express/schema/jwt.d.ts",
@@ -162,16 +143,6 @@
         "default": "./_cjs/api/express/schema/jwt.cjs"
       }
     },
-    "./api/express/schema/routing": {
-      "import": {
-        "types": "./dist/api/express/schema/routing.d.ts",
-        "default": "./dist/api/express/schema/routing.js"
-      },
-      "require": {
-        "types": "./dist/api/express/schema/routing.d.ts",
-        "default": "./_cjs/api/express/schema/routing.cjs"
-      }
-    },
     "./api/reportError": {
       "import": {
         "types": "./dist/api/reportError.d.ts",
@@ -202,16 +173,6 @@
         "default": "./_cjs/api/util.cjs"
       }
     },
-    "./api/writeDocs": {
-      "import": {
-        "types": "./dist/api/writeDocs.d.ts",
-        "default": "./dist/api/writeDocs.js"
-      },
-      "require": {
-        "types": "./dist/api/writeDocs.d.ts",
-        "default": "./_cjs/api/writeDocs.cjs"
-      }
-    },
     "./errorReporter": {
       "import": {
         "types": "./dist/errorReporter.d.ts",
@@ -711,16 +672,6 @@
         "types": "./dist/services/simpledb/simpledb.d.ts",
         "default": "./_cjs/services/simpledb/simpledb.cjs"
       }
-    },
-    "./test.arbs": {
-      "import": {
-        "types": "./dist/test.arbs.d.ts",
-        "default": "./dist/test.arbs.js"
-      },
-      "require": {
-        "types": "./dist/test.arbs.d.ts",
-        "default": "./_cjs/test.arbs.cjs"
-      }
     }
   },
   "gitHead": "bd8e27eea3eff97db8739d577d67e7336c078d28",

package/tsconfig.json

@@ -3,7 +3,7 @@
     "strict": true,
     "allowUnusedLabels": false,
     "allowUnreachableCode": false,
-    "exactOptionalPropertyTypes": false,
+    "exactOptionalPropertyTypes": true,
     "noFallthroughCasesInSwitch": true,
     "noImplicitOverride": true,
     "noImplicitReturns": false,
@@ -43,6 +43,7 @@
       "./node_modules/@effect-app/core/vendor/effect-stm-tsplus.json",
       "./node_modules/@effect-app/core/vendor/effect-stream-tsplus.json",
       "./node_modules/@effect-app/core/vendor/fp-ts-optic-tsplus.json",
+      "./node_modules/@effect-app/core/vendor/effect-schema-tsplus.json",
       "./node_modules/@effect-app/core/vendor/effect-platform-tsplus.json"
     ],
     "plugins": [

package/_cjs/api/express/makeJsonSchema.cjs

@@ -1,151 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.checkPaths = checkPaths;
-exports.makeJsonSchema = makeJsonSchema;
-var tsplus_module_1 = _interopRequireWildcard(require("effect/Effect"));
-var tsplus_module_2 = _interopRequireWildcard(require("effect/Chunk"));
-var tsplus_module_3 = _interopRequireWildcard(require("@effect-app/core/_ext/Iterable"));
-var _errors = require("../../errors.cjs");
-var RS = _interopRequireWildcard(require("./schema/routing.cjs"));
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-/* eslint-disable @typescript-eslint/no-explicit-any */
-
-const rx = /:(\w+)/g;
-class PathsTree {
-  constructor(path) {
-    this.methods = [];
-    this.params = {};
-    this.subpaths = {};
-    this.path = path;
-  }
-}
-// interface Match {
-//   _tag: "resource" | "param"
-//   value: string
-// }
-// function checkShadowing(
-//   pathNavigator: PathsTree,
-//   match: Match
-// ) {
-//   return Effect.gen(function*($) {
-//     switch (match._tag) {
-//       case "resource": {
-//         // check shadowing: if 'a/:param' comes before 'a/b', then 'a/b' is shadowed
-//         if (pathNavigator.params[1]) {
-//           return yield* $(
-//             new InvalidStateError(
-//               `Path ${pathNavigator.path}${match.value}/ is shadowed by ${pathNavigator.params[1].path}`
-//             )
-//           )
-//         }
-//         break
-//       }
-//       case "param": {
-//         // check shadowing: if 'a/b' comes before 'a/:param', then 'a/"param' is partially shadowed
-//         const subpaths = Object.getOwnPropertyNames(pathNavigator.subpaths)
-//         if (subpaths.length > 0) {
-//           yield* $(subpaths.forEachEffect((s) =>
-//             Effect.logInfo(
-//               `Path ${pathNavigator.path}:${match.value}/ is partially shadowed by ${pathNavigator.subpaths[s]!.path}`
-//             )
-//           ))
-//         }
-//         break
-//       }
-//     }
-//   })
-// }
-function checkPaths(paths) {
-  return tsplus_module_1.gen(function* ($) {
-    const pathMethods = new PathsTree("/");
-    const regex = /(?:^|\/)([^/:\n]+)|:(\w+)/g;
-    for (const path of paths) {
-      const matches = [...path.path.matchAll(regex)].map(match => match[1] ? {
-        _tag: "resource",
-        value: match[1]
-      } : {
-        _tag: "param",
-        value: match[2]
-      });
-      let pathNavigator = pathMethods;
-      for (let i = 0; i < matches.length;) {
-        const match = matches[i];
-        // yield* $(checkShadowing(pathNavigator, match))
-        switch (match._tag) {
-          case "resource":
-            {
-              if (!(match.value in pathNavigator.subpaths)) {
-                pathNavigator.subpaths[match.value] = new PathsTree(`${pathNavigator.path}${match.value}/`);
-              }
-              pathNavigator = pathNavigator.subpaths[match.value];
-              i++;
-              break;
-            }
-          case "param":
-            {
-              const paramsNames = [match.value];
-              let numberOfParams = 1;
-              while (i < matches.length && matches[i + 1]?._tag === "param") {
-                numberOfParams++;
-                i++;
-                paramsNames.push(matches[i].value);
-              }
-              if (!(numberOfParams in pathNavigator.params)) {
-                pathNavigator.params[numberOfParams] = new PathsTree(`${pathNavigator.path}:${paramsNames.join("/:")}/`);
-              }
-              pathNavigator = pathNavigator.params[numberOfParams];
-              i++;
-              break;
-            }
-        }
-      }
-      if (pathNavigator.methods.includes(path.method)) {
-        // throw duplicate path-method error
-        return yield* $(new _errors.InvalidStateError(`Duplicate method ${path.method} for path ${path.path}`));
-      }
-      pathNavigator.methods.push(path.method);
-    }
-    return paths;
-  });
-}
-/**
- * Work in progress JSONSchema generator.
- */
-function makeJsonSchema(r) {
-  return tsplus_module_1.map(tsplus_module_1.flatMap(tsplus_module_3.ext_forEach(tsplus_module_2.fromIterable(r), RS.makeFromSchema), checkPaths), e => {
-    const map = ({
-      method,
-      path,
-      responses,
-      ...rest
-    }) => ({
-      [method]: {
-        ...rest,
-        responses: responses.reduce((prev, cur) => {
-          prev[cur.statusCode] = cur.type;
-          return prev;
-        }, {})
-      }
-    });
-    return e.reduce((prev, e) => {
-      const path = e.path.split("?")[0].replace(rx, (_a, b) => `{${b}}`);
-      prev[path] = {
-        ...prev[path],
-        ...map(e)
-      };
-      return prev;
-    }, {});
-  });
-}
-class Response {
-  constructor(statusCode, type // string | JSONSchema | SubSchema
-  ) {
-    this.statusCode = statusCode;
-    this.type = type;
-  }
-}
-//# sourceMappingURL=makeJsonSchema.cjs.map

package/_cjs/api/express/makeJsonSchema.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"makeJsonSchema.cjs","names":["_errors","require","RS","_interopRequireWildcard","_getRequireWildcardCache","e","WeakMap","r","t","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","rx","PathsTree","constructor","path","methods","params","subpaths","checkPaths","paths","tsplus_module_1","gen","$","pathMethods","regex","matches","matchAll","map","match","_tag","value","pathNavigator","length","paramsNames","numberOfParams","push","join","includes","method","InvalidStateError","makeJsonSchema","flatMap","tsplus_module_3","ext_forEach","tsplus_module_2","fromIterable","makeFromSchema","responses","rest","reduce","prev","cur","statusCode","type","split","replace","_a","b","Response"],"sources":["../../../_src/api/express/makeJsonSchema.ts"],"sourcesContent":[null],"mappings":"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"}

package/_cjs/api/express/makeJsonSchema.test.cjs

@@ -1,50 +0,0 @@
-"use strict";
-
-var tsplus_module_1 = _interopRequireWildcard(require("effect/Effect"));
-var tsplus_module_2 = _interopRequireWildcard(require("effect/Exit"));
-var _errors = require("../../errors.cjs");
-var _makeJsonSchema = require("./makeJsonSchema.cjs");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-const path = {
-  path: "/securities/:id/search/:id2",
-  method: "get"
-};
-const equalPaths = ["/securities/:idt/search/:id2", "/securities/:id/search/:id2t", "/securities/:idt/search/:id2t"].map(path => ({
-  path,
-  method: "get"
-}));
-const differentPaths = ["/securities/search/:id2", "/securities/:id/search/", "/securities/:id/search/:id2", "/securities/:id/:id2/search/:id3"].map(path => ({
-  path,
-  method: "get"
-})).concat(["/securities/:idt/search/:id2"].map(path => ({
-  path,
-  method: "post"
-})));
-test("works", async () => {
-  expect(await tsplus_module_1.runPromise((0, _makeJsonSchema.checkPaths)(differentPaths))).toStrictEqual(differentPaths);
-  for (const p of equalPaths) {
-    expect(await tsplus_module_1.runPromiseExit((0, _makeJsonSchema.checkPaths)([path, p]))).toStrictEqual(tsplus_module_2.fail(new _errors.InvalidStateError(`Duplicate method ${p.method} for path ${p.path}`)));
-  }
-  // should it error out? I think not
-  // expect(await checkPaths(["a/:p1/c/:p2", "a/b"].map((path) => ({ path, method: "get" }))).runPromiseEither)
-  //   .toStrictEqual(
-  //     Either.left(new InvalidStateError(`Path /a/b/ is shadowed by /a/:p1/`))
-  //   )
-  // should not error out
-  // expect(await checkPaths([{ path: "a/:p1/c/:p2", method: "post" }, { path: "a/b", method: "get" }]).runPromiseEither)
-  //   .toStrictEqual(
-  //     Either.left(new InvalidStateError(`Path /a/b/ is shadowed by /a/:p1/`))
-  //   )
-  // should not error out
-  // expect(await checkPaths([{ path: "a/:param/c/d", method: "get" }, { path: "a/b/c/e", method: "get" }]).runPromiseEither)
-  //   .toStrictEqual(
-  //     Either.left(new InvalidStateError(`Path /a/b/ is shadowed by /a/:p1/`))
-  //   )
-  // it should error out
-  // expect(await checkPaths(["a/:p1/c/:p2", "a/:p111/c/d"].map((path) => ({ path, method: "get" }))).runPromiseEither)
-  //   .toStrictEqual(
-  //     Either.left(new InvalidStateError(`Path /a/:p1/c/d/ is shadowed by /a/:p1/c/:p2/`))
-  //   )
-});
-//# sourceMappingURL=makeJsonSchema.test.cjs.map

package/_cjs/api/express/makeJsonSchema.test.cjs.map

@@ -1 +0,0 @@
-{"version":3,"file":"makeJsonSchema.test.cjs","names":["_errors","require","_makeJsonSchema","_getRequireWildcardCache","e","WeakMap","r","t","_interopRequireWildcard","__esModule","default","has","get","n","__proto__","a","Object","defineProperty","getOwnPropertyDescriptor","u","prototype","hasOwnProperty","call","i","set","path","method","equalPaths","map","differentPaths","concat","test","expect","tsplus_module_1","runPromise","checkPaths","toStrictEqual","p","runPromiseExit","tsplus_module_2","fail","InvalidStateError"],"sources":["../../../_src/api/express/makeJsonSchema.test.ts"],"sourcesContent":[null],"mappings":";;;;AAAA,IAAAA,OAAA,GAAAC,OAAA;AACA,IAAAC,eAAA,GAAAD,OAAA;AAAgD,SAAAE,yBAAAC,CAAA,6BAAAC,OAAA,mBAAAC,CAAA,OAAAD,OAAA,IAAAE,CAAA,OAAAF,OAAA,YAAAF,wBAAA,YAAAA,CAAAC,CAAA,WAAAA,CAAA,GAAAG,CAAA,GAAAD,CAAA,KAAAF,CAAA;AAAA,SAAAI,wBAAAJ,CAAA,EAAAE,CAAA,SAAAA,CAAA,IAAAF,CAAA,IAAAA,CAAA,CAAAK,UAAA,SAAAL,CAAA,eAAAA,CAAA,uBAAAA,CAAA,yBAAAA,CAAA,WAAAM,OAAA,EAAAN,CAAA,QAAAG,CAAA,GAAAJ,wBAAA,CAAAG,CAAA,OAAAC,CAAA,IAAAA,CAAA,CAAAI,GAAA,CAAAP,CAAA,UAAAG,CAAA,CAAAK,GAAA,CAAAR,CAAA,OAAAS,CAAA,KAAAC,SAAA,UAAAC,CAAA,GAAAC,MAAA,CAAAC,cAAA,IAAAD,MAAA,CAAAE,wBAAA,WAAAC,CAAA,IAAAf,CAAA,oBAAAe,CAAA,IAAAH,MAAA,CAAAI,SAAA,CAAAC,cAAA,CAAAC,IAAA,CAAAlB,CAAA,EAAAe,CAAA,SAAAI,CAAA,GAAAR,CAAA,GAAAC,MAAA,CAAAE,wBAAA,CAAAd,CAAA,EAAAe,CAAA,UAAAI,CAAA,KAAAA,CAAA,CAAAX,GAAA,IAAAW,CAAA,CAAAC,GAAA,IAAAR,MAAA,CAAAC,cAAA,CAAAJ,CAAA,EAAAM,CAAA,EAAAI,CAAA,IAAAV,CAAA,CAAAM,CAAA,IAAAf,CAAA,CAAAe,CAAA,YAAAN,CAAA,CAAAH,OAAA,GAAAN,CAAA,EAAAG,CAAA,IAAAA,CAAA,CAAAiB,GAAA,CAAApB,CAAA,EAAAS,CAAA,GAAAA,CAAA;AAEhD,MAAMY,IAAI,GAAG;EAAEA,IAAI,EAAE,6BAA6B;EAAEC,MAAM,EAAE;AAAK,CAAE;AAEnE,MAAMC,UAAU,GAAG,CACjB,8BAA8B,EAC9B,8BAA8B,EAC9B,+BAA+B,CAChC,CACEC,GAAG,CAAEH,IAAI,KAAM;EAAEA,IAAI;EAAEC,MAAM,EAAE;AAAK,CAAE,CAAC,CAAC;AAE3C,MAAMG,cAAc,GAGd,CACJ,yBAAyB,EACzB,yBAAyB,EACzB,6BAA6B,EAC7B,kCAAkC,CACnC,CACED,GAAG,CAAEH,IAAI,KAAM;EAAEA,IAAI;EAAEC,MAAM,EAAE;AAAK,CAAE,CAAC,CAAC,CACxCI,MAAM,CAAC,CACN,8BAA8B,CAC/B,CACEF,GAAG,CAAEH,IAAI,KAAM;EAAEA,IAAI;EAAEC,MAAM,EAAE;AAAM,CAAE,CAAC,CAAC,CAAC;AAE/CK,IAAI,CAAC,OAAO,EAAE,YAAW;EACvBC,MAAM,CAAC,MAAAC,eAAA,CAAAC,UAAA,CAAO,IAAAC,0BAAU,EAACN,cAAc,CAAE,CAAW,CAAC,CAACO,aAAa,CAACP,cAAc,CAAC;EAEnF,KAAK,MAAMQ,CAAC,IAAIV,UAAU,EAAE;IAC1BK,MAAM,CAAC,MAAAC,eAAA,CAAAK,cAAA,CAAM,IAAAH,0BAAU,EAAC,CAACV,IAAI,EAAEY,CAAC,CAAC,CAAC,CAAe,CAAC,CAACD,aAAa,CAC9DG,eAAA,CAAAC,IAAA,CAAU,IAAIC,yBAAiB,CAAC,oBAAoBJ,CAAC,CAACX,MAAM,aAAaW,CAAC,CAACZ,IAAI,EAAE,CAAC,CAAC,CACpF;EACH;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;EAEA;EACA;EACA;EACA;EACA;AACF,CAAC,CAAC"}

package/_cjs/api/express/makeOpenApiSpecs.cjs

@@ -1,65 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.makeOpenApiSpecs = makeOpenApiSpecs;
-var tsplus_module_1 = _interopRequireWildcard(require("effect/Ref"));
-var tsplus_module_2 = _interopRequireWildcard(require("effect/Effect"));
-var _index = require("@effect-app/infra-adapters/Openapi/atlas-plutus/Schema/index");
-var _makeJsonSchema = require("./makeJsonSchema.cjs");
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function (e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
-function makeOpenApiSpecs(rdescs, info) {
-  return tsplus_module_2.gen(function* ($) {
-    const ref = yield* $(tsplus_module_1.make(new Map()));
-    const paths = yield* $(tsplus_module_2.provideService((0, _makeJsonSchema.makeJsonSchema)(rdescs), _index.References, {
-      ref
-    }));
-    const refs = yield* $(tsplus_module_1.get(ref));
-    const parameterRefs = {}; // todos
-    const schemas = {};
-    const securitySchemes = {
-      bearerAuth: {
-        type: "http",
-        scheme: "bearer",
-        bearerFormat: "JWT"
-      }
-    }; // { basicAuth: { type: "http", scheme: "basic" } }
-    const components = {
-      securitySchemes,
-      schemas,
-      parameters: parameterRefs
-    };
-    for (const entry of refs.entries()) {
-      // eslint-disable-next-line prefer-destructuring
-      schemas[entry[0]] = entry[1];
-    }
-    return {
-      openapi: "3.0.0",
-      info: {
-        title: info.title,
-        description: info.description,
-        termsOfService: info.tos,
-        contact: info.contact ? {
-          name: info.contact.name,
-          email: info.contact.email,
-          url: info.contact.url
-        } : undefined,
-        license: info.license ? {
-          name: info.license.name,
-          url: info.license.url
-        } : undefined,
-        version: info.version
-      },
-      tags: [],
-      paths,
-      components,
-      security: [{
-        bearerAuth: []
-      }]
-      // test,
-    };
-  });
-}
-//# sourceMappingURL=makeOpenApiSpecs.cjs.map