@faasjs/load 4.3.0 → 4.4.0
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/dist/index.d.mts +2 -1
- package/dist/index.d.ts +2 -1
- package/dist/index.js +8 -6
- package/dist/index.mjs +8 -6
- package/package.json +5 -5
package/dist/index.d.mts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Config } from '@faasjs/func';
|
|
2
|
+
import { Logger } from '@faasjs/logger';
|
|
2
3
|
|
|
3
4
|
/**
|
|
4
5
|
* Load configuration from faas.yaml
|
|
5
6
|
*/
|
|
6
|
-
declare function loadConfig(root: string, filename: string, staging: string): Config;
|
|
7
|
+
declare function loadConfig(root: string, filename: string, staging: string, logger?: Logger): Config;
|
|
7
8
|
|
|
8
9
|
export { loadConfig };
|
package/dist/index.d.ts
CHANGED
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Config } from '@faasjs/func';
|
|
2
|
+
import { Logger } from '@faasjs/logger';
|
|
2
3
|
|
|
3
4
|
/**
|
|
4
5
|
* Load configuration from faas.yaml
|
|
5
6
|
*/
|
|
6
|
-
declare function loadConfig(root: string, filename: string, staging: string): Config;
|
|
7
|
+
declare function loadConfig(root: string, filename: string, staging: string, logger?: Logger): Config;
|
|
7
8
|
|
|
8
9
|
export { loadConfig };
|
package/dist/index.js
CHANGED
|
@@ -12,17 +12,19 @@ var Config = class {
|
|
|
12
12
|
filename;
|
|
13
13
|
origin;
|
|
14
14
|
defaults;
|
|
15
|
-
logger
|
|
16
|
-
constructor(root, filename) {
|
|
15
|
+
logger;
|
|
16
|
+
constructor(root, filename, logger$1) {
|
|
17
|
+
this.logger = new logger.Logger(
|
|
18
|
+
logger$1?.label ? `${logger$1.label}] [config` : "config"
|
|
19
|
+
);
|
|
17
20
|
this.root = root;
|
|
18
21
|
if (!this.root.endsWith(path.sep)) this.root += path.sep;
|
|
19
22
|
this.filename = filename;
|
|
20
|
-
this.logger.debug("
|
|
23
|
+
this.logger.debug("load %s in %s", filename, root);
|
|
21
24
|
const configs = [];
|
|
22
25
|
const paths = [this.root, "."].concat(
|
|
23
26
|
path.dirname(filename.replace(root, "")).split(path.sep)
|
|
24
27
|
);
|
|
25
|
-
this.logger.debug("Paths: %j", paths);
|
|
26
28
|
paths.reduce((base, path$1) => {
|
|
27
29
|
const root2 = path.join(base, path$1);
|
|
28
30
|
if (root2 === base) return base;
|
|
@@ -50,8 +52,8 @@ var Config = class {
|
|
|
50
52
|
return this[key] || this.defaults || /* @__PURE__ */ Object.create(null);
|
|
51
53
|
}
|
|
52
54
|
};
|
|
53
|
-
function loadConfig(root, filename, staging) {
|
|
54
|
-
return new Config(root, filename).get(staging);
|
|
55
|
+
function loadConfig(root, filename, staging, logger) {
|
|
56
|
+
return new Config(root, filename, logger).get(staging);
|
|
55
57
|
}
|
|
56
58
|
|
|
57
59
|
exports.loadConfig = loadConfig;
|
package/dist/index.mjs
CHANGED
|
@@ -10,17 +10,19 @@ var Config = class {
|
|
|
10
10
|
filename;
|
|
11
11
|
origin;
|
|
12
12
|
defaults;
|
|
13
|
-
logger
|
|
14
|
-
constructor(root, filename) {
|
|
13
|
+
logger;
|
|
14
|
+
constructor(root, filename, logger) {
|
|
15
|
+
this.logger = new Logger(
|
|
16
|
+
logger?.label ? `${logger.label}] [config` : "config"
|
|
17
|
+
);
|
|
15
18
|
this.root = root;
|
|
16
19
|
if (!this.root.endsWith(sep)) this.root += sep;
|
|
17
20
|
this.filename = filename;
|
|
18
|
-
this.logger.debug("
|
|
21
|
+
this.logger.debug("load %s in %s", filename, root);
|
|
19
22
|
const configs = [];
|
|
20
23
|
const paths = [this.root, "."].concat(
|
|
21
24
|
dirname(filename.replace(root, "")).split(sep)
|
|
22
25
|
);
|
|
23
|
-
this.logger.debug("Paths: %j", paths);
|
|
24
26
|
paths.reduce((base, path) => {
|
|
25
27
|
const root2 = join(base, path);
|
|
26
28
|
if (root2 === base) return base;
|
|
@@ -48,8 +50,8 @@ var Config = class {
|
|
|
48
50
|
return this[key] || this.defaults || /* @__PURE__ */ Object.create(null);
|
|
49
51
|
}
|
|
50
52
|
};
|
|
51
|
-
function loadConfig(root, filename, staging) {
|
|
52
|
-
return new Config(root, filename).get(staging);
|
|
53
|
+
function loadConfig(root, filename, staging, logger) {
|
|
54
|
+
return new Config(root, filename, logger).get(staging);
|
|
53
55
|
}
|
|
54
56
|
|
|
55
57
|
export { loadConfig };
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@faasjs/load",
|
|
3
|
-
"version": "4.
|
|
3
|
+
"version": "4.4.0",
|
|
4
4
|
"license": "MIT",
|
|
5
5
|
"main": "dist/index.js",
|
|
6
6
|
"module": "dist/index.mjs",
|
|
@@ -35,14 +35,14 @@
|
|
|
35
35
|
],
|
|
36
36
|
"peerDependencies": {
|
|
37
37
|
"js-yaml": "*",
|
|
38
|
-
"@faasjs/deep_merge": "4.
|
|
39
|
-
"@faasjs/func": "4.
|
|
38
|
+
"@faasjs/deep_merge": "4.4.0",
|
|
39
|
+
"@faasjs/func": "4.4.0"
|
|
40
40
|
},
|
|
41
41
|
"devDependencies": {
|
|
42
42
|
"js-yaml": "*",
|
|
43
43
|
"@types/js-yaml": "*",
|
|
44
|
-
"@faasjs/deep_merge": "4.
|
|
45
|
-
"@faasjs/func": "4.
|
|
44
|
+
"@faasjs/deep_merge": "4.4.0",
|
|
45
|
+
"@faasjs/func": "4.4.0"
|
|
46
46
|
},
|
|
47
47
|
"engines": {
|
|
48
48
|
"node": ">=22.0.0",
|