@yongdall/configuration 0.2.0 → 0.4.0

package/index.d.mts

@@ -2,6 +2,8 @@ import { Tenant } from "@yongdall/types";
 import { assetsRoot, configRoot, projectRoot } from "@yongdall/root";
 
 //#region cli/configuration/index.d.mts
+declare function loadProjectConfiguration(): Promise<Configuration>;
+declare function loadProjectConfigurationPath(): Promise<string>;
 /**
  * @template {object} T
  * @param {string} name
@@ -14,10 +16,8 @@ declare function loadCfgWithPath<T extends object>(name: string): Promise<[strin
  * @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;
+declare function loadTenant(): Promise<Omit<Tenant, "id">>;
+declare function loadBoot(): Promise<object>;
 type Configuration = {
   /**
    * 启动模块
@@ -40,12 +40,5 @@ type Configuration = {
    */
   plugins?: Record<string, string | boolean> | undefined;
 };
-declare namespace configuration {
-  let bootModule: string | undefined;
-  let bootName: string | undefined;
-  let title: string | undefined;
-  let single: boolean | undefined;
-  let plugins: Record<string, string | boolean> | undefined;
-}
 //#endregion
-export { Configuration, assetsRoot, boot, configRoot, configurationPath, configuration as default, loadCfg, loadCfgWithPath, projectRoot, tenant };
+export { Configuration, assetsRoot, configRoot, loadBoot, loadCfg, loadCfgWithPath, loadProjectConfiguration, loadProjectConfigurationPath, loadTenant, projectRoot };

package/index.mjs

@@ -1,6 +1,6 @@
 import * as pathFn from "node:path";
 import * as fsPromises from "node:fs/promises";
-import { assetsRoot, configRoot, configRoot as configRoot$1, configurationPath as configurationPath$1, projectRoot } from "@yongdall/root";
+import { assetsRoot, configRoot, configRoot as configRoot$1, configurationPath, projectRoot } from "@yongdall/root";
 import loadConfiguration, { loadConfigurationWithPath } from "@yongdall/load-configuration";
 
 //#region cli/configuration/index.mjs
@@ -13,10 +13,16 @@ import loadConfiguration, { loadConfigurationWithPath } from "@yongdall/load-con
 * @prop {boolean} [single] 单用户模式
 * @prop {Record<string, string | boolean>} [plugins] 插件
 */
-const r = await loadConfigurationWithPath(configurationPath$1).catch(() => {});
-const configurationPath = r?.[0] || configurationPath$1;
-/** 全局配置 */
-const configuration = r?.[1] || {};
+/** @type {Promise<[string, object | null]?>?} */
+let projectConfigurationPromise = null;
+async function loadProjectConfiguration() {
+	projectConfigurationPromise ||= loadConfigurationWithPath(configurationPath).catch(() => null);
+	return projectConfigurationPromise.then((r) => r?.[1] || {});
+}
+async function loadProjectConfigurationPath() {
+	projectConfigurationPromise ||= loadConfigurationWithPath(configurationPath).catch(() => null);
+	return projectConfigurationPromise.then((r) => r?.[0] || configurationPath);
+}
 /**
 * @template {object} T
 * @param {string} name 
@@ -33,16 +39,17 @@ async function loadCfgWithPath(name) {
 async function loadCfg(name) {
 	return loadConfiguration(pathFn.resolve(configRoot$1, name));
 }
-/** @type {Omit<Tenant, 'id'>} */
-const tenant = {
-	label: configuration.title || "拥道YongDall",
-	single: Boolean(configuration.single),
-	providers: await loadCfg("providers").catch(() => {}).then((v) => v || {}),
-	salt: await fsPromises.readFile(pathFn.resolve(configRoot$1, "salt"))
-};
-const boot = await loadCfg("boot") || {};
-var configuration_default = configuration;
+async function loadTenant() {
+	const configuration = await loadProjectConfiguration();
+	return {
+		label: configuration.title || "拥道YongDall",
+		single: Boolean(configuration.single),
+		providers: await loadCfg("providers").catch(() => {}).then((v) => v || {}),
+		salt: await fsPromises.readFile(pathFn.resolve(configRoot$1, "salt"))
+	};
+}
+const loadBoot = async () => await loadCfg("boot") || {};
 
 //#endregion
