@alicloud/alfa-core 1.3.0 → 1.3.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.
Files changed (7) hide show
  1. package/dist/index.js +4 -4
  2. package/es/base.js +47 -12
  3. package/es/utils/getAlfaManifest.js +21 -15
  4. package/lib/base.d.ts +6 -0
  5. package/lib/base.js +47 -12
  6. package/lib/utils/getAlfaManifest.js +21 -15
  7. package/package.json +3 -3
package/es/base.js CHANGED
@@ -73,7 +73,8 @@ var BaseLoader = /*#__PURE__*/function () {
73
73
 
74
74
  chains.push(this.resolve, undefined); // modify resolved config
75
75
 
76
- this.afterResolve.handlers.forEach(flattenHookHandlers); // update props before load
76
+ this.afterResolve.handlers.forEach(flattenHookHandlers);
77
+ chains.push(this.init, undefined); // update props before load
77
78
 
78
79
  this.beforeLoad.handlers.forEach(flattenHookHandlers); // TODO: handle beforeLoad error
79
80
 
@@ -86,9 +87,11 @@ var BaseLoader = /*#__PURE__*/function () {
86
87
  promise = promise.then(chains.shift(), chains.shift());
87
88
  }
88
89
 
89
- return _context.abrupt("return", promise);
90
+ return _context.abrupt("return", promise.catch(function (e) {
91
+ throw e;
92
+ }));
90
93
 
91
- case 18:
94
+ case 19:
92
95
  case "end":
93
96
  return _context.stop();
94
97
  }
@@ -148,15 +151,15 @@ var BaseLoader = /*#__PURE__*/function () {
148
151
  return resolve;
149
152
  }()
150
153
  /**
151
- * loadApp from remote
154
+ * init config for micro app
152
155
  * @param config
153
156
  * @returns
154
157
  */
155
158
 
