@yongdall/configuration 0.1.0 → 0.1.1

package/index.d.mts

@@ -2,12 +2,19 @@ import { Tenant } from "@yongdall/types";
 import { assetsRoot, configRoot, projectRoot } from "@yongdall/root";
 
 //#region cli/configuration/index.d.mts
+/**
+ * @template {object} T
+ * @param {string} name
+ * @returns {Promise<[string, T] | null>}
+ */
+declare function loadCfgWithPath<T extends object>(name: string): Promise<[string, T] | null>;
 /**
  * @template {object} T
  * @param {string} name
  * @returns {Promise<T | null>}
  */
 declare function loadCfg<T extends object>(name: string): Promise<T | null>;
+declare const configurationPath: string;
 /** @type {Omit<Tenant, 'id'>} */
 declare const tenant: Omit<Tenant, "id">;
 declare const boot: object;
@@ -41,4 +48,4 @@ declare namespace configuration {
   let plugins: Record<string, string | boolean> | undefined;
 }
 //#endregion
-export { Configuration, assetsRoot, boot, configRoot, configuration as default, loadCfg, projectRoot, tenant };
+export { Configuration, assetsRoot, boot, configRoot, configurationPath, configuration as default, loadCfg, loadCfgWithPath, projectRoot, tenant };

package/index.mjs

@@ -1,7 +1,7 @@
 import * as pathFn from "node:path";
 import * as fsPromises from "node:fs/promises";
-import { assetsRoot, configRoot, configRoot as configRoot$1, configurationPath, projectRoot } from "@yongdall/root";
-import loadConfiguration from "@yongdall/load-configuration";
+import { assetsRoot, configRoot, configRoot as configRoot$1, configurationPath as configurationPath$1, projectRoot } from "@yongdall/root";
+import loadConfiguration, { loadConfigurationWithPath } from "@yongdall/load-configuration";
 
 //#region cli/configuration/index.mjs
 /** @import { Tenant } from '@yongdall/types' */
@@ -13,8 +13,18 @@ import loadConfiguration from "@yongdall/load-configuration";
 * @prop {boolean} [single] 单用户模式
 * @prop {Record<string, string | boolean>} [plugins] 插件
 */
+const r = await loadConfigurationWithPath(configurationPath$1).catch(() => {});
+const configurationPath = r?.[0] || configurationPath$1;
 /** 全局配置 */