-export { assetsRoot, boot, configRoot, configurationPath, configuration_default as default, loadCfg, loadCfgWithPath, projectRoot, tenant };
+export { assetsRoot, configRoot, loadBoot, loadCfg, loadCfgWithPath, loadProjectConfiguration, loadProjectConfigurationPath, loadTenant, projectRoot };
 //# sourceMappingURL=index.mjs.map

package/index.mjs.map

@@ -1 +1 @@
-{"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] | 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"}
+{"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 */\n\n/** @type {Promise<[string, object | null]?>?} */\nlet projectConfigurationPromise = null;\nexport async function loadProjectConfiguration() {\n\tprojectConfigurationPromise ||= loadConfigurationWithPath(linkPath).catch(() => null);\n\treturn projectConfigurationPromise.then(r => /** @type {Configuration} */(r?.[1] || {}));\n}\nexport async function loadProjectConfigurationPath() {\n\tprojectConfigurationPromise ||= loadConfigurationWithPath(linkPath).catch(() => null);\n\treturn projectConfigurationPromise.then(r => r?.[0] || linkPath);\n}\n\n/**\n * @template {object} T\n * @param {string} name \n * @returns {Promise<[string, T | null] | 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\nexport async function loadTenant() {\n\tconst configuration = await loadProjectConfiguration();\n\t/** @type {Omit<Tenant, 'id'>} */\n\tconst tenant = {\n\t\tlabel: configuration.title || '拥道YongDall',\n\t\tsingle: Boolean(configuration.single),\n\t\tproviders: await loadCfg('providers').catch(() => { }).then(v => /** @type {Record<string, string>} */(v || {})),\n\t\tsalt: await fsPromises.readFile(pathFn.resolve(configRoot, 'salt'))\n\t};\n\treturn tenant;\n}\n\nexport const loadBoot = async () => await loadCfg('boot') || {};\n"],"mappings":";;;;;;;;;;;;;;;;AAiBA,IAAI,8BAA8B;AAClC,eAAsB,2BAA2B;AAChD,iCAAgC,0BAA0BA,kBAAS,CAAC,YAAY,KAAK;AACrF,QAAO,4BAA4B,MAAK,MAAkC,IAAI,MAAM,EAAE,CAAE;;AAEzF,eAAsB,+BAA+B;AACpD,iCAAgC,0BAA0BA,kBAAS,CAAC,YAAY,KAAK;AACrF,QAAO,4BAA4B,MAAK,MAAK,IAAI,MAAMA,kBAAS;;;;;;;AAQjE,eAAsB,gBAAgB,MAAM;AAE3C,QAAO,0BADI,OAAO,QAAQC,cAAY,KAAK,CACL;;;;;;;AASvC,eAAsB,QAAQ,MAAM;AAEnC,QAAO,kBADI,OAAO,QAAQA,cAAY,KAAK,CACb;;AAG/B,eAAsB,aAAa;CAClC,MAAM,gBAAgB,MAAM,0BAA0B;AAQtD,QANe;EACd,OAAO,cAAc,SAAS;EAC9B,QAAQ,QAAQ,cAAc,OAAO;EACrC,WAAW,MAAM,QAAQ,YAAY,CAAC,YAAY,GAAI,CAAC,MAAK,MAA2C,KAAK,EAAE,CAAE;EAChH,MAAM,MAAM,WAAW,SAAS,OAAO,QAAQA,cAAY,OAAO,CAAC;EACnE;;AAIF,MAAa,WAAW,YAAY,MAAM,QAAQ,OAAO,IAAI,EAAE"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@yongdall/configuration",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "type": "module",
   "bin": {
     "configuration.yongdall": "./bin.mjs",
@@ -12,12 +12,12 @@
     "#index": "./index.mjs"
   },
   "dependencies": {
-    "@yongdall/load-configuration": "^0.2.0",
-    "@yongdall/root": "^0.2.0"
+    "@yongdall/load-configuration": "^0.4.0",
+    "@yongdall/root": "^0.4.0"
   },
   "devDependencies": {
-    "@yongdall/cli-parse": "^0.2.0",
-    "@yongdall/types": "^0.2.0"
+    "@yongdall/cli-parse": "^0.4.0",
+    "@yongdall/types": "^0.4.0"
   },
   "exports": {
     ".": "./index.mjs"