@serverless-devs/s 2.0.100-beta.9 → 2.0.101-beta.2
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/bin/s-set-env +2 -0
- package/lib/clean/index.js +17 -40
- package/lib/cli/index.js +36 -63
- package/lib/component/index.js +41 -64
- package/lib/config/add/index.js +36 -59
- package/lib/config/delete/index.js +36 -59
- package/lib/config/get/index.js +44 -67
- package/lib/config/index.js +17 -40
- package/lib/help/index.js +61 -40
- package/lib/index.js +93 -110
- package/lib/init/index.js +70 -93
- package/lib/init/init-config.js +25 -30
- package/lib/init/init-manager.js +8 -8
- package/lib/set/analysis/index.js +38 -61
- package/lib/set/index.js +17 -40
- package/lib/set/locale/index.js +38 -61
- package/lib/set/registry/index.js +38 -61
- package/lib/set/workspace/index.js +39 -62
- package/lib/special-commad/index.js +56 -34
- package/lib/update-notifier/index.js +2 -2
- package/lib/utils/common.js +73 -25
- package/lib/utils/core.js +6 -2
- package/lib/utils/index.js +6 -2
- package/lib/verify/index.js +42 -65
- package/package.json +1 -4
- package/readme.md +8 -2
|
@@ -41,79 +41,101 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
|
|
|
41
41
|
Object.defineProperty(exports, "__esModule", { value: true });
|
|
42
42
|
var commander_1 = require("@serverless-devs/commander");
|
|
43
43
|
var core_1 = __importDefault(require("../utils/core"));
|
|
44
|
-
var
|
|
45
|
-
var
|
|
46
|
-
var getGlobalArgs = core_1.default.getGlobalArgs, execCommand = core_1.default.execCommand,
|
|
44
|
+
var path_1 = __importDefault(require("path"));
|
|
45
|
+
var utils_1 = require("../utils");
|
|
46
|
+
var getGlobalArgs = core_1.default.getGlobalArgs, execCommand = core_1.default.execCommand, getYamlContent = core_1.default.getYamlContent, lodash = core_1.default.lodash;
|
|
47
|
+
var isEmpty = lodash.isEmpty, includes = lodash.includes, keys = lodash.keys, get = lodash.get;
|
|
47
48
|
var SpecialCommad = /** @class */ (function () {
|
|
48
49
|
function SpecialCommad(command) {
|
|
49
50
|
this.command = command;
|
|
50
51
|
}
|
|
51
52
|
SpecialCommad.prototype.init = function () {
|
|
52
53
|
return __awaiter(this, void 0, void 0, function () {
|
|
53
|
-
var argv, rawData, template, access, skipActions, debug, sub, _a, serverName, method;
|
|
54
|
+
var argv, rawData, template, access, skipActions, debug, env, help, sub, _a, serverName, method, spath;
|
|
54
55
|
return __generator(this, function (_b) {
|
|
55
56
|
switch (_b.label) {
|
|
56
57
|
case 0:
|
|
57
|
-
if ((0, lodash_1.includes)(constant_1.COMMAND_LIST, process.argv[2]))
|
|
58
|
-
return [2 /*return*/];
|
|
59
58
|
argv = getGlobalArgs(process.argv.slice(2));
|
|
60
|
-
rawData = argv._, template = argv.template, access = argv.access, skipActions = argv["skip-actions"], debug = argv.debug;
|
|
61
|
-
if (
|
|
59
|
+
rawData = argv._, template = argv.template, access = argv.access, skipActions = argv["skip-actions"], debug = argv.debug, env = argv.env, help = argv.help;
|
|
60
|
+
if (isEmpty(rawData))
|
|
62
61
|
return [2 /*return*/];
|
|
63
62
|
sub = new commander_1.Command(rawData[0]);
|
|
64
63
|
sub.allowUnknownOption();
|
|
65
64
|
this.command.addCommand(sub);
|
|
66
65
|
return [4 /*yield*/, this.getParams(argv)];
|
|
67
66
|
case 1:
|
|
68
|
-
_a = _b.sent(), serverName = _a.serverName, method = _a.method;
|
|
69
|
-
return [
|
|
70
|
-
|
|
71
|
-
serverName: serverName,
|
|
72
|
-
method: method,
|
|
73
|
-
args: process.argv.slice(2),
|
|
74
|
-
globalArgs: {
|
|
75
|
-
access: access,
|
|
76
|
-
skipActions: skipActions,
|
|
77
|
-
debug: debug,
|
|
78
|
-
},
|
|
79
|
-
})];
|
|
67
|
+
_a = _b.sent(), serverName = _a.serverName, method = _a.method, spath = _a.spath;
|
|
68
|
+
if (!(serverName && isEmpty(method) && help)) return [3 /*break*/, 3];
|
|
69
|
+
return [4 /*yield*/, this.help({ spath: spath, serverName: serverName })];
|
|
80
70
|
case 2: return [2 /*return*/, _b.sent()];
|
|
71
|
+
case 3: return [4 /*yield*/, execCommand({
|
|
72
|
+
syaml: template,
|
|
73
|
+
serverName: serverName,
|
|
74
|
+
method: method,
|
|
75
|
+
args: process.argv.slice(2),
|
|
76
|
+
globalArgs: {
|
|
77
|
+
access: access,
|
|
78
|
+
skipActions: skipActions,
|
|
79
|
+
debug: debug,
|
|
80
|
+
env: env,
|
|
81
|
+
},
|
|
82
|
+
})];
|
|
83
|
+
case 4: return [2 /*return*/, _b.sent()];
|
|
84
|
+
}
|
|
85
|
+
});
|
|
86
|
+
});
|
|
87
|
+
};
|
|
88
|
+
SpecialCommad.prototype.help = function (_a) {
|
|
89
|
+
var spath = _a.spath, serverName = _a.serverName;
|
|
90
|
+
return __awaiter(this, void 0, void 0, function () {
|
|
91
|
+
var yamlData, component, instance, publishPath;
|
|
92
|
+
return __generator(this, function (_b) {
|
|
93
|
+
switch (_b.label) {
|
|
94
|
+
case 0: return [4 /*yield*/, getYamlContent(spath)];
|
|
95
|
+
case 1:
|
|
96
|
+
yamlData = _b.sent();
|
|
97
|
+
component = get(yamlData, ['services', serverName, 'component']);
|
|
98
|
+
return [4 /*yield*/, core_1.default.loadComponent(component)];
|
|
99
|
+
case 2:
|
|
100
|
+
instance = _b.sent();
|
|
101
|
+
publishPath = path_1.default.join(instance.__path, 'publish.yaml');
|
|
102
|
+
return [4 /*yield*/, (0, utils_1.specifyServiceHelp)(publishPath)];
|
|
103
|
+
case 3:
|
|
104
|
+
_b.sent();
|
|
105
|
+
return [2 /*return*/];
|
|
81
106
|
}
|
|
82
107
|
});
|
|
83
108
|
});
|
|
84
109
|
};
|
|
85
110
|
SpecialCommad.prototype.getParams = function (argv) {
|
|
86
111
|
return __awaiter(this, void 0, void 0, function () {
|
|
87
|
-
var rawData, template, spath, yamlData, servicesName;
|
|
112
|
+
var rawData, template, originSpath, spath, yamlData, servicesName;
|
|
88
113
|
return __generator(this, function (_a) {
|
|
89
114
|
switch (_a.label) {
|
|
90
115
|
case 0:
|
|
91
116
|
rawData = argv._, template = argv.template;
|
|
92
|
-
return [4 /*yield*/, getTemplatePath(template)];
|
|
117
|
+
return [4 /*yield*/, core_1.default.getTemplatePath(template)];
|
|
93
118
|
case 1:
|
|
119
|
+
originSpath = _a.sent();
|
|
120
|
+
return [4 /*yield*/, core_1.default.transforYamlPath(originSpath, { warn: false })];
|
|
121
|
+
case 2:
|
|
94
122
|
spath = _a.sent();
|
|
95
123
|
if (spath) {
|
|
96
|
-
process.env['templateFile'] =
|
|
124
|
+
process.env['templateFile'] = originSpath;
|
|
97
125
|
}
|
|
98
|
-
if (rawData.length === 1) {
|
|
99
|
-
return [2 /*return*/, {
|
|
100
|
-
method: rawData[0],
|
|
101
|
-
}];
|
|
102
|
-
}
|
|
103
|
-
if (!(rawData.length === 2)) return [3 /*break*/, 3];
|
|
104
126
|
return [4 /*yield*/, getYamlContent(spath)];
|
|
105
|
-
case
|
|
127
|
+
case 3:
|
|
106
128
|
yamlData = _a.sent();
|
|
107
|
-
servicesName =
|
|
108
|
-
return [2 /*return*/,
|
|
129
|
+
servicesName = keys(get(yamlData, 'services'));
|
|
130
|
+
return [2 /*return*/, includes(servicesName, rawData[0])
|
|
109
131
|
? {
|
|
110
132
|
serverName: rawData[0],
|
|
111
133
|
method: rawData[1],
|
|
134
|
+
spath: spath,
|
|
112
135
|
}
|
|
113
136
|
: {
|
|
114
137
|
method: rawData[0],
|
|
115
138
|
}];
|
|
116
|
-
case 3: return [2 /*return*/];
|
|
117
139
|
}
|
|
118
140
|
});
|
|
119
141
|
});
|
|
@@ -121,4 +143,4 @@ var SpecialCommad = /** @class */ (function () {
|
|
|
121
143
|
return SpecialCommad;
|
|
122
144
|
}());
|
|
123
145
|
exports.default = SpecialCommad;
|
|
124
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
146
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvc3BlY2lhbC1jb21tYWQvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7QUFBQSx3REFBc0U7QUFDdEUsdURBQWlDO0FBQ2pDLDhDQUF3QjtBQUN4QixrQ0FBOEM7QUFDdEMsSUFBQSxhQUFhLEdBQTBDLGNBQUksY0FBOUMsRUFBRSxXQUFXLEdBQTZCLGNBQUksWUFBakMsRUFBRSxjQUFjLEdBQWEsY0FBSSxlQUFqQixFQUFFLE1BQU0sR0FBSyxjQUFJLE9BQVQsQ0FBVTtBQUM1RCxJQUFBLE9BQU8sR0FBMEIsTUFBTSxRQUFoQyxFQUFFLFFBQVEsR0FBZ0IsTUFBTSxTQUF0QixFQUFFLElBQUksR0FBVSxNQUFNLEtBQWhCLEVBQUUsR0FBRyxHQUFLLE1BQU0sSUFBWCxDQUFZO0FBQ2hEO0lBQ0UsdUJBQW9CLE9BQXdCO1FBQXhCLFlBQU8sR0FBUCxPQUFPLENBQWlCO0lBQUcsQ0FBQztJQUMxQyw0QkFBSSxHQUFWOzs7Ozs7d0JBQ1EsSUFBSSxHQUFHLGFBQWEsQ0FBQyxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsQ0FBQyxDQUFDO3dCQUN2QyxPQUFPLEdBQXNFLElBQUksRUFBMUUsRUFBRSxRQUFRLEdBQTRELElBQUksU0FBaEUsRUFBRSxNQUFNLEdBQW9ELElBQUksT0FBeEQsRUFBa0IsV0FBVyxHQUF1QixJQUFJLGdCQUEzQixFQUFFLEtBQUssR0FBZ0IsSUFBSSxNQUFwQixFQUFFLEdBQUcsR0FBVyxJQUFJLElBQWYsRUFBRSxJQUFJLEdBQUssSUFBSSxLQUFULENBQVU7d0JBQzdGLElBQUksT0FBTyxDQUFDLE9BQU8sQ0FBQzs0QkFBRSxzQkFBTzt3QkFDdkIsR0FBRyxHQUFHLElBQUksbUJBQU8sQ0FBQyxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQzt3QkFDcEMsR0FBRyxDQUFDLGtCQUFrQixFQUFFLENBQUM7d0JBQ3pCLElBQUksQ0FBQyxPQUFPLENBQUMsVUFBVSxDQUFDLEdBQUcsQ0FBQyxDQUFDO3dCQUNTLHFCQUFNLElBQUksQ0FBQyxTQUFTLENBQUMsSUFBSSxDQUFDLEVBQUE7O3dCQUExRCxLQUFnQyxTQUEwQixFQUF4RCxVQUFVLGdCQUFBLEVBQUUsTUFBTSxZQUFBLEVBQUUsS0FBSyxXQUFBOzZCQUU3QixDQUFBLFVBQVUsSUFBSSxPQUFPLENBQUMsTUFBTSxDQUFDLElBQUksSUFBSSxDQUFBLEVBQXJDLHdCQUFxQzt3QkFDaEMscUJBQU0sSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLEtBQUssT0FBQSxFQUFFLFVBQVUsWUFBQSxFQUFFLENBQUMsRUFBQTs0QkFBN0Msc0JBQU8sU0FBc0MsRUFBQzs0QkFFekMscUJBQU0sV0FBVyxDQUFDOzRCQUN2QixLQUFLLEVBQUUsUUFBUTs0QkFDZixVQUFVLFlBQUE7NEJBQ1YsTUFBTSxRQUFBOzRCQUNOLElBQUksRUFBRSxPQUFPLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUM7NEJBQzNCLFVBQVUsRUFBRTtnQ0FDVixNQUFNLFFBQUE7Z0NBQ04sV0FBVyxhQUFBO2dDQUNYLEtBQUssT0FBQTtnQ0FDTCxHQUFHLEtBQUE7NkJBQ0o7eUJBQ0YsQ0FBQyxFQUFBOzRCQVhGLHNCQUFPLFNBV0wsRUFBQzs7OztLQUNKO0lBRUssNEJBQUksR0FBVixVQUFXLEVBQXFCO1lBQW5CLEtBQUssV0FBQSxFQUFFLFVBQVUsZ0JBQUE7Ozs7OzRCQUNYLHFCQUFNLGNBQWMsQ0FBQyxLQUFLLENBQUMsRUFBQTs7d0JBQXRDLFFBQVEsR0FBRyxTQUEyQjt3QkFDdEMsU0FBUyxHQUFHLEdBQUcsQ0FBQyxRQUFRLEVBQUUsQ0FBQyxVQUFVLEVBQUUsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDLENBQUM7d0JBQ3RELHFCQUFNLGNBQUksQ0FBQyxhQUFhLENBQUMsU0FBUyxDQUFDLEVBQUE7O3dCQUE5QyxRQUFRLEdBQUcsU0FBbUM7d0JBQzlDLFdBQVcsR0FBRyxjQUFJLENBQUMsSUFBSSxDQUFDLFFBQVEsQ0FBQyxNQUFNLEVBQUUsY0FBYyxDQUFDLENBQUM7d0JBQy9ELHFCQUFNLElBQUEsMEJBQWtCLEVBQUMsV0FBVyxDQUFDLEVBQUE7O3dCQUFyQyxTQUFxQyxDQUFDOzs7OztLQUN2QztJQUVLLGlDQUFTLEdBQWYsVUFBZ0IsSUFBSTs7Ozs7O3dCQUNQLE9BQU8sR0FBZSxJQUFJLEVBQW5CLEVBQUUsUUFBUSxHQUFLLElBQUksU0FBVCxDQUFVO3dCQUNsQixxQkFBTSxjQUFJLENBQUMsZUFBZSxDQUFDLFFBQVEsQ0FBQyxFQUFBOzt3QkFBbEQsV0FBVyxHQUFHLFNBQW9DO3dCQUMxQyxxQkFBTSxjQUFJLENBQUMsZ0JBQWdCLENBQUMsV0FBVyxFQUFFLEVBQUUsSUFBSSxFQUFFLEtBQUssRUFBRSxDQUFDLEVBQUE7O3dCQUFqRSxLQUFLLEdBQUcsU0FBeUQ7d0JBQ3ZFLElBQUksS0FBSyxFQUFFOzRCQUNULE9BQU8sQ0FBQyxHQUFHLENBQUMsY0FBYyxDQUFDLEdBQUcsV0FBVyxDQUFDO3lCQUMzQzt3QkFDZ0IscUJBQU0sY0FBYyxDQUFDLEtBQUssQ0FBQyxFQUFBOzt3QkFBdEMsUUFBUSxHQUFHLFNBQTJCO3dCQUN0QyxZQUFZLEdBQUcsSUFBSSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsVUFBVSxDQUFDLENBQUMsQ0FBQzt3QkFDckQsc0JBQU8sUUFBUSxDQUFDLFlBQVksRUFBRSxPQUFPLENBQUMsQ0FBQyxDQUFDLENBQUM7Z0NBQ3ZDLENBQUMsQ0FBQztvQ0FDRSxVQUFVLEVBQUUsT0FBTyxDQUFDLENBQUMsQ0FBQztvQ0FDdEIsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7b0NBQ2xCLEtBQUssT0FBQTtpQ0FDTjtnQ0FDSCxDQUFDLENBQUM7b0NBQ0UsTUFBTSxFQUFFLE9BQU8sQ0FBQyxDQUFDLENBQUM7aUNBQ25CLEVBQUM7Ozs7S0FDUDtJQUNILG9CQUFDO0FBQUQsQ0FBQyxBQXZERCxJQXVEQztBQUVELGtCQUFlLGFBQWEsQ0FBQyJ9
|