-const configuration = await loadConfiguration(configurationPath).catch(() => {}) || {};
+const configuration = r?.[1] || {};
+/**
+* @template {object} T
+* @param {string} name 
+* @returns {Promise<[string, T] | null>}
+*/
+async function loadCfgWithPath(name) {
+	return loadConfigurationWithPath(pathFn.resolve(configRoot$1, name));
+}
 /**
 * @template {object} T
 * @param {string} name 
@@ -34,5 +44,5 @@ const boot = await loadCfg("boot") || {};
 var configuration_default = configuration;
 
 //#endregion
-export { assetsRoot, boot, configRoot, configuration_default as default, loadCfg, projectRoot, tenant };
+export { assetsRoot, boot, configRoot, configurationPath, configuration_default as default, loadCfg, loadCfgWithPath, projectRoot, tenant };
 //# sourceMappingURL=index.mjs.map

package/index.mjs.map

@@ -1 +1 @@
-{"version":3,"file":"index.mjs","names":["configRoot"],"sources":["../../cli/configuration/index.mjs"],"sourcesContent":["import * as pathFn from 'node:path';\nimport * as fsPromises from 'node:fs/promises';\nimport loadConfiguration from '@yongdall/load-configuration';\nexport { projectRoot, configRoot, assetsRoot } from '@yongdall/root';\nimport { configurationPath, configRoot } from '@yongdall/root';\n/** @import { Tenant } from '@yongdall/types' */\n\n/**\n * @typedef {object} Configuration\n * @prop {string} [bootModule] 启动模块\n * @prop {string} [bootName] 启动模块配置名称\n * @prop {string} [title] 网站名称\n * @prop {boolean} [single] 单用户模式\n * @prop {Record<string, string | boolean>} [plugins] 插件\n */\n\n/** 全局配置 */\nconst configuration = /** @type {Configuration} */(\n\tawait loadConfiguration(configurationPath).catch(() => {}) || {}\n);\n\n\n/**\n * @template {object} T\n * @param {string} name \n * @returns {Promise<T | null>}\n */\nexport async function loadCfg(name) {\n\tlet path = pathFn.resolve(configRoot, name);\n\treturn loadConfiguration(path);\n}\n\n/** @type {Omit<Tenant, 'id'>} */\nexport const tenant = {\n\tlabel: configuration.title || '拥道YongDall',\n\tsingle: Boolean(configuration.single),\n\tproviders: await loadCfg('providers').catch(() => {}).then(v => /** @type {Record<string, string>} */(v || {})),\n\tsalt: await fsPromises.readFile(pathFn.resolve(configRoot, 'salt'))\n};\n\nexport const boot = await loadCfg('boot') || {};\n\nexport default configuration;\n"],"mappings":";;;;;;;;;;;;;;;;AAiBA,MAAM,gBACL,MAAM,kBAAkB,kBAAkB,CAAC,YAAY,GAAG,IAAI,EAAE;;;;;;AASjE,eAAsB,QAAQ,MAAM;AAEnC,QAAO,kBADI,OAAO,QAAQA,cAAY,KAAK,CACb;;;AAI/B,MAAa,SAAS;CACrB,OAAO,cAAc,SAAS;CAC9B,QAAQ,QAAQ,cAAc,OAAO;CACrC,WAAW,MAAM,QAAQ,YAAY,CAAC,YAAY,GAAG,CAAC,MAAK,MAA2C,KAAK,EAAE,CAAE;CAC/G,MAAM,MAAM,WAAW,SAAS,OAAO,QAAQA,cAAY,OAAO,CAAC;CACnE;AAED,MAAa,OAAO,MAAM,QAAQ,OAAO,IAAI,EAAE;AAE/C,4BAAe"}
+{"version":3,"file":"index.mjs","names":["linkPath","configRoot"],"sources":["../../cli/configuration/index.mjs"],"sourcesContent":["import * as pathFn from 'node:path';\nimport * as fsPromises from 'node:fs/promises';\nimport loadConfiguration, { loadConfigurationWithPath } from '@yongdall/load-configuration';\nexport { projectRoot, configRoot, assetsRoot } from '@yongdall/root';\nimport { configurationPath as linkPath, configRoot } from '@yongdall/root';\n/** @import { Tenant } from '@yongdall/types' */\n\n/**\n * @typedef {object} Configuration\n * @prop {string} [bootModule] 启动模块\n * @prop {string} [bootName] 启动模块配置名称\n * @prop {string} [title] 网站名称\n * @prop {boolean} [single] 单用户模式\n * @prop {Record<string, string | boolean>} [plugins] 插件\n */\nconst r = await loadConfigurationWithPath(linkPath).catch(() => {})\n\nexport const configurationPath = r?.[0] || linkPath;\n/** 全局配置 */\nconst configuration = /** @type {Configuration} */(r?.[1] || {});\n\n\n\n/**\n * @template {object} T\n * @param {string} name \n * @returns {Promise<[string, T] | null>}\n */\nexport async function loadCfgWithPath(name) {\n\tlet path = pathFn.resolve(configRoot, name);\n\treturn loadConfigurationWithPath(path);\n}\n\n\n/**\n * @template {object} T\n * @param {string} name \n * @returns {Promise<T | null>}\n */\nexport async function loadCfg(name) {\n\tlet path = pathFn.resolve(configRoot, name);\n\treturn loadConfiguration(path);\n}\n\n/** @type {Omit<Tenant, 'id'>} */\nexport const tenant = {\n\tlabel: configuration.title || '拥道YongDall',\n\tsingle: Boolean(configuration.single),\n\tproviders: await loadCfg('providers').catch(() => {}).then(v => /** @type {Record<string, string>} */(v || {})),\n\tsalt: await fsPromises.readFile(pathFn.resolve(configRoot, 'salt'))\n};\n\nexport const boot = await loadCfg('boot') || {};\n\nexport default configuration;\n"],"mappings":";;;;;;;;;;;;;;;AAeA,MAAM,IAAI,MAAM,0BAA0BA,oBAAS,CAAC,YAAY,GAAG;AAEnE,MAAa,oBAAoB,IAAI,MAAMA;;AAE3C,MAAM,gBAA6C,IAAI,MAAM,EAAE;;;;;;AAS/D,eAAsB,gBAAgB,MAAM;AAE3C,QAAO,0BADI,OAAO,QAAQC,cAAY,KAAK,CACL;;;;;;;AASvC,eAAsB,QAAQ,MAAM;AAEnC,QAAO,kBADI,OAAO,QAAQA,cAAY,KAAK,CACb;;;AAI/B,MAAa,SAAS;CACrB,OAAO,cAAc,SAAS;CAC9B,QAAQ,QAAQ,cAAc,OAAO;CACrC,WAAW,MAAM,QAAQ,YAAY,CAAC,YAAY,GAAG,CAAC,MAAK,MAA2C,KAAK,EAAE,CAAE;CAC/G,MAAM,MAAM,WAAW,SAAS,OAAO,QAAQA,cAAY,OAAO,CAAC;CACnE;AAED,MAAa,OAAO,MAAM,QAAQ,OAAO,IAAI,EAAE;AAE/C,4BAAe"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yongdall/configuration",
-  "version": "0.1.0",
+  "version": "0.1.1",
   "type": "module",
   "bin": {
     "configuration.yongdall": "./bin.mjs",