@appland/scanner 1.52.5 → 1.54.1
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 +22 -0
- package/built/cli/scan/command.js.map +1 -1
- package/built/cli/scan.js +23 -12
- package/built/cli/scan.js.map +1 -1
- package/built/configuration/configurationProvider.js +1 -1
- package/built/configuration/configurationProvider.js.map +1 -1
- package/built/rules/nPlusOneQuery.js +83 -37
- package/built/rules/nPlusOneQuery.js.map +1 -1
- package/doc/rules/missing-authentication.md +5 -4
- package/package.json +3 -1
- package/built/cli/progressReporter.js +0 -16
- package/built/cli/progressReporter.js.map +0 -1
package/CHANGELOG.md
CHANGED
|
@@ -1,3 +1,25 @@
|
|
|
1
|
+
# [@appland/scanner-v1.54.1](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.54.0...@appland/scanner-v1.54.1) (2022-05-03)
|
|
2
|
+
|
|
3
|
+
|
|
4
|
+
### Bug Fixes
|
|
5
|
+
|
|
6
|
+
* Metadata rule title ([8d87864](https://github.com/applandinc/appmap-js/commit/8d878645001457d02487fd564498e8b858362f72))
|
|
7
|
+
* Progress bar exit ([f311bb2](https://github.com/applandinc/appmap-js/commit/f311bb2af258e6a140c9a09c64ae71ebc43c52f7))
|
|
8
|
+
|
|
9
|
+
# [@appland/scanner-v1.54.0](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.53.0...@appland/scanner-v1.54.0) (2022-05-03)
|
|
10
|
+
|
|
11
|
+
|
|
12
|
+
### Features
|
|
13
|
+
|
|
14
|
+
* N+1 queries must have the same common ancestor ([7edb88b](https://github.com/applandinc/appmap-js/commit/7edb88b3dc3938e9edc718b8279e980abbc06423))
|
|
15
|
+
|
|
16
|
+
# [@appland/scanner-v1.53.0](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.52.5...@appland/scanner-v1.53.0) (2022-05-02)
|
|
17
|
+
|
|
18
|
+
|
|
19
|
+
### Features
|
|
20
|
+
|
|
21
|
+
* Show 0-100% progress bar ([570cc3b](https://github.com/applandinc/appmap-js/commit/570cc3bfa255f6f448100b3c38e667fe6187b242))
|
|
22
|
+
|
|
1
23
|
# [@appland/scanner-v1.52.5](https://github.com/applandinc/appmap-js/compare/@appland/scanner-v1.52.4...@appland/scanner-v1.52.5) (2022-05-02)
|
|
2
24
|
|
|
3
25
|
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/scan/command.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,6BAA4C;AAC5C,wCAAwC;AACxC,6BAAiC;
|
|
1
|
+
{"version":3,"file":"command.js","sourceRoot":"","sources":["../../../src/cli/scan/command.ts"],"names":[],"mappings":"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"}
|
package/built/cli/scan.js
CHANGED
|
@@ -64,10 +64,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
64
64
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
65
65
|
};
|
|
66
66
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
67
|
+
/* eslint-disable @typescript-eslint/no-empty-function */
|
|
68
|
+
var cli_progress_1 = __importDefault(require("cli-progress"));
|
|
67
69
|
var promises_1 = require("fs/promises");
|
|
68
70
|
var models_1 = require("@appland/models");
|
|
69
71
|
var ruleChecker_1 = __importDefault(require("../ruleChecker"));
|
|
70
|
-
var progressReporter_1 = __importDefault(require("./progressReporter"));
|
|
71
72
|
var appMapIndex_1 = __importDefault(require("../appMapIndex"));
|
|
72
73
|
function batch(items, size, process) {
|
|
73
74
|
return __awaiter(this, void 0, void 0, function () {
|
|
@@ -90,27 +91,36 @@ function batch(items, size, process) {
|
|
|
90
91
|
}
|
|
91
92
|
function scan(files, checks) {
|
|
92
93
|
return __awaiter(this, void 0, void 0, function () {
|
|
93
|
-
|
|
94
|
+
function newProgress() {
|
|
95
|
+
if (process.stdout.isTTY) {
|
|
96
|
+
return new cli_progress_1.default.SingleBar({ format: "Scanning [{bar}] {percentage}% | {value}/{total}" }, cli_progress_1.default.Presets.shades_classic);
|
|
97
|
+
}
|
|
98
|
+
return {
|
|
99
|
+
increment: function () { },
|
|
100
|
+
start: function () { },
|
|
101
|
+
stop: function () { },
|
|
102
|
+
};
|
|
103
|
+
}
|
|
104
|
+
var checker, appMapMetadata, findings, progress;
|
|
94
105
|
var _this = this;
|
|
95
106
|
return __generator(this, function (_a) {
|
|
96
107
|
switch (_a.label) {
|
|
97
108
|
case 0:
|
|
109
|
+
// TODO: Improve this by respecting .gitignore, or similar.
|
|
110
|
+
// For now, this addresses the main problem of encountering appmap-js and its appmap.json files
|
|
111
|
+
// in a bundled node_modules.
|
|
112
|
+
files = files.filter(function (file) { return !file.split('/').includes('node_modules'); });
|
|
98
113
|
checker = new ruleChecker_1.default();
|
|
99
114
|
appMapMetadata = {};
|
|
100
115
|
findings = [];
|
|
116
|
+
progress = newProgress();
|
|
117
|
+
progress.start(files.length * checks.length, 0);
|
|
101
118
|
return [4 /*yield*/, batch(files, 2, function (file) { return __awaiter(_this, void 0, void 0, function () {
|
|
102
119
|
var appMapData, appMap, appMapIndex;
|
|
103
120
|
var _this = this;
|
|
104
121
|
return __generator(this, function (_a) {
|
|
105
122
|
switch (_a.label) {
|
|
106
|
-
case 0:
|
|
107
|
-
// TODO: Improve this by respecting .gitignore, or similar.
|
|
108
|
-
// For now, this addresses the main problem of encountering appmap-js and its appmap.json files
|
|
109
|
-
// in a bundled node_modules.
|
|
110
|
-
if (file.split('/').includes('node_modules')) {
|
|
111
|
-
return [2 /*return*/, null];
|
|
112
|
-
}
|
|
113
|
-
return [4 /*yield*/, (0, promises_1.readFile)(file, 'utf8')];
|
|
123
|
+
case 0: return [4 /*yield*/, (0, promises_1.readFile)(file, 'utf8')];
|
|
114
124
|
case 1:
|
|
115
125
|
appMapData = _a.sent();
|
|
116
126
|
appMap = (0, models_1.buildAppMap)(appMapData).normalize().build();
|
|
@@ -125,21 +135,22 @@ function scan(files, checks) {
|
|
|
125
135
|
return [4 /*yield*/, checker.check(file, appMapIndex, check, findings)];
|
|
126
136
|
case 1:
|
|
127
137
|
_a.sent();
|
|
138
|
+
progress.increment();
|
|
128
139
|
newMatches = findings.slice(matchCount, findings.length);
|
|
129
140
|
newMatches.forEach(function (match) { return (match.appMapFile = file); });
|
|
130
|
-
process.stderr.write((0, progressReporter_1.default)(newMatches));
|
|
131
141
|
return [2 /*return*/];
|
|
132
142
|
}
|
|
133
143
|
});
|
|
134
144
|
}); }))];
|
|
135
145
|
case 2:
|
|
136
146
|
_a.sent();
|
|
137
|
-
return [2 /*return
|
|
147
|
+
return [2 /*return*/, null];
|
|
138
148
|
}
|
|
139
149
|
});
|
|
140
150
|
}); })];
|
|
141
151
|
case 1:
|
|
142
152
|
_a.sent();
|
|
153
|
+
progress.stop();
|
|
143
154
|
return [2 /*return*/, { appMapMetadata: appMapMetadata, findings: findings }];
|
|
144
155
|
}
|
|
145
156
|
});
|
package/built/cli/scan.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/cli/scan.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,wCAAuC;AACvC,0CAAwD;AAGxD,+DAAyC;AAGzC
|
|
1
|
+
{"version":3,"file":"scan.js","sourceRoot":"","sources":["../../src/cli/scan.ts"],"names":[],"mappings":"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"}
|
|
@@ -105,7 +105,7 @@ function loadFromDir(ruleName) {
|
|
|
105
105
|
_c.trys.push([0, 2, , 3]);
|
|
106
106
|
return [4 /*yield*/, Promise.resolve().then(function () { return __importStar(require("../rules/".concat(ruleName, "/metadata"))); })];
|
|
107
107
|
case 1:
|
|
108
|
-
metadata = _c.sent();
|
|
108
|
+
metadata = (_c.sent()).default;
|
|
109
109
|
return [3 /*break*/, 3];
|
|
110
110
|
case 2:
|
|
111
111
|
e_2 = _c.sent();
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"configurationProvider.js","sourceRoot":"","sources":["../../src/configuration/configurationProvider.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,4CAAsB;AACtB,oDAA2B;AAC3B,yBAAoC;AAGpC,mDAA6B;AAE7B,0CAA6E;AAC7E,sDAAgF;AAEhF,2FAAqE;AAErE,uEAAmD;AACnD,iGAA6E;AAG7E,2BAA0B;AAE1B,IAAM,GAAG,GAAG,IAAI,aAAG,EAAE,CAAC;AACtB,GAAG,CAAC,SAAS,CAAC,mCAA2B,CAAC,CAAC;AAE3C,SAAS,YAAY,CAAC,QAAgB;IAAtC,iBAUC;IATC,OAAO;;;;;;oBAGQ,sFAAa,mBAAY,QAAQ,CAAE,QAAC;;oBAA/C,QAAQ,GAAG,SAAoC,CAAC;;;;oBAEhD,sBAAO;wBAET,sBAAO,QAAQ,CAAC,OAAO,EAAC;;;SACzB,CAAC;AACJ,CAAC;AAED,SAAS,WAAW,CAAC,QAAgB;IAArC,iBAiDC;IAhDC,OAAO;;;;;;
|
|
1
|
+
{"version":3,"file":"configurationProvider.js","sourceRoot":"","sources":["../../src/configuration/configurationProvider.ts"],"names":[],"mappings":"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"}
|
|
@@ -10,6 +10,31 @@ var __values = (this && this.__values) || function(o) {
|
|
|
10
10
|
};
|
|
11
11
|
throw new TypeError(s ? "Object is not iterable." : "Symbol.iterator is not defined.");
|
|
12
12
|
};
|
|
13
|
+
var __read = (this && this.__read) || function (o, n) {
|
|
14
|
+
var m = typeof Symbol === "function" && o[Symbol.iterator];
|
|
15
|
+
if (!m) return o;
|
|
16
|
+
var i = m.call(o), r, ar = [], e;
|
|
17
|
+
try {
|
|
18
|
+
while ((n === void 0 || n-- > 0) && !(r = i.next()).done) ar.push(r.value);
|
|
19
|
+
}
|
|
20
|
+
catch (error) { e = { error: error }; }
|
|
21
|
+
finally {
|
|
22
|
+
try {
|
|
23
|
+
if (r && !r.done && (m = i["return"])) m.call(i);
|
|
24
|
+
}
|
|
25
|
+
finally { if (e) throw e.error; }
|
|
26
|
+
}
|
|
27
|
+
return ar;
|
|
28
|
+
};
|
|
29
|
+
var __spreadArray = (this && this.__spreadArray) || function (to, from, pack) {
|
|
30
|
+
if (pack || arguments.length === 2) for (var i = 0, l = from.length, ar; i < l; i++) {
|
|
31
|
+
if (ar || !(i in from)) {
|
|
32
|
+
if (!ar) ar = Array.prototype.slice.call(from, 0, i);
|
|
33
|
+
ar[i] = from[i];
|
|
34
|
+
}
|
|
35
|
+
}
|
|
36
|
+
return to.concat(ar || Array.prototype.slice.call(from));
|
|
37
|
+
};
|
|
13
38
|
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
14
39
|
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
15
40
|
};
|
|
@@ -24,55 +49,76 @@ var Options = /** @class */ (function () {
|
|
|
24
49
|
}
|
|
25
50
|
return Options;
|
|
26
51
|
}());
|
|
27
|
-
// TODO: clean up according to https://github.com/applandinc/scanner/issues/43
|
|
28
52
|
function build(options) {
|
|
29
|
-
var sqlCount = {};
|
|
30
53
|
function matcher(command, appMapIndex, eventFilter) {
|
|
31
54
|
var e_1, _a;
|
|
55
|
+
var sqlEvents = (0, database_1.sqlStrings)(command, appMapIndex, eventFilter);
|
|
56
|
+
var sqlRollup = {};
|
|
57
|
+
var eventsById = {};
|
|
58
|
+
appMapIndex.appMap.events.forEach(function (event) {
|
|
59
|
+
eventsById[event.id] = event;
|
|
60
|
+
});
|
|
32
61
|
try {
|
|
33
|
-
for (var
|
|
34
|
-
var sqlEvent =
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
};
|
|
41
|
-
sqlCount[sqlEvent.sql] = occurrence;
|
|
42
|
-
}
|
|
43
|
-
else {
|
|
44
|
-
occurrence.count += 1;
|
|
45
|
-
occurrence.events.push(sqlEvent.event);
|
|
46
|
-
}
|
|
62
|
+
for (var sqlEvents_1 = __values(sqlEvents), sqlEvents_1_1 = sqlEvents_1.next(); !sqlEvents_1_1.done; sqlEvents_1_1 = sqlEvents_1.next()) {
|
|
63
|
+
var sqlEvent = sqlEvents_1_1.value;
|
|
64
|
+
if (!sqlEvent.event.parent)
|
|
65
|
+
continue;
|
|
66
|
+
var key = [sqlEvent.event.parent.id, sqlEvent.sql].join('\n');
|
|
67
|
+
sqlRollup[key] || (sqlRollup[key] = []);
|
|
68
|
+
sqlRollup[key].push(sqlEvent);
|
|
47
69
|
}
|
|
48
70
|
}
|
|
49
71
|
catch (e_1_1) { e_1 = { error: e_1_1 }; }
|
|
50
72
|
finally {
|
|
51
73
|
try {
|
|
52
|
-
if (
|
|
74
|
+
if (sqlEvents_1_1 && !sqlEvents_1_1.done && (_a = sqlEvents_1.return)) _a.call(sqlEvents_1);
|
|
53
75
|
}
|
|
54
76
|
finally { if (e_1) throw e_1.error; }
|
|
55
77
|
}
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
78
|
+
var matchResults = [];
|
|
79
|
+
var _loop_1 = function () {
|
|
80
|
+
__spreadArray([], __read(Object.keys(sqlRollup)), false).forEach(function (key) {
|
|
81
|
+
var events = sqlRollup[key];
|
|
82
|
+
var _a = __read(key.split('\n'), 2), ancestorId = _a[0], sql = _a[1];
|
|
83
|
+
var ancestor = eventsById[parseInt(ancestorId)];
|
|
84
|
+
var occurranceCount = events.length;
|
|
85
|
+
if (occurranceCount > options.warningLimit) {
|
|
86
|
+
var buildMatchResult = function (level) {
|
|
87
|
+
return {
|
|
88
|
+
level: level,
|
|
89
|
+
event: events[0].event,
|
|
90
|
+
message: "".concat(ancestor.toString(), "[").concat(ancestor.id, "] contains ").concat(occurranceCount, " occurrences of SQL: ").concat(sql),
|
|
91
|
+
groupMessage: sql,
|
|
92
|
+
occurranceCount: occurranceCount,
|
|
93
|
+
relatedEvents: events.map(function (e) { return e.event; }),
|
|
94
|
+
};
|
|
95
|
+
};
|
|
96
|
+
if (occurranceCount >= options.errorLimit) {
|
|
97
|
+
matchResults.push(buildMatchResult('error'));
|
|
98
|
+
}
|
|
99
|
+
else if (occurranceCount >= options.warningLimit) {
|
|
100
|
+
matchResults.push(buildMatchResult('warning'));
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
});
|
|
104
|
+
var newRollup = {};
|
|
105
|
+
Object.keys(sqlRollup).forEach(function (key) {
|
|
106
|
+
var events = sqlRollup[key];
|
|
107
|
+
if (events.length >= options.warningLimit)
|
|
108
|
+
return;
|
|
109
|
+
var _a = __read(key.split('\n'), 2), ancestorId = _a[0], sql = _a[1];
|
|
110
|
+
var ancestor = eventsById[parseInt(ancestorId)];
|
|
111
|
+
if (ancestor.parent) {
|
|
112
|
+
var parentKey = [ancestor.parent.id, sql].join('\n');
|
|
113
|
+
newRollup[parentKey] = (newRollup[parentKey] || []).concat(events);
|
|
114
|
+
}
|
|
115
|
+
}, {});
|
|
116
|
+
sqlRollup = newRollup;
|
|
117
|
+
};
|
|
118
|
+
do {
|
|
119
|
+
_loop_1();
|
|
120
|
+
} while (Object.keys(sqlRollup).length > 0);
|
|
121
|
+
return matchResults;
|
|
76
122
|
}
|
|
77
123
|
return {
|
|
78
124
|
matcher: matcher,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"nPlusOneQuery.js","sourceRoot":"","sources":["../../src/rules/nPlusOneQuery.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"nPlusOneQuery.js","sourceRoot":"","sources":["../../src/rules/nPlusOneQuery.ts"],"names":[],"mappings":"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"}
|
|
@@ -21,15 +21,16 @@ This rule checks all HTTP server requests that satisfy the following conditions:
|
|
|
21
21
|
- HTTP status code is `< 300`
|
|
22
22
|
- Matches include and exclude lists of content type (by default, these are empty).
|
|
23
23
|
|
|
24
|
-
For each matching request, any event that satisfies either of these conditions will satisfy the
|
|
24
|
+
For each matching request, any event that satisfies either of these conditions will satisfy the
|
|
25
|
+
rule:
|
|
25
26
|
|
|
26
|
-
1. Has label `public`.
|
|
27
|
+
1. Has label `access.public`.
|
|
27
28
|
2. Has label `security.authentication`, and returns a truthy value.
|
|
28
29
|
|
|
29
30
|
### Notes
|
|
30
31
|
|
|
31
32
|
If a request does not require an authenticated user (e.g. because it contains completely public
|
|
32
|
-
information), then this rule can be satisfied by calling any function labeled `public`.
|
|
33
|
+
information), then this rule can be satisfied by calling any function labeled `access.public`.
|
|
33
34
|
|
|
34
35
|
If the `security.authentication` event returns a falsey value (`false`, `null`, etc), then
|
|
35
36
|
authentication is assumed to be denied, and the rule is not satisfied.
|
|
@@ -37,7 +38,7 @@ authentication is assumed to be denied, and the rule is not satisfied.
|
|
|
37
38
|
### Resolution
|
|
38
39
|
|
|
39
40
|
If the request is designed to be public, and the omission of authentication is intentionaly, modify
|
|
40
|
-
the code so that it calls a function labeled `public`.
|
|
41
|
+
the code so that it calls a function labeled `access.public`.
|
|
41
42
|
|
|
42
43
|
Otherwise, modify the code so that it calls a function labeled `security.authentication` which
|
|
43
44
|
returns a truthy result (for example, a User object).
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@appland/scanner",
|
|
3
|
-
"version": "1.
|
|
3
|
+
"version": "1.54.1",
|
|
4
4
|
"description": "",
|
|
5
5
|
"bin": "built/cli.js",
|
|
6
6
|
"files": [
|
|
@@ -56,10 +56,12 @@
|
|
|
56
56
|
"@appland/client": "^1.3.0",
|
|
57
57
|
"@appland/models": "^1.14.5",
|
|
58
58
|
"@appland/sql-parser": "^1.5.0",
|
|
59
|
+
"@types/cli-progress": "^3.9.2",
|
|
59
60
|
"ajv": "^8.8.2",
|
|
60
61
|
"ansi-escapes": "^5.0.0",
|
|
61
62
|
"async": "^3.2.3",
|
|
62
63
|
"chalk": "^4.1.2",
|
|
64
|
+
"cli-progress": "^3.11.0",
|
|
63
65
|
"form-data": "^4.0.0",
|
|
64
66
|
"glob": "^7.2.0",
|
|
65
67
|
"js-yaml": "^4.1.0",
|
|
@@ -1,16 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
3
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
4
|
-
};
|
|
5
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
6
|
-
var chalk_1 = __importDefault(require("chalk"));
|
|
7
|
-
function default_1(matches) {
|
|
8
|
-
if (matches.length === 0) {
|
|
9
|
-
return chalk_1.default.stderr.green('.');
|
|
10
|
-
}
|
|
11
|
-
else {
|
|
12
|
-
return chalk_1.default.stderr.magenta('!');
|
|
13
|
-
}
|
|
14
|
-
}
|
|
15
|
-
exports.default = default_1;
|
|
16
|
-
//# sourceMappingURL=progressReporter.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"progressReporter.js","sourceRoot":"","sources":["../../src/cli/progressReporter.ts"],"names":[],"mappings":";;;;;AAAA,gDAA0B;AAG1B,mBAAyB,OAAkB;IACzC,IAAI,OAAO,CAAC,MAAM,KAAK,CAAC,EAAE;QACxB,OAAO,eAAK,CAAC,MAAM,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC;KAChC;SAAM;QACL,OAAO,eAAK,CAAC,MAAM,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;KAClC;AACH,CAAC;AAND,4BAMC"}
|