@serverless-devs/s 2.0.97-beta.2 → 2.0.97-beta.9
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/Makefile +23 -0
- package/lib/clean/index.js +33 -31
- package/lib/cli/cli-manager.js +10 -10
- package/lib/cli/index.js +52 -52
- package/lib/component/index.js +49 -144
- package/lib/config/add/index.js +40 -38
- package/lib/config/delete/index.js +47 -47
- package/lib/config/get/index.js +39 -37
- package/lib/config/index.js +34 -32
- package/lib/core/command/command-manager.js +8 -7
- package/lib/core/component/hook.js +4 -4
- package/lib/core/component/index.js +9 -9
- package/lib/error/human-error.js +5 -5
- package/lib/error/human-warning.js +4 -4
- package/lib/error/index.js +35 -34
- package/lib/index.js +106 -135
- package/lib/init/index.js +90 -103
- package/lib/init/init-manager.js +66 -19
- package/lib/onboarding/index.js +5 -5
- package/lib/set/analysis/index.js +36 -34
- package/lib/set/index.js +34 -32
- package/lib/set/locale/index.js +50 -50
- package/lib/set/registry/index.js +49 -49
- package/lib/set/workspace/index.js +37 -35
- package/lib/specification/parse.js +10 -10
- package/lib/update-notifier/index.js +19 -19
- package/lib/utils/command-util.js +74 -57
- package/lib/utils/common.js +61 -13
- package/lib/utils/index.js +3 -3
- package/package.json +5 -4
- package/.eslintrc.json +0 -112
- package/.prettierrc.json +0 -11
- package/lib/clean/index.d.ts +0 -1
- package/lib/cli/cli-manager.d.ts +0 -13
- package/lib/cli/index.d.ts +0 -2
- package/lib/component/index.d.ts +0 -1
- package/lib/config/add/index.d.ts +0 -1
- package/lib/config/common/common.d.ts +0 -46
- package/lib/config/delete/index.d.ts +0 -2
- package/lib/config/get/index.d.ts +0 -1
- package/lib/config/index.d.ts +0 -2
- package/lib/constants/index.d.ts +0 -0
- package/lib/constants/static-variable.d.ts +0 -4
- package/lib/core/command/command-manager.d.ts +0 -12
- package/lib/core/component/hook.d.ts +0 -17
- package/lib/core/component/index.d.ts +0 -53
- package/lib/core/index.d.ts +0 -2
- package/lib/core/plugin/index.d.ts +0 -13
- package/lib/entiry/cli.d.ts +0 -27
- package/lib/entiry/index.d.ts +0 -2
- package/lib/error/command-error.d.ts +0 -5
- package/lib/error/config-delete-error.d.ts +0 -5
- package/lib/error/config-error.d.ts +0 -5
- package/lib/error/config-get-error.d.ts +0 -5
- package/lib/error/human-error.d.ts +0 -13
- package/lib/error/human-warning.d.ts +0 -8
- package/lib/error/index.d.ts +0 -17
- package/lib/error/init-error.d.ts +0 -5
- package/lib/error/serverless-error.d.ts +0 -4
- package/lib/execDaemon.d.ts +0 -6
- package/lib/index.d.ts +0 -2
- package/lib/init/index.d.ts +0 -2
- package/lib/init/init-config.d.ts +0 -43
- package/lib/init/init-manager.d.ts +0 -17
- package/lib/onboarding/index.d.ts +0 -2
- package/lib/set/analysis/index.d.ts +0 -1
- package/lib/set/index.d.ts +0 -1
- package/lib/set/locale/index.d.ts +0 -1
- package/lib/set/registry/index.d.ts +0 -10
- package/lib/set/workspace/index.d.ts +0 -1
- package/lib/specification/analysis.d.ts +0 -12
- package/lib/specification/index.d.ts +0 -4
- package/lib/specification/parse.d.ts +0 -24
- package/lib/specification/version.d.ts +0 -35
- package/lib/update-notifier/index.d.ts +0 -10
- package/lib/utils/command-util.d.ts +0 -18
- package/lib/utils/common.d.ts +0 -28
- package/lib/utils/core.d.ts +0 -3
- package/lib/utils/handler-set-config.d.ts +0 -19
- package/lib/utils/i18n/en.d.ts +0 -44
- package/lib/utils/i18n/index.d.ts +0 -2
- package/lib/utils/i18n/zh.d.ts +0 -44
- package/lib/utils/index.d.ts +0 -9
- package/lib/utils/logger.d.ts +0 -11
- package/lib/utils/storage.d.ts +0 -8
- package/lib/utils/url-parser.d.ts +0 -15
|
@@ -124,7 +124,7 @@ var Parse = /** @class */ (function () {
|
|
|
124
124
|
if (type === 'Literal') {
|
|
125
125
|
// 兼容新版本的规范 services
|
|
126
126
|
return (this.globalJsonKeyMap[variableName] ||
|
|
127
|
-
this.globalJsonKeyMap["services."
|
|
127
|
+
this.globalJsonKeyMap["services.".concat(variableName)] ||
|
|
128
128
|
'${' + variableName + '}');
|
|
129
129
|
}
|
|
130
130
|
if (type === 'Fun' && (funName === 'Env' || funName === 'env')) {
|
|
@@ -144,24 +144,24 @@ var Parse = /** @class */ (function () {
|
|
|
144
144
|
if (parentStr === void 0) { parentStr = ''; }
|
|
145
145
|
if (Object.prototype.toString.call(value) === '[object Object]') {
|
|
146
146
|
if (parentStr !== '') {
|
|
147
|
-
parentStr = parentStr
|
|
147
|
+
parentStr = "".concat(parentStr, ".");
|
|
148
148
|
}
|
|
149
149
|
Object.keys(value).map(function (key) {
|
|
150
|
-
var showKey = ""
|
|
150
|
+
var showKey = "".concat(parentStr).concat(key);
|
|
151
151
|
var objValue = value[key];
|
|
152
152
|
arr.push(showKey);
|
|
153
|
-
arr.concat(_this.generateMagicVariables(objValue, arr, ""
|
|
153
|
+
arr.concat(_this.generateMagicVariables(objValue, arr, "".concat(showKey)));
|
|
154
154
|
_this.globalJsonKeyMap[showKey] = objValue;
|
|
155
155
|
});
|
|
156
156
|
}
|
|
157
157
|
else if (Object.prototype.toString.call(value) === '[object Array]') {
|
|
158
158
|
value.forEach(function (_arrValue, i) {
|
|
159
|
-
var showKey = parentStr
|
|
160
|
-
var showKeyNe = parentStr
|
|
159
|
+
var showKey = "".concat(parentStr, "[").concat(i, "]");
|
|
160
|
+
var showKeyNe = "".concat(parentStr, "[").concat(i - value.length, "]");
|
|
161
161
|
arr.push(showKey);
|
|
162
162
|
arr.push(showKeyNe);
|
|
163
|
-
arr.concat(_this.generateMagicVariables(_arrValue, arr, ""
|
|
164
|
-
arr.concat(_this.generateMagicVariables(_arrValue, arr, ""
|
|
163
|
+
arr.concat(_this.generateMagicVariables(_arrValue, arr, "".concat(showKey)));
|
|
164
|
+
arr.concat(_this.generateMagicVariables(_arrValue, arr, "".concat(showKeyNe)));
|
|
165
165
|
_this.globalJsonKeyMap[showKey] = _arrValue;
|
|
166
166
|
_this.globalJsonKeyMap[showKeyNe] = _arrValue;
|
|
167
167
|
});
|
|
@@ -173,7 +173,7 @@ var Parse = /** @class */ (function () {
|
|
|
173
173
|
};
|
|
174
174
|
Parse.prototype.isProjectProperties = function (topKey, parentKey) {
|
|
175
175
|
var projProperties = false;
|
|
176
|
-
if (parentKey === 'Properties' && this.globalJsonKeyMap[topKey
|
|
176
|
+
if (parentKey === 'Properties' && this.globalJsonKeyMap["".concat(topKey, ".").concat(parentKey)]) {
|
|
177
177
|
projProperties = true;
|
|
178
178
|
}
|
|
179
179
|
return projProperties;
|
|
@@ -253,4 +253,4 @@ var Parse = /** @class */ (function () {
|
|
|
253
253
|
return Parse;
|
|
254
254
|
}());
|
|
255
255
|
exports.Parse = Parse;
|
|
256
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
256
|
+
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"parse.js","sourceRoot":"","sources":["../../src/specification/parse.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AAAA,qCAAyB;AACzB,yCAA6B;AAC7B,qCAA2C;AAC3C,kCAAuC;AACvC,iCAAyC;AACzC,uDAAiC;AACzB,IAAQ,IAAI,GAAK,cAAI,OAAT,CAAU;AAC9B,iCAAmC;AAMnC,IAAM,wBAAwB,GAAG,IAAI,MAAM,CAAC,YAAY,EAAE,GAAG,CAAC,CAAC;AAC/D,IAAM,0BAA0B,GAAG,IAAI,MAAM,CAAC,cAAc,EAAE,GAAG,CAAC,CAAC;AAEnE,IAAM,qBAAqB,GAAG,CAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAC;AAEtE;IAOE,eAAsB,IAAY;QAAZ,SAAI,GAAJ,IAAI,CAAQ;QANxB,cAAS,GAAQ,EAAE,CAAC;QACvB,oBAAe,GAA2B,EAAE,CAAC;QAC1C,qBAAgB,GAAQ,EAAE,CAAC;QAC3B,iBAAY,GAAU,EAAE,CAAC;QACzB,wBAAmB,GAAU,EAAE,CAAC;QAGxC,IAAI,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;YACvB,IAAI;gBACF,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;aACjB;YAAC,OAAO,EAAE,EAAE;gBACX,MAAM,IAAI,KAAK,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC;aAC7B;SACF;IACH,CAAC;IAED,0BAAU,GAAV,UAAW,QAAgB;QACzB,IAAI,OAAO,GAAG,EAAE,CAAC;QACjB,IAAI;YACF,IAAM,OAAO,GAAG,IAAI,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC;YACvC,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE;gBACrE,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC,CAAC;aACxD;YACD,IAAI,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAC,EAAE;gBACnC,OAAO,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,YAAY,CAAC,QAAQ,CAAC,CAAC,QAAQ,EAAE,CAAC,CAAC;aAC5D;SACF;QAAC,OAAO,KAAK,EAAE;YACd,IAAI,mBAAW,CAAC;gBACd,KAAK,OAAA;aACN,CAAC;iBACC,MAAM,CAAC,KAAK,CAAC;iBACb,IAAI,CAAC,cAAM,OAAA,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAf,CAAe,CAAC,CAAC;SAChC;QACD,OAAO,OAAO,CAAC;IACjB,CAAC;IAEK,oBAAI,GAAV,UAAW,QAAgB;;;gBACzB,IAAI,CAAC,SAAS,GAAG,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,CAAC;;;;KAC5C;IAED,oCAAoB,GAApB;QACE,OAAO,IAAI,CAAC,SAAS,CAAC;IACxB,CAAC;IAEO,iCAAiB,GAAzB,UAA0B,WAAgB;QAChC,IAAA,YAAY,GAAiC,WAAW,aAA5C,EAAE,IAAI,GAA2B,WAAW,KAAtC,EAAE,OAAO,GAAkB,WAAW,QAA7B,EAAE,WAAW,GAAK,WAAW,YAAhB,CAAiB;QACjE,IAAM,MAAM,GAAG,EAAE,CAAC;QAClB,IAAI,IAAI,KAAK,SAAS,EAAE;YACtB,oBAAoB;YACpB,OAAO,CACL,IAAI,CAAC,gBAAgB,CAAC,YAAY,CAAC;gBACnC,IAAI,CAAC,gBAAgB,CAAC,mBAAY,YAAY,CAAE,CAAC;gBACjD,IAAI,GAAG,YAAY,GAAG,GAAG,CAC1B,CAAC;SACH;QACD,IAAI,IAAI,KAAK,KAAK,IAAI,CAAC,OAAO,KAAK,KAAK,IAAI,OAAO,KAAK,KAAK,CAAC,EAAE;YAC9D,OAAO,OAAO,CAAC,GAAG,CAAC,WAAW,CAAC,CAAC;SACjC;QACD,IAAI,IAAI,KAAK,KAAK,IAAI,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,MAAM,CAAC,EAAE;YAChE,OAAO,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,GAAG,EAAE,EAAE,WAAW,CAAC,CAAC;SAC9C;QAED,IAAI,IAAI,KAAK,KAAK,IAAI,CAAC,OAAO,KAAK,MAAM,IAAI,OAAO,KAAK,MAAM,CAAC,EAAE;YAChE,OAAO,IAAI,CAAC,UAAU,CAAC,WAAW,CAAC,CAAC;SACrC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC;IAED,sCAAsB,GAAtB,UAAuB,KAAU,EAAE,GAAe,EAAE,SAAc;QAAlE,iBA2BC;QA3BkC,oBAAA,EAAA,QAAe;QAAE,0BAAA,EAAA,cAAc;QAChE,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,iBAAiB,EAAE;YAC/D,IAAI,SAAS,KAAK,EAAE,EAAE;gBACpB,SAAS,GAAG,UAAG,SAAS,MAAG,CAAC;aAC7B;YACD,MAAM,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,GAAG,CAAC,UAAA,GAAG;gBACxB,IAAM,OAAO,GAAG,UAAG,SAAS,SAAG,GAAG,CAAE,CAAC;gBACrC,IAAM,QAAQ,GAAG,KAAK,CAAC,GAAG,CAAC,CAAC;gBAC5B,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAClB,GAAG,CAAC,MAAM,CAAC,KAAI,CAAC,sBAAsB,CAAC,QAAQ,EAAE,GAAG,EAAE,UAAG,OAAO,CAAE,CAAC,CAAC,CAAC;gBACrE,KAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,QAAQ,CAAC;YAC5C,CAAC,CAAC,CAAC;SACJ;aAAM,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,KAAK,gBAAgB,EAAE;YACrE,KAAK,CAAC,OAAO,CAAC,UAAC,SAAc,EAAE,CAAS;gBACtC,IAAM,OAAO,GAAG,UAAG,SAAS,cAAI,CAAC,MAAG,CAAC;gBACrC,IAAM,SAAS,GAAG,UAAG,SAAS,cAAI,CAAC,GAAG,KAAK,CAAC,MAAM,MAAG,CAAC;gBACtD,GAAG,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;gBAClB,GAAG,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC;gBACpB,GAAG,CAAC,MAAM,CAAC,KAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,GAAG,EAAE,UAAG,OAAO,CAAE,CAAC,CAAC,CAAC;gBACtE,GAAG,CAAC,MAAM,CAAC,KAAI,CAAC,sBAAsB,CAAC,SAAS,EAAE,GAAG,EAAE,UAAG,SAAS,CAAE,CAAC,CAAC,CAAC;gBACxE,KAAI,CAAC,gBAAgB,CAAC,OAAO,CAAC,GAAG,SAAS,CAAC;gBAC3C,KAAI,CAAC,gBAAgB,CAAC,SAAS,CAAC,GAAG,SAAS,CAAC;YAC/C,CAAC,CAAC,CAAC;SACJ;aAAM;YACL,GAAG,GAAG,EAAE,CAAC;SACV;QACD,OAAO,GAAG,CAAC;IACb,CAAC;IAED,mCAAmB,GAAnB,UAAoB,MAAc,EAAE,SAAc;QAChD,IAAI,cAAc,GAAG,KAAK,CAAC;QAC3B,IAAI,SAAS,KAAK,YAAY,IAAI,IAAI,CAAC,gBAAgB,CAAC,UAAG,MAAM,cAAI,SAAS,CAAE,CAAC,EAAE;YACjF,cAAc,GAAG,IAAI,CAAC;SACvB;QACD,OAAO,cAAc,CAAC;IACxB,CAAC;IAED,kCAAkB,GAAlB,UAAmB,QAAa,EAAE,MAAc,EAAE,SAAe;QAAjE,iBAiDC;QAhDC,IAAI,qBAAqB,CAAC,QAAQ,CAAC,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE;YAC5E,OAAO,QAAQ,CAAC;SACjB;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,iBAAiB,EAAE;YAClE,IAAM,SAAS,GAAG,QAAQ,CAAC,KAAK,CAAC,wBAAwB,CAAC,CAAC;YAC3D,IAAI,SAAS,EAAE;gBACb,IAAM,WAAW,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC,CAAC,iDAAiD;gBACnF,IAAM,WAAW,GAAG,EAAE,YAAY,EAAE,WAAW,EAAE,IAAI,EAAE,SAAS,EAAE,OAAO,EAAE,IAAI,EAAE,WAAW,EAAE,EAAE,EAAE,CAAC;gBACnG,IAAM,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,0BAA0B,CAAC,CAAC;gBACrE,IAAI,cAAc,EAAE;oBAClB,WAAW,CAAC,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;oBACxC,WAAW,CAAC,WAAW,GAAG,cAAc,CAAC,CAAC,CAAC,CAAC;oBAC5C,WAAW,CAAC,IAAI,GAAG,KAAK,CAAC;iBAC1B;qBAAM;oBACL,IAAI,qBAAqB,GAAG,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC;oBACzD,IAAI,CAAC,qBAAqB,EAAE;wBAC1B,qBAAqB,GAAG,EAAE,CAAC;qBAC5B;oBACD,IAAM,cAAc,GAAG,WAAW,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBACjD,qBAAqB,CAAC,cAAc,CAAC,GAAG,CAAC,CAAC,CAAC,qBAAqB;oBAChE,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,qBAAqB,CAAC;iBACtD;gBAED,IAAI,SAAS,GAAG,IAAA,mBAAU,EAAC,WAAW,EAAE,MAAM,CAAC;oBAC7C,CAAC,CAAC,IAAA,YAAG,EAAC,OAAO,EAAE,WAAW,CAAC;oBAC3B,CAAC,CAAC,IAAI,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC;gBAExC,OAAO,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,SAAS,CAAC,KAAK,iBAAiB;oBACpE,CAAC,CAAC,QAAQ,CAAC,OAAO,CAAC,wBAAwB,EAAE,SAAS,CAAC;oBACvD,CAAC,CAAC,SAAS,CAAC;aACf;YAED,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,IAAI,MAAM,CAAC,IAAI,CAAC,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,IAAI,CAAC,EAAE;gBAC1F,IAAI,CAAC,eAAe,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC;aACnC;YACD,OAAO,QAAQ,CAAC;SACjB;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,gBAAgB,EAAE;YACjE,OAAO,QAAQ,CAAC,GAAG,CAAC,UAAC,IAAS;gBAC5B,OAAO,KAAI,CAAC,kBAAkB,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;YAC/C,CAAC,CAAC,CAAC;SACJ;QACD,IAAI,MAAM,CAAC,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,iBAAiB,EAAE;YAClE,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG;gBAC/B,QAAQ,CAAC,GAAG,CAAC,GAAG,KAAI,CAAC,kBAAkB,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,MAAM,EAAE,SAAS,IAAI,GAAG,CAAC,CAAC;YACnF,CAAC,CAAC,CAAC;YACH,OAAO,QAAQ,CAAC;SACjB;IACH,CAAC;IAED,+BAAe,GAAf,UAAgB,QAA0B;QAA1C,iBAYC;QAXC,IAAM,SAAS,GAAG,IAAA,wBAAc,EAAC,QAAQ,CAAC,CAAC;QAC3C,MAAM,CAAC,IAAI,CAAC,SAAS,CAAC,CAAC,OAAO,CAAC,UAAA,GAAG;YAChC,IAAM,QAAQ,GAAG,SAAS,CAAC,GAAG,CAAC,CAAC;YAChC,SAAS,CAAC,GAAG,CAAC,GAAG,KAAI,CAAC,kBAAkB,CAAC,QAAQ,EAAE,GAAG,CAAC,CAAC;QAC1D,CAAC,CAAC,CAAC;QACH,IAAI,QAAQ,CAAC,QAAQ,EAAE;YACrB,QAAQ,CAAC,QAAQ,GAAG,SAAS,CAAC;SAC/B;aAAM;YACL,QAAQ,GAAG,SAAS,CAAC;SACtB;QACD,OAAO,IAAA,kBAAS,EAAC,QAAQ,CAAC,CAAC;IAC7B,CAAC;IAEK,gCAAgB,GAAtB,UAAuB,SAAc;;;gBACnC,IAAI,CAAC,YAAY,GAAG,IAAI,CAAC,sBAAsB,CAAC,SAAS,CAAC,CAAC;gBAC3D,sBAAO,IAAI,CAAC,eAAe,CAAC,SAAS,CAAC,EAAC;;;KACxC;IACH,YAAC;AAAD,CAAC,AA/KD,IA+KC;AA/KY,sBAAK"}
|