@effect-app/infra 0.104.4 → 0.105.0
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 +14 -0
- package/_cjs/RequestContext.cjs +12 -12
- package/_cjs/RequestContext.cjs.map +1 -1
- package/_cjs/api/codec.cjs +2 -2
- package/_cjs/api/codec.cjs.map +1 -1
- package/_cjs/api/express/schema/jwt.cjs +11 -11
- package/_cjs/api/express/schema/jwt.cjs.map +1 -1
- package/_cjs/api/express/schema/routing.cjs +4 -4
- package/_cjs/api/express/schema/routing.cjs.map +1 -1
- package/_cjs/services/QueueMaker/memQueue.cjs +2 -2
- package/_cjs/services/QueueMaker/memQueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/sbqueue.cjs +9 -8
- package/_cjs/services/QueueMaker/sbqueue.cjs.map +1 -1
- package/_cjs/services/QueueMaker/service.cjs +2 -2
- package/_cjs/services/QueueMaker/service.cjs.map +1 -1
- package/_cjs/services/RepositoryBase.cjs.map +1 -1
- package/_cjs/services/simpledb/memdb.cjs +2 -2
- package/_cjs/services/simpledb/memdb.cjs.map +1 -1
- package/_cjs/services/simpledb/redisdb.cjs +6 -6
- package/_cjs/services/simpledb/redisdb.cjs.map +1 -1
- package/_cjs/services/simpledb/shared.cjs +9 -9
- package/_cjs/services/simpledb/shared.cjs.map +1 -1
- package/_src/RequestContext.ts +17 -17
- package/_src/api/app.ts.bak +12 -12
- package/_src/api/codec.ts +5 -5
- package/_src/api/express/routing.ts.bak +2 -2
- package/_src/api/express/schema/jwt.ts +13 -13
- package/_src/api/express/schema/routing.ts +12 -12
- package/_src/services/QueueMaker/memQueue.ts +2 -2
- package/_src/services/QueueMaker/sbqueue.ts +3 -2
- package/_src/services/QueueMaker/service.ts +2 -2
- package/_src/services/RepositoryBase.ts +8 -8
- package/_src/services/simpledb/memdb.ts +2 -2
- package/_src/services/simpledb/redisdb.ts +6 -6
- package/_src/services/simpledb/shared.ts +11 -11
- package/dist/RequestContext.d.ts +39 -39
- package/dist/RequestContext.d.ts.map +1 -1
- package/dist/RequestContext.js +12 -12
- package/dist/api/codec.d.ts +3 -3
- package/dist/api/codec.d.ts.map +1 -1
- package/dist/api/codec.js +3 -3
- package/dist/api/express/schema/jwt.d.ts +4 -4
- package/dist/api/express/schema/jwt.d.ts.map +1 -1
- package/dist/api/express/schema/jwt.js +12 -12
- package/dist/api/express/schema/routing.d.ts +8 -8
- package/dist/api/express/schema/routing.d.ts.map +1 -1
- package/dist/api/express/schema/routing.js +5 -5
- package/dist/services/QueueMaker/memQueue.js +3 -3
- package/dist/services/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/services/QueueMaker/sbqueue.js +10 -9
- package/dist/services/QueueMaker/service.d.ts +3 -3
- package/dist/services/QueueMaker/service.js +3 -3
- package/dist/services/RepositoryBase.d.ts +2 -2
- package/dist/services/RepositoryBase.d.ts.map +1 -1
- package/dist/services/RepositoryBase.js +1 -1
- package/dist/services/simpledb/memdb.d.ts +4 -4
- package/dist/services/simpledb/memdb.d.ts.map +1 -1
- package/dist/services/simpledb/memdb.js +3 -3
- package/dist/services/simpledb/redisdb.d.ts +9 -9
- package/dist/services/simpledb/redisdb.d.ts.map +1 -1
- package/dist/services/simpledb/redisdb.js +7 -7
- package/dist/services/simpledb/shared.d.ts +13 -13
- package/dist/services/simpledb/shared.d.ts.map +1 -1
- package/dist/services/simpledb/shared.js +10 -10
- package/package.json +6 -6
package/dist/RequestContext.d.ts
CHANGED
|
@@ -1,64 +1,64 @@
|
|
|
1
|
-
import { useClassFeaturesForSchema,
|
|
1
|
+
import { useClassFeaturesForSchema, ExtendedClass, literal, ReasonableString, struct, date, FromClass, ConstructorInputApi, FieldsClass } from "@effect-app/prelude/schema";
|
|
2
2
|
import { UserProfileId } from "@effect-app/prelude/ids";
|
|
3
|
-
declare const RequestContextParent_base: import("@effect-app/schema").
|
|
3
|
+
declare const RequestContextParent_base: import("@effect-app/schema").ExtendedClass<import("@effect-app/schema").SchemaProperties<import("@effect-app/schema").ToProps<{
|
|
4
4
|
_tag: import("@effect-app/schema").DefaultSchema<unknown, "RequestContext", "RequestContext", "RequestContext", import("@effect-app/schema").LiteralApi<["RequestContext"]>>;
|
|
5
5
|
id: import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>> & {
|
|
6
|
-
withDefault: import("@effect-app/schema").
|
|
6
|
+
withDefault: import("@effect-app/schema").Field<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>, "required", import("effect/Option").None<any>, import("effect/Option").Some<["constructor", () => import("@effect-app/schema").ReasonableString]>>;
|
|
7
7
|
make: () => import("@effect-app/prelude/schema").StringId;
|
|
8
8
|
};
|
|
9
9
|
name: import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>;
|
|
10
|
-
userProfile: import("@effect-app/schema").
|
|
10
|
+
userProfile: import("@effect-app/schema").Field<import("@effect-app/schema").Schema<unknown, {
|
|
11
11
|
readonly sub: UserProfileId;
|
|
12
12
|
}, {
|
|
13
13
|
readonly sub: UserProfileId;
|
|
14
14
|
}, {
|
|
15
15
|
readonly sub: string;
|
|
16
16
|
}, {
|
|
17
|
-
|
|
18
|
-
sub: import("@effect-app/schema").
|
|
17
|
+
fields: import("@effect-app/schema").ToProps<{
|
|
18
|
+
sub: import("@effect-app/schema").SchemaDefaultSchema<unknown, UserProfileId, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/prelude/schema").StringId> & import("@effect-app/schema").ApiSelfType<UserProfileId>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, UserProfileId, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/prelude/schema").StringId> & import("@effect-app/schema").ApiSelfType<UserProfileId>>> & {
|
|
19
19
|
EParser: import("@effect-app/schema/custom/_parser").Parser<string, any, UserProfileId>;
|
|
20
20
|
make: () => UserProfileId;
|
|
21
21
|
eq: import("effect/Equivalence").Equivalence<UserProfileId>;
|
|
22
|
-
withDefault: import("@effect-app/schema").
|
|
23
|
-
}
|
|
22
|
+
withDefault: import("@effect-app/schema").Field<import("@effect-app/schema").SchemaDefaultSchema<unknown, UserProfileId, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/prelude/schema").StringId> & import("@effect-app/schema").ApiSelfType<UserProfileId>>, "required", import("effect/Option").None<any>, import("effect/Option").Some<["constructor", () => UserProfileId]>>;
|
|
23
|
+
};
|
|
24
24
|
}>;
|
|
25
25
|
}>, "optional", import("effect/Option").None<any>, import("effect/Option").None<any>>;
|
|
26
26
|
locale: import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>;
|
|
27
|
-
createdAt: import("@effect-app/schema").
|
|
28
|
-
}>>, RequestContextParent, RequestContextParent.ConstructorInput, RequestContextParent.
|
|
27
|
+
createdAt: import("@effect-app/schema").SpecificField<import("@effect-app/schema").Schema<unknown, Date, Date, string, {}>, "required", import("effect/Option").None<any>, import("effect/Option").Some<["constructor", () => Date]>>;
|
|
28
|
+
}>>, RequestContextParent, RequestContextParent.ConstructorInput, RequestContextParent.From, RequestContextParent.Fields> & import("@effect-app/schema").PropsExtensions<RequestContextParent.Fields>;
|
|
29
29
|
export declare class RequestContextParent extends RequestContextParent_base {
|
|
30
30
|
}
|
|
31
|
-
declare const RequestContext_base: import("@effect-app/schema").
|
|
32
|
-
id: import("@effect-app/schema").
|
|
31
|
+
declare const RequestContext_base: import("@effect-app/schema").ExtendedClass<import("@effect-app/schema").SchemaProperties<import("@effect-app/schema").ToProps<{
|
|
32
|
+
id: import("@effect-app/schema").Field<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>, "required", import("effect/Option").None<any>, import("effect/Option").Some<["constructor", () => import("@effect-app/schema").ReasonableString]>>;
|
|
33
33
|
rootId: import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>> & {
|
|
34
|
-
withDefault: import("@effect-app/schema").
|
|
34
|
+
withDefault: import("@effect-app/schema").Field<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>, "required", import("effect/Option").None<any>, import("effect/Option").Some<["constructor", () => import("@effect-app/schema").ReasonableString]>>;
|
|
35
35
|
make: () => import("@effect-app/prelude/schema").StringId;
|
|
36
36
|
};
|
|
37
|
-
parent: import("@effect-app/schema").
|
|
38
|
-
|
|
37
|
+
parent: import("@effect-app/schema").Field<import("@effect-app/schema").Schema<unknown, RequestContextParent, RequestContextParent.ConstructorInput, RequestContextParent.From, {
|
|
38
|
+
fields: RequestContextParent.Fields;
|
|
39
39
|
}>, "optional", import("effect/Option").None<any>, import("effect/Option").None<any>>;
|
|
40
|
-
namespace: import("@effect-app/schema").
|
|
41
|
-
_tag: import("@effect-app/schema").
|
|
42
|
-
name: import("@effect-app/schema").
|
|
43
|
-
userProfile: import("@effect-app/schema").
|
|
40
|
+
namespace: import("@effect-app/schema").Field<import("@effect-app/schema").Schema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>, "optional", import("effect/Option").None<any>, import("effect/Option").None<any>>;
|
|
41
|
+
_tag: import("@effect-app/schema").Field<import("@effect-app/schema").DefaultSchema<unknown, "RequestContext", "RequestContext", "RequestContext", import("@effect-app/schema").LiteralApi<["RequestContext"]>>, "required", import("effect/Option").None<any>, import("effect/Option").None<any>>;
|
|
42
|
+
name: import("@effect-app/schema").Field<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, import("@effect-app/schema").ReasonableString, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/schema").ReasonableString>>>, "required", import("effect/Option").None<any>, import("effect/Option").None<any>>;
|
|
43
|
+
userProfile: import("@effect-app/schema").Field<import("@effect-app/schema").Schema<unknown, {
|
|
44
44
|
readonly sub: UserProfileId;
|
|
45
45
|
}, {
|
|
46
46
|
readonly sub: UserProfileId;
|
|
47
47
|
}, {
|
|
48
48
|
readonly sub: string;
|
|
49
49
|
}, {
|
|
50
|
-
|
|
51
|
-
sub: import("@effect-app/schema").
|
|
50
|
+
fields: import("@effect-app/schema").ToProps<{
|
|
51
|
+
sub: import("@effect-app/schema").SchemaDefaultSchema<unknown, UserProfileId, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/prelude/schema").StringId> & import("@effect-app/schema").ApiSelfType<UserProfileId>> & import("@effect-app/schema").Utils<import("@effect-app/schema").SchemaDefaultSchema<unknown, UserProfileId, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/prelude/schema").StringId> & import("@effect-app/schema").ApiSelfType<UserProfileId>>> & {
|
|
52
52
|
EParser: import("@effect-app/schema/custom/_parser").Parser<string, any, UserProfileId>;
|
|
53
53
|
make: () => UserProfileId;
|
|
54
54
|
eq: import("effect/Equivalence").Equivalence<UserProfileId>;
|
|
55
|
-
withDefault: import("@effect-app/schema").
|
|
56
|
-
}
|
|
55
|
+
withDefault: import("@effect-app/schema").Field<import("@effect-app/schema").SchemaDefaultSchema<unknown, UserProfileId, string, string, import("@effect-app/schema").ApiSelfType<import("@effect-app/prelude/schema").StringId> & import("@effect-app/schema").ApiSelfType<UserProfileId>>, "required", import("effect/Option").None<any>, import("effect/Option").Some<["constructor", () => UserProfileId]>>;
|
|
56
|
+
};
|
|
57
57
|
}>;
|
|
58
58
|
}>, "optional", import("effect/Option").None<any>, import("effect/Option").None<any>>;
|
|
59
|
-
locale: import("@effect-app/schema").
|
|
60
|
-
createdAt: import("@effect-app/schema").
|
|
61
|
-
}>>, RequestContext, RequestContext.ConstructorInput, RequestContext.
|
|
59
|
+
locale: import("@effect-app/schema").Field<import("@effect-app/schema").DefaultSchema<unknown, "en" | "de", "en" | "de", "en" | "de", import("@effect-app/schema").LiteralApi<["en", "de"]>>, "required", import("effect/Option").None<any>, import("effect/Option").None<any>>;
|
|
60
|
+
createdAt: import("@effect-app/schema").SpecificField<import("@effect-app/schema").Schema<unknown, Date, Date, string, {}>, "required", import("effect/Option").None<any>, import("effect/Option").Some<["constructor", () => Date]>>;
|
|
61
|
+
}>>, RequestContext, RequestContext.ConstructorInput, RequestContext.From, RequestContext.Fields> & import("@effect-app/schema").PropsExtensions<RequestContext.Fields>;
|
|
62
62
|
/**
|
|
63
63
|
* @tsplus type RequestContext
|
|
64
64
|
* @tsplus companion RequestContext.Ops
|
|
@@ -73,7 +73,7 @@ export declare class RequestContext extends RequestContext_base {
|
|
|
73
73
|
};
|
|
74
74
|
}
|
|
75
75
|
export declare namespace RequestContextParent {
|
|
76
|
-
const
|
|
76
|
+
const From_base: import("@effect-app/schema").FromClass<{
|
|
77
77
|
readonly _tag: "RequestContext";
|
|
78
78
|
readonly id: string;
|
|
79
79
|
readonly name: string;
|
|
@@ -84,19 +84,19 @@ export declare namespace RequestContextParent {
|
|
|
84
84
|
readonly createdAt: string;
|
|
85
85
|
}>;
|
|
86
86
|
/**
|
|
87
|
-
* @tsplus type RequestContextParent.
|
|
88
|
-
* @tsplus companion RequestContextParent.
|
|
87
|
+
* @tsplus type RequestContextParent.From
|
|
88
|
+
* @tsplus companion RequestContextParent.From/Ops
|
|
89
89
|
*/
|
|
90
|
-
export class
|
|
90
|
+
export class From extends From_base {
|
|
91
91
|
}
|
|
92
|
-
export interface ConstructorInput extends
|
|
92
|
+
export interface ConstructorInput extends ConstructorInputApi<typeof RequestContextParent> {
|
|
93
93
|
}
|
|
94
|
-
export interface
|
|
94
|
+
export interface Fields extends FieldsClass<typeof RequestContextParent> {
|
|
95
95
|
}
|
|
96
96
|
export {};
|
|
97
97
|
}
|
|
98
98
|
export declare namespace RequestContext {
|
|
99
|
-
const
|
|
99
|
+
const From_base_1: import("@effect-app/schema").FromClass<{
|
|
100
100
|
readonly _tag: "RequestContext";
|
|
101
101
|
readonly id: string;
|
|
102
102
|
readonly name: string;
|
|
@@ -106,18 +106,18 @@ export declare namespace RequestContext {
|
|
|
106
106
|
readonly locale: "en" | "de";
|
|
107
107
|
readonly createdAt: string;
|
|
108
108
|
readonly rootId: string;
|
|
109
|
-
readonly parent?: RequestContextParent.
|
|
109
|
+
readonly parent?: RequestContextParent.From | undefined;
|
|
110
110
|
readonly namespace?: string | undefined;
|
|
111
111
|
}>;
|
|
112
112
|
/**
|
|
113
|
-
* @tsplus type RequestContext.
|
|
114
|
-
* @tsplus companion RequestContext.
|
|
113
|
+
* @tsplus type RequestContext.From
|
|
114
|
+
* @tsplus companion RequestContext.From/Ops
|
|
115
115
|
*/
|
|
116
|
-
export class
|
|
116
|
+
export class From extends From_base_1 {
|
|
117
117
|
}
|
|
118
|
-
export interface ConstructorInput extends
|
|
118
|
+
export interface ConstructorInput extends ConstructorInputApi<typeof RequestContext> {
|
|
119
119
|
}
|
|
120
|
-
export interface
|
|
120
|
+
export interface Fields extends FieldsClass<typeof RequestContext> {
|
|
121
121
|
}
|
|
122
122
|
export {};
|
|
123
123
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,yBAAyB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElE,qBACa,oBAAqB,SAAQ,yBAYxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBACa,cAAe,SAAQ,mBAWlC;IACA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,oBAAoB,CAAC,gBAAgB;IAUhD,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAKD,yBAAiB,oBAAoB,CAAC;;;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,
|
|
1
|
+
{"version":3,"file":"RequestContext.d.ts","sourceRoot":"","sources":["../_src/RequestContext.ts"],"names":[],"mappings":";AAAA,OAAO,EAAa,aAAa,EAAE,MAAM,yBAAyB,CAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;AAElE,qBACa,oBAAqB,SAAQ,yBAYxC;CAAG;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAEL;;;GAGG;AACH,qBACa,cAAe,SAAQ,mBAWlC;IACA,MAAM,CAAC,OAAO,CACZ,IAAI,EAAE,IAAI,EACV,MAAM,EAAE,cAAc,EACtB,OAAO,EAAE,oBAAoB,CAAC,gBAAgB;IAUhD,MAAM,CAAC,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,EAAE,cAAc;;;;;;CASrD;AAKD,yBAAiB,oBAAoB,CAAC;;;;;;;;;;;IACpC;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,SAAwC;KAAG;IACrE,MAAM,WAAW,gBACf,SAAQ,mBAAmB,CAAC,OAAO,oBAAoB,CAAC;KAAG;IAC7D,MAAM,WAAW,MAAO,SAAQ,WAAW,CAAC,OAAO,oBAAoB,CAAC;KAAG;;CAC5E;AACD,yBAAiB,cAAc,CAAC;;;;;;;;;;;;;;IAC9B;;;OAGG;IACH,MAAM,OAAO,IAAK,SAAQ,WAAkC;KAAG;IAC/D,MAAM,WAAW,gBACf,SAAQ,mBAAmB,CAAC,OAAO,cAAc,CAAC;KAAG;IACvD,MAAM,WAAW,MAAO,SAAQ,WAAW,CAAC,OAAO,cAAc,CAAC;KAAG;;CACtE"}
|
package/dist/RequestContext.js
CHANGED
|
@@ -8,11 +8,11 @@ var RequestContext_1;
|
|
|
8
8
|
import * as tsplus_module_1 from "@effect-app/prelude/schema";
|
|
9
9
|
import * as tsplus_module_2 from "@effect-app/schema/ext";
|
|
10
10
|
import { RequestId, UserProfileId } from "@effect-app/prelude/ids";
|
|
11
|
-
let RequestContextParent = class RequestContextParent extends tsplus_module_1.
|
|
11
|
+
let RequestContextParent = class RequestContextParent extends tsplus_module_1.ExtendedClass()({
|
|
12
12
|
_tag: tsplus_module_1.literal("RequestContext"),
|
|
13
13
|
id: RequestId,
|
|
14
14
|
name: tsplus_module_1.ReasonableString,
|
|
15
|
-
userProfile: tsplus_module_2.optionalProp(tsplus_module_1.
|
|
15
|
+
userProfile: tsplus_module_2.optionalProp(tsplus_module_1.struct({ sub: UserProfileId })),
|
|
16
16
|
locale: tsplus_module_1.literal("en", "de"),
|
|
17
17
|
createdAt: tsplus_module_2.withDefaultProp(tsplus_module_1.date)
|
|
18
18
|
}) {
|
|
@@ -25,7 +25,7 @@ export { RequestContextParent };
|
|
|
25
25
|
* @tsplus type RequestContext
|
|
26
26
|
* @tsplus companion RequestContext.Ops
|
|
27
27
|
*/
|
|
28
|
-
let RequestContext = RequestContext_1 = class RequestContext extends tsplus_module_1.
|
|
28
|
+
let RequestContext = RequestContext_1 = class RequestContext extends tsplus_module_1.ExtendedClass()({
|
|
29
29
|
...RequestContextParent.omit("id"),
|
|
30
30
|
id: RequestId.withDefault,
|
|
31
31
|
rootId: RequestId,
|
|
@@ -59,20 +59,20 @@ export { RequestContext };
|
|
|
59
59
|
/* eslint-disable */
|
|
60
60
|
(function (RequestContextParent) {
|
|
61
61
|
/**
|
|
62
|
-
* @tsplus type RequestContextParent.
|
|
63
|
-
* @tsplus companion RequestContextParent.
|
|
62
|
+
* @tsplus type RequestContextParent.From
|
|
63
|
+
* @tsplus companion RequestContextParent.From/Ops
|
|
64
64
|
*/
|
|
65
|
-
class
|
|
65
|
+
class From extends tsplus_module_1.FromClass() {
|
|
66
66
|
}
|
|
67
|
-
RequestContextParent.
|
|
67
|
+
RequestContextParent.From = From;
|
|
68
68
|
})(RequestContextParent || (RequestContextParent = {}));
|
|
69
69
|
(function (RequestContext) {
|
|
70
70
|
/**
|
|
71
|
-
* @tsplus type RequestContext.
|
|
72
|
-
* @tsplus companion RequestContext.
|
|
71
|
+
* @tsplus type RequestContext.From
|
|
72
|
+
* @tsplus companion RequestContext.From/Ops
|
|
73
73
|
*/
|
|
74
|
-
class
|
|
74
|
+
class From extends tsplus_module_1.FromClass() {
|
|
75
75
|
}
|
|
76
|
-
RequestContext.
|
|
76
|
+
RequestContext.From = From;
|
|
77
77
|
})(RequestContext || (RequestContext = {}));
|
|
78
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
78
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiUmVxdWVzdENvbnRleHQuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9fc3JjL1JlcXVlc3RDb250ZXh0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxTQUFTLEVBQUUsYUFBYSxFQUFFLE1BQU0seUJBQXlCLENBQUE7QUFHM0QsSUFBTSxvQkFBb0IsR0FBMUIsTUFBTSxvQkFBcUIsU0FBUSxnQkFBQSxhQUFhLEVBS3BELENBQUM7SUFDRixJQUFJLEVBQUUsZ0JBQUEsT0FBTyxDQUFDLGdCQUFnQixDQUFDO0lBQy9CLEVBQUUsRUFBRSxTQUFTO0lBQ2IsSUFBSSxrQkFBRSxnQkFBZ0I7SUFDdEIsV0FBVywrQkFBRSxnQkFBQSxNQUFNLENBQUMsRUFBRSxHQUFHLEVBQUUsYUFBYSxFQUFFLENBQUMsQ0FBUztJQUNwRCxNQUFNLEVBQUUsZ0JBQUEsT0FBTyxDQUFDLElBQUksRUFBRSxJQUFJLENBQUM7SUFDM0IsU0FBUyxrREFBRSxJQUFJLENBQVk7Q0FDNUIsQ0FBQztDQUFHLENBQUE7QUFaUSxvQkFBb0I7b0JBRGhDLHlCQUF5QjtHQUNiLG9CQUFvQixDQVk1Qjs7QUFFTDs7O0dBR0c7QUFFSSxJQUFNLGNBQWMsc0JBQXBCLE1BQU0sY0FBZSxTQUFRLGdCQUFBLGFBQWEsRUFLOUMsQ0FBQztJQUNGLEdBQUcsb0JBQW9CLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQztJQUNsQyxFQUFFLEVBQUUsU0FBUyxDQUFDLFdBQVc7SUFDekIsTUFBTSxFQUFFLFNBQVM7SUFDakIsTUFBTSwrQkFBRSxvQkFBb0IsQ0FBUztJQUNyQyxTQUFTLCtDQUFFLGdCQUFnQixDQUFTO0NBQ3JDLENBQUM7SUFDQSxNQUFNLENBQUMsT0FBTyxDQUVaLE1BQXNCLEVBQ3RCLE9BQThDO1FBRTlDLE9BQU8sSUFBSSxnQkFBYyxDQUFDO1lBQ3hCLFNBQVMsRUFBRSxNQUFNLEVBQUUsU0FBUztZQUM1QixHQUFHLE9BQU87WUFDVixNQUFNLEVBQUUsTUFBTSxDQUFDLE1BQU07WUFDckIsTUFBTTtTQUNQLENBQUMsQ0FBQTtJQUNKLENBQUM7SUFFRCxNQUFNLENBQUMsWUFBWSxDQUFhLElBQW9CO1FBQ2xELE9BQU87WUFDTCxhQUFhLEVBQUUsSUFBSSxDQUFDLElBQUk7WUFDeEIsTUFBTSxFQUFFLElBQUksQ0FBQyxNQUFNO1lBQ25CLEdBQUcsQ0FBQyxJQUFJLENBQUMsTUFBTTtnQkFDYixDQUFDLENBQUMsRUFBRSxtQkFBbUIsRUFBRSxJQUFJLENBQUMsTUFBTSxDQUFDLElBQUksRUFBRSxZQUFZLEVBQUUsSUFBSSxDQUFDLE1BQU0sQ0FBQyxNQUFNLEVBQUU7Z0JBQzdFLENBQUMsQ0FBQyxFQUFFLENBQUM7U0FDUixDQUFBO0lBQ0gsQ0FBQztDQUNGLENBQUE7QUFsQ1ksY0FBYztvQkFEMUIseUJBQXlCO0dBQ2IsY0FBYyxDQWtDMUI7O0FBRUQsZ0NBQWdDO0FBQ2hDLEVBQUU7QUFDRixvQkFBb0I7QUFDcEIsV0FBaUIsb0JBQW9CO0lBQ25DOzs7T0FHRztJQUNILE1BQWEsSUFBSyxTQUFRLGdCQUFBLFNBQVMsRUFBK0I7S0FBRztJQUF4RCx5QkFBSSxPQUFvRCxDQUFBO0FBSXZFLENBQUMsRUFUZ0Isb0JBQW9CLEtBQXBCLG9CQUFvQixRQVNwQztBQUNELFdBQWlCLGNBQWM7SUFDN0I7OztPQUdHO0lBQ0gsTUFBYSxJQUFLLFNBQVEsZ0JBQUEsU0FBUyxFQUF5QjtLQUFHO0lBQWxELG1CQUFJLE9BQThDLENBQUE7QUFJakUsQ0FBQyxFQVRnQixjQUFjLEtBQWQsY0FBYyxRQVM5QiJ9
|
package/dist/api/codec.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as
|
|
1
|
+
import * as S from "@effect-app/schema";
|
|
2
2
|
import { Encoder, Parser } from "@effect-app/schema";
|
|
3
|
-
export declare function makeCodec<
|
|
3
|
+
export declare function makeCodec<To extends {
|
|
4
4
|
id: Id;
|
|
5
|
-
}, ConstructorInput,
|
|
5
|
+
}, ConstructorInput, From, Api, Id>(self: S.Schema<unknown, To, ConstructorInput, From, Api>): readonly [(a: unknown, env?: Parser.ParserEnv | undefined) => import("effect/Effect").Effect<never, never, To>, Encoder.Encoder<To, From>];
|
|
6
6
|
//# sourceMappingURL=codec.d.ts.map
|
package/dist/api/codec.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codec.d.ts","sourceRoot":"","sources":["../../_src/api/codec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"codec.d.ts","sourceRoot":"","sources":["../../_src/api/codec.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,CAAC,MAAM,oBAAoB,CAAA;AACvC,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,oBAAoB,CAAA;AAEpD,wBAAgB,SAAS,CACvB,EAAE,SAAS;IAAE,EAAE,EAAE,EAAE,CAAA;CAAE,EACrB,gBAAgB,EAChB,IAAI,EACJ,GAAG,EACH,EAAE,EACF,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC,OAAO,EAAE,EAAE,EAAE,gBAAgB,EAAE,IAAI,EAAE,GAAG,CAAC,8IAKzD"}
|
package/dist/api/codec.js
CHANGED
|
@@ -1,9 +1,9 @@
|
|
|
1
|
-
import * as
|
|
1
|
+
import * as S from "@effect-app/schema";
|
|
2
2
|
import { Encoder, Parser } from "@effect-app/schema";
|
|
3
3
|
export function makeCodec(self) {
|
|
4
|
-
const decode =
|
|
4
|
+
const decode = S.condemnDie(Parser.for(self));
|
|
5
5
|
// TODO: strict
|
|
6
6
|
const encode = Encoder.for(self);
|
|
7
7
|
return [decode, encode];
|
|
8
8
|
}
|
|
9
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
9
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiY29kZWMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9fc3JjL2FwaS9jb2RlYy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSxPQUFPLEtBQUssQ0FBQyxNQUFNLG9CQUFvQixDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFFcEQsTUFBTSxVQUFVLFNBQVMsQ0FNdkIsSUFBd0Q7SUFDeEQsTUFBTSxNQUFNLEdBQUcsQ0FBQyxDQUFDLFVBQVUsQ0FBQyxNQUFNLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUE7SUFDN0MsZUFBZTtJQUNmLE1BQU0sTUFBTSxHQUFHLE9BQU8sQ0FBQyxHQUFHLENBQUMsSUFBSSxDQUFDLENBQUE7SUFDaEMsT0FBTyxDQUFDLE1BQU0sRUFBRSxNQUFNLENBQVUsQ0FBQTtBQUNsQyxDQUFDIn0=
|
|
@@ -1,5 +1,5 @@
|
|
|
1
|
-
import * as
|
|
2
|
-
export declare const jwtIdentifier:
|
|
3
|
-
export declare const jwtFromString:
|
|
4
|
-
export declare const jwt:
|
|
1
|
+
import * as S from "@effect-app/schema";
|
|
2
|
+
export declare const jwtIdentifier: S.Annotation<{}>;
|
|
3
|
+
export declare const jwtFromString: S.Schema<string, unknown, unknown, string, {}>;
|
|
4
|
+
export declare const jwt: S.Schema<unknown, unknown, unknown, string, {}>;
|
|
5
5
|
//# sourceMappingURL=jwt.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/jwt.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"jwt.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/jwt.ts"],"names":[],"mappings":"AAIA,OAAO,KAAK,CAAC,MAAM,oBAAoB,CAAA;AAIvC,eAAO,MAAM,aAAa,kBAAyB,CAAA;AAEnD,eAAO,MAAM,aAAa,EAAE,CAAC,CAAC,MAAM,CAAC,MAAM,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,CAwBxE,CAAA;AAED,eAAO,MAAM,GAAG,iDAAiC,CAAA"}
|
|
@@ -2,30 +2,30 @@
|
|
|
2
2
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
3
3
|
/* eslint-disable @typescript-eslint/ban-types */
|
|
4
4
|
import { pipe } from "@effect-app/core/Function";
|
|
5
|
-
import * as
|
|
5
|
+
import * as S from "@effect-app/schema";
|
|
6
6
|
import { These as Th } from "@effect-app/schema";
|
|
7
7
|
import { jwtDecode } from "jwt-decode";
|
|
8
|
-
export const jwtIdentifier =
|
|
8
|
+
export const jwtIdentifier = S.makeAnnotation();
|
|
9
9
|
export const jwtFromString = pipe(
|
|
10
|
-
//
|
|
11
|
-
|
|
10
|
+
// S.identity((u): u is string => typeof u === "string"),
|
|
11
|
+
S.identity((u) => {
|
|
12
12
|
throw new Error("Cannot id JWT: " + u);
|
|
13
|
-
}),
|
|
14
|
-
//
|
|
13
|
+
}), S.constructor((n) => Th.succeed(n)),
|
|
14
|
+
// S.arbitrary((_) => {
|
|
15
15
|
// throw new Error("Cannot arb JWT")
|
|
16
16
|
// }), // TODO
|
|
17
|
-
//
|
|
17
|
+
// S.encoder((_) => {
|
|
18
18
|
// throw new Error("can't encode")
|
|
19
19
|
// }),
|
|
20
|
-
|
|
20
|
+
S.parser((p) => {
|
|
21
21
|
try {
|
|
22
22
|
return Th.succeed(
|
|
23
23
|
// eslint-disable-next-line @typescript-eslint/ban-ts-comment
|
|
24
24
|
jwtDecode(p));
|
|
25
25
|
}
|
|
26
26
|
catch (err) {
|
|
27
|
-
return Th.fail(
|
|
27
|
+
return Th.fail(S.leafE(S.parseStringE(p))); // "not a JWT: " + err as anyw
|
|
28
28
|
}
|
|
29
|
-
}),
|
|
30
|
-
export const jwt =
|
|
31
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
29
|
+
}), S.mapApi(() => ({})), S.annotate(jwtIdentifier, {}));
|
|
30
|
+
export const jwt = S.string[">>>"](jwtFromString);
|
|
31
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiand0LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vLi4vLi4vX3NyYy9hcGkvZXhwcmVzcy9zY2hlbWEvand0LnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiJBQUFBLDREQUE0RDtBQUM1RCx1REFBdUQ7QUFDdkQsaURBQWlEO0FBQ2pELE9BQU8sRUFBRSxJQUFJLEVBQUUsTUFBTSwyQkFBMkIsQ0FBQTtBQUNoRCxPQUFPLEtBQUssQ0FBQyxNQUFNLG9CQUFvQixDQUFBO0FBQ3ZDLE9BQU8sRUFBRSxLQUFLLElBQUksRUFBRSxFQUFFLE1BQU0sb0JBQW9CLENBQUE7QUFDaEQsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLFlBQVksQ0FBQTtBQUV0QyxNQUFNLENBQUMsTUFBTSxhQUFhLEdBQUcsQ0FBQyxDQUFDLGNBQWMsRUFBTSxDQUFBO0FBRW5ELE1BQU0sQ0FBQyxNQUFNLGFBQWEsR0FBbUQsSUFBSTtBQUMvRSx5REFBeUQ7QUFDekQsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBZSxFQUFFO0lBQzVCLE1BQU0sSUFBSSxLQUFLLENBQUMsaUJBQWlCLEdBQUcsQ0FBQyxDQUFDLENBQUE7QUFDeEMsQ0FBQyxDQUFDLEVBQ0YsQ0FBQyxDQUFDLFdBQVcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsRUFBRSxDQUFDLE9BQU8sQ0FBQyxDQUFDLENBQUMsQ0FBQztBQUNuQyx5QkFBeUI7QUFDekIsd0NBQXdDO0FBQ3hDLGdCQUFnQjtBQUNoQix1QkFBdUI7QUFDdkIsc0NBQXNDO0FBQ3RDLFFBQVE7QUFDUixDQUFDLENBQUMsTUFBTSxDQUFDLENBQUMsQ0FBTSxFQUFFLEVBQUU7SUFDbEIsSUFBSSxDQUFDO1FBQ0gsT0FBTyxFQUFFLENBQUMsT0FBTztRQUNmLDZEQUE2RDtRQUM3RCxTQUFTLENBQUMsQ0FBQyxDQUFDLENBQ2IsQ0FBQTtJQUNILENBQUM7SUFBQyxPQUFPLEdBQUcsRUFBRSxDQUFDO1FBQ2IsT0FBTyxFQUFFLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLFlBQVksQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUEsQ0FBQyw4QkFBOEI7SUFDM0UsQ0FBQztBQUNILENBQUMsQ0FBQyxFQUNGLENBQUMsQ0FBQyxNQUFNLENBQUMsR0FBRyxFQUFFLENBQUMsQ0FBQyxFQUFFLENBQUMsQ0FBQyxFQUNwQixDQUFDLENBQUMsUUFBUSxDQUFDLGFBQWEsRUFBRSxFQUFFLENBQUMsQ0FDOUIsQ0FBQTtBQUVELE1BQU0sQ0FBQyxNQUFNLEdBQUcsR0FBRyxDQUFDLENBQUMsTUFBTSxDQUFDLEtBQUssQ0FBQyxDQUFDLGFBQWEsQ0FBQyxDQUFBIn0=
|
|
@@ -1,21 +1,21 @@
|
|
|
1
1
|
import { Tag } from "effect/Context";
|
|
2
2
|
import { Option } from "@effect-app/core/Option";
|
|
3
|
-
import * as
|
|
3
|
+
import * as S from "@effect-app/schema";
|
|
4
4
|
import type { Methods } from "@effect-app/schema";
|
|
5
5
|
import type { JSONSchema, ParameterLocation, SubSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus";
|
|
6
|
-
export type Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA> =
|
|
6
|
+
export type Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA> = S.ReqResSchemed<unknown, ReqA> & {
|
|
7
7
|
method: Methods.Rest;
|
|
8
8
|
path: string;
|
|
9
|
-
Cookie?:
|
|
10
|
-
Path?:
|
|
11
|
-
Body?:
|
|
12
|
-
Query?:
|
|
13
|
-
Headers?:
|
|
9
|
+
Cookie?: S.ReqRes<Record<string, string>, CookieA>;
|
|
10
|
+
Path?: S.ReqRes<Record<string, string>, PathA>;
|
|
11
|
+
Body?: S.ReqRes<unknown, BodyA>;
|
|
12
|
+
Query?: S.ReqRes<Record<string, string>, QueryA>;
|
|
13
|
+
Headers?: S.ReqRes<Record<string, string>, HeaderA>;
|
|
14
14
|
Tag: Tag<M, M>;
|
|
15
15
|
};
|
|
16
16
|
export interface RouteRequestHandler<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA extends PathA & QueryA & BodyA, ResA> {
|
|
17
17
|
Request: Request<M, PathA, CookieA, QueryA, BodyA, HeaderA, ReqA>;
|
|
18
|
-
Response?:
|
|
18
|
+
Response?: S.ReqRes<unknown, ResA> | S.ReqResSchemed<unknown, ResA>;
|
|
19
19
|
ResponseOpenApi?: any;
|
|
20
20
|
}
|
|
21
21
|
export declare function asRouteDescriptionAny<R extends RouteDescriptorAny>(i: R): RouteDescriptorAny;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/routing.ts"],"names":[],"mappings":";;AAEA,OAAO,KAAK,
|
|
1
|
+
{"version":3,"file":"routing.d.ts","sourceRoot":"","sources":["../../../../_src/api/express/schema/routing.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import * as tsplus_module_2 from "effect/Effect";
|
|
|
3
3
|
import * as tsplus_module_3 from "effect/Option";
|
|
4
4
|
/* eslint-disable @typescript-eslint/ban-types */
|
|
5
5
|
/* eslint-disable @typescript-eslint/no-explicit-any */
|
|
6
|
-
import * as
|
|
6
|
+
import * as S from "@effect-app/schema";
|
|
7
7
|
import { isObjectSchema } from "@effect-app/infra-adapters/Openapi/atlas-plutus";
|
|
8
8
|
import * as OpenApi from "@effect-app/infra-adapters/Openapi/index";
|
|
9
9
|
export function asRouteDescriptionAny(i) {
|
|
@@ -20,7 +20,7 @@ export function makeFromSchema(e) {
|
|
|
20
20
|
const jsonSchema = (r) => jsonSchema_(r);
|
|
21
21
|
const { Request: Req, Response: Res_, ResponseOpenApi } = e.handler;
|
|
22
22
|
const r = ResponseOpenApi ?? Res_;
|
|
23
|
-
const Res = r ?
|
|
23
|
+
const Res = r ? S.extractSchema(r) : S.Void;
|
|
24
24
|
// TODO EffectOption.fromNullable(Req.Headers).flatMapOpt(jsonSchema)
|
|
25
25
|
// TODO: use the path vs body etc serialisation also in the Client.
|
|
26
26
|
const makeReqQuerySchema = tsplus_module_2.flatMap(tsplus_module_2.sync(() => tsplus_module_3.fromNullable(Req.Query)), (_) => tsplus_module_3.match(_, {
|
|
@@ -59,7 +59,7 @@ export function makeFromSchema(e) {
|
|
|
59
59
|
};
|
|
60
60
|
}
|
|
61
61
|
return tsplus_module_2.map(tsplus_module_2.all({
|
|
62
|
-
req: jsonSchema(Req.
|
|
62
|
+
req: jsonSchema(Req.Class),
|
|
63
63
|
reqQuery: makeReqQuerySchema,
|
|
64
64
|
reqHeaders: makeReqHeadersSchema,
|
|
65
65
|
reqBody: makeReqBodySchema,
|
|
@@ -68,7 +68,7 @@ export function makeFromSchema(e) {
|
|
|
68
68
|
res: makeResSchema
|
|
69
69
|
}), (_) => {
|
|
70
70
|
// console.log("$$$ REQ", _.req)
|
|
71
|
-
const isEmpty = !e.handler.Response || e.handler.Response ===
|
|
71
|
+
const isEmpty = !e.handler.Response || e.handler.Response === S.Void;
|
|
72
72
|
return {
|
|
73
73
|
path: e.path,
|
|
74
74
|
method: e.method.toLowerCase(),
|
|
@@ -108,4 +108,4 @@ class Response {
|
|
|
108
108
|
this.type = type;
|
|
109
109
|
}
|
|
110
110
|
}
|
|
111
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
111
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicm91dGluZy5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uLy4uL19zcmMvYXBpL2V4cHJlc3Mvc2NoZW1hL3JvdXRpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsaURBQWlEO0FBQ2pELHVEQUF1RDtBQUN2RCxPQUFPLEtBQUssQ0FBQyxNQUFNLG9CQUFvQixDQUFBO0FBSXZDLE9BQU8sRUFBRSxjQUFjLEVBQUUsTUFBTSxpREFBaUQsQ0FBQTtBQUNoRixPQUFPLEtBQUssT0FBTyxNQUFNLDBDQUEwQyxDQUFBO0FBb0NuRSxNQUFNLFVBQVUscUJBQXFCLENBQStCLENBQUk7SUFDdEUsT0FBTyxDQUF1QixDQUFBO0FBQ2hDLENBQUM7QUFFRCxNQUFNLFVBQVUsd0JBQXdCLENBQ3RDLEdBQXFCO0lBRXJCLE9BQU8sR0FBRyxDQUFDLEdBQUcsQ0FBQyxxQkFBcUIsQ0FBQyxDQUFBO0FBQ3ZDLENBQUM7QUFpQ0QsTUFBTSxVQUFVLG1CQUFtQixDQVdqQyxJQUFZLEVBQ1osTUFBYyxFQUNkLE9BU0M7SUFZRCxPQUFPLEVBQUUsSUFBSSxFQUFFLE9BQU8sRUFBRSxNQUFNLEVBQUUsSUFBSSxFQUFFLFFBQVEsRUFBRSxDQUFBO0FBQ2xELENBQUM7QUFFRCxNQUFNLFVBQVUsY0FBYyxDQUM1QixDQUEyRDtJQUUzRCxNQUFNLFdBQVcsR0FBRyxPQUFPLENBQUMsR0FBRyxDQUFBO0lBQy9CLE1BQU0sVUFBVSxHQUFHLENBQU8sQ0FBaUIsRUFBRSxFQUFFLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxDQUFBO0lBQzlELE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxFQUFFLFFBQVEsRUFBRSxJQUFJLEVBQUUsZUFBZSxFQUFFLEdBQUcsQ0FBQyxDQUFDLE9BQU8sQ0FBQTtJQUNuRSxNQUFNLENBQUMsR0FBRyxlQUFlLElBQUksSUFBSSxDQUFBO0lBQ2pDLE1BQU0sR0FBRyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxD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
|
|
@@ -24,9 +24,9 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema, mak
|
|
|
24
24
|
const q = yield* $(mem.getOrCreateQueue(queueName));
|
|
25
25
|
const qDrain = yield* $(mem.getOrCreateQueue(queueDrainName));
|
|
26
26
|
const rcc = yield* $(RequestContextContainer);
|
|
27
|
-
const wireSchema = tsplus_module_1.
|
|
27
|
+
const wireSchema = tsplus_module_1.struct({ body: schema, meta: QueueMeta });
|
|
28
28
|
const encoder = wireSchema.Encoder;
|
|
29
|
-
const drainW = tsplus_module_1.
|
|
29
|
+
const drainW = tsplus_module_1.struct({ body: drainSchema, meta: QueueMeta });
|
|
30
30
|
const parseDrain = tsplus_module_2.parseCondemnDie(drainW);
|
|
31
31
|
return {
|
|
32
32
|
publish: (...messages) => tsplus_module_3.gen(function* ($) {
|
|
@@ -65,4 +65,4 @@ export function makeMemQueue(queueName, queueDrainName, schema, drainSchema, mak
|
|
|
65
65
|
};
|
|
66
66
|
});
|
|
67
67
|
}
|
|
68
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
68
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibWVtUXVldWUuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9fc3JjL3NlcnZpY2VzL1F1ZXVlTWFrZXIvbWVtUXVldWUudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7OztBQUFBLE9BQU8sRUFBRSxRQUFRLEVBQUUsTUFBTSxxQ0FBcUMsQ0FBQTtBQUM5RCxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxRQUFRLENBQUE7QUFDL0IsT0FBTyxFQUFFLHVCQUF1QixFQUFFLE1BQU0sK0JBQStCLENBQUE7QUFDdkUsT0FBTyxFQUFFLDJCQUEyQixFQUFFLE1BQU0sYUFBYSxDQUFBO0FBQ3pELE9BQU8sRUFBa0IsU0FBUyxFQUFFLE1BQU0sY0FBYyxDQUFBO0FBRXhEOztHQUVHO0FBQ0gsTUFBTSxVQUFVLFlBQVksQ0FPMUIsU0FBaUIsRUFDakIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQsRUFDNUQsZUFBcUY7SUFFckYsT0FBTyxvQkFBVyxRQUFRLENBQUMsRUFBQyxDQUFDO1FBQzNCLE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxRQUFRLENBQUMsQ0FBQTtRQUM5QixNQUFNLENBQUMsR0FBRyxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsR0FBRyxDQUFDLGdCQUFnQixDQUFDLFNBQVMsQ0FBQyxDQUFDLENBQUE7UUFDbkQsTUFBTSxNQUFNLEdBQUcsS0FBSyxDQUFDLENBQUMsQ0FBQyxDQUFDLEdBQUcsQ0FBQyxnQkFBZ0IsQ0FBQyxjQUFjLENBQUMsQ0FBQyxDQUFBO1FBQzdELE1BQU0sR0FBRyxHQUFHLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyx1QkFBdUIsQ0FBQyxDQUFBO1FBRTdDLE1BQU0sVUFBVSxHQUFHLGdCQUFBLE1B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
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":";;;
|
|
1
|
+
{"version":3,"file":"sbqueue.d.ts","sourceRoot":"","sources":["../../../_src/services/QueueMaker/sbqueue.ts"],"names":[],"mappings":";;;AAcA,OAAO,EAAE,uBAAuB,EAAE,MAAM,+BAA+B,CAAA;;;;;AAOvE,wBAAgB,mBAAmB,CACjC,MAAM,EACN,GAAG,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC1C,QAAQ,SAAS;IAAE,EAAE,EAAE,QAAQ,CAAC;IAAC,IAAI,EAAE,MAAM,CAAA;CAAE,EAC/C,IAAI,EACJ,MAAM,EAEN,UAAU,EAAE,MAAM,EAClB,cAAc,EAAE,MAAM,EACtB,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,GAAG,EAAE,GAAG,EAAE,IAAI,EAAE,GAAG,CAAC,EACnD,WAAW,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,EAAE,GAAG,EAAE,GAAG,EAAE,GAAG,CAAC,EAC5D,eAAe,EAAE,MAAM,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC,EAAE,EAAE,QAAQ,KAAK,MAAM,CAAC,KAAK,EAAE,MAAM,EAAE,IAAI,CAAC,CAAC;;;GAmFtF;;;;;AAKD,wBAAgB,oBAAoB,CAAC,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,+IAG1F"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
|
-
import * as tsplus_module_1 from "@effect-app/
|
|
2
|
-
import * as tsplus_module_2 from "@effect-app/
|
|
3
|
-
import * as tsplus_module_3 from "@effect-app/
|
|
1
|
+
import * as tsplus_module_1 from "@effect-app/schema/ext";
|
|
2
|
+
import * as tsplus_module_2 from "@effect-app/core/Tag";
|
|
3
|
+
import * as tsplus_module_3 from "@effect-app/prelude/schema";
|
|
4
4
|
import * as tsplus_module_4 from "@effect-app/prelude/utils";
|
|
5
5
|
import * as tsplus_module_5 from "effect/Effect";
|
|
6
6
|
import * as tsplus_module_6 from "@effect-app/infra/api/setupRequest";
|
|
@@ -12,6 +12,7 @@ import { LiveReceiver, LiveSender, LiveServiceBusClient, Receiver, Sender, subsc
|
|
|
12
12
|
import { captureException } from "@effect-app/infra/errorReporter";
|
|
13
13
|
import { RequestContext } from "@effect-app/infra/RequestContext";
|
|
14
14
|
import { RequestId } from "@effect-app/prelude/ids";
|
|
15
|
+
import { struct } from "@effect-app/schema";
|
|
15
16
|
import { Tracer } from "effect";
|
|
16
17
|
import { RequestContextContainer } from "../RequestContextContainer.js";
|
|
17
18
|
import { reportNonInterruptedFailure, reportNonInterruptedFailureCause } from "./errors.js";
|
|
@@ -20,17 +21,17 @@ import { QueueMeta } from "./service.js";
|
|
|
20
21
|
* @tsplus static QueueMaker.Ops makeServiceBus
|
|
21
22
|
*/
|
|
22
23
|
export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSchema, makeHandleEvent) {
|
|
23
|
-
const wireSchema =
|
|
24
|
+
const wireSchema = struct({
|
|
24
25
|
body: schema,
|
|
25
26
|
meta: QueueMeta
|
|
26
27
|
});
|
|
27
28
|
const encoder = wireSchema.Encoder;
|
|
28
|
-
const drainW =
|
|
29
|
-
const parseDrain =
|
|
29
|
+
const drainW = struct({ body: drainSchema, meta: QueueMeta });
|
|
30
|
+
const parseDrain = tsplus_module_1.parseCondemnDie(drainW);
|
|
30
31
|
return tsplus_module_5.gen(function* ($) {
|
|
31
32
|
const s = yield* $(Sender);
|
|
32
33
|
const receiver = yield* $(Receiver);
|
|
33
|
-
const receiverLayer =
|
|
34
|
+
const receiverLayer = tsplus_module_2.makeLayer(Receiver, receiver);
|
|
34
35
|
const silenceAndReportError = reportNonInterruptedFailure({ name: "ServiceBusQueue.drain." + queueDrainName });
|
|
35
36
|
const reportError = reportNonInterruptedFailureCause({ name: "ServiceBusQueue.drain." + queueDrainName });
|
|
36
37
|
const rcc = yield* $(RequestContextContainer);
|
|
@@ -43,7 +44,7 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
43
44
|
.pipe(tsplus_module_5.annotateLogs({ body: tsplus_module_4.RecordPretty(tsplus_module_4.object$(body)), meta: tsplus_module_4.RecordPretty(tsplus_module_4.object$(meta)) })), handleEvent(body))).pipe(silenceAndReportError), RequestContext.inherit(meta.requestContext, {
|
|
44
45
|
id: RequestId(body.id),
|
|
45
46
|
locale: "en",
|
|
46
|
-
name:
|
|
47
|
+
name: tsplus_module_3.ReasonableString(body._tag)
|
|
47
48
|
})), "queue.drain", {
|
|
48
49
|
attributes: { "queue.name": queueDrainName },
|
|
49
50
|
parent: meta.span
|
|
@@ -77,4 +78,4 @@ export function makeServiceBusQueue(_queueName, queueDrainName, schema, drainSch
|
|
|
77
78
|
export function makeServiceBusLayers(url, queueName, queueDrainName) {
|
|
78
79
|
return tsplus_module_10.provide((tsplus_module_10.merge(LiveSender(queueName))(LiveReceiver(queueDrainName))))(LiveServiceBusClient(url));
|
|
79
80
|
}
|
|
80
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
81
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoic2JxdWV1ZS5qcyIsInNvdXJjZVJvb3QiOiIiLCJzb3VyY2VzIjpbIi4uLy4uLy4uL19zcmMvc2VydmljZXMvUXVldWVNYWtlci9zYnF1ZXVlLnRzIl0sIm5hbWVzIjpbXSwibWFwcGluZ3MiOiI7Ozs7Ozs7Ozs7QUFBQSxPQUFPLEVBQ0wsWUFBWSxFQUNaLFVBQVUsRUFDVixvQkFBb0IsRUFDcEIsUUFBUSxFQUNSLE1BQU0sRUFDTixTQUFTLEVBQ1YsTUFBTSx1Q0FBdUMsQ0FBQTtBQUU5QyxPQUFPLEVBQUUsZ0JBQWdCLEVBQUUsTUFBTSxpQ0FBaUMsQ0FBQTtBQUNsRSxPQUFPLEVBQUUsY0FBYyxFQUFFLE1BQU0sa0NBQWtDLENBQUE7QUFDakUsT0FBTyxFQUFFLFNBQVMsRUFBRSxNQUFNLHlCQUF5QixDQUFBO0FBQ25ELE9BQU8sRUFBRSxNQUFNLEVBQUUsTUFBTSxvQkFBb0IsQ0FBQTtBQUMzQyxPQUFPLEVBQUUsTUFBTSxFQUFFLE1BQU0sUUFBUSxDQUFBO0FBQy9CLE9BQU8sRUFBRSx1QkFBdUIsRUFBRSxNQUFNLCtCQUErQixDQUFBO0FBQ3ZFLE9BQU8sRUFBRSwyQkFBMkIsRUFBRSxnQ0FBZ0MsRUFBRSxNQUFNLGFBQWEsQ0FBQTtBQUMzRixPQUFPLEVBQWtCLFNBQVMsRUFBRSxNQUFNLGNBQWMsQ0FBQTtBQUV4RDs7R0FFRztBQUNILE1BQU0sVUFBVSxtQkFBbUIsQ0FPakMsVUFBa0IsRUFDbEIsY0FBc0IsRUFDdEIsTUFBbUQsRUFDbkQsV0FBNEQsRUFDNUQsZUFBcUY7SUFFckYsTUFBTSxVQUFVLEdBQUcsTUFBTSxDQUFDO1FBQ3hCLElBQUksRUFBRSxNQUFNO1FBQ1osSUFBSSxFQUFFLFNBQVM7S0FDaEIsQ0FBQyxDQUFBO0lBQ0YsTUFBTSxPQUFPLEdBQUcsVUFBVSxDQUFDLE9BQU8sQ0FBQTtJQUNsQyxNQUFNLE1BQU0sR0FBRyxNQUFNLENBQUMsRUFBRSxJQUFJLEVBQUUsV0FBVyxFQUFFLElBQUksRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFB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
|