@faasjs/load 0.0.2-beta.260 → 0.0.2-beta.274

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 (3) hide show
  1. package/lib/index.es.js +14 -19
  2. package/lib/index.js +14 -19
  3. package/package.json +3 -3
package/lib/index.es.js CHANGED
@@ -33,29 +33,24 @@ class Config {
33
33
  return root;
34
34
  });
35
35
  this.origin = deepMerge(...configs);
36
- if (!this.origin.defaults)
37
- throw Error('[faas.yaml] need defaults env.');
38
- this.defaults = deepMerge(this.origin.defaults);
36
+ this.defaults = deepMerge(this.origin.defaults || {});
39
37
  for (const key in this.origin) {
40
38
  if (key !== 'defaults')
41
39
  this[key] = deepMerge(this.origin.defaults, this.origin[key]);
42
40
  const data = this[key];
43
- if (!data.providers)
44
- throw Error(`[faas.yaml] missing key: ${key}/providers`);
45
- if (!data.plugins)
46
- throw Error(`[faas.yaml] missing key: ${key}/plugins`);
47
- for (const pluginKey in data.plugins) {
48
- const plugin = data.plugins[pluginKey];
49
- plugin.name = pluginKey;
50
- if (plugin.provider)
51
- if (typeof plugin.provider === 'string') {
52
- if (!data.providers[plugin.provider])
53
- throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
54
- plugin.provider = data.providers[plugin.provider];
55
- }
56
- else
57
- plugin.provider = deepMerge(data.providers[plugin.provider], plugin.provider);
58
- }
41
+ if (data.plugins)
42
+ for (const pluginKey in data.plugins) {
43
+ const plugin = data.plugins[pluginKey];
44
+ plugin.name = pluginKey;
45
+ if (plugin.provider)
46
+ if (typeof plugin.provider === 'string') {
47
+ if (!data.providers[plugin.provider])
48
+ throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
49
+ plugin.provider = data.providers[plugin.provider];
50
+ }
51
+ else
52
+ plugin.provider = deepMerge(data.providers[plugin.provider], plugin.provider);
53
+ }
59
54
  }
60
55
  }
61
56
  }
package/lib/index.js CHANGED
@@ -60,29 +60,24 @@ class Config {
60
60
  return root;
61
61
  });
62
62
  this.origin = deep_merge.deepMerge(...configs);
63
- if (!this.origin.defaults)
64
- throw Error('[faas.yaml] need defaults env.');
65
- this.defaults = deep_merge.deepMerge(this.origin.defaults);
63
+ this.defaults = deep_merge.deepMerge(this.origin.defaults || {});
66
64
  for (const key in this.origin) {
67
65
  if (key !== 'defaults')
68
66
  this[key] = deep_merge.deepMerge(this.origin.defaults, this.origin[key]);
69
67
  const data = this[key];
70
- if (!data.providers)
71
- throw Error(`[faas.yaml] missing key: ${key}/providers`);
72
- if (!data.plugins)
73
- throw Error(`[faas.yaml] missing key: ${key}/plugins`);
74
- for (const pluginKey in data.plugins) {
75
- const plugin = data.plugins[pluginKey];
76
- plugin.name = pluginKey;
77
- if (plugin.provider)
78
- if (typeof plugin.provider === 'string') {
79
- if (!data.providers[plugin.provider])
80
- throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
81
- plugin.provider = data.providers[plugin.provider];
82
- }
83
- else
84
- plugin.provider = deep_merge.deepMerge(data.providers[plugin.provider], plugin.provider);
85
- }
68
+ if (data.plugins)
69
+ for (const pluginKey in data.plugins) {
70
+ const plugin = data.plugins[pluginKey];
71
+ plugin.name = pluginKey;
72
+ if (plugin.provider)
73
+ if (typeof plugin.provider === 'string') {
74
+ if (!data.providers[plugin.provider])
75
+ throw Error(`[faas.yaml] missing provider: ${plugin.provider} <${key}/plugins/${pluginKey}>`);
76
+ plugin.provider = data.providers[plugin.provider];
77
+ }
78
+ else
79
+ plugin.provider = deep_merge.deepMerge(data.providers[plugin.provider], plugin.provider);
80
+ }
86
81
  }
87
82
  }
88
83
  }
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@faasjs/load",
3
- "version": "0.0.2-beta.260",
3
+ "version": "0.0.2-beta.274",
4
4
  "license": "MIT",
5
5
  "main": "lib/index.js",
6
6
  "types": "lib/index.d.ts",
@@ -27,11 +27,11 @@
27
27
  "vm2": "*"
28
28
  },
29
29
  "devDependencies": {
30
- "@faasjs/func": "^0.0.2-beta.260",
30
+ "@faasjs/func": "^0.0.2-beta.269",
31
31
  "@types/debug": "*",
32
32
  "@types/jest": "*",
33
33
  "@types/js-yaml": "*",
34
34
  "@types/node": "*"
35
35
  },
36
- "gitHead": "4863d76f065e4ca18a3ec4131a630ef37c742fcf"
36
+ "gitHead": "1d5855a56c0497df92ee45c77d1a24fa44d7d678"
37
37
  }