@foxford/den 3.2.0 → 3.2.1

package/bin/den.cjs

@@ -1,7 +1,8 @@
 "use strict";
 
 
-var _chunkRRR2DJMNcjs = require('../chunk-RRR2DJMN.cjs');
+var _chunkUB3GCX73cjs = require('../chunk-UB3GCX73.cjs');
+require('../chunk-KQAB6C6Q.cjs');
 require('../chunk-A6ZPAM6Z.cjs');
 
 
@@ -69,11 +70,11 @@ function run(argv) {
     }
     const target = { base: options["base"], root: (_a = options["root"]) != null ? _a : process.cwd() };
     if (command === "build") {
-      yield _chunkRRR2DJMNcjs.buildApp.call(void 0, target);
+      yield _chunkUB3GCX73cjs.buildApp.call(void 0, target);
       return;
     }
     if (command === "dev") {
-      yield _chunkRRR2DJMNcjs.devApp.call(void 0, target);
+      yield _chunkUB3GCX73cjs.devApp.call(void 0, target);
       return;
     }
     fail(`\u043D\u0435\u0438\u0437\u0432\u0435\u0441\u0442\u043D\u0430\u044F \u043A\u043E\u043C\u0430\u043D\u0434\u0430 \xAB${command}\xBB`);

package/bin/den.js

@@ -1,7 +1,8 @@
 import {
   buildApp,
   devApp
-} from "../chunk-BMI5HNGE.js";
+} from "../chunk-URSWYSZF.js";
+import "../chunk-RG7ZV5BD.js";
 import "../chunk-TPBI6TOU.js";
 import {
   __async

package/builder/index.cjs

@@ -2,11 +2,12 @@
 
 
 
-var _chunkRRR2DJMNcjs = require('../chunk-RRR2DJMN.cjs');
+var _chunkUB3GCX73cjs = require('../chunk-UB3GCX73.cjs');
+require('../chunk-KQAB6C6Q.cjs');
 require('../chunk-A6ZPAM6Z.cjs');
 require('../chunk-T5QVCXVB.cjs');
 
 
 
 
-exports.buildApp = _chunkRRR2DJMNcjs.buildApp; exports.defineAppConfig = _chunkRRR2DJMNcjs.defineAppConfig; exports.devApp = _chunkRRR2DJMNcjs.devApp;
+exports.buildApp = _chunkUB3GCX73cjs.buildApp; exports.defineAppConfig = _chunkUB3GCX73cjs.defineAppConfig; exports.devApp = _chunkUB3GCX73cjs.devApp;

package/builder/index.js

@@ -2,7 +2,8 @@ import {
   buildApp,
   defineAppConfig,
   devApp
-} from "../chunk-BMI5HNGE.js";
+} from "../chunk-URSWYSZF.js";
+import "../chunk-RG7ZV5BD.js";
 import "../chunk-TPBI6TOU.js";
 import "../chunk-6FNC3XMI.js";
 export {

package/chunk-KQAB6C6Q.cjs

@@ -0,0 +1,15 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }// src/serve/env.ts
+var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
+var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+var ENV_FILE = ".env";
+function loadAppEnv(root) {
+  const file = _path2.default.join(root, ENV_FILE);
+  if (!_fs2.default.existsSync(file)) {
+    return;
+  }
+  process.loadEnvFile(file);
+}
+
+
+
+exports.loadAppEnv = loadAppEnv;

package/chunk-RG7ZV5BD.js

@@ -0,0 +1,15 @@
+// src/serve/env.ts
+import fs from "fs";
+import path from "path";
+var ENV_FILE = ".env";
+function loadAppEnv(root) {
+  const file = path.join(root, ENV_FILE);
+  if (!fs.existsSync(file)) {
+    return;
+  }
+  process.loadEnvFile(file);
+}
+
+export {
+  loadAppEnv
+};

package/{chunk-RRR2DJMN.cjs → chunk-UB3GCX73.cjs}

