@mrnafisia/type-query 1.0.23 → 1.0.26
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/dist/model.d.ts.map +1 -1
- package/dist/model.js +7 -6
- package/dist/model.js.map +1 -1
- package/dist/pool.js +1 -1
- package/dist/pool.js.map +1 -1
- package/dist/types/model.d.ts +4 -3
- package/dist/types/model.d.ts.map +1 -1
- package/dist/types/pool.d.ts +1 -2
- package/dist/types/pool.d.ts.map +1 -1
- package/package.json +1 -1
package/dist/model.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,MAAM,eAAe,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"AAAA,OAAO,OAAO,MAAM,YAAY,CAAC;AACjC,OAAO,KAAK,MAAM,eAAe,CAAC;AAElC,OAAO,EAAC,UAAU,EAAC,MAAM,eAAe,CAAC;AACzC,OAAO,EAAC,mBAAmB,EAAC,MAAM,kBAAkB,CAAC;AA8GrD,QAAA,MAAM,gBAAgB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;2CAGyB,MAAM;sJACmC,OAAO;qCAwJ9F,CAAC;AAEF,OAAO,EAAC,gBAAgB,EAAC,CAAC"}
|
package/dist/model.js
CHANGED
|
@@ -16,6 +16,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
16
16
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
17
17
|
exports.createModelUtils = void 0;
|
|
18
18
|
var decimal_js_1 = __importDefault(require("decimal.js"));
|
|
19
|
+
var never_catch_1 = require("never-catch");
|
|
19
20
|
var parseBoolean = function (v) { return v === 'true' ? true : v === 'false' ? false : undefined; };
|
|
20
21
|
var parseNumber = function (v) {
|
|
21
22
|
var _v = Number(v);
|
|
@@ -260,10 +261,10 @@ var createModelUtils = function (columns, custom) {
|
|
|
260
261
|
for (var _i = 0, requires_1 = requires; _i < requires_1.length; _i++) {
|
|
261
262
|
require = requires_1[_i];
|
|
262
263
|
if (data[require] === undefined) {
|
|
263
|
-
return
|
|
264
|
+
return (0, never_catch_1.err)(require);
|
|
264
265
|
}
|
|
265
266
|
if (validate && !columnsParseAndValidate[require].Validate(data[require])) {
|
|
266
|
-
return
|
|
267
|
+
return (0, never_catch_1.err)(require);
|
|
267
268
|
}
|
|
268
269
|
result[require] = columnsParseAndValidate[require].Parse(data[require]);
|
|
269
270
|
}
|
|
@@ -274,19 +275,19 @@ var createModelUtils = function (columns, custom) {
|
|
|
274
275
|
continue;
|
|
275
276
|
}
|
|
276
277
|
if (validate && !columnsParseAndValidate[optional].Validate(data[optional])) {
|
|
277
|
-
return
|
|
278
|
+
return (0, never_catch_1.err)(optional);
|
|
278
279
|
}
|
|
279
280
|
result[optional] = columnsParseAndValidate[optional].Parse(data[optional]);
|
|
280
281
|
}
|
|
281
|
-
return result;
|
|
282
|
+
return (0, never_catch_1.ok)(result);
|
|
282
283
|
}, Validate: function (data) {
|
|
283
284
|
var dataKey;
|
|
284
285
|
for (dataKey in data) {
|
|
285
286
|
if (!columnsParseAndValidate[dataKey].Validate(data[dataKey])) {
|
|
286
|
-
return
|
|
287
|
+
return (0, never_catch_1.err)(dataKey);
|
|
287
288
|
}
|
|
288
289
|
}
|
|
289
|
-
return
|
|
290
|
+
return (0, never_catch_1.ok)(undefined);
|
|
290
291
|
} }, columnsParseAndValidate);
|
|
291
292
|
};
|
|
292
293
|
exports.createModelUtils = createModelUtils;
|
package/dist/model.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;AAAA,0DAAiC;
|
|
1
|
+
{"version":3,"file":"model.js","sourceRoot":"","sources":["../src/model.ts"],"names":[],"mappings":"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"}
|
package/dist/pool.js
CHANGED
|
@@ -79,7 +79,7 @@ var createPool = function (connectionString) {
|
|
|
79
79
|
case 0: return [4 /*yield*/, callback(client)];
|
|
80
80
|
case 1:
|
|
81
81
|
result = _a.sent();
|
|
82
|
-
if (!result
|
|
82
|
+
if (!result) return [3 /*break*/, 3];
|
|
83
83
|
return [4 /*yield*/, client.query('COMMIT ;')];
|
|
84
84
|
case 2:
|
|
85
85
|
_a.sent();
|
package/dist/pool.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAyC;AAEzC,2CAAyD;AAEzD,IAAM,MAAM,GAAG,UAAK,CAAC,SAAS,CAAC,MAAM,CAAC;AACtC,UAAK,CAAC,SAAS,CAAC,MAAM,GAAG;IAAA,iBAGxB;IAFG,gBAAgB,CAAC,OAAO,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,KAAI,CAAC,IAAI,EAAE,KAAI,CAAC,MAAM,CAAC,EAA5B,CAA4B,CAAC,CAAC;IAC/D,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAgB,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,IAAM,gBAAgB,GAAsB,EAAE,CAAC;AAC/C,IAAM,OAAO,GAAY,UAAC,EAAa;QAAZ,KAAK,WAAA,EAAE,IAAI,UAAA;IAClC,QAAQ,KAAK,EAAE;QACX,KAAK,eAAe;YAChB,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,MAAM;KACb;AACL,CAAC,CAAC;AAoCkB,0BAAO;AAnC3B,IAAM,UAAU,GAAe,UAAC,EAAa;QAAZ,KAAK,WAAA,EAAE,IAAI,UAAA;IACxC,QAAQ,KAAK,EAAE;QACX,KAAK,eAAe;YAChB,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3D,MAAM;KACb;AACL,CAAC,CAAC;AA6B2B,gCAAU;AA3BvC,IAAM,UAAU,GAAG,UAAC,gBAAwB;IACxC,IAAM,IAAI,GAAG,IAAI,SAAM,CAAC,EAAC,gBAAgB,kBAAA,EAAC,CAAC,CAAC;IAC5C,OAAO;QACH,CAAC,EAAE,IAAI;QACP,WAAW,EAAE,UAAC,QAAQ,EAAE,cAA+B;YAA/B,+BAAA,EAAA,+BAA+B;YAAK,OAAA,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,UAAA,MAAM;gBAClF,OAAA,MAAM,CAAC,KAAK,CAAC,4CAAqC,IAAA,wCAA2B,EAAC,cAAc,CAAC,OAAI,CAAC;qBAC7F,IAAI,CAAC;;;;oCACa,qBAAM,QAAQ,CAAC,MAAM,CAAC,EAAA;;gCAA/B,MAAM,GAAG,SAAsB;qCACjC,MAAM,
|
|
1
|
+
{"version":3,"file":"pool.js","sourceRoot":"","sources":["../src/pool.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,yBAAyC;AAEzC,2CAAyD;AAEzD,IAAM,MAAM,GAAG,UAAK,CAAC,SAAS,CAAC,MAAM,CAAC;AACtC,UAAK,CAAC,SAAS,CAAC,MAAM,GAAG;IAAA,iBAGxB;IAFG,gBAAgB,CAAC,OAAO,CAAC,UAAA,IAAI,IAAI,OAAA,IAAI,CAAC,KAAI,CAAC,IAAI,EAAE,KAAI,CAAC,MAAM,CAAC,EAA5B,CAA4B,CAAC,CAAC;IAC/D,MAAM,CAAC,KAAK,CAAC,IAAI,EAAE,SAAgB,CAAC,CAAC;AACzC,CAAC,CAAC;AAEF,IAAM,gBAAgB,GAAsB,EAAE,CAAC;AAC/C,IAAM,OAAO,GAAY,UAAC,EAAa;QAAZ,KAAK,WAAA,EAAE,IAAI,UAAA;IAClC,QAAQ,KAAK,EAAE;QACX,KAAK,eAAe;YAChB,gBAAgB,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YAC5B,MAAM;KACb;AACL,CAAC,CAAC;AAoCkB,0BAAO;AAnC3B,IAAM,UAAU,GAAe,UAAC,EAAa;QAAZ,KAAK,WAAA,EAAE,IAAI,UAAA;IACxC,QAAQ,KAAK,EAAE;QACX,KAAK,eAAe;YAChB,gBAAgB,CAAC,MAAM,CAAC,gBAAgB,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC;YAC3D,MAAM;KACb;AACL,CAAC,CAAC;AA6B2B,gCAAU;AA3BvC,IAAM,UAAU,GAAG,UAAC,gBAAwB;IACxC,IAAM,IAAI,GAAG,IAAI,SAAM,CAAC,EAAC,gBAAgB,kBAAA,EAAC,CAAC,CAAC;IAC5C,OAAO;QACH,CAAC,EAAE,IAAI;QACP,WAAW,EAAE,UAAC,QAAQ,EAAE,cAA+B;YAA/B,+BAAA,EAAA,+BAA+B;YAAK,OAAA,IAAI,CAAC,OAAO,EAAE,CAAC,IAAI,CAAC,UAAA,MAAM;gBAClF,OAAA,MAAM,CAAC,KAAK,CAAC,4CAAqC,IAAA,wCAA2B,EAAC,cAAc,CAAC,OAAI,CAAC;qBAC7F,IAAI,CAAC;;;;oCACa,qBAAM,QAAQ,CAAC,MAAM,CAAC,EAAA;;gCAA/B,MAAM,GAAG,SAAsB;qCACjC,MAAM,EAAN,wBAAM;gCACN,qBAAM,MAAM,CAAC,KAAK,CAAC,UAAU,CAAC,EAAA;;gCAA9B,SAA8B,CAAC;;oCAE/B,qBAAM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAA;;gCAAhC,SAAgC,CAAC;;;gCAErC,MAAM,CAAC,OAAO,EAAE,CAAC;;;;qBACpB,CAAC;qBACD,KAAK,CAAC,UAAO,GAAG;;;;;;gCAET,qBAAM,MAAM,CAAC,KAAK,CAAC,YAAY,CAAC,EAAA;;gCAAhC,SAAgC,CAAC;;;;;;gCAGrC,MAAM,CAAC,OAAO,EAAE,CAAC;gCACjB,MAAM,GAAG,CAAC;;;qBACb,CAAC;YAjBN,CAiBM,CACT;QAnB2D,CAmB3D;KACK,CAAC;AACf,CAAC,CAAC;AAEM,gCAAU"}
|
package/dist/types/model.d.ts
CHANGED
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import type Table from './table';
|
|
2
2
|
import type { ColumnTypeByColumns } from './postgres';
|
|
3
|
+
import { Result } from "never-catch";
|
|
3
4
|
declare type SimpleModel<Columns extends Table['columns']> = {
|
|
4
5
|
[col in keyof Columns & string]: ColumnTypeByColumns<Columns, col>;
|
|
5
6
|
};
|
|
@@ -11,11 +12,11 @@ declare type Model<Columns extends Table['columns'], Requires extends readonly (
|
|
|
11
12
|
declare type ModelUtils<Columns extends Table['columns']> = {
|
|
12
13
|
Parse: <Requires extends readonly (keyof Columns)[], Optionals extends readonly (keyof Columns)[]>(data: {
|
|
13
14
|
[key: string]: string;
|
|
14
|
-
}, requires: Requires, optional: Optionals, validate
|
|
15
|
-
Validate:
|
|
15
|
+
}, requires: Requires, optional: Optionals, validate?: boolean) => Result<Model<Columns, Requires, Optionals>, Requires[Exclude<keyof Requires, keyof unknown[]>] | Optionals[Exclude<keyof Optionals, keyof unknown[]>]>;
|
|
16
|
+
Validate: <D extends Partial<SimpleModel<Columns>>>(data: D) => Result<undefined, keyof D>;
|
|
16
17
|
} & {
|
|
17
18
|
[key in keyof Columns]: {
|
|
18
|
-
Parse: (v: string, validate
|
|
19
|
+
Parse: (v: string, validate?: boolean) => ColumnTypeByColumns<Columns, key> | undefined;
|
|
19
20
|
Validate: (v: ColumnTypeByColumns<Columns, key>) => boolean;
|
|
20
21
|
};
|
|
21
22
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/types/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"model.d.ts","sourceRoot":"","sources":["../../src/types/model.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,KAAK,MAAM,SAAS,CAAC;AACjC,OAAO,KAAK,EAAC,mBAAmB,EAAC,MAAM,YAAY,CAAC;AACpD,OAAO,EAAC,MAAM,EAAC,MAAM,aAAa,CAAC;AAEnC,aAAK,WAAW,CAAC,OAAO,SAAS,KAAK,CAAC,SAAS,CAAC,IAAI;KAAG,GAAG,IAAI,MAAM,OAAO,GAAG,MAAM,GAAG,mBAAmB,CAAC,OAAO,EAAE,GAAG,CAAC;CAAG,CAAC;AAE7H,aAAK,KAAK,CAAC,OAAO,SAAS,KAAK,CAAC,SAAS,CAAC,EAAE,QAAQ,SAAS,SAAS,CAAC,MAAM,OAAO,CAAC,EAAE,EAAE,SAAS,SAAS,SAAS,CAAC,MAAM,OAAO,CAAC,EAAE,IAClI;KACK,GAAG,IAAI,OAAO,CAAC,MAAM,QAAQ,EAAE,MAAM,OAAO,EAAE,CAAC,IAAI,QAAQ,CAAC,GAAG,CAAC,GAAG,MAAM,GAC1E,mBAAmB,CAAC,OAAO,EAAE,QAAQ,CAAC,GAAG,CAAC,GAAG,MAAM,OAAO,CAAC;CAC9D,GACD;KACK,GAAG,IAAI,OAAO,CAAC,MAAM,SAAS,EAAE,MAAM,OAAO,EAAE,CAAC,IAAI,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,CAAC,CAAC,EAC9E,mBAAmB,CAAC,OAAO,EAAE,SAAS,CAAC,GAAG,CAAC,GAAG,MAAM,OAAO,CAAC;CAC/D,CAAC;AAEN,aAAK,UAAU,CAAC,OAAO,SAAS,KAAK,CAAC,SAAS,CAAC,IAAI;IAChD,KAAK,EAAE,CAAC,QAAQ,SAAS,SAAS,CAAC,MAAM,OAAO,CAAC,EAAE,EAAE,SAAS,SAAS,SAAS,CAAC,MAAM,OAAO,CAAC,EAAE,EAC7F,IAAI,EAAE;QAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;KAAE,EAC/B,QAAQ,EAAE,QAAQ,EAClB,QAAQ,EAAE,SAAS,EACnB,QAAQ,CAAC,EAAE,OAAO,KACjB,MAAM,CAAC,KAAK,CAAC,OAAO,EAAE,QAAQ,EAAE,SAAS,CAAC,EAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,QAAQ,EAAE,MAAM,OAAO,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC,OAAO,CAAC,MAAM,SAAS,EAAE,MAAM,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;IAC5J,QAAQ,EAAE,CAAC,CAAC,SAAS,OAAO,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,EAC9C,IAAI,EAAE,CAAC,KACN,MAAM,CAAC,SAAS,EAAE,MAAM,CAAC,CAAC,CAAC;CACnC,GAAG;KACC,GAAG,IAAI,MAAM,OAAO,GAAG;QACpB,KAAK,EAAE,CAAC,CAAC,EAAE,MAAM,EAAE,QAAQ,CAAC,EAAE,OAAO,KAAK,mBAAmB,CAAC,OAAO,EAAE,GAAG,CAAC,GAAG,SAAS,CAAC;QACxF,QAAQ,EAAE,CAAC,CAAC,EAAE,mBAAmB,CAAC,OAAO,EAAE,GAAG,CAAC,KAAK,OAAO,CAAC;KAC/D;CACJ,CAAC;AAEF,YAAY,EACR,WAAW,EACX,KAAK,EACL,UAAU,EACb,CAAC"}
|
package/dist/types/pool.d.ts
CHANGED
|
@@ -1,10 +1,9 @@
|
|
|
1
1
|
import { Param } from './entity';
|
|
2
|
-
import type { Result } from 'never-catch';
|
|
3
2
|
import type { Pool as PgPool, PoolClient } from 'pg';
|
|
4
3
|
declare type TransactionIsolationLevel = 'read-uncommitted' | 'read-committed' | 'repeatable-read' | 'serializable';
|
|
5
4
|
declare type Pool = {
|
|
6
5
|
$: PgPool;
|
|
7
|
-
transaction: (callback: (client: PoolClient) => Promise<
|
|
6
|
+
transaction: (callback: (client: PoolClient) => Promise<boolean>, isolationLevel?: TransactionIsolationLevel) => Promise<void>;
|
|
8
7
|
};
|
|
9
8
|
declare type OnSendQueryHook = (query: string, params: Param[]) => void;
|
|
10
9
|
declare type AddHook = (hookAndEvent: {
|
package/dist/types/pool.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/types/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,UAAU,CAAC;AAC/B,OAAO,KAAK,EAAC,
|
|
1
|
+
{"version":3,"file":"pool.d.ts","sourceRoot":"","sources":["../../src/types/pool.ts"],"names":[],"mappings":"AAAA,OAAO,EAAC,KAAK,EAAC,MAAM,UAAU,CAAC;AAC/B,OAAO,KAAK,EAAC,IAAI,IAAI,MAAM,EAAE,UAAU,EAAC,MAAM,IAAI,CAAC;AAEnD,aAAK,yBAAyB,GAAG,kBAAkB,GAAG,gBAAgB,GAAG,iBAAiB,GAAG,cAAc,CAAC;AAE5G,aAAK,IAAI,GAAG;IACR,CAAC,EAAE,MAAM,CAAC;IACV,WAAW,EAAE,CACT,QAAQ,EAAE,CAAC,MAAM,EAAE,UAAU,KAAK,OAAO,CAAC,OAAO,CAAC,EAClD,cAAc,CAAC,EAAE,yBAAyB,KACzC,OAAO,CAAC,IAAI,CAAC,CAAC;CACtB,CAAC;AAEF,aAAK,eAAe,GAAG,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,IAAI,CAAC;AAChE,aAAK,OAAO,GAAG,CAAC,YAAY,EAAE;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,eAAe,CAAA;CAAE,KAAK,IAAI,CAAC;AACzF,aAAK,UAAU,GAAG,CAAC,YAAY,EAAE;IAAE,KAAK,EAAE,eAAe,CAAC;IAAC,IAAI,EAAE,eAAe,CAAA;CAAE,KAAK,IAAI,CAAC;AAE5F,YAAY,EACR,yBAAyB,EACzB,IAAI,EACJ,eAAe,EACf,OAAO,EACP,UAAU,EACb,CAAC"}
|