@effect-app/infra 2.61.1 → 2.61.3
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 +12 -0
- package/dist/Store/Cosmos/query.d.ts.map +1 -1
- package/dist/Store/Cosmos/query.js +4 -2
- package/dist/Store/codeFilter.d.ts.map +1 -1
- package/dist/Store/codeFilter.js +24 -12
- package/package.json +1 -1
- package/src/Store/Cosmos/query.ts +3 -1
- package/src/Store/codeFilter.ts +34 -17
- package/test/rawQuery.test.ts +33 -1
package/CHANGELOG.md
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAe,KAAK,qBAAqB,EAAQ,MAAM,YAAY,CAAA;AAGzF,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAEpD,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,eAAe,GAAG,SAAS,eAAe,EAAE,CAAA;KACpD,EAAE,CAAA;CACJ,qCAcA;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC,EACpF,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC,EACzE,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAe,KAAK,qBAAqB,EAAQ,MAAM,YAAY,CAAA;AAGzF,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAC5E,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,eAAe,CAAA;AAEpD,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAC1B,KAAK,EAAE,MAAM,CAAA;IACb,UAAU,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,KAAK,EAAE,eAAe,GAAG,SAAS,eAAe,EAAE,CAAA;KACpD,EAAE,CAAA;CACJ,qCAcA;AAED,wBAAgB,sBAAsB,CACpC,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,aAAa,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,EACtC,MAAM,CAAC,EAAE,qBAAqB,CAAC,MAAM,GAAG;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,SAAS,MAAM,EAAE,CAAA;CAAE,CAAC,EACpF,KAAK,CAAC,EAAE,qBAAqB,CAAC;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAA;CAAE,CAAC,EACzE,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;eAwLc,GAAG;;EAOhC"}
|
|
@@ -141,9 +141,11 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
|
|
|
141
141
|
? getValues(_.result)
|
|
142
142
|
: [_]);
|
|
143
143
|
const values = getValues(filter);
|
|
144
|
+
// with joins, you should use DISTINCT
|
|
145
|
+
// or you can end up with duplicates
|
|
144
146
|
return {
|
|
145
147
|
query: `
|
|
146
|
-
SELECT ${select
|
|
148
|
+
SELECT DISTINCT ${select
|
|
147
149
|
? `${select
|
|
148
150
|
.map((s) => typeof s === "string"
|
|
149
151
|
? s === idKey ? "f.id" : `f["${s}"]` // x["y"} vs x.y, helps with reserved keywords like "value"
|
|
@@ -173,4 +175,4 @@ export function buildWhereCosmosQuery3(idKey, filter, name, importedMarkerId, de
|
|
|
173
175
|
]
|
|
174
176
|
};
|
|
175
177
|
}
|
|
176
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
178
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/Cosmos/query.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAuD1C,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE,YAAY,OAAO,oBAE7D,GAAG,aAGjB,CAAA;
|
|
1
|
+
{"version":3,"file":"codeFilter.d.ts","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"AAEA,OAAO,EAAS,MAAM,EAAE,MAAM,YAAY,CAAA;AAE1C,OAAO,KAAK,EAAE,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAA;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,0BAA0B,CAAA;AAC3D,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,cAAc,CAAA;AAuD1C,eAAO,MAAM,mBAAmB,GAAI,CAAC,EAAE,GAAG,OAAO,EAAE,GAAG,CAAC,EAAE,YAAY,OAAO,oBAE7D,GAAG,aAGjB,CAAA;AAyBD,eAAO,MAAM,WAAW,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,MAAM,KAAK,CAAC,YAA6B,CAAA;AAwFtG,eAAO,MAAM,YAAY,GAAI,CAAC,EAAE,OAAO,SAAS,YAAY,EAAE,EAAE,KAAK,CAAC,KAAG,OAKxE,CAAA;AAED,wBAAgB,UAAU,CAAC,CAAC,SAAS,WAAW,EAAE,EAAE,SAAS,CAAC,EAAE,MAAM,EAAE,MAAM,IACpE,GAAG,CAAC,uCACb"}
|
package/dist/Store/codeFilter.js
CHANGED
|
@@ -59,14 +59,17 @@ export const codeFilterStatement = (p, x, isRelation) => {
|
|
|
59
59
|
}
|
|
60
60
|
return filterStatement(x, p);
|
|
61
61
|
};
|
|
62
|
-
const isRelationCheck = (f) => {
|
|
63
|
-
if (f.every((_) => "path" in _ && _.path.includes(".-1."))) {
|
|
62
|
+
const isRelationCheck = (f, isRelation) => {
|
|
63
|
+
if (f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.includes(".-1."))) {
|
|
64
64
|
const first = f[0];
|
|
65
65
|
const rel = first.path.split(".-1.")[0];
|
|
66
|
-
if (
|
|
66
|
+
if (isRelation && rel !== isRelation) {
|
|
67
|
+
throw new Error(`expected ${isRelation} relation but found ${rel}`);
|
|
68
|
+
}
|
|
69
|
+
if (!f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.startsWith(rel + ".-1."))) {
|
|
67
70
|
throw new Error(`Cannot mix relation checks of different props, expected all to be "${rel}"`);
|
|
68
71
|
}
|
|
69
|
-
return
|
|
72
|
+
return rel;
|
|
70
73
|
}
|
|
71
74
|
if (f.some((_) => "path" in _ && _.path.includes(".-1."))) {
|
|
72
75
|
throw new Error("Cannot mix relation checks with non-relation checks in the same filter scope. create a separate one");
|
|
@@ -74,7 +77,7 @@ const isRelationCheck = (f) => {
|
|
|
74
77
|
return false;
|
|
75
78
|
};
|
|
76
79
|
export const codeFilter3 = (state) => (sut) => codeFilter3_(state, sut);
|
|
77
|
-
const codeFilter3__ = (state, sut, statements, isRelation =
|
|
80
|
+
const codeFilter3__ = (state, sut, statements, isRelation = null) => {
|
|
78
81
|
let s = "";
|
|
79
82
|
let l = 0;
|
|
80
83
|
const printN = (n) => {
|
|
@@ -102,9 +105,12 @@ const codeFilter3__ = (state, sut, statements, isRelation = false) => {
|
|
|
102
105
|
break;
|
|
103
106
|
case "or-scope": {
|
|
104
107
|
++l;
|
|
105
|
-
|
|
108
|
+
const rel = isRelationCheck(e.result, isRelation);
|
|
109
|
+
if (rel) {
|
|
106
110
|
const rel = e.result[0].path.split(".-1.")[0];
|
|
107
|
-
s +=
|
|
111
|
+
s += isRelation
|
|
112
|
+
? ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
|
|
113
|
+
: ` || (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${printN(l)})`;
|
|
108
114
|
}
|
|
109
115
|
else {
|
|
110
116
|
s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
|
|
@@ -114,9 +120,12 @@ const codeFilter3__ = (state, sut, statements, isRelation = false) => {
|
|
|
114
120
|
}
|
|
115
121
|
case "and-scope": {
|
|
116
122
|
++l;
|
|
117
|
-
|
|
123
|
+
const rel = isRelationCheck(e.result, isRelation);
|
|
124
|
+
if (rel) {
|
|
118
125
|
const rel = e.result[0].path.split(".-1.")[0];
|
|
119
|
-
s +=
|
|
126
|
+
s += isRelation
|
|
127
|
+
? ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
|
|
128
|
+
: ` && (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${printN(l)})`;
|
|
120
129
|
}
|
|
121
130
|
else {
|
|
122
131
|
s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
|
|
@@ -126,9 +135,12 @@ const codeFilter3__ = (state, sut, statements, isRelation = false) => {
|
|
|
126
135
|
}
|
|
127
136
|
case "where-scope": {
|
|
128
137
|
// ;++l
|
|
129
|
-
|
|
138
|
+
const rel = isRelationCheck(e.result, isRelation);
|
|
139
|
+
if (rel) {
|
|
130
140
|
const rel = e.result[0].path.split(".-1.")[0];
|
|
131
|
-
s +=
|
|
141
|
+
s += isRelation
|
|
142
|
+
? `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
|
|
143
|
+
: `(\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${printN(l)})`;
|
|
132
144
|
}
|
|
133
145
|
else {
|
|
134
146
|
s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`;
|
|
@@ -149,4 +161,4 @@ export const codeFilter3_ = (state, sut) => {
|
|
|
149
161
|
export function codeFilter(filter) {
|
|
150
162
|
return (x) => codeFilter3_(filter, x) ? Option.some(x) : Option.none();
|
|
151
163
|
}
|
|
152
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"codeFilter.js","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"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"}
|
|
164
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"codeFilter.js","sourceRoot":"","sources":["../../src/Store/codeFilter.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -182,9 +182,11 @@ export function buildWhereCosmosQuery3(
|
|
|
182
182
|
: [_]
|
|
183
183
|
)
|
|
184
184
|
const values = getValues(filter)
|
|
185
|
+
// with joins, you should use DISTINCT
|
|
186
|
+
// or you can end up with duplicates
|
|
185
187
|
return {
|
|
186
188
|
query: `
|
|
187
|
-
SELECT ${
|
|
189
|
+
SELECT DISTINCT ${
|
|
188
190
|
select
|
|
189
191
|
? `${
|
|
190
192
|
select
|
package/src/Store/codeFilter.ts
CHANGED
|
@@ -66,16 +66,19 @@ export const codeFilterStatement = <E>(p: FilterR, x: E, isRelation: boolean) =>
|
|
|
66
66
|
return filterStatement(x, p)
|
|
67
67
|
}
|
|
68
68
|
|
|
69
|
-
const isRelationCheck = (f: readonly FilterResult[]) => {
|
|
70
|
-
if (f.every((_) => "path" in _ && _.path.includes(".-1."))) {
|
|
69
|
+
const isRelationCheck = (f: readonly FilterResult[], isRelation: string | null) => {
|
|
70
|
+
if (f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.includes(".-1."))) {
|
|
71
71
|
const first = f[0] as { path: string }
|
|
72
72
|
const rel = first.path.split(".-1.")[0]
|
|
73
|
-
if (
|
|
73
|
+
if (isRelation && rel !== isRelation) {
|
|
74
|
+
throw new Error(`expected ${isRelation} relation but found ${rel}`)
|
|
75
|
+
}
|
|
76
|
+
if (!f.filter((_) => "path" in _).every((_) => "path" in _ && _.path.startsWith(rel + ".-1."))) {
|
|
74
77
|
throw new Error(
|
|
75
78
|
`Cannot mix relation checks of different props, expected all to be "${rel}"`
|
|
76
79
|
)
|
|
77
80
|
}
|
|
78
|
-
return
|
|
81
|
+
return rel
|
|
79
82
|
}
|
|
80
83
|
if (f.some((_) => "path" in _ && _.path.includes(".-1."))) {
|
|
81
84
|
throw new Error(
|
|
@@ -87,7 +90,12 @@ const isRelationCheck = (f: readonly FilterResult[]) => {
|
|
|
87
90
|
}
|
|
88
91
|
|
|
89
92
|
export const codeFilter3 = <E>(state: readonly FilterResult[]) => (sut: E) => codeFilter3_(state, sut)
|
|
90
|
-
const codeFilter3__ = <E>(
|
|
93
|
+
const codeFilter3__ = <E>(
|
|
94
|
+
state: readonly FilterResult[],
|
|
95
|
+
sut: E,
|
|
96
|
+
statements: any[],
|
|
97
|
+
isRelation: string | null = null
|
|
98
|
+
): string => {
|
|
91
99
|
let s = ""
|
|
92
100
|
let l = 0
|
|
93
101
|
const printN = (n: number) => {
|
|
@@ -117,11 +125,14 @@ const codeFilter3__ = <E>(state: readonly FilterResult[], sut: E, statements: an
|
|
|
117
125
|
break
|
|
118
126
|
case "or-scope": {
|
|
119
127
|
++l
|
|
120
|
-
|
|
128
|
+
const rel = isRelationCheck(e.result, isRelation)
|
|
129
|
+
if (rel) {
|
|
121
130
|
const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
|
|
122
|
-
s +=
|
|
123
|
-
printN(l)
|
|
124
|
-
|
|
131
|
+
s += isRelation
|
|
132
|
+
? ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
|
|
133
|
+
: ` || (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${
|
|
134
|
+
printN(l)
|
|
135
|
+
})`
|
|
125
136
|
} else {
|
|
126
137
|
s += ` || (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`
|
|
127
138
|
}
|
|
@@ -130,11 +141,14 @@ const codeFilter3__ = <E>(state: readonly FilterResult[], sut: E, statements: an
|
|
|
130
141
|
}
|
|
131
142
|
case "and-scope": {
|
|
132
143
|
++l
|
|
133
|
-
|
|
144
|
+
const rel = isRelationCheck(e.result, isRelation)
|
|
145
|
+
if (rel) {
|
|
134
146
|
const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
|
|
135
|
-
s +=
|
|
136
|
-
printN(l)
|
|
137
|
-
|
|
147
|
+
s += isRelation
|
|
148
|
+
? ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
|
|
149
|
+
: ` && (\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${
|
|
150
|
+
printN(l)
|
|
151
|
+
})`
|
|
138
152
|
} else {
|
|
139
153
|
s += ` && (\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`
|
|
140
154
|
}
|
|
@@ -144,11 +158,14 @@ const codeFilter3__ = <E>(state: readonly FilterResult[], sut: E, statements: an
|
|
|
144
158
|
}
|
|
145
159
|
case "where-scope": {
|
|
146
160
|
// ;++l
|
|
147
|
-
|
|
161
|
+
const rel = isRelationCheck(e.result, isRelation)
|
|
162
|
+
if (rel) {
|
|
148
163
|
const rel = (e.result[0]! as { path: string }).path.split(".-1.")[0]
|
|
149
|
-
s +=
|
|
150
|
-
printN(l)
|
|
151
|
-
|
|
164
|
+
s += isRelation
|
|
165
|
+
? `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements, rel)}\n${printN(l)})`
|
|
166
|
+
: `(\n${printN(l + 1)}sut.${rel}.some(el => ${codeFilter3__(e.result, sut, statements, rel)})\n${
|
|
167
|
+
printN(l)
|
|
168
|
+
})`
|
|
152
169
|
} else {
|
|
153
170
|
s += `(\n${printN(l + 1)}${codeFilter3__(e.result, sut, statements)}\n${printN(l)})`
|
|
154
171
|
}
|
package/test/rawQuery.test.ts
CHANGED
|
@@ -159,7 +159,7 @@ describe("filter first-level array fields as groups", () => {
|
|
|
159
159
|
// TODO
|
|
160
160
|
cosmos: () => ({
|
|
161
161
|
query: `
|
|
162
|
-
SELECT
|
|
162
|
+
SELECT DISTINCT
|
|
163
163
|
f.name,
|
|
164
164
|
ARRAY (SELECT t.id,t["value"] FROM t in f.items) AS items
|
|
165
165
|
FROM Somethings f
|
|
@@ -201,6 +201,21 @@ describe("filter first-level array fields as groups", () => {
|
|
|
201
201
|
project(projected)
|
|
202
202
|
)
|
|
203
203
|
|
|
204
|
+
// mixing relation check with scoped relationcheck
|
|
205
|
+
const items3 = yield* repo.query(
|
|
206
|
+
where("items.-1.value", "gt", 20),
|
|
207
|
+
and(where("items.-1.description", "contains", "d item")),
|
|
208
|
+
project(projected)
|
|
209
|
+
)
|
|
210
|
+
|
|
211
|
+
// broken in cosmos db somehow... returns twice record 2??
|
|
212
|
+
// need to use DISTINCT..
|
|
213
|
+
// https://stackoverflow.com/questions/51855660/cosmos-db-joins-give-duplicate-results
|
|
214
|
+
const items4 = yield* repo.query(
|
|
215
|
+
where("items.-1.value", "gt", 10),
|
|
216
|
+
project(projected)
|
|
217
|
+
)
|
|
218
|
+
|
|
204
219
|
const expected = [
|
|
205
220
|
{
|
|
206
221
|
name: "Item 2",
|
|
@@ -213,6 +228,23 @@ describe("filter first-level array fields as groups", () => {
|
|
|
213
228
|
|
|
214
229
|
expect(items).toStrictEqual(expected)
|
|
215
230
|
expect(items2).toStrictEqual(expected)
|
|
231
|
+
expect(items3).toStrictEqual(expected)
|
|
232
|
+
expect(items4).toStrictEqual([
|
|
233
|
+
{
|
|
234
|
+
name: "Item 1",
|
|
235
|
+
items: [
|
|
236
|
+
{ id: "1-1", value: 10 },
|
|
237
|
+
{ id: "1-2", value: 20 }
|
|
238
|
+
]
|
|
239
|
+
},
|
|
240
|
+
{
|
|
241
|
+
name: "Item 2",
|
|
242
|
+
items: [
|
|
243
|
+
{ id: "2-1", value: 30 },
|
|
244
|
+
{ id: "2-2", value: 40 }
|
|
245
|
+
]
|
|
246
|
+
}
|
|
247
|
+
])
|
|
216
248
|
})
|
|
217
249
|
.pipe(setupRequestContextFromCurrent())
|
|
218
250
|
|