@@ -1,5 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireWildcard(obj) { if (obj && obj.__esModule) { return obj; } else { var newObj = {}; if (obj != null) { for (var key in obj) { if (Object.prototype.hasOwnProperty.call(obj, key)) { newObj[key] = obj[key]; } } } newObj.default = obj; return newObj; } } function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var _chunkKQAB6C6Qcjs = require('./chunk-KQAB6C6Q.cjs');
+
+
 var _chunkA6ZPAM6Zcjs = require('./chunk-A6ZPAM6Z.cjs');
 
 
@@ -109,11 +112,16 @@ export default descriptor
 function generateServerProcess(configPath, base, mode) {
   const assets = mode === "development" ? `  assets: { base: ${JSON.stringify(base)}, dir: fileURLToPath(new URL('./client', import.meta.url)) },
 ` : "";
-  return `${mode === "development" ? "import { fileURLToPath } from 'node:url'\n\n" : ""}import { serveApp } from '@foxford/den/serve'
+  return `import { fileURLToPath } from 'node:url'
+
+import { loadAppEnv, serveApp } from '@foxford/den/serve'
 
 import app from ${JSON.stringify(VIRTUAL_SERVER_APP)}
 import config from ${JSON.stringify(configPath)}
 
+// \u0423\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044F \u043E\u043A\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u2014 \u0434\u043E \u043F\u0435\u0440\u0432\u043E\u0433\u043E \u0447\u0442\u0435\u043D\u0438\u044F: \u043F\u043E\u0440\u0442 \u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u0447\u0438\u0442\u0430\u044E\u0442\u0441\u044F \u043D\u0438\u0436\u0435
+loadAppEnv(fileURLToPath(new URL('..', import.meta.url)))
+
 await serveApp(app, {
 ${assets}  configure: config.server?.configure,
   host: process.env.HOST,
@@ -225,6 +233,7 @@ function buildApp(options) {
     const { mode = "production" } = options;
     process.env["NODE_ENV"] = mode;
     const root = _path2.default.resolve(options.root);
+    _chunkKQAB6C6Qcjs.loadAppEnv.call(void 0, root);
     const { config, configPath } = yield loadAppConfig(root);
     const port = resolvePort((_a = config.server) == null ? void 0 : _a.port);
     const base = (_b = options.base) != null ? _b : "";
@@ -309,7 +318,9 @@ function bannerLines(facts2) {
     `${label("\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E")}http://localhost:${port}`,
     ...network === void 0 ? [] : [`${label("\u0432 \u0441\u0435\u0442\u0438")}http://${network}:${port}`],
     `${label("\u0440\u0443\u0447\u043A\u0438")}${ENDPOINTS.join("   ")}`,
-    ...facts2.base === void 0 ? [] : [`${label("\u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B")}${facts2.base}`],
+    // Префикс печатается, только когда он есть: при относительной сборке артефакты идут с
+    // адреса самого приложения, а он уже назван строкой выше
+    ...facts2.base === void 0 || facts2.base === "" ? [] : [`${label("\u043F\u0440\u0435\u0444\u0438\u043A\u0441")}${facts2.base}`],
     `${label("\u0447\u0430\u043D\u043A\u0438")}${assetsSummary(facts2.assets)}`,
     `${label("\u0432\u044B\u0445\u043E\u0434\u044B")}${OUTPUTS.join(", ")}`,
     `${label("\u043F\u0440\u0430\u0432\u043A\u0438")}${facts2.watched.join(", ")}`,

package/{chunk-BMI5HNGE.js → chunk-URSWYSZF.js}

@@ -1,3 +1,6 @@
+import {
+  loadAppEnv
+} from "./chunk-RG7ZV5BD.js";
 import {
   logger
 } from "./chunk-TPBI6TOU.js";
@@ -109,11 +112,16 @@ export default descriptor
 function generateServerProcess(configPath, base, mode) {
   const assets = mode === "development" ? `  assets: { base: ${JSON.stringify(base)}, dir: fileURLToPath(new URL('./client', import.meta.url)) },
 ` : "";
-  return `${mode === "development" ? "import { fileURLToPath } from 'node:url'\n\n" : ""}import { serveApp } from '@foxford/den/serve'
+  return `import { fileURLToPath } from 'node:url'
+
+import { loadAppEnv, serveApp } from '@foxford/den/serve'
 
 import app from ${JSON.stringify(VIRTUAL_SERVER_APP)}
 import config from ${JSON.stringify(configPath)}
 
+// \u0423\u043C\u043E\u043B\u0447\u0430\u043D\u0438\u044F \u043E\u043A\u0440\u0443\u0436\u0435\u043D\u0438\u044F \u2014 \u0434\u043E \u043F\u0435\u0440\u0432\u043E\u0433\u043E \u0447\u0442\u0435\u043D\u0438\u044F: \u043F\u043E\u0440\u0442 \u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u0447\u0438\u0442\u0430\u044E\u0442\u0441\u044F \u043D\u0438\u0436\u0435
+loadAppEnv(fileURLToPath(new URL('..', import.meta.url)))
+
 await serveApp(app, {
 ${assets}  configure: config.server?.configure,
   host: process.env.HOST,
@@ -225,6 +233,7 @@ function buildApp(options) {
     const { mode = "production" } = options;
     process.env["NODE_ENV"] = mode;
     const root = path2.resolve(options.root);
+    loadAppEnv(root);
     const { config, configPath } = yield loadAppConfig(root);
     const port = resolvePort((_a = config.server) == null ? void 0 : _a.port);
     const base = (_b = options.base) != null ? _b : "";
@@ -309,7 +318,9 @@ function bannerLines(facts2) {
     `${label("\u043B\u043E\u043A\u0430\u043B\u044C\u043D\u043E")}http://localhost:${port}`,
     ...network === void 0 ? [] : [`${label("\u0432 \u0441\u0435\u0442\u0438")}http://${network}:${port}`],
     `${label("\u0440\u0443\u0447\u043A\u0438")}${ENDPOINTS.join("   ")}`,
-    ...facts2.base === void 0 ? [] : [`${label("\u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B")}${facts2.base}`],
+    // Префикс печатается, только когда он есть: при относительной сборке артефакты идут с
+    // адреса самого приложения, а он уже назван строкой выше
+    ...facts2.base === void 0 || facts2.base === "" ? [] : [`${label("\u043F\u0440\u0435\u0444\u0438\u043A\u0441")}${facts2.base}`],
     `${label("\u0447\u0430\u043D\u043A\u0438")}${assetsSummary(facts2.assets)}`,
     `${label("\u0432\u044B\u0445\u043E\u0434\u044B")}${OUTPUTS.join(", ")}`,
     `${label("\u043F\u0440\u0430\u0432\u043A\u0438")}${facts2.watched.join(", ")}`,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@foxford/den",
-  "version": "3.2.0",
+  "version": "3.2.1",
   "description": "Den — декларативный метафреймворк Foxford (core runtime)",
   "keywords": [
     "foxford",
@@ -24,8 +24,8 @@
   },
   "dependencies": {
     "fastify": "^5.11.2",
-    "@foxford/logger": "^1.2.2",
-    "@foxford/ioc": "^1.1.2"
+    "@foxford/ioc": "^1.1.2",
+    "@foxford/logger": "^1.2.2"
   },
   "peerDependencies": {
     "vite": ">=5.0.0"
@@ -86,14 +86,16 @@
     "chunk-6FNC3XMI.js",
     "chunk-6QV4L6R2.cjs",
     "chunk-A6ZPAM6Z.cjs",
-    "chunk-BMI5HNGE.js",
     "chunk-C7BM4DGX.cjs",
     "chunk-E23E2VUC.js",
+    "chunk-KQAB6C6Q.cjs",
     "chunk-MCN4GFEQ.js",
-    "chunk-RRR2DJMN.cjs",
+    "chunk-RG7ZV5BD.js",
     "chunk-T5QVCXVB.cjs",
     "chunk-TPBI6TOU.js",
     "chunk-TPHJUDHG.js",
+    "chunk-UB3GCX73.cjs",
+    "chunk-URSWYSZF.js",
     "chunk-WBHHHICS.js",
     "chunk-XOJ2VWX4.cjs",
     "chunk-Z5BL4DJA.cjs",
@@ -125,6 +127,6 @@
     "view-adapter-B4gEb-ms.d.ts",
     "view-adapter-DJ7yB6Ml.d.cts"
   ],
-  "sha": "c382a3d",
+  "sha": "57a2d9b",
   "scripts": {}
 }

package/serve/index.cjs

@@ -1,5 +1,8 @@
 "use strict";Object.defineProperty(exports, "__esModule", {value: true}); function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+var _chunkKQAB6C6Qcjs = require('../chunk-KQAB6C6Q.cjs');
+
+
 
 
 var _chunkZOU6W6ZQcjs = require('../chunk-ZOU6W6ZQ.cjs');
@@ -184,4 +187,5 @@ function serveApp(_0) {
 
 
 
-exports.appPlugin = appPlugin; exports.registerAssets = registerAssets; exports.serveApp = serveApp;
+
+exports.appPlugin = appPlugin; exports.loadAppEnv = _chunkKQAB6C6Qcjs.loadAppEnv; exports.registerAssets = registerAssets; exports.serveApp = serveApp;

package/serve/index.d.cts

@@ -41,6 +41,15 @@ interface AppPluginOptions {
  */
 declare const appPlugin: FastifyPluginAsync<AppPluginOptions>;
 
+/**
+ * Кладёт умолчания из `<root>/.env` в окружение процесса.
+ *
+ * Отсутствие файла — норма, а не отказ: он локальный и в репозиторий не попадает.
+ *
+ * @param root - Корень приложения
+ */
+declare function loadAppEnv(root: string): void;
+
 /** Настройки инстанса. */
 interface ServeAppOptions {
     /** Порт; `0` — свободный, фактический смотри в `server.addresses()`. */
@@ -79,4 +88,4 @@ interface ServeAppOptions {
  */
 declare function serveApp(app: ServableApp, options?: ServeAppOptions): Promise<FastifyInstance>;
 
-export { type AppAssetsSource, type AppPluginOptions, type ServableApp, type ServeAppOptions, appPlugin, registerAssets, serveApp };
+export { type AppAssetsSource, type AppPluginOptions, type ServableApp, type ServeAppOptions, appPlugin, loadAppEnv, registerAssets, serveApp };

package/serve/index.d.ts

@@ -41,6 +41,15 @@ interface AppPluginOptions {
  */
 declare const appPlugin: FastifyPluginAsync<AppPluginOptions>;
 
+/**
+ * Кладёт умолчания из `<root>/.env` в окружение процесса.
+ *
+ * Отсутствие файла — норма, а не отказ: он локальный и в репозиторий не попадает.
+ *
+ * @param root - Корень приложения
+ */
+declare function loadAppEnv(root: string): void;
+
 /** Настройки инстанса. */
 interface ServeAppOptions {
     /** Порт; `0` — свободный, фактический смотри в `server.addresses()`. */
@@ -79,4 +88,4 @@ interface ServeAppOptions {
  */
 declare function serveApp(app: ServableApp, options?: ServeAppOptions): Promise<FastifyInstance>;
 
-export { type AppAssetsSource, type AppPluginOptions, type ServableApp, type ServeAppOptions, appPlugin, registerAssets, serveApp };
+export { type AppAssetsSource, type AppPluginOptions, type ServableApp, type ServeAppOptions, appPlugin, loadAppEnv, registerAssets, serveApp };

package/serve/index.js

@@ -1,3 +1,6 @@
+import {
+  loadAppEnv
+} from "../chunk-RG7ZV5BD.js";
 import {
   matchRoute,
   normalizeRoutes,
@@ -182,6 +185,7 @@ function serveApp(_0) {
 }
 export {
   appPlugin,
+  loadAppEnv,
   registerAssets,
   serveApp
 };