@effect-app/infra 0.15.3 → 0.16.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +25 -0
- package/_cjs/api/express/schema/requestHandler.cjs +5 -5
- package/_cjs/api/express/schema/requestHandler.cjs.map +1 -1
- package/_cjs/api/express/schema/routing.cjs +1 -1
- package/_cjs/api/express/schema/routing.cjs.map +1 -1
- package/_cjs/api/routing.cjs +5 -5
- package/_cjs/api/routing.cjs.map +1 -1
- package/_cjs/rateLimit.cjs +1 -1
- package/_cjs/rateLimit.cjs.map +1 -1
- package/_cjs/services/Operations/live.cjs.map +1 -1
- package/_cjs/services/Repository.cjs +2 -2
- package/_cjs/services/Repository.cjs.map +1 -1
- package/_cjs/services/Store/Cosmos.cjs +1 -1
- package/_cjs/services/Store/Cosmos.cjs.map +1 -1
- package/_cjs/services/Store/Memory.cjs.map +1 -1
- package/_cjs/services/Store/Redis.cjs.map +1 -1
- package/_cjs/services/Store/utils.cjs.map +1 -1
- package/_cjs/services/simpledb/cosmosdb.cjs.map +1 -1
- package/_cjs/services/simpledb/diskdb.cjs.map +1 -1
- package/_cjs/services/simpledb/memdb.cjs +1 -1
- package/_cjs/services/simpledb/memdb.cjs.map +1 -1
- package/_cjs/services/simpledb/mongodb.cjs +2 -2
- package/_cjs/services/simpledb/mongodb.cjs.map +1 -1
- package/_cjs/services/simpledb/redisdb.cjs +2 -2
- package/_cjs/services/simpledb/redisdb.cjs.map +1 -1
- package/_cjs/services/simpledb/shared.cjs.map +1 -1
- package/_cjs/services/simpledb/simpledb.cjs +4 -4
- package/_cjs/services/simpledb/simpledb.cjs.map +1 -1
- package/_src/api/express/schema/requestHandler.ts +10 -10
- package/_src/api/express/schema/routing.ts +18 -18
- package/_src/api/routing.ts +5 -5
- package/_src/rateLimit.ts +2 -2
- package/_src/services/Operations/live.ts +5 -5
- package/_src/services/Operations/service.ts +1 -1
- package/_src/services/Repository.ts +10 -10
- package/_src/services/Store/Cosmos.ts +7 -7
- package/_src/services/Store/Memory.ts +1 -1
- package/_src/services/Store/Redis.ts +1 -1
- package/_src/services/Store/index.test.ts.bak +2 -2
- package/_src/services/Store/service.ts +1 -1
- package/_src/services/Store/utils.ts +17 -17
- package/_src/services/simpledb/cosmosdb.ts +2 -2
- package/_src/services/simpledb/diskdb.ts +3 -3
- package/_src/services/simpledb/memdb.ts +2 -2
- package/_src/services/simpledb/mongodb.ts +3 -3
- package/_src/services/simpledb/redisdb.ts +1 -1
- package/_src/services/simpledb/shared.ts +2 -2
- package/_src/services/simpledb/simpledb.ts +6 -6
- package/dist/api/express/makeOpenApiSpecs.d.ts +1 -1
- package/dist/api/express/schema/requestHandler.d.ts +6 -6
- package/dist/api/express/schema/requestHandler.d.ts.map +1 -1
- package/dist/api/express/schema/requestHandler.js +6 -6
- package/dist/api/express/schema/routing.d.ts +1 -1
- package/dist/api/express/schema/routing.js +2 -2
- package/dist/api/routing.js +6 -6
- package/dist/rateLimit.d.ts +2 -2
- package/dist/rateLimit.d.ts.map +1 -1
- package/dist/rateLimit.js +2 -2
- package/dist/services/Operations/live.js +1 -1
- package/dist/services/Operations/service.d.ts +2 -2
- package/dist/services/Operations/service.d.ts.map +1 -1
- package/dist/services/Repository.d.ts +20 -20
- package/dist/services/Repository.d.ts.map +1 -1
- package/dist/services/Repository.js +3 -3
- package/dist/services/Store/Cosmos.js +2 -2
- package/dist/services/Store/Memory.js +1 -1
- package/dist/services/Store/Redis.js +1 -1
- package/dist/services/Store/service.d.ts +2 -2
- package/dist/services/Store/service.d.ts.map +1 -1
- package/dist/services/Store/utils.d.ts +1 -1
- package/dist/services/Store/utils.js +1 -1
- package/dist/services/simpledb/cosmosdb.d.ts +3 -3
- package/dist/services/simpledb/cosmosdb.js +1 -1
- package/dist/services/simpledb/diskdb.d.ts +3 -3
- package/dist/services/simpledb/diskdb.js +1 -1
- package/dist/services/simpledb/memdb.d.ts +3 -3
- package/dist/services/simpledb/memdb.js +2 -2
- package/dist/services/simpledb/mongodb.d.ts +3 -3
- package/dist/services/simpledb/mongodb.js +3 -3
- package/dist/services/simpledb/redisdb.d.ts +3 -3
- package/dist/services/simpledb/redisdb.js +3 -3
- package/dist/services/simpledb/shared.d.ts +2 -2
- package/dist/services/simpledb/shared.d.ts.map +1 -1
- package/dist/services/simpledb/shared.js +1 -1
- package/dist/services/simpledb/simpledb.d.ts +4 -4
- package/dist/services/simpledb/simpledb.d.ts.map +1 -1
- package/dist/services/simpledb/simpledb.js +5 -5
- package/package.json +6 -6
- package/tsconfig.json +1 -2
- package/tsconfig.json.bak +1 -2
|
@@ -14,7 +14,7 @@ export const makeETag = <E extends PersistenceModelType<Id>, Id extends string>(
|
|
|
14
14
|
_etag: objectHash(e)
|
|
15
15
|
}) as any
|
|
16
16
|
export const makeUpdateETag =
|
|
17
|
-
(name: string) => <E extends PersistenceModelType<Id>, Id extends string>(e: E, current:
|
|
17
|
+
(name: string) => <E extends PersistenceModelType<Id>, Id extends string>(e: E, current: Option<E>) =>
|
|
18
18
|
Effect.gen(function*($) {
|
|
19
19
|
if (current.isSome() && current.value._etag !== e._etag) {
|
|
20
20
|
return yield* $(
|
|
@@ -30,19 +30,19 @@ export function codeFilter<E extends { id: string }, NE extends E>(filter: Filte
|
|
|
30
30
|
filter.type === "startsWith"
|
|
31
31
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
32
32
|
? lowercaseIfString((x as any)[filter.by]).startsWith(filter.value.toLowerCase())
|
|
33
|
-
?
|
|
34
|
-
:
|
|
33
|
+
? Option(x as unknown as NE)
|
|
34
|
+
: Option.none
|
|
35
35
|
: filter.type === "endsWith"
|
|
36
36
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
37
37
|
? lowercaseIfString((x as any)[filter.by]).endsWith(filter.value.toLowerCase())
|
|
38
|
-
?
|
|
39
|
-
:
|
|
38
|
+
? Option(x as unknown as NE)
|
|
39
|
+
: Option.none
|
|
40
40
|
: filter.type === "contains"
|
|
41
41
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
42
42
|
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
|
|
43
43
|
? lowercaseIfString((x as any)[filter.by]).includes(filter.value.toLowerCase())
|
|
44
|
-
?
|
|
45
|
-
:
|
|
44
|
+
? Option(x as unknown as NE)
|
|
45
|
+
: Option.none
|
|
46
46
|
: filter.type === "join_find"
|
|
47
47
|
? filter.keys.some(k => {
|
|
48
48
|
const value = get(x, k) as Record<string, unknown>[]
|
|
@@ -52,8 +52,8 @@ export function codeFilter<E extends { id: string }, NE extends E>(filter: Filte
|
|
|
52
52
|
value.some(v => compareCaseInsensitive(v[filter.valueKey], filter.value))
|
|
53
53
|
)
|
|
54
54
|
})
|
|
55
|
-
?
|
|
56
|
-
:
|
|
55
|
+
? Option(x as unknown as NE)
|
|
56
|
+
: Option.none
|
|
57
57
|
// TODO: support mixed or/and
|
|
58
58
|
: filter.mode === "or"
|
|
59
59
|
? filter.where
|
|
@@ -66,8 +66,8 @@ export function codeFilter<E extends { id: string }, NE extends E>(filter: Filte
|
|
|
66
66
|
? !compareCaseInsensitive(get(x, p.key), p.value)
|
|
67
67
|
: compareCaseInsensitive(get(x, p.key), p.value)
|
|
68
68
|
)
|
|
69
|
-
?
|
|
70
|
-
:
|
|
69
|
+
? Option(x as unknown as NE)
|
|
70
|
+
: Option.none
|
|
71
71
|
: filter.where
|
|
72
72
|
.every(p =>
|
|
73
73
|
p.t === "in"
|
|
@@ -86,8 +86,8 @@ export function codeFilter<E extends { id: string }, NE extends E>(filter: Filte
|
|
|
86
86
|
.some(_ => compareCaseInsensitive(get(_, p.key.split(".-1.")[1]!), p.value))
|
|
87
87
|
: compareCaseInsensitive(get(x, p.key), p.value)
|
|
88
88
|
)
|
|
89
|
-
?
|
|
90
|
-
:
|
|
89
|
+
? Option(x as unknown as NE)
|
|
90
|
+
: Option.none
|
|
91
91
|
}
|
|
92
92
|
|
|
93
93
|
export function codeFilterJoinSelect<E extends { id: string }, NE>(
|
|
@@ -98,15 +98,15 @@ export function codeFilterJoinSelect<E extends { id: string }, NE>(
|
|
|
98
98
|
const value = get(x, k)
|
|
99
99
|
// we mimic the behavior of cosmosdb; if the shape in db does not match what we're looking for, we imagine false hit
|
|
100
100
|
return value
|
|
101
|
-
?
|
|
101
|
+
? Option(
|
|
102
102
|
(value as readonly NE[]).filterMap(v =>
|
|
103
103
|
// eslint-disable-next-line @typescript-eslint/no-explicit-any
|
|
104
104
|
compareCaseInsensitive((v as any)[filter.valueKey], filter.value)
|
|
105
|
-
?
|
|
106
|
-
:
|
|
105
|
+
? Option({ ...v, _rootId: x.id })
|
|
106
|
+
: Option.none
|
|
107
107
|
)
|
|
108
108
|
)
|
|
109
|
-
:
|
|
109
|
+
: Option.none
|
|
110
110
|
})
|
|
111
111
|
.flatMap(_ => _)
|
|
112
112
|
.toChunk
|
|
@@ -38,7 +38,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
|
|
|
38
38
|
function find(id: string) {
|
|
39
39
|
return Cosmos.db
|
|
40
40
|
.flatMap(db => Effect.tryPromise(() => db.container(type).item(id).read<{ data: EA }>()))
|
|
41
|
-
.map(i =>
|
|
41
|
+
.map(i => Option.fromNullable(i.resource))
|
|
42
42
|
.map(
|
|
43
43
|
_ =>
|
|
44
44
|
_.map(
|
|
@@ -77,7 +77,7 @@ WHERE (
|
|
|
77
77
|
.map(_ => _.map(_ => _.id))
|
|
78
78
|
}
|
|
79
79
|
|
|
80
|
-
function store(record: A, currentVersion:
|
|
80
|
+
function store(record: A, currentVersion: Option<Version>) {
|
|
81
81
|
return Effect.gen(function*($) {
|
|
82
82
|
const version = "_etag" // we get this from the etag anyway.
|
|
83
83
|
|
|
@@ -31,7 +31,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
|
|
|
31
31
|
save: simpledb.store(find(type), store, lockRecordOnDisk(type), type)
|
|
32
32
|
}
|
|
33
33
|
|
|
34
|
-
function store(record: A, currentVersion:
|
|
34
|
+
function store(record: A, currentVersion: Option<Version>) {
|
|
35
35
|
const version = currentVersion
|
|
36
36
|
.map(cv => (parseInt(cv) + 1).toString())
|
|
37
37
|
.getOrElse(() => "1")
|
|
@@ -107,7 +107,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
|
|
|
107
107
|
}
|
|
108
108
|
|
|
109
109
|
function getIdx(index: Index) {
|
|
110
|
-
return readIndex(index).map(idx =>
|
|
110
|
+
return readIndex(index).map(idx => Option.fromNullable(idx[index.key]))
|
|
111
111
|
}
|
|
112
112
|
|
|
113
113
|
function readIndex(index: Index) {
|
|
@@ -127,7 +127,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
|
|
|
127
127
|
function tryRead(filePath: string) {
|
|
128
128
|
return fu
|
|
129
129
|
.fileExists(filePath)
|
|
130
|
-
.flatMap(exists => !exists ? Effect(
|
|
130
|
+
.flatMap(exists => !exists ? Effect(Option.none) : readFile(filePath).map(Option.some))
|
|
131
131
|
}
|
|
132
132
|
|
|
133
133
|
function getFilename(type: string, id: string) {
|
|
@@ -54,10 +54,10 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
|
|
|
54
54
|
}
|
|
55
55
|
}
|
|
56
56
|
return null
|
|
57
|
-
}).map(
|
|
57
|
+
}).map(Option.fromNullable)
|
|
58
58
|
}
|
|
59
59
|
|
|
60
|
-
function store(record: A, currentVersion:
|
|
60
|
+
function store(record: A, currentVersion: Option<Version>) {
|
|
61
61
|
const version = currentVersion
|
|
62
62
|
.map(cv => (parseInt(cv) + 1).toString())
|
|
63
63
|
.getOrElse(() => "1")
|
|
@@ -39,7 +39,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
|
|
|
39
39
|
.findOne<{ _id: TKey; version: Version; data: EA }>({ _id: id })
|
|
40
40
|
)
|
|
41
41
|
)
|
|
42
|
-
.map(
|
|
42
|
+
.map(Option.fromNullable)
|
|
43
43
|
.mapOpt(({ data, version }) => ({ version, data } as CachedRecord<EA>))
|
|
44
44
|
}
|
|
45
45
|
|
|
@@ -48,11 +48,11 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
|
|
|
48
48
|
.flatMap(db =>
|
|
49
49
|
Effect.tryPromise(() => db.collection(type).findOne<{ _id: TKey }>(keys, { projection: { _id: 1 } }))
|
|
50
50
|
)
|
|
51
|
-
.map(
|
|
51
|
+
.map(Option.fromNullable)
|
|
52
52
|
.mapOpt(({ _id }) => _id)
|
|
53
53
|
}
|
|
54
54
|
|
|
55
|
-
function store(record: A, currentVersion:
|
|
55
|
+
function store(record: A, currentVersion: Option<Version>) {
|
|
56
56
|
return Effect.gen(function*($) {
|
|
57
57
|
const version = currentVersion
|
|
58
58
|
.map(cv => (parseInt(cv) + 1).toString())
|
|
@@ -39,7 +39,7 @@ export function createContext<TKey extends string, EA, A extends DBRecord<TKey>>
|
|
|
39
39
|
.mapError(e => new ConnectionException(new Error(e.toString())))
|
|
40
40
|
).orDie
|
|
41
41
|
}
|
|
42
|
-
function store(record: A, currentVersion:
|
|
42
|
+
function store(record: A, currentVersion: Option<string>) {
|
|
43
43
|
const version = currentVersion
|
|
44
44
|
.map(cv => (parseInt(cv) + 1).toString())
|
|
45
45
|
.getOrElse(() => "1")
|
|
@@ -65,7 +65,7 @@ export function getRecordName(type: string, id: string) {
|
|
|
65
65
|
export function makeMap<TKey, T>() {
|
|
66
66
|
const map = new Map<TKey, T>()
|
|
67
67
|
return {
|
|
68
|
-
find: (k: TKey) => Effect(() =>
|
|
68
|
+
find: (k: TKey) => Effect(() => Option.fromNullable(map.get(k))),
|
|
69
69
|
[Symbol.iterator]: () => map[Symbol.iterator](),
|
|
70
70
|
set: (k: TKey, v: T) =>
|
|
71
71
|
Effect(() => {
|
|
@@ -76,7 +76,7 @@ export function makeMap<TKey, T>() {
|
|
|
76
76
|
|
|
77
77
|
export interface EffectMap<TKey, T> {
|
|
78
78
|
[Symbol.iterator](): IterableIterator<[TKey, T]>
|
|
79
|
-
find: (k: TKey) => Effect<never, never,
|
|
79
|
+
find: (k: TKey) => Effect<never, never, Option<T>>
|
|
80
80
|
set: (k: TKey, v: T) => Effect<never, never, void>
|
|
81
81
|
}
|
|
82
82
|
|
|
@@ -37,7 +37,7 @@ const getM = <T>(type: string) => <R, E, A>(eff: (m: EffectMap<string, CachedRec
|
|
|
37
37
|
})
|
|
38
38
|
|
|
39
39
|
export function find<R, RDecode, EDecode, E, EA, A>(
|
|
40
|
-
tryRead: (id: string) => Effect<R, E,
|
|
40
|
+
tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>,
|
|
41
41
|
decode: (d: EA) => Effect<RDecode, EDecode, A>,
|
|
42
42
|
type: string
|
|
43
43
|
) {
|
|
@@ -63,7 +63,7 @@ export function find<R, RDecode, EDecode, E, EA, A>(
|
|
|
63
63
|
}
|
|
64
64
|
|
|
65
65
|
export function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey>>(
|
|
66
|
-
save: (r: A, version:
|
|
66
|
+
save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>,
|
|
67
67
|
type: string
|
|
68
68
|
) {
|
|
69
69
|
const getCache = getM<A>(type)
|
|
@@ -79,8 +79,8 @@ export function storeDirectly<R, E, TKey extends string, A extends DBRecord<TKey
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
export function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<TKey>>(
|
|
82
|
-
tryRead: (id: string) => Effect<R, E,
|
|
83
|
-
save: (r: A, version:
|
|
82
|
+
tryRead: (id: string) => Effect<R, E, Option<CachedRecord<EA>>>,
|
|
83
|
+
save: (r: A, version: Option<Version>) => Effect<R, E, CachedRecord<A>>,
|
|
84
84
|
lock: (id: string) => Effect<R2 | Scope, E2, unknown>,
|
|
85
85
|
type: string
|
|
86
86
|
) {
|
|
@@ -90,7 +90,7 @@ export function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<
|
|
|
90
90
|
c
|
|
91
91
|
.find(record.id)
|
|
92
92
|
.mapOpt(x => x.version)
|
|
93
|
-
.flatMap(_ => _.match(() => save(record,
|
|
93
|
+
.flatMap(_ => _.match(() => save(record, Option.none), confirmVersionAndSave(record)))
|
|
94
94
|
.tap(r => c.set(record.id, r))
|
|
95
95
|
.map(r => r.data)
|
|
96
96
|
)
|
|
@@ -110,7 +110,7 @@ export function store<R, E, R2, E2, TKey extends string, EA, A extends DBRecord<
|
|
|
110
110
|
? Effect.fail(new OptimisticLockException(type, record.id))
|
|
111
111
|
: Effect.unit
|
|
112
112
|
)
|
|
113
|
-
.zipRight(save(record,
|
|
113
|
+
.zipRight(save(record, Option(cv)))
|
|
114
114
|
).scoped
|
|
115
115
|
}
|
|
116
116
|
}
|
|
@@ -18,7 +18,7 @@ export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, i
|
|
|
18
18
|
version: string;
|
|
19
19
|
};
|
|
20
20
|
tags: never[];
|
|
21
|
-
paths: Record<string, Record<"
|
|
21
|
+
paths: Record<string, Record<"PATCH" | "GET" | "POST" | "PUT" | "DELETE", {
|
|
22
22
|
[x: string]: {
|
|
23
23
|
responses: any;
|
|
24
24
|
tags: readonly string[] | undefined;
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Effect } from "@effect/io/Effect";
|
|
2
2
|
import { Layer } from "@effect/io/Layer";
|
|
3
|
-
import {
|
|
3
|
+
import { Option } from "@effect-app/core/Option";
|
|
4
4
|
import * as MO from "@effect-app/schema";
|
|
5
5
|
import type { Methods } from "@effect-app/schema";
|
|
6
6
|
import type express from "express";
|
|
@@ -61,11 +61,11 @@ export type Middleware2<R, ReqA, ResA, R2 = never, PR = never> = Middleware<R, a
|
|
|
61
61
|
export declare function makeRequestParsers<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA, Errors>(Request: RequestHandler<R, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA, ResA, Errors>["Request"]): RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA>;
|
|
62
62
|
type Decode<A> = (u: unknown) => Effect<never, unknown, A>;
|
|
63
63
|
export interface RequestParsers<PathA, CookieA, QueryA, BodyA, HeaderA> {
|
|
64
|
-
parseHeaders: Decode<
|
|
65
|
-
parseQuery: Decode<
|
|
66
|
-
parseBody: Decode<
|
|
67
|
-
parsePath: Decode<
|
|
68
|
-
parseCookie: Decode<
|
|
64
|
+
parseHeaders: Decode<Option<HeaderA>>;
|
|
65
|
+
parseQuery: Decode<Option<QueryA>>;
|
|
66
|
+
parseBody: Decode<Option<BodyA>>;
|
|
67
|
+
parsePath: Decode<Option<PathA>>;
|
|
68
|
+
parseCookie: Decode<Option<CookieA>>;
|
|
69
69
|
}
|
|
70
70
|
export {};
|
|
71
71
|
//# sourceMappingURL=requestHandler.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"requestHandler.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/requestHandler.ts"],"names":[],"mappings":";;;AAEA,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAA;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,oBAAoB,CAAA;AAEjD,OAAO,KAAK,OAAO,MAAM,SAAS,CAAA;AAClC,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAEpD,MAAM,MAAM,EAAE,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;IAC5D,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,EAAE,GAAG,CAAC;CAC1B,GAAG,CAAC,GACD,KAAK,CAAA;AAET,MAAM,MAAM,EAAE,CAAC,CAAC,SAAS,MAAM,CAAC,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,SAAS;IAC5D,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,EAAE,GAAG,CAAC;CAC1B,GAAG,CAAC,GACD,KAAK,CAAA;AAET,MAAM,MAAM,OAAO,CACjB,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,IACjC,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG;IACpC,MAAM,EAAE,OAAO,CAAA;IACf,IAAI,EAAE,MAAM,CAAA;IACZ,MAAM,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAA;IACnD,IAAI,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,KAAK,CAAC,CAAA;IAC/C,IAAI,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,KAAK,CAAC,CAAA;IAChC,KAAK,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,MAAM,CAAC,CAAA;IACjD,OAAO,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,EAAE,OAAO,CAAC,CAAA;CACrD,CAAA;AAED,MAAM,MAAM,QAAQ,CAClB,IAAI,SAAS,MAAM,EACnB,MAAM,SAAS,OAAO,EACtB,IAAI,IACF,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG;IACpC,MAAM,EAAE,MAAM,CAAA;IACd,IAAI,EAAE,IAAI,CAAA;CACX,CAAA;AAED,MAAM,MAAM,MAAM,CAAC,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,EAAE,CAAC,KAAK,CAAC,CAAA;AAYtC,wBAAgB,YAAY,CAAC,CAAC,EAAE,OAAO,aAEtC;AASD,wBAAgB,kBAAkB,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EACvE,OAAO,EAAE,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,+CAEZ,eAAe;;;;;;GAqFnE;AAwBD,wBAAgB,cAAc,CAAC,IAAI,EAAE,CAAC,EAAE,CAAC,EACvC,cAAc,EAAE,CAAC,GAAG,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,SAE9B,IAAI,OAAO,gBAAgB,sEASzC;AAED,MAAM,WAAW,oBAAoB,CACnC,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,IAAI;IAEJ,aAAa,CAAC,EAAE,GAAG,CAAA;IACnB,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,EAAE,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAC5D,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IAC9D,QAAQ,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;CACtE;AAED,MAAM,WAAW,cAAc,CAC7B,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,IAAI;IAEJ,aAAa,CAAC,EAAE,GAAG,CAAA;IACnB,CAAC,EAAE,CAAC,CAAC,EAAE,KAAK,GAAG,MAAM,GAAG,KAAK,GAAG,EAAE,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IAC5D,OAAO,EAAE,OAAO,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,CAAC,CAAA;IAC9D,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;IACpE,eAAe,CAAC,EAAE,GAAG,CAAA;CACtB;AAED,MAAM,WAAW,eAAe,CAC9B,CAAC,EACD,IAAI,SAAS,MAAM,EACnB,MAAM,SAAS,OAAO,EACtB,IAAI,EACJ,IAAI,EACJ,IAAI;IAEJ,CAAC,EAAE,CAAC,CAAC,EAAE,IAAI,KAAK,MAAM,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC,CAAA;IACrC,OAAO,EAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACrC,QAAQ,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,OAAO,EAAE,IAAI,CAAC,CAAA;CACrE;AAED,MAAM,MAAM,iBAAiB,CAAC,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,IAAI,CAC5D,GAAG,EAAE,OAAO,CAAC,OAAO,EACpB,GAAG,EAAE,OAAO,CAAC,QAAQ,KAClB,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,EAAE,CAAC,CAAA;AAExB,MAAM,MAAM,UAAU,CACpB,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,IAAI,EACJ,EAAE,GAAG,KAAK,EACV,EAAE,GAAG,KAAK,IACR,CACF,OAAO,EAAE,cAAc,CAAC,CAAC,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,KACjF;IACH,OAAO,EAAE,OAAO,OAAO,CAAA;IACvB,MAAM,EAAE,iBAAiB,CAAC,IAAI,EAAE,EAAE,EAAE,EAAE,CAAC,CAAA;CACxC,CAAA;AAED,MAAM,MAAM,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,GAAG,KAAK,EAAE,EAAE,GAAG,KAAK,IAAI,UAAU,CACzE,CAAC,EACD,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,GAAG,EACH,IAAI,EACJ,IAAI,EACJ,GAAG,EACH,EAAE,EACF,EAAE,CACH,CAAA;AAED,wBAAgB,kBAAkB,CAChC,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,SAAS,KAAK,GAAG,MAAM,GAAG,KAAK,EACnC,IAAI,EACJ,MAAM,EAEN,OAAO,EAAE,cAAc,CACrB,CAAC,EACD,KAAK,EACL,OAAO,EACP,MAAM,EACN,KAAK,EACL,OAAO,EACP,IAAI,EACJ,IAAI,EACJ,MAAM,CACP,CAAC,SAAS,CAAC,GACX,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO,CAAC,CAgDxD;AAED,KAAK,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,EAAE,OAAO,KAAK,MAAM,CAAC,KAAK,EAAE,OAAO,EAAE,CAAC,CAAC,CAAA;AAE1D,MAAM,WAAW,cAAc,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,OAAO;IACpE,YAAY,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"requestHandler.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/requestHandler.ts"],"names":[],"mappings":"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"}
|
|
@@ -118,15 +118,15 @@ export function respondSuccess(encodeResponse) {
|
|
|
118
118
|
}
|
|
119
119
|
export function makeRequestParsers(Request) {
|
|
120
120
|
const ph = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Headers)))));
|
|
121
|
-
const parseHeaders = (u) => tsplus_module_6.
|
|
121
|
+
const parseHeaders = (u) => tsplus_module_6.flatMapOption(ph, d => d(u));
|
|
122
122
|
const pq = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Query)))));
|
|
123
|
-
const parseQuery = (u) => tsplus_module_6.
|
|
123
|
+
const parseQuery = (u) => tsplus_module_6.flatMapOption(pq, d => d(u));
|
|
124
124
|
const pb = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Body)))));
|
|
125
|
-
const parseBody = (u) => tsplus_module_6.
|
|
125
|
+
const parseBody = (u) => tsplus_module_6.flatMapOption(pb, d => d(u));
|
|
126
126
|
const pp = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Path)))));
|
|
127
|
-
const parsePath = (u) => tsplus_module_6.
|
|
127
|
+
const parsePath = (u) => tsplus_module_6.flatMapOption(pp, d => d(u));
|
|
128
128
|
const pc = tsplus_module_1.sync(() => tsplus_module_5.map(MO.condemn)(tsplus_module_5.map(Parser.for)(tsplus_module_5.map(s => s)(tsplus_module_5.fromNullable(Request.Cookie)))));
|
|
129
|
-
const parseCookie = (u) => tsplus_module_6.
|
|
129
|
+
const parseCookie = (u) => tsplus_module_6.flatMapOption(pc, d => d(u));
|
|
130
130
|
return {
|
|
131
131
|
parseBody,
|
|
132
132
|
parseCookie,
|
|
@@ -135,4 +135,4 @@ export function makeRequestParsers(Request) {
|
|
|
135
135
|
parseQuery
|
|
136
136
|
};
|
|
137
137
|
}
|
|
138
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
138
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"requestHandler.js","sourceRoot":"","sources":["../../../../_src/api/express/schema/requestHandler.ts"],"names":[],"mappings":";;;;;;AAAA,uDAAuD;AACvD,iDAAiD;AACjD,OAAO,KAAK,EAAE,MAAM,oBAAoB,CAAA;AAExC,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAE3C,OAAO,EAAE,eAAe,EAAE,MAAM,oBAAoB,CAAA;AAwCpD,oDAAoD;AACpD,iCAAiC;AACjC,6BAA6B;AAC7B,mCAAmC;AACnC,MAAM;AACN,mEAAmE;AACnE,iCAAiC;AACjC,MAAM;AACN,qCAAqC;AACrC,IAAI;AACJ,MAAM,UAAU,YAAY,CAAC,CAAU;IACrC,OAAO,CAAC,CAAC,CAAC,CAAA;AACZ,CAAC;AAED,iEAAiE;AACjE,+FAA+F;AAC/F,4BAA4B;AAC5B,MAAM;AACN,IAAI;AAEJ,8DAA8D;AAC9D,MAAM,UAAU,kBAAkB,CAChC,OAA+D;IAE/D,OAAO,CAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,KAAK,EAAmB,EAAE,EAAE,CACpE,wBAAA,uBAAc;QACZ,IAAI,EAAE,6CAAA,OAAO;aACV,SAAS,CAAC,IAAI,CAAC,GACF,CAAC,CAAC,EAAE,CAChB,0BAAA,CAAC,CAAY,IAAI,CAAC,0BAAA,CAAC,CAAC,KAAK,CAAY;YACnC,CAAC,CAAE,8BAAqB,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAA2C;YAChF,CAAC,CAAC,2BACA,0BAAA,CAAC,CAAY;gBACX,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE;gBAC9C,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,2BAAE,CAAC,CAAC,KAAK,CAAS,EAAE,CAClD,CACJ;QACH,MAAM,EAAE,6CAAA,OAAO;aACZ,WAAW,CAAC,OAAO,CAAC,GACP,CAAC,CAAC,EAAE,CAChB,0BAAA,CAAC,CAAY,IAAI,CAAC,0BAAA,CAAC,CAAC,KAAK,CAAY;YACnC,CAAC,CAAE,8BAAqB,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAA2C;YAChF,CAAC,CAAC,2BACA,0BAAA,CAAC,CAAY;gBACX,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE;gBAC9C,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,2BAAE,CAAC,CAAC,KAAK,CAAS,EAAE,CAClD,CACJ;QACH,OAAO,EAAE,6CAAA,OAAO;aACb,YAAY,CAAC,OAAO,CAAC,GACR,CAAC,CAAC,EAAE,CAChB,0BAAA,CAAC,CAAY,IAAI,CAAC,0BAAA,CAAC,CAAC,KAAK,CAAY;YACnC,CAAC,CAAE,8BAAqB,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAA2C;YAChF,CAAC,CAAC,2BACA,0BAAA,CAAC,CAAY;gBACX,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE;gBAC9C,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,2BAAE,CAAC,CAAC,KAAK,CAAS,EAAE,CAClD,CACJ;QACH,KAAK,EAAE,6CAAA,OAAO;aACX,UAAU,CAAC,KAAK,CAAC,GACJ,CAAC,CAAC,EAAE,CAChB,0BAAA,CAAC,CAAY,IAAI,CAAC,0BAAA,CAAC,CAAC,KAAK,CAAY;YACnC,CAAC,CAAE,8BAAqB,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAA2C;YAChF,CAAC,CAAC,2BACA,0BAAA,CAAC,CAAY;gBACX,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE;gBAC9C,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,2BAAE,CAAC,CAAC,KAAK,CAAS,EAAE,CAClD,CACJ;QACH,IAAI,EAAE,6CAAA,OAAO;aACV,SAAS,CAAC,MAAM,CAAC,GACJ,CAAC,CAAC,EAAE,CAChB,0BAAA,CAAC,CAAY,IAAI,CAAC,0BAAA,CAAC,CAAC,KAAK,CAAY;YACnC,CAAC,CAAE,8BAAqB,GAAG,EAAE,CAAC,CAAC,CAAC,KAAK,CAA2C;YAChF,CAAC,CAAC,2BACA,0BAAA,CAAC,CAAY;gBACX,CAAC,CAAC,EAAE,IAAI,EAAE,SAAkB,EAAE,KAAK,EAAE,CAAC,CAAC,KAAK,EAAE;gBAC9C,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,MAAM,2BAAE,CAAC,CAAC,KAAK,CAAS,EAAE,CAClD,CACJ;KACJ,CAAC,EAAS,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,KAAK,EAAE,EAAE,EAAE;QACpD,MAAM,MAAM,GAAc,EAAE,CAAA;QAC5B,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;SAC5C;QACD,IAAI,MAAM,CAAC,IAAI,KAAK,SAAS,EAAE;YAC7B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC,CAAA;SAChD;QACD,IAAI,OAAO,CAAC,IAAI,KAAK,SAAS,EAAE;YAC9B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAA;SAClD;QACD,IAAI,IAAI,CAAC,IAAI,KAAK,SAAS,EAAE;YAC3B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;SAC5C;QACD,IAAI,KAAK,CAAC,IAAI,KAAK,SAAS,EAAE;YAC5B,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAA;SAC5C;QACD,IAAI,MAAM,CAAC,MAAM,EAAE;YACjB,OAAO,qBAAY,IAAI,eAAe,CAAC,MAAM,CAAC,CAAC,CAAA;SAChD;QACD,OAAO,2BAAO,CAAA;YACZ,IAAI,EAAE,IAAI,CAAC,KAAM;YACjB,MAAM,EAAE,MAAM,CAAC,KAAM;YACrB,OAAO,EAAE,OAAO,CAAC,KAAM;YACvB,IAAI,EAAE,IAAI,CAAC,KAAM;YACjB,KAAK,EAAE,KAAK,CAAC,KAAM;SACpB,CAAA,CAAC,CAAA;IACJ,CAAC,CAAC,CAAA;AACN,CAAC;AAED,iEAAiE;AACjE,+EAA+E;AAC/E,uCAAuC;AACvC,gDAAgD;AAChD,OAAO;AACP,qEAAqE;AACrE,MAAM;AACN,kCAAkC;AAClC,uBAAuB;AACvB,oDAAoD;AACpD,oBAAoB;AACpB,SAAS;AACT,cAAc;AACd,yEAAyE;AACzE,QAAQ;AACR,MAAM;AACN,IAAI;AAEJ,SAAS,SAAS,CAAC,IAAY;IAC7B,OAAO,CAAC,CAAU,EAAE,EAAE,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;AAC5D,CAAC;AAED,MAAM,UAAU,cAAc,CAC5B,cAA2C;IAE3C,OAAO,CAAC,GAAS,EAAE,GAAqB,EAAE,EAAE,CAC1C,gBAAA,IAAI,CAAC,cAAc,CAAC,GAAG,CAAC,2BAAkB,CAAC,CAAC,EAAE,CAC5C,wBAAA,CAAC,EAAS,CAAC,CAAC,EAAE,CACZ,qBAAO,GAAG,EAAE;QACV,CAAC,KAAK,SAAS;YACb,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE;YACxB,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IACjE,CAAC,CAAC,CACH,CAAC,CAAA;AACR,CAAC;AAwFD,MAAM,UAAU,kBAAkB,CAWhC,OAUY;IAEZ,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,OAAO,EAHjB,oBAEO,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,OAAO,CAAC,CACtB,CACI,CACA,CACnB,CAAA;IACD,MAAM,YAAY,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE7D,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,OAAO,EAHjB,oBAEO,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,KAAK,CAAC,CACpB,CACI,CACA,CACnB,CAAA;IACD,MAAM,UAAU,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE3D,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,OAAO,EAHjB,oBAEO,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,IAAI,CAAC,CACnB,CACI,CACA,CACnB,CAAA;IACD,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1D,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,OAAO,EAHjB,oBAEO,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,IAAI,CAAC,CACnB,CACI,CACA,CACnB,CAAA;IACD,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE1D,MAAM,EAAE,GAAG,2BACT,oBAGO,EAAE,CAAC,OAAO,EAHjB,oBAEO,MAAM,CAAC,GAAG,EAFjB,oBACO,CAAC,CAAC,EAAE,CAAC,CAAC,EADb,6BAAoB,OAAO,CAAC,MAAM,CAAC,CACrB,CACI,CACA,CACnB,CAAA;IACD,MAAM,WAAW,GAAG,CAAC,CAAU,EAAE,EAAE,CAAC,8BAAA,EAAE,EAAY,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;IAE5D,OAAO;QACL,SAAS;QACT,WAAW;QACX,YAAY;QACZ,SAAS;QACT,UAAU;KACX,CAAA;AACH,CAAC"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Option } from "@effect-app/core/Option";
|
|
2
2
|
import type { Methods } from "@effect-app/schema";
|
|
3
3
|
import type { JSONSchema, ParameterLocation, SubSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus";
|
|
4
4
|
import type { RequestHandler, RequestHandlerOptRes } from "./requestHandler.js";
|
|
@@ -20,7 +20,7 @@ export function makeFromSchema(e) {
|
|
|
20
20
|
const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler;
|
|
21
21
|
const r = ResponseOpenApi ?? Res_;
|
|
22
22
|
const Res = r ? MO.extractSchema(r) : MO.Void;
|
|
23
|
-
// TODO
|
|
23
|
+
// TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
|
|
24
24
|
// TODO: use the path vs body etc serialisation also in the Client.
|
|
25
25
|
const makeReqQuerySchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Query)), _ => tsplus_module_3.match(() => tsplus_module_2.sync(() => tsplus_module_1.none), _ => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some))(_));
|
|
26
26
|
const makeReqHeadersSchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Headers)), _ => tsplus_module_3.match(() => tsplus_module_2.sync(() => tsplus_module_1.none), _ => tsplus_module_2.map(jsonSchema(_), tsplus_module_3.some))(_));
|
|
@@ -90,4 +90,4 @@ class Response {
|
|
|
90
90
|
this.type = type;
|
|
91
91
|
}
|
|
92
92
|
}
|
|
93
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
93
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3Mvc2NoZW1hL3JvdXRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsdURBQXVEO0FBQ3ZELE9BQU8sS0FBSyxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFJeEMsT0FBTyxFQUFFLGNBQWMsRUFBRSxNQUFNLGlEQUFpRCxDQUFBO0FBQ2hGLE9BQU8sS0FBSyxPQUFPLE1BQU0sMENBQTBDLENBQUE7QUFHbkUsTUFBTSxVQUFVLHFCQUFxQixDQUErQixDQUFJO0lBQ3RFLE9BQU8sQ0FBdUIsQ0FBQTtBQUNoQyxDQUFDO0FBRUQsTUFBTSxVQUFVLHdCQUF3QixDQUN0QyxHQUFxQjtJQUVyQixPQUFPLEdBQUcsQ0FBQyxHQUFHLENBQUMscUJBQXFCLENBQUMsQ0FBQTtBQUN2QyxDQUFDO0FBa0NELE1BQU0sVUFBVSxtQkFBbUIsQ0FZakMsSUFBWSxFQUNaLE1BQWMsRUFDZCxPQVVDO0lBRUQsT0FBTyxFQUFFLElBQUksRUFBRSxNQUFNLEVBQUUsT0FBTyxFQUFFLElBQUksRUFBRSxRQUFRLEVBVzdDLENBQUE7QUFDSCxDQUFDO0FBRUQsTUFBTSxVQUFVLGNBQWMsQ0FDNUIsQ0FBZ0U7SUFFaEUsTUFBTSxXQUFXLEdBQUcsT0FBTyxDQUFDLEdBQUcsQ0FBQTtJQUMvQixNQUFNLFVBQVUsR0FBRyxDQUFPLENBQWtCLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsQ0FBQTtJQUMvRCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsRUFBRSxRQUFRLEVBQUUsSUFBSSxFQUFFLGVBQWUsRUFBRSxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUE7SUFDbkUsTUFBTSxDQUFDLEdBQUcsZUFBZSxJQUFJLElBQUksQ0FBQTtJQUNqQyxNQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxhQUFhLENBQUMs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
|
package/dist/api/routing.js
CHANGED
|
@@ -20,15 +20,15 @@ import { reportRequestError } from "./reportError.js";
|
|
|
20
20
|
import { snipString, snipValue } from "./util.js";
|
|
21
21
|
export function makeRequestParsers(Request) {
|
|
22
22
|
const ph = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Headers)))));
|
|
23
|
-
const parseHeaders = (u) => tsplus_module_3.
|
|
23
|
+
const parseHeaders = (u) => tsplus_module_3.flatMapOption(ph, d => d(u));
|
|
24
24
|
const pq = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Query)))));
|
|
25
|
-
const parseQuery = (u) => tsplus_module_3.
|
|
25
|
+
const parseQuery = (u) => tsplus_module_3.flatMapOption(pq, d => d(u));
|
|
26
26
|
const pb = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Body)))));
|
|
27
|
-
const parseBody = (u) => tsplus_module_3.
|
|
27
|
+
const parseBody = (u) => tsplus_module_3.flatMapOption(pb, d => d(u));
|
|
28
28
|
const pp = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Path)))));
|
|
29
|
-
const parsePath = (u) => tsplus_module_3.
|
|
29
|
+
const parsePath = (u) => tsplus_module_3.flatMapOption(pp, d => d(u));
|
|
30
30
|
const pc = tsplus_module_2.sync(() => tsplus_module_1.map(MO.condemnFail)(tsplus_module_1.map(MO.Parser.for)(tsplus_module_1.map(s => s)(tsplus_module_1.fromNullable(Request.Cookie)))));
|
|
31
|
-
const parseCookie = (u) => tsplus_module_3.
|
|
31
|
+
const parseCookie = (u) => tsplus_module_3.flatMapOption(pc, d => d(u));
|
|
32
32
|
return {
|
|
33
33
|
parseBody,
|
|
34
34
|
parseCookie,
|
|
@@ -244,4 +244,4 @@ export function matchResource(mod) {
|
|
|
244
244
|
return handler;
|
|
245
245
|
};
|
|
246
246
|
}
|
|
247
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
247
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../_src/api/routing.ts"],"names":[],"mappings":"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"}
|
package/dist/rateLimit.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { DUR } from "@fp-ts/data/Duration";
|
|
1
|
+
import { Duration, DUR } from "@fp-ts/data/Duration";
|
|
2
2
|
import { Semaphore, Effect } from "@effect/io/Effect";
|
|
3
3
|
import { Chunk } from "@fp-ts/data/Chunk";
|
|
4
4
|
/**
|
|
@@ -10,7 +10,7 @@ import { Chunk } from "@fp-ts/data/Chunk";
|
|
|
10
10
|
* @tsplus pipeable effect/io/Effect/Semaphore withPermitsDuration
|
|
11
11
|
* @tsplus location "@effect-app/infra/rateLimit"
|
|
12
12
|
*/
|
|
13
|
-
export declare function SEM_withPermitsDuration(permits: number, duration:
|
|
13
|
+
export declare function SEM_withPermitsDuration(permits: number, duration: Duration): (self: Semaphore) => <R, E, A>(effect: import("@effect/io/Effect").Effect<R, E, A>) => import("@effect/io/Effect").Effect<R, E, A>;
|
|
14
14
|
/**
|
|
15
15
|
* @tsplus pipeable Iterable batchNPar
|
|
16
16
|
* @tsplus static Collection.Aspects batchNPar
|
package/dist/rateLimit.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../_src/rateLimit.ts"],"names":[],"mappings":";;;;;;;;;;;;AAkCA,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,
|
|
1
|
+
{"version":3,"file":"rateLimit.d.ts","sourceRoot":"","sources":["../_src/rateLimit.ts"],"names":[],"mappings":";;;;;;;;;;;;AAkCA,wBAAgB,uBAAuB,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,UAC3D,SAAS,mHAYxB;;;;;;AAMD,wBAAgB,SAAS,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAC9C,CAAC,EAAE,MAAM,EACT,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC1E,YAAY,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,WAE7C,SAAS,CAAC,CAAC,+FAM3B;;;;;;AAMD,wBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,EAC1C,CAAC,EAAE,MAAM,EACT,WAAW,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,YAAY,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,EAC/E,YAAY,EAAE,CAAC,CAAC,EAAE,KAAK,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,KAAK,MAAM,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,WAE7C,SAAS,CAAC,CAAC,+FAM3B;;;;;;AA2BD,wBAAgB,cAAc,CAC5B,CAAC,EAAE,MAAM,EACT,CAAC,EAAE,GAAG,gUAeP"}
|
package/dist/rateLimit.js
CHANGED
|
@@ -10,7 +10,7 @@ import * as tsplus_module_3 from "@effect-app/core/Array";
|
|
|
10
10
|
// * @tsplus static effect/stm/TSemaphore.Ops withPermitsDuration
|
|
11
11
|
// * @tsplus pipeable effect/stm/TSemaphore withPermitsDuration
|
|
12
12
|
// */
|
|
13
|
-
// export function withPermitsDuration(permits: number, duration:
|
|
13
|
+
// export function withPermitsDuration(permits: number, duration: Duration) {
|
|
14
14
|
// return (self: TSemaphore): <R, E, A>(effect: Effect<R, E, A>) => Effect<R, E, A> => {
|
|
15
15
|
// return effect =>
|
|
16
16
|
// Effect.uninterruptibleMask(
|
|
@@ -79,4 +79,4 @@ export function batch(n, forEachItem, forEachBatch) {
|
|
|
79
79
|
export function naiveRateLimit(n, d) {
|
|
80
80
|
return (items) => ((forEachItem, forEachBatch) => tsplus_module_3.ext_forEachWithIndex(tsplus_module_3.chunk_(items, n), (batch, i) => tsplus_module_1.zipRight(((i === 0) ? tsplus_module_2.unit : tsplus_module_1.delay(tsplus_module_2.unit, d)), tsplus_module_1.flatMap(tsplus_module_1.withParallelism(tsplus_module_3.ext_forEachEffectPar(batch, forEachItem), n), forEachBatch))));
|
|
81
81
|
}
|
|
82
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
82
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicmF0ZUxpbWl0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9yYXRlTGltaXQudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsTUFBTTtBQUNOLDhFQUE4RTtBQUM5RSx1RUFBdUU7QUFDdkUsbUZBQW1GO0FBQ25GLCtCQUErQjtBQUMvQixLQUFLO0FBQ0wsa0VBQWtFO0FBQ2xFLGdFQUFnRTtBQUNoRSxNQUFNO0FBQ04sNkVBQTZFO0FBQzdFLDBGQUEwRjtBQUMxRix1QkFBdUI7QUFDdkIsb0NBQW9DO0FBQ3BDLHFCQUFxQjtBQUNyQixtREFBbUQ7QUFDbkQsZ0NBQWdDO0FBQ2hDLDJCQUEyQjtBQUMzQix5Q0FBeUM7QUFDekMsNEJBQTRCO0FBQzVCLHFDQUFxQztBQUNyQyxrQkFBa0I7QUFDbEIsVUFBVTtBQUNWLE1BQU07QUFDTixJQUFJO0FBRUo7Ozs7Ozs7O0dBUUc7QUFDSCxNQUFNLFVBQVUsdUJBQXVCLENBQUMsT0FBZSxFQUFFLFFBQWtCO0lBQ3pFLE9BQU8sQ0FBQyxJQUFlLEVBQXlELEVBQUU7UUFDaEYsT0FBTyxNQUFNLENBQUMsRUFBRSxDQUNkLG9DQUNFLE9BQU8sQ0FBQyxFQUFFLGdDQUVKLHlCQUFBLE9BQU8sQ0FBQyxNQUFNLENBQUMsRUFFYixzQkFBQSxJQUFJLENBQUMsT0FBTyxDQUFDLE9BQU8sQ0FBQyxFQUNaLFFBQVEsQ0FBQyxDQUNuQixFQUxMLE9BQU8sQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBS3RCLENBQ1IsQ0FBQTtJQUNMLENBQUMsQ0FBQTtBQUNILENBQUM7QUFFRDs7O0dBR0c7QUFDSCxNQUFNLFVBQVUsU0FBUyxDQUN2QixDQUFTLEVBQ1QsV0FBMEUsRUFDMUUsWUFBNEQ7SUFFNUQsT0FBTyxDQUFDLEtBQWtCLEVBQUUsRUFBRSxDQUM1Qix3Q0FBQSx1QkFBQSxLQUFLLEVBQU8sQ0FBQyxDQUFDLEVBQ2UsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLEVBQUUsQ0FDbEMsd0JBQUEsb0NBQUEsQ0FBQyxFQUFxQixDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFDLFdBQVcsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLEVBQzFDLENBQUMsQ0FBQyxFQUFFLENBQUMsWUFBWSxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxDQUNwQyxDQUFBO0FBQ1AsQ0FBQztBQUVEOzs7R0FHRztBQUNILE1BQU0sVUFBVSxLQUFLLENBQ25CLENBQVMsRUFDVCxXQUErRSxFQUMvRSxZQUE0RDtJQUU1RCxPQUFPLENBQUMsS0FBa0IsRUFBRSxFQUFFLENBQzVCLHFDQUFBLHVCQUFBLEtBQUssRUFBTyxDQUFDLENBQUMsRUFDWSxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUMvQix3QkFBQSxvQ0FBQSxDQUFDLEVBQXFCLENBQUMsQ0FBQyxFQUFFLENBQUMsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUMsRUFDMUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQyxZQUFZLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxDQUFDLENBQ3BDLENBQUE7QUFDUCxDQUFDO0FBRUQsTUFBTTtBQUNOLHlDQUF5QztBQUN6QyxpREFBaUQ7QUFDakQsTUFBTTtBQUNOLDZCQUE2QjtBQUM3QixlQUFlO0FBQ2YsV0FBVztBQUNYLE1BQU07QUFDTixzQ0FBc0M7QUFDdEMsNkJBQTZCO0FBQzdCLGdEQUFnRDtBQUNoRCwwREFBMEQ7QUFDMUQsV0FBVztBQUNYLHFDQUFxQztBQUNyQyxzQkFBc0I7QUFDdEIsd0NBQXdDO0FBQ3hDLG1GQUFtRjtBQUNuRixzQkFBc0I7QUFDdEIsSUFBSTtBQUVKOzs7R0FHRztBQUVILE1BQU0sVUFBVSxjQUFjLENBQzVCLENBQVMsRUFDVCxDQUFNO0lBRU4sT0FBTyxDQUFJLEtBQWtCLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FDakMsV0FBc0MsRUFDdEMsWUFBaUQsRUFDakQsRUFBRSxDQUNGLHFDQUFBLHVCQUFBLEtBQUssRUFBTyxDQUFDLENBQUMsRUFDWSxDQUFDLEtBQUssRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUNuQyx5QkFBQSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsc0JBQWEsQ0FBQyxDQUFDLDRDQUFrQixDQUFDLENBQUMsQ0FBQyxFQUU1Qyx3QkFBQSxnQ0FBQSxxQ0FBQSxLQUFLLEVBQWtCLFdBQVcsQ0FBQyxFQUNoQixDQUFDLENBQUMsRUFDVixZQUFZLENBQUMsQ0FDekIsQ0FDSixDQUFDLENBQUE7QUFDUixDQUFDIn0=
|
|
@@ -84,4 +84,4 @@ const cleanupLoop = tsplus_module_1.forkScoped(tsplus_module_1.forever(tsplus_mo
|
|
|
84
84
|
* @tsplus static Operations.Ops Live
|
|
85
85
|
*/
|
|
86
86
|
export const Live = tsplus_module_10.LayerProvideMerge(tsplus_module_10.toScopedDiscardLayer(cleanupLoop))(tsplus_module_1.toLayer(make, Operations));
|
|
87
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
87
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGl2ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvT3BlcmF0aW9ucy9saXZlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxnQkFBZ0IsRUFBRSxNQUFNLG1DQUFtQyxDQUFBO0FBQ3BFLE9BQU8sRUFBRSxXQUFXLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUU3RCxPQUFPLEVBQUUsT0FBTyxFQUFFLFNBQVMsRUFBRSxXQUFXLEVBQUUsT0FBTyxFQUFFLE1BQU0sZ0NBQWdDLENBQUE7QUFDekYsT0FBTyxFQUFFLFVBQVUsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV6QyxNQUFNLGNBQWMsR0FBRyxXQUFXLENBQUMsS0FBSyxDQUFDLEVBQUUsQ0FBQyxJQUFJLGdCQUFnQixDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUE7QUFFeEUsTUFBTSxJQUFJLEdBQUcscUJBQU8sR0FBRyxFQUFFO0lBQ3ZCLE1BQU0sR0FBRyxHQUFHLElBQUksR0FBRyxFQUEwQixDQUFBO0lBQzdDLE1BQU0sTUFBTSxHQUFHLHFCQUFPLEdBQUcsRUFBRSxDQUFDLFdBQVcsQ0FBQyxJQUFJLEVBQUUsQ0FBQyxDQUFBO0lBRS9DLE1BQU0sT0FBTyxHQUFHLHFCQUFPLEdBQUcsRUFBRTtRQUMxQixNQUFNLE1BQU0sR0FBRyw2QkFBQSxJQUFJLElBQUksRUFBRSxFQUFVLENBQUMsQ0FBQyxDQUFBO1FBQ3JDLDhCQUFBLEdBQUcsQ0FBQyxPQUFPLEVBQUUsRUFFVixPQUFPLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsRUFBRSxFQUFFO1lBQ3BCLE1BQU0sV0FBVyxHQUFHLDBCQUE0QyxHQUFHLEVBQUUsQ0FBQyxFQUFFLENBQUMsU0FBUyxFQUE5RCw2QkFBb0IsRUFBRSxDQUFDLFNBQVMsQ0FBQyxDQUE4QixDQUFBO1lBQ25GLElBQUksV0FBVyxHQUFHLE1BQU0sRUFBRTtnQkFD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
|
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
import { ServiceTagged } from "@effect-app/prelude/service";
|
|
2
2
|
import { Effect } from "@effect/io/Effect";
|
|
3
3
|
import { Scope } from "@effect/io/Scope";
|
|
4
|
-
import {
|
|
4
|
+
import { Option } from "@effect-app/core/Option";
|
|
5
5
|
import { Tag } from "@fp-ts/data/Context";
|
|
6
6
|
import type { Operation, OperationId, OperationProgress } from "@effect-app/prelude/Operations";
|
|
7
7
|
export declare const OperationsId: unique symbol;
|
|
8
8
|
export interface Operations extends ServiceTagged<typeof OperationsId> {
|
|
9
9
|
register: Effect<Scope, never, OperationId>;
|
|
10
10
|
update: (id: OperationId, progress: OperationProgress) => Effect<never, never, void>;
|
|
11
|
-
find: (id: OperationId) => Effect<never, never,
|
|
11
|
+
find: (id: OperationId) => Effect<never, never, Option<Operation>>;
|
|
12
12
|
cleanup: Effect<never, never, void>;
|
|
13
13
|
}
|
|
14
14
|
/**
|