@mathrunet/masamune 1.9.0 → 1.10.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +18 -0
- package/dist/functions/geocoding.js +3 -2
- package/dist/functions/geocoding.js.map +1 -1
- package/dist/functions/scheduler.js +15 -6
- package/dist/functions/scheduler.js.map +1 -1
- package/dist/functions/send_notification.js +2 -4
- package/dist/functions/send_notification.js.map +1 -1
- package/dist/lib/send_notification.d.ts +1 -1
- package/dist/lib/send_notification.js +26 -17
- package/dist/lib/send_notification.js.map +1 -1
- package/package.json +1 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,21 @@
|
|
|
1
|
+
# [1.10.0](https://github.com/mathrunet/node_masamune/compare/v1.9.1...v1.10.0) (2023-12-14)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### feat
|
|
5
|
+
|
|
6
|
+
* Support for sending multiple tokens. ([6d16257](https://github.com/mathrunet/node_masamune/commit/6d16257242a9ad9d8b0709992c30892eb80fdb10))
|
|
7
|
+
|
|
8
|
+
|
|
9
|
+
|
|
10
|
+
## [1.9.1](https://github.com/mathrunet/node_masamune/compare/v1.9.0...v1.9.1) (2023-11-29)
|
|
11
|
+
|
|
12
|
+
|
|
13
|
+
### fix
|
|
14
|
+
|
|
15
|
+
* Config changes. ([b459970](https://github.com/mathrunet/node_masamune/commit/b45997023ff0f2d763dd41fe16bf0263cac056cb))
|
|
16
|
+
|
|
17
|
+
|
|
18
|
+
|
|
1
19
|
# [1.9.0](https://github.com/mathrunet/node_masamune/compare/v1.8.5...v1.9.0) (2023-11-29)
|
|
2
20
|
|
|
3
21
|
|
|
@@ -39,7 +39,7 @@ const api_1 = require("../lib/api");
|
|
|
39
39
|
*
|
|
40
40
|
* GeocodingAPIで緯度経度を取得します。
|
|
41
41
|
*
|
|
42
|
-
* @param {string} map.api_key
|
|
42
|
+
* @param {string} map.geocoding.api_key
|
|
43
43
|
* API key for GoogleMapGeocodingAPI. Follow the steps below to issue it.
|
|
44
44
|
* https://mathru.notion.site/Google-Map-API-API-e9a65fba9795450fb9a252ab4e631ace?pvs=4
|
|
45
45
|
* GoogleMapGeocodingAPI用のAPIキー。下記の手順で発行します。
|
|
@@ -52,13 +52,14 @@ const api_1 = require("../lib/api");
|
|
|
52
52
|
module.exports = (regions, timeoutSeconds, data) => functions.runWith({ timeoutSeconds: timeoutSeconds }).region(...regions).https.onCall((query) => __awaiter(void 0, void 0, void 0, function* () {
|
|
53
53
|
try {
|
|
54
54
|
const address = query.address;
|
|
55
|
-
const config = functions.config().map;
|
|
55
|
+
const config = functions.config().map.geocoding;
|
|
56
56
|
const apiKey = config.api_key;
|
|
57
57
|
if (!address) {
|
|
58
58
|
throw new functions.https.HttpsError("invalid-argument", "Query parameter is invalid.");
|
|
59
59
|
}
|
|
60
60
|
const res = yield api_1.Api.get(`https://maps.googleapis.com/maps/api/geocode/json?address=${encodeURIComponent(address)}&key=${apiKey}`);
|
|
61
61
|
const json = (yield res.json());
|
|
62
|
+
console.log(json);
|
|
62
63
|
return Object.assign({ success: true }, json);
|
|
63
64
|
}
|
|
64
65
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"geocoding.js","sourceRoot":"","sources":["../../src/functions/geocoding.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,oCAAiC;AAEjC;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,cAAsB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAChL,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC;
|
|
1
|
+
{"version":3,"file":"geocoding.js","sourceRoot":"","sources":["../../src/functions/geocoding.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,oCAAiC;AAEjC;;;;;;;;;;;;;;GAcG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,cAAsB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAChL,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,OAAO,GAAG,KAAK,CAAC,OAAO,CAAC;QAC9B,MAAM,MAAM,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,GAAG,CAAC,SAAS,CAAC;QAChD,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC;QAC9B,IAAI,CAAC,OAAO,EAAE;YACV,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,6BAA6B,CAAC,CAAC;SAC3F;QACD,MAAM,GAAG,GAAG,MAAM,SAAG,CAAC,GAAG,CACrB,6DAA6D,kBAAkB,CAAC,OAAO,CAAC,QAAQ,MAAM,EAAE,CAC3G,CAAC;QACF,MAAM,IAAI,GAAG,CAAC,MAAM,GAAG,CAAC,IAAI,EAAE,CAA2B,CAAC;QAC1D,OAAO,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC;QAClB,uBACI,OAAO,EAAE,IAAI,IACV,IAAI,EACT;KACL;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;QACnB,MAAM,GAAG,CAAC;KACb;AACL,CAAC,CAAA,CACJ,CAAC"}
|
|
@@ -53,6 +53,7 @@ module.exports = (regions, timeoutSeconds, data) => {
|
|
|
53
53
|
const firestoreInstance = admin.firestore();
|
|
54
54
|
const collection = yield firestoreInstance.collection(collectionPath).where("_done", "==", false).where("_time", "<=", Date.now()).orderBy("_time", "asc").get();
|
|
55
55
|
for (var doc of collection.docs) {
|
|
56
|
+
let res = null;
|
|
56
57
|
const command = doc.get("#command")["@command"];
|
|
57
58
|
const priParams = doc.get("#command")["@private"];
|
|
58
59
|
switch (command) {
|
|
@@ -63,7 +64,7 @@ module.exports = (regions, timeoutSeconds, data) => {
|
|
|
63
64
|
const data = priParams["data"];
|
|
64
65
|
const token = priParams["token"];
|
|
65
66
|
const topic = priParams["topic"];
|
|
66
|
-
yield (0, send_notification_1.sendNotification)({
|
|
67
|
+
const response = yield (0, send_notification_1.sendNotification)({
|
|
67
68
|
title: title,
|
|
68
69
|
body: body,
|
|
69
70
|
channelId: channelId,
|
|
@@ -71,6 +72,7 @@ module.exports = (regions, timeoutSeconds, data) => {
|
|
|
71
72
|
token: token,
|
|
72
73
|
topic: topic,
|
|
73
74
|
});
|
|
75
|
+
res = response.results;
|
|
74
76
|
break;
|
|
75
77
|
case "copy_document":
|
|
76
78
|
const path = priParams["path"];
|
|
@@ -91,11 +93,18 @@ module.exports = (regions, timeoutSeconds, data) => {
|
|
|
91
93
|
});
|
|
92
94
|
break;
|
|
93
95
|
}
|
|
94
|
-
|
|
95
|
-
"_done": true,
|
|
96
|
-
|
|
97
|
-
|
|
98
|
-
}
|
|
96
|
+
if (res !== null && Object.keys(res).length > 0) {
|
|
97
|
+
yield doc.ref.set(Object.assign({ "_done": true }, res), {
|
|
98
|
+
merge: true
|
|
99
|
+
});
|
|
100
|
+
}
|
|
101
|
+
else {
|
|
102
|
+
yield doc.ref.set({
|
|
103
|
+
"_done": true,
|
|
104
|
+
}, {
|
|
105
|
+
merge: true
|
|
106
|
+
});
|
|
107
|
+
}
|
|
99
108
|
}
|
|
100
109
|
}
|
|
101
110
|
catch (err) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/functions/scheduler.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,sDAAwC;AACxC,gEAA4D;AAE5D;;;;;;;;;GASG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,cAAsB,EAAE,IAA+B,EAAE,EAAE;;IAAC,OAAA,SAAS,CAAC,OAAO,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,MAAA,IAAI,CAAC,UAAU,CAAC,mCAAI,iBAAiB,CAAC,CAAC,KAAK,CAChO,CAAO,KAAK,EAAE,EAAE;QACZ,IAAI;YACA,MAAM,cAAc,GAAG,SAAS,CAAC,MAAM,EAAE,CAAC,SAAS,CAAC,eAAe,CAAC;YACpE,MAAM,iBAAiB,GAAG,KAAK,CAAC,SAAS,EAAE,CAAC;YAC5C,MAAM,UAAU,GAAG,MAAM,iBAAiB,CAAC,UAAU,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,KAAK,CAAC,CAAC,KAAK,CAAC,OAAO,EAAE,IAAI,EAAE,IAAI,CAAC,GAAG,EAAE,CAAC,CAAC,OAAO,CAAC,OAAO,EAAE,KAAK,CAAC,CAAC,GAAG,EAAE,CAAC;YACjK,KAAK,IAAI,GAAG,IAAI,UAAU,CAAC,IAAI,EAAE;gBAC7B,MAAM,OAAO,GAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAA4B,CAAC,UAAU,CAAC,CAAC;gBAC5E,MAAM,SAAS,GAAI,GAAG,CAAC,GAAG,CAAC,UAAU,CAA4B,CAAC,UAAU,CAA2B,CAAC;gBACxG,QAAQ,OAAO,EAAE;oBACb,KAAK,cAAc;wBACf,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,CAAW,CAAC;wBAC3C,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAW,CAAC;wBACzC,MAAM,SAAS,GAAG,SAAS,CAAC,SAAS,CAA8B,CAAC;wBACpE,MAAM,IAAI,GAAG,SAAS,CAAC,MAAM,CAAuC,CAAC;wBACrE,MAAM,KAAK,GAAG,SAAS,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"scheduler.js","sourceRoot":"","sources":["../../src/functions/scheduler.ts"],"names":[],"mappings":"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"}
|
|
@@ -77,7 +77,7 @@ module.exports = (regions, timeoutSeconds, data) => functions.runWith({ timeoutS
|
|
|
77
77
|
const data = query.data;
|
|
78
78
|
const token = query.token;
|
|
79
79
|
const topic = query.topic;
|
|
80
|
-
yield (0, send_notification_1.sendNotification)({
|
|
80
|
+
const res = yield (0, send_notification_1.sendNotification)({
|
|
81
81
|
title: title,
|
|
82
82
|
body: body,
|
|
83
83
|
channelId: channelId,
|
|
@@ -85,13 +85,11 @@ module.exports = (regions, timeoutSeconds, data) => functions.runWith({ timeoutS
|
|
|
85
85
|
token: token,
|
|
86
86
|
topic: topic,
|
|
87
87
|
});
|
|
88
|
+
return res;
|
|
88
89
|
}
|
|
89
90
|
catch (err) {
|
|
90
91
|
console.log(err);
|
|
91
92
|
throw err;
|
|
92
93
|
}
|
|
93
|
-
return {
|
|
94
|
-
success: true,
|
|
95
|
-
};
|
|
96
94
|
}));
|
|
97
95
|
//# sourceMappingURL=send_notification.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/functions/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,gEAA4D;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,cAAsB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAChL,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAe,CAAC;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAc,CAAC;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,UAAuC,CAAC;QAChE,MAAM,IAAI,GAAG,KAAK,CAAC,IAA6C,CAAC;QACjE,MAAM,KAAK,GAAG,KAAK,CAAC,
|
|
1
|
+
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/functions/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,gEAA4D;AAE5D;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,MAAM,CAAC,OAAO,GAAG,CAAC,OAAiB,EAAE,cAAsB,EAAE,IAA+B,EAAE,EAAE,CAAC,SAAS,CAAC,OAAO,CAAC,EAAC,cAAc,EAAE,cAAc,EAAC,CAAC,CAAC,MAAM,CAAC,GAAG,OAAO,CAAC,CAAC,KAAK,CAAC,MAAM,CAChL,CAAO,KAAK,EAAE,EAAE;IACZ,IAAI;QACA,MAAM,KAAK,GAAG,KAAK,CAAC,KAAe,CAAC;QACpC,MAAM,IAAI,GAAG,KAAK,CAAC,IAAc,CAAC;QAClC,MAAM,SAAS,GAAG,KAAK,CAAC,UAAuC,CAAC;QAChE,MAAM,IAAI,GAAG,KAAK,CAAC,IAA6C,CAAC;QACjE,MAAM,KAAK,GAAG,KAAK,CAAC,KAA6C,CAAC;QAClE,MAAM,KAAK,GAAG,KAAK,CAAC,KAAkC,CAAC;QACvD,MAAM,GAAG,GAAG,MAAM,IAAA,oCAAgB,EAAC;YAC/B,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,IAAI;YACV,SAAS,EAAE,SAAS;YACpB,IAAI,EAAE,IAAI;YACV,KAAK,EAAE,KAAK;YACZ,KAAK,EAAE,KAAK;SACf,CAAC,CAAC;QACH,OAAO,GAAG,CAAC;KACd;IAAC,OAAO,GAAG,EAAE;QACV,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;QACjB,MAAM,GAAG,CAAC;KACb;AACL,CAAC,CAAA,CACJ,CAAC"}
|
|
@@ -40,7 +40,7 @@ export declare function sendNotification({ title, body, data, channelId, token,
|
|
|
40
40
|
data: {
|
|
41
41
|
[key: string]: string;
|
|
42
42
|
} | undefined;
|
|
43
|
-
token: string | undefined | null;
|
|
43
|
+
token: string | string[] | undefined | null;
|
|
44
44
|
topic: string | undefined | null;
|
|
45
45
|
}): Promise<{
|
|
46
46
|
[key: string]: any;
|
|
@@ -72,35 +72,42 @@ const admin = __importStar(require("firebase-admin"));
|
|
|
72
72
|
*/
|
|
73
73
|
function sendNotification({ title, body, data, channelId, token, topic, }) {
|
|
74
74
|
return __awaiter(this, void 0, void 0, function* () {
|
|
75
|
+
const res = {};
|
|
75
76
|
try {
|
|
76
|
-
if (token === undefined
|
|
77
|
+
if ((token === undefined || token === null) && (topic === undefined || topic === null)) {
|
|
77
78
|
throw new functions.https.HttpsError("invalid-argument", "Either [token] or [topic] must be specified.");
|
|
78
79
|
}
|
|
79
80
|
if (token !== undefined && token !== null) {
|
|
80
|
-
|
|
81
|
-
|
|
82
|
-
|
|
83
|
-
|
|
84
|
-
|
|
85
|
-
android: {
|
|
86
|
-
priority: "high",
|
|
81
|
+
if (typeof token === "string") {
|
|
82
|
+
token = [token];
|
|
83
|
+
}
|
|
84
|
+
for (let t of token) {
|
|
85
|
+
const messageId = yield admin.messaging().send({
|
|
87
86
|
notification: {
|
|
88
87
|
title: title,
|
|
89
88
|
body: body,
|
|
90
|
-
clickAction: "FLUTTER_NOTIFICATION_CLICK",
|
|
91
|
-
channelId: channelId !== null && channelId !== void 0 ? channelId : undefined,
|
|
92
89
|
},
|
|
93
|
-
|
|
94
|
-
|
|
95
|
-
|
|
96
|
-
|
|
90
|
+
android: {
|
|
91
|
+
priority: "high",
|
|
92
|
+
notification: {
|
|
93
|
+
title: title,
|
|
94
|
+
body: body,
|
|
95
|
+
clickAction: "FLUTTER_NOTIFICATION_CLICK",
|
|
96
|
+
channelId: channelId !== null && channelId !== void 0 ? channelId : undefined,
|
|
97
|
+
},
|
|
98
|
+
},
|
|
99
|
+
data: data,
|
|
100
|
+
token: t,
|
|
101
|
+
});
|
|
102
|
+
res[t] = messageId;
|
|
103
|
+
}
|
|
97
104
|
return {
|
|
98
105
|
success: true,
|
|
99
|
-
|
|
106
|
+
results: res,
|
|
100
107
|
};
|
|
101
108
|
}
|
|
102
109
|
else if (topic !== undefined && topic !== null) {
|
|
103
|
-
const
|
|
110
|
+
const messageId = yield admin.messaging().send({
|
|
104
111
|
notification: {
|
|
105
112
|
title: title,
|
|
106
113
|
body: body,
|
|
@@ -117,9 +124,10 @@ function sendNotification({ title, body, data, channelId, token, topic, }) {
|
|
|
117
124
|
data: data,
|
|
118
125
|
topic: topic,
|
|
119
126
|
});
|
|
127
|
+
res[topic] = messageId;
|
|
120
128
|
return {
|
|
121
129
|
success: true,
|
|
122
|
-
|
|
130
|
+
results: res,
|
|
123
131
|
};
|
|
124
132
|
}
|
|
125
133
|
}
|
|
@@ -128,6 +136,7 @@ function sendNotification({ title, body, data, channelId, token, topic, }) {
|
|
|
128
136
|
}
|
|
129
137
|
return {
|
|
130
138
|
success: true,
|
|
139
|
+
results: res,
|
|
131
140
|
};
|
|
132
141
|
});
|
|
133
142
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/lib/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,sDAAwC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,SAAsB,gBAAgB,CAAC,EACnC,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,KAAK,EACL,KAAK,GAQJ;;QACD,IAAI;YACA,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,
|
|
1
|
+
{"version":3,"file":"send_notification.js","sourceRoot":"","sources":["../../src/lib/send_notification.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,8DAAgD;AAChD,sDAAwC;AAExC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;GAkCG;AACH,SAAsB,gBAAgB,CAAC,EACnC,KAAK,EACL,IAAI,EACJ,IAAI,EACJ,SAAS,EACT,KAAK,EACL,KAAK,GAQJ;;QACD,MAAM,GAAG,GAA2B,EAAE,CAAC;QACvC,IAAI;YACA,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,CAAC,EAAE;gBACpF,MAAM,IAAI,SAAS,CAAC,KAAK,CAAC,UAAU,CAAC,kBAAkB,EAAE,8CAA8C,CAAC,CAAC;aAC5G;YACD,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;gBACvC,IAAI,OAAO,KAAK,KAAK,QAAQ,EAAE;oBAC3B,KAAK,GAAG,CAAC,KAAK,CAAC,CAAC;iBACnB;gBACD,KAAK,IAAI,CAAC,IAAI,KAAK,EAAE;oBACjB,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,CAC1C;wBACI,YAAY,EAAE;4BACV,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,IAAI;yBACb;wBACD,OAAO,EAAE;4BACL,QAAQ,EAAE,MAAM;4BAChB,YAAY,EAAE;gCACV,KAAK,EAAE,KAAK;gCACZ,IAAI,EAAE,IAAI;gCACV,WAAW,EAAE,4BAA4B;gCACzC,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,SAAS;6BACpC;yBACJ;wBACD,IAAI,EAAE,IAAI;wBACV,KAAK,EAAE,CAAC;qBACX,CACJ,CAAC;oBACF,GAAG,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;iBACtB;gBACD,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,GAAG;iBACf,CAAC;aACL;iBAAM,IAAI,KAAK,KAAK,SAAS,IAAI,KAAK,KAAK,IAAI,EAAE;gBAC9C,MAAM,SAAS,GAAG,MAAM,KAAK,CAAC,SAAS,EAAE,CAAC,IAAI,CAC1C;oBACI,YAAY,EAAE;wBACV,KAAK,EAAE,KAAK;wBACZ,IAAI,EAAE,IAAI;qBACb;oBACD,OAAO,EAAE;wBACL,QAAQ,EAAE,MAAM;wBAChB,YAAY,EAAE;4BACV,KAAK,EAAE,KAAK;4BACZ,IAAI,EAAE,IAAI;4BACV,WAAW,EAAE,4BAA4B;4BACzC,SAAS,EAAE,SAAS,aAAT,SAAS,cAAT,SAAS,GAAI,SAAS;yBACpC;qBACJ;oBACD,IAAI,EAAE,IAAI;oBACV,KAAK,EAAE,KAAK;iBACf,CACJ,CAAC;gBACF,GAAG,CAAC,KAAK,CAAC,GAAG,SAAS,CAAC;gBACvB,OAAO;oBACH,OAAO,EAAE,IAAI;oBACb,OAAO,EAAE,GAAG;iBACf,CAAC;aACL;SACJ;QAAC,OAAO,GAAG,EAAE;YACV,MAAM,GAAG,CAAC;SACb;QACD,OAAO;YACH,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,GAAG;SACf,CAAC;IAEN,CAAC;CAAA;AApFD,4CAoFC"}
|