@serverless-devs/s 2.2.2 → 3.0.0-85afd68d
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/lib/daemon/lib.js +327 -0
- package/lib/daemon/report.js +50 -0
- package/lib/daemon/update-cli.js +20 -0
- package/lib/daemon/update-component.js +21 -0
- package/lib/daemon/update-templates.js +19 -0
- package/lib/index.js +1677 -246
- package/package.json +62 -48
- package/readme.md +2 -2
- package/lib/check-node-version/index.js +0 -15
- package/lib/clean/index.js +0 -166
- package/lib/cli/index.js +0 -223
- package/lib/component/index.js +0 -286
- package/lib/config/add/index.js +0 -190
- package/lib/config/common/common.js +0 -194
- package/lib/config/delete/index.js +0 -121
- package/lib/config/get/index.js +0 -130
- package/lib/config/index.js +0 -39
- package/lib/config/rename/index.js +0 -132
- package/lib/constant.js +0 -8
- package/lib/daemon/template.js +0 -20
- package/lib/daemon/update.js +0 -9
- package/lib/edit/index.js +0 -104
- package/lib/error/command-error.js +0 -29
- package/lib/error/config-delete-error.js +0 -29
- package/lib/error/config-error.js +0 -29
- package/lib/error/config-get-error.js +0 -29
- package/lib/error/human-error.js +0 -76
- package/lib/error/human-warning.js +0 -20
- package/lib/error/index.js +0 -147
- package/lib/error/init-error.js +0 -29
- package/lib/error/serverless-error.js +0 -19
- package/lib/execDaemon.js +0 -35
- package/lib/global-agent/index.js +0 -22
- package/lib/help/index.js +0 -158
- package/lib/init/index.js +0 -106
- package/lib/init/init-config.js +0 -606
- package/lib/init/init-manager.js +0 -223
- package/lib/onboarding/index.js +0 -111
- package/lib/set/analysis/index.js +0 -118
- package/lib/set/index.js +0 -40
- package/lib/set/locale/index.js +0 -118
- package/lib/set/log/index.js +0 -118
- package/lib/set/proxy/index.js +0 -123
- package/lib/set/registry/index.js +0 -146
- package/lib/set/workspace/index.js +0 -119
- package/lib/special-commad/index.js +0 -156
- package/lib/update-notifier/index.js +0 -137
- package/lib/utils/common.js +0 -347
- package/lib/utils/core.js +0 -49
- package/lib/utils/handler-set-config.js +0 -130
- package/lib/utils/i18n/en.js +0 -46
- package/lib/utils/i18n/index.js +0 -16
- package/lib/utils/i18n/zh.js +0 -46
- package/lib/utils/index.js +0 -39
- package/lib/utils/logger.js +0 -12
- package/lib/verify/index.js +0 -224
package/lib/utils/i18n/zh.js
DELETED
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
3
|
-
exports.default = {
|
|
4
|
-
clean_up_the_environment: '清理环境',
|
|
5
|
-
display_help_for_command: '显示命令帮助',
|
|
6
|
-
remove_components: '删除组件',
|
|
7
|
-
delete_the_file_under_the_cache: '删除缓存里的的<dirname>文件',
|
|
8
|
-
record_your_log_information: '是否记录您的日志信息?',
|
|
9
|
-
init_pproject_deploy_tip: '是否立即部署该项目?',
|
|
10
|
-
tip_for_a_serverless_project: "检测到当前目录下已存在一个Serverless-Devs项目,请通过 's deploy' 进行部署或通过 's -h' 获取更多信息",
|
|
11
|
-
create_a_new_project: '未检测到 Serverless-Devs 项目,是否新建一个项目?',
|
|
12
|
-
en: 'English (en)',
|
|
13
|
-
zh: '中文 (zh)',
|
|
14
|
-
select_current_language: '请选择当前语言',
|
|
15
|
-
'app-tip': '请选择您希望创建的 Serverless-Devs 应用',
|
|
16
|
-
'template-tip': '请选择您喜欢的模版',
|
|
17
|
-
'fc-runtime-starter': 'fc-runtime-starter - 快速部署一个 FC 函数',
|
|
18
|
-
'fc-custom-container-stater': 'fc-custom-container-stater - 快速部署一个 custom-container 应用',
|
|
19
|
-
web: 'web-framework-stater - 快速部署一个 Web 框架',
|
|
20
|
-
'static-site': 'static-website-stater - 快速部署一个静态网站',
|
|
21
|
-
'best-practice': 'serverless-best-practice - 快速体验 Serverless 最佳实践',
|
|
22
|
-
'devs-template': 'Serverless Devs 开发模板',
|
|
23
|
-
'fc-http-nodejs': 'fc-http-nodejs - 快速部署一个 nodejs12 函数',
|
|
24
|
-
'fc-http-python': 'fc-http-python - 快速部署一个 python3 函数',
|
|
25
|
-
'fc-http-java': 'fc-http-java - 快速部署一个 java8 函数',
|
|
26
|
-
'fc-custom-container-event-python3': 'fc-custom-container-event-python3 - 快速部署一个通过事件触发的 python3 应用',
|
|
27
|
-
'fc-custom-container-event-cpp': 'fc-custom-container-event-cpp - 快速部署一个通过事件触发的 cpp 应用',
|
|
28
|
-
'fc-custom-container-http-springboot': 'fc-custom-container-http-springboot - 快速部署一个通过 HTTP 请求触发的 springboot 应用',
|
|
29
|
-
'fc-custom-container-http-aspdotnetcore': 'fc-custom-container-http-aspdotnetcore - 快速部署一个通过 HTTP 请求触发的 aspdotnetcore 应用',
|
|
30
|
-
'express-starter': 'express-starter - 快速部署一个 express 基础应用',
|
|
31
|
-
'koa-starter': 'koa-starter - 快速部署一个 koa 基础应用',
|
|
32
|
-
'nuxtjs-starter': 'nuxtjs-starter - 快速部署一个 nuxtjs 基础应用',
|
|
33
|
-
'eggjs-starter': 'eggjs-starter - 快速部署一个 eggjs 基础应用',
|
|
34
|
-
'flask-starter': 'flask-starter - 快速部署一个 flask 基础应用',
|
|
35
|
-
'SpringBoot-starter': 'SpringBoot-starter - 快速部署一个 SpringBoot 基础应用',
|
|
36
|
-
'Zblog-starter': 'Zblog-starter - 快速部署一个 Zblog 基础应用',
|
|
37
|
-
'website-starter': 'website-starter - 快速部署一个静态网站',
|
|
38
|
-
'react-starter': 'react-starter - 快速部署一个 React.js 应用',
|
|
39
|
-
'vue-starter': 'vue-starter - 快速部署一个 Vue.js 应用',
|
|
40
|
-
puppeteer: 'puppeteer - 快速部署一个基于 puppeteer 截图的 Web 应用',
|
|
41
|
-
ffmpeg: 'ffmpeg - 快速部署一个基于 ffmpeg 实现音视频处理应用',
|
|
42
|
-
pdf2Img: 'pdf2Img - 快速部署一个 pdf 转图片应用',
|
|
43
|
-
tensorflow: 'tensorflow - 快速部署一个 tensorflow 应用',
|
|
44
|
-
todoList: 'todoList - 快速部署一个基于 nodejs 的网页 TodoList 应用',
|
|
45
|
-
};
|
|
46
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiemguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbHMvaTE4bi96aC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLGtCQUFlO0lBQ2Isd0JBQXdCLEVBQUUsTUFBTTtJQUNoQyx3QkFBd0IsRUFBRSxRQUFRO0lBQ2xDLGlCQUFpQixFQUFFLE1BQU07SUFDekIsK0JBQStCLEVBQUUsb0JBQW9CO0lBQ3JELDJCQUEyQixFQUFFLGFBQWE7SUFDMUMsd0JBQXdCLEVBQUUsWUFBWTtJQUN0Qyw0QkFBNEIsRUFDMUIscUVBQXFFO0lBQ3ZFLG9CQUFvQixFQUFFLG1DQUFtQztJQUN6RCxFQUFFLEVBQUUsY0FBYztJQUNsQixFQUFFLEVBQUUsU0FBUztJQUNiLHVCQUF1QixFQUFFLFNBQVM7SUFDbEMsU0FBUyxFQUFFLDhCQUE4QjtJQUN6QyxjQUFjLEVBQUUsV0FBVztJQUMzQixvQkFBb0IsRUFBRSxtQ0FBbUM7SUFDekQsNEJBQTRCLEVBQUUseURBQXlEO0lBQ3ZGLEdBQUcsRUFBRSxzQ0FBc0M7SUFDM0MsYUFBYSxFQUFFLG9DQUFvQztJQUNuRCxlQUFlLEVBQUUsaURBQWlEO0lBQ2xFLGVBQWUsRUFBRSxzQkFBc0I7SUFDdkMsZ0JBQWdCLEVBQUUscUNBQXFDO0lBQ3ZELGdCQUFnQixFQUFFLG9DQUFvQztJQUN0RCxjQUFjLEVBQUUsZ0NBQWdDO0lBQ2hELG1DQUFtQyxFQUFFLDhEQUE4RDtJQUNuRywrQkFBK0IsRUFBRSxzREFBc0Q7SUFDdkYscUNBQXFDLEVBQ25DLHlFQUF5RTtJQUMzRSx3Q0FBd0MsRUFDdEMsK0VBQStFO0lBQ2pGLGlCQUFpQixFQUFFLHVDQUF1QztJQUMxRCxhQUFhLEVBQUUsK0JBQStCO0lBQzlDLGdCQUFnQixFQUFFLHFDQUFxQztJQUN2RCxlQUFlLEVBQUUsbUNBQW1DO0lBQ3BELGVBQWUsRUFBRSxtQ0FBbUM7SUFDcEQsb0JBQW9CLEVBQUUsNkNBQTZDO0lBQ25FLGVBQWUsRUFBRSxtQ0FBbUM7SUFDcEQsaUJBQWlCLEVBQUUsOEJBQThCO0lBQ2pELGVBQWUsRUFBRSxvQ0FBb0M7SUFDckQsYUFBYSxFQUFFLGdDQUFnQztJQUMvQyxTQUFTLEVBQUUsMkNBQTJDO0lBQ3RELE1BQU0sRUFBRSxvQ0FBb0M7SUFDNUMsT0FBTyxFQUFFLDRCQUE0QjtJQUNyQyxVQUFVLEVBQUUsbUNBQW1DO0lBQy9DLFFBQVEsRUFBRSw0Q0FBNEM7Q0FDdkQsQ0FBQyJ9
|
package/lib/utils/index.js
DELETED
|
@@ -1,39 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
/** @format */
|
|
3
|
-
var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
|
|
4
|
-
if (k2 === undefined) k2 = k;
|
|
5
|
-
var desc = Object.getOwnPropertyDescriptor(m, k);
|
|
6
|
-
if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
|
|
7
|
-
desc = { enumerable: true, get: function() { return m[k]; } };
|
|
8
|
-
}
|
|
9
|
-
Object.defineProperty(o, k2, desc);
|
|
10
|
-
}) : (function(o, m, k, k2) {
|
|
11
|
-
if (k2 === undefined) k2 = k;
|
|
12
|
-
o[k2] = m[k];
|
|
13
|
-
}));
|
|
14
|
-
var __exportStar = (this && this.__exportStar) || function(m, exports) {
|
|
15
|
-
for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
|
|
16
|
-
};
|
|
17
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
18
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
19
|
-
};
|
|
20
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
21
|
-
exports.registerCommandChecker = exports.i18n = exports.logger = void 0;
|
|
22
|
-
var logger_1 = __importDefault(require("./logger"));
|
|
23
|
-
__exportStar(require("./common"), exports);
|
|
24
|
-
__exportStar(require("./handler-set-config"), exports);
|
|
25
|
-
var logger_2 = require("./logger");
|
|
26
|
-
Object.defineProperty(exports, "logger", { enumerable: true, get: function () { return __importDefault(logger_2).default; } });
|
|
27
|
-
var i18n_1 = require("./i18n");
|
|
28
|
-
Object.defineProperty(exports, "i18n", { enumerable: true, get: function () { return __importDefault(i18n_1).default; } });
|
|
29
|
-
function registerCommandChecker(program) {
|
|
30
|
-
program.on('command:*', function (cmds) {
|
|
31
|
-
var commands = program.commands.map(function (command) { return command.name(); });
|
|
32
|
-
if (!commands.includes(cmds[0])) {
|
|
33
|
-
logger_1.default.error(" error: unknown command ".concat(cmds[0]));
|
|
34
|
-
program.help();
|
|
35
|
-
}
|
|
36
|
-
});
|
|
37
|
-
}
|
|
38
|
-
exports.registerCommandChecker = registerCommandChecker;
|
|
39
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IjtBQUFBLGNBQWM7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7O0FBRWQsb0RBQThCO0FBQzlCLDJDQUF5QjtBQUN6Qix1REFBcUM7QUFDckMsbUNBQTZDO0FBQXBDLGlIQUFBLE9BQU8sT0FBVTtBQUMxQiwrQkFBeUM7QUFBaEMsNkdBQUEsT0FBTyxPQUFRO0FBRXhCLFNBQWdCLHNCQUFzQixDQUFDLE9BQVk7SUFDakQsT0FBTyxDQUFDLEVBQUUsQ0FBQyxXQUFXLEVBQUUsVUFBQyxJQUFTO1FBQ2hDLElBQU0sUUFBUSxHQUFHLE9BQU8sQ0FBQyxRQUFRLENBQUMsR0FBRyxDQUFDLFVBQUMsT0FBWSxJQUFLLE9BQUEsT0FBTyxDQUFDLElBQUksRUFBRSxFQUFkLENBQWMsQ0FBQyxDQUFDO1FBQ3hFLElBQUksQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsQ0FBQyxFQUFFO1lBQy9CLGdCQUFNLENBQUMsS0FBSyxDQUFDLG1DQUE0QixJQUFJLENBQUMsQ0FBQyxDQUFDLENBQUUsQ0FBQyxDQUFDO1lBQ3BELE9BQU8sQ0FBQyxJQUFJLEVBQUUsQ0FBQztTQUNoQjtJQUNILENBQUMsQ0FBQyxDQUFDO0FBQ0wsQ0FBQztBQVJELHdEQVFDIn0=
|
package/lib/utils/logger.js
DELETED
|
@@ -1,12 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
/** @format */
|
|
3
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
4
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
5
|
-
};
|
|
6
|
-
Object.defineProperty(exports, "__esModule", { value: true });
|
|
7
|
-
var core_1 = __importDefault(require("./core"));
|
|
8
|
-
var Logger = core_1.default.Logger;
|
|
9
|
-
var logger = new Logger('S-CLI');
|
|
10
|
-
logger.success = function (message) { return logger.log(message, 'green'); };
|
|
11
|
-
exports.default = logger;
|
|
12
|
-
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibG9nZ2VyLmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vLi4vc3JjL3V0aWxzL2xvZ2dlci50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiO0FBQUEsY0FBYzs7Ozs7QUFFZCxnREFBMEI7QUFFbEIsSUFBQSxNQUFNLEdBQUssY0FBSSxPQUFULENBQVU7QUFFeEIsSUFBTSxNQUFNLEdBQUcsSUFBSSxNQUFNLENBQUMsT0FBTyxDQUFDLENBQUM7QUFFbkMsTUFBTSxDQUFDLE9BQU8sR0FBRyxVQUFDLE9BQWUsSUFBSyxPQUFBLE1BQU0sQ0FBQyxHQUFHLENBQUMsT0FBTyxFQUFFLE9BQU8sQ0FBQyxFQUE1QixDQUE0QixDQUFDO0FBRW5FLGtCQUFlLE1BQU0sQ0FBQyJ9
|
package/lib/verify/index.js
DELETED
|
@@ -1,224 +0,0 @@
|
|
|
1
|
-
"use strict";
|
|
2
|
-
var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
|
|
3
|
-
function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
|
|
4
|
-
return new (P || (P = Promise))(function (resolve, reject) {
|
|
5
|
-
function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
|
|
6
|
-
function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
|
|
7
|
-
function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
|
|
8
|
-
step((generator = generator.apply(thisArg, _arguments || [])).next());
|
|
9
|
-
});
|
|
10
|
-
};
|
|
11
|
-
var __generator = (this && this.__generator) || function (thisArg, body) {
|
|
12
|
-
var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
|
|
13
|
-
return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
|
|
14
|
-
function verb(n) { return function (v) { return step([n, v]); }; }
|
|
15
|
-
function step(op) {
|
|
16
|
-
if (f) throw new TypeError("Generator is already executing.");
|
|
17
|
-
while (g && (g = 0, op[0] && (_ = 0)), _) try {
|
|
18
|
-
if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
|
|
19
|
-
if (y = 0, t) op = [op[0] & 2, t.value];
|
|
20
|
-
switch (op[0]) {
|
|
21
|
-
case 0: case 1: t = op; break;
|
|
22
|
-
case 4: _.label++; return { value: op[1], done: false };
|
|
23
|
-
case 5: _.label++; y = op[1]; op = [0]; continue;
|
|
24
|
-
case 7: op = _.ops.pop(); _.trys.pop(); continue;
|
|
25
|
-
default:
|
|
26
|
-
if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) { _ = 0; continue; }
|
|
27
|
-
if (op[0] === 3 && (!t || (op[1] > t[0] && op[1] < t[3]))) { _.label = op[1]; break; }
|
|
28
|
-
if (op[0] === 6 && _.label < t[1]) { _.label = t[1]; t = op; break; }
|
|
29
|
-
if (t && _.label < t[2]) { _.label = t[2]; _.ops.push(op); break; }
|
|
30
|
-
if (t[2]) _.ops.pop();
|
|
31
|
-
_.trys.pop(); continue;
|
|
32
|
-
}
|
|
33
|
-
op = body.call(thisArg, _);
|
|
34
|
-
} catch (e) { op = [6, e]; y = 0; } finally { f = t = 0; }
|
|
35
|
-
if (op[0] & 5) throw op[1]; return { value: op[0] ? op[1] : void 0, done: true };
|
|
36
|
-
}
|
|
37
|
-
};
|
|
38
|
-
var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
39
|
-
return (mod && mod.__esModule) ? mod : { "default": mod };
|
|
40
|
-
};
|
|
41
|
-
var core_1 = __importDefault(require("../utils/core"));
|
|
42
|
-
var i18n_1 = __importDefault(require("../utils/i18n"));
|
|
43
|
-
var utils_1 = require("../utils");
|
|
44
|
-
var path_1 = __importDefault(require("path"));
|
|
45
|
-
var ajv_1 = __importDefault(require("ajv"));
|
|
46
|
-
var error_1 = require("../error");
|
|
47
|
-
var colors = core_1.default.colors, getYamlContent = core_1.default.getYamlContent, lodash = core_1.default.lodash, loadComponent = core_1.default.loadComponent, fs = core_1.default.fse, parseYaml = core_1.default.parseYaml, spinner = core_1.default.spinner;
|
|
48
|
-
var get = lodash.get, keys = lodash.keys, omit = lodash.omit, isEmpty = lodash.isEmpty, replace = lodash.replace, isPlainObject = lodash.isPlainObject, isArray = lodash.isArray, each = lodash.each, last = lodash.last, split = lodash.split, uniq = lodash.uniq, map = lodash.map, concat = lodash.concat, filter = lodash.filter;
|
|
49
|
-
var description = "Application verification.\n \n Example:\n $ s verify\n\n".concat((0, utils_1.emoji)('📖'), " Document: ").concat(colors.underline('https://github.com/Serverless-Devs/Serverless-Devs/tree/master/docs/zh/command/verify.md'));
|
|
50
|
-
function deleteXkey(obj) {
|
|
51
|
-
var result = isArray(obj) ? [] : {};
|
|
52
|
-
if (typeof obj === 'object') {
|
|
53
|
-
var keyList = keys(obj).filter(function (v) { return v.startsWith('x-'); });
|
|
54
|
-
var xobj = omit(obj, keyList);
|
|
55
|
-
for (var i in xobj) {
|
|
56
|
-
result[i] = typeof obj[i] === 'object' ? deleteXkey(obj[i]) : obj[i];
|
|
57
|
-
}
|
|
58
|
-
}
|
|
59
|
-
else {
|
|
60
|
-
result = obj;
|
|
61
|
-
}
|
|
62
|
-
return result;
|
|
63
|
-
}
|
|
64
|
-
function transforData(obj) {
|
|
65
|
-
var data = deleteXkey(obj);
|
|
66
|
-
var tempArr = [];
|
|
67
|
-
function getRequiredKey(value, parentStr) {
|
|
68
|
-
if (parentStr === void 0) { parentStr = ''; }
|
|
69
|
-
if (isPlainObject(value)) {
|
|
70
|
-
if (value.required === true) {
|
|
71
|
-
var newArr = split(parentStr, '.');
|
|
72
|
-
var newStr = newArr.slice(0, newArr.length - 2).join('.');
|
|
73
|
-
tempArr.push({
|
|
74
|
-
key: newStr,
|
|
75
|
-
name: last(newArr),
|
|
76
|
-
});
|
|
77
|
-
}
|
|
78
|
-
if (typeof value.required === 'boolean') {
|
|
79
|
-
delete value.required;
|
|
80
|
-
}
|
|
81
|
-
if (parentStr !== '') {
|
|
82
|
-
parentStr = "".concat(parentStr, ".");
|
|
83
|
-
}
|
|
84
|
-
for (var key in value) {
|
|
85
|
-
getRequiredKey(value[key], "".concat(parentStr).concat(key));
|
|
86
|
-
}
|
|
87
|
-
}
|
|
88
|
-
if (isArray(value)) {
|
|
89
|
-
each(value, function (item, index) {
|
|
90
|
-
getRequiredKey(item, "".concat(parentStr, "[").concat(index, "]"));
|
|
91
|
-
});
|
|
92
|
-
}
|
|
93
|
-
}
|
|
94
|
-
function setRequiredKey(value, parentStr) {
|
|
95
|
-
if (parentStr === void 0) { parentStr = ''; }
|
|
96
|
-
if (isPlainObject(value)) {
|
|
97
|
-
var filterArr = filter(tempArr, function (o) { return o.key === parentStr; });
|
|
98
|
-
if (filterArr.length > 0) {
|
|
99
|
-
var names = map(filterArr, function (o) { return o.name; });
|
|
100
|
-
value.required = value.required ? uniq(concat(value.required, names)) : names;
|
|
101
|
-
}
|
|
102
|
-
if (parentStr !== '') {
|
|
103
|
-
parentStr = "".concat(parentStr, ".");
|
|
104
|
-
}
|
|
105
|
-
for (var key in value) {
|
|
106
|
-
setRequiredKey(value[key], "".concat(parentStr).concat(key));
|
|
107
|
-
}
|
|
108
|
-
}
|
|
109
|
-
if (isArray(value)) {
|
|
110
|
-
each(value, function (item, index) {
|
|
111
|
-
setRequiredKey(item, "".concat(parentStr, "[").concat(index, "]"));
|
|
112
|
-
});
|
|
113
|
-
}
|
|
114
|
-
}
|
|
115
|
-
getRequiredKey(data);
|
|
116
|
-
setRequiredKey(data);
|
|
117
|
-
return data;
|
|
118
|
-
}
|
|
119
|
-
function run(program) {
|
|
120
|
-
var _this = this;
|
|
121
|
-
var command = program
|
|
122
|
-
.command('verify')
|
|
123
|
-
.usage('[options]')
|
|
124
|
-
.option('-t, --template [templatePath]', 'Specify the template file')
|
|
125
|
-
.helpOption('-h, --help', (0, i18n_1.default)('display_help_for_command'))
|
|
126
|
-
.description(description)
|
|
127
|
-
.addHelpCommand(false)
|
|
128
|
-
.action(function () { return __awaiter(_this, void 0, void 0, function () {
|
|
129
|
-
var error_2;
|
|
130
|
-
return __generator(this, function (_a) {
|
|
131
|
-
switch (_a.label) {
|
|
132
|
-
case 0:
|
|
133
|
-
_a.trys.push([0, 2, , 4]);
|
|
134
|
-
return [4 /*yield*/, doAction()];
|
|
135
|
-
case 1:
|
|
136
|
-
_a.sent();
|
|
137
|
-
return [3 /*break*/, 4];
|
|
138
|
-
case 2:
|
|
139
|
-
error_2 = _a.sent();
|
|
140
|
-
return [4 /*yield*/, (0, error_1.HandleError)(error_2)];
|
|
141
|
-
case 3:
|
|
142
|
-
_a.sent();
|
|
143
|
-
return [3 /*break*/, 4];
|
|
144
|
-
case 4: return [2 /*return*/];
|
|
145
|
-
}
|
|
146
|
-
});
|
|
147
|
-
}); });
|
|
148
|
-
var doAction = function () { return __awaiter(_this, void 0, void 0, function () {
|
|
149
|
-
var argv, _a, help, template, originSpath, templatePath, data, doc, services, componentList, key, ele, validList, _i, componentList_1, item, componentInstance, publishData, schemaData, ajv, validate, valid, errors, ferrors, instancePath, errKey, rows;
|
|
150
|
-
return __generator(this, function (_b) {
|
|
151
|
-
switch (_b.label) {
|
|
152
|
-
case 0:
|
|
153
|
-
argv = process.argv.splice(2);
|
|
154
|
-
_a = core_1.default.getGlobalArgs(argv), help = _a.help, template = _a.template;
|
|
155
|
-
help && command.help();
|
|
156
|
-
return [4 /*yield*/, core_1.default.getTemplatePath(template)];
|
|
157
|
-
case 1:
|
|
158
|
-
originSpath = _b.sent();
|
|
159
|
-
return [4 /*yield*/, core_1.default.transforYamlPath(originSpath)];
|
|
160
|
-
case 2:
|
|
161
|
-
templatePath = _b.sent();
|
|
162
|
-
data = fs.readFileSync(templatePath, 'utf8');
|
|
163
|
-
doc = parseYaml(data);
|
|
164
|
-
services = doc.services;
|
|
165
|
-
componentList = [];
|
|
166
|
-
for (key in services) {
|
|
167
|
-
ele = services[key];
|
|
168
|
-
componentList.push({
|
|
169
|
-
component: ele.component,
|
|
170
|
-
props: ele.props,
|
|
171
|
-
service: key,
|
|
172
|
-
});
|
|
173
|
-
}
|
|
174
|
-
validList = [];
|
|
175
|
-
_i = 0, componentList_1 = componentList;
|
|
176
|
-
_b.label = 3;
|
|
177
|
-
case 3:
|
|
178
|
-
if (!(_i < componentList_1.length)) return [3 /*break*/, 7];
|
|
179
|
-
item = componentList_1[_i];
|
|
180
|
-
return [4 /*yield*/, loadComponent(item.component)];
|
|
181
|
-
case 4:
|
|
182
|
-
componentInstance = _b.sent();
|
|
183
|
-
return [4 /*yield*/, getYamlContent(path_1.default.join(componentInstance.__path, 'publish.yaml'))];
|
|
184
|
-
case 5:
|
|
185
|
-
publishData = _b.sent();
|
|
186
|
-
schemaData = get(publishData, 'Properties', {});
|
|
187
|
-
if (isEmpty(schemaData.properties)) {
|
|
188
|
-
return [3 /*break*/, 6];
|
|
189
|
-
}
|
|
190
|
-
ajv = new ajv_1.default({
|
|
191
|
-
strict: false,
|
|
192
|
-
});
|
|
193
|
-
validate = ajv.compile(transforData(schemaData));
|
|
194
|
-
valid = validate(item.props);
|
|
195
|
-
if (!valid) {
|
|
196
|
-
validList.push(true);
|
|
197
|
-
errors = validate.errors;
|
|
198
|
-
ferrors = filter(errors, function (o) { return o.keyword !== 'oneOf'; });
|
|
199
|
-
utils_1.logger.log("".concat((0, utils_1.red)('✖'), " Format verification failed."));
|
|
200
|
-
instancePath = get(ferrors, '[0].instancePath');
|
|
201
|
-
if (instancePath) {
|
|
202
|
-
errKey = replace(instancePath.slice(1), /\//g, '.');
|
|
203
|
-
utils_1.logger.log("The ".concat(colors.yellow(errKey), " field in ").concat(colors.yellow(item.service), " service is incorrect.\n"));
|
|
204
|
-
}
|
|
205
|
-
rows = map(ferrors, function (o) { return ({
|
|
206
|
-
message: o.message,
|
|
207
|
-
params: o.params,
|
|
208
|
-
}); });
|
|
209
|
-
utils_1.logger.output(rows.length > 1 ? rows : rows[0]);
|
|
210
|
-
return [3 /*break*/, 7];
|
|
211
|
-
}
|
|
212
|
-
_b.label = 6;
|
|
213
|
-
case 6:
|
|
214
|
-
_i++;
|
|
215
|
-
return [3 /*break*/, 3];
|
|
216
|
-
case 7:
|
|
217
|
-
validList.length === 0 && spinner('Format verification passed.').succeed();
|
|
218
|
-
return [2 /*return*/];
|
|
219
|
-
}
|
|
220
|
-
});
|
|
221
|
-
}); };
|
|
222
|
-
}
|
|
223
|
-
module.exports = run;
|
|
224
|
-
//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/verify/index.ts"],"names":[],"mappings":";;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;AACA,uDAAiC;AACjC,uDAAiC;AACjC,kCAA8C;AAC9C,8CAAwB;AACxB,4CAAsB;AACtB,kCAAuC;AAE/B,IAAA,MAAM,GAAyE,cAAI,OAA7E,EAAE,cAAc,GAAyD,cAAI,eAA7D,EAAE,MAAM,GAAiD,cAAI,OAArD,EAAE,aAAa,GAAkC,cAAI,cAAtC,EAAO,EAAE,GAAyB,cAAI,IAA7B,EAAE,SAAS,GAAc,cAAI,UAAlB,EAAE,OAAO,GAAK,cAAI,QAAT,CAAU;AACpF,IAAA,GAAG,GACT,MAAM,IADG,EAAE,IAAI,GACf,MAAM,KADS,EAAE,IAAI,GACrB,MAAM,KADe,EAAE,OAAO,GAC9B,MAAM,QADwB,EAAE,OAAO,GACvC,MAAM,QADiC,EAAE,aAAa,GACtD,MAAM,cADgD,EAAE,OAAO,GAC/D,MAAM,QADyD,EAAE,IAAI,GACrE,MAAM,KAD+D,EAAE,IAAI,GAC3E,MAAM,KADqE,EAAE,KAAK,GAClF,MAAM,MAD4E,EAAE,IAAI,GACxF,MAAM,KADkF,EAAE,GAAG,GAC7F,MAAM,IADuF,EAAE,MAAM,GACrG,MAAM,OAD+F,EAAE,MAAM,GAC7G,MAAM,OADuG,CACtG;AAET,IAAM,WAAW,GAAG,+EAKlB,IAAA,aAAK,EAAC,IAAI,CAAC,wBAAc,MAAM,CAAC,SAAS,CACzC,0FAA0F,CAC3F,CAAE,CAAC;AAEJ,SAAS,UAAU,CAAC,GAAQ;IAC1B,IAAI,MAAM,GAAQ,OAAO,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IACzC,IAAI,OAAO,GAAG,KAAK,QAAQ,EAAE;QAC3B,IAAM,OAAO,GAAG,IAAI,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,UAAC,CAAS,IAAK,OAAA,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC,EAAlB,CAAkB,CAAC,CAAC;QACpE,IAAM,IAAI,GAAG,IAAI,CAAC,GAAG,EAAE,OAAO,CAAC,CAAC;QAChC,KAAK,IAAM,CAAC,IAAI,IAAI,EAAE;YACpB,MAAM,CAAC,CAAC,CAAC,GAAG,OAAO,GAAG,CAAC,CAAC,CAAC,KAAK,QAAQ,CAAC,CAAC,CAAC,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;SACtE;KACF;SAAM;QACL,MAAM,GAAG,GAAG,CAAC;KACd;IACD,OAAO,MAAM,CAAC;AAChB,CAAC;AAED,SAAS,YAAY,CAAC,GAAQ;IAC5B,IAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAM,OAAO,GAAG,EAAE,CAAC;IACnB,SAAS,cAAc,CAAC,KAAU,EAAE,SAAc;QAAd,0BAAA,EAAA,cAAc;QAChD,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE;YACxB,IAAI,KAAK,CAAC,QAAQ,KAAK,IAAI,EAAE;gBAC3B,IAAM,MAAM,GAAG,KAAK,CAAC,SAAS,EAAE,GAAG,CAAC,CAAC;gBACrC,IAAM,MAAM,GAAG,MAAM,CAAC,KAAK,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;gBAC5D,OAAO,CAAC,IAAI,CAAC;oBACX,GAAG,EAAE,MAAM;oBACX,IAAI,EAAE,IAAI,CAAC,MAAM,CAAC;iBACnB,CAAC,CAAC;aACJ;YACD,IAAI,OAAO,KAAK,CAAC,QAAQ,KAAK,SAAS,EAAE;gBACvC,OAAO,KAAK,CAAC,QAAQ,CAAC;aACvB;YACD,IAAI,SAAS,KAAK,EAAE,EAAE;gBACpB,SAAS,GAAG,UAAG,SAAS,MAAG,CAAC;aAC7B;YACD,KAAK,IAAM,GAAG,IAAI,KAAK,EAAE;gBACvB,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAG,SAAS,SAAG,GAAG,CAAE,CAAC,CAAC;aAClD;SACF;QACD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,KAAK,EAAE,UAAC,IAAI,EAAE,KAAK;gBACtB,cAAc,CAAC,IAAI,EAAE,UAAG,SAAS,cAAI,KAAK,MAAG,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IACD,SAAS,cAAc,CAAC,KAAU,EAAE,SAAc;QAAd,0BAAA,EAAA,cAAc;QAChD,IAAI,aAAa,CAAC,KAAK,CAAC,EAAE;YACxB,IAAM,SAAS,GAAG,MAAM,CAAC,OAAO,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,GAAG,KAAK,SAAS,EAAnB,CAAmB,CAAC,CAAC;YAC5D,IAAI,SAAS,CAAC,MAAM,GAAG,CAAC,EAAE;gBACxB,IAAM,KAAK,GAAG,GAAG,CAAC,SAAS,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,IAAI,EAAN,CAAM,CAAC,CAAC;gBAC1C,KAAK,CAAC,QAAQ,GAAG,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,KAAK,CAAC;aAC/E;YAED,IAAI,SAAS,KAAK,EAAE,EAAE;gBACpB,SAAS,GAAG,UAAG,SAAS,MAAG,CAAC;aAC7B;YACD,KAAK,IAAM,GAAG,IAAI,KAAK,EAAE;gBACvB,cAAc,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,UAAG,SAAS,SAAG,GAAG,CAAE,CAAC,CAAC;aAClD;SACF;QACD,IAAI,OAAO,CAAC,KAAK,CAAC,EAAE;YAClB,IAAI,CAAC,KAAK,EAAE,UAAC,IAAI,EAAE,KAAK;gBACtB,cAAc,CAAC,IAAI,EAAE,UAAG,SAAS,cAAI,KAAK,MAAG,CAAC,CAAC;YACjD,CAAC,CAAC,CAAC;SACJ;IACH,CAAC;IACD,cAAc,CAAC,IAAI,CAAC,CAAC;IACrB,cAAc,CAAC,IAAI,CAAC,CAAC;IACrB,OAAO,IAAI,CAAC;AACd,CAAC;AAED,SAAS,GAAG,CAAC,OAAgB;IAA7B,iBAmEC;IAlEC,IAAM,OAAO,GAAG,OAAO;SACpB,OAAO,CAAC,QAAQ,CAAC;SACjB,KAAK,CAAC,WAAW,CAAC;SAClB,MAAM,CAAC,+BAA+B,EAAE,2BAA2B,CAAC;SACpE,UAAU,CAAC,YAAY,EAAE,IAAA,cAAI,EAAC,0BAA0B,CAAC,CAAC;SAC1D,WAAW,CAAC,WAAW,CAAC;SACxB,cAAc,CAAC,KAAK,CAAC;SACrB,MAAM,CAAC;;;;;;oBAEJ,qBAAM,QAAQ,EAAE,EAAA;;oBAAhB,SAAgB,CAAC;;;;oBAEjB,qBAAM,IAAA,mBAAW,EAAC,OAAK,CAAC,EAAA;;oBAAxB,SAAwB,CAAC;;;;;SAE5B,CAAC,CAAC;IAEL,IAAM,QAAQ,GAAG;;;;;oBACT,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;oBAC9B,KAAqB,cAAI,CAAC,aAAa,CAAC,IAAI,CAAC,EAA3C,IAAI,UAAA,EAAE,QAAQ,cAAA,CAA8B;oBACpD,IAAI,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;oBACH,qBAAM,cAAI,CAAC,eAAe,CAAC,QAAQ,CAAC,EAAA;;oBAAlD,WAAW,GAAG,SAAoC;oBACnC,qBAAM,cAAI,CAAC,gBAAgB,CAAC,WAAW,CAAC,EAAA;;oBAAvD,YAAY,GAAG,SAAwC;oBACvD,IAAI,GAAG,EAAE,CAAC,YAAY,CAAC,YAAY,EAAE,MAAM,CAAC,CAAC;oBAC7C,GAAG,GAAG,SAAS,CAAC,IAAI,CAAC,CAAC;oBACpB,QAAQ,GAAK,GAAG,SAAR,CAAS;oBACnB,aAAa,GAAG,EAAE,CAAC;oBACzB,KAAW,GAAG,IAAI,QAAQ,EAAE;wBACpB,GAAG,GAAG,QAAQ,CAAC,GAAG,CAAC,CAAC;wBAC1B,aAAa,CAAC,IAAI,CAAC;4BACjB,SAAS,EAAE,GAAG,CAAC,SAAS;4BACxB,KAAK,EAAE,GAAG,CAAC,KAAK;4BAChB,OAAO,EAAE,GAAG;yBACb,CAAC,CAAC;qBACJ;oBACK,SAAS,GAAG,EAAE,CAAC;0BACW,EAAb,+BAAa;;;yBAAb,CAAA,2BAAa,CAAA;oBAArB,IAAI;oBACa,qBAAM,aAAa,CAAC,IAAI,CAAC,SAAS,CAAC,EAAA;;oBAAvD,iBAAiB,GAAG,SAAmC;oBACzC,qBAAM,cAAc,CAAC,cAAI,CAAC,IAAI,CAAC,iBAAiB,CAAC,MAAM,EAAE,cAAc,CAAC,CAAC,EAAA;;oBAAvF,WAAW,GAAG,SAAyE;oBACvF,UAAU,GAAG,GAAG,CAAC,WAAW,EAAE,YAAY,EAAE,EAAE,CAAC,CAAC;oBACtD,IAAI,OAAO,CAAC,UAAU,CAAC,UAAU,CAAC,EAAE;wBAClC,wBAAS;qBACV;oBACK,GAAG,GAAG,IAAI,aAAG,CAAC;wBAClB,MAAM,EAAE,KAAK;qBACd,CAAC,CAAC;oBACG,QAAQ,GAAG,GAAG,CAAC,OAAO,CAAC,YAAY,CAAC,UAAU,CAAC,CAAC,CAAC;oBACjD,KAAK,GAAG,QAAQ,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;oBACnC,IAAI,CAAC,KAAK,EAAE;wBACV,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;wBACb,MAAM,GAAK,QAAQ,OAAb,CAAc;wBACtB,OAAO,GAAG,MAAM,CAAC,MAAM,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC,CAAC,OAAO,KAAK,OAAO,EAArB,CAAqB,CAAC,CAAC;wBAC3D,cAAM,CAAC,GAAG,CAAC,UAAG,IAAA,WAAG,EAAC,GAAG,CAAC,iCAA8B,CAAC,CAAC;wBAChD,YAAY,GAAG,GAAG,CAAC,OAAO,EAAE,kBAAkB,CAAC,CAAC;wBACtD,IAAI,YAAY,EAAE;4BACV,MAAM,GAAG,OAAO,CAAC,YAAY,CAAC,KAAK,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,GAAG,CAAC,CAAC;4BAC1D,cAAM,CAAC,GAAG,CAAC,cAAO,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,uBAAa,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,6BAA0B,CAAC,CAAC;yBAC5G;wBACK,IAAI,GAAG,GAAG,CAAC,OAAO,EAAE,UAAA,CAAC,IAAI,OAAA,CAAC;4BAC9B,OAAO,EAAE,CAAC,CAAC,OAAO;4BAClB,MAAM,EAAE,CAAC,CAAC,MAAM;yBACjB,CAAC,EAH6B,CAG7B,CAAC,CAAC;wBACJ,cAAM,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC;wBAChD,wBAAM;qBACP;;;oBA5BgB,IAAa,CAAA;;;oBA8BhC,SAAS,CAAC,MAAM,KAAK,CAAC,IAAI,OAAO,CAAC,6BAA6B,CAAC,CAAC,OAAO,EAAE,CAAC;;;;SAC5E,CAAC;AACJ,CAAC;AAED,iBAAS,GAAG,CAAC"}
|