@effect-app/infra 4.0.0-beta.217 → 4.0.0-beta.219
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 +26 -0
- package/dist/Model/query/dsl.d.ts +9 -1
- package/dist/Model/query/dsl.d.ts.map +1 -1
- package/dist/Model/query/dsl.js +29 -1
- package/dist/Model/query/new-kid-interpreter.d.ts +7 -1
- package/dist/Model/query/new-kid-interpreter.d.ts.map +1 -1
- package/dist/Model/query/new-kid-interpreter.js +12 -1
- package/dist/Store/Cosmos/query.d.ts +1 -1
- package/dist/Store/Cosmos/query.d.ts.map +1 -1
- package/dist/Store/Cosmos/query.js +13 -1
- package/dist/Store/Memory.d.ts +1 -1
- package/dist/Store/Memory.d.ts.map +1 -1
- package/dist/Store/Memory.js +21 -1
- package/dist/Store/SQL/query.d.ts +1 -1
- package/dist/Store/SQL/query.d.ts.map +1 -1
- package/dist/Store/SQL/query.js +18 -1
- package/dist/api/internal/RequestContextMiddleware.d.ts +2 -2
- package/dist/api/internal/RequestContextMiddleware.d.ts.map +1 -1
- package/dist/api/internal/RequestContextMiddleware.js +8 -5
- package/dist/api/routing.js +3 -3
- package/package.json +2 -2
- package/src/Model/query/dsl.ts +40 -0
- package/src/Model/query/new-kid-interpreter.ts +18 -0
- package/src/Store/Cosmos/query.ts +12 -0
- package/src/Store/Memory.ts +18 -0
- package/src/Store/SQL/query.ts +17 -0
- package/src/api/internal/RequestContextMiddleware.ts +14 -4
- package/src/api/routing.ts +2 -2
package/dist/api/routing.js
CHANGED
|
@@ -136,7 +136,8 @@ export const makeRouter = (middlewareLive) => {
|
|
|
136
136
|
"code.function.name": resource._tag,
|
|
137
137
|
"code.namespace": meta.moduleName,
|
|
138
138
|
"app.rpc.type": resource.type
|
|
139
|
-
}
|
|
139
|
+
},
|
|
140
|
+
sampled: false // we don't want it to appear on otel, just a way to quickly jump to src on error..
|
|
140
141
|
}, {
|
|
141
142
|
captureStackTrace: () => handler.stack // capturing the handler stack is the main reason why we are doing the span here
|
|
142
143
|
}));
|
|
@@ -198,7 +199,6 @@ export const makeRouter = (middlewareLive) => {
|
|
|
198
199
|
}));
|
|
199
200
|
return RpcServer
|
|
200
201
|
.layerHttp({
|
|
201
|
-
spanPrefix: "RpcServer." + meta.moduleName,
|
|
202
202
|
group: rpcs,
|
|
203
203
|
path: ("/rpc/" + meta.moduleName),
|
|
204
204
|
protocol: "http"
|
|
@@ -235,4 +235,4 @@ export const makeRouter = (middlewareLive) => {
|
|
|
235
235
|
Router: matchFor
|
|
236
236
|
};
|
|
237
237
|
};
|
|
238
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
|
|
238
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"routing.js","sourceRoot":"","sources":["../../src/api/routing.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@effect-app/infra",
|
|
3
|
-
"version": "4.0.0-beta.
|
|
3
|
+
"version": "4.0.0-beta.219",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"type": "module",
|
|
6
6
|
"dependencies": {
|
|
@@ -13,7 +13,7 @@
|
|
|
13
13
|
"proper-lockfile": "^4.1.2",
|
|
14
14
|
"pure-rand": "8.4.0",
|
|
15
15
|
"query-string": "^9.3.1",
|
|
16
|
-
"effect-app": "4.0.0-beta.
|
|
16
|
+
"effect-app": "4.0.0-beta.219"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@azure/cosmos": "^4.9.3",
|
package/src/Model/query/dsl.ts
CHANGED
|
@@ -168,6 +168,13 @@ export type ComputedProjectionExpression =
|
|
|
168
168
|
readonly distinct: boolean
|
|
169
169
|
readonly operation?: ComputedProjectionOperation
|
|
170
170
|
}
|
|
171
|
+
| {
|
|
172
|
+
readonly _tag: "relation-collect-fields"
|
|
173
|
+
readonly path: string
|
|
174
|
+
readonly fields: readonly string[]
|
|
175
|
+
readonly distinct: boolean
|
|
176
|
+
readonly operation?: ComputedProjectionOperation
|
|
177
|
+
}
|
|
171
178
|
|
|
172
179
|
export type ComputedProjectionMap = Readonly<Record<string, ComputedProjectionExpression>>
|
|
173
180
|
export type Q<TFieldValues extends FieldValues> =
|
|
@@ -602,6 +609,39 @@ export const relation = <TFieldValues extends FieldValues>(
|
|
|
602
609
|
path: path as string,
|
|
603
610
|
field,
|
|
604
611
|
distinct: true
|
|
612
|
+
},
|
|
613
|
+
collectFields: (fields: readonly string[], operation?: ComputedProjectionOperation): ComputedProjectionExpression =>
|
|
614
|
+
operation
|
|
615
|
+
? {
|
|
616
|
+
_tag: "relation-collect-fields",
|
|
617
|
+
path: path as string,
|
|
618
|
+
fields,
|
|
619
|
+
distinct: false,
|
|
620
|
+
operation
|
|
621
|
+
}
|
|
622
|
+
: {
|
|
623
|
+
_tag: "relation-collect-fields",
|
|
624
|
+
path: path as string,
|
|
625
|
+
fields,
|
|
626
|
+
distinct: false
|
|
627
|
+
},
|
|
628
|
+
collectDistinctFields: (
|
|
629
|
+
fields: readonly string[],
|
|
630
|
+
operation?: ComputedProjectionOperation
|
|
631
|
+
): ComputedProjectionExpression =>
|
|
632
|
+
operation
|
|
633
|
+
? {
|
|
634
|
+
_tag: "relation-collect-fields",
|
|
635
|
+
path: path as string,
|
|
636
|
+
fields,
|
|
637
|
+
distinct: true,
|
|
638
|
+
operation
|
|
639
|
+
}
|
|
640
|
+
: {
|
|
641
|
+
_tag: "relation-collect-fields",
|
|
642
|
+
path: path as string,
|
|
643
|
+
fields,
|
|
644
|
+
distinct: true
|
|
605
645
|
}
|
|
606
646
|
})
|
|
607
647
|
|
|
@@ -76,6 +76,13 @@ export type ComputedProjectionIrExpression =
|
|
|
76
76
|
readonly distinct: boolean
|
|
77
77
|
readonly filter: readonly FilterResult[]
|
|
78
78
|
}
|
|
79
|
+
| {
|
|
80
|
+
readonly _tag: "relation-collect-fields"
|
|
81
|
+
readonly path: string
|
|
82
|
+
readonly fields: readonly string[]
|
|
83
|
+
readonly distinct: boolean
|
|
84
|
+
readonly filter: readonly FilterResult[]
|
|
85
|
+
}
|
|
79
86
|
|
|
80
87
|
type Result<TFieldValues extends FieldValues, A = TFieldValues, R = never> = {
|
|
81
88
|
filter: FilterResult[]
|
|
@@ -270,6 +277,17 @@ const interpret = <
|
|
|
270
277
|
filter
|
|
271
278
|
} as ComputedProjectionIrExpression
|
|
272
279
|
]
|
|
280
|
+
case "relation-collect-fields":
|
|
281
|
+
return [
|
|
282
|
+
key,
|
|
283
|
+
{
|
|
284
|
+
_tag: e._tag,
|
|
285
|
+
path: e.path,
|
|
286
|
+
fields: e.fields,
|
|
287
|
+
distinct: e.distinct,
|
|
288
|
+
filter
|
|
289
|
+
} as ComputedProjectionIrExpression
|
|
290
|
+
]
|
|
273
291
|
}
|
|
274
292
|
})
|
|
275
293
|
)
|
|
@@ -358,6 +358,18 @@ export function buildWhereCosmosQuery3(
|
|
|
358
358
|
}
|
|
359
359
|
return `ARRAY(SELECT VALUE ${fieldRef} FROM ${relationAlias} IN ${relationSource}${where}) AS ${key}`
|
|
360
360
|
}
|
|
361
|
+
case "relation-collect-fields": {
|
|
362
|
+
const subqueries = computed.fields.map((field) => {
|
|
363
|
+
const fieldRef = dottedToAccess(`${relationAlias}.${field}`)
|
|
364
|
+
return computed.distinct
|
|
365
|
+
? `ARRAY(SELECT DISTINCT VALUE ${fieldRef} FROM ${relationAlias} IN ${relationSource}${where})`
|
|
366
|
+
: `ARRAY(SELECT VALUE ${fieldRef} FROM ${relationAlias} IN ${relationSource}${where})`
|
|
367
|
+
})
|
|
368
|
+
const combined = computed.distinct
|
|
369
|
+
? subqueries.reduce((acc, sq) => `SetUnion(${acc}, ${sq})`)
|
|
370
|
+
: subqueries.reduce((acc, sq) => `ARRAY_CONCAT(${acc}, ${sq})`)
|
|
371
|
+
return `${combined} AS ${key}`
|
|
372
|
+
}
|
|
361
373
|
}
|
|
362
374
|
}
|
|
363
375
|
// with joins, you should use DISTINCT
|
package/src/Store/Memory.ts
CHANGED
|
@@ -48,6 +48,8 @@ const emptyValueFor = (tag: ComputedProjectionIrExpression["_tag"]) => {
|
|
|
48
48
|
return true
|
|
49
49
|
case "relation-collect":
|
|
50
50
|
return [] as unknown[]
|
|
51
|
+
case "relation-collect-fields":
|
|
52
|
+
return [] as unknown[]
|
|
51
53
|
default:
|
|
52
54
|
return assertUnreachable(tag)
|
|
53
55
|
}
|
|
@@ -136,6 +138,22 @@ const computeProjectionValue = (
|
|
|
136
138
|
}
|
|
137
139
|
return out
|
|
138
140
|
}
|
|
141
|
+
case "relation-collect-fields": {
|
|
142
|
+
const out: unknown[] = []
|
|
143
|
+
const seen = computed.distinct ? new Set<unknown>() : undefined
|
|
144
|
+
for (const value of relation) {
|
|
145
|
+
if (!matches(value)) continue
|
|
146
|
+
for (const field of computed.fields) {
|
|
147
|
+
const v = get(value, field)
|
|
148
|
+
if (seen) {
|
|
149
|
+
if (seen.has(v)) continue
|
|
150
|
+
seen.add(v)
|
|
151
|
+
}
|
|
152
|
+
out.push(v)
|
|
153
|
+
}
|
|
154
|
+
}
|
|
155
|
+
return out
|
|
156
|
+
}
|
|
139
157
|
default:
|
|
140
158
|
return assertUnreachable(computed)
|
|
141
159
|
}
|
package/src/Store/SQL/query.ts
CHANGED
|
@@ -469,6 +469,23 @@ export function buildWhereSQLQuery(
|
|
|
469
469
|
const aggArg = computed.distinct ? `DISTINCT ${fieldExtract}` : fieldExtract
|
|
470
470
|
return `(SELECT COALESCE(jsonb_agg(${aggArg}), '[]'::jsonb) FROM ${relationFrom}${whereClause()}) AS "${key}"`
|
|
471
471
|
}
|
|
472
|
+
case "relation-collect-fields": {
|
|
473
|
+
const branches = computed.fields.map((field) => {
|
|
474
|
+
const fieldExtract = dialect.jsonExtractElement(relationAlias, field)
|
|
475
|
+
return `SELECT ${fieldExtract} AS __v FROM ${relationFrom}${whereClause()}`
|
|
476
|
+
})
|
|
477
|
+
const unionQuery = branches.join(" UNION ALL ")
|
|
478
|
+
if (dialect.jsonColumnType === "JSON") {
|
|
479
|
+
if (computed.distinct) {
|
|
480
|
+
return `(SELECT COALESCE(json_group_array(__v), json_array()) FROM (SELECT DISTINCT __v FROM (${unionQuery}))) AS "${key}"`
|
|
481
|
+
}
|
|
482
|
+
return `(SELECT COALESCE(json_group_array(__v), json_array()) FROM (${unionQuery})) AS "${key}"`
|
|
483
|
+
}
|
|
484
|
+
if (computed.distinct) {
|
|
485
|
+
return `(SELECT COALESCE(jsonb_agg(__v), '[]'::jsonb) FROM (SELECT DISTINCT __v FROM (${unionQuery}) inner_q) outer_q) AS "${key}"`
|
|
486
|
+
}
|
|
487
|
+
return `(SELECT COALESCE(jsonb_agg(__v), '[]'::jsonb) FROM (${unionQuery}) t) AS "${key}"`
|
|
488
|
+
}
|
|
472
489
|
default:
|
|
473
490
|
return assertUnreachable(computed)
|
|
474
491
|
}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
|
-
import { Effect } from "effect-app"
|
|
1
|
+
import { Effect, Layer } from "effect-app"
|
|
2
2
|
import { HttpMiddleware, HttpServerRequest, HttpServerResponse } from "effect-app/http"
|
|
3
3
|
import { NonEmptyString255 } from "effect-app/Schema"
|
|
4
|
-
import { Locale, RequestContext } from "../../RequestContext.js"
|
|
5
|
-
import {
|
|
4
|
+
import { Locale, LocaleRef, RequestContext, spanAttributes } from "../../RequestContext.js"
|
|
5
|
+
import { ContextMapContainer } from "../../Store/ContextMapContainer.js"
|
|
6
|
+
import { storeId } from "../../Store/Memory.js"
|
|
6
7
|
|
|
7
8
|
export const RequestContextMiddleware = (defaultLocale: Locale = "en") =>
|
|
8
9
|
HttpMiddleware.make((app) =>
|
|
@@ -32,7 +33,16 @@ export const RequestContextMiddleware = (defaultLocale: Locale = "en") =>
|
|
|
32
33
|
namespace,
|
|
33
34
|
sourceId: deviceId ? NonEmptyString255(deviceId) : undefined
|
|
34
35
|
})
|
|
35
|
-
|
|
36
|
+
yield* Effect.annotateCurrentSpan(spanAttributes(requestContext))
|
|
37
|
+
const layer = Layer.mergeAll(
|
|
38
|
+
ContextMapContainer.layer,
|
|
39
|
+
Layer.succeed(LocaleRef, requestContext.locale),
|
|
40
|
+
Layer.succeed(storeId, requestContext.namespace)
|
|
41
|
+
)
|
|
42
|
+
const res = yield* app.pipe(
|
|
43
|
+
Effect.withLogSpan(requestContext.name),
|
|
44
|
+
Effect.provide(layer, { local: true })
|
|
45
|
+
)
|
|
36
46
|
|
|
37
47
|
// TODO: how to set also on errors?
|
|
38
48
|
return HttpServerResponse.setHeaders(res, {
|
package/src/api/routing.ts
CHANGED
|
@@ -505,7 +505,8 @@ export const makeRouter = <Live extends Layer.Layer<any, any, any> = Layer.Layer
|
|
|
505
505
|
"code.function.name": resource._tag,
|
|
506
506
|
"code.namespace": meta.moduleName,
|
|
507
507
|
"app.rpc.type": resource.type
|
|
508
|
-
}
|
|
508
|
+
},
|
|
509
|
+
sampled: false // we don't want it to appear on otel, just a way to quickly jump to src on error..
|
|
509
510
|
}, {
|
|
510
511
|
captureStackTrace: () => handler.stack // capturing the handler stack is the main reason why we are doing the span here
|
|
511
512
|
})
|
|
@@ -609,7 +610,6 @@ export const makeRouter = <Live extends Layer.Layer<any, any, any> = Layer.Layer
|
|
|
609
610
|
|
|
610
611
|
return RpcServer
|
|
611
612
|
.layerHttp({
|
|
612
|
-
spanPrefix: "RpcServer." + meta.moduleName,
|
|
613
613
|
group: rpcs,
|
|
614
614
|
path: ("/rpc/" + meta.moduleName) as `/${typeof meta.moduleName}`,
|
|
615
615
|
protocol: "http"
|