@effect-app/infra 0.31.1 → 0.32.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.
Files changed (31) hide show
  1. package/CHANGELOG.md +6 -0
  2. package/_cjs/filter.cjs +121 -3
  3. package/_cjs/filter.cjs.map +1 -1
  4. package/_cjs/services/Store/Cosmos.cjs +5 -2
  5. package/_cjs/services/Store/Cosmos.cjs.map +1 -1
  6. package/_cjs/services/Store/service.cjs.map +1 -1
  7. package/_cjs/services/Store/utils.cjs +13 -1
  8. package/_cjs/services/Store/utils.cjs.map +1 -1
  9. package/_src/filter.ts +123 -4
  10. package/_src/services/Store/Cosmos.ts +17 -1
  11. package/_src/services/Store/service.ts +10 -6
  12. package/_src/services/Store/utils.ts +33 -1
  13. package/dist/api/express/makeOpenApiSpecs.d.ts +1 -1
  14. package/dist/filter.d.ts +68 -2
  15. package/dist/filter.d.ts.map +1 -1
  16. package/dist/filter.js +88 -2
  17. package/dist/services/Store/Cosmos.d.ts +3 -3
  18. package/dist/services/Store/Cosmos.d.ts.map +1 -1
  19. package/dist/services/Store/Cosmos.js +24 -9
  20. package/dist/services/Store/service.d.ts +6 -1
  21. package/dist/services/Store/service.d.ts.map +1 -1
  22. package/dist/services/Store/service.js +1 -1
  23. package/dist/services/Store/utils.d.ts.map +1 -1
  24. package/dist/services/Store/utils.js +32 -4
  25. package/dist/services/simpledb/cosmosdb.d.ts +2 -2
  26. package/dist/services/simpledb/diskdb.d.ts +2 -2
  27. package/dist/services/simpledb/memdb.d.ts +2 -2
  28. package/dist/services/simpledb/mongodb.d.ts +2 -2
  29. package/dist/services/simpledb/redisdb.d.ts +2 -2
  30. package/dist/services/simpledb/simpledb.d.ts +3 -3
  31. package/package.json +1 -1
package/_src/services/Store/Cosmos.ts CHANGED
@@ -496,6 +496,14 @@ export function buildWhereCosmosQuery(
496
496
  ? `ARRAY_CONTAINS(@v${i}, ${x.f}.${x.key})`
497
497
  : x.t === "not-in"
498
498
  ? `(NOT ARRAY_CONTAINS(@v${i}, ${x.f}.${x.key}))`
499
+ : x.t === "lt"
500
+ ? `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} < ${lowerIfNeeded(`@v${i}`, x.value)}`
501
+ : x.t === "lte"
502
+ ? `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} <= ${lowerIfNeeded(`@v${i}`, x.value)}`
503
+ : x.t === "gt"
504
+ ? `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} > ${lowerIfNeeded(`@v${i}`, x.value)}`
505
+ : x.t === "gte"
506
+ ? `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} >= ${lowerIfNeeded(`@v${i}`, x.value)}`
499
507
  : x.t === "not-eq"
500
508
  ? x.value === null
501
509
  ? `IS_NULL(${x.f}.${x.key}) = false`
@@ -512,12 +520,20 @@ export function buildWhereCosmosQuery(
512
520
  ...filter.where
513
521
  .map((x, i) => ({
514
522
  name: `@v${i}`,
515
- value: x.value
523
+ value: isArray(x.value)
524
+ ? x.value.map(_ => _ instanceof Date ? _.toISOString() : _)
525
+ : x.value instanceof Date
526
+ ? x.value.toISOString()
527
+ : x.value
516
528
  }))
517
529
  ]
518
530
  }
519
531
  }
520
532
 
533
+ function isArray(t: SupportedValues | readonly SupportedValues[]): t is readonly SupportedValues[] {
534
+ return Array.isArray(t)
535
+ }
536
+
521
537
  const lowerIfNeeded = (key: unknown, value: unknown) => typeof value === "string" ? `LOWER(${key})` : `${key}`
522
538
 
