@foxford/den 3.1.0 → 3.1.2

package/{chunk-KJ6NDOOL.js → chunk-3RX2OSUL.js}

@@ -9,26 +9,6 @@ var SlotRegistryToken = createToken("core:SlotRegistry");
 var ActivatableToken = createToken("core:Activatable");
 var RequestContextToken = createToken("core:RequestContext");
 
-// src/logger.ts
-import { createToken as createToken2 } from "@foxford/ioc";
-import { log } from "@foxford/logger";
-var logger = log.getLogger("@foxford/den");
-var LoggerToken = createToken2("den:Logger");
-function scopeLogger(container) {
-  if (container.has(LoggerToken)) {
-    const resolved = container.resolve(LoggerToken);
-    if (!(resolved instanceof Promise)) {
-      return resolved;
-    }
-  }
-  return logger;
-}
-function unitLogger(container, name) {
-  var _a;
-  const base = scopeLogger(container);
-  return (_a = base.getLogger(name)) != null ? _a : base;
-}
-
 export {
   ContainerManagerToken,
   GuardRunnerToken,
@@ -37,9 +17,5 @@ export {
   StateRegistryToken,
   SlotRegistryToken,
   ActivatableToken,
-  RequestContextToken,
-  logger,
-  LoggerToken,
-  scopeLogger,
-  unitLogger
+  RequestContextToken
 };

package/{chunk-HJO26HIQ.js → chunk-6FNC3XMI.js}

@@ -1,4 +1,6 @@
 var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
 var __getOwnPropSymbols = Object.getOwnPropertySymbols;
 var __hasOwnProp = Object.prototype.hasOwnProperty;
 var __propIsEnum = Object.prototype.propertyIsEnumerable;
@@ -14,6 +16,7 @@ var __spreadValues = (a, b) => {
     }
   return a;
 };
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
 var __async = (__this, __arguments, generator) => {
   return new Promise((resolve, reject) => {
     var fulfilled = (value) => {
@@ -37,5 +40,6 @@ var __async = (__this, __arguments, generator) => {
 
 export {
   __spreadValues,
+  __spreadProps,
   __async
 };

package/{chunk-CZVYVNLI.cjs → chunk-6QV4L6R2.cjs}

@@ -9,25 +9,7 @@ var SlotRegistryToken = _ioc.createToken.call(void 0, "core:SlotRegistry");
 var ActivatableToken = _ioc.createToken.call(void 0, "core:Activatable");
 var RequestContextToken = _ioc.createToken.call(void 0, "core:RequestContext");
 
-// src/logger.ts
 
-var _logger = require('@foxford/logger');
-var logger = _logger.log.getLogger("@foxford/den");
-var LoggerToken = _ioc.createToken.call(void 0, "den:Logger");
-function scopeLogger(container) {
-  if (container.has(LoggerToken)) {
-    const resolved = container.resolve(LoggerToken);
-    if (!(resolved instanceof Promise)) {
-      return resolved;
-    }
-  }
-  return logger;
-}
-function unitLogger(container, name) {
-  var _a;
-  const base = scopeLogger(container);
-  return (_a = base.getLogger(name)) != null ? _a : base;
-}
 
 
 
@@ -36,10 +18,4 @@ function unitLogger(container, name) {
 
 
 
-
-
-
-
-
-
-exports.ContainerManagerToken = ContainerManagerToken; exports.GuardRunnerToken = GuardRunnerToken; exports.NavigationManagerToken = NavigationManagerToken; exports.StateSerializerToken = StateSerializerToken; exports.StateRegistryToken = StateRegistryToken; exports.SlotRegistryToken = SlotRegistryToken; exports.ActivatableToken = ActivatableToken; exports.RequestContextToken = RequestContextToken; exports.logger = logger; exports.LoggerToken = LoggerToken; exports.scopeLogger = scopeLogger; exports.unitLogger = unitLogger;
+exports.ContainerManagerToken = ContainerManagerToken; exports.GuardRunnerToken = GuardRunnerToken; exports.NavigationManagerToken = NavigationManagerToken; exports.StateSerializerToken = StateSerializerToken; exports.StateRegistryToken = StateRegistryToken; exports.SlotRegistryToken = SlotRegistryToken; exports.ActivatableToken = ActivatableToken; exports.RequestContextToken = RequestContextToken;

package/chunk-A6ZPAM6Z.cjs

@@ -0,0 +1,26 @@
+"use strict";Object.defineProperty(exports, "__esModule", {value: true});// src/logger.ts
+var _ioc = require('@foxford/ioc');
+var _logger = require('@foxford/logger');
+var logger = _logger.log.getLogger("@foxford/den");
+var LoggerToken = _ioc.createToken.call(void 0, "den:Logger");
+function scopeLogger(container) {
+  if (container.has(LoggerToken)) {
+    const resolved = container.resolve(LoggerToken);
+    if (!(resolved instanceof Promise)) {
+      return resolved;
+    }
+  }
+  return logger;
+}
+function unitLogger(container, name) {
+  var _a;
+  const base = scopeLogger(container);
+  return (_a = base.getLogger(name)) != null ? _a : base;
+}
+
+
+
+
+
+
+exports.logger = logger; exports.LoggerToken = LoggerToken; exports.scopeLogger = scopeLogger; exports.unitLogger = unitLogger;

package/chunk-LW7IN57F.cjs

@@ -0,0 +1,358 @@
+"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 _chunkA6ZPAM6Zcjs = require('./chunk-A6ZPAM6Z.cjs');
+
+
+
+
+var _chunkT5QVCXVBcjs = require('./chunk-T5QVCXVB.cjs');
+
+// src/builder/config.ts
+function defineAppConfig(config) {
+  return config;
+}
+
+// src/builder/build.ts
+var _fs = require('fs'); var _fs2 = _interopRequireDefault(_fs);
+var _path = require('path'); var _path2 = _interopRequireDefault(_path);
+
+// src/builder/assets.ts
+
+
+var MANIFEST_PATH = ".vite/manifest.json";
+function readManifest(outDir) {
+  const manifestPath = _path2.default.join(outDir, MANIFEST_PATH);
+  if (!_fs2.default.existsSync(manifestPath)) {
+    return null;
+  }
+  return JSON.parse(_fs2.default.readFileSync(manifestPath, "utf-8"));
+}
+function collectAssets(outDir, base) {
+  const manifest = readManifest(outDir);
+  if (manifest === null) {
+    return { css: [], js: [] };
+  }
+  const css = [];
+  const js = [];
+  const seen = /* @__PURE__ */ new Set();
+  const prefix = base.endsWith("/") ? base : `${base}/`;
+  function walk(key) {
+    var _a, _b;
+    if (seen.has(key)) {
+      return;
+    }
+    seen.add(key);
+    const chunk = manifest == null ? void 0 : manifest[key];
+    if (!chunk) {
+      return;
+    }
+    for (const imported of (_a = chunk.imports) != null ? _a : []) {
+      walk(imported);
+    }
+    for (const href of (_b = chunk.css) != null ? _b : []) {
+      css.push(`${prefix}${href}`);
+    }
+    js.push(`${prefix}${chunk.file}`);
+  }
+  for (const [key, chunk] of Object.entries(manifest)) {
+    if (chunk.isEntry === true) {
+      walk(key);
+    }
+  }
+  return { css, js };
+}
+
+// src/builder/entries.ts
+var VIRTUAL_CLIENT = "virtual:den/client";
+var VIRTUAL_SERVER_APP = "virtual:den/server-app";
+var VIRTUAL_SERVER_PROCESS = "virtual:den/server-process";
+var DEFAULT_PORT = 3e3;
+function toResolvedId(id) {
+  return `\0${id}`;
+}
+function generateClientEntry(entry, clientEntry) {
+  return `import app from ${JSON.stringify(entry)}
+import { hydrateApp } from ${JSON.stringify(clientEntry)}
+
+hydrateApp(app)
+`;
+}
+function generateServerApp(entry, configPath, assets) {
+  return `import { getAppContainer, viewAdapterOf } from '@foxford/den/island'
+
+import app from ${JSON.stringify(entry)}
+import config from ${JSON.stringify(configPath)}
+
+const server = config.server ?? {}
+
+async function setup() {
+  viewAdapterOf(app.viewLayer).installResolver()
+  server.container?.(getAppContainer())
+  await server.setup?.()
+}
+
+const descriptor = { ...app, assets: ${JSON.stringify(assets)}, setup }
+
+if (server.render) {
+  descriptor.serverRender = server.render
+}
+
+export default descriptor
+`;
+}
+function generateServerProcess(configPath) {
+  return `import { serveApp } from '@foxford/den/serve'
+
+import app from ${JSON.stringify(VIRTUAL_SERVER_APP)}
+import config from ${JSON.stringify(configPath)}
+
+await serveApp(app, {
+  configure: config.server?.configure,
+  host: process.env.HOST,
+  port: Number(process.env.PORT ?? ${String(DEFAULT_PORT)}),
+})
+`;
+}
+
+// src/builder/plugin.ts
+function denAppModules(options) {
+  const { assets, config, configPath, entry } = options;
+  const sources = {
+    [VIRTUAL_CLIENT]: () => generateClientEntry(entry, config.preset.clientEntry),
+    [VIRTUAL_SERVER_APP]: () => generateServerApp(entry, configPath, assets),
+    [VIRTUAL_SERVER_PROCESS]: () => generateServerProcess(configPath)
+  };
+  return {
+    load: (id) => {
+      for (const [virtual, source] of Object.entries(sources)) {
+        if (id === toResolvedId(virtual)) {
+          return source();
+        }
+      }
+      return null;
+    },
+    name: "den:app-modules",
+    resolveId: (id) => id in sources ? toResolvedId(id) : null
+  };
+}
+
+// src/builder/build.ts
+var CONFIG_FILE = "den.config.ts";
+var OUT_ROOT = "build";
+var OUT_CLIENT = "build/client";
+var OUT_SERVER = "build/server";
+var ENGINE = /^@foxford\/den(\/|$)/;
+function loadAppConfig(root) {
+  return _chunkT5QVCXVBcjs.__async.call(void 0, this, null, function* () {
+    const configPath = _path2.default.join(root, CONFIG_FILE);
+    if (!_fs2.default.existsSync(configPath)) {
+      throw new Error(`den: ${CONFIG_FILE} \u043D\u0435 \u043D\u0430\u0439\u0434\u0435\u043D \u0432 \xAB${root}\xBB`);
+    }
+    const { createServer } = yield Promise.resolve().then(() => _interopRequireWildcard(require("vite")));
+    const server = yield createServer({
+      appType: "custom",
+      configFile: false,
+      logLevel: "silent",
+      root,
+      server: { middlewareMode: true }
+    });
+    try {
+      const loaded = yield server.ssrLoadModule(configPath);
+      const config = loaded.default;
+      if (!(config == null ? void 0 : config.preset)) {
+        throw new Error(`den: ${CONFIG_FILE} \u043D\u0435 \u043E\u0431\u044A\u044F\u0432\u043B\u044F\u0435\u0442 \u043F\u0440\u0435\u0441\u0435\u0442 \u0444\u0440\u0435\u0439\u043C\u0432\u043E\u0440\u043A\u0430 \u2014 \u0441\u043E\u0431\u0438\u0440\u0430\u0442\u044C \u043D\u0435\u0447\u0435\u043C`);
+      }
+      return { config, configPath };
+    } finally {
+      yield server.close();
+    }
+  });
+}
+function dependenciesOf(root) {
+  var _a, _b;
+  const manifestPath = _path2.default.join(root, "package.json");
+  if (!_fs2.default.existsSync(manifestPath)) {
+    return [];
+  }
+  const manifest = JSON.parse(_fs2.default.readFileSync(manifestPath, "utf-8"));
+  return [...Object.keys((_a = manifest.dependencies) != null ? _a : {}), ...Object.keys((_b = manifest.devDependencies) != null ? _b : {})];
+}
+function viteConfigFor(options) {
+  var _a, _b, _c;
+  const { assets, base, config, configPath, entryFileNames, input, mode, outDir, root, target } = options;
+  const entry = (_a = config.entry) != null ? _a : "src/index.ts";
+  const composed = {
+    base,
+    build: {
+      // Клиентский выход чистит свой каталог сам, серверные — нет: они пишут рядом с уже
+      // собранным клиентским, и очистка снесла бы его вместе с манифестом
+      emptyOutDir: target === "client",
+      manifest: target === "client",
+      outDir: _path2.default.join(root, outDir),
+      // Вход задаётся `input`, а не `build.ssr`: строку в `build.ssr` сборщик понимает как путь
+      // к файлу, а входы у нас виртуальные — их резолвит плагин
+      rollupOptions: _chunkT5QVCXVBcjs.__spreadValues.call(void 0, _chunkT5QVCXVBcjs.__spreadValues.call(void 0, {
+        input
+      }, target === "server" ? { external: [ENGINE] } : {}), entryFileNames === void 0 ? {} : { output: { entryFileNames } }),
+      ssr: target === "server"
+    },
+    configFile: false,
+    // Режим объявляем явно: плагины сборщика выбирают по нему рантайм фреймворка, а через
+    // программный вызов он иначе не доедет.
+    mode,
+    plugins: [...config.preset.plugins, denAppModules({ assets, config, configPath, entry: _path2.default.join(root, entry) })],
+    root,
+    ssr: { noExternal: (_c = (_b = config.server) == null ? void 0 : _b.noExternal) != null ? _c : [] }
+  };
+  return config.vite ? config.vite(composed, target) : composed;
+}
+function buildApp(options) {
+  return _chunkT5QVCXVBcjs.__async.call(void 0, this, null, function* () {
+    var _a, _b;
+    const { base = "/", mode = "production" } = options;
+    process.env["NODE_ENV"] = mode;
+    const root = _path2.default.resolve(options.root);
+    const { config, configPath } = yield loadAppConfig(root);
+    const refusal = (_b = (_a = config.preset).validate) == null ? void 0 : _b.call(_a, dependenciesOf(root));
+    if (refusal !== void 0 && refusal !== null) {
+      throw new Error(`den: ${refusal}`);
+    }
+    const { build } = yield Promise.resolve().then(() => _interopRequireWildcard(require("vite")));
+    const shared = { base, config, configPath, mode, root };
+    const empty = { css: [], js: [] };
+    _chunkA6ZPAM6Zcjs.logger.info(`\u0441\u0431\u043E\u0440\u043A\u0430 \u043A\u043B\u0438\u0435\u043D\u0442\u0441\u043A\u043E\u0433\u043E \u0432\u044B\u0445\u043E\u0434\u0430 (${config.preset.view})`);
+    yield build(viteConfigFor(_chunkT5QVCXVBcjs.__spreadProps.call(void 0, _chunkT5QVCXVBcjs.__spreadValues.call(void 0, {}, shared), { assets: empty, input: VIRTUAL_CLIENT, outDir: OUT_CLIENT, target: "client" })));
+    const assets = collectAssets(_path2.default.join(root, OUT_CLIENT), base);
+    _chunkA6ZPAM6Zcjs.logger.info(`\u0430\u0440\u0442\u0435\u0444\u0430\u043A\u0442\u044B: ${String(assets.js.length)} js, ${String(assets.css.length)} css`);
+    _chunkA6ZPAM6Zcjs.logger.info("\u0441\u0431\u043E\u0440\u043A\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u043D\u043E\u0433\u043E \u0434\u0435\u0441\u043A\u0440\u0438\u043F\u0442\u043E\u0440\u0430");
+    yield build(
+      viteConfigFor(_chunkT5QVCXVBcjs.__spreadProps.call(void 0, _chunkT5QVCXVBcjs.__spreadValues.call(void 0, {}, shared), {
+        assets,
+        entryFileNames: "index.mjs",
+        input: VIRTUAL_SERVER_APP,
+        outDir: OUT_SERVER,
+        target: "server"
+      }))
+    );
+    _chunkA6ZPAM6Zcjs.logger.info("\u0441\u0431\u043E\u0440\u043A\u0430 \u0442\u043E\u0447\u043A\u0438 \u0432\u0445\u043E\u0434\u0430 \u043F\u0440\u043E\u0446\u0435\u0441\u0441\u0430");
+    yield build(
+      viteConfigFor(_chunkT5QVCXVBcjs.__spreadProps.call(void 0, _chunkT5QVCXVBcjs.__spreadValues.call(void 0, {}, shared), {
+        assets,
+        entryFileNames: "server.mjs",
+        input: VIRTUAL_SERVER_PROCESS,
+        outDir: OUT_ROOT,
+        target: "server"
+      }))
+    );
+  });
+}
+
+// src/builder/dev.ts
+var _child_process = require('child_process');
+
+
+var SERVER_ENTRY = "build/server.mjs";
+var WATCHED = ["src", "den.config.ts"];
+var DEBOUNCE_MS = 150;
+var SHUTDOWN_TIMEOUT_MS = 5e3;
+function devApp(options) {
+  return _chunkT5QVCXVBcjs.__async.call(void 0, this, null, function* () {
+    const root = _path2.default.resolve(options.root);
+    const entry = _path2.default.join(root, SERVER_ENTRY);
+    let child = null;
+    let pending = null;
+    let building = false;
+    let dirty = false;
+    function signalGroup(pid, signal) {
+      try {
+        process.kill(-pid, signal);
+      } catch (e) {
+      }
+    }
+    function stop() {
+      return _chunkT5QVCXVBcjs.__async.call(void 0, this, null, function* () {
+        const running = child;
+        child = null;
+        if (!running || running.exitCode !== null || running.pid === void 0) {
+          return;
+        }
+        const { pid } = running;
+        yield new Promise((resolve) => {
+          const forced = setTimeout(() => signalGroup(pid, "SIGKILL"), SHUTDOWN_TIMEOUT_MS);
+          running.once("exit", () => {
+            clearTimeout(forced);
+            resolve();
+          });
+          signalGroup(pid, "SIGTERM");
+        });
+      });
+    }
+    function start() {
+      const started = _child_process.spawn.call(void 0, process.execPath, [...process.execArgv, entry], {
+        detached: true,
+        stdio: "inherit"
+      });
+      child = started;
+      started.on("exit", (code, signal) => {
+        if (child !== started) {
+          return;
+        }
+        child = null;
+        _chunkA6ZPAM6Zcjs.logger.error(`\u043F\u0440\u043E\u0446\u0435\u0441\u0441 \u043F\u0440\u0438\u043B\u043E\u0436\u0435\u043D\u0438\u044F \u0437\u0430\u0432\u0435\u0440\u0448\u0438\u043B\u0441\u044F \u0441\u0430\u043C (\u043A\u043E\u0434 ${String(code)}, \u0441\u0438\u0433\u043D\u0430\u043B ${String(signal)})`);
+      });
+    }
+    function rebuild() {
+      return _chunkT5QVCXVBcjs.__async.call(void 0, this, null, function* () {
+        if (building) {
+          dirty = true;
+          return;
+        }
+        building = true;
+        try {
+          do {
+            dirty = false;
+            yield stop();
+            try {
+              yield buildApp(_chunkT5QVCXVBcjs.__spreadProps.call(void 0, _chunkT5QVCXVBcjs.__spreadValues.call(void 0, {}, options), { mode: "development" }));
+              start();
+            } catch (error) {
+              _chunkA6ZPAM6Zcjs.logger.error("\u0441\u0431\u043E\u0440\u043A\u0430 \u043D\u0435 \u043F\u0440\u043E\u0448\u043B\u0430, \u0436\u0434\u0443 \u043F\u0440\u0430\u0432\u043A\u0438:", error);
+            }
+          } while (dirty);
+        } finally {
+          building = false;
+        }
+      });
+    }
+    yield rebuild();
+    for (const target of WATCHED) {
+      const watched = _path2.default.join(root, target);
+      if (!_fs2.default.existsSync(watched)) {
+        continue;
+      }
+      _fs2.default.watch(watched, { recursive: true }, () => {
+        if (pending) {
+          clearTimeout(pending);
+        }
+        pending = setTimeout(() => void rebuild(), DEBOUNCE_MS);
+      });
+    }
+    _chunkA6ZPAM6Zcjs.logger.info(`\u0436\u0434\u0443 \u0438\u0437\u043C\u0435\u043D\u0435\u043D\u0438\u0439 \u0432 ${WATCHED.join(", ")}`);
+    for (const signal of ["SIGINT", "SIGTERM"]) {
+      process.once(signal, () => {
+        void stop().then(() => process.exit(0));
+      });
+    }
+    process.on("exit", () => {
+      if ((child == null ? void 0 : child.pid) !== void 0) {
+        signalGroup(child.pid, "SIGTERM");
+      }
+    });
+  });
+}
+
+
+
+
+
+exports.defineAppConfig = defineAppConfig; exports.buildApp = buildApp; exports.devApp = devApp;