@effect-app/infra 4.0.0-beta.101 → 4.0.0-beta.103
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +14 -0
- package/dist/CUPS.d.ts +1 -1
- package/dist/Emailer/Sendgrid.d.ts +16 -16
- package/dist/Model/query/new-kid-interpreter.d.ts +2 -2
- package/dist/Operations.d.ts +1 -1
- package/dist/Store/SQL/query.d.ts +1 -0
- package/dist/Store/SQL/query.d.ts.map +1 -1
- package/dist/Store/SQL/query.js +10 -5
- package/dist/api/internal/auth.d.ts +1 -1
- package/package.json +2 -2
- package/src/Store/SQL/query.ts +11 -4
- package/test/dist/fixtures.d.ts +1 -1
- package/test/sql-store.test.ts +288 -0
package/CHANGELOG.md
CHANGED
|
@@ -1,5 +1,19 @@
|
|
|
1
1
|
# @effect-app/infra
|
|
2
2
|
|
|
3
|
+
## 4.0.0-beta.103
|
|
4
|
+
|
|
5
|
+
### Patch Changes
|
|
6
|
+
|
|
7
|
+
- Updated dependencies [7119320]
|
|
8
|
+
- effect-app@4.0.0-beta.103
|
|
9
|
+
|
|
10
|
+
## 4.0.0-beta.102
|
|
11
|
+
|
|
12
|
+
### Patch Changes
|
|
13
|
+
|
|
14
|
+
- 62627e9: Fix boolean handling in SQL SELECT and WHERE
|
|
15
|
+
- effect-app@4.0.0-beta.102
|
|
16
|
+
|
|
3
17
|
## 4.0.0-beta.101
|
|
4
18
|
|
|
5
19
|
### Patch Changes
|
package/dist/CUPS.d.ts
CHANGED
|
@@ -3,7 +3,7 @@ import { Config, Context, Effect, Layer, Option, S } from "effect-app";
|
|
|
3
3
|
export declare const PrinterId: S.WithDefaults<S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">> & S.brand<import("effect/Schema").NonEmptyString, "NonEmptyString" | "NonEmptyString64k" | "NonEmptyString2k" | "NonEmptyString255">;
|
|
4
4
|
export type PrinterId = S.NonEmptyString255;
|
|
5
5
|
export declare const prepareTempDir: Effect.Effect<void, never, never>;
|
|
6
|
-
export declare const makePrintJobTempFile: (data: string |
|
|
6
|
+
export declare const makePrintJobTempFile: (data: string | NodeJS.ArrayBufferView<ArrayBufferLike> | Iterable<string | NodeJS.ArrayBufferView<ArrayBufferLike>> | AsyncIterable<string | NodeJS.ArrayBufferView<ArrayBufferLike>> | import("node:stream"), options?: FileOptions) => Effect.Effect<string, import("effect/Cause").UnknownError, import("effect/Scope").Scope>;
|
|
7
7
|
export declare const makePrintJobTempFileArrayBuffer: (buffer: ArrayBuffer, options?: FileOptions) => Effect.Effect<string, import("effect/Cause").UnknownError, import("effect/Scope").Scope>;
|
|
8
8
|
export declare const CUPSConfig: Config.Config<{
|
|
9
9
|
server: Option.Option<import("node:url").URL>;
|
|
@@ -10,6 +10,10 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
10
10
|
to: EmailData | EmailData[];
|
|
11
11
|
cc: EmailData | EmailData[];
|
|
12
12
|
bcc: EmailData | EmailData[];
|
|
13
|
+
attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
|
|
14
|
+
headers?: {
|
|
15
|
+
[key: string]: string;
|
|
16
|
+
};
|
|
13
17
|
replyTo?: EmailData;
|
|
14
18
|
sendAt?: number;
|
|
15
19
|
subject?: string;
|
|
@@ -17,15 +21,11 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
17
21
|
html?: string;
|
|
18
22
|
templateId?: string;
|
|
19
23
|
personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
|
|
20
|
-
attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
|
|
21
24
|
ipPoolName?: string;
|
|
22
25
|
batchId?: string;
|
|
23
26
|
sections?: {
|
|
24
27
|
[key: string]: string;
|
|
25
28
|
};
|
|
26
|
-
headers?: {
|
|
27
|
-
[key: string]: string;
|
|
28
|
-
};
|
|
29
29
|
categories?: string[];
|
|
30
30
|
category?: string;
|
|
31
31
|
customArgs?: {
|
|
@@ -49,6 +49,10 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
49
49
|
to: EmailData | EmailData[];
|
|
50
50
|
cc: EmailData | EmailData[];
|
|
51
51
|
bcc: EmailData | EmailData[];
|
|
52
|
+
attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
|
|
53
|
+
headers?: {
|
|
54
|
+
[key: string]: string;
|
|
55
|
+
};
|
|
52
56
|
replyTo?: EmailData;
|
|
53
57
|
sendAt?: number;
|
|
54
58
|
subject?: string;
|
|
@@ -56,15 +60,11 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
56
60
|
html: string;
|
|
57
61
|
templateId?: string;
|
|
58
62
|
personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
|
|
59
|
-
attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
|
|
60
63
|
ipPoolName?: string;
|
|
61
64
|
batchId?: string;
|
|
62
65
|
sections?: {
|
|
63
66
|
[key: string]: string;
|
|
64
67
|
};
|
|
65
|
-
headers?: {
|
|
66
|
-
[key: string]: string;
|
|
67
|
-
};
|
|
68
68
|
categories?: string[];
|
|
69
69
|
category?: string;
|
|
70
70
|
customArgs?: {
|
|
@@ -88,6 +88,10 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
88
88
|
to: EmailData | EmailData[];
|
|
89
89
|
cc: EmailData | EmailData[];
|
|
90
90
|
bcc: EmailData | EmailData[];
|
|
91
|
+
attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
|
|
92
|
+
headers?: {
|
|
93
|
+
[key: string]: string;
|
|
94
|
+
};
|
|
91
95
|
replyTo?: EmailData;
|
|
92
96
|
sendAt?: number;
|
|
93
97
|
subject?: string;
|
|
@@ -95,15 +99,11 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
95
99
|
html?: string;
|
|
96
100
|
templateId: string;
|
|
97
101
|
personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
|
|
98
|
-
attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
|
|
99
102
|
ipPoolName?: string;
|
|
100
103
|
batchId?: string;
|
|
101
104
|
sections?: {
|
|
102
105
|
[key: string]: string;
|
|
103
106
|
};
|
|
104
|
-
headers?: {
|
|
105
|
-
[key: string]: string;
|
|
106
|
-
};
|
|
107
107
|
categories?: string[];
|
|
108
108
|
category?: string;
|
|
109
109
|
customArgs?: {
|
|
@@ -127,6 +127,10 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
127
127
|
to: EmailData | EmailData[];
|
|
128
128
|
cc: EmailData | EmailData[];
|
|
129
129
|
bcc: EmailData | EmailData[];
|
|
130
|
+
attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
|
|
131
|
+
headers?: {
|
|
132
|
+
[key: string]: string;
|
|
133
|
+
};
|
|
130
134
|
replyTo?: EmailData;
|
|
131
135
|
sendAt?: number;
|
|
132
136
|
subject?: string;
|
|
@@ -134,15 +138,11 @@ export declare function renderMessage(forceFake: boolean): (msg: EmailMsg) => {
|
|
|
134
138
|
html?: string;
|
|
135
139
|
templateId?: string;
|
|
136
140
|
personalizations?: import("@sendgrid/helpers/classes/personalization.js").PersonalizationData[];
|
|
137
|
-
attachments?: import("@sendgrid/helpers/classes/attachment.js").AttachmentData[];
|
|
138
141
|
ipPoolName?: string;
|
|
139
142
|
batchId?: string;
|
|
140
143
|
sections?: {
|
|
141
144
|
[key: string]: string;
|
|
142
145
|
};
|
|
143
|
-
headers?: {
|
|
144
|
-
[key: string]: string;
|
|
145
|
-
};
|
|
146
146
|
categories?: string[];
|
|
147
147
|
category?: string;
|
|
148
148
|
customArgs?: {
|
|
@@ -21,8 +21,8 @@ export declare const toFilter: <TFieldValues extends FieldValues, A, R, TFieldVa
|
|
|
21
21
|
key: import("../filter/types/path/eager.js").Path<TFieldValues>;
|
|
22
22
|
direction: "ASC" | "DESC";
|
|
23
23
|
}[]];
|
|
24
|
-
ttype: "
|
|
25
|
-
mode: "
|
|
24
|
+
ttype: "many" | "one" | "count";
|
|
25
|
+
mode: "collect" | "project" | "transform";
|
|
26
26
|
filter: FilterResult[];
|
|
27
27
|
};
|
|
28
28
|
//# sourceMappingURL=new-kid-interpreter.d.ts.map
|
package/dist/Operations.d.ts
CHANGED
|
@@ -37,7 +37,7 @@ declare const Operations_base: Context.OpaqueClass<Operations, "effect-app/Opera
|
|
|
37
37
|
all: Effect.Effect<Operation[], never, never>;
|
|
38
38
|
find: (id: OperationId) => Effect.Effect<Option.Option<Operation>, never, never>;
|
|
39
39
|
update: (id: OperationId, progress: OperationProgress) => Effect.Effect<void, never, never>;
|
|
40
|
-
}, never,
|
|
40
|
+
}, never, OperationsRepo | RequestFiberSet>;
|
|
41
41
|
};
|
|
42
42
|
export declare class Operations extends Operations_base {
|
|
43
43
|
private static readonly CleanupLive;
|
|
@@ -17,6 +17,7 @@ export interface SQLDialect {
|
|
|
17
17
|
readonly jsonEachFrom: (arrPath: string, alias: string) => string;
|
|
18
18
|
readonly jsonExtractElement: (alias: string, subPath: string) => string;
|
|
19
19
|
readonly serializeJsonValue: (v: unknown) => unknown;
|
|
20
|
+
readonly serializeScalar: (v: unknown) => unknown;
|
|
20
21
|
}
|
|
21
22
|
export declare const sqliteDialect: SQLDialect;
|
|
22
23
|
export declare const pgDialect: SQLDialect;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAG/D,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAG5E,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,QAAQ,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAClD,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/C,QAAQ,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/E,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAClF,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IAC9F,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IACjG,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IAC9F,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IACjG,QAAQ,CAAC,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9E,QAAQ,CAAC,sBAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IACjF,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,QAAQ,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IACjE,QAAQ,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAA;IACvE,QAAQ,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;
|
|
1
|
+
{"version":3,"file":"query.d.ts","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,qBAAqB,EAAE,MAAM,YAAY,CAAA;AAG/D,OAAO,KAAK,EAAW,YAAY,EAAE,MAAM,iCAAiC,CAAA;AAG5E,MAAM,WAAW,UAAU;IACzB,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,QAAQ,CAAC,eAAe,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAClD,QAAQ,CAAC,WAAW,EAAE,CAAC,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/C,QAAQ,CAAC,iBAAiB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAC/E,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAClF,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IAC9F,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IACjG,QAAQ,CAAC,oBAAoB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IAC9F,QAAQ,CAAC,uBAAuB,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,eAAe,EAAE,SAAS,MAAM,EAAE,KAAK,MAAM,CAAA;IACjG,QAAQ,CAAC,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9E,QAAQ,CAAC,sBAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,EAAE,cAAc,EAAE,MAAM,KAAK,MAAM,CAAA;IACjF,QAAQ,CAAC,cAAc,EAAE,MAAM,GAAG,OAAO,CAAA;IACzC,QAAQ,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,MAAM,KAAK,MAAM,CAAA;IAC9C,QAAQ,CAAC,YAAY,EAAE,CAAC,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,MAAM,CAAA;IACjE,QAAQ,CAAC,kBAAkB,EAAE,CAAC,KAAK,EAAE,MAAM,EAAE,OAAO,EAAE,MAAM,KAAK,MAAM,CAAA;IACvE,QAAQ,CAAC,kBAAkB,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;IACpD,QAAQ,CAAC,eAAe,EAAE,CAAC,CAAC,EAAE,OAAO,KAAK,OAAO,CAAA;CAClD;AAED,eAAO,MAAM,aAAa,EAAE,UA4B3B,CAAA;AAED,eAAO,MAAM,SAAS,EAAE,UA2EvB,CAAA;AAED,wBAAgB,QAAQ,CAAC,CAAC,EAAE;IAAE,GAAG,EAAE,MAAM,CAAC;IAAC,MAAM,EAAE,OAAO,EAAE,CAAA;CAAE,qCAO7D;AAQD,wBAAgB,kBAAkB,CAChC,OAAO,EAAE,UAAU,EACnB,KAAK,EAAE,WAAW,EAClB,MAAM,EAAE,SAAS,YAAY,EAAE,EAC/B,SAAS,EAAE,MAAM,EACjB,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;;;EA0Pf"}
|
package/dist/Store/SQL/query.js
CHANGED
|
@@ -5,7 +5,7 @@ import { InfraLogger } from "../../logger.js";
|
|
|
5
5
|
import { isRelationCheck } from "../codeFilter.js";
|
|
6
6
|
export const sqliteDialect = {
|
|
7
7
|
jsonExtract: (path) => `json_extract(data, '$.${path}')`,
|
|
8
|
-
jsonExtractJson: (path) => `json_quote(json_extract(data, '$.${path}'))`,
|
|
8
|
+
jsonExtractJson: (path) => `CASE json_type(data, '$.${path}') WHEN 'true' THEN 'true' WHEN 'false' THEN 'false' ELSE json_quote(json_extract(data, '$.${path}')) END`,
|
|
9
9
|
placeholder: (_index) => "?",
|
|
10
10
|
jsonArrayContains: (arrPath, val) => `EXISTS(SELECT 1 FROM json_each(data, '$.${arrPath}') WHERE value = ${val})`,
|
|
11
11
|
jsonArrayNotContains: (arrPath, val) => `NOT EXISTS(SELECT 1 FROM json_each(data, '$.${arrPath}') WHERE value = ${val})`,
|
|
@@ -19,7 +19,10 @@ export const sqliteDialect = {
|
|
|
19
19
|
arrayLength: (path) => `json_array_length(data, '$.${path}')`,
|
|
20
20
|
jsonEachFrom: (arrPath, alias) => `json_each(data, '$.${arrPath}') AS ${alias}`,
|
|
21
21
|
jsonExtractElement: (alias, subPath) => `json_extract(${alias}.value, '$.${subPath}')`,
|
|
22
|
-
serializeJsonValue: (v) => v
|
|
22
|
+
serializeJsonValue: (v) => v,
|
|
23
|
+
// SQLite stores JSON booleans as integers (0/1) and better-sqlite3 refuses
|
|
24
|
+
// to bind JS booleans, so coerce them to integers for WHERE params.
|
|
25
|
+
serializeScalar: (v) => typeof v === "boolean" ? (v ? 1 : 0) : v
|
|
23
26
|
};
|
|
24
27
|
export const pgDialect = {
|
|
25
28
|
jsonExtract: (path) => {
|
|
@@ -96,7 +99,9 @@ export const pgDialect = {
|
|
|
96
99
|
const last = parts.pop();
|
|
97
100
|
return `${alias}${parts.map((p) => `->'${p}'`).join("")}->>'${last}'`;
|
|
98
101
|
},
|
|
99
|
-
serializeJsonValue: (v) => JSON.stringify(v)
|
|
102
|
+
serializeJsonValue: (v) => JSON.stringify(v),
|
|
103
|
+
// PG's ->> operator yields text, so compare booleans as 'true'/'false' text.
|
|
104
|
+
serializeScalar: (v) => typeof v === "boolean" ? (v ? "true" : "false") : v
|
|
100
105
|
};
|
|
101
106
|
export function logQuery(q) {
|
|
102
107
|
return InfraLogger
|
|
@@ -114,7 +119,7 @@ export function buildWhereSQLQuery(dialect, idKey, filter, tableName, defaultVal
|
|
|
114
119
|
const params = [];
|
|
115
120
|
let paramIndex = 1;
|
|
116
121
|
const addParam = (value) => {
|
|
117
|
-
params.push(value);
|
|
122
|
+
params.push(dialect.serializeScalar(value));
|
|
118
123
|
return dialect.placeholder(paramIndex++);
|
|
119
124
|
};
|
|
120
125
|
const fieldExpr = (path, relation) => {
|
|
@@ -359,4 +364,4 @@ export function buildWhereSQLQuery(dialect, idKey, filter, tableName, defaultVal
|
|
|
359
364
|
const sql = `SELECT ${getSelectExpr()} FROM "${tableName}" ${whereClause} ${orderClause} ${limitClause}`.trim();
|
|
360
365
|
return { sql, params };
|
|
361
366
|
}
|
|
362
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"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"}
|
|
367
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"query.js","sourceRoot":"","sources":["../../../src/Store/SQL/query.ts"],"names":[],"mappings":"AAAA,uDAAuD;AACvD,OAAO,EAAE,MAAM,EAA8B,MAAM,YAAY,CAAA;AAC/D,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAA;AACpD,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAA;AAE7C,OAAO,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAA;AAsBlD,MAAM,CAAC,MAAM,aAAa,GAAe;IACvC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,yBAAyB,IAAI,IAAI;IACxD,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE,CACxB,2BAA2B,IAAI,8FAA8F,IAAI,SAAS;IAC5I,WAAW,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG;IAC5B,iBAAiB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CAAC,2CAA2C,OAAO,oBAAoB,GAAG,GAAG;IACjH,oBAAoB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE,CACrC,+CAA+C,OAAO,oBAAoB,GAAG,GAAG;IAClF,oBAAoB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACtC,2CAA2C,OAAO,sBAAsB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;IAC7F,uBAAuB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACzC,+CAA+C,OAAO,sBAAsB,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,IAAI;IACjG,oBAAoB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACtC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,2CAA2C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC;IAC3G,uBAAuB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,CACzC,QACE,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,2CAA2C,OAAO,oBAAoB,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,OAAO,CAC1G,GAAG;IACL,mBAAmB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,SAAS,IAAI,gBAAgB,GAAG,GAAG;IACvE,sBAAsB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,SAAS,IAAI,oBAAoB,GAAG,GAAG;IAC9E,cAAc,EAAE,MAAM;IACtB,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,8BAA8B,IAAI,IAAI;IAC7D,YAAY,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE,CAAC,sBAAsB,OAAO,SAAS,KAAK,EAAE;IAC/E,kBAAkB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE,CAAC,gBAAgB,KAAK,cAAc,OAAO,IAAI;IACtF,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC;IAC5B,2EAA2E;IAC3E,oEAAoE;IACpE,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;CACjE,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAe;IACnC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE;QACpB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC7B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,WAAW,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA;QACrD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAA;QACzB,OAAO,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,GAAG,CAAA;IACnE,CAAC;IACD,eAAe,EAAE,CAAC,IAAI,EAAE,EAAE;QACxB,MAAM,KAAK,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAC7B,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA;QACpD,OAAO,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;IACvD,CAAC;IACD,WAAW,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,EAAE;IACnC,iBAAiB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;QAClC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG;YACvB,CAAC,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;QAClD,OAAO,GAAG,QAAQ,OAAO,GAAG,SAAS,CAAA;IACvC,CAAC;IACD,oBAAoB,EAAE,CAAC,OAAO,EAAE,GAAG,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG;YACvB,CAAC,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;QAClD,OAAO,QAAQ,QAAQ,OAAO,GAAG,UAAU,CAAA;IAC7C,CAAC;IACD,oBAAoB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG;YACvB,CAAC,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;QAClD,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,QAAQ,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAA;IAC1E,CAAC;IACD,uBAAuB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG;YACvB,CAAC,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;QAClD,OAAO,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,QAAQ,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAA;IAC9E,CAAC;IACD,oBAAoB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACtC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG;YACvB,CAAC,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;QAClD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,QAAQ,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,CAAA;IACpE,CAAC;IACD,uBAAuB,EAAE,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE;QACzC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG;YACvB,CAAC,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;QAClD,OAAO,QAAQ,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,QAAQ,OAAO,CAAC,SAAS,CAAC,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAA;IAC/E,CAAC;IACD,mBAAmB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,UAAU,GAAG,EAAE;IAC1D,sBAAsB,EAAE,CAAC,IAAI,EAAE,GAAG,EAAE,EAAE,CAAC,GAAG,IAAI,cAAc,GAAG,EAAE;IACjE,cAAc,EAAE,OAAO;IACvB,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,6BAA6B,IAAI,IAAI;IAC5D,YAAY,EAAE,CAAC,OAAO,EAAE,KAAK,EAAE,EAAE;QAC/B,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,MAAM,QAAQ,GAAG,KAAK,CAAC,MAAM,KAAK,CAAC;YACjC,CAAC,CAAC,UAAU,KAAK,CAAC,CAAC,CAAC,GAAG;YACvB,CAAC,CAAC,OAAO,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAA;QAClD,OAAO,wBAAwB,QAAQ,QAAQ,KAAK,EAAE,CAAA;IACxD,CAAC;IACD,kBAAkB,EAAE,CAAC,KAAK,EAAE,OAAO,EAAE,EAAE;QACrC,MAAM,KAAK,GAAG,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAA;QAChC,IAAI,KAAK,CAAC,MAAM,KAAK,CAAC;YAAE,OAAO,GAAG,KAAK,OAAO,KAAK,CAAC,CAAC,CAAC,GAAG,CAAA;QACzD,MAAM,IAAI,GAAG,KAAK,CAAC,GAAG,EAAG,CAAA;QACzB,OAAO,GAAG,KAAK,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,IAAI,GAAG,CAAA;IACvE,CAAC;IACD,kBAAkB,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC;IAC5C,6EAA6E;IAC7E,eAAe,EAAE,CAAC,CAAC,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC;CAC5E,CAAA;AAED,MAAM,UAAU,QAAQ,CAAC,CAAqC;IAC5D,OAAO,WAAW;SACf,QAAQ,CAAC,WAAW,CAAC;SACrB,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC;QACxB,KAAK,EAAE,CAAC,CAAC,GAAG;QACZ,UAAU,EAAE,IAAI,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,EAAE,SAAS,EAAE,CAAC,CAAC;KACnD,CAAC,CAAC,CAAA;AACP,CAAC;AAED,MAAM,gBAAgB,GAAG,CAAC,IAAY,EAAE,EAAE,CACxC,IAAI;KACD,KAAK,CAAC,GAAG,CAAC;KACV,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,KAAK,IAAI,CAAC;KACzB,IAAI,CAAC,GAAG,CAAC,CAAA;AAEd,MAAM,UAAU,kBAAkB,CAChC,OAAmB,EACnB,KAAkB,EAClB,MAA+B,EAC/B,SAAiB,EACjB,aAAsC,EACtC,MAAoF,EACpF,KAAyE,EACzE,IAAa,EACb,KAAc;IAEd,MAAM,MAAM,GAAc,EAAE,CAAA;IAC5B,IAAI,UAAU,GAAG,CAAC,CAAA;IAElB,MAAM,QAAQ,GAAG,CAAC,KAAc,EAAU,EAAE;QAC1C,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,eAAe,CAAC,KAAK,CAAC,CAAC,CAAA;QAC3C,OAAO,OAAO,CAAC,WAAW,CAAC,UAAU,EAAE,CAAC,CAAA;IAC1C,CAAC,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,IAAY,EAAE,QAAiB,EAAU,EAAE;QAC5D,IAAI,IAAI,KAAK,KAAK,IAAI,IAAI,KAAK,IAAI;YAAE,OAAO,IAAI,CAAA;QAChD,IAAI,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;YACtC,MAAM,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,CAAC,CAAE,CAAA;YACtC,IAAI,OAAO,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;gBAChC,6CAA6C;gBAC7C,OAAO,OAAO,CAAC,kBAAkB,CAAC,IAAI,QAAQ,EAAE,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;YACxF,CAAC;YACD,OAAO,OAAO,CAAC,kBAAkB,CAAC,IAAI,QAAQ,EAAE,EAAE,OAAO,CAAC,CAAA;QAC5D,CAAC;QACD,IAAI,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,EAAE,CAAC;YAC7B,MAAM,OAAO,GAAG,gBAAgB,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,MAAM,CAAC,CAAC,CAAA;YAClE,OAAO,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAA;QACrC,CAAC;QACD,MAAM,QAAQ,GAAG,gBAAgB,CAAC,IAAI,CAAC,CAAA;QACvC,MAAM,IAAI,GAAG,OAAO,CAAC,WAAW,CAAC,QAAQ,CAAC,CAAA;QAC1C,MAAM,MAAM,GAAG,IAAI,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAA;QACjC,IAAI,MAAM,IAAI,aAAa,EAAE,CAAC;YAC5B,OAAO,YAAY,IAAI,KAAK,QAAQ,CAAC,aAAa,CAAC,MAAM,CAAC,CAAC,GAAG,CAAA;QAChE,CAAC;QACD,OAAO,IAAI,CAAA;IACb,CAAC,CAAA;IAED,MAAM,SAAS,GAAG,CAAC,CAAU,EAAE,QAAiB,EAAU,EAAE;QAC1D,MAAM,YAAY,GAAG,CAAC,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,IAAI,CAAA;QACrD,MAAM,CAAC,GAAG,SAAS,CAAC,YAAY,EAAE,QAAQ,CAAC,CAAA;QAE3C,QAAQ,CAAC,CAAC,EAAE,EAAE,CAAC;YACb,KAAK,IAAI,CAAC,CAAC,CAAC;gBACV,MAAM,IAAI,GAAG,CAAC,CAAC,KAAsC,CAAA;gBACrD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAA;gBAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAA;gBACjD,MAAM,KAAK,GAAa,EAAE,CAAA;gBAC1B,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;oBACxD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,QAAQ,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACpD,CAAC;gBACD,IAAI,OAAO;oBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,UAAU,CAAC,CAAA;gBACvC,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAA;YACzE,CAAC;YACD,KAAK,OAAO,CAAC,CAAC,CAAC;gBACb,MAAM,IAAI,GAAG,CAAC,CAAC,KAAsC,CAAA;gBACrD,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAA;gBAC3C,MAAM,WAAW,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,IAAI,IAAI,CAAC,CAAA;gBACjD,MAAM,KAAK,GAAa,EAAE,CAAA;gBAC1B,IAAI,WAAW,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBAC3B,MAAM,YAAY,GAAG,WAAW,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAA;oBACxD,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,YAAY,YAAY,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAA;gBACxD,CAAC;gBACD,IAAI,OAAO;oBAAE,KAAK,CAAC,IAAI,CAAC,GAAG,CAAC,cAAc,CAAC,CAAA;gBAC3C,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,IAAI,KAAK,CAAA;YAC1E,CAAC;YAED,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAA;gBAC9C,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC3B,OAAO,OAAO,CAAC,iBAAiB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;YAC9C,CAAC;YACD,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAA;gBAC9C,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC3B,OAAO,OAAO,CAAC,oBAAoB,CAAC,OAAO,EAAE,CAAC,CAAC,CAAA;YACjD,CAAC;YAED,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAA;gBAC9C,MAAM,IAAI,GAAG,CAAC,CAAC,KAAsC,CAAA;gBACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC7E,OAAO,OAAO,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YAC5D,CAAC;YACD,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAA;gBAC9C,MAAM,IAAI,GAAG,CAAC,CAAC,KAAsC,CAAA;gBACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC7E,OAAO,OAAO,CAAC,uBAAuB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YAC/D,CAAC;YAED,KAAK,cAAc,CAAC,CAAC,CAAC;gBACpB,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAA;gBAC9C,MAAM,IAAI,GAAG,CAAC,CAAC,KAAsC,CAAA;gBACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC7E,OAAO,OAAO,CAAC,oBAAoB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YAC5D,CAAC;YACD,KAAK,iBAAiB,CAAC,CAAC,CAAC;gBACvB,MAAM,OAAO,GAAG,gBAAgB,CAAC,YAAY,CAAC,CAAA;gBAC9C,MAAM,IAAI,GAAG,CAAC,CAAC,KAAsC,CAAA;gBACrD,MAAM,YAAY,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC,CAAC,CAAC,CAAC,CAAA;gBAC7E,OAAO,OAAO,CAAC,uBAAuB,CAAC,OAAO,EAAE,YAAY,CAAC,CAAA;YAC/D,CAAC;YAED,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAA;gBAClC,OAAO,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC1C,CAAC;YACD,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,GAAG,CAAC,CAAA;gBAClC,OAAO,OAAO,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC7C,CAAC;YACD,KAAK,YAAY,CAAC,CAAC,CAAC;gBAClB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAA;gBACjC,OAAO,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC1C,CAAC;YACD,KAAK,eAAe,CAAC,CAAC,CAAC;gBACrB,MAAM,CAAC,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC,KAAK,GAAG,CAAC,CAAA;gBACjC,OAAO,OAAO,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC7C,CAAC;YACD,KAAK,UAAU,CAAC,CAAC,CAAC;gBAChB,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;gBACjC,OAAO,OAAO,CAAC,mBAAmB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC1C,CAAC;YACD,KAAK,aAAa,CAAC,CAAC,CAAC;gBACnB,MAAM,CAAC,GAAG,QAAQ,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,CAAC,CAAA;gBACjC,OAAO,OAAO,CAAC,sBAAsB,CAAC,CAAC,EAAE,CAAC,CAAC,CAAA;YAC7C,CAAC;YAED,KAAK,IAAI,CAAC,CAAC,CAAC;gBACV,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC3B,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,CAAA;YACtB,CAAC;YACD,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC3B,OAAO,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;YACvB,CAAC;YACD,KAAK,IAAI,CAAC,CAAC,CAAC;gBACV,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC3B,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,CAAA;YACtB,CAAC;YACD,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC3B,OAAO,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;YACvB,CAAC;YACD,KAAK,KAAK,CAAC,CAAC,CAAC;gBACX,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI;oBAAE,OAAO,GAAG,CAAC,cAAc,CAAA;gBAC/C,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC3B,OAAO,GAAG,CAAC,OAAO,CAAC,EAAE,CAAA;YACvB,CAAC;YACD,KAAK,SAAS,CAAC;YACf,KAAK,IAAI,CAAC,CAAC,CAAC;gBACV,IAAI,CAAC,CAAC,KAAK,KAAK,IAAI;oBAAE,OAAO,GAAG,CAAC,UAAU,CAAA;gBAC3C,MAAM,CAAC,GAAG,QAAQ,CAAC,CAAC,CAAC,KAAK,CAAC,CAAA;gBAC3B,OAAO,GAAG,CAAC,MAAM,CAAC,EAAE,CAAA;YACtB,CAAC;YACD;gBACE,OAAO,iBAAiB,CAAC,CAAC,CAAC,EAAE,CAAC,CAAA;QAClC,CAAC;IACH,CAAC,CAAA;IAED,MAAM,YAAY,GAAG,CAAC,GAAW,EAAE,KAAa,EAAE,KAAc,EAAU,EAAE;QAC1E,iDAAiD;QACjD,IAAI,KAAK,IAAI,KAAK,KAAK,KAAK;YAAE,OAAO,KAAK,CAAA;QAC1C,IAAI,CAAC,KAAK,IAAI,KAAK,KAAK,KAAK;YAAE,OAAO,KAAK,CAAA;QAC3C,MAAM,IAAI,GAAG,OAAO,CAAC,YAAY,CAAC,GAAG,EAAE,IAAI,GAAG,EAAE,CAAC,CAAA;QACjD,wDAAwD;QACxD,OAAO,KAAK;YACV,CAAC,CAAC,4BAA4B,IAAI,eAAe,KAAK,IAAI;YAC1D,CAAC,CAAC,wBAAwB,IAAI,UAAU,KAAK,GAAG,CAAA;IACpD,CAAC,CAAA;IAED,MAAM,KAAK,GAAG,CAAC,KAA8B,EAAE,UAAyB,EAAE,KAAc,EAAU,EAAE;QAClG,IAAI,CAAC,GAAG,EAAE,CAAA;QACV,KAAK,MAAM,CAAC,IAAI,KAAK,EAAE,CAAC;YACtB,QAAQ,CAAC,CAAC,CAAC,EAAE,CAAC;gBACZ,KAAK,OAAO;oBACV,CAAC,IAAI,SAAS,CAAC,CAAC,EAAE,UAAU,IAAI,SAAS,CAAC,CAAA;oBAC1C,MAAK;gBACP,KAAK,IAAI;oBACP,CAAC,IAAI,OAAO,SAAS,CAAC,CAAC,EAAE,UAAU,IAAI,SAAS,CAAC,EAAE,CAAA;oBACnD,MAAK;gBACP,KAAK,KAAK;oBACR,CAAC,IAAI,QAAQ,SAAS,CAAC,CAAC,EAAE,UAAU,IAAI,SAAS,CAAC,EAAE,CAAA;oBACpD,MAAK;gBACP,KAAK,UAAU,CAAC,CAAC,CAAC;oBAChB,IAAI,CAAC,KAAK;wBAAE,KAAK,GAAG,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAA;oBAC1C,MAAM,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;oBACjD,IAAI,GAAG,EAAE,CAAC;wBACR,CAAC,IAAI,UAAU;4BACb,CAAC,CAAC,QAAQ,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;4BACxC,CAAC,CAAC,OAAO,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,CAAA;oBACpE,CAAC;yBAAM,CAAC;wBACN,CAAC,IAAI,QAAQ,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAA;oBAC9C,CAAC;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,WAAW,CAAC,CAAC,CAAC;oBACjB,IAAI,CAAC,KAAK;wBAAE,KAAK,GAAG,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAA;oBAC1C,MAAM,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;oBACjD,IAAI,GAAG,EAAE,CAAC;wBACR,CAAC,IAAI,UAAU;4BACb,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;4BACzC,CAAC,CAAC,QAAQ,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,EAAE,CAAA;oBACrE,CAAC;yBAAM,CAAC;wBACN,CAAC,IAAI,SAAS,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAA;oBAC/C,CAAC;oBACD,MAAK;gBACP,CAAC;gBACD,KAAK,aAAa,CAAC,CAAC,CAAC;oBACnB,IAAI,CAAC,KAAK;wBAAE,KAAK,GAAG,CAAC,CAAC,QAAQ,KAAK,OAAO,CAAA;oBAC1C,MAAM,GAAG,GAAG,eAAe,CAAC,CAAC,CAAC,MAAM,EAAE,UAAU,CAAC,CAAA;oBACjD,IAAI,GAAG,EAAE,CAAC;wBACR,CAAC,IAAI,UAAU;4BACb,CAAC,CAAC,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,GAAG;4BACpC,CAAC,CAAC,YAAY,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,EAAE,KAAK,CAAC,CAAA;oBAC3D,CAAC;yBAAM,CAAC;wBACN,CAAC,IAAI,IAAI,KAAK,CAAC,CAAC,CAAC,MAAM,EAAE,IAAI,EAAE,KAAK,CAAC,GAAG,CAAA;oBAC1C,CAAC;oBACD,MAAK;gBACP,CAAC;YACH,CAAC;QACH,CAAC;QACD,OAAO,CAAC,CAAA;IACV,CAAC,CAAA;IAED,MAAM,aAAa,GAAG,GAAW,EAAE;QACjC,IAAI,CAAC,MAAM;YAAE,OAAO,iBAAiB,CAAA;QACrC,MAAM,MAAM,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE;YAC9B,IAAI,OAAO,CAAC,KAAK,QAAQ,EAAE,CAAC;gBAC1B,IAAI,CAAC,KAAK,KAAK,IAAI,CAAC,KAAK,IAAI;oBAAE,OAAO,IAAI,CAAA;gBAC1C,IAAI,CAAC,KAAK,OAAO;oBAAE,OAAO,OAAO,CAAA;gBACjC,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAA;YAClD,CAAC;YACD,OAAO,GAAG,OAAO,CAAC,eAAe,CAAC,CAAC,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC,GAAG,GAAG,CAAA;QAC1D,CAAC,CAAC,CAAA;QACF,OAAO,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;IAC1B,CAAC,CAAA;IAED,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM;QAC/B,CAAC,CAAC,SAAS,KAAK,CAAC,CAAC,EAAE,CAAC,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAE,CAAC,EAAE,IAAI,EAAE,KAAK,CAAC,EAAE;QACzF,CAAC,CAAC,EAAE,CAAA;IAEN,MAAM,WAAW,GAAG,KAAK;QACvB,CAAC,CAAC,YAAY,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,GAAG,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE;QACjF,CAAC,CAAC,EAAE,CAAA;IAEN,MAAM,WAAW,GAAG,KAAK,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS;QAC3D,CAAC,CAAC,SAAS,QAAQ,CAAC,KAAK,IAAI,MAAM,CAAC,WAAW,QAAQ,CAAC,IAAI,IAAI,CAAC,CAAC,EAAE;QACpE,CAAC,CAAC,EAAE,CAAA;IAEN,MAAM,GAAG,GAAG,UAAU,aAAa,EAAE,UAAU,SAAS,KAAK,WAAW,IAAI,WAAW,IAAI,WAAW,EAAE,CAAC,IAAI,EAAE,CAAA;IAE/G,OAAO,EAAE,GAAG,EAAE,MAAM,EAAE,CAAA;AACxB,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { HttpHeaders, HttpServerRequest, HttpServerResponse } from "effect-app/h
|
|
|
3
3
|
import { auth, InsufficientScopeError, InvalidRequestError, InvalidTokenError, UnauthorizedError } from "express-oauth2-jwt-bearer";
|
|
4
4
|
type Config = Parameters<typeof auth>[0];
|
|
5
5
|
export declare const checkJWTI: (config: Config) => (headers: HttpHeaders.Headers) => Effect.Effect<void, InsufficientScopeError | InvalidRequestError | InvalidTokenError | UnauthorizedError, never>;
|
|
6
|
-
export declare const checkJwt: (config: Config) => <E, R>(app: Effect.Effect<HttpServerResponse.HttpServerResponse, E, HttpServerRequest.HttpServerRequest
|
|
6
|
+
export declare const checkJwt: (config: Config) => <E, R>(app: Effect.Effect<HttpServerResponse.HttpServerResponse, E, R | HttpServerRequest.HttpServerRequest>) => Effect.Effect<HttpServerResponse.HttpServerResponse, E | import("effect/unstable/http/HttpBody").HttpBodyError, R | HttpServerRequest.HttpServerRequest>;
|
|
7
7
|
declare const JWTError_base: new <A extends Record<string, any> = {}>(args: import("effect/Types").VoidIfEmpty<{ readonly [P in keyof A as P extends "_tag" ? never : P]: A[P]; }>) => Readonly<A> & {
|
|
8
8
|
readonly _tag: "JWTError";
|
|
9
9
|
} & import("effect/Pipeable").Pipeable;
|
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.103",
|
|
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": "7.0.1",
|
|
15
15
|
"query-string": "^9.3.1",
|
|
16
|
-
"effect-app": "4.0.0-beta.
|
|
16
|
+
"effect-app": "4.0.0-beta.103"
|
|
17
17
|
},
|
|
18
18
|
"devDependencies": {
|
|
19
19
|
"@azure/cosmos": "^4.9.2",
|
package/src/Store/SQL/query.ts
CHANGED
|
@@ -22,11 +22,13 @@ export interface SQLDialect {
|
|
|
22
22
|
readonly jsonEachFrom: (arrPath: string, alias: string) => string
|
|
23
23
|
readonly jsonExtractElement: (alias: string, subPath: string) => string
|
|
24
24
|
readonly serializeJsonValue: (v: unknown) => unknown
|
|
25
|
+
readonly serializeScalar: (v: unknown) => unknown
|
|
25
26
|
}
|
|
26
27
|
|
|
27
28
|
export const sqliteDialect: SQLDialect = {
|
|
28
29
|
jsonExtract: (path) => `json_extract(data, '$.${path}')`,
|
|
29
|
-
jsonExtractJson: (path) =>
|
|
30
|
+
jsonExtractJson: (path) =>
|
|
31
|
+
`CASE json_type(data, '$.${path}') WHEN 'true' THEN 'true' WHEN 'false' THEN 'false' ELSE json_quote(json_extract(data, '$.${path}')) END`,
|
|
30
32
|
placeholder: (_index) => "?",
|
|
31
33
|
jsonArrayContains: (arrPath, val) => `EXISTS(SELECT 1 FROM json_each(data, '$.${arrPath}') WHERE value = ${val})`,
|
|
32
34
|
jsonArrayNotContains: (arrPath, val) =>
|
|
@@ -47,7 +49,10 @@ export const sqliteDialect: SQLDialect = {
|
|
|
47
49
|
arrayLength: (path) => `json_array_length(data, '$.${path}')`,
|
|
48
50
|
jsonEachFrom: (arrPath, alias) => `json_each(data, '$.${arrPath}') AS ${alias}`,
|
|
49
51
|
jsonExtractElement: (alias, subPath) => `json_extract(${alias}.value, '$.${subPath}')`,
|
|
50
|
-
serializeJsonValue: (v) => v
|
|
52
|
+
serializeJsonValue: (v) => v,
|
|
53
|
+
// SQLite stores JSON booleans as integers (0/1) and better-sqlite3 refuses
|
|
54
|
+
// to bind JS booleans, so coerce them to integers for WHERE params.
|
|
55
|
+
serializeScalar: (v) => typeof v === "boolean" ? (v ? 1 : 0) : v
|
|
51
56
|
}
|
|
52
57
|
|
|
53
58
|
export const pgDialect: SQLDialect = {
|
|
@@ -122,7 +127,9 @@ export const pgDialect: SQLDialect = {
|
|
|
122
127
|
const last = parts.pop()!
|
|
123
128
|
return `${alias}${parts.map((p) => `->'${p}'`).join("")}->>'${last}'`
|
|
124
129
|
},
|
|
125
|
-
serializeJsonValue: (v) => JSON.stringify(v)
|
|
130
|
+
serializeJsonValue: (v) => JSON.stringify(v),
|
|
131
|
+
// PG's ->> operator yields text, so compare booleans as 'true'/'false' text.
|
|
132
|
+
serializeScalar: (v) => typeof v === "boolean" ? (v ? "true" : "false") : v
|
|
126
133
|
}
|
|
127
134
|
|
|
128
135
|
export function logQuery(q: { sql: string; params: unknown[] }) {
|
|
@@ -155,7 +162,7 @@ export function buildWhereSQLQuery(
|
|
|
155
162
|
let paramIndex = 1
|
|
156
163
|
|
|
157
164
|
const addParam = (value: unknown): string => {
|
|
158
|
-
params.push(value)
|
|
165
|
+
params.push(dialect.serializeScalar(value))
|
|
159
166
|
return dialect.placeholder(paramIndex++)
|
|
160
167
|
}
|
|
161
168
|
|
package/test/dist/fixtures.d.ts
CHANGED
|
@@ -67,7 +67,7 @@ declare const RequestContextMap_base: (new () => {
|
|
|
67
67
|
readonly requireRoles: RpcContextMap.RpcContextMap.Custom<never, typeof UnauthorizedError, string[]>;
|
|
68
68
|
readonly test: RpcContextMap.RpcContextMap<never, S.Never>;
|
|
69
69
|
}>;
|
|
70
|
-
get: <Key extends "
|
|
70
|
+
get: <Key extends "allowAnonymous" | "requireRoles" | "test">(key: Key) => RpcX.RpcMiddleware.RpcDynamic<Key, {
|
|
71
71
|
readonly allowAnonymous: RpcContextMap.RpcContextMap.Inverted<UserProfile, typeof NotLoggedInError>;
|
|
72
72
|
readonly requireRoles: RpcContextMap.RpcContextMap.Custom<never, typeof UnauthorizedError, string[]>;
|
|
73
73
|
readonly test: RpcContextMap.RpcContextMap<never, S.Never>;
|
package/test/sql-store.test.ts
CHANGED
|
@@ -631,6 +631,294 @@ describe("SQL Store (SQLite integration)", () => {
|
|
|
631
631
|
}))
|
|
632
632
|
})
|
|
633
633
|
|
|
634
|
+
// --- boolean WHERE clause tests (regression: where("x", true) must work per dialect) ---
|
|
635
|
+
|
|
636
|
+
describe("boolean WHERE clauses — query builder", () => {
|
|
637
|
+
it("sqlite: eq true serializes bool → 1 integer", () => {
|
|
638
|
+
const result = buildWhereSQLQuery(
|
|
639
|
+
sqliteDialect,
|
|
640
|
+
"id",
|
|
641
|
+
[{ t: "where", path: "flag", op: "eq", value: true as any }],
|
|
642
|
+
"t",
|
|
643
|
+
{}
|
|
644
|
+
)
|
|
645
|
+
expect(result.sql).toContain("json_extract(data, '$.flag') = ?")
|
|
646
|
+
expect(result.params).toEqual([1])
|
|
647
|
+
})
|
|
648
|
+
|
|
649
|
+
it("sqlite: eq false serializes bool → 0 integer", () => {
|
|
650
|
+
const result = buildWhereSQLQuery(
|
|
651
|
+
sqliteDialect,
|
|
652
|
+
"id",
|
|
653
|
+
[{ t: "where", path: "flag", op: "eq", value: false as any }],
|
|
654
|
+
"t",
|
|
655
|
+
{}
|
|
656
|
+
)
|
|
657
|
+
expect(result.params).toEqual([0])
|
|
658
|
+
})
|
|
659
|
+
|
|
660
|
+
it("sqlite: neq/in also serialize booleans", () => {
|
|
661
|
+
const r1 = buildWhereSQLQuery(
|
|
662
|
+
sqliteDialect,
|
|
663
|
+
"id",
|
|
664
|
+
[{ t: "where", path: "flag", op: "neq", value: true as any }],
|
|
665
|
+
"t",
|
|
666
|
+
{}
|
|
667
|
+
)
|
|
668
|
+
expect(r1.params).toEqual([1])
|
|
669
|
+
|
|
670
|
+
const r2 = buildWhereSQLQuery(
|
|
671
|
+
sqliteDialect,
|
|
672
|
+
"id",
|
|
673
|
+
[{ t: "where", path: "flag", op: "in", value: [true, false] as any }],
|
|
674
|
+
"t",
|
|
675
|
+
{}
|
|
676
|
+
)
|
|
677
|
+
expect(r2.params).toEqual([1, 0])
|
|
678
|
+
})
|
|
679
|
+
|
|
680
|
+
it("pg: eq true serializes bool → 'true' text (matches ->> output)", () => {
|
|
681
|
+
const result = buildWhereSQLQuery(
|
|
682
|
+
pgDialect,
|
|
683
|
+
"id",
|
|
684
|
+
[{ t: "where", path: "flag", op: "eq", value: true as any }],
|
|
685
|
+
"t",
|
|
686
|
+
{}
|
|
687
|
+
)
|
|
688
|
+
expect(result.sql).toContain("data->>'flag' = $1")
|
|
689
|
+
expect(result.params).toEqual(["true"])
|
|
690
|
+
})
|
|
691
|
+
|
|
692
|
+
it("pg: eq false serializes bool → 'false' text", () => {
|
|
693
|
+
const result = buildWhereSQLQuery(
|
|
694
|
+
pgDialect,
|
|
695
|
+
"id",
|
|
696
|
+
[{ t: "where", path: "flag", op: "eq", value: false as any }],
|
|
697
|
+
"t",
|
|
698
|
+
{}
|
|
699
|
+
)
|
|
700
|
+
expect(result.params).toEqual(["false"])
|
|
701
|
+
})
|
|
702
|
+
|
|
703
|
+
it("pg: in with booleans serializes as text list", () => {
|
|
704
|
+
const result = buildWhereSQLQuery(
|
|
705
|
+
pgDialect,
|
|
706
|
+
"id",
|
|
707
|
+
[{ t: "where", path: "flag", op: "in", value: [true, false] as any }],
|
|
708
|
+
"t",
|
|
709
|
+
{}
|
|
710
|
+
)
|
|
711
|
+
expect(result.params).toEqual(["true", "false"])
|
|
712
|
+
})
|
|
713
|
+
|
|
714
|
+
it("non-boolean scalars pass through unchanged (sqlite)", () => {
|
|
715
|
+
const result = buildWhereSQLQuery(
|
|
716
|
+
sqliteDialect,
|
|
717
|
+
"id",
|
|
718
|
+
[{ t: "where", path: "name", op: "eq", value: "Alice" }],
|
|
719
|
+
"t",
|
|
720
|
+
{}
|
|
721
|
+
)
|
|
722
|
+
expect(result.params).toEqual(["Alice"])
|
|
723
|
+
})
|
|
724
|
+
|
|
725
|
+
it("non-boolean scalars pass through unchanged (pg)", () => {
|
|
726
|
+
const result = buildWhereSQLQuery(
|
|
727
|
+
pgDialect,
|
|
728
|
+
"id",
|
|
729
|
+
[{ t: "where", path: "age", op: "gt", value: 18 as any }],
|
|
730
|
+
"t",
|
|
731
|
+
{}
|
|
732
|
+
)
|
|
733
|
+
expect(result.params).toEqual([18])
|
|
734
|
+
})
|
|
735
|
+
})
|
|
736
|
+
|
|
737
|
+
describe("boolean WHERE clauses — SQLite integration (end-to-end)", () => {
|
|
738
|
+
const withDb = (fn: (db: Sqlite.Database) => void) => {
|
|
739
|
+
const db = new BetterSqlite(":memory:")
|
|
740
|
+
try {
|
|
741
|
+
fn(db)
|
|
742
|
+
} finally {
|
|
743
|
+
db.close()
|
|
744
|
+
}
|
|
745
|
+
}
|
|
746
|
+
|
|
747
|
+
it("where flag = true matches only true rows", () =>
|
|
748
|
+
withDb((db) => {
|
|
749
|
+
db.exec(`CREATE TABLE "t" (id TEXT PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`)
|
|
750
|
+
db
|
|
751
|
+
.prepare(`INSERT INTO "t" (id, _etag, data) VALUES (?, ?, ?)`)
|
|
752
|
+
.run("1", "e", JSON.stringify({ flag: true, name: "Alice" }))
|
|
753
|
+
db
|
|
754
|
+
.prepare(`INSERT INTO "t" (id, _etag, data) VALUES (?, ?, ?)`)
|
|
755
|
+
.run("2", "e", JSON.stringify({ flag: false, name: "Bob" }))
|
|
756
|
+
|
|
757
|
+
const q = buildWhereSQLQuery(
|
|
758
|
+
sqliteDialect,
|
|
759
|
+
"id",
|
|
760
|
+
[{ t: "where", path: "flag", op: "eq", value: true as any }],
|
|
761
|
+
"t",
|
|
762
|
+
{}
|
|
763
|
+
)
|
|
764
|
+
const rows = query(db, q.sql, q.params)
|
|
765
|
+
expect(rows.length).toBe(1)
|
|
766
|
+
expect((JSON.parse((rows[0] as any).data) as any).name).toBe("Alice")
|
|
767
|
+
}))
|
|
768
|
+
|
|
769
|
+
it("where flag = false matches only false rows", () =>
|
|
770
|
+
withDb((db) => {
|
|
771
|
+
db.exec(`CREATE TABLE "t" (id TEXT PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`)
|
|
772
|
+
db
|
|
773
|
+
.prepare(`INSERT INTO "t" (id, _etag, data) VALUES (?, ?, ?)`)
|
|
774
|
+
.run("1", "e", JSON.stringify({ flag: true, name: "Alice" }))
|
|
775
|
+
db
|
|
776
|
+
.prepare(`INSERT INTO "t" (id, _etag, data) VALUES (?, ?, ?)`)
|
|
777
|
+
.run("2", "e", JSON.stringify({ flag: false, name: "Bob" }))
|
|
778
|
+
|
|
779
|
+
const q = buildWhereSQLQuery(
|
|
780
|
+
sqliteDialect,
|
|
781
|
+
"id",
|
|
782
|
+
[{ t: "where", path: "flag", op: "eq", value: false as any }],
|
|
783
|
+
"t",
|
|
784
|
+
{}
|
|
785
|
+
)
|
|
786
|
+
const rows = query(db, q.sql, q.params)
|
|
787
|
+
expect(rows.length).toBe(1)
|
|
788
|
+
expect((JSON.parse((rows[0] as any).data) as any).name).toBe("Bob")
|
|
789
|
+
}))
|
|
790
|
+
|
|
791
|
+
it("where nested boolean path works", () =>
|
|
792
|
+
withDb((db) => {
|
|
793
|
+
db.exec(`CREATE TABLE "t" (id TEXT PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`)
|
|
794
|
+
db
|
|
795
|
+
.prepare(`INSERT INTO "t" (id, _etag, data) VALUES (?, ?, ?)`)
|
|
796
|
+
.run("1", "e", JSON.stringify({ meta: { active: true }, name: "Alice" }))
|
|
797
|
+
db
|
|
798
|
+
.prepare(`INSERT INTO "t" (id, _etag, data) VALUES (?, ?, ?)`)
|
|
799
|
+
.run("2", "e", JSON.stringify({ meta: { active: false }, name: "Bob" }))
|
|
800
|
+
|
|
801
|
+
const q = buildWhereSQLQuery(
|
|
802
|
+
sqliteDialect,
|
|
803
|
+
"id",
|
|
804
|
+
[{ t: "where", path: "meta.active", op: "eq", value: true as any }],
|
|
805
|
+
"t",
|
|
806
|
+
{}
|
|
807
|
+
)
|
|
808
|
+
const rows = query(db, q.sql, q.params)
|
|
809
|
+
expect(rows.length).toBe(1)
|
|
810
|
+
expect((JSON.parse((rows[0] as any).data) as any).name).toBe("Alice")
|
|
811
|
+
}))
|
|
812
|
+
|
|
813
|
+
it("where neq boolean works", () =>
|
|
814
|
+
withDb((db) => {
|
|
815
|
+
db.exec(`CREATE TABLE "t" (id TEXT PRIMARY KEY, _etag TEXT, data JSON NOT NULL)`)
|
|
816
|
+
db
|
|
817
|
+
.prepare(`INSERT INTO "t" (id, _etag, data) VALUES (?, ?, ?)`)
|
|
818
|
+
.run("1", "e", JSON.stringify({ flag: true, name: "Alice" }))
|
|
819
|
+
db
|
|
820
|
+
.prepare(`INSERT INTO "t" (id, _etag, data) VALUES (?, ?, ?)`)
|
|
821
|
+
.run("2", "e", JSON.stringify({ flag: false, name: "Bob" }))
|
|
822
|
+
|
|
823
|
+
const q = buildWhereSQLQuery(
|
|
824
|
+
sqliteDialect,
|
|
825
|
+
"id",
|
|
826
|
+
[{ t: "where", path: "flag", op: "neq", value: true as any }],
|
|
827
|
+
"t",
|
|
828
|
+
{}
|
|
829
|
+
)
|
|
830
|
+
const rows = query(db, q.sql, q.params)
|
|
831
|
+
expect(rows.length).toBe(1)
|
|
832
|
+
expect((JSON.parse((rows[0] as any).data) as any).name).toBe("Bob")
|
|
833
|
+
}))
|
|
834
|
+
})
|
|
835
|
+
|
|
836
|
+
// --- jsonExtractJson dialect tests (regression: booleans must survive round-trip) ---
|
|
837
|
+
|
|
838
|
+
describe("sqliteDialect.jsonExtractJson boolean round-trip", () => {
|
|
839
|
+
const withDb = (fn: (db: Sqlite.Database) => void) => {
|
|
840
|
+
const db = new BetterSqlite(":memory:")
|
|
841
|
+
try {
|
|
842
|
+
fn(db)
|
|
843
|
+
} finally {
|
|
844
|
+
db.close()
|
|
845
|
+
}
|
|
846
|
+
}
|
|
847
|
+
|
|
848
|
+
it("SQL uses json_type CASE to preserve booleans", () => {
|
|
849
|
+
const sql = sqliteDialect.jsonExtractJson("flag")
|
|
850
|
+
expect(sql).toContain("json_type(data, '$.flag')")
|
|
851
|
+
expect(sql).toContain("'true'")
|
|
852
|
+
expect(sql).toContain("'false'")
|
|
853
|
+
expect(sql).toContain("json_quote(json_extract(data, '$.flag'))")
|
|
854
|
+
})
|
|
855
|
+
|
|
856
|
+
it("boolean false round-trips as false (not 0)", () =>
|
|
857
|
+
withDb((db) => {
|
|
858
|
+
db.exec(`CREATE TABLE "t" (data JSON NOT NULL)`)
|
|
859
|
+
db.prepare(`INSERT INTO "t" (data) VALUES (?)`).run(JSON.stringify({ flag: false }))
|
|
860
|
+
|
|
861
|
+
const row = db.prepare(`SELECT ${sqliteDialect.jsonExtractJson("flag")} AS v FROM "t"`).get() as any
|
|
862
|
+
const parsed = JSON.parse(row.v)
|
|
863
|
+
expect(parsed).toBe(false)
|
|
864
|
+
expect(typeof parsed).toBe("boolean")
|
|
865
|
+
}))
|
|
866
|
+
|
|
867
|
+
it("boolean true round-trips as true (not 1)", () =>
|
|
868
|
+
withDb((db) => {
|
|
869
|
+
db.exec(`CREATE TABLE "t" (data JSON NOT NULL)`)
|
|
870
|
+
db.prepare(`INSERT INTO "t" (data) VALUES (?)`).run(JSON.stringify({ flag: true }))
|
|
871
|
+
|
|
872
|
+
const row = db.prepare(`SELECT ${sqliteDialect.jsonExtractJson("flag")} AS v FROM "t"`).get() as any
|
|
873
|
+
const parsed = JSON.parse(row.v)
|
|
874
|
+
expect(parsed).toBe(true)
|
|
875
|
+
expect(typeof parsed).toBe("boolean")
|
|
876
|
+
}))
|
|
877
|
+
|
|
878
|
+
it("nested boolean round-trips correctly", () =>
|
|
879
|
+
withDb((db) => {
|
|
880
|
+
db.exec(`CREATE TABLE "t" (data JSON NOT NULL)`)
|
|
881
|
+
db.prepare(`INSERT INTO "t" (data) VALUES (?)`).run(
|
|
882
|
+
JSON.stringify({ nested: { flag: false } })
|
|
883
|
+
)
|
|
884
|
+
|
|
885
|
+
const row = db
|
|
886
|
+
.prepare(`SELECT ${sqliteDialect.jsonExtractJson("nested.flag")} AS v FROM "t"`)
|
|
887
|
+
.get() as any
|
|
888
|
+
const parsed = JSON.parse(row.v)
|
|
889
|
+
expect(parsed).toBe(false)
|
|
890
|
+
expect(typeof parsed).toBe("boolean")
|
|
891
|
+
}))
|
|
892
|
+
|
|
893
|
+
it("numbers 0 and 1 still parse as numbers (not booleans)", () =>
|
|
894
|
+
withDb((db) => {
|
|
895
|
+
db.exec(`CREATE TABLE "t" (data JSON NOT NULL)`)
|
|
896
|
+
db.prepare(`INSERT INTO "t" (data) VALUES (?)`).run(JSON.stringify({ zero: 0, one: 1 }))
|
|
897
|
+
|
|
898
|
+
const zRow = db.prepare(`SELECT ${sqliteDialect.jsonExtractJson("zero")} AS v FROM "t"`).get() as any
|
|
899
|
+
const oRow = db.prepare(`SELECT ${sqliteDialect.jsonExtractJson("one")} AS v FROM "t"`).get() as any
|
|
900
|
+
expect(JSON.parse(zRow.v)).toBe(0)
|
|
901
|
+
expect(typeof JSON.parse(zRow.v)).toBe("number")
|
|
902
|
+
expect(JSON.parse(oRow.v)).toBe(1)
|
|
903
|
+
expect(typeof JSON.parse(oRow.v)).toBe("number")
|
|
904
|
+
}))
|
|
905
|
+
|
|
906
|
+
it("strings, arrays, and null still round-trip correctly", () =>
|
|
907
|
+
withDb((db) => {
|
|
908
|
+
db.exec(`CREATE TABLE "t" (data JSON NOT NULL)`)
|
|
909
|
+
db.prepare(`INSERT INTO "t" (data) VALUES (?)`).run(
|
|
910
|
+
JSON.stringify({ s: "hello", arr: [1, 2, 3], nil: null })
|
|
911
|
+
)
|
|
912
|
+
|
|
913
|
+
const sRow = db.prepare(`SELECT ${sqliteDialect.jsonExtractJson("s")} AS v FROM "t"`).get() as any
|
|
914
|
+
const aRow = db.prepare(`SELECT ${sqliteDialect.jsonExtractJson("arr")} AS v FROM "t"`).get() as any
|
|
915
|
+
const nRow = db.prepare(`SELECT ${sqliteDialect.jsonExtractJson("nil")} AS v FROM "t"`).get() as any
|
|
916
|
+
expect(JSON.parse(sRow.v)).toBe("hello")
|
|
917
|
+
expect(JSON.parse(aRow.v)).toEqual([1, 2, 3])
|
|
918
|
+
expect(JSON.parse(nRow.v)).toBe(null)
|
|
919
|
+
}))
|
|
920
|
+
})
|
|
921
|
+
|
|
634
922
|
// --- toRow stripping and parseRow reconstruction tests ---
|
|
635
923
|
|
|
636
924
|
describe("toRow strips _etag and id from data", () => {
|