@faasjs/load 3.1.2 → 3.1.4

package/dist/index.d.mts

@@ -1,7 +1,7 @@
 import { Config as Config$1, Func } from '@faasjs/func';
 
 /**
- * 配置类
+ * Load configuration from faas.yaml
  */
 declare class Config {
     [key: string]: any;
@@ -12,18 +12,12 @@ declare class Config {
         defaults: Config$1;
     };
     readonly defaults: Config$1;
-    /**
-     * 创建配置类，并自动读取配置内容
-     *
-     * @param root {string} 根目录
-     * @param filename {filename} 目标文件，用于读取目录层级
-     */
+    private readonly logger;
     constructor(root: string, filename: string);
+    get(key: string): Config;
 }
 /**
- * 加载配置
- * @param root {string} 根目录
- * @param filename {filename} 目标文件，用于读取目录层级
+ * Load configuration from faas.yaml
  */
 declare function loadConfig(root: string, filename: string, staging: string): Config;
 

package/dist/index.d.ts

@@ -1,7 +1,7 @@
 import { Config as Config$1, Func } from '@faasjs/func';
 
 /**
- * 配置类
+ * Load configuration from faas.yaml
  */
 declare class Config {
     [key: string]: any;
@@ -12,18 +12,12 @@ declare class Config {
         defaults: Config$1;
     };
     readonly defaults: Config$1;
-    /**
-     * 创建配置类，并自动读取配置内容
-     *
-     * @param root {string} 根目录
-     * @param filename {filename} 目标文件，用于读取目录层级
-     */
+    private readonly logger;
     constructor(root: string, filename: string);
+    get(key: string): Config;
 }
 /**
- * 加载配置
- * @param root {string} 根目录
- * @param filename {filename} 目标文件，用于读取目录层级
+ * Load configuration from faas.yaml
  */
 declare function loadConfig(root: string, filename: string, staging: string): Config;
 

package/dist/index.js

@@ -4,6 +4,7 @@ var deep_merge = require('@faasjs/deep_merge');
 var fs = require('fs');
 var path = require('path');
 var jsYaml = require('js-yaml');
+var logger = require('@faasjs/logger');
 var rollup_js = require('rollup/dist/rollup.js');
 var tsTransform = require('@faasjs/ts-transform');
 
@@ -18,20 +19,17 @@ var Config = class {
   filename;
   origin;
   defaults;
-  /**
-   * 创建配置类，并自动读取配置内容
-   *
-   * @param root {string} 根目录
-   * @param filename {filename} 目标文件，用于读取目录层级
-   */
+  logger = new logger.Logger("Config");
   constructor(root, filename) {
     this.root = root;
     if (!this.root.endsWith(path.sep)) this.root += path.sep;
     this.filename = filename;
+    this.logger.debug("Load config from %s in %s", filename, root);
     const configs = [];
     const paths = [this.root, "."].concat(
       path.dirname(filename.replace(root, "")).split(path.sep)
     );
+    this.logger.debug("Paths: %j", paths);
     paths.reduce((base, path$1) => {
       const root2 = path.join(base, path$1);
       if (root2 === base) return base;
@@ -43,10 +41,12 @@ var Config = class {
       return root2;
     });
     this.origin = deep_merge.deepMerge(...configs);
+    this.logger.debug("Origin: %j", this.origin);
     this.defaults = deep_merge.deepMerge(this.origin.defaults || {});
+    this.logger.debug("Defaults: %j", this.defaults);
     for (const key in this.origin) {
       if (key !== "defaults")
-        this[key] = deep_merge.deepMerge(this.origin.defaults, this.origin[key]);
+        this[key] = deep_merge.deepMerge(this.defaults, this.origin[key]);
       const data = this[key];
       if (data.plugins)
         for (const pluginKey in data.plugins) {
@@ -55,9 +55,12 @@ var Config = class {
         }
     }
   }
+  get(key) {
+    return this[key] || this.defaults || /* @__PURE__ */ Object.create(null);
+  }
 };
 function loadConfig(root, filename, staging) {
-  return new Config(root, filename)[staging] || /* @__PURE__ */ Object.create(null);
+  return new Config(root, filename).get(staging);
 }
 var FaasPackages = [
   "@faasjs/cloud_function",

package/dist/index.mjs

@@ -2,6 +2,7 @@ import { deepMerge } from '@faasjs/deep_merge';
 import { unlinkSync, existsSync, readFileSync } from 'node:fs';
 import { sep, dirname, join } from 'node:path';
 import { load } from 'js-yaml';
+import { Logger } from '@faasjs/logger';
 import { rollup } from 'rollup/dist/rollup.js';
 import { NodeBuiltinModules, bundle } from '@faasjs/ts-transform';
 
@@ -16,20 +17,17 @@ var Config = class {
   filename;
   origin;
   defaults;
-  /**
-   * 创建配置类，并自动读取配置内容
-   *
-   * @param root {string} 根目录
-   * @param filename {filename} 目标文件，用于读取目录层级
-   */
+  logger = new Logger("Config");
   constructor(root, filename) {
     this.root = root;
     if (!this.root.endsWith(sep)) this.root += sep;
     this.filename = filename;
+    this.logger.debug("Load config from %s in %s", filename, root);
     const configs = [];
     const paths = [this.root, "."].concat(
       dirname(filename.replace(root, "")).split(sep)
     );
+    this.logger.debug("Paths: %j", paths);
     paths.reduce((base, path) => {
       const root2 = join(base, path);
       if (root2 === base) return base;
@@ -41,10 +39,12 @@ var Config = class {
       return root2;
     });
     this.origin = deepMerge(...configs);
+    this.logger.debug("Origin: %j", this.origin);
     this.defaults = deepMerge(this.origin.defaults || {});
+    this.logger.debug("Defaults: %j", this.defaults);
     for (const key in this.origin) {
       if (key !== "defaults")
-        this[key] = deepMerge(this.origin.defaults, this.origin[key]);
+        this[key] = deepMerge(this.defaults, this.origin[key]);
       const data = this[key];
       if (data.plugins)
         for (const pluginKey in data.plugins) {
@@ -53,9 +53,12 @@ var Config = class {
         }
     }
   }
+  get(key) {
+    return this[key] || this.defaults || /* @__PURE__ */ Object.create(null);
+  }
 };
 function loadConfig(root, filename, staging) {
-  return new Config(root, filename)[staging] || /* @__PURE__ */ Object.create(null);
+  return new Config(root, filename).get(staging);
 }
 var FaasPackages = [
   "@faasjs/cloud_function",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@faasjs/load",
-  "version": "3.1.2",
+  "version": "3.1.4",
   "license": "MIT",
   "main": "dist/index.js",
   "module": "dist/index.mjs",
@@ -38,15 +38,15 @@
     "rollup": "*"
   },
   "peerDependencies": {
-    "@faasjs/deep_merge": "3.1.2",
-    "@faasjs/func": "3.1.2",
-    "@faasjs/ts-transform": "3.1.2"
+    "@faasjs/deep_merge": "3.1.4",
+    "@faasjs/func": "3.1.4",
+    "@faasjs/ts-transform": "3.1.4"
   },
   "devDependencies": {
     "@types/js-yaml": "*",
-    "@faasjs/deep_merge": "3.1.2",
-    "@faasjs/func": "3.1.2",
-    "@faasjs/ts-transform": "3.1.2"
+    "@faasjs/deep_merge": "3.1.4",
+    "@faasjs/func": "3.1.4",
+    "@faasjs/ts-transform": "3.1.4"
   },
   "engines": {
     "node": ">=22.0.0",