156
159
  }, {
157
- key: "load",
160
+ key: "init",
158
161
  value: function () {
159
- var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(config) {
162
+ var _init = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee3(config) {
160
163
  var name, container, manifest, props, deps, url, beforeMount, afterMount, beforeUnmount, afterUnmount, beforeUpdate, sandbox, app;
161
164
  return _regeneratorRuntime.wrap(function _callee3$(_context3) {
162
165
  while (1) {
@@ -184,15 +187,11 @@ var BaseLoader = /*#__PURE__*/function () {
184
187
 
185
188
  case 3:
186
189
  app = _context3.sent;
187
- _context3.next = 6;
188
- return app.load();
189
-
190
- case 6:
191
190
  return _context3.abrupt("return", _objectSpread(_objectSpread({}, config), {}, {
192
191
  app: app
193
192
  }));
194
193
 
195
- case 7:
194
+ case 5:
196
195
  case "end":
197
196
  return _context3.stop();
198
197
  }
@@ -200,7 +199,43 @@ var BaseLoader = /*#__PURE__*/function () {
200
199
  }, _callee3);
201
200
  }));
202
201
 
203
- function load(_x3) {
202
+ function init(_x3) {
203
+ return _init.apply(this, arguments);
204
+ }
205
+
206
+ return init;
207
+ }()
208
+ /**
209
+ * loadApp from remote
210
+ * @param config
211
+ * @returns
212
+ */
213
+
214
+ }, {
215
+ key: "load",
216
+ value: function () {
217
+ var _load = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee4(config) {
218
+ var _config$app;
219
+
220
+ return _regeneratorRuntime.wrap(function _callee4$(_context4) {
221
+ while (1) {
222
+ switch (_context4.prev = _context4.next) {
223
+ case 0:
224
+ _context4.next = 2;
225
+ return config === null || config === void 0 ? void 0 : (_config$app = config.app) === null || _config$app === void 0 ? void 0 : _config$app.load();
226
+
227
+ case 2:
228
+ return _context4.abrupt("return", config);
229
+
230
+ case 3:
231
+ case "end":
232
+ return _context4.stop();
233
+ }
234
+ }
235
+ }, _callee4);
236
+ }));
237
+
238
+ function load(_x4) {
204
239
  return _load.apply(this, arguments);
205
240
  }
206
241
 
package/es/utils/getAlfaManifest.js CHANGED
@@ -3,44 +3,50 @@ import _regeneratorRuntime from "@babel/runtime/regenerator";
3
3
  import { getRelease } from './getAlfaRelease';
4
4
  export var getManifest = /*#__PURE__*/function () {
5
5
  var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime.mark(function _callee(config) {
6
- var _releaseConfig$distT2;
6
+ var _releaseConfig$distT, _releaseConfig$distT2, _releaseConfig$versio;
7
7
 
8
- var name, version, releaseConfig, _releaseConfig$distT, configByVersion;
8
+ var name, logger, version, releaseConfig, latestVersion, versionEntry, _releaseConfig$versio2;
9
9
 
10
10
  return _regeneratorRuntime.wrap(function _callee$(_context) {
11
11
  while (1) {
12
12
  switch (_context.prev = _context.next) {
13
13
  case 0:
14
- name = config.name;
14
+ name = config.name, logger = config.logger;
15
15
  version = config.version;
16
16
  _context.next = 4;
17
17
  return getRelease(config);
18
18
 
19
19
  case 4:
20
20
  releaseConfig = _context.sent;
21
+ latestVersion = (_releaseConfig$distT = releaseConfig['dist-tags']) === null || _releaseConfig$distT === void 0 ? void 0 : _releaseConfig$distT.latest; // if version is in dist-tags, return value
21
22
 
22
- if (!config.version) {
23
- version = (_releaseConfig$distT = releaseConfig['dist-tags']) === null || _releaseConfig$distT === void 0 ? void 0 : _releaseConfig$distT.latest;
24
- } // if version is in dist-tags, return value
23
+ if ((_releaseConfig$distT2 = releaseConfig['dist-tags']) !== null && _releaseConfig$distT2 !== void 0 && _releaseConfig$distT2[version]) {
24
+ version = releaseConfig['dist-tags'][version];
25
+ }
25
26
 
27
+ versionEntry = (_releaseConfig$versio = releaseConfig.versions) === null || _releaseConfig$versio === void 0 ? void 0 : _releaseConfig$versio[version];
26
28
 
27
- if ((_releaseConfig$distT2 = releaseConfig['dist-tags']) !== null && _releaseConfig$distT2 !== void 0 && _releaseConfig$distT2[config.version]) {
28
- version = releaseConfig['dist-tags'][config.version];
29
+ if (versionEntry) {
30
+ _context.next = 13;
31
+ break;
29
32
  }
30
33
 
31
- configByVersion = releaseConfig.versions[version];
34
+ logger === null || logger === void 0 ? void 0 : logger.error({
35
+ E_MSG: "cannot find ".concat(name, "@").concat(version, ".")
36
+ });
37
+ versionEntry = (_releaseConfig$versio2 = releaseConfig.versions) === null || _releaseConfig$versio2 === void 0 ? void 0 : _releaseConfig$versio2[latestVersion];
32
38
 
33
- if (configByVersion) {
34
- _context.next = 10;
39
+ if (versionEntry) {
40
+ _context.next = 13;
35
41
  break;
36
42
  }
37
43
 
38
- throw new Error("".concat(name, "@").concat(version, " is not found, please check you release."));
44
+ throw new Error("cannot find ".concat(name, "@latest, please check release."));
39
45
 
40
- case 10:
41
- return _context.abrupt("return", releaseConfig.versions[version].entry);
46
+ case 13:
47
+ return _context.abrupt("return", versionEntry.entry);
42
48
 
43
- case 11:
49
+ case 14:
44
50
  case "end":
45
51
  return _context.stop();
46
52
  }
package/lib/base.d.ts CHANGED
@@ -15,6 +15,12 @@ export default class BaseLoader {
15
15
  * @returns
16
16
  */
17
17
  private resolve;
18
+ /**
19
+ * init config for micro app
20
+ * @param config
21
+ * @returns
22
+ */
23
+ private init;
18
24
  /**
19
25
  * loadApp from remote
20
26
  * @param config
package/lib/base.js CHANGED
@@ -88,7 +88,8 @@ var BaseLoader = /*#__PURE__*/function () {
88
88
 
89
89
  chains.push(this.resolve, undefined); // modify resolved config
90
90
 
91
- this.afterResolve.handlers.forEach(flattenHookHandlers); // update props before load
91
+ this.afterResolve.handlers.forEach(flattenHookHandlers);
92
+ chains.push(this.init, undefined); // update props before load
92
93
 
93
94
  this.beforeLoad.handlers.forEach(flattenHookHandlers); // TODO: handle beforeLoad error
94
95
 
@@ -101,9 +102,11 @@ var BaseLoader = /*#__PURE__*/function () {
101
102
  promise = promise.then(chains.shift(), chains.shift());
102
103
  }
103
104
 
104
- return _context.abrupt("return", promise);
105
+ return _context.abrupt("return", promise.catch(function (e) {
106
+ throw e;
107
+ }));
105
108
 
106
- case 18:
109
+ case 19:
107
110
  case "end":
108
111
  return _context.stop();
109
112
  }
@@ -163,15 +166,15 @@ var BaseLoader = /*#__PURE__*/function () {
163
166
  return resolve;
164
167
  }()
165
168
  /**
166
- * loadApp from remote
169
+ * init config for micro app
167
170
  * @param config
168
171
  * @returns
169
172
  */
170
173
 
171
174
  }, {
172
- key: "load",
175
+ key: "init",
173
176
  value: function () {
174
- var _load = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(config) {
177
+ var _init = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee3(config) {
175
178
  var name, container, manifest, props, deps, url, beforeMount, afterMount, beforeUnmount, afterUnmount, beforeUpdate, sandbox, app;
176
179
  return _regenerator.default.wrap(function _callee3$(_context3) {
177
180
  while (1) {
@@ -199,15 +202,11 @@ var BaseLoader = /*#__PURE__*/function () {
199
202
 
200
203
  case 3:
201
204
  app = _context3.sent;
202
- _context3.next = 6;
203
- return app.load();
204
-
205
- case 6:
206
205
  return _context3.abrupt("return", _objectSpread(_objectSpread({}, config), {}, {
207
206
  app: app
208
207
  }));
209
208
 
210
- case 7:
209
+ case 5:
211
210
  case "end":
212
211
  return _context3.stop();
213
212
  }
@@ -215,7 +214,43 @@ var BaseLoader = /*#__PURE__*/function () {
215
214
  }, _callee3);
216
215
  }));
217
216
 
218
- function load(_x3) {
217
+ function init(_x3) {
218
+ return _init.apply(this, arguments);
219
+ }
220
+
221
+ return init;
222
+ }()
223
+ /**
224
+ * loadApp from remote
225
+ * @param config
226
+ * @returns
227
+ */
228
+
229
+ }, {
230
+ key: "load",
231
+ value: function () {
232
+ var _load = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee4(config) {
233
+ var _config$app;
234
+
235
+ return _regenerator.default.wrap(function _callee4$(_context4) {
236
+ while (1) {
237
+ switch (_context4.prev = _context4.next) {
238
+ case 0:
239
+ _context4.next = 2;
240
+ return config === null || config === void 0 ? void 0 : (_config$app = config.app) === null || _config$app === void 0 ? void 0 : _config$app.load();
241
+
242
+ case 2:
243
+ return _context4.abrupt("return", config);
244
+
245
+ case 3:
246
+ case "end":
247
+ return _context4.stop();
248
+ }
249
+ }
250
+ }, _callee4);
251
+ }));
252
+
253
+ function load(_x4) {
219
254
  return _load.apply(this, arguments);
220
255
  }
221
256
 
package/lib/utils/getAlfaManifest.js CHANGED
@@ -15,44 +15,50 @@ var _getAlfaRelease = require("./getAlfaRelease");
15
15
 
16
16
  var getManifest = /*#__PURE__*/function () {
17
17
  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/_regenerator.default.mark(function _callee(config) {
18
- var _releaseConfig$distT2;
18
+ var _releaseConfig$distT, _releaseConfig$distT2, _releaseConfig$versio;
19
19
 
20
- var name, version, releaseConfig, _releaseConfig$distT, configByVersion;
20
+ var name, logger, version, releaseConfig, latestVersion, versionEntry, _releaseConfig$versio2;
21
21
 
22
22
  return _regenerator.default.wrap(function _callee$(_context) {
23
23
  while (1) {
24
24
  switch (_context.prev = _context.next) {
25
25
  case 0:
26
- name = config.name;
26
+ name = config.name, logger = config.logger;
27
27
  version = config.version;
28
28
  _context.next = 4;
29
29
  return (0, _getAlfaRelease.getRelease)(config);
30
30
 
31
31
  case 4:
32
32
  releaseConfig = _context.sent;
33
+ latestVersion = (_releaseConfig$distT = releaseConfig['dist-tags']) === null || _releaseConfig$distT === void 0 ? void 0 : _releaseConfig$distT.latest; // if version is in dist-tags, return value
33
34
 
34
- if (!config.version) {
35
- version = (_releaseConfig$distT = releaseConfig['dist-tags']) === null || _releaseConfig$distT === void 0 ? void 0 : _releaseConfig$distT.latest;
36
- } // if version is in dist-tags, return value
35
+ if ((_releaseConfig$distT2 = releaseConfig['dist-tags']) !== null && _releaseConfig$distT2 !== void 0 && _releaseConfig$distT2[version]) {
36
+ version = releaseConfig['dist-tags'][version];
37
+ }
37
38
 
39
+ versionEntry = (_releaseConfig$versio = releaseConfig.versions) === null || _releaseConfig$versio === void 0 ? void 0 : _releaseConfig$versio[version];
38
40
 
39
- if ((_releaseConfig$distT2 = releaseConfig['dist-tags']) !== null && _releaseConfig$distT2 !== void 0 && _releaseConfig$distT2[config.version]) {
40
- version = releaseConfig['dist-tags'][config.version];
41
+ if (versionEntry) {
42
+ _context.next = 13;
43
+ break;
41
44
  }
42
45
 
43
- configByVersion = releaseConfig.versions[version];
46
+ logger === null || logger === void 0 ? void 0 : logger.error({
47
+ E_MSG: "cannot find ".concat(name, "@").concat(version, ".")
48
+ });
49
+ versionEntry = (_releaseConfig$versio2 = releaseConfig.versions) === null || _releaseConfig$versio2 === void 0 ? void 0 : _releaseConfig$versio2[latestVersion];
44
50
 
45
- if (configByVersion) {
46
- _context.next = 10;
51
+ if (versionEntry) {
52
+ _context.next = 13;
47
53
  break;
48
54
  }
49
55
 
50
- throw new Error("".concat(name, "@").concat(version, " is not found, please check you release."));
56
+ throw new Error("cannot find ".concat(name, "@latest, please check release."));
51
57
 
52
- case 10:
53
- return _context.abrupt("return", releaseConfig.versions[version].entry);
58
+ case 13:
59
+ return _context.abrupt("return", versionEntry.entry);
54
60
 
55
- case 11:
61
+ case 14:
56
62
  case "end":
57
63
  return _context.stop();
58
64
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@alicloud/alfa-core",
3
- "version": "1.3.0",
3
+ "version": "1.3.3",
4
4
  "description": "MicroFront End SDK for alicloud",
5
5
  "main": "lib/index.js",
6
6
  "module": "es/index.js",
@@ -30,7 +30,7 @@
30
30
  },
31
31
  "dependencies": {
32
32
  "@alicloud/console-logger-sls": "^1.2.31",
33
- "@alicloud/console-os-kernal": "^1.2.3"
33
+ "@alicloud/console-os-kernal": "^1.3.3"
34
34
  },
35
- "gitHead": "fd4e97a8b7802616641e61a6572492c90a480c30"
35
+ "gitHead": "0ee54132107a373f2d13b548a747461aa3dcfc7c"
36
36
  }