523
539
  export function buildCosmosQuery<PM>(
package/_src/services/Store/service.ts CHANGED
@@ -12,14 +12,18 @@ export type StoreConfig<E> = {
12
12
  allowNamespace?: (namespace: string) => boolean
13
13
  }
14
14
 
15
- export type SupportedValues = string | boolean | number | null
15
+ export type SupportedValues = string | boolean | number | Date | null
16
+ export type SupportedValues2 = string | boolean | number | Date
16
17
 
17
18
  // default is eq
18
- export type Where = { key: string; t?: "eq" | "not-eq"; value: SupportedValues } | {
19
- key: string
20
- t: "in" | "not-in"
21
- value: readonly (SupportedValues)[]
22
- }
19
+ export type Where =
20
+ | { key: string; t?: "eq" | "not-eq"; value: SupportedValues }
21
+ | { key: string; t: "gt" | "lt" | "gte" | "lte"; value: SupportedValues2 }
22
+ | {
23
+ key: string
24
+ t: "in" | "not-in"
25
+ value: readonly (SupportedValues)[]
26
+ }
23
27
 
24
28
  // default is where
25
29
  export type StoreWhereFilter = {
package/_src/services/Store/utils.ts CHANGED
@@ -2,7 +2,7 @@ import { get } from "@effect-app/prelude/utils"
2
2
 
3
3
  import { OptimisticConcurrencyException } from "../../errors.js"
4
4
 
5
- import type { Filter, FilterJoinSelect, PersistenceModelType } from "./service.js"
5
+ import type { Filter, FilterJoinSelect, PersistenceModelType, SupportedValues2 } from "./service.js"
6
6
 
7
7
  import objectHash from "object-hash"
8
8
 
@@ -62,6 +62,14 @@ export function codeFilter<E extends { id: string }, NE extends E>(filter: Filte
62
62
  ? p.value.includes(get(x, p.key))
63
63
  : p.t === "not-in"
64
64
  ? !p.value.includes(get(x, p.key))
65
+ : p.t === "lt"
66
+ ? ltCaseInsensitive(get(x, p.key), p.value)
67
+ : p.t === "lte"
68
+ ? lteCaseInsensitive(get(x, p.key), p.value)
69
+ : p.t === "gt"
70
+ ? gtCaseInsensitive(get(x, p.key), p.value)
71
+ : p.t === "gte"
72
+ ? gteCaseInsensitive(get(x, p.key), p.value)
65
73
  : p.t === "not-eq"
66
74
  ? !compareCaseInsensitive(get(x, p.key), p.value)
67
75
  : compareCaseInsensitive(get(x, p.key), p.value)
@@ -124,3 +132,27 @@ function compareCaseInsensitive(valA: unknown, valB: unknown) {
124
132
  ? valA.toLowerCase() === valB.toLowerCase()
125
133
  : valA === valB
126
134
  }
135
+
136
+ function ltCaseInsensitive(valA: SupportedValues2, valB: SupportedValues2) {
137
+ return typeof valB === "string" && typeof valA === "string"
138
+ ? valA.toLowerCase() < valB.toLowerCase()
139
+ : valA < valB
140
+ }
141
+
142
+ function lteCaseInsensitive(valA: SupportedValues2, valB: SupportedValues2) {
143
+ return typeof valB === "string" && typeof valA === "string"
144
+ ? valA.toLowerCase() <= valB.toLowerCase()
145
+ : valA <= valB
146
+ }
147
+
148
+ function gtCaseInsensitive(valA: SupportedValues2, valB: SupportedValues2) {
149
+ return typeof valB === "string" && typeof valA === "string"
150
+ ? valA.toLowerCase() > valB.toLowerCase()
151
+ : valA > valB
152
+ }
153
+
154
+ function gteCaseInsensitive(valA: SupportedValues2, valB: SupportedValues2) {
155
+ return typeof valB === "string" && typeof valA === "string"
156
+ ? valA.toLowerCase() >= valB.toLowerCase()
157
+ : valA >= valB
158
+ }
package/dist/api/express/makeOpenApiSpecs.d.ts CHANGED
@@ -18,7 +18,7 @@ export declare function makeOpenApiSpecs(rdescs: Iterable<RouteDescriptorAny>, i
18
18
  version: string;
19
19
  };
20
20
  tags: never[];
21
- paths: Record<string, Record<"GET" | "POST" | "PUT" | "PATCH" | "DELETE", {
21
+ paths: Record<string, Record<"PATCH" | "GET" | "POST" | "PUT" | "DELETE", {
22
22
  [x: string]: {
23
23
  responses: any;
24
24
  tags: readonly string[] | undefined;
package/dist/filter.d.ts CHANGED
@@ -1,5 +1,6 @@
1
1
  import type { FieldValues } from "./filter/types/fields.js";
2
2
  import type { FieldPath } from "./filter/types/path/eager.js";
3
+ import type { SupportedValues } from "./services/Store.js";
3
4
  /**
4
5
  * the function defaults to "eq", but has additional properties for notEq, in and notIn
5
6
  */
@@ -29,18 +30,37 @@ declare function makeHelpers_<TFieldValues extends FieldValues>(): {
29
30
  value: V_3;
30
31
  t: "not-eq";
31
32
  };
33
+ gt<TFieldName_4 extends FieldPath<TFieldValues>, V_4 extends import("./filter/types/path/eager.js").PathValue<TFieldValues, TFieldName_4>>(this: void, path: TFieldName_4, value: V_4): {
34
+ key: TFieldName_4;
35
+ value: V_4;
36
+ t: "gt";
37
+ };
38
+ gte<TFieldName_5 extends FieldPath<TFieldValues>, V_5 extends import("./filter/types/path/eager.js").PathValue<TFieldValues, TFieldName_5>>(this: void, path: TFieldName_5, value: V_5): {
39
+ key: TFieldName_5;
40
+ value: V_5;
41
+ t: "gte";
42
+ };
43
+ lt<TFieldName_6 extends FieldPath<TFieldValues>, V_6 extends import("./filter/types/path/eager.js").PathValue<TFieldValues, TFieldName_6>>(this: void, path: TFieldName_6, value: V_6): {
44
+ key: TFieldName_6;
45
+ value: V_6;
46
+ t: "lt";
47
+ };
48
+ lte<TFieldName_7 extends FieldPath<TFieldValues>, V_7 extends import("./filter/types/path/eager.js").PathValue<TFieldValues, TFieldName_7>>(this: void, path: TFieldName_7, value: V_7): {
49
+ key: TFieldName_7;
50
+ value: V_7;
51
+ t: "lte";
52
+ };
32
53
  };
33
54
  declare function makeWhereFilter_<TFieldValues extends FieldValues>(): (<TFieldName extends import("./filter/types/path/eager.js").Path<TFieldValues>, V extends import("./filter/types/path/eager.js").PathValue<TFieldValues, TFieldName>>(this: void, path: TFieldName, value: V) => {
34
55
  key: TFieldName;
35
56
  value: V;
36
57
  t: "eq";
37
58
  }) & WhereHelpers<TFieldValues>;
38
- export type WhereValue<T extends "eq" | "not-eq" | "starts-with" | "ends-with" | "includes" | "contains" | "not-contains", A, // extends SupportedValues,
59
+ export type WhereValue<T extends "eq" | "not-eq" | "lt" | "gt" | "lte" | "gte" | "starts-with" | "ends-with" | "includes" | "contains" | "not-contains", A, // extends SupportedValues,
39
60
  V extends A = A> = {
40
61
  t: T;
41
62
  v: V;
42
63
  };
43
- type SupportedValues = string | boolean | number | null;
44
64
  export type WhereIn<T extends "in" | "not-in", V, Values extends readonly V[] = readonly V[]> = {
45
65
  t: T;
46
66
  v: Values;
@@ -71,6 +91,7 @@ export declare function $in<A extends SupportedValues, Values extends readonly A
71
91
  export declare function $notIn<A extends SupportedValues, Values extends readonly A[]>(_: A, ...v: Values): WhereIn<"not-in", A, Values>;
72
92
  /**
73
93
  * @tsplus fluent string $is
94
+ * @tsplus fluent Date $is
74
95
  * @tsplus fluent boolean $is
75
96
  * @tsplus fluent number $is
76
97
  * @tsplus fluent Object $is
@@ -79,14 +100,55 @@ export declare function $notIn<A extends SupportedValues, Values extends readonl
79
100
  export declare function $is<A, V extends A>(_: A, v: V): WhereValue<"eq", A, V>;
80
101
  /**
81
102
  * @tsplus fluent string $isnt
103
+ * @tsplus fluent Date $isnt
82
104
  * @tsplus fluent boolean $isnt
83
105
  * @tsplus fluent number $isnt
84
106
  * @tsplus fluent Object $isnt
85
107
  * @tsplus location "@effect-app/infra/filter"
86
108
  */
87
109
  export declare function $isnt<A, V extends A>(_: A, v: V): WhereValue<"not-eq", A, V>;
110
+ /**
111
+ * @tsplus fluent string $gt
112
+ * @tsplus fluent Date $gt
113
+ * @tsplus fluent boolean $gt
114
+ * @tsplus fluent number $gt
115
+ * @tsplus fluent Object $gt
116
+ * @tsplus location "@effect-app/infra/filter"
117
+ */
118
+ export declare function $gt<A, V extends A>(_: A, v: V): WhereValue<"gt", A, V>;
119
+ /**
120
+ * @tsplus fluent string $gte
121
+ * @tsplus fluent Date $gte
122
+ * @tsplus fluent boolean $gte
123
+ * @tsplus fluent number $gte
124
+ * @tsplus fluent Object $gte
125
+ * @tsplus location "@effect-app/infra/filter"
126
+ */
127
+ export declare function $gte<A, V extends A>(_: A, v: V): WhereValue<"gte", A, V>;
128
+ /**
129
+ * @tsplus fluent string $lt
130
+ * @tsplus fluent Date $lt
131
+ * @tsplus fluent boolean $lt
132
+ * @tsplus fluent number $lt
133
+ * @tsplus fluent Object $lt
134
+ * @tsplus location "@effect-app/infra/filter"
135
+ */
136
+ export declare function $lt<A, V extends A>(_: A, v: V): WhereValue<"lt", A, V>;
137
+ /**
138
+ * @tsplus fluent string $lte
139
+ * @tsplus fluent Date $lte
140
+ * @tsplus fluent boolean $lte
141
+ * @tsplus fluent number $lte
142
+ * @tsplus fluent Object $lte
143
+ * @tsplus location "@effect-app/infra/filter"
144
+ */
145
+ export declare function $lte<A, V extends A>(_: A, v: V): WhereValue<"lte", A, V>;
88
146
  declare function $is__<V extends A, A>(v: V): (_: A) => WhereValue<"eq", A, V>;
89
147
  declare function $isnt__<V extends A, A>(v: V): (_: A) => WhereValue<"not-eq", A, V>;
148
+ declare function $lt__<V extends A, A>(v: V): (_: A) => WhereValue<"lt", A, V>;
149
+ declare function $lte__<V extends A, A>(v: V): (_: A) => WhereValue<"lte", A, V>;
150
+ declare function $gt__<V extends A, A>(v: V): (_: A) => WhereValue<"gt", A, V>;
151
+ declare function $gte__<V extends A, A>(v: V): (_: A) => WhereValue<"gte", A, V>;
90
152
  declare function $in__<A extends SupportedValues, Values extends readonly A[]>(...v: Values): (_: A) => WhereIn<"in", A, [...Values]>;
91
153
  declare function $notIn__<A extends SupportedValues, Values extends readonly A[]>(...v: Values): (_: A) => WhereIn<"not-in", A, [...Values]>;
92
154
  export declare const Filters: {
@@ -94,6 +156,10 @@ export declare const Filters: {
94
156
  $isnt: typeof $isnt__;
95
157
  $in: typeof $in__;
96
158
  $notIn: typeof $notIn__;
159
+ $gt: typeof $gt__;
160
+ $gte: typeof $gte__;
161
+ $lt: typeof $lt__;
162
+ $lte: typeof $lte__;
97
163
  };
98
164
  /**
99
165
  * @tsplus fluent string $startsWith
package/dist/filter.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../_src/filter.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"filter.d.ts","sourceRoot":"","sources":["../_src/filter.ts"],"names":[],"mappings":"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"}
package/dist/filter.js CHANGED
@@ -2,6 +2,10 @@ export const $in = $in_1;
2
2
  export const $notIn = $notIn_1;
3
3
  export const $is = $is_1;
4
4
  export const $isnt = $isnt_1;
5
+ export const $gt = $gt_1;
6
+ export const $gte = $gte_1;
7
+ export const $lt = $lt_1;
8
+ export const $lte = $lte_1;
5
9
  export function makeWhereFilter() {
6
10
  const f = makeWhereFilter_();
7
11
  return f;
@@ -23,6 +27,18 @@ function makeHelpers_() {
23
27
  },
24
28
  notEq(path, value) {
25
29
  return { key: path, value, t: "not-eq" };
30
+ },
31
+ gt(path, value) {
32
+ return { key: path, value, t: "gt" };
33
+ },
34
+ gte(path, value) {
35
+ return { key: path, value, t: "gte" };
36
+ },
37
+ lt(path, value) {
38
+ return { key: path, value, t: "lt" };
39
+ },
40
+ lte(path, value) {
41
+ return { key: path, value, t: "lte" };
26
42
  }
27
43
  };
28
44
  }
@@ -61,6 +77,7 @@ function $notIn_1(_, ...v) {
61
77
  }
62
78
  /**
63
79
  * @tsplus fluent string $is
80
+ * @tsplus fluent Date $is
64
81
  * @tsplus fluent boolean $is
65
82
  * @tsplus fluent number $is
66
83
  * @tsplus fluent Object $is
@@ -70,6 +87,7 @@ function $is_1(_, v) {
70
87
  }
71
88
  /**
72
89
  * @tsplus fluent string $isnt
90
+ * @tsplus fluent Date $isnt
73
91
  * @tsplus fluent boolean $isnt
74
92
  * @tsplus fluent number $isnt
75
93
  * @tsplus fluent Object $isnt
@@ -77,12 +95,64 @@ function $is_1(_, v) {
77
95
  function $isnt_1(_, v) {
78
96
  return $$isnt(v);
79
97
  }
98
+ /**
99
+ * @tsplus fluent string $gt
100
+ * @tsplus fluent Date $gt
101
+ * @tsplus fluent boolean $gt
102
+ * @tsplus fluent number $gt
103
+ * @tsplus fluent Object $gt
104
+ */
105
+ function $gt_1(_, v) {
106
+ return $$gt(v);
107
+ }
108
+ /**
109
+ * @tsplus fluent string $gte
110
+ * @tsplus fluent Date $gte
111
+ * @tsplus fluent boolean $gte
112
+ * @tsplus fluent number $gte
113
+ * @tsplus fluent Object $gte
114
+ */
115
+ function $gte_1(_, v) {
116
+ return $$gte(v);
117
+ }
118
+ /**
119
+ * @tsplus fluent string $lt
120
+ * @tsplus fluent Date $lt
121
+ * @tsplus fluent boolean $lt
122
+ * @tsplus fluent number $lt
123
+ * @tsplus fluent Object $lt
124
+ */
125
+ function $lt_1(_, v) {
126
+ return $$lt(v);
127
+ }
128
+ /**
129
+ * @tsplus fluent string $lte
130
+ * @tsplus fluent Date $lte
131
+ * @tsplus fluent boolean $lte
132
+ * @tsplus fluent number $lte
133
+ * @tsplus fluent Object $lte
134
+ */
135
+ function $lte_1(_, v) {
136
+ return $$lte(v);
137
+ }
80
138
  function $is__(v) {
81
139
  return (_) => $is_1(_, v);
82
140
  }
83
141
  function $isnt__(v) {
84
142
  return (_) => $isnt_1(_, v);
85
143
  }
144
+ function $lt__(v) {
145
+ return (_) => $lt_1(_, v);
146
+ }
147
+ function $lte__(v) {
148
+ return (_) => $lte_1(_, v);
149
+ }
150
+ function $gt__(v) {
151
+ return (_) => $gt_1(_, v);
152
+ }
153
+ function $gte__(v) {
154
+ return (_) => $gte_1(_, v);
155
+ }
86
156
  function $in__(...v) {
87
157
  return (_) => $in_1(_, ...v);
88
158
  }
@@ -103,7 +173,11 @@ export const Filters = {
103
173
  $is: $is__,
104
174
  $isnt: $isnt__,
105
175
  $in: $in__,
106
- $notIn: $notIn__
176
+ $notIn: $notIn__,
177
+ $gt: $gt__,
178
+ $gte: $gte__,
179
+ $lt: $lt__,
180
+ $lte: $lte__
107
181
  // $contains: $contains__,
108
182
  // $notContains: $notContains__,
109
183
  };
@@ -137,6 +211,18 @@ function $$is(v) {
137
211
  function $$isnt(v) {
138
212
  return { t: "not-eq", v };
139
213
  }
214
+ function $$lt(v) {
215
+ return { t: "lt", v };
216
+ }
217
+ function $$lte(v) {
218
+ return { t: "lte", v };
219
+ }
220
+ function $$gt(v) {
221
+ return { t: "gt", v };
222
+ }
223
+ function $$gte(v) {
224
+ return { t: "gte", v };
225
+ }
140
226
  // containsAny, containsAll?
141
227
  function $$contains(v) {
142
228
  return { t: "contains", v };
@@ -168,4 +254,4 @@ export function makeFilters() {
168
254
  }
169
255
  return test;
170
256
  }
171
- //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6ImFBcUdnQixHQUFHO2FBWUgsTUFBTTthQWFOLEdBQUc7YUFTSCxLQUFLO0FBN0hyQixNQUFNLFVBQVUsZUFBZTtJQUM3QixNQUFNLENBQUMsR0FBRyxnQkFBZ0IsRUFBZ0IsQ0FBQTtJQUMxQyxPQUFPLENBQThCLENBQUE7QUFDdkMsQ0FBQztBQUVELFNBQVMsV0FBVztJQUNsQixNQUFNLE9BQU8sR0FBRyxZQUFZLEVBQWdCLENBQUE7SUFDNUMsT0FBTyxPQUFxQyxDQUFBO0FBQzlDLENBQUM7QUFJRCxTQUFTLFlBQVk7SUFJbkIsT0FBTztRQUNMLEVBQUUsQ0FFQSxJQUFnQixFQUNoQixLQUFtQjtZQUVuQixPQUFPLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLElBQWEsRUFBRSxDQUFBO1FBQy9DLENBQUM7UUFDRCxLQUFLLENBRUgsSUFBZ0IsRUFDaEIsS0FBbUI7WUFFbkIsT0FBTyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxRQUFpQixFQUFFLENBQUE7UUFDbkQsQ0FBQztRQUNELEVBQUUsQ0FFQSxJQUFnQixFQUNoQixLQUFRO1lBRVIsT0FBTyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxJQUFhLEVBQUUsQ0FBQTtRQUMvQyxDQUFDO1FBQ0QsS0FBSyxDQUVILElBQWdCLEVBQ2hCLEtBQVE7WUFFUixPQUFPLEVBQUUsR0FBRyxFQUFFLElBQUksRUFBRSxLQUFLLEVBQUUsQ0FBQyxFQUFFLFFBQWlCLEVBQUUsQ0FBQTtRQUNuRCxDQUFDO0tBQ2tELENBQUE7QUFDdkQsQ0FBQztBQUVELFNBQVMsZ0JBQWdCO0lBQ3ZCLE1BQU0sT0FBTyxHQUFHLFdBQVcsRUFBZ0IsQ0FBQTtJQUMzQyxNQUFNLENBQUMs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
257
+ //# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiZmlsdGVyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vX3NyYy9maWx0ZXIudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6ImFBMklnQixHQUFHO2FBWUgsTUFBTTthQWNOLEdBQUc7YUFVSCxLQUFLO2FBV0wsR0FBRzthQVdILElBQUk7YUFXSixHQUFHO2FBV0gsSUFBSTtBQWpOcEIsTUFBTSxVQUFVLGVBQWU7SUFDN0IsTUFBTSxDQUFDLEdBQUcsZ0JBQWdCLEVBQWdCLENBQUE7SUFDMUMsT0FBTyxDQUE4QixDQUFBO0FBQ3ZDLENBQUM7QUFFRCxTQUFTLFdBQVc7SUFDbEIsTUFBTSxPQUFPLEdBQUcsWUFBWSxFQUFnQixDQUFBO0lBQzVDLE9BQU8sT0FBcUMsQ0FBQTtBQUM5QyxDQUFDO0FBSUQsU0FBUyxZQUFZO0lBSW5CLE9BQU87UUFDTCxFQUFFLENBRUEsSUFBZ0IsRUFDaEIsS0FBbUI7WUFFbkIsT0FBTyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxJQUFhLEVBQUUsQ0FBQTtRQUMvQyxDQUFDO1FBQ0QsS0FBSyxDQUVILElBQWdCLEVBQ2hCLEtBQW1CO1lBRW5CLE9BQU8sRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsUUFBaUIsRUFBRSxDQUFBO1FBQ25ELENBQUM7UUFDRCxFQUFFLENBRUEsSUFBZ0IsRUFDaEIsS0FBUTtZQUVSLE9BQU8sRUFBRSxHQUFHLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUUsSUFBYSxFQUFFLENBQUE7UUFDL0MsQ0FBQztRQUNELEtBQUssQ0FFSCxJQUFnQixFQUNoQixLQUFRO1lBRVIsT0FBTyxFQUFFLEdBQUcsRUFBRSxJQUFJLEVBQUUsS0FBSyxFQUFFLENBQUMsRUFBRSxRQUFpQixFQUFFLENBQUE7UUFDbkQsQ0FBQztRQUNELEVBQUUsQ0FFQSxJQUFnQixFQUNoQixLQUFRO1lBRVIsT0FBTyxFQUFFLEdBQUcs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
package/dist/services/Store/Cosmos.d.ts CHANGED
@@ -2,7 +2,7 @@ import { Effect } from "@effect/io/Effect";
2
2
  import { NonEmptyReadonlyArray } from "@effect/data/ReadonlyArray";
3
3
  import { Config } from "@effect/io/Config";
4
4
  import * as CosmosClient from "@effect-app/infra-adapters/cosmos-client";
5
- import type { FilterJoinSelect, JoinFindFilter, LegacyFilter, PersistenceModelType, StorageConfig, Store, StoreConfig, StoreWhereFilter, SupportedValues } from "./service.js";
5
+ import type { FilterJoinSelect, JoinFindFilter, LegacyFilter, PersistenceModelType, StorageConfig, Store, StoreConfig, StoreWhereFilter } from "./service.js";
6
6
  import { StoreMaker } from "./service.js";
7
7
  export declare function makeCosmosStore({ prefix }: StorageConfig): import("@effect/io/Effect").Effect<CosmosClient.CosmosClient, never, {
8
8
  make: <Id extends string, PM extends PersistenceModelType<Id>, Id2 extends Id>(name: string, seed?: import("@effect/io/Effect").Effect<never, never, ReadonlyMap<Id2, PM>> | undefined, config?: StoreConfig<PM> | undefined) => import("@effect/io/Effect").Effect<never, never, Store<PM, Id>>;
@@ -41,14 +41,14 @@ export declare function buildWhereCosmosQuery(filter: StoreWhereFilter, name: st
41
41
  query: string;
42
42
  parameters: {
43
43
  name: string;
44
- value: SupportedValues | readonly SupportedValues[];
44
+ value: string | number | boolean | (string | number | boolean | null)[] | null;
45
45
  }[];
46
46
  };
47
47
  export declare function buildCosmosQuery<PM>(filter: LegacyFilter<PM> | StoreWhereFilter, name: string, importedMarkerId: string, skip?: number, limit?: number): {
48
48
  query: string;
49
49
  parameters: {
50
50
  name: string;
51
- value: SupportedValues | readonly SupportedValues[];
51
+ value: string | number | boolean | (string | number | boolean | null)[] | null;
52
52
  }[];
53
53
  };
54
54
  export declare function CosmosStoreLive(config: Config<StorageConfig>): import("@effect/io/Layer").Layer<CosmosClient.CosmosClient, import("@effect/io/Config/Error").ConfigError, StoreMaker>;
package/dist/services/Store/Cosmos.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"Cosmos.d.ts","sourceRoot":"","sources":["../../../_src/services/Store/Cosmos.ts"],"names":[],"mappings":";;;AAEA,OAAO,KAAK,YAAY,MAAM,0CAA0C,CAAA;AAMxE,OAAO,KAAK,EAEV,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,KAAK,EACL,WAAW,EACX,gBAAgB,EAChB,eAAe,EAChB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa;yFAK3C,MAAM;GA+UnB;AAuBD;;GAEG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,gBAAgB,EACxB,CAAC,EAAE,MAAM,EACT,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAaf;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,cAAc,EACtB,CAAC,EAAE,MAAM,EACT,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAYf;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EACvC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,EACxB,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAyBf;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EA+Cf;AAID,wBAAgB,gBAAgB,CAAC,EAAE,EACjC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,gBAAgB,EAC3C,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAOf;AAKD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,0HAE5D"}
1
+ {"version":3,"file":"Cosmos.d.ts","sourceRoot":"","sources":["../../../_src/services/Store/Cosmos.ts"],"names":[],"mappings":";;;AAEA,OAAO,KAAK,YAAY,MAAM,0CAA0C,CAAA;AAMxE,OAAO,KAAK,EAEV,gBAAgB,EAChB,cAAc,EACd,YAAY,EACZ,oBAAoB,EACpB,aAAa,EACb,KAAK,EACL,WAAW,EACX,gBAAgB,EAEjB,MAAM,cAAc,CAAA;AACrB,OAAO,EAAE,UAAU,EAAE,MAAM,cAAc,CAAA;AAGzC,wBAAgB,eAAe,CAAC,EAAE,MAAM,EAAE,EAAE,aAAa;yFAK3C,MAAM;GA+UnB;AAuBD;;GAEG;AACH,wBAAgB,gCAAgC,CAC9C,MAAM,EAAE,gBAAgB,EACxB,CAAC,EAAE,MAAM,EACT,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAaf;AAED;;GAEG;AACH,wBAAgB,wBAAwB,CACtC,MAAM,EAAE,cAAc,EACtB,CAAC,EAAE,MAAM,EACT,IAAI,EAAE,MAAM,EACZ,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAYf;AAED;;GAEG;AACH,wBAAgB,sBAAsB,CAAC,EAAE,EACvC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,EACxB,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAyBf;AAED,wBAAgB,qBAAqB,CACnC,MAAM,EAAE,gBAAgB,EACxB,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EA2Df;AAQD,wBAAgB,gBAAgB,CAAC,EAAE,EACjC,MAAM,EAAE,YAAY,CAAC,EAAE,CAAC,GAAG,gBAAgB,EAC3C,IAAI,EAAE,MAAM,EACZ,gBAAgB,EAAE,MAAM,EACxB,IAAI,CAAC,EAAE,MAAM,EACb,KAAK,CAAC,EAAE,MAAM;;;;;;EAOf;AAKD,wBAAgB,eAAe,CAAC,MAAM,EAAE,MAAM,CAAC,aAAa,CAAC,0HAE5D"}
package/dist/services/Store/Cosmos.js CHANGED
@@ -278,13 +278,21 @@ export function buildWhereCosmosQuery(filter, name, importedMarkerId, skip, limi
278
278
  ? `ARRAY_CONTAINS(@v${i}, ${x.f}.${x.key})`
279
279
  : x.t === "not-in"
280
280
  ? `(NOT ARRAY_CONTAINS(@v${i}, ${x.f}.${x.key}))`
281
- : x.t === "not-eq"
282
- ? x.value === null
283
- ? `IS_NULL(${x.f}.${x.key}) = false`
284
- : `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} <> ${lowerIfNeeded(`@v${i}`, x.value)}`
285
- : x.value === null
286
- ? `IS_NULL(${x.f}.${x.key}) = true`
287
- : `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} = ${lowerIfNeeded(`@v${i}`, x.value)}`)
281
+ : x.t === "lt"
282
+ ? `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} < ${lowerIfNeeded(`@v${i}`, x.value)}`
283
+ : x.t === "lte"
284
+ ? `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} <= ${lowerIfNeeded(`@v${i}`, x.value)}`
285
+ : x.t === "gt"
286
+ ? `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} > ${lowerIfNeeded(`@v${i}`, x.value)}`
287
+ : x.t === "gte"
288
+ ? `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} >= ${lowerIfNeeded(`@v${i}`, x.value)}`
289
+ : x.t === "not-eq"
290
+ ? x.value === null
291
+ ? `IS_NULL(${x.f}.${x.key}) = false`
292
+ : `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} <> ${lowerIfNeeded(`@v${i}`, x.value)}`
293
+ : x.value === null
294
+ ? `IS_NULL(${x.f}.${x.key}) = true`
295
+ : `${lowerIfNeeded(`${x.f}.${x.key}`, x.value)} = ${lowerIfNeeded(`@v${i}`, x.value)}`)
288
296
  .join(filter.mode === "or" ? " OR " : " AND ")}
289
297
  ${lm}`,
290
298
  parameters: [
@@ -292,11 +300,18 @@ export function buildWhereCosmosQuery(filter, name, importedMarkerId, skip, limi
292
300
  ...filter.where
293
301
  .map((x, i) => ({
294
302
  name: `@v${i}`,
295
- value: x.value
303
+ value: isArray(x.value)
304
+ ? x.value.map(_ => _ instanceof Date ? _.toISOString() : _)
305
+ : x.value instanceof Date
306
+ ? x.value.toISOString()
307
+ : x.value
296
308
  }))
297
309
  ]
298
310
  };
299
311
  }
312
+ function isArray(t) {
313
+ return Array.isArray(t);
314
+ }
300
315
  const lowerIfNeeded = (key, value) => typeof value === "string" ? `LOWER(${key})` : `${key}`;
301
316
  export function buildCosmosQuery(filter, name, importedMarkerId, skip, limit) {
302
317
  return filter.type === "startsWith" ||
@@ -313,4 +328,4 @@ class CosmosDbOperationError {
313
328
  export function CosmosStoreLive(config) {
314
329
  return tsplus_module_1.toLayer(tsplus_module_1.flatMap(tsplus_module_1.config(config), makeCosmosStore), StoreMaker);
315
330
  }
316
- //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../../_src/services/Store/Cosmos.ts"],"names":[],"mappings":"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"}
331
+ //# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Cosmos.js","sourceRoot":"","sources":["../../../_src/services/Store/Cosmos.ts"],"names":[],"mappings":"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"}
package/dist/services/Store/service.d.ts CHANGED
@@ -13,11 +13,16 @@ export type StoreConfig<E> = {
13
13
  partitionValue: (e: E) => string | undefined;
14
14
  allowNamespace?: (namespace: string) => boolean;
15
15
  };
16
- export type SupportedValues = string | boolean | number | null;
16
+ export type SupportedValues = string | boolean | number | Date | null;
17
+ export type SupportedValues2 = string | boolean | number | Date;
17
18
  export type Where = {
18
19
  key: string;
19
20
  t?: "eq" | "not-eq";
20
21
  value: SupportedValues;
22
+ } | {
23
+ key: string;
24
+ t: "gt" | "lt" | "gte" | "lte";
25
+ value: SupportedValues2;
21
26
  } | {
22
27
  key: string;
23
28
  t: "in" | "not-in";