@serverless-devs/s 2.0.100-beta.12 → 2.0.100-beta.13
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 +11 -11
- package/lib/cli/index.js +4 -4
- package/lib/component/index.js +18 -18
- package/lib/config/add/index.js +13 -13
- package/lib/config/delete/index.js +4 -4
- package/lib/config/get/index.js +4 -4
- package/lib/config/index.js +11 -11
- package/lib/help/index.js +23 -19
- package/lib/index.js +77 -74
- package/lib/init/index.js +12 -12
- package/lib/init/init-config.js +1 -11
- package/lib/set/analysis/index.js +5 -5
- package/lib/set/env/index.js +71 -0
- package/lib/set/index.js +10 -10
- package/lib/set/locale/index.js +4 -4
- package/lib/set/registry/index.js +4 -4
- package/lib/set/workspace/index.js +5 -5
- package/lib/special-commad/index.js +68 -28
- package/lib/update-notifier/index.js +1 -1
- package/lib/utils/common.js +11 -9
- package/lib/verify/index.js +30 -30
- package/package.json +1 -1
- package/shell/postbuild.sh +1 -0
package/lib/help/index.js
CHANGED
|
@@ -43,11 +43,12 @@ var utils_1 = require("../utils");
|
|
|
43
43
|
var lodash_1 = require("lodash");
|
|
44
44
|
var core_1 = __importDefault(require("../utils/core"));
|
|
45
45
|
var path_1 = __importDefault(require("path"));
|
|
46
|
-
var makeUnderLine = core_1.default.makeUnderLine, publishHelp = core_1.default.publishHelp, getGlobalArgs = core_1.default.getGlobalArgs,
|
|
46
|
+
var makeUnderLine = core_1.default.makeUnderLine, publishHelp = core_1.default.publishHelp, getGlobalArgs = core_1.default.getGlobalArgs, getYamlContent = core_1.default.getYamlContent, loadComponent = core_1.default.loadComponent;
|
|
47
47
|
var descption = {
|
|
48
48
|
Options: [
|
|
49
49
|
{ '--debug': 'Open debug model.' },
|
|
50
50
|
{ '--skip-actions': 'Skip the extends section.' },
|
|
51
|
+
{ '--env <environment>': 'Specify the running environment' },
|
|
51
52
|
{ '-t, --template <path>': 'Specify the template file.' },
|
|
52
53
|
{ '-a, --access <aliasName>': 'Specify the access alias name.' },
|
|
53
54
|
{ '-v, --version': 'Output the version number.' },
|
|
@@ -66,42 +67,45 @@ var descption = {
|
|
|
66
67
|
};
|
|
67
68
|
function help(program) {
|
|
68
69
|
return __awaiter(this, void 0, void 0, function () {
|
|
69
|
-
var helperLength, _a, rawData, template, help, customeDescription, spath, yamlData, serviceList, _i, serviceList_1, service, component, instance, publishPath, publishContent, commands, key, error_1, output;
|
|
70
|
+
var helperLength, _a, rawData, template, help, env, customeDescription, originSpath, spath, yamlData, serviceList, _i, serviceList_1, service, component, instance, publishPath, publishContent, commands, key, error_1, output;
|
|
70
71
|
var _b, _c;
|
|
71
72
|
return __generator(this, function (_d) {
|
|
72
73
|
switch (_d.label) {
|
|
73
74
|
case 0:
|
|
74
75
|
helperLength = publishHelp.maxLen(descption.Options);
|
|
75
|
-
_a = getGlobalArgs(process.argv.slice(2)), rawData = _a._, template = _a.template, help = _a.help;
|
|
76
|
+
_a = getGlobalArgs(process.argv.slice(2)), rawData = _a._, template = _a.template, help = _a.help, env = _a.env;
|
|
76
77
|
customeDescription = [];
|
|
77
|
-
if (!(rawData.length === 0 && help)) return [3 /*break*/,
|
|
78
|
+
if (!(rawData.length === 0 && help)) return [3 /*break*/, 10];
|
|
78
79
|
_d.label = 1;
|
|
79
80
|
case 1:
|
|
80
|
-
_d.trys.push([1,
|
|
81
|
-
return [4 /*yield*/, getTemplatePath(template)];
|
|
81
|
+
_d.trys.push([1, 9, , 10]);
|
|
82
|
+
return [4 /*yield*/, core_1.default.getTemplatePath(template)];
|
|
82
83
|
case 2:
|
|
84
|
+
originSpath = _d.sent();
|
|
85
|
+
return [4 /*yield*/, core_1.default.getTemplatePathWithEnv({ spath: originSpath, env: env })];
|
|
86
|
+
case 3:
|
|
83
87
|
spath = _d.sent();
|
|
84
|
-
if (!spath) return [3 /*break*/,
|
|
88
|
+
if (!spath) return [3 /*break*/, 8];
|
|
85
89
|
return [4 /*yield*/, getYamlContent(spath)];
|
|
86
|
-
case
|
|
90
|
+
case 4:
|
|
87
91
|
yamlData = _d.sent();
|
|
88
92
|
serviceList = (0, lodash_1.keys)((0, lodash_1.get)(yamlData, 'services'));
|
|
89
|
-
if (!(serviceList.length > 1)) return [3 /*break*/,
|
|
93
|
+
if (!(serviceList.length > 1)) return [3 /*break*/, 5];
|
|
90
94
|
for (_i = 0, serviceList_1 = serviceList; _i < serviceList_1.length; _i++) {
|
|
91
95
|
service = serviceList_1[_i];
|
|
92
96
|
customeDescription.push((_b = {},
|
|
93
97
|
_b["".concat(service, " [options]")] = "Please use [s ".concat(service, " -h] obtain the documentation."),
|
|
94
98
|
_b));
|
|
95
99
|
}
|
|
96
|
-
return [3 /*break*/,
|
|
97
|
-
case
|
|
100
|
+
return [3 /*break*/, 8];
|
|
101
|
+
case 5:
|
|
98
102
|
component = (0, lodash_1.get)(yamlData, ['services', serviceList[0], 'component']);
|
|
99
103
|
return [4 /*yield*/, loadComponent(component)];
|
|
100
|
-
case
|
|
104
|
+
case 6:
|
|
101
105
|
instance = _d.sent();
|
|
102
106
|
publishPath = path_1.default.join(instance.__path, 'publish.yaml');
|
|
103
107
|
return [4 /*yield*/, getYamlContent(publishPath)];
|
|
104
|
-
case
|
|
108
|
+
case 7:
|
|
105
109
|
publishContent = _d.sent();
|
|
106
110
|
commands = publishContent.Commands;
|
|
107
111
|
if (commands) {
|
|
@@ -109,12 +113,12 @@ function help(program) {
|
|
|
109
113
|
customeDescription.push((_c = {}, _c[key] = commands[key], _c));
|
|
110
114
|
}
|
|
111
115
|
}
|
|
112
|
-
_d.label =
|
|
113
|
-
case
|
|
114
|
-
case 8:
|
|
115
|
-
error_1 = _d.sent();
|
|
116
|
-
return [3 /*break*/, 9];
|
|
116
|
+
_d.label = 8;
|
|
117
|
+
case 8: return [3 /*break*/, 10];
|
|
117
118
|
case 9:
|
|
119
|
+
error_1 = _d.sent();
|
|
120
|
+
return [3 /*break*/, 10];
|
|
121
|
+
case 10:
|
|
118
122
|
output = [
|
|
119
123
|
"".concat((0, utils_1.emoji)('🚀'), " Welcome to the Serverless Devs.\n"),
|
|
120
124
|
publishHelp.helpInfo(descption.Options, 'Options', helperLength),
|
|
@@ -132,4 +136,4 @@ function help(program) {
|
|
|
132
136
|
});
|
|
133
137
|
}
|
|
134
138
|
exports.default = help;
|
|
135
|
-
//# sourceMappingURL=data:application/json;base64,
|
|
139
|
+
//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaGVscC9pbmRleC50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7Ozs7OztBQUFBLGtDQUFpQztBQUNqQyxpQ0FBbUM7QUFDbkMsdURBQWlDO0FBQ2pDLDhDQUF3QjtBQUNoQixJQUFBLGFBQWEsR0FBZ0UsY0FBSSxjQUFwRSxFQUFFLFdBQVcsR0FBbUQsY0FBSSxZQUF2RCxFQUFFLGFBQWEsR0FBb0MsY0FBSSxjQUF4QyxFQUFFLGNBQWMsR0FBb0IsY0FBSSxlQUF4QixFQUFFLGFBQWEsR0FBSyxjQUFJLGNBQVQsQ0FBVTtBQUUxRixJQUFNLFNBQVMsR0FBRztJQUNoQixPQUFPLEVBQUU7UUFDUCxFQUFFLFNBQVMsRUFBRSxtQkFBbUIsRUFBRTtRQUNsQyxFQUFFLGdCQUFnQixFQUFFLDJCQUEyQixFQUFFO1FBQ2pELEVBQUUscUJBQXFCLEVBQUUsaUNBQWlDLEVBQUU7UUFDNUQsRUFBRSx1QkFBdUIsRUFBRSw0QkFBNEIsRUFBRTtRQUN6RCxFQUFFLDBCQUEwQixFQUFFLGdDQUFnQyxFQUFFO1FBQ2hFLEVBQUUsZUFBZSxFQUFFLDRCQUE0QixFQUFFO1FBQ2pELEVBQUUsWUFBWSxFQUFFLDJCQUEyQixFQUFFO0tBQzlDO0lBQ0QsUUFBUSxFQUFFO1FBQ1IsRUFBRSxNQUFNLEVBQUUsZ0NBQWdDLEVBQUU7UUFDNUMsRUFBRSxJQUFJLEVBQUUsd0NBQXdDLEVBQUU7UUFDbEQsRUFBRSxHQUFHLEVBQUUsK0NBQStDLEVBQUU7UUFDeEQsRUFBRSxNQUFNLEVBQUUsNkJBQTZCLEVBQUU7UUFDekMsRUFBRSxHQUFHLEVBQUUsNEJBQTRCLEVBQUU7UUFDckMsRUFBRSxLQUFLLEVBQUUsK0JBQStCLEVBQUU7UUFDMUMsRUFBRSxTQUFTLEVBQUUsc0NBQXNDLEVBQUU7S0FDdEQ7SUFDRCxRQUFRLEVBQUUsQ0FBQyxFQUFF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
|