@effect-app/infra 3.10.0 → 4.0.0-beta.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 +19 -0
- package/_check.sh +3 -0
- package/dist/CUPS.d.ts +22 -12
- package/dist/CUPS.d.ts.map +1 -1
- package/dist/CUPS.js +28 -29
- package/dist/Emailer/Sendgrid.js +13 -12
- package/dist/Emailer/service.d.ts +3 -13
- package/dist/Emailer/service.d.ts.map +1 -1
- package/dist/Emailer/service.js +3 -3
- package/dist/MainFiberSet.d.ts +18 -41
- package/dist/MainFiberSet.d.ts.map +1 -1
- package/dist/MainFiberSet.js +10 -10
- package/dist/Model/Repository/ext.d.ts.map +1 -1
- package/dist/Model/Repository/ext.js +13 -10
- package/dist/Model/Repository/internal/internal.d.ts +5 -5
- package/dist/Model/Repository/internal/internal.d.ts.map +1 -1
- package/dist/Model/Repository/internal/internal.js +52 -42
- package/dist/Model/Repository/legacy.d.ts +9 -9
- package/dist/Model/Repository/legacy.d.ts.map +1 -1
- package/dist/Model/Repository/makeRepo.d.ts +4 -4
- package/dist/Model/Repository/makeRepo.d.ts.map +1 -1
- package/dist/Model/Repository/makeRepo.js +1 -1
- package/dist/Model/Repository/service.d.ts +11 -11
- package/dist/Model/Repository/service.d.ts.map +1 -1
- package/dist/Model/Repository/validation.d.ts +17 -47
- package/dist/Model/Repository/validation.d.ts.map +1 -1
- package/dist/Model/Repository/validation.js +2 -2
- package/dist/Model/query/dsl.d.ts +22 -22
- package/dist/Model/query/dsl.d.ts.map +1 -1
- package/dist/Model/query/dsl.js +1 -1
- package/dist/Model/query/new-kid-interpreter.d.ts +1 -1
- package/dist/Model/query/new-kid-interpreter.js +7 -7
- package/dist/Operations.d.ts +22 -63
- package/dist/Operations.d.ts.map +1 -1
- package/dist/Operations.js +14 -14
- package/dist/OperationsRepo.d.ts +23 -7
- package/dist/OperationsRepo.d.ts.map +1 -1
- package/dist/OperationsRepo.js +4 -5
- package/dist/QueueMaker/SQLQueue.d.ts +6 -8
- package/dist/QueueMaker/SQLQueue.d.ts.map +1 -1
- package/dist/QueueMaker/SQLQueue.js +20 -24
- package/dist/QueueMaker/errors.js +1 -1
- package/dist/QueueMaker/memQueue.d.ts +2 -5
- package/dist/QueueMaker/memQueue.d.ts.map +1 -1
- package/dist/QueueMaker/memQueue.js +22 -26
- package/dist/QueueMaker/sbqueue.d.ts +2 -5
- package/dist/QueueMaker/sbqueue.d.ts.map +1 -1
- package/dist/QueueMaker/sbqueue.js +24 -28
- package/dist/RequestContext.d.ts +28 -41
- package/dist/RequestContext.d.ts.map +1 -1
- package/dist/RequestContext.js +4 -4
- package/dist/RequestFiberSet.d.ts +23 -50
- package/dist/RequestFiberSet.d.ts.map +1 -1
- package/dist/RequestFiberSet.js +14 -14
- package/dist/Store/ContextMapContainer.d.ts +4 -4
- package/dist/Store/ContextMapContainer.d.ts.map +1 -1
- package/dist/Store/ContextMapContainer.js +5 -5
- package/dist/Store/Cosmos.d.ts.map +1 -1
- package/dist/Store/Cosmos.js +21 -28
- package/dist/Store/Disk.d.ts.map +1 -1
- package/dist/Store/Disk.js +12 -16
- package/dist/Store/Memory.d.ts +2 -2
- package/dist/Store/Memory.d.ts.map +1 -1
- package/dist/Store/Memory.js +25 -33
- package/dist/Store/index.js +2 -2
- package/dist/Store/service.d.ts +9 -34
- package/dist/Store/service.d.ts.map +1 -1
- package/dist/Store/service.js +4 -4
- package/dist/Store/utils.d.ts.map +1 -1
- package/dist/Store/utils.js +10 -2
- package/dist/adapters/SQL/Model.d.ts +106 -162
- package/dist/adapters/SQL/Model.d.ts.map +1 -1
- package/dist/adapters/SQL/Model.js +92 -130
- package/dist/adapters/ServiceBus.d.ts +13 -44
- package/dist/adapters/ServiceBus.d.ts.map +1 -1
- package/dist/adapters/ServiceBus.js +13 -15
- package/dist/adapters/cosmos-client.d.ts +7 -3
- package/dist/adapters/cosmos-client.d.ts.map +1 -1
- package/dist/adapters/cosmos-client.js +5 -4
- package/dist/adapters/logger.d.ts +1 -1
- package/dist/adapters/logger.d.ts.map +1 -1
- package/dist/adapters/memQueue.d.ts +8 -21
- package/dist/adapters/memQueue.d.ts.map +1 -1
- package/dist/adapters/memQueue.js +4 -4
- package/dist/adapters/mongo-client.d.ts +6 -6
- package/dist/adapters/mongo-client.d.ts.map +1 -1
- package/dist/adapters/mongo-client.js +5 -4
- package/dist/adapters/redis-client.d.ts +14 -4
- package/dist/adapters/redis-client.d.ts.map +1 -1
- package/dist/adapters/redis-client.js +19 -18
- package/dist/api/ContextProvider.d.ts +10 -15
- package/dist/api/ContextProvider.d.ts.map +1 -1
- package/dist/api/ContextProvider.js +8 -8
- package/dist/api/codec.d.ts +1 -1
- package/dist/api/codec.d.ts.map +1 -1
- package/dist/api/codec.js +1 -1
- package/dist/api/internal/RequestContextMiddleware.d.ts +1 -1
- package/dist/api/internal/RequestContextMiddleware.d.ts.map +1 -1
- package/dist/api/internal/auth.d.ts +3 -3
- package/dist/api/internal/auth.d.ts.map +1 -1
- package/dist/api/internal/auth.js +8 -8
- package/dist/api/internal/events.d.ts +2 -2
- package/dist/api/internal/events.d.ts.map +1 -1
- package/dist/api/internal/events.js +9 -9
- package/dist/api/internal/health.d.ts +1 -1
- package/dist/api/internal/health.d.ts.map +1 -1
- package/dist/api/internal/health.js +2 -2
- package/dist/api/layerUtils.d.ts +14 -14
- package/dist/api/layerUtils.d.ts.map +1 -1
- package/dist/api/layerUtils.js +5 -5
- package/dist/api/middlewares.d.ts +0 -75
- package/dist/api/middlewares.d.ts.map +1 -1
- package/dist/api/middlewares.js +6 -51
- package/dist/api/reportError.js +4 -4
- package/dist/api/routing/middleware/RouterMiddleware.d.ts +4 -4
- package/dist/api/routing/middleware/RouterMiddleware.d.ts.map +1 -1
- package/dist/api/routing/middleware/middleware.d.ts +6 -7
- package/dist/api/routing/middleware/middleware.d.ts.map +1 -1
- package/dist/api/routing/middleware/middleware.js +9 -13
- package/dist/api/routing/schema/jwt.d.ts +1 -1
- package/dist/api/routing/schema/jwt.d.ts.map +1 -1
- package/dist/api/routing/schema/jwt.js +5 -4
- package/dist/api/routing/utils.d.ts +2 -2
- package/dist/api/routing/utils.d.ts.map +1 -1
- package/dist/api/routing/utils.js +10 -8
- package/dist/api/routing.d.ts +39 -37
- package/dist/api/routing.d.ts.map +1 -1
- package/dist/api/routing.js +17 -21
- package/dist/api/setupRequest.d.ts +4 -6
- package/dist/api/setupRequest.d.ts.map +1 -1
- package/dist/api/setupRequest.js +10 -9
- package/dist/arbs.d.ts +3 -3
- package/dist/arbs.d.ts.map +1 -1
- package/dist/arbs.js +2 -2
- package/dist/errorReporter.d.ts +1 -1
- package/dist/errorReporter.d.ts.map +1 -1
- package/dist/errorReporter.js +12 -12
- package/dist/fileUtil.d.ts +6 -6
- package/dist/fileUtil.d.ts.map +1 -1
- package/dist/logger/jsonLogger.d.ts.map +1 -1
- package/dist/logger/jsonLogger.js +19 -18
- package/dist/logger/logFmtLogger.d.ts.map +1 -1
- package/dist/logger/logFmtLogger.js +11 -13
- package/dist/logger/shared.d.ts +2 -2
- package/dist/logger/shared.d.ts.map +1 -1
- package/dist/logger/shared.js +7 -9
- package/dist/logger.d.ts +1 -1
- package/dist/logger.d.ts.map +1 -1
- package/dist/rateLimit.d.ts +2 -2
- package/dist/rateLimit.d.ts.map +1 -1
- package/dist/rateLimit.js +5 -5
- package/dist/test.d.ts +2 -2
- package/dist/test.d.ts.map +1 -1
- package/dist/test.js +6 -24
- package/package.json +19 -22
- package/src/CUPS.ts +15 -14
- package/src/Emailer/Sendgrid.ts +15 -13
- package/src/Emailer/service.ts +3 -3
- package/src/MainFiberSet.ts +16 -12
- package/src/Model/Repository/ext.ts +18 -16
- package/src/Model/Repository/internal/internal.ts +80 -69
- package/src/Model/Repository/legacy.ts +9 -9
- package/src/Model/Repository/makeRepo.ts +5 -5
- package/src/Model/Repository/service.ts +12 -12
- package/src/Model/Repository/validation.ts +1 -1
- package/src/Model/query/dsl.ts +13 -13
- package/src/Model/query/new-kid-interpreter.ts +8 -8
- package/src/Operations.ts +17 -14
- package/src/OperationsRepo.ts +3 -4
- package/src/QueueMaker/SQLQueue.ts +86 -89
- package/src/QueueMaker/errors.ts +1 -1
- package/src/QueueMaker/memQueue.ts +90 -91
- package/src/QueueMaker/sbqueue.ts +90 -92
- package/src/RequestContext.ts +3 -3
- package/src/RequestFiberSet.ts +17 -15
- package/src/Store/ContextMapContainer.ts +4 -4
- package/src/Store/Cosmos.ts +20 -27
- package/src/Store/Disk.ts +13 -17
- package/src/Store/Memory.ts +28 -34
- package/src/Store/index.ts +1 -1
- package/src/Store/service.ts +4 -4
- package/src/Store/utils.ts +9 -5
- package/src/adapters/SQL/Model.ts +255 -268
- package/src/adapters/ServiceBus.ts +17 -20
- package/src/adapters/cosmos-client.ts +5 -5
- package/src/adapters/memQueue.ts +3 -3
- package/src/adapters/mongo-client.ts +5 -5
- package/src/adapters/redis-client.ts +25 -19
- package/src/api/ContextProvider.ts +24 -34
- package/src/api/codec.ts +1 -1
- package/src/api/internal/auth.ts +11 -13
- package/src/api/internal/events.ts +11 -11
- package/src/api/internal/health.ts +1 -1
- package/src/api/layerUtils.ts +20 -20
- package/src/api/middlewares.ts +0 -97
- package/src/api/reportError.ts +3 -3
- package/src/api/routing/middleware/RouterMiddleware.ts +5 -6
- package/src/api/routing/middleware/middleware.ts +13 -25
- package/src/api/routing/schema/jwt.ts +9 -7
- package/src/api/routing/utils.ts +12 -10
- package/src/api/routing.ts +77 -79
- package/src/api/setupRequest.ts +9 -8
- package/src/arbs.ts +3 -3
- package/src/errorReporter.ts +12 -12
- package/src/logger/jsonLogger.ts +18 -17
- package/src/logger/logFmtLogger.ts +10 -12
- package/src/logger/shared.ts +6 -8
- package/src/rateLimit.ts +7 -7
- package/src/test.ts +7 -29
- package/test/contextProvider.test.ts +77 -70
- package/test/controller.test.ts +51 -39
- package/test/dist/contextProvider.test.d.ts.map +1 -1
- package/test/dist/controller.test.d.ts.map +1 -1
- package/test/dist/fixtures.d.ts +33 -81
- package/test/dist/fixtures.d.ts.map +1 -1
- package/test/dist/fixtures.js +9 -8
- package/test/dist/query.test.d.ts.map +1 -1
- package/test/dist/rawQuery.test.d.ts.map +1 -1
- package/test/dist/requires.test.d.ts.map +1 -1
- package/test/dist/rpc-multi-middleware.test.d.ts.map +1 -1
- package/test/fixtures.ts +9 -7
- package/test/query.test.ts +49 -41
- package/test/rawQuery.test.ts +44 -40
- package/test/requires.test.ts +40 -31
- package/test/rpc-multi-middleware.test.ts +13 -14
- package/test/validateSample.test.ts +2 -2
- package/tsconfig.json +1 -27
- package/dist/api/internal/middlewares.d.ts +0 -15
- package/dist/api/internal/middlewares.d.ts.map +0 -1
- package/dist/api/internal/middlewares.js +0 -168
- package/src/api/internal/middlewares.ts +0 -279
|
@@ -7,18 +7,21 @@
|
|
|
7
7
|
/**
|
|
8
8
|
* @since 1.0.0
|
|
9
9
|
*/
|
|
10
|
-
import * as
|
|
11
|
-
import
|
|
12
|
-
import
|
|
13
|
-
import * as
|
|
14
|
-
import * as SqlSchema from "@effect/sql/SqlSchema";
|
|
10
|
+
import * as VariantSchema from "effect/unstable/schema/VariantSchema";
|
|
11
|
+
import { SqlClient } from "effect/unstable/sql/SqlClient";
|
|
12
|
+
import * as SqlResolver from "effect/unstable/sql/SqlResolver";
|
|
13
|
+
import * as SqlSchema from "effect/unstable/sql/SqlSchema";
|
|
15
14
|
import crypto from "crypto"; // TODO
|
|
16
15
|
import * as DateTime from "effect/DateTime";
|
|
17
16
|
import * as Effect from "effect/Effect";
|
|
17
|
+
import { identity } from "effect/Function";
|
|
18
18
|
import * as Option from "effect/Option";
|
|
19
|
-
import * as
|
|
19
|
+
import * as Predicate from "effect/Predicate";
|
|
20
|
+
import * as RequestResolver from "effect/RequestResolver";
|
|
20
21
|
import * as Schema from "effect/Schema";
|
|
21
|
-
|
|
22
|
+
import * as Getter from "effect/SchemaGetter";
|
|
23
|
+
import * as Transformation from "effect/SchemaTransformation";
|
|
24
|
+
const { Class, Field, FieldExcept, FieldOnly, Struct, Union, extract, fieldEvolve } = VariantSchema.make({
|
|
22
25
|
variants: ["select", "insert", "update", "json", "jsonCreate", "jsonUpdate"],
|
|
23
26
|
defaultVariant: "select"
|
|
24
27
|
});
|
|
@@ -31,14 +34,14 @@ export {
|
|
|
31
34
|
* @since 1.0.0
|
|
32
35
|
* @category constructors
|
|
33
36
|
* @example
|
|
34
|
-
* import { Schema } from "effect
|
|
35
|
-
* import { Model } from "
|
|
37
|
+
* import { Schema } from "effect"
|
|
38
|
+
* import { Model } from "effect/unstable/schema"
|
|
36
39
|
*
|
|
37
40
|
* export const GroupId = Schema.Number.pipe(Schema.brand("GroupId"))
|
|
38
41
|
*
|
|
39
42
|
* export class Group extends Model.Class<Group>("Group")({
|
|
40
43
|
* id: Model.Generated(GroupId),
|
|
41
|
-
* name: Schema.
|
|
44
|
+
* name: Schema.String,
|
|
42
45
|
* createdAt: Model.DateTimeInsertFromDate,
|
|
43
46
|
* updatedAt: Model.DateTimeUpdateFromDate
|
|
44
47
|
* }) {}
|
|
@@ -85,11 +88,6 @@ fieldEvolve,
|
|
|
85
88
|
* @category fields
|
|
86
89
|
*/
|
|
87
90
|
FieldExcept,
|
|
88
|
-
/**
|
|
89
|
-
* @since 1.0.0
|
|
90
|
-
* @category fields
|
|
91
|
-
*/
|
|
92
|
-
fieldFromKey,
|
|
93
91
|
/**
|
|
94
92
|
* @since 1.0.0
|
|
95
93
|
* @category fields
|
|
@@ -154,6 +152,14 @@ export const Sensitive = (schema) => Field({
|
|
|
154
152
|
insert: schema,
|
|
155
153
|
update: schema
|
|
156
154
|
});
|
|
155
|
+
/**
|
|
156
|
+
* @since 1.0.0
|
|
157
|
+
* @category optional
|
|
158
|
+
*/
|
|
159
|
+
export const optionalOption = (schema) => Schema.optionalKey(Schema.NullOr(schema)).pipe(Schema.decodeTo(Schema.Option(Schema.toType(schema)), Transformation.transformOptional({
|
|
160
|
+
decode: (oe) => oe.pipe(Option.filter(Predicate.isNotNull), Option.some),
|
|
161
|
+
encode: Option.flatten
|
|
162
|
+
})));
|
|
157
163
|
/**
|
|
158
164
|
* Convert a field to one that is optional for all variants.
|
|
159
165
|
*
|
|
@@ -167,17 +173,9 @@ export const FieldOption = fieldEvolve({
|
|
|
167
173
|
select: Schema.OptionFromNullOr,
|
|
168
174
|
insert: Schema.OptionFromNullOr,
|
|
169
175
|
update: Schema.OptionFromNullOr,
|
|
170
|
-
json:
|
|
171
|
-
jsonCreate:
|
|
172
|
-
jsonUpdate:
|
|
173
|
-
});
|
|
174
|
-
/**
|
|
175
|
-
* @since 1.0.0
|
|
176
|
-
* @category date & time
|
|
177
|
-
*/
|
|
178
|
-
export const DateTimeFromDate = Schema.transform(Schema.ValidDateFromSelf, Schema.DateTimeUtcFromSelf, {
|
|
179
|
-
decode: DateTime.unsafeFromDate,
|
|
180
|
-
encode: DateTime.toDateUtc
|
|
176
|
+
json: optionalOption,
|
|
177
|
+
jsonCreate: optionalOption,
|
|
178
|
+
jsonUpdate: optionalOption
|
|
181
179
|
});
|
|
182
180
|
/**
|
|
183
181
|
* A schema for a `DateTime.Utc` that is serialized as a date string in the
|
|
@@ -186,52 +184,37 @@ export const DateTimeFromDate = Schema.transform(Schema.ValidDateFromSelf, Schem
|
|
|
186
184
|
* @since 1.0.0
|
|
187
185
|
* @category date & time
|
|
188
186
|
*/
|
|
189
|
-
export const Date = Schema.
|
|
190
|
-
decode:
|
|
191
|
-
|
|
192
|
-
|
|
193
|
-
})),
|
|
194
|
-
encode: (dt) => ParseResult.succeed(DateTime.formatIsoDate(dt))
|
|
195
|
-
});
|
|
187
|
+
export const Date = Schema.String.pipe(Schema.decodeTo(Schema.DateTimeUtc, {
|
|
188
|
+
decode: Getter.dateTimeUtcFromInput().map(DateTime.removeTime),
|
|
189
|
+
encode: Getter.transform(DateTime.formatIsoDate)
|
|
190
|
+
}));
|
|
196
191
|
/**
|
|
197
192
|
* @since 1.0.0
|
|
198
193
|
* @category date & time
|
|
199
194
|
*/
|
|
200
|
-
export const DateWithNow = VariantSchema.Overrideable(Date,
|
|
201
|
-
|
|
202
|
-
onNone: () => Effect.map(DateTime.now, DateTime.removeTime),
|
|
203
|
-
onSome: (dt) => Effect.succeed(DateTime.removeTime(dt))
|
|
204
|
-
})
|
|
195
|
+
export const DateWithNow = VariantSchema.Overrideable(Date, {
|
|
196
|
+
defaultValue: Effect.map(DateTime.now, DateTime.removeTime)
|
|
205
197
|
});
|
|
206
198
|
/**
|
|
207
199
|
* @since 1.0.0
|
|
208
200
|
* @category date & time
|
|
209
201
|
*/
|
|
210
|
-
export const DateTimeWithNow = VariantSchema.Overrideable(Schema.
|
|
211
|
-
|
|
212
|
-
onNone: () => Effect.map(DateTime.now, DateTime.formatIso),
|
|
213
|
-
onSome: (dt) => Effect.succeed(DateTime.formatIso(dt))
|
|
214
|
-
})
|
|
202
|
+
export const DateTimeWithNow = VariantSchema.Overrideable(Schema.DateTimeUtcFromString, {
|
|
203
|
+
defaultValue: DateTime.now
|
|
215
204
|
});
|
|
216
205
|
/**
|
|
217
206
|
* @since 1.0.0
|
|
218
207
|
* @category date & time
|
|
219
208
|
*/
|
|
220
|
-
export const DateTimeFromDateWithNow = VariantSchema.Overrideable(Schema.
|
|
221
|
-
|
|
222
|
-
onNone: () => Effect.map(DateTime.now, DateTime.toDateUtc),
|
|
223
|
-
onSome: (dt) => Effect.succeed(DateTime.toDateUtc(dt))
|
|
224
|
-
})
|
|
209
|
+
export const DateTimeFromDateWithNow = VariantSchema.Overrideable(Schema.DateTimeUtcFromDate, {
|
|
210
|
+
defaultValue: DateTime.now
|
|
225
211
|
});
|
|
226
212
|
/**
|
|
227
213
|
* @since 1.0.0
|
|
228
214
|
* @category date & time
|
|
229
215
|
*/
|
|
230
|
-
export const DateTimeFromNumberWithNow = VariantSchema.Overrideable(Schema.
|
|
231
|
-
|
|
232
|
-
onNone: () => Effect.map(DateTime.now, DateTime.toEpochMillis),
|
|
233
|
-
onSome: (dt) => Effect.succeed(DateTime.toEpochMillis(dt))
|
|
234
|
-
})
|
|
216
|
+
export const DateTimeFromNumberWithNow = VariantSchema.Overrideable(Schema.DateTimeUtcFromMillis, {
|
|
217
|
+
defaultValue: DateTime.now
|
|
235
218
|
});
|
|
236
219
|
/**
|
|
237
220
|
* A field that represents a date-time value that is inserted as the current
|
|
@@ -243,9 +226,9 @@ export const DateTimeFromNumberWithNow = VariantSchema.Overrideable(Schema.Numbe
|
|
|
243
226
|
* @category date & time
|
|
244
227
|
*/
|
|
245
228
|
export const DateTimeInsert = Field({
|
|
246
|
-
select: Schema.
|
|
229
|
+
select: Schema.DateTimeUtcFromString,
|
|
247
230
|
insert: DateTimeWithNow,
|
|
248
|
-
json: Schema.
|
|
231
|
+
json: Schema.DateTimeUtcFromString
|
|
249
232
|
});
|
|
250
233
|
/**
|
|
251
234
|
* A field that represents a date-time value that is inserted as the current
|
|
@@ -257,9 +240,9 @@ export const DateTimeInsert = Field({
|
|
|
257
240
|
* @category date & time
|
|
258
241
|
*/
|
|
259
242
|
export const DateTimeInsertFromDate = Field({
|
|
260
|
-
select:
|
|
243
|
+
select: Schema.DateTimeUtcFromDate,
|
|
261
244
|
insert: DateTimeFromDateWithNow,
|
|
262
|
-
json: Schema.
|
|
245
|
+
json: Schema.DateTimeUtcFromString
|
|
263
246
|
});
|
|
264
247
|
/**
|
|
265
248
|
* A field that represents a date-time value that is inserted as the current
|
|
@@ -271,9 +254,9 @@ export const DateTimeInsertFromDate = Field({
|
|
|
271
254
|
* @category date & time
|
|
272
255
|
*/
|
|
273
256
|
export const DateTimeInsertFromNumber = Field({
|
|
274
|
-
select: Schema.
|
|
257
|
+
select: Schema.DateTimeUtcFromMillis,
|
|
275
258
|
insert: DateTimeFromNumberWithNow,
|
|
276
|
-
json: Schema.
|
|
259
|
+
json: Schema.DateTimeUtcFromMillis
|
|
277
260
|
});
|
|
278
261
|
/**
|
|
279
262
|
* A field that represents a date-time value that is updated as the current
|
|
@@ -286,10 +269,10 @@ export const DateTimeInsertFromNumber = Field({
|
|
|
286
269
|
* @category date & time
|
|
287
270
|
*/
|
|
288
271
|
export const DateTimeUpdate = Field({
|
|
289
|
-
select: Schema.
|
|
272
|
+
select: Schema.DateTimeUtcFromString,
|
|
290
273
|
insert: DateTimeWithNow,
|
|
291
274
|
update: DateTimeWithNow,
|
|
292
|
-
json: Schema.
|
|
275
|
+
json: Schema.DateTimeUtcFromString
|
|
293
276
|
});
|
|
294
277
|
/**
|
|
295
278
|
* A field that represents a date-time value that is updated as the current
|
|
@@ -302,10 +285,10 @@ export const DateTimeUpdate = Field({
|
|
|
302
285
|
* @category date & time
|
|
303
286
|
*/
|
|
304
287
|
export const DateTimeUpdateFromDate = Field({
|
|
305
|
-
select:
|
|
288
|
+
select: Schema.DateTimeUtcFromDate,
|
|
306
289
|
insert: DateTimeFromDateWithNow,
|
|
307
290
|
update: DateTimeFromDateWithNow,
|
|
308
|
-
json: Schema.
|
|
291
|
+
json: Schema.DateTimeUtcFromString
|
|
309
292
|
});
|
|
310
293
|
/**
|
|
311
294
|
* A field that represents a date-time value that is updated as the current
|
|
@@ -318,10 +301,10 @@ export const DateTimeUpdateFromDate = Field({
|
|
|
318
301
|
* @category date & time
|
|
319
302
|
*/
|
|
320
303
|
export const DateTimeUpdateFromNumber = Field({
|
|
321
|
-
select: Schema.
|
|
304
|
+
select: Schema.DateTimeUtcFromMillis,
|
|
322
305
|
insert: DateTimeFromNumberWithNow,
|
|
323
306
|
update: DateTimeFromNumberWithNow,
|
|
324
|
-
json: Schema.
|
|
307
|
+
json: Schema.DateTimeUtcFromMillis
|
|
325
308
|
});
|
|
326
309
|
/**
|
|
327
310
|
* A field that represents a JSON value stored as text in the database.
|
|
@@ -332,7 +315,7 @@ export const DateTimeUpdateFromNumber = Field({
|
|
|
332
315
|
* @category json
|
|
333
316
|
*/
|
|
334
317
|
export const JsonFromString = (schema) => {
|
|
335
|
-
const parsed = Schema.
|
|
318
|
+
const parsed = Schema.fromJsonString(schema);
|
|
336
319
|
return Field({
|
|
337
320
|
select: parsed,
|
|
338
321
|
insert: parsed,
|
|
@@ -353,9 +336,7 @@ export const makeRepository = (Model, options) => Effect.gen(function* () {
|
|
|
353
336
|
const idSchema = Model.fields[options.idColumn];
|
|
354
337
|
const idColumn = options.idColumn;
|
|
355
338
|
const versionColumn = options.versionColumn;
|
|
356
|
-
|
|
357
|
-
// I guess we should hide the versionColumn and insert it in the schema instead
|
|
358
|
-
const insertSchema = SqlSchema.single({
|
|
339
|
+
const insertSchema = SqlSchema.findOne({
|
|
359
340
|
Request: Model.insert,
|
|
360
341
|
Result: Model,
|
|
361
342
|
execute: (request) => sql.onDialectOrElse({
|
|
@@ -366,19 +347,17 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = LAST_INSERT_ID(
|
|
|
366
347
|
orElse: () => sql `insert into ${sql(options.tableName)} ${sql.insert(request).returning("*")}`
|
|
367
348
|
})
|
|
368
349
|
});
|
|
369
|
-
const insert = (insert) => insertSchema(insert).pipe(Effect.
|
|
370
|
-
captureStackTrace: false
|
|
371
|
-
attributes: { insert }
|
|
350
|
+
const insert = (insert) => insertSchema(insert).pipe(Effect.catchTag("NoSuchElementError", Effect.die), Effect.withSpan(`${options.spanPrefix}.insert`, {}, {
|
|
351
|
+
captureStackTrace: false
|
|
372
352
|
}));
|
|
373
353
|
const insertVoidSchema = SqlSchema.void({
|
|
374
354
|
Request: Model.insert,
|
|
375
355
|
execute: (request) => sql `insert into ${sql(options.tableName)} ${sql.insert(request)}`
|
|
376
356
|
});
|
|
377
|
-
const insertVoid = (insert) => insertVoidSchema(insert).pipe(Effect.
|
|
378
|
-
captureStackTrace: false
|
|
379
|
-
attributes: { insert }
|
|
357
|
+
const insertVoid = (insert) => insertVoidSchema(insert).pipe(Effect.withSpan(`${options.spanPrefix}.insertVoid`, {}, {
|
|
358
|
+
captureStackTrace: false
|
|
380
359
|
}));
|
|
381
|
-
const updateSchema = SqlSchema.
|
|
360
|
+
const updateSchema = SqlSchema.findOne({
|
|
382
361
|
Request: Model.update,
|
|
383
362
|
Result: Model,
|
|
384
363
|
execute: versionColumn
|
|
@@ -397,9 +376,10 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idCol
|
|
|
397
376
|
orElse: () => sql `update ${sql(options.tableName)} set ${sql.update(request, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} returning *`
|
|
398
377
|
})
|
|
399
378
|
});
|
|
400
|
-
const update = (update) => updateSchema(update).pipe(Effect.
|
|
401
|
-
|
|
402
|
-
|
|
379
|
+
const update = (update) => updateSchema(update).pipe(Effect.catchTag("NoSuchElementError", Effect.die), Effect.withSpan(`${options.spanPrefix}.update`, {
|
|
380
|
+
attributes: { id: update[idColumn] }
|
|
381
|
+
}, {
|
|
382
|
+
captureStackTrace: false
|
|
403
383
|
}));
|
|
404
384
|
const updateVoidSchema = SqlSchema.void({
|
|
405
385
|
Request: Model.update,
|
|
@@ -407,26 +387,27 @@ select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${request[idCol
|
|
|
407
387
|
? (request) => sql `update ${sql(options.tableName)} set ${sql.update({ ...request, [versionColumn]: crypto.randomUUID() }, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]} and ${sql(versionColumn)} = ${request[versionColumn]}`
|
|
408
388
|
: (request) => sql `update ${sql(options.tableName)} set ${sql.update(request, [idColumn])} where ${sql(idColumn)} = ${request[idColumn]}`
|
|
409
389
|
});
|
|
410
|
-
const updateVoid = (update) => updateVoidSchema(update).pipe(Effect.
|
|
411
|
-
|
|
412
|
-
|
|
390
|
+
const updateVoid = (update) => updateVoidSchema(update).pipe(Effect.withSpan(`${options.spanPrefix}.updateVoid`, {
|
|
391
|
+
attributes: { id: update[idColumn] }
|
|
392
|
+
}, {
|
|
393
|
+
captureStackTrace: false
|
|
413
394
|
}));
|
|
414
|
-
const findByIdSchema = SqlSchema.
|
|
395
|
+
const findByIdSchema = SqlSchema.findOneOption({
|
|
415
396
|
Request: idSchema,
|
|
416
397
|
Result: Model,
|
|
417
398
|
execute: (id) => sql `select * from ${sql(options.tableName)} where ${sql(idColumn)} = ${id}`
|
|
418
399
|
});
|
|
419
|
-
const findById = (id) => findByIdSchema(id).pipe(Effect.
|
|
420
|
-
captureStackTrace: false
|
|
421
|
-
attributes: { id }
|
|
400
|
+
const findById = (id) => findByIdSchema(id).pipe(Effect.withSpan(`${options.spanPrefix}.findById`, { attributes: { id } }, {
|
|
401
|
+
captureStackTrace: false
|
|
422
402
|
}));
|
|
423
403
|
const deleteSchema = SqlSchema.void({
|
|
424
404
|
Request: idSchema,
|
|
425
405
|
execute: (id) => sql `delete from ${sql(options.tableName)} where ${sql(idColumn)} = ${id}`
|
|
426
406
|
});
|
|
427
|
-
const delete_ = (id) => deleteSchema(id).pipe(Effect.
|
|
428
|
-
captureStackTrace: false,
|
|
407
|
+
const delete_ = (id) => deleteSchema(id).pipe(Effect.withSpan(`${options.spanPrefix}.delete`, {
|
|
429
408
|
attributes: { id }
|
|
409
|
+
}, {
|
|
410
|
+
captureStackTrace: false
|
|
430
411
|
}));
|
|
431
412
|
return { insert, insertVoid, update, updateVoid, findById, delete: delete_ };
|
|
432
413
|
});
|
|
@@ -440,69 +421,50 @@ export const makeDataLoaders = (Model, options) => Effect.gen(function* () {
|
|
|
440
421
|
const sql = yield* SqlClient;
|
|
441
422
|
const idSchema = Model.fields[options.idColumn];
|
|
442
423
|
const idColumn = options.idColumn;
|
|
443
|
-
const
|
|
424
|
+
const setMaxBatchSize = options.maxBatchSize ? RequestResolver.batchN(options.maxBatchSize) : identity;
|
|
425
|
+
const insertResolver = SqlResolver.ordered({
|
|
444
426
|
Request: Model.insert,
|
|
445
427
|
Result: Model,
|
|
446
428
|
execute: (request) => sql.onDialectOrElse({
|
|
447
429
|
mysql: () => Effect.forEach(request, (request) => sql `insert into ${sql(options.tableName)} ${sql.insert(request)};
|
|
448
430
|
select * from ${sql(options.tableName)} where ${sql(idColumn)} = LAST_INSERT_ID();`
|
|
449
431
|
.unprepared
|
|
450
|
-
.pipe(Effect.map(([, results]) => results)), { concurrency: 10 }),
|
|
432
|
+
.pipe(Effect.map(([, results]) => results[0])), { concurrency: 10 }),
|
|
451
433
|
orElse: () => sql `insert into ${sql(options.tableName)} ${sql.insert(request).returning("*")}`
|
|
452
434
|
})
|
|
453
|
-
});
|
|
454
|
-
const
|
|
455
|
-
|
|
456
|
-
|
|
457
|
-
});
|
|
458
|
-
const insertExecute = insertResolver.makeExecute(insertLoader);
|
|
459
|
-
const insert = (insert) => insertExecute(insert).pipe(Effect.orDie, Effect.withSpan(`${options.spanPrefix}.insert`, {
|
|
460
|
-
captureStackTrace: false,
|
|
461
|
-
attributes: { insert }
|
|
435
|
+
}).pipe(RequestResolver.setDelay(options.window), setMaxBatchSize, RequestResolver.withSpan(`${options.spanPrefix}.insertResolver`));
|
|
436
|
+
const insertExecute = SqlResolver.request(insertResolver);
|
|
437
|
+
const insert = (insert) => insertExecute(insert).pipe(Effect.catchTag("ResultLengthMismatch", Effect.die), Effect.withSpan(`${options.spanPrefix}.insert`, {}, {
|
|
438
|
+
captureStackTrace: false
|
|
462
439
|
}));
|
|
463
|
-
const insertVoidResolver =
|
|
440
|
+
const insertVoidResolver = SqlResolver.void({
|
|
464
441
|
Request: Model.insert,
|
|
465
442
|
execute: (request) => sql `insert into ${sql(options.tableName)} ${sql.insert(request)}`
|
|
466
|
-
});
|
|
467
|
-
const
|
|
468
|
-
|
|
469
|
-
|
|
470
|
-
});
|
|
471
|
-
const insertVoidExecute = insertVoidResolver.makeExecute(insertVoidLoader);
|
|
472
|
-
const insertVoid = (insert) => insertVoidExecute(insert).pipe(Effect.orDie, Effect.withSpan(`${options.spanPrefix}.insertVoid`, {
|
|
473
|
-
captureStackTrace: false,
|
|
474
|
-
attributes: { insert }
|
|
443
|
+
}).pipe(RequestResolver.setDelay(options.window), setMaxBatchSize, RequestResolver.withSpan(`${options.spanPrefix}.insertVoidResolver`));
|
|
444
|
+
const insertVoidExecute = SqlResolver.request(insertVoidResolver);
|
|
445
|
+
const insertVoid = (insert) => insertVoidExecute(insert).pipe(Effect.withSpan(`${options.spanPrefix}.insertVoid`, {}, {
|
|
446
|
+
captureStackTrace: false
|
|
475
447
|
}));
|
|
476
|
-
const findByIdResolver =
|
|
448
|
+
const findByIdResolver = SqlResolver.findById({
|
|
477
449
|
Id: idSchema,
|
|
478
450
|
Result: Model,
|
|
479
451
|
ResultId(request) {
|
|
480
452
|
return request[idColumn];
|
|
481
453
|
},
|
|
482
454
|
execute: (ids) => sql `select * from ${sql(options.tableName)} where ${sql.in(idColumn, ids)}`
|
|
483
|
-
});
|
|
484
|
-
const
|
|
485
|
-
|
|
486
|
-
|
|
487
|
-
});
|
|
488
|
-
const findByIdExecute = findByIdResolver.makeExecute(findByIdLoader);
|
|
489
|
-
const findById = (id) => findByIdExecute(id).pipe(Effect.orDie, Effect.withSpan(`${options.spanPrefix}.findById`, {
|
|
490
|
-
captureStackTrace: false,
|
|
491
|
-
attributes: { id }
|
|
455
|
+
}).pipe(RequestResolver.setDelay(options.window), setMaxBatchSize, RequestResolver.withSpan(`${options.spanPrefix}.findByIdResolver`));
|
|
456
|
+
const findByIdExecute = SqlResolver.request(findByIdResolver);
|
|
457
|
+
const findById = (id) => findByIdExecute(id).pipe(Effect.withSpan(`${options.spanPrefix}.findById`, { attributes: { id } }, {
|
|
458
|
+
captureStackTrace: false
|
|
492
459
|
}));
|
|
493
|
-
const deleteResolver =
|
|
460
|
+
const deleteResolver = SqlResolver.void({
|
|
494
461
|
Request: idSchema,
|
|
495
462
|
execute: (ids) => sql `delete from ${sql(options.tableName)} where ${sql.in(idColumn, ids)}`
|
|
496
|
-
});
|
|
497
|
-
const
|
|
498
|
-
|
|
499
|
-
|
|
500
|
-
});
|
|
501
|
-
const deleteExecute = deleteResolver.makeExecute(deleteLoader);
|
|
502
|
-
const delete_ = (id) => deleteExecute(id).pipe(Effect.orDie, Effect.withSpan(`${options.spanPrefix}.delete`, {
|
|
503
|
-
captureStackTrace: false,
|
|
504
|
-
attributes: { id }
|
|
463
|
+
}).pipe(RequestResolver.setDelay(options.window), setMaxBatchSize, RequestResolver.withSpan(`${options.spanPrefix}.deleteResolver`));
|
|
464
|
+
const deleteExecute = SqlResolver.request(deleteResolver);
|
|
465
|
+
const delete_ = (id) => deleteExecute(id).pipe(Effect.withSpan(`${options.spanPrefix}.delete`, { attributes: { id } }, {
|
|
466
|
+
captureStackTrace: false
|
|
505
467
|
}));
|
|
506
468
|
return { insert, insertVoid, findById, delete: delete_ };
|
|
507
469
|
});
|
|
508
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/adapters/SQL/Model.ts"],"names":[],"mappings":"AAAA,+DAA+D;AAC/D,4DAA4D;AAC5D,4DAA4D;AAC5D,uDAAuD;AACvD,0DAA0D;AAC1D,wDAAwD;AACxD;;GAEG;AACH,OAAO,KAAK,GAAG,MAAM,sCAAsC,CAAA;AAC3D,OAAO,KAAK,aAAa,MAAM,oCAAoC,CAAA;AACnE,OAAO,EAAE,SAAS,EAAE,MAAM,uBAAuB,CAAA;AACjD,OAAO,KAAK,WAAW,MAAM,yBAAyB,CAAA;AACtD,OAAO,KAAK,SAAS,MAAM,uBAAuB,CAAA;AAClD,OAAO,MAAM,MAAM,QAAQ,CAAA,CAAC,OAAO;AAEnC,OAAO,KAAK,QAAQ,MAAM,iBAAiB,CAAA;AAE3C,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AACvC,OAAO,KAAK,WAAW,MAAM,oBAAoB,CAAA;AACjD,OAAO,KAAK,MAAM,MAAM,eAAe,CAAA;AAGvC,MAAM,EACJ,KAAK,EACL,KAAK,EACL,WAAW,EACX,SAAS,EACT,MAAM,EACN,KAAK,EACL,OAAO,EACP,WAAW,EACX,YAAY,EACb,GAAG,aAAa,CAAC,IAAI,CAAC;IACrB,QAAQ,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,QAAQ,EAAE,MAAM,EAAE,YAAY,EAAE,YAAY,CAAC;IAC5E,cAAc,EAAE,QAAQ;CACzB,CAAC,CAAA;AAwCF,OAAO;AACL;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAwCG;AACH,KAAK;AACL;;;GAGG;AACH,OAAO;AACP;;;GAGG;AACH,KAAK;AACL;;;GAGG;AACH,WAAW;AACX;;;GAGG;AACH,WAAW;AACX;;;GAGG;AACH,YAAY;AACZ;;;GAGG;AACH,SAAS;AACT;;;GAGG;AACH,MAAM;AACN;;;GAGG;AACH,KAAK,EACN,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,MAAM,GAA8E,aAAa,CAAC,MAAM,CAAA;AAErH;;;GAGG;AACH,MAAM,CAAC,MAAM,QAAQ,GAA2C,aAAa,CAAC,QAAQ,CAAA;AActF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,MAAS,EACK,EAAE,CAChB,KAAK,CAAC;IACJ,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,MAAM;CACb,CAAC,CAAA;AAgBJ;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,MAAS,EACU,EAAE,CACrB,KAAK,CAAC;IACJ,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,IAAI,EAAE,MAAM;CACb,CAAC,CAAA;AAcJ;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,MAAS,EACK,EAAE,CAChB,KAAK,CAAC;IACJ,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;IACd,MAAM,EAAE,MAAM;CACf,CAAC,CAAA;AAsBJ;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,WAAW,GAWZ,WAAW,CAAC;IACpB,MAAM,EAAE,MAAM,CAAC,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC,gBAAgB;IAC/B,MAAM,EAAE,MAAM,CAAC,gBAAgB;IAC/B,IAAI,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,CAAC;IAC3C,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;IACjE,UAAU,EAAE,MAAM,CAAC,YAAY,CAAC,EAAE,EAAE,EAAE,QAAQ,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;CAClE,CAAQ,CAAA;AAaX;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAqB,MAAM,CAAC,SAAS,CAChE,MAAM,CAAC,iBAAiB,EACxB,MAAM,CAAC,mBAAmB,EAC1B;IACE,MAAM,EAAE,QAAQ,CAAC,cAAc;IAC/B,MAAM,EAAE,QAAQ,CAAC,SAAS;CAC3B,CACF,CAAA;AAQD;;;;;;GAMG;AACH,MAAM,CAAC,MAAM,IAAI,GAAS,MAAM,CAAC,eAAe,CAC9C,MAAM,CAAC,MAAM,EACb,MAAM,CAAC,mBAAmB,EAC1B;IACE,MAAM,EAAE,CAAC,CAAC,EAAE,CAAC,EAAE,GAAG,EAAE,EAAE,CACpB,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,IAAI,CACnB,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,UAAU,CAAC,EAC/B,MAAM,CAAC,KAAK,CAAC;QACX,MAAM,EAAE,GAAG,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,IAAI,WAAW,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;QAC5D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,EAAE,CAAC;KACxC,CAAC,CACH;IACH,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,WAAW,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;CAChE,CACF,CAAA;AAED;;;GAGG;AACH,MAAM,CAAC,MAAM,WAAW,GAAG,aAAa,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,CAAC,mBAAmB,EAAE;IACtF,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,UAAU,CAAC;QAC3D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;KACxD,CAAC;CACH,CAAC,CAAA;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,EAAE;IACnG,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,SAAS,CAAC;QAC1D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KACvD,CAAC;CACH,CAAC,CAAA;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,uBAAuB,GAAG,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,YAAY,EAAE,MAAM,CAAC,mBAAmB,EAAE;IACjH,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,SAAS,CAAC;QAC1D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC,CAAC;KACvD,CAAC;CACH,CAAC,CAAA;AAEF;;;GAGG;AACH,MAAM,CAAC,MAAM,yBAAyB,GAAG,aAAa,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,EAAE;IAC7G,QAAQ,EAAE,MAAM,CAAC,KAAK,CAAC;QACrB,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,GAAG,EAAE,QAAQ,CAAC,aAAa,CAAC;QAC9D,MAAM,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;KAC3D,CAAC;CACH,CAAC,CAAA;AAcF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,cAAc,GAAmB,KAAK,CAAC;IAClD,MAAM,EAAE,MAAM,CAAC,WAAW;IAC1B,MAAM,EAAE,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC,WAAW;CACzB,CAAC,CAAA;AAcF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAA2B,KAAK,CAAC;IAClE,MAAM,EAAE,gBAAgB;IACxB,MAAM,EAAE,uBAAuB;IAC/B,IAAI,EAAE,MAAM,CAAC,WAAW;CACzB,CAAC,CAAA;AAcF;;;;;;;;GAQG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,CAAC;IACtE,MAAM,EAAE,MAAM,CAAC,qBAAqB;IACpC,MAAM,EAAE,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC,qBAAqB;CACnC,CAAC,CAAA;AAeF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,cAAc,GAAmB,KAAK,CAAC;IAClD,MAAM,EAAE,MAAM,CAAC,WAAW;IAC1B,MAAM,EAAE,eAAe;IACvB,MAAM,EAAE,eAAe;IACvB,IAAI,EAAE,MAAM,CAAC,WAAW;CACzB,CAAC,CAAA;AAeF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,sBAAsB,GAA2B,KAAK,CAAC;IAClE,MAAM,EAAE,gBAAgB;IACxB,MAAM,EAAE,uBAAuB;IAC/B,MAAM,EAAE,uBAAuB;IAC/B,IAAI,EAAE,MAAM,CAAC,WAAW;CACzB,CAAC,CAAA;AAeF;;;;;;;;;GASG;AACH,MAAM,CAAC,MAAM,wBAAwB,GAA6B,KAAK,CAAC;IACtE,MAAM,EAAE,MAAM,CAAC,qBAAqB;IACpC,MAAM,EAAE,yBAAyB;IACjC,MAAM,EAAE,yBAAyB;IACjC,IAAI,EAAE,MAAM,CAAC,qBAAqB;CACnC,CAAC,CAAA;AAkBF;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAC5B,MAAS,EACU,EAAE;IACrB,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,CAAC,MAAa,CAAC,CAAA;IAC9C,OAAO,KAAK,CAAC;QACX,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,MAAM,EAAE,MAAM;QACd,IAAI,EAAE,MAAM;QACZ,UAAU,EAAE,MAAM;QAClB,UAAU,EAAE,MAAM;KACnB,CAAQ,CAAA;AACX,CAAC,CAAA;AAED;;;;;GAKG;AACH,MAAM,CAAC,MAAM,cAAc,GAAG,CAG5B,KAAQ,EAAE,OAKX,EAuBC,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAA;IAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAsB,CAAA;IACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAkB,CAAA;IAC3C,MAAM,aAAa,GAAG,OAAO,CAAC,aAAa,CAAA;IAE3C,wCAAwC;IACxC,+EAA+E;IAC/E,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC;QACpC,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CACnB,GAAG,CAAC,eAAe,CAAC;YAClB,KAAK,EAAE,GAAG,EAAE,CACV,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;gBAC3D,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,sBAAsB;iBACpE,UAAU;iBACV,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAc,CAAC,CAC5C;YACL,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;SAC/F,CAAC;KACL,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,CACb,MAA2B,EAC6C,EAAE,CAC1E,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CACvB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,SAAS,EAAE;QAC9C,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,MAAM,EAAE;KACvB,CAAC,CACI,CAAA;IAEV,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC;QACtC,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;KACxF,CAAC,CAAA;IACF,MAAM,UAAU,GAAG,CACjB,MAA2B,EACwC,EAAE,CACrE,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,CAC3B,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,aAAa,EAAE;QAClD,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,MAAM,EAAE;KACvB,CAAC,CACI,CAAA;IAEV,MAAM,YAAY,GAAG,SAAS,CAAC,MAAM,CAAC;QACpC,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,aAAa;YACpB,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CACZ,GAAG,CAAC,eAAe,CAAC;gBAClB,KAAK,EAAE,GAAG,EAAE,CACV,GAAG,CAAA,UAAU,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,QACjC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAC7E,UAAU,GAAG,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,CAAC,aAAa,CAAC,MAAM,OAAO,CAAC,aAAa,CAAC;gBAClG,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG;qBACtE,UAAU;qBACV,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAc,CAAC,CAC5C;gBACL,MAAM,EAAE,GAAG,EAAE,CACX,GAAG,CAAA,UAAU,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,QACjC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAC7E,UAAU,GAAG,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,CAAC,aAAa,CAAC,MACtE,OAAO,CAAC,aAAa,CACvB,cAAc;aACjB,CAAC;YACJ,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CACZ,GAAG,CAAC,eAAe,CAAC;gBAClB,KAAK,EAAE,GAAG,EAAE,CACV,GAAG,CAAA,UAAU,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,MAC/F,OAAO,CAAC,QAAQ,CAClB;gBACE,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,GAAG;qBACtE,UAAU;qBACV,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAc,CAAC,CAC5C;gBACL,MAAM,EAAE,GAAG,EAAE,CACX,GAAG,CAAA,UAAU,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,MAC/F,OAAO,CAAC,QAAQ,CAClB,cAAc;aACjB,CAAC;KACP,CAAC,CAAA;IACF,MAAM,MAAM,GAAG,CACb,MAA2B,EAC6C,EAAE,CAC1E,YAAY,CAAC,MAAM,CAAC,CAAC,IAAI,CACvB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,SAAS,EAAE;QAC9C,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,MAAM,EAAE;KACvB,CAAC,CACI,CAAA;IAEV,MAAM,gBAAgB,GAAG,SAAS,CAAC,IAAI,CAAC;QACtC,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,OAAO,EAAE,aAAa;YACpB,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CACZ,GAAG,CAAA,UAAU,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,QACjC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,OAAO,EAAE,CAAC,aAAa,CAAC,EAAE,MAAM,CAAC,UAAU,EAAE,EAAE,EAAE,CAAC,QAAQ,CAAC,CAC7E,UAAU,GAAG,CAAC,QAAQ,CAAC,MAAM,OAAO,CAAC,QAAQ,CAAC,QAAQ,GAAG,CAAC,aAAa,CAAC,MAAM,OAAO,CAAC,aAAa,CAAC,EAAE;YACxG,CAAC,CAAC,CAAC,OAAO,EAAE,EAAE,CACZ,GAAG,CAAA,UAAU,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,QAAQ,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,QAAQ,CAAC,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,MAC/F,OAAO,CAAC,QAAQ,CAClB,EAAE;KACP,CAAC,CAAA;IACF,MAAM,UAAU,GAAG,CACjB,MAA2B,EACwC,EAAE,CACrE,gBAAgB,CAAC,MAAM,CAAC,CAAC,IAAI,CAC3B,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,aAAa,EAAE;QAClD,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,MAAM,EAAE;KACvB,CAAC,CACI,CAAA;IAEV,MAAM,cAAc,GAAG,SAAS,CAAC,OAAO,CAAC;QACvC,OAAO,EAAE,QAAQ;QACjB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA,iBAAiB,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;KAC7F,CAAC,CAAA;IACF,MAAM,QAAQ,GAAG,CACf,EAAuC,EACgE,EAAE,CACzG,cAAc,CAAC,EAAE,CAAC,CAAC,IAAI,CACrB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,WAAW,EAAE;QAChD,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,EAAE,EAAE;KACnB,CAAC,CACI,CAAA;IAEV,MAAM,YAAY,GAAG,SAAS,CAAC,IAAI,CAAC;QAClC,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,CAAC,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,MAAM,EAAE,EAAE;KAC3F,CAAC,CAAA;IACF,MAAM,OAAO,GAAG,CACd,EAAuC,EAC6B,EAAE,CACtE,YAAY,CAAC,EAAE,CAAC,CAAC,IAAI,CACnB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,SAAS,EAAE;QAC9C,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,EAAE,EAAE;KACnB,CAAC,CACI,CAAA;IAEV,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAW,CAAA;AACvF,CAAC,CAAC,CAAA;AAEJ;;;;;GAKG;AACH,MAAM,CAAC,MAAM,eAAe,GAAG,CAI7B,KAAQ,EACR,OAMC,EAUD,EAAE,CACF,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IAClB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAA;IAC5B,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAsB,CAAA;IACpE,MAAM,QAAQ,GAAG,OAAO,CAAC,QAAkB,CAAA;IAE3C,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,UAAU,SAAS,EAAE;QAChF,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,MAAM,EAAE,KAAK;QACb,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CACnB,GAAG,CAAC,eAAe,CAAC;YAClB,KAAK,EAAE,GAAG,EAAE,CACV,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAClC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC;gBAC7D,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,QAAQ,CAAC,sBAAsB;iBAClE,UAAU;iBACV,IAAI,CACH,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,EAAE,CAAC,OAAc,CAAC,CAC5C,EAAE,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;YAC7B,MAAM,EAAE,GAAG,EAAE,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,CAAC,GAAG,CAAC,EAAE;SAC/F,CAAC;KACL,CAAC,CAAA;IACF,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,EAAE;QACzD,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAa;KACpC,CAAC,CAAA;IACF,MAAM,aAAa,GAAG,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IAC9D,MAAM,MAAM,GAAG,CACb,MAA2B,EAC6C,EAAE,CAC1E,aAAa,CAAC,MAAM,CAAC,CAAC,IAAI,CACxB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,SAAS,EAAE;QAC9C,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,MAAM,EAAE;KACvB,CAAC,CACH,CAAA;IAEH,MAAM,kBAAkB,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,UAAU,aAAa,EAAE;QACrF,OAAO,EAAE,KAAK,CAAC,MAAM;QACrB,OAAO,EAAE,CAAC,OAAO,EAAE,EAAE,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE;KACxF,CAAC,CAAA;IACF,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,kBAAkB,EAAE;QACjE,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAa;KACpC,CAAC,CAAA;IACF,MAAM,iBAAiB,GAAG,kBAAkB,CAAC,WAAW,CAAC,gBAAgB,CAAC,CAAA;IAC1E,MAAM,UAAU,GAAG,CACjB,MAA2B,EACwC,EAAE,CACrE,iBAAiB,CAAC,MAAM,CAAC,CAAC,IAAI,CAC5B,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,aAAa,EAAE;QAClD,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,MAAM,EAAE;KACvB,CAAC,CACH,CAAA;IAEH,MAAM,gBAAgB,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,WAAW,EAAE;QACrF,EAAE,EAAE,QAAQ;QACZ,MAAM,EAAE,KAAK;QACb,QAAQ,CAAC,OAAO;YACd,OAAO,OAAO,CAAC,QAAQ,CAAC,CAAA;QAC1B,CAAC;QACD,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA,iBAAiB,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE;KAC9F,CAAC,CAAA;IACF,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,gBAAgB,EAAE;QAC7D,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAa;KACpC,CAAC,CAAA;IACF,MAAM,eAAe,GAAG,gBAAgB,CAAC,WAAW,CAAC,cAAc,CAAC,CAAA;IACpE,MAAM,QAAQ,GAAG,CAAC,EAAuC,EAA2C,EAAE,CACpG,eAAe,CAAC,EAAE,CAAC,CAAC,IAAI,CACtB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,WAAW,EAAE;QAChD,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,EAAE,EAAE;KACnB,CAAC,CACI,CAAA;IAEV,MAAM,cAAc,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,IAAI,CAAC,GAAG,OAAO,CAAC,UAAU,SAAS,EAAE;QAC7E,OAAO,EAAE,QAAQ;QACjB,OAAO,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,GAAG,CAAA,eAAe,GAAG,CAAC,OAAO,CAAC,SAAS,CAAC,UAAU,GAAG,CAAC,EAAE,CAAC,QAAQ,EAAE,GAAG,CAAC,EAAE;KAC5F,CAAC,CAAA;IACF,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,GAAG,CAAC,UAAU,CAAC,cAAc,EAAE;QACzD,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY,EAAE,OAAO,CAAC,YAAa;KACpC,CAAC,CAAA;IACF,MAAM,aAAa,GAAG,cAAc,CAAC,WAAW,CAAC,YAAY,CAAC,CAAA;IAC9D,MAAM,OAAO,GAAG,CAAC,EAAuC,EAAuB,EAAE,CAC/E,aAAa,CAAC,EAAE,CAAC,CAAC,IAAI,CACpB,MAAM,CAAC,KAAK,EACZ,MAAM,CAAC,QAAQ,CAAC,GAAG,OAAO,CAAC,UAAU,SAAS,EAAE;QAC9C,iBAAiB,EAAE,KAAK;QACxB,UAAU,EAAE,EAAE,EAAE,EAAE;KACnB,CAAC,CACI,CAAA;IAEV,OAAO,EAAE,MAAM,EAAE,UAAU,EAAE,QAAQ,EAAE,MAAM,EAAE,OAAO,EAAW,CAAA;AACnE,CAAC,CAAC,CAAA"}
|
|
470
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Model.js","sourceRoot":"","sources":["../../../src/adapters/SQL/Model.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,58 +1,27 @@
|
|
|
1
1
|
import { type OperationOptionsBase, type ProcessErrorArgs, ServiceBusClient, type ServiceBusMessage, type ServiceBusMessageBatch, type ServiceBusReceivedMessage, type ServiceBusReceiver } from "@azure/service-bus";
|
|
2
|
-
import {
|
|
3
|
-
declare
|
|
4
|
-
|
|
2
|
+
import { Effect, Layer, type Scope, ServiceMap } from "effect-app";
|
|
3
|
+
declare const ServiceBusClientTag_base: ServiceMap.OpaqueClass<ServiceBusClientTag, "@services/Client", ServiceBusClient> & {
|
|
4
|
+
readonly make: (url: string) => Effect.Effect<ServiceBusClient, never, Scope.Scope>;
|
|
5
|
+
};
|
|
5
6
|
export declare class ServiceBusClientTag extends ServiceBusClientTag_base {
|
|
6
|
-
static readonly make: typeof makeClient;
|
|
7
7
|
static readonly layer: (url: string) => Layer.Layer<ServiceBusClientTag, never, never>;
|
|
8
8
|
}
|
|
9
|
-
declare const Sender_base:
|
|
10
|
-
name: string;
|
|
11
|
-
sendMessages: (messages: ServiceBusMessage | ServiceBusMessage[] | ServiceBusMessageBatch, options?: Omit<OperationOptionsBase, "abortSignal">) => Effect.Effect<void, never, never>;
|
|
12
|
-
}) => Readonly<{
|
|
13
|
-
name: string;
|
|
14
|
-
sendMessages: (messages: ServiceBusMessage | ServiceBusMessage[] | ServiceBusMessageBatch, options?: Omit<OperationOptionsBase, "abortSignal">) => Effect.Effect<void, never, never>;
|
|
15
|
-
}> & Context.TagClassShape<"Sender", {
|
|
16
|
-
name: string;
|
|
17
|
-
sendMessages: (messages: ServiceBusMessage | ServiceBusMessage[] | ServiceBusMessageBatch, options?: Omit<OperationOptionsBase, "abortSignal">) => Effect.Effect<void, never, never>;
|
|
18
|
-
}>) & {
|
|
19
|
-
toLayer: <E, R>(eff: Effect.Effect<Omit<Sender, keyof Context.TagClassShape<any, any>>, E, R>) => Layer.Layer<Sender, E, R>;
|
|
20
|
-
toLayerScoped: <E, R_1>(eff: Effect.Effect<Omit<Sender, keyof Context.TagClassShape<any, any>>, E, R_1>) => Layer.Layer<Sender, E, Exclude<R_1, Scope.Scope>>;
|
|
21
|
-
of: (service: Omit<Sender, keyof Context.TagClassShape<any, any>>) => Sender;
|
|
22
|
-
} & Context.Tag<Sender, Sender> & Context.ServiceUse<Sender, {
|
|
9
|
+
declare const Sender_base: ServiceMap.OpaqueClass<Sender, "Sender", {
|
|
23
10
|
name: string;
|
|
24
11
|
sendMessages: (messages: ServiceBusMessage | ServiceBusMessage[] | ServiceBusMessageBatch, options?: Omit<OperationOptionsBase, "abortSignal">) => Effect.Effect<void, never, never>;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
static readonly make: (name: string) => Effect.Effect<{
|
|
12
|
+
}> & {
|
|
13
|
+
readonly make: (name: string) => Effect.Effect<{
|
|
28
14
|
name: string;
|
|
29
|
-
sendMessages: (messages: ServiceBusMessage |
|
|
15
|
+
sendMessages: (messages: ServiceBusMessage | ServiceBusMessage[] | ServiceBusMessageBatch, options?: Omit<OperationOptionsBase, "abortSignal">) => Effect.Effect<void, never, never>;
|
|
30
16
|
}, never, Scope.Scope | ServiceBusClientTag>;
|
|
17
|
+
};
|
|
18
|
+
export declare class Sender extends Sender_base {
|
|
31
19
|
static readonly layer: (name: string) => Layer.Layer<Sender, never, ServiceBusClientTag>;
|
|
32
20
|
}
|
|
33
|
-
export declare const SenderTag: <Id>() => <Key extends string>(queueName: Key) =>
|
|
21
|
+
export declare const SenderTag: <Id>() => <Key extends string>(queueName: Key) => ServiceMap.Service<Id, Sender> & {
|
|
34
22
|
layer: Layer.Layer<Id, never, ServiceBusClientTag>;
|
|
35
23
|
};
|
|
36
|
-
declare const Receiver_base:
|
|
37
|
-
name: string;
|
|
38
|
-
make: (waitTillEmpty: Effect.Effect<void>) => Effect.Effect<ServiceBusReceiver, never, Scope.Scope>;
|
|
39
|
-
makeSession: (sessionId: string, waitTillEmpty: Effect.Effect<void>) => Effect.Effect<ServiceBusReceiver, never, Scope.Scope>;
|
|
40
|
-
subscribe<RMsg, RErr>(hndlr: MessageHandlers<RMsg, RErr>, sessionId?: string): Effect.Effect<void, never, Scope.Scope | RMsg | RErr>;
|
|
41
|
-
}) => Readonly<{
|
|
42
|
-
name: string;
|
|
43
|
-
make: (waitTillEmpty: Effect.Effect<void>) => Effect.Effect<ServiceBusReceiver, never, Scope.Scope>;
|
|
44
|
-
makeSession: (sessionId: string, waitTillEmpty: Effect.Effect<void>) => Effect.Effect<ServiceBusReceiver, never, Scope.Scope>;
|
|
45
|
-
subscribe<RMsg, RErr>(hndlr: MessageHandlers<RMsg, RErr>, sessionId?: string): Effect.Effect<void, never, Scope.Scope | RMsg | RErr>;
|
|
46
|
-
}> & Context.TagClassShape<"Receiver", {
|
|
47
|
-
name: string;
|
|
48
|
-
make: (waitTillEmpty: Effect.Effect<void>) => Effect.Effect<ServiceBusReceiver, never, Scope.Scope>;
|
|
49
|
-
makeSession: (sessionId: string, waitTillEmpty: Effect.Effect<void>) => Effect.Effect<ServiceBusReceiver, never, Scope.Scope>;
|
|
50
|
-
subscribe<RMsg, RErr>(hndlr: MessageHandlers<RMsg, RErr>, sessionId?: string): Effect.Effect<void, never, Scope.Scope | RMsg | RErr>;
|
|
51
|
-
}>) & {
|
|
52
|
-
toLayer: <E, R>(eff: Effect.Effect<Omit<Receiver, keyof Context.TagClassShape<any, any>>, E, R>) => Layer.Layer<Receiver, E, R>;
|
|
53
|
-
toLayerScoped: <E, R_1>(eff: Effect.Effect<Omit<Receiver, keyof Context.TagClassShape<any, any>>, E, R_1>) => Layer.Layer<Receiver, E, Exclude<R_1, Scope.Scope>>;
|
|
54
|
-
of: (service: Omit<Receiver, keyof Context.TagClassShape<any, any>>) => Receiver;
|
|
55
|
-
} & Context.Tag<Receiver, Receiver> & Context.ServiceUse<Receiver, {
|
|
24
|
+
declare const Receiver_base: ServiceMap.OpaqueClass<Receiver, "Receiver", {
|
|
56
25
|
name: string;
|
|
57
26
|
make: (waitTillEmpty: Effect.Effect<void>) => Effect.Effect<ServiceBusReceiver, never, Scope.Scope>;
|
|
58
27
|
makeSession: (sessionId: string, waitTillEmpty: Effect.Effect<void>) => Effect.Effect<ServiceBusReceiver, never, Scope.Scope>;
|
|
@@ -67,7 +36,7 @@ export declare class Receiver extends Receiver_base {
|
|
|
67
36
|
}, never, ServiceBusClientTag>;
|
|
68
37
|
static readonly layer: (name: string) => Layer.Layer<Receiver, never, ServiceBusClientTag>;
|
|
69
38
|
}
|
|
70
|
-
export declare const ReceiverTag: <Id>() => <Key extends string>(queueName: Key) =>
|
|
39
|
+
export declare const ReceiverTag: <Id>() => <Key extends string>(queueName: Key) => ServiceMap.Service<Id, Receiver> & {
|
|
71
40
|
layer: Layer.Layer<Id, never, ServiceBusClientTag>;
|
|
72
41
|
};
|
|
73
42
|
export declare const SenderReceiver: (queue: string, queueDrain?: string) => Layer.Layer<Sender | Receiver, never, ServiceBusClientTag>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"ServiceBus.d.ts","sourceRoot":"","sources":["../../src/adapters/ServiceBus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,iBAAiB,EAAE,KAAK,sBAAsB,EAAE,KAAK,yBAAyB,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACrN,OAAO,EAAS,
|
|
1
|
+
{"version":3,"file":"ServiceBus.d.ts","sourceRoot":"","sources":["../../src/adapters/ServiceBus.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,oBAAoB,EAAE,KAAK,gBAAgB,EAAE,gBAAgB,EAAE,KAAK,iBAAiB,EAAE,KAAK,sBAAsB,EAAE,KAAK,yBAAyB,EAAE,KAAK,kBAAkB,EAAE,MAAM,oBAAoB,CAAA;AACrN,OAAO,EAAS,MAAM,EAAkB,KAAK,EAAE,KAAK,KAAK,EAAE,UAAU,EAAE,MAAM,YAAY,CAAA;;;;AAkBzF,qBAAa,mBACX,SAAQ,wBAAoG;IAE5G,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAI,KAAK,MAAM,oDAAiC;CACtE;;UA6BO,MAAM;kBACE,CACZ,QAAQ,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,GAAG,sBAAsB,EAC1E,OAAO,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,aAAa,CAAC,KAChD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC;;;cAJhC,MAAM;sBACE,CACZ,QAAQ,EAAE,iBAAiB,GAAG,iBAAiB,EAAE,GAAG,sBAAsB,EAC1E,OAAO,CAAC,EAAE,IAAI,CAAC,oBAAoB,EAAE,aAAa,CAAC,KAChD,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC;;;AALxC,qBAAa,MAAO,SAAQ,WAMQ;IAClC,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAI,MAAM,MAAM,qDAAkC;CACxE;AAED,eAAO,MAAM,SAAS,GAAI,EAAE,QAAQ,GAAG,SAAS,MAAM,EAAE,WAAW,GAAG;;CASrE,CAAA;;UA+FO,MAAM;UACN,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAAK,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;iBACtF,CACX,SAAS,EAAE,MAAM,EACjB,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,KAC/B,MAAM,CAAC,MAAM,CAAC,kBAAkB,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,CAAC;cAChD,IAAI,EAAE,IAAI,SACX,eAAe,CAAC,IAAI,EAAE,IAAI,CAAC,cACtB,MAAM,GACjB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,KAAK,CAAC,KAAK,GAAG,IAAI,GAAG,IAAI,CAAC;;AAV1D,qBAAa,QAAS,SAAQ,aAWd;IACd,MAAM,CAAC,QAAQ,CAAC,IAAI,SAxGM,MAAM;;8BAyBD,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;iCAEhB,MAAM,iBAAiB,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC;oBAOjC,IAAI,EAAE,IAAI;mCAsElB;IACnC,MAAM,CAAC,QAAQ,CAAC,KAAK,GAAI,MAAM,MAAM,uDAAqC;CAC3E;AAED,eAAO,MAAM,WAAW,GAAI,EAAE,QAAQ,GAAG,SAAS,MAAM,EAAE,WAAW,GAAG;;CASvE,CAAA;AAED,eAAO,MAAM,cAAc,GAAI,OAAO,MAAM,EAAE,aAAa,MAAM,+DACS,CAAA;AAE1E,MAAM,WAAW,eAAe,CAAC,IAAI,EAAE,IAAI;IACzC;;;;OAIG;IACH,cAAc,CAAC,OAAO,EAAE,yBAAyB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;IACpF;;;;OAIG;IACH,YAAY,CAAC,IAAI,EAAE,gBAAgB,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,KAAK,EAAE,IAAI,CAAC,CAAA;CACvE"}
|