arcway 0.4.16 → 0.4.18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "arcway",
-  "version": "0.4.16",
+  "version": "0.4.18",
   "description": "A convention-based framework for building modular monoliths with strict domain boundaries.",
   "license": "MIT",
   "type": "module",

package/server/config/modules/database.js

@@ -1,4 +1,5 @@
 import path from 'node:path';
+import { normalizePort } from '../port.js';
 
 const DEFAULTS = {
   sqliteFilename: '.build/db/arcway.db',
@@ -15,6 +16,12 @@ function resolve(config, { rootDir } = {}) {
   const db = { ...DEFAULTS, ...config.database };
   // Resolve friendly client names to actual knex driver names
   db.client = CLIENT_MAP[db.client] ?? db.client;
+  if (db.connection && typeof db.connection === 'object' && db.connection.port !== undefined) {
+    db.connection = {
+      ...db.connection,
+      port: normalizePort(db.connection.port, 'database.connection.port'),
+    };
+  }
   if (db.dir && !path.isAbsolute(db.dir)) {
     db.dir = path.resolve(rootDir, db.dir);
   }

package/server/config/modules/mail.js

@@ -1,4 +1,5 @@
 import { normalizeDurationDays, normalizeDurationSeconds } from '../duration.js';
+import { normalizePort } from '../port.js';
 
 const DEFAULTS = {
   driver: 'console',
@@ -8,6 +9,12 @@ const DEFAULTS = {
 function resolve(config) {
   if (!config.mail) return config;
   const mail = { ...DEFAULTS, ...config.mail };
+  if (mail.smtp?.port !== undefined) {
+    mail.smtp = {
+      ...mail.smtp,
+      port: normalizePort(mail.smtp.port, 'mail.smtp.port'),
+    };
+  }
   if (mail.inbound?.imap?.pollIntervalSeconds !== undefined) {
     mail.inbound.imap.pollIntervalSeconds = normalizeDurationSeconds(
       mail.inbound.imap.pollIntervalSeconds,

package/server/config/modules/pages.js

@@ -72,6 +72,13 @@ function resolve(config, { rootDir } = {}) {
       ...(hmr ? { hmr } : {}),
     },
   };
+  if (
+    pages.language != null &&
+    (typeof pages.language !== 'string' ||
+      !/^[A-Za-z]{2,3}(?:-[A-Za-z0-9]{2,8})*$/.test(pages.language))
+  ) {
+    throw new TypeError('Invalid config: pages.language must be a valid language tag');
+  }
   if (pages.rewrite != null) {
     if (
       typeof pages.rewrite !== 'object' ||

package/server/config/modules/session.js

@@ -1,14 +1,15 @@
 import { resolveSessionConfig } from '../../session/index.js';
 
 function resolve(config, { mode } = {}) {
-  if (!config.session) return config;
+  if (config.session === false) return { ...config, session: undefined };
   const vaultSession = config.vault?.values?.session;
+  if (config.session == null && !vaultSession) return config;
   const sessionKeyring = config.vault?.keyring?.map((entry) => ({
     id: entry.id,
     password: entry.secrets.session,
   }));
   const sessionInput = {
-    ...config.session,
+    ...(config.session ?? {}),
     password: vaultSession,
     keyring: sessionKeyring,
   };

package/server/config/port.js

@@ -0,0 +1,10 @@
+function normalizePort(value, name) {
+  if (value === undefined || value === null || value === '') return value;
+  const port = typeof value === 'string' && /^\d+$/.test(value) ? Number(value) : value;
+  if (!Number.isInteger(port) || port < 1 || port > 65535) {
+    throw new TypeError(`Invalid config: ${name} must be an integer from 1 to 65535`);
+  }
+  return port;
+}
+
+export { normalizePort };

package/server/pages/handler.js

@@ -35,6 +35,7 @@ function createPagesHandler(options) {
   let manifestPath = path.join(outDir, 'pages-manifest.json');
   const sessionConfig = options.session;
   const appContext = options.appContext ?? null;
+  const documentLanguage = options.documentLanguage;
   const rewrite = options.rewrite ?? null;
   const mode = options.mode ?? 'production';
   const devMode = mode === 'development';
@@ -141,6 +142,7 @@ function createPagesHandler(options) {
         manifest,
         cacheVersion,
         projectReact,
+        documentLanguage,
       );
     } else if (!res.headersSent) {
       res.writeHead(500, getHtmlHeaders());
@@ -225,6 +227,7 @@ function createPagesHandler(options) {
           componentCache,
           cacheVersion,
           projectReact,
+          documentLanguage,
         );
         return true;
       }
@@ -315,6 +318,7 @@ function createPagesHandler(options) {
           status: loaderResult?.status,
           headers: loaderResult?.headers,
         },
+        documentLanguage,
       );
     } catch (err) {
       await renderRuntimeError(err, res);
@@ -333,6 +337,7 @@ function createPagesHandler(options) {
           manifest,
           cacheVersion,
           projectReact,
+          documentLanguage,
         );
       } else {
         res.writeHead(404, getHtmlHeaders());
@@ -363,6 +368,7 @@ async function renderDevBuildError(
   componentCache,
   cacheVersion,
   projectReact,
+  documentLanguage,
 ) {
   const errorMessage = err instanceof Error ? err.stack || err.message : String(err);
   if (manifest.errorBundle && !res.headersSent) {
@@ -376,6 +382,7 @@ async function renderDevBuildError(
       manifest,
       cacheVersion,
       projectReact,
+      documentLanguage,
     );
     return;
   }

package/server/pages/pages-router.js

@@ -55,6 +55,7 @@ class PagesRouter {
       ...(isDev ? { outDir } : { resolveOutDir }),
       session: config.session,
       appContext: this.appContext,
+      documentLanguage: config.pages?.language,
       rewrite: config.pages?.rewrite,
       mode,
       viteDev,

package/server/pages/ssr.js

@@ -130,10 +130,18 @@ window.__vite_plugin_react_preamble_installed__ = true;
     `<script type="module" src="${route.clientBundle}"></script>`,
   ].join('\n');
 }
-function buildHtmlShell({ headHtml, fontPreloadTags, cssLinkTag, bodysuffix }) {
+function buildHtmlShell({
+  headHtml,
+  fontPreloadTags,
+  cssLinkTag,
+  bodysuffix,
+  documentLanguage,
+}) {
+  const languageAttribute = documentLanguage ? ` lang="${documentLanguage}"` : '';
+
   return {
     head: `<!DOCTYPE html>
-<html>
+<html${languageAttribute}>
 <head>
 <meta charset="utf-8" />
 <meta name="viewport" content="width=device-width, initial-scale=1, viewport-fit=cover" />
@@ -165,6 +173,7 @@ async function renderPage(
   onRenderFailure = null,
   pageProps = params,
   response = {},
+  documentLanguage,
 ) {
   const { createElement, renderToPipeableStream } = react;
   const bundlePath = path.join(outDir, route.serverBundle);
@@ -243,6 +252,7 @@ async function renderPage(
 ${hmrTag}
 ${scriptTags}
 ${liveReloadTag}`,
+        documentLanguage,
       });
       res.write(shell.head);
       pass = new PassThrough();
@@ -310,6 +320,7 @@ async function renderErrorPage(
   manifest,
   cacheVersion,
   react,
+  documentLanguage,
 ) {
   const { createElement, renderToPipeableStream } = react;
   const fullPath = path.join(outDir, bundlePath);
@@ -349,7 +360,12 @@ async function renderErrorPage(
       if (res.headersSent || closed) return;
       const headHtml = renderHeadToString(headData);
       res.writeHead(statusCode, getHtmlHeaders());
-      const shell = buildHtmlShell({ headHtml, fontPreloadTags, cssLinkTag });
+      const shell = buildHtmlShell({
+        headHtml,
+        fontPreloadTags,
+        cssLinkTag,
+        documentLanguage,
+      });
       res.write(shell.head);
       pass = new PassThrough();
       pass.on('data', (chunk) => {

package/server/pages/vite-dev.js

@@ -224,7 +224,7 @@ function getViteServerOptions(config, hmrServer) {
   const hmr = config?.pages?.vite?.hmr;
   return {
     middlewareMode: true,
-    ...(hmr ? { hmr: { ...hmr, ...(hmrServer ? { server: hmrServer } : {}) } } : {}),
+    hmr: { ...hmr, server: hmrServer },
   };
 }
 
@@ -239,7 +239,7 @@ async function createViteHmrServer(log, { host = '0.0.0.0', port = 24678 } = {})
 
 async function createViteDevRouter({ rootDir, log, config }) {
   const appAliases = resolveAppAliases(rootDir);
-  const hmrServer = config?.pages?.vite?.hmr ? await createViteHmrServer(log) : null;
+  const hmrServer = await createViteHmrServer(log);
   let vite;
   try {
     vite = await createViteServer({