@serverless-devs/engine 0.0.1-beta.1 → 0.0.1-beta.3

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.
@@ -4,6 +4,7 @@ interface IOptions {
4
4
  hookLevel: `${IActionLevel}`;
5
5
  projectName?: string;
6
6
  logger: ILoggerInstance;
7
+ skipActions?: boolean;
7
8
  }
8
9
  declare class Actions {
9
10
  private actions;
@@ -54,10 +54,14 @@ class Actions {
54
54
  this.logger = option.logger;
55
55
  }
56
56
  setValue(key, value) {
57
+ if (this.option.skipActions)
58
+ return;
57
59
  (0, lodash_1.set)(this.record, key, value);
58
60
  }
59
61
  start(hookType, inputs = {}) {
60
62
  return __awaiter(this, void 0, void 0, function* () {
63
+ if (this.option.skipActions)
64
+ return {};
61
65
  this.inputs = inputs;
62
66
  const hooks = (0, lodash_1.filter)(this.actions, (item) => item.hookType === hookType);
63
67
  if ((0, lodash_1.isEmpty)(hooks))
@@ -122,7 +126,7 @@ class Actions {
122
126
  const argv = (0, string_argv_1.default)(hook.value);
123
127
  const { _ } = utils.parseArgv(argv);
124
128
  const [componentName, method] = _;
125
- const instance = yield (0, load_component_1.default)(componentName);
129
+ const instance = yield (0, load_component_1.default)(componentName, { logger: this.logger });
126
130
  if (instance[method]) {
127
131
  // 方法存在,执行报错,退出码101
128
132
  const newInputs = Object.assign(Object.assign({}, this.record.componentProps), { argv: (0, lodash_1.filter)(argv.slice(2), (o) => !(0, lodash_1.includes)([componentName, method], o)) });
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/actions/index.ts"],"names":[],"mappings":"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"}
package/lib/index.d.ts CHANGED
@@ -12,6 +12,7 @@ declare class Engine {
12
12
  private actionInstance;
13
13
  constructor(options: IEngineOptions);
14
14
  start(): Promise<IContext>;
15
+ output(): void;
15
16
  private validate;
16
17
  private download;
17
18
  private getLogger;
package/lib/index.js CHANGED
@@ -41,6 +41,7 @@ const types_1 = require("./types");
41
41
  const utils_1 = require("./utils");
42
42
  const parse_spec_1 = __importStar(require("@serverless-devs/parse-spec"));
43
43
  const path_1 = __importDefault(require("path"));
44
+ const js_yaml_1 = __importDefault(require("js-yaml"));
44
45
  const chalk_1 = __importDefault(require("chalk"));
45
46
  const actions_1 = __importDefault(require("./actions"));
46
47
  const credential_1 = __importDefault(require("@serverless-devs/credential"));
@@ -55,14 +56,28 @@ class Engine {
55
56
  this.record = { status: types_1.STEP_STATUS.PENING, editStatusAble: true };
56
57
  this.spec = {};
57
58
  debug('engine start');
59
+ // 初始化参数
58
60
  this.options.args = (0, lodash_1.get)(this.options, 'args', process.argv.slice(2));
61
+ this.options.cwd = (0, lodash_1.get)(this.options, 'cwd', process.cwd());
62
+ this.options.template = utils.getAbsolutePath((0, lodash_1.get)(this.options, 'template'), this.options.cwd);
59
63
  debug(`engine options: ${(0, utils_1.stringify)(options)}`);
60
64
  }
61
65
  start() {
62
66
  return __awaiter(this, void 0, void 0, function* () {
63
67
  this.context.status = types_1.STEP_STATUS.RUNNING;
64
- this.parseSpecInstance = new parse_spec_1.default((0, lodash_1.get)(this.options, 'yamlPath'), this.options.args);
65
- this.spec = this.parseSpecInstance.start();
68
+ // engine应收敛所有的异常,不应该抛出异常
69
+ try {
70
+ this.parseSpecInstance = new parse_spec_1.default((0, lodash_1.get)(this.options, 'template'), this.options.args);
71
+ this.spec = this.parseSpecInstance.start();
72
+ }
73
+ catch (error) {
74
+ this.context.error = error;
75
+ return this.context;
76
+ }
77
+ // 初始化行参环境变量 > .env (parse-spec require .env)
78
+ (0, lodash_1.each)(this.options.env, (value, key) => {
79
+ process.env[key] = value;
80
+ });
66
81
  const { steps: _steps, yaml, access = yaml.access } = this.spec;
67
82
  this.validate();
68
83
  this.glog = this.getLogger();
@@ -71,8 +86,9 @@ class Engine {
71
86
  this.globalActionInstance = new actions_1.default(yaml.actions, {
72
87
  hookLevel: parse_spec_1.IActionLevel.GLOBAL,
73
88
  logger: this.logger,
89
+ skipActions: this.spec.skipActions,
74
90
  });
75
- const credential = yield (0, utils_1.getCredential)(access);
91
+ const credential = yield (0, utils_1.getCredential)(access, this.logger);
76
92
  yield this.globalActionInstance.start(parse_spec_1.IHookType.PRE, { access, credential });
77
93
  this.context.steps = (0, lodash_1.map)(steps, (item) => {
78
94
  return Object.assign(Object.assign({}, item), { stepCount: (0, lodash_1.uniqueId)(), status: types_1.STEP_STATUS.PENING, done: false });
@@ -158,6 +174,28 @@ class Engine {
158
174
  return res;
159
175
  });
160
176
  }
177
+ output() {
178
+ const { output } = this.spec;
179
+ debug(`output: ${output}`);
180
+ if ((0, lodash_1.isEmpty)(output))
181
+ return;
182
+ const data = {};
183
+ (0, lodash_1.each)(this.context.steps, (item) => {
184
+ if (!(0, lodash_1.isEmpty)(item.output)) {
185
+ (0, lodash_1.set)(data, item.projectName, item.output);
186
+ }
187
+ });
188
+ if (output === parse_spec_1.IOutput.JSON) {
189
+ return console.log(JSON.stringify(data, null, 2));
190
+ }
191
+ if (output === parse_spec_1.IOutput.RAW) {
192
+ return console.log(JSON.stringify(data));
193
+ }
194
+ if (output === parse_spec_1.IOutput.YAML) {
195
+ return console.log(js_yaml_1.default.dump(data));
196
+ }
197
+ return this.logger.output(data, 0);
198
+ }
161
199
  validate() {
162
200
  const { steps, method } = this.spec;
163
201
  if ((0, lodash_1.isEmpty)(steps)) {
@@ -171,8 +209,12 @@ class Engine {
171
209
  return __awaiter(this, void 0, void 0, function* () {
172
210
  const newSteps = [];
173
211
  for (const step of steps) {
174
- const instance = yield (0, load_component_1.default)(step.component, this.glog.__generate(step.projectName));
175
- newSteps.push(Object.assign(Object.assign({}, step), { instance }));
212
+ const logger = this.glog.__generate(step.projectName);
213
+ const instance = yield (0, load_component_1.default)(step.component, {
214
+ logger,
215
+ engineLogger: this.logger,
216
+ });
217
+ newSteps.push(Object.assign(Object.assign({}, step), { instance, logger }));
176
218
  }
177
219
  return newSteps;
178
220
  });
@@ -186,7 +228,7 @@ class Engine {
186
228
  }
187
229
  throw new Error('customLogger must be instance of Logger');
188
230
  }
189
- return new logger_1.default(Object.assign(Object.assign({ traceId: Math.random().toString(16).slice(2), logDir: path_1.default.join(utils.getRootHome(), 'logs') }, this.options.logConfig), { level: (0, lodash_1.get)(this.options, 'logConfig.level', this.spec.debug ? 'DEBUG' : undefined) }));
231
+ return new logger_1.default(Object.assign(Object.assign({ traceId: (0, lodash_1.get)(process.env, 'serverless_devs_trace_id', (0, utils_1.randomId)()), logDir: path_1.default.join(utils.getRootHome(), 'logs') }, this.options.logConfig), { level: (0, lodash_1.get)(this.options, 'logConfig.level', this.spec.debug ? 'DEBUG' : 'INFO') }));
190
232
  }
191
233
  recordContext(item, options = {}) {
192
234
  const { status, error, output, process_time, props, done } = options;
@@ -274,13 +316,14 @@ class Engine {
274
316
  return __awaiter(this, void 0, void 0, function* () {
275
317
  try {
276
318
  debug(`project item: ${(0, utils_1.stringify)(item)}`);
277
- item.credential = yield (0, utils_1.getCredential)(item.access);
319
+ item.credential = yield (0, utils_1.getCredential)(item.access, this.logger);
278
320
  const newAction = this.parseSpecInstance.parseActions(item.actions, parse_spec_1.IActionLevel.PROJECT);
279
321
  debug(`project actions: ${JSON.stringify(newAction)}`);
280
322
  this.actionInstance = new actions_1.default(newAction, {
281
323
  hookLevel: parse_spec_1.IActionLevel.PROJECT,
282
324
  projectName: item.projectName,
283
- logger: this.logger,
325
+ logger: item.logger,
326
+ skipActions: this.spec.skipActions,
284
327
  });
285
328
  this.actionInstance.setValue('magic', this.getFilterContext(item));
286
329
  const newInputs = yield this.getProps(item);
@@ -341,7 +384,7 @@ class Engine {
341
384
  projectName: item.projectName,
342
385
  access: item.access,
343
386
  component: item.component,
344
- credential: new credential_1.default(),
387
+ credential: new credential_1.default({ logger: this.logger }),
345
388
  args: (0, lodash_1.filter)(this.options.args, (o) => !(0, lodash_1.includes)([projectName, method], o)),
346
389
  };
347
390
  this.recordContext(item, { props: newInputs });
package/lib/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
package/lib/types.d.ts CHANGED
@@ -1,9 +1,9 @@
1
1
  import { IStep } from '@serverless-devs/parse-spec';
2
2
  import { IOptions as ILogConfig } from '@serverless-devs/logger/lib/type';
3
- import Logger from '@serverless-devs/logger';
3
+ import Logger, { ILoggerInstance } from '@serverless-devs/logger';
4
4
  export interface IEngineOptions {
5
- args: string[];
6
- yamlPath?: string;
5
+ args?: string[];
6
+ template?: string;
7
7
  env?: Record<string, string>;
8
8
  cwd?: string;
9
9
  logConfig?: EngineLogger;
@@ -12,6 +12,7 @@ export type EngineLogger = Partial<ILogConfig> & {
12
12
  customLogger?: Logger;
13
13
  };
14
14
  export type IStepOptions = IStep & {
15
+ logger: ILoggerInstance;
15
16
  instance?: any;
16
17
  id?: string;
17
18
  if?: string;
package/lib/types.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AA+BA,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,gCAAqB,CAAA;IACrB,gCAAqB,CAAA;IACrB,8BAAmB,CAAA;AACrB,CAAC,EAJW,OAAO,GAAP,eAAO,KAAP,eAAO,QAIlB;AAED,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,sCAAkB,CAAA;IAClB,+DAA2C,CAAA;AAC7C,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B;AAID,IAAK,gBAEJ;AAFD,WAAK,gBAAgB;IACnB,oCAAgB,CAAA;AAClB,CAAC,EAFI,gBAAgB,KAAhB,gBAAgB,QAEpB;AAEY,QAAA,WAAW,mCAAQ,gBAAgB,GAAK,gBAAgB,EAAG"}
1
+ {"version":3,"file":"types.js","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":";;;AAgCA,IAAY,OAIX;AAJD,WAAY,OAAO;IACjB,gCAAqB,CAAA;IACrB,gCAAqB,CAAA;IACrB,8BAAmB,CAAA;AACrB,CAAC,EAJW,OAAO,GAAP,eAAO,KAAP,eAAO,QAIlB;AAED,IAAY,gBAMX;AAND,WAAY,gBAAgB;IAC1B,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,uCAAmB,CAAA;IACnB,sCAAkB,CAAA;IAClB,+DAA2C,CAAA;AAC7C,CAAC,EANW,gBAAgB,GAAhB,wBAAgB,KAAhB,wBAAgB,QAM3B;AAID,IAAK,gBAEJ;AAFD,WAAK,gBAAgB;IACnB,oCAAgB,CAAA;AAClB,CAAC,EAFI,gBAAgB,KAAhB,gBAAgB,QAEpB;AAEY,QAAA,WAAW,mCAAQ,gBAAgB,GAAK,gBAAgB,EAAG"}
@@ -1,7 +1,9 @@
1
+ import { ILoggerInstance } from '@serverless-devs/logger';
1
2
  export declare function getLogPath(filePath: string): string;
3
+ export declare const randomId: () => string;
2
4
  export declare function getProcessTime(time: number): number;
3
5
  export declare function throw101Error(error: Error, prefix: string): void;
4
6
  export declare function throw100Error(message: string, tips?: string): void;
5
7
  export declare function throwError(message: string, tips?: string): void;
6
- export declare function getCredential(access?: string): Promise<Record<string, string>>;
8
+ export declare function getCredential(access: string | undefined, logger: ILoggerInstance): Promise<Record<string, string>>;
7
9
  export declare const stringify: (value: any) => string;
@@ -12,7 +12,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
12
12
  return (mod && mod.__esModule) ? mod : { "default": mod };
13
13
  };
14
14
  Object.defineProperty(exports, "__esModule", { value: true });
15
- exports.stringify = exports.getCredential = exports.throwError = exports.throw100Error = exports.throw101Error = exports.getProcessTime = exports.getLogPath = void 0;
15
+ exports.stringify = exports.getCredential = exports.throwError = exports.throw100Error = exports.throw101Error = exports.getProcessTime = exports.randomId = exports.getLogPath = void 0;
16
16
  const credential_1 = __importDefault(require("@serverless-devs/credential"));
17
17
  const flatted_1 = __importDefault(require("flatted"));
18
18
  const lodash_1 = require("lodash");
@@ -20,6 +20,8 @@ function getLogPath(filePath) {
20
20
  return `step_${filePath}.log`;
21
21
  }
22
22
  exports.getLogPath = getLogPath;
23
+ const randomId = () => Math.random().toString(16).slice(2);
24
+ exports.randomId = randomId;
23
25
  function getProcessTime(time) {
24
26
  return (Math.round((Date.now() - time) / 10) * 10) / 1000;
25
27
  }
@@ -54,10 +56,10 @@ function throwError(message, tips) {
54
56
  throw new Error(JSON.stringify({ message, tips }));
55
57
  }
56
58
  exports.throwError = throwError;
57
- function getCredential(access) {
59
+ function getCredential(access, logger) {
58
60
  return __awaiter(this, void 0, void 0, function* () {
59
61
  try {
60
- const instance = new credential_1.default();
62
+ const instance = new credential_1.default({ logger });
61
63
  const res = yield instance.get(access);
62
64
  return (0, lodash_1.get)(res, 'credential', {});
63
65
  }
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/utils/index.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@serverless-devs/engine",
3
- "version": "0.0.1-beta.1",
3
+ "version": "0.0.1-beta.3",
4
4
  "description": "request for serverless-devs",
5
5
  "main": "lib/index.js",
6
6
  "author": "xsahxl",
@@ -15,17 +15,19 @@
15
15
  "execa": "^5.1.1",
16
16
  "flatted": "^3.2.7",
17
17
  "fs-extra": "^11.1.0",
18
+ "js-yaml": "^4.1.0",
18
19
  "lodash": "^4.17.21",
19
20
  "string-argv": "^0.3.2",
20
21
  "xstate": "^4.37.2",
21
- "@serverless-devs/logger": "^0.0.1",
22
- "@serverless-devs/load-component": "^0.0.1-beta.1",
23
- "@serverless-devs/credential": "^0.0.2",
24
- "@serverless-devs/utils": "^0.0.7",
25
- "@serverless-devs/parse-spec": "^0.0.1-beta.1"
22
+ "@serverless-devs/credential": "^0.0.2-beta.1",
23
+ "@serverless-devs/parse-spec": "^0.0.1-beta.3",
24
+ "@serverless-devs/load-component": "^0.0.2-beta.2",
25
+ "@serverless-devs/logger": "^0.0.2-beta.1",
26
+ "@serverless-devs/utils": "^0.0.8-beta.1"
26
27
  },
27
28
  "devDependencies": {
28
29
  "@types/fs-extra": "^11.0.1",
30
+ "@types/js-yaml": "^4.0.5",
29
31
  "@types/lodash": "^4.14.195"
30
32
  },
31
33
  "scripts": {