@medusajs/medusa 2.6.0-snapshot-20250221164338 → 3.0.0-preview-20250211091350
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/api/admin/draft-orders/[id]/route.d.ts +1 -3
- package/dist/api/admin/draft-orders/[id]/route.d.ts.map +1 -1
- package/dist/api/admin/draft-orders/[id]/route.js +8 -33
- package/dist/api/admin/draft-orders/[id]/route.js.map +1 -1
- package/dist/api/admin/draft-orders/middlewares.d.ts.map +1 -1
- package/dist/api/admin/draft-orders/middlewares.js +4 -11
- package/dist/api/admin/draft-orders/middlewares.js.map +1 -1
- package/dist/api/admin/draft-orders/query-config.d.ts.map +1 -1
- package/dist/api/admin/draft-orders/query-config.js +0 -6
- package/dist/api/admin/draft-orders/query-config.js.map +1 -1
- package/dist/api/admin/draft-orders/route.d.ts +1 -1
- package/dist/api/admin/draft-orders/route.d.ts.map +1 -1
- package/dist/api/admin/draft-orders/route.js +16 -37
- package/dist/api/admin/draft-orders/route.js.map +1 -1
- package/dist/api/admin/draft-orders/validators.d.ts +38 -168
- package/dist/api/admin/draft-orders/validators.d.ts.map +1 -1
- package/dist/api/admin/draft-orders/validators.js +9 -20
- package/dist/api/admin/draft-orders/validators.js.map +1 -1
- package/dist/api/admin/products/middlewares.d.ts.map +1 -1
- package/dist/api/admin/products/middlewares.js +5 -11
- package/dist/api/admin/products/middlewares.js.map +1 -1
- package/dist/api/admin/products/route.d.ts.map +1 -1
- package/dist/api/admin/products/route.js +2 -34
- package/dist/api/admin/products/route.js.map +1 -1
- package/dist/api/admin/products/validators.d.ts +17 -17
- package/dist/api/admin/products/validators.js +2 -2
- package/dist/api/admin/products/validators.js.map +1 -1
- package/dist/api/store/products/helpers.d.ts.map +1 -1
- package/dist/api/store/products/helpers.js.map +1 -1
- package/dist/api/store/products/middlewares.d.ts.map +1 -1
- package/dist/api/store/products/middlewares.js +5 -14
- package/dist/api/store/products/middlewares.js.map +1 -1
- package/dist/api/store/products/route.d.ts +1 -1
- package/dist/api/store/products/route.d.ts.map +1 -1
- package/dist/api/store/products/route.js +2 -54
- package/dist/api/store/products/route.js.map +1 -1
- package/dist/api/store/products/validators.d.ts +6 -6
- package/dist/api/utils/common-validators/products/index.d.ts +12 -12
- package/dist/api/utils/common-validators/products/index.d.ts.map +1 -1
- package/dist/api/utils/common-validators/products/index.js +6 -10
- package/dist/api/utils/common-validators/products/index.js.map +1 -1
- package/dist/commands/plugin/db/generate.d.ts.map +1 -1
- package/dist/commands/plugin/db/generate.js +3 -7
- package/dist/commands/plugin/db/generate.js.map +1 -1
- package/dist/commands/start.d.ts.map +1 -1
- package/dist/commands/start.js +1 -1
- package/dist/commands/start.js.map +1 -1
- package/dist/instrumentation/index.d.ts +4 -3
- package/dist/instrumentation/index.d.ts.map +1 -1
- package/dist/instrumentation/index.js +20 -38
- package/dist/instrumentation/index.js.map +1 -1
- package/dist/tsconfig.tsbuildinfo +1 -1
- package/package.json +49 -52
- package/dist/loaders/feature-flags/index-engine.d.ts +0 -4
- package/dist/loaders/feature-flags/index-engine.d.ts.map +0 -1
- package/dist/loaders/feature-flags/index-engine.js +0 -10
- package/dist/loaders/feature-flags/index-engine.js.map +0 -1
|
@@ -236,8 +236,8 @@ export declare const StoreGetProductsParamsFields: z.ZodObject<{
|
|
|
236
236
|
sales_channel_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
237
237
|
q: z.ZodOptional<z.ZodString>;
|
|
238
238
|
id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
239
|
-
title: z.ZodOptional<z.
|
|
240
|
-
handle: z.ZodOptional<z.
|
|
239
|
+
title: z.ZodOptional<z.ZodString>;
|
|
240
|
+
handle: z.ZodOptional<z.ZodString>;
|
|
241
241
|
is_giftcard: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodString]>, string | boolean, string | boolean>, boolean, string | boolean>>;
|
|
242
242
|
category_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
243
243
|
external_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
@@ -372,8 +372,8 @@ export declare const StoreGetProductsParamsFields: z.ZodObject<{
|
|
|
372
372
|
sales_channel_id?: string | string[] | undefined;
|
|
373
373
|
q?: string | undefined;
|
|
374
374
|
id?: string | string[] | undefined;
|
|
375
|
-
title?: string |
|
|
376
|
-
handle?: string |
|
|
375
|
+
title?: string | undefined;
|
|
376
|
+
handle?: string | undefined;
|
|
377
377
|
is_giftcard?: boolean | undefined;
|
|
378
378
|
category_id?: string | string[] | undefined;
|
|
379
379
|
external_id?: string | string[] | undefined;
|
|
@@ -391,8 +391,8 @@ export declare const StoreGetProductsParamsFields: z.ZodObject<{
|
|
|
391
391
|
sales_channel_id?: string | string[] | undefined;
|
|
392
392
|
q?: string | undefined;
|
|
393
393
|
id?: string | string[] | undefined;
|
|
394
|
-
title?: string |
|
|
395
|
-
handle?: string |
|
|
394
|
+
title?: string | undefined;
|
|
395
|
+
handle?: string | undefined;
|
|
396
396
|
is_giftcard?: string | boolean | undefined;
|
|
397
397
|
category_id?: string | string[] | undefined;
|
|
398
398
|
external_id?: string | string[] | undefined;
|
|
@@ -5,8 +5,8 @@ export declare const ProductStatusEnum: z.ZodNativeEnum<typeof ProductStatus>;
|
|
|
5
5
|
export declare const StoreGetProductParamsDirectFields: z.ZodObject<{
|
|
6
6
|
q: z.ZodOptional<z.ZodString>;
|
|
7
7
|
id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
8
|
-
title: z.ZodOptional<z.
|
|
9
|
-
handle: z.ZodOptional<z.
|
|
8
|
+
title: z.ZodOptional<z.ZodString>;
|
|
9
|
+
handle: z.ZodOptional<z.ZodString>;
|
|
10
10
|
is_giftcard: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodString]>, string | boolean, string | boolean>, boolean, string | boolean>>;
|
|
11
11
|
category_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
12
12
|
external_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
@@ -136,8 +136,8 @@ export declare const StoreGetProductParamsDirectFields: z.ZodObject<{
|
|
|
136
136
|
}, "strip", z.ZodTypeAny, {
|
|
137
137
|
q?: string | undefined;
|
|
138
138
|
id?: string | string[] | undefined;
|
|
139
|
-
title?: string |
|
|
140
|
-
handle?: string |
|
|
139
|
+
title?: string | undefined;
|
|
140
|
+
handle?: string | undefined;
|
|
141
141
|
is_giftcard?: boolean | undefined;
|
|
142
142
|
category_id?: string | string[] | undefined;
|
|
143
143
|
external_id?: string | string[] | undefined;
|
|
@@ -150,8 +150,8 @@ export declare const StoreGetProductParamsDirectFields: z.ZodObject<{
|
|
|
150
150
|
}, {
|
|
151
151
|
q?: string | undefined;
|
|
152
152
|
id?: string | string[] | undefined;
|
|
153
|
-
title?: string |
|
|
154
|
-
handle?: string |
|
|
153
|
+
title?: string | undefined;
|
|
154
|
+
handle?: string | undefined;
|
|
155
155
|
is_giftcard?: string | boolean | undefined;
|
|
156
156
|
category_id?: string | string[] | undefined;
|
|
157
157
|
external_id?: string | string[] | undefined;
|
|
@@ -166,8 +166,8 @@ export declare const GetProductsParams: z.ZodObject<{
|
|
|
166
166
|
sales_channel_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
167
167
|
q: z.ZodOptional<z.ZodString>;
|
|
168
168
|
id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
169
|
-
title: z.ZodOptional<z.
|
|
170
|
-
handle: z.ZodOptional<z.
|
|
169
|
+
title: z.ZodOptional<z.ZodString>;
|
|
170
|
+
handle: z.ZodOptional<z.ZodString>;
|
|
171
171
|
is_giftcard: z.ZodOptional<z.ZodEffects<z.ZodEffects<z.ZodUnion<[z.ZodBoolean, z.ZodString]>, string | boolean, string | boolean>, boolean, string | boolean>>;
|
|
172
172
|
category_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
173
173
|
external_id: z.ZodOptional<z.ZodUnion<[z.ZodString, z.ZodArray<z.ZodString, "many">]>>;
|
|
@@ -298,8 +298,8 @@ export declare const GetProductsParams: z.ZodObject<{
|
|
|
298
298
|
sales_channel_id?: string | string[] | undefined;
|
|
299
299
|
q?: string | undefined;
|
|
300
300
|
id?: string | string[] | undefined;
|
|
301
|
-
title?: string |
|
|
302
|
-
handle?: string |
|
|
301
|
+
title?: string | undefined;
|
|
302
|
+
handle?: string | undefined;
|
|
303
303
|
is_giftcard?: boolean | undefined;
|
|
304
304
|
category_id?: string | string[] | undefined;
|
|
305
305
|
external_id?: string | string[] | undefined;
|
|
@@ -313,8 +313,8 @@ export declare const GetProductsParams: z.ZodObject<{
|
|
|
313
313
|
sales_channel_id?: string | string[] | undefined;
|
|
314
314
|
q?: string | undefined;
|
|
315
315
|
id?: string | string[] | undefined;
|
|
316
|
-
title?: string |
|
|
317
|
-
handle?: string |
|
|
316
|
+
title?: string | undefined;
|
|
317
|
+
handle?: string | undefined;
|
|
318
318
|
is_giftcard?: string | boolean | undefined;
|
|
319
319
|
category_id?: string | string[] | undefined;
|
|
320
320
|
external_id?: string | string[] | undefined;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/api/utils/common-validators/products/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/api/utils/common-validators/products/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,sBAAsB,EAAE,MAAM,2BAA2B,CAAA;AAClE,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAA;AACzD,OAAO,EAAE,CAAC,EAAE,MAAM,KAAK,CAAA;AAIvB,eAAO,MAAM,iBAAiB,uCAA8B,CAAA;AAE5D,eAAO,MAAM,iCAAiC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAc5C,CAAA;AAEF,eAAO,MAAM,iBAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAIa,CAAA;AAE3C,KAAK,kBAAkB,GAAG,sBAAsB,GAAG;IACjD,MAAM,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;IAC1B,WAAW,CAAC,EAAE,MAAM,GAAG,MAAM,EAAE,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,sBAAsB,SAC3B,kBAAkB,KACvB,sBAWF,CAAA"}
|
|
@@ -9,8 +9,8 @@ exports.ProductStatusEnum = zod_1.z.nativeEnum(utils_1.ProductStatus);
|
|
|
9
9
|
exports.StoreGetProductParamsDirectFields = zod_1.z.object({
|
|
10
10
|
q: zod_1.z.string().optional(),
|
|
11
11
|
id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
|
|
12
|
-
title: zod_1.z.
|
|
13
|
-
handle: zod_1.z.
|
|
12
|
+
title: zod_1.z.string().optional(),
|
|
13
|
+
handle: zod_1.z.string().optional(),
|
|
14
14
|
is_giftcard: (0, common_1.booleanString)().optional(),
|
|
15
15
|
category_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
|
|
16
16
|
external_id: zod_1.z.union([zod_1.z.string(), zod_1.z.array(zod_1.z.string())]).optional(),
|
|
@@ -29,15 +29,11 @@ exports.GetProductsParams = zod_1.z
|
|
|
29
29
|
const transformProductParams = (data) => {
|
|
30
30
|
const res = {
|
|
31
31
|
...data,
|
|
32
|
+
tags: { id: data.tag_id },
|
|
33
|
+
categories: { id: data.category_id },
|
|
32
34
|
};
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
delete res.tag_id;
|
|
36
|
-
}
|
|
37
|
-
if ((0, utils_1.isPresent)(data.category_id)) {
|
|
38
|
-
res.categories = { id: data.category_id };
|
|
39
|
-
delete res.category_id;
|
|
40
|
-
}
|
|
35
|
+
delete res.tag_id;
|
|
36
|
+
delete res.category_id;
|
|
41
37
|
return res;
|
|
42
38
|
};
|
|
43
39
|
exports.transformProductParams = transformProductParams;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/utils/common-validators/products/index.ts"],"names":[],"mappings":";;;AACA,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/api/utils/common-validators/products/index.ts"],"names":[],"mappings":";;;AACA,qDAAyD;AACzD,6BAAuB;AACvB,iDAAoD;AACpD,sCAAyC;AAE5B,QAAA,iBAAiB,GAAG,OAAC,CAAC,UAAU,CAAC,qBAAa,CAAC,CAAA;AAE/C,QAAA,iCAAiC,GAAG,OAAC,CAAC,MAAM,CAAC;IACxD,CAAC,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IACxB,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACzD,KAAK,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC5B,MAAM,EAAE,OAAC,CAAC,MAAM,EAAE,CAAC,QAAQ,EAAE;IAC7B,WAAW,EAAE,IAAA,sBAAa,GAAE,CAAC,QAAQ,EAAE;IACvC,WAAW,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClE,WAAW,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAClE,aAAa,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IACpE,MAAM,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC7D,OAAO,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;IAC9D,UAAU,EAAE,IAAA,8BAAiB,GAAE,CAAC,QAAQ,EAAE;IAC1C,UAAU,EAAE,IAAA,8BAAiB,GAAE,CAAC,QAAQ,EAAE;IAC1C,UAAU,EAAE,IAAA,8BAAiB,GAAE,CAAC,QAAQ,EAAE;CAC3C,CAAC,CAAA;AAEW,QAAA,iBAAiB,GAAG,OAAC;KAC/B,MAAM,CAAC;IACN,gBAAgB,EAAE,OAAC,CAAC,KAAK,CAAC,CAAC,OAAC,CAAC,MAAM,EAAE,EAAE,OAAC,CAAC,KAAK,CAAC,OAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,CAAC,QAAQ,EAAE;CACxE,CAAC;KACD,KAAK,CAAC,yCAAiC,CAAC,CAAA;AAOpC,MAAM,sBAAsB,GAAG,CACpC,IAAwB,EACA,EAAE;IAC1B,MAAM,GAAG,GAAG;QACV,GAAG,IAAI;QACP,IAAI,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,MAAM,EAAE;QACzB,UAAU,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,WAAW,EAAE;KACrC,CAAA;IAED,OAAO,GAAG,CAAC,MAAM,CAAA;IACjB,OAAO,GAAG,CAAC,WAAW,CAAA;IAEtB,OAAO,GAA6B,CAAA;AACtC,CAAC,CAAA;AAbY,QAAA,sBAAsB,0BAalC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/commands/plugin/db/generate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/commands/plugin/db/generate.ts"],"names":[],"mappings":"AAcA;;GAEG;AACH,QAAA,MAAM,IAAI;;oBAyCT,CAAA;AA4ED,eAAe,IAAI,CAAA"}
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
"use strict";
|
|
2
2
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
const glob_1 = require("glob");
|
|
4
3
|
const logger_1 = require("@medusajs/framework/logger");
|
|
5
4
|
const utils_1 = require("@medusajs/framework/utils");
|
|
6
5
|
const path_1 = require("path");
|
|
7
6
|
const core_1 = require("@mikro-orm/core");
|
|
8
7
|
const postgresql_1 = require("@mikro-orm/postgresql");
|
|
8
|
+
const glob_1 = require("glob");
|
|
9
9
|
const TERMINAL_SIZE = process.stdout.columns;
|
|
10
10
|
/**
|
|
11
11
|
* Generate migrations for all scanned modules in a plugin
|
|
@@ -13,7 +13,7 @@ const TERMINAL_SIZE = process.stdout.columns;
|
|
|
13
13
|
const main = async function ({ directory }) {
|
|
14
14
|
try {
|
|
15
15
|
const moduleDescriptors = [];
|
|
16
|
-
const modulePaths = glob_1.glob.sync((0,
|
|
16
|
+
const modulePaths = glob_1.glob.sync((0, path_1.join)(directory, "src", "modules", "*", "index.ts"));
|
|
17
17
|
for (const path of modulePaths) {
|
|
18
18
|
const moduleDirname = (0, path_1.dirname)(path);
|
|
19
19
|
const serviceName = await getModuleServiceName(path);
|
|
@@ -41,7 +41,7 @@ const main = async function ({ directory }) {
|
|
|
41
41
|
};
|
|
42
42
|
async function getEntitiesForModule(path) {
|
|
43
43
|
const entities = [];
|
|
44
|
-
const entityPaths = glob_1.glob.sync((0,
|
|
44
|
+
const entityPaths = glob_1.glob.sync((0, path_1.join)(path, "models", "*.ts"), {
|
|
45
45
|
ignore: ["**/index.{js,ts}", "**/*.d.ts"],
|
|
46
46
|
});
|
|
47
47
|
for (const entityPath of entityPaths) {
|
|
@@ -66,17 +66,13 @@ async function generateMigrations(moduleDescriptors = []) {
|
|
|
66
66
|
const DB_HOST = process.env.DB_HOST ?? "localhost";
|
|
67
67
|
const DB_USERNAME = process.env.DB_USERNAME ?? "";
|
|
68
68
|
const DB_PASSWORD = process.env.DB_PASSWORD ?? "";
|
|
69
|
-
const DB_PORT = process.env.DB_PORT ? Number(process.env.DB_PORT) : 5432;
|
|
70
|
-
const DATABASE_URL = process.env.DATABASE_URL;
|
|
71
69
|
for (const moduleDescriptor of moduleDescriptors) {
|
|
72
70
|
logger_1.logger.info(`Generating migrations for module ${moduleDescriptor.serviceName}...`);
|
|
73
71
|
const mikroOrmConfig = (0, utils_1.defineMikroOrmCliConfig)(moduleDescriptor.serviceName, {
|
|
74
72
|
entities: moduleDescriptor.entities,
|
|
75
73
|
host: DB_HOST,
|
|
76
|
-
port: DB_PORT,
|
|
77
74
|
user: DB_USERNAME,
|
|
78
75
|
password: DB_PASSWORD,
|
|
79
|
-
...(DATABASE_URL ? { clientUrl: DATABASE_URL } : {}),
|
|
80
76
|
migrations: {
|
|
81
77
|
path: moduleDescriptor.migrationsPath,
|
|
82
78
|
},
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/plugin/db/generate.ts"],"names":[],"mappings":";;AAAA
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/commands/plugin/db/generate.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AA2BA;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,iBAoB9D;AAED;;;GAGG;AAEH,eAAO,IAAI,mBAAmB,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAiB,CAAA;AAqEhF,iBAAe,KAAK,CAAC,IAAI,EAAE;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,
|
|
1
|
+
{"version":3,"file":"start.d.ts","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"AA2BA;;;;;GAKG;AACH,wBAAsB,uBAAuB,CAAC,SAAS,EAAE,MAAM,iBAoB9D;AAED;;;GAGG;AAEH,eAAO,IAAI,mBAAmB,EAAE,CAAC,GAAG,IAAI,EAAE,GAAG,EAAE,KAAK,OAAO,CAAC,GAAG,CAAiB,CAAA;AAqEhF,iBAAe,KAAK,CAAC,IAAI,EAAE;IACzB,SAAS,EAAE,MAAM,CAAA;IACjB,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,IAAI,CAAC,EAAE,MAAM,CAAA;IACb,KAAK,CAAC,EAAE,OAAO,CAAA;IACf,OAAO,CAAC,EAAE,MAAM,CAAA;CACjB,iBA+JA;AAED,eAAe,KAAK,CAAA"}
|
package/dist/commands/start.js
CHANGED
|
@@ -137,7 +137,7 @@ async function start(args) {
|
|
|
137
137
|
res.status(200).send("OK");
|
|
138
138
|
});
|
|
139
139
|
const server = utils_1.GracefulShutdownServer.create(http_.listen(port, host).on("listening", () => {
|
|
140
|
-
logger_1.logger.success(serverActivity, `Server is ready on
|
|
140
|
+
logger_1.logger.success(serverActivity, `Server is ready on http://${host || "localhost"}:${port}`);
|
|
141
141
|
displayAdminUrl({ container, host, port });
|
|
142
142
|
(0, telemetry_1.track)("CLI_START_COMPLETED");
|
|
143
143
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"start.js","sourceRoot":"","sources":["../../src/commands/start.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import type { SpanExporter } from "@opentelemetry/sdk-trace-node";
|
|
2
|
-
import type {
|
|
2
|
+
import type { Instrumentation } from "@opentelemetry/instrumentation";
|
|
3
3
|
/**
|
|
4
4
|
* Instrument the first touch point of the HTTP layer to report traces to
|
|
5
5
|
* OpenTelemetry
|
|
@@ -26,14 +26,15 @@ export declare function instrumentWorkflows(): void;
|
|
|
26
26
|
* - @opentelemetry/instrumentation-pg
|
|
27
27
|
* - @opentelemetry/instrumentation
|
|
28
28
|
*/
|
|
29
|
-
export declare function registerOtel(options:
|
|
29
|
+
export declare function registerOtel(options: {
|
|
30
30
|
serviceName: string;
|
|
31
|
-
exporter
|
|
31
|
+
exporter: SpanExporter;
|
|
32
32
|
instrument?: Partial<{
|
|
33
33
|
http: boolean;
|
|
34
34
|
query: boolean;
|
|
35
35
|
workflows: boolean;
|
|
36
36
|
db: boolean;
|
|
37
37
|
}>;
|
|
38
|
+
instrumentations?: Instrumentation[];
|
|
38
39
|
}): any;
|
|
39
40
|
//# sourceMappingURL=index.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/instrumentation/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/instrumentation/index.ts"],"names":[],"mappings":"AASA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAA;AACjE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,gCAAgC,CAAA;AAWrE;;;GAGG;AACH,wBAAgB,mBAAmB,SA6GlC;AAED;;GAEG;AACH,wBAAgB,qBAAqB,SA2EpC;AAED;;GAEG;AACH,wBAAgB,mBAAmB,SAsClC;AAED;;;;;;;;;;;;GAYG;AACH,wBAAgB,YAAY,CAAC,OAAO,EAAE;IACpC,WAAW,EAAE,MAAM,CAAA;IACnB,QAAQ,EAAE,YAAY,CAAA;IACtB,UAAU,CAAC,EAAE,OAAO,CAAC;QACnB,IAAI,EAAE,OAAO,CAAA;QACb,KAAK,EAAE,OAAO,CAAA;QACd,SAAS,EAAE,OAAO,CAAA;QAClB,EAAE,EAAE,OAAO,CAAA;KACZ,CAAC,CAAA;IACF,gBAAgB,CAAC,EAAE,eAAe,EAAE,CAAA;CACrC,OAiCA"}
|
|
@@ -121,19 +121,14 @@ function instrumentRemoteQuery() {
|
|
|
121
121
|
span.setAttributes({
|
|
122
122
|
"query.fields": queryOptions.fields,
|
|
123
123
|
});
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
}
|
|
127
|
-
catch (err) {
|
|
124
|
+
return await queryFn()
|
|
125
|
+
.catch((error) => {
|
|
128
126
|
span.setStatus({
|
|
129
127
|
code: SpanStatusCode.ERROR,
|
|
130
|
-
message:
|
|
128
|
+
message: error.message,
|
|
131
129
|
});
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
finally {
|
|
135
|
-
span.end();
|
|
136
|
-
}
|
|
130
|
+
})
|
|
131
|
+
.finally(() => span.end());
|
|
137
132
|
});
|
|
138
133
|
});
|
|
139
134
|
framework_1.Query.instrument.remoteQuery(async function (queryFn, queryOptions) {
|
|
@@ -148,19 +143,14 @@ function instrumentRemoteQuery() {
|
|
|
148
143
|
span.setAttributes({
|
|
149
144
|
"query.fields": "fields" in queryOptions ? queryOptions.fields : [],
|
|
150
145
|
});
|
|
151
|
-
|
|
152
|
-
|
|
153
|
-
}
|
|
154
|
-
catch (error) {
|
|
146
|
+
return await queryFn()
|
|
147
|
+
.catch((error) => {
|
|
155
148
|
span.setStatus({
|
|
156
149
|
code: SpanStatusCode.ERROR,
|
|
157
150
|
message: error.message,
|
|
158
151
|
});
|
|
159
|
-
|
|
160
|
-
|
|
161
|
-
finally {
|
|
162
|
-
span.end();
|
|
163
|
-
}
|
|
152
|
+
})
|
|
153
|
+
.finally(() => span.end());
|
|
164
154
|
});
|
|
165
155
|
});
|
|
166
156
|
framework_1.Query.instrument.remoteDataFetch(async function (fetchFn, serviceName, method, options) {
|
|
@@ -169,19 +159,14 @@ function instrumentRemoteQuery() {
|
|
|
169
159
|
"fetch.select": options.select,
|
|
170
160
|
"fetch.relations": options.relations,
|
|
171
161
|
});
|
|
172
|
-
|
|
173
|
-
|
|
174
|
-
}
|
|
175
|
-
catch (error) {
|
|
162
|
+
return await fetchFn()
|
|
163
|
+
.catch((error) => {
|
|
176
164
|
span.setStatus({
|
|
177
165
|
code: SpanStatusCode.ERROR,
|
|
178
166
|
message: error.message,
|
|
179
167
|
});
|
|
180
|
-
|
|
181
|
-
|
|
182
|
-
finally {
|
|
183
|
-
span.end();
|
|
184
|
-
}
|
|
168
|
+
})
|
|
169
|
+
.finally(() => span.end());
|
|
185
170
|
});
|
|
186
171
|
});
|
|
187
172
|
}
|
|
@@ -206,7 +191,6 @@ function instrumentWorkflows() {
|
|
|
206
191
|
Object.entries(metadata).forEach(([key, value]) => {
|
|
207
192
|
span.setAttribute(`workflow.step.${key}`, value);
|
|
208
193
|
});
|
|
209
|
-
// TODO: should we report error and re throw it?
|
|
210
194
|
return await stepHandler().finally(() => span.end());
|
|
211
195
|
});
|
|
212
196
|
};
|
|
@@ -225,14 +209,11 @@ function instrumentWorkflows() {
|
|
|
225
209
|
* - @opentelemetry/instrumentation
|
|
226
210
|
*/
|
|
227
211
|
function registerOtel(options) {
|
|
228
|
-
const { exporter, serviceName, instrument, instrumentations, ...nodeSdkOptions } = {
|
|
229
|
-
instrument: {},
|
|
230
|
-
instrumentations: [],
|
|
231
|
-
...options,
|
|
232
|
-
};
|
|
233
212
|
const { Resource } = require("@opentelemetry/resources");
|
|
234
213
|
const { NodeSDK } = require("@opentelemetry/sdk-node");
|
|
235
214
|
const { SimpleSpanProcessor } = require("@opentelemetry/sdk-trace-node");
|
|
215
|
+
const instrument = options.instrument || {};
|
|
216
|
+
const instrumentations = options.instrumentations || [];
|
|
236
217
|
if (instrument.db) {
|
|
237
218
|
const { PgInstrumentation } = require("@opentelemetry/instrumentation-pg");
|
|
238
219
|
instrumentations.push(new PgInstrumentation());
|
|
@@ -247,10 +228,11 @@ function registerOtel(options) {
|
|
|
247
228
|
instrumentWorkflows();
|
|
248
229
|
}
|
|
249
230
|
const sdk = new NodeSDK({
|
|
250
|
-
serviceName,
|
|
251
|
-
resource: new Resource({
|
|
252
|
-
|
|
253
|
-
|
|
231
|
+
serviceName: options.serviceName,
|
|
232
|
+
resource: new Resource({
|
|
233
|
+
"service.name": options.serviceName,
|
|
234
|
+
}),
|
|
235
|
+
spanProcessor: new SimpleSpanProcessor(options.exporter),
|
|
254
236
|
instrumentations: instrumentations,
|
|
255
237
|
});
|
|
256
238
|
sdk.start();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/instrumentation/index.ts"],"names":[],"mappings":";;AAyBA,kDA6GC;AAKD,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/instrumentation/index.ts"],"names":[],"mappings":";;AAyBA,kDA6GC;AAKD,sDA2EC;AAKD,kDAsCC;AAeD,oCA2CC;AA3TD,mCAAkC;AAClC,mDAK4B;AAC5B,mDAA0D;AAC1D,6DAAsD;AAGtD,qEAA2E;AAE3E,MAAM,kBAAkB,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAA;AAEhD,SAAS,qBAAqB,CAAC,QAAgB;IAC7C,OAAO,kBAAkB,CAAC,IAAI,CAAC,CAAC,gBAAgB,EAAE,EAAE,CAClD,QAAQ,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CACpC,CAAA;AACH,CAAC;AAED;;;GAGG;AACH,SAAgB,mBAAmB;IACjC,MAAM,YAAY,GAAG,OAAO,CAAC,mBAAmB,CAAC,CAAA;IACjD,MAAM,UAAU,GAAG,IAAI,kBAAM,CAAC,gBAAgB,EAAE,OAAO,CAAC,CAAA;IACxD,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;IAExD,YAAY,CAAC,mBAAmB,GAAG,KAAK,EACtC,cAAc,EACd,GAAG,EACH,GAAG,EACH,WAAW,EACX,EAAE;QACF,IAAI,qBAAqB,CAAC,GAAG,CAAC,GAAI,CAAC,EAAE,CAAC;YACpC,OAAO,MAAM,cAAc,EAAE,CAAA;QAC/B,CAAC;QAED,MAAM,SAAS,GAAG,WAAW,IAAI,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,GAAG,EAAE,CAAA;QAC3D,MAAM,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;YAC/C,IAAI,CAAC,aAAa,CAAC;gBACjB,YAAY,EAAE,WAAW;gBACzB,UAAU,EAAE,GAAG,CAAC,GAAG;gBACnB,aAAa,EAAE,GAAG,CAAC,MAAM;gBACzB,GAAG,GAAG,CAAC,OAAO;aACf,CAAC,CAAA;YAEF,IAAI,CAAC;gBACH,MAAM,cAAc,EAAE,CAAA;YACxB,CAAC;oBAAS,CAAC;gBACT,IAAI,GAAG,CAAC,UAAU,IAAI,GAAG,EAAE,CAAC;oBAC1B,IAAI,CAAC,SAAS,CAAC;wBACb,IAAI,EAAE,cAAc,CAAC,KAAK;wBAC1B,OAAO,EAAE,eAAe,GAAG,CAAC,aAAa,EAAE;qBAC5C,CAAC,CAAA;gBACJ,CAAC;gBACD,IAAI,CAAC,aAAa,CAAC,EAAE,iBAAiB,EAAE,GAAG,CAAC,UAAU,EAAE,CAAC,CAAA;gBACzD,IAAI,CAAC,GAAG,EAAE,CAAA;YACZ,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC,CAAA;IAED;;;OAGG;IACH,sBAAe,CAAC,UAAU,GAAG,CAAC,OAAO,EAAE,EAAE;QACvC,OAAO,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;YACxB,IAAI,qBAAqB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC3C,OAAO,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;YAChC,CAAC;YAED,MAAM,KAAK,GAAG,GAAG,CAAC,KAAK,EAAE,IAAI,IAAI,GAAG,GAAG,CAAC,MAAM,IAAI,GAAG,CAAC,WAAW,EAAE,CAAA;YACnE,MAAM,SAAS,GAAG,kBAAkB,KAAK,EAAE,CAAA;YAE3C,MAAM,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC/C,IAAI,CAAC;oBACH,MAAM,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;gBACzB,CAAC;gBAAC,OAAO,KAAK,EAAE,CAAC;oBACf,IAAI,CAAC,SAAS,CAAC;wBACb,IAAI,EAAE,cAAc,CAAC,KAAK;wBAC1B,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,QAAQ;qBACnC,CAAC,CAAA;oBACF,MAAM,KAAK,CAAA;gBACb,CAAC;wBAAS,CAAC;oBACT,IAAI,CAAC,GAAG,EAAE,CAAA;gBACZ,CAAC;YACH,CAAC,CAAC,CAAA;QACJ,CAAC,CAAA;IACH,CAAC,CAAA;IAED;;;OAGG;IACH,sBAAe,CAAC,eAAe,GAAG,CAAC,OAAO,EAAE,EAAE;QAC5C,OAAO,KAAK,EACV,GAAuB,EACvB,GAAmB,EACnB,IAAwB,EACxB,EAAE;YACF,IAAI,qBAAqB,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC;gBAC3C,OAAO,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,IAAI,CAAC,CAAA;YAChC,CAAC;YAED,MAAM,SAAS,GAAG,eAChB,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,IAAA,kBAAS,EAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,WAC3C,EAAE,CAAA;YAEF,MAAM,UAAU,CAAC,KAAK,CAAC,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE;gBAC/C,OAAO,IAAI,OAAO,CAAO,CAAC,OAAO,EAAE,MAAM,EAAE,EAAE;oBAC3C,MAAM,KAAK,GAAG,CAAC,KAAW,EAAE,EAAE;wBAC5B,IAAI,KAAK,EAAE,CAAC;4BACV,IAAI,CAAC,SAAS,CAAC;gCACb,IAAI,EAAE,cAAc,CAAC,KAAK;gCAC1B,OAAO,EAAE,KAAK,CAAC,OAAO,IAAI,QAAQ;6BACnC,CAAC,CAAA;4BACF,IAAI,CAAC,GAAG,EAAE,CAAA;4BACV,MAAM,CAAC,KAAK,CAAC,CAAA;wBACf,CAAC;6BAAM,CAAC;4BACN,IAAI,CAAC,GAAG,EAAE,CAAA;4BACV,OAAO,EAAE,CAAA;wBACX,CAAC;oBACH,CAAC,CAAA;oBAED,OAAO,CAAC,GAAG,EAAE,GAAG,EAAE,KAAK,CAAC,CAAA;gBAC1B,CAAC,CAAC,CAAA;YACJ,CAAC,CAAC;iBACC,KAAK,CAAC,IAAI,CAAC;iBACX,IAAI,CAAC,IAAI,CAAC,CAAA;QACf,CAAC,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAED;;GAEG;AACH,SAAgB,qBAAqB;IACnC,MAAM,WAAW,GAAG,IAAI,kBAAM,CAAC,iBAAiB,EAAE,OAAO,CAAC,CAAA;IAC1D,MAAM,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC,oBAAoB,CAAC,CAAA;IAExD,iBAAK,CAAC,UAAU,CAAC,UAAU,CAAC,KAAK,WAAW,OAAO,EAAE,YAAY;QAC/D,OAAO,MAAM,WAAW,CAAC,KAAK,CAC5B,gBAAgB,YAAY,CAAC,MAAM,EAAE,EACrC,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,IAAI,CAAC,aAAa,CAAC;gBACjB,cAAc,EAAE,YAAY,CAAC,MAAM;aACpC,CAAC,CAAA;YACF,OAAO,MAAM,OAAO,EAAE;iBACnB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,cAAc,CAAC,KAAK;oBAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB,CAAC,CAAA;YACJ,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;QAC9B,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,iBAAK,CAAC,UAAU,CAAC,WAAW,CAAC,KAAK,WAAW,OAAO,EAAE,YAAY;QAChE,MAAM,eAAe,GACnB,YAAY,IAAI,YAAY;YAC1B,CAAC,CAAC,YAAY,CAAC,UAAU;YACzB,CAAC,CAAC,SAAS,IAAI,YAAY;gBAC3B,CAAC,CAAC,YAAY,CAAC,OAAO;gBACtB,CAAC,CAAC,SAAS,IAAI,YAAY;oBAC3B,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,YAAY,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;oBACtC,CAAC,CAAC,gBAAgB,CAAA;QAEtB,OAAO,MAAM,WAAW,CAAC,KAAK,CAC5B,gBAAgB,eAAe,EAAE,EACjC,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,IAAI,CAAC,aAAa,CAAC;gBACjB,cAAc,EAAE,QAAQ,IAAI,YAAY,CAAC,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE;aACpE,CAAC,CAAA;YACF,OAAO,MAAM,OAAO,EAAE;iBACnB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,cAAc,CAAC,KAAK;oBAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB,CAAC,CAAA;YACJ,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;QAC9B,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;IAEF,iBAAK,CAAC,UAAU,CAAC,eAAe,CAAC,KAAK,WACpC,OAAO,EACP,WAAW,EACX,MAAM,EACN,OAAO;QAEP,OAAO,MAAM,WAAW,CAAC,KAAK,CAC5B,GAAG,IAAA,kBAAS,EAAC,WAAW,CAAC,IAAI,IAAA,kBAAS,EAAC,MAAM,CAAC,EAAE,EAChD,KAAK,EAAE,IAAI,EAAE,EAAE;YACb,IAAI,CAAC,aAAa,CAAC;gBACjB,cAAc,EAAE,OAAO,CAAC,MAAM;gBAC9B,iBAAiB,EAAE,OAAO,CAAC,SAAS;aACrC,CAAC,CAAA;YACF,OAAO,MAAM,OAAO,EAAE;iBACnB,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE;gBACf,IAAI,CAAC,SAAS,CAAC;oBACb,IAAI,EAAE,cAAc,CAAC,KAAK;oBAC1B,OAAO,EAAE,KAAK,CAAC,OAAO;iBACvB,CAAC,CAAA;YACJ,CAAC,CAAC;iBACD,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;QAC9B,CAAC,CACF,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC;AAED;;GAEG;AACH,SAAgB,mBAAmB;IACjC,MAAM,eAAe,GAAG,IAAI,kBAAM,CAChC,mCAAmC,EACnC,OAAO,CACR,CAAA;IAED,uCAAuB,CAAC,gBAAgB,GAAG,KAAK,EAC9C,mBAAmB,EACnB,QAAQ,EACR,EAAE;QACF,OAAO,MAAM,eAAe,CAAC,KAAK,CAChC,YAAY,IAAA,kBAAS,EAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,EAC1C,KAAK,WAAW,IAAI;YAClB,IAAI,CAAC,YAAY,CAAC,yBAAyB,EAAE,QAAQ,CAAC,cAAc,CAAC,CAAA;YAErE,IAAI,QAAQ,CAAC,aAAa,EAAE,CAAC;gBAC3B,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,aAAa,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;oBAC9D,IAAI,CAAC,YAAY,CAAC,0BAA0B,GAAG,EAAE,EAAE,KAAe,CAAC,CAAA;gBACrE,CAAC,CAAC,CAAA;YACJ,CAAC;YAED,OAAO,MAAM,mBAAmB,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;QAC9D,CAAC,CACF,CAAA;IACH,CAAC,CAAA;IAED,uCAAuB,CAAC,SAAS,GAAG,KAAK,EAAE,WAAW,EAAE,QAAQ,EAAE,EAAE;QAClE,OAAO,MAAM,eAAe,CAAC,KAAK,CAChC,QAAQ,IAAA,kBAAS,EAAC,QAAQ,CAAC,MAAM,CAAC,IAAI,QAAQ,CAAC,IAAI,EAAE,EACrD,KAAK,WAAW,IAAI;YAClB,MAAM,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,GAAG,EAAE,KAAK,CAAC,EAAE,EAAE;gBAChD,IAAI,CAAC,YAAY,CAAC,iBAAiB,GAAG,EAAE,EAAE,KAAK,CAAC,CAAA;YAClD,CAAC,CAAC,CAAA;YAEF,OAAO,MAAM,WAAW,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,GAAG,EAAE,CAAC,CAAA;QACtD,CAAC,CACF,CAAA;IACH,CAAC,CAAA;AACH,CAAC;AAED;;;;;;;;;;;;GAYG;AACH,SAAgB,YAAY,CAAC,OAU5B;IACC,MAAM,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC,0BAA0B,CAAC,CAAA;IACxD,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC,yBAAyB,CAAC,CAAA;IACtD,MAAM,EAAE,mBAAmB,EAAE,GAAG,OAAO,CAAC,+BAA+B,CAAC,CAAA;IAExE,MAAM,UAAU,GAAG,OAAO,CAAC,UAAU,IAAI,EAAE,CAAA;IAC3C,MAAM,gBAAgB,GAAG,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAA;IAEvD,IAAI,UAAU,CAAC,EAAE,EAAE,CAAC;QAClB,MAAM,EAAE,iBAAiB,EAAE,GAAG,OAAO,CAAC,mCAAmC,CAAC,CAAA;QAC1E,gBAAgB,CAAC,IAAI,CAAC,IAAI,iBAAiB,EAAE,CAAC,CAAA;IAChD,CAAC;IACD,IAAI,UAAU,CAAC,IAAI,EAAE,CAAC;QACpB,mBAAmB,EAAE,CAAA;IACvB,CAAC;IACD,IAAI,UAAU,CAAC,KAAK,EAAE,CAAC;QACrB,qBAAqB,EAAE,CAAA;IACzB,CAAC;IACD,IAAI,UAAU,CAAC,SAAS,EAAE,CAAC;QACzB,mBAAmB,EAAE,CAAA;IACvB,CAAC;IAED,MAAM,GAAG,GAAG,IAAI,OAAO,CAAC;QACtB,WAAW,EAAE,OAAO,CAAC,WAAW;QAChC,QAAQ,EAAE,IAAI,QAAQ,CAAC;YACrB,cAAc,EAAE,OAAO,CAAC,WAAW;SACpC,CAAC;QACF,aAAa,EAAE,IAAI,mBAAmB,CAAC,OAAO,CAAC,QAAQ,CAAC;QACxD,gBAAgB,EAAE,gBAAgB;KACnC,CAAC,CAAA;IAEF,GAAG,CAAC,KAAK,EAAE,CAAA;IACX,OAAO,GAAG,CAAA;AACZ,CAAC"}
|