@ossy/platform 1.36.1 → 1.36.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ossy/platform",
-  "version": "1.36.1",
+  "version": "1.36.2",
   "description": "Ossy application server runtime",
   "repository": {
     "type": "git",
@@ -38,13 +38,13 @@
     "@aws-sdk/s3-request-presigner": "^3.1057.0",
     "@aws-sdk/util-create-request": "^3.972.26",
     "@aws-sdk/util-format-url": "^3.972.17",
-    "@ossy/event-store": "^1.5.1",
-    "@ossy/observability": "^1.5.1",
-    "@ossy/policies": "^1.10.1",
-    "@ossy/router": "^1.37.1",
-    "@ossy/sdk": "^1.37.1",
-    "@ossy/tokens": "^1.10.1",
-    "@ossy/users": "^1.10.1",
+    "@ossy/event-store": "^1.5.2",
+    "@ossy/observability": "^1.5.2",
+    "@ossy/policies": "^1.10.2",
+    "@ossy/router": "^1.37.2",
+    "@ossy/sdk": "^1.37.2",
+    "@ossy/tokens": "^1.10.2",
+    "@ossy/users": "^1.10.2",
     "cookie-parser": "^1.4.7",
     "dotenv": ">=16.0.0 <18.0.0",
     "express": ">=5.0.0 <6.0.0",
@@ -62,5 +62,5 @@
     "src",
     "Dockerfile"
   ],
-  "gitHead": "d5b71d16ec56c819401c7a74f95d12b2347ca3c4"
+  "gitHead": "723d9d35aba3cd43700ecd6e72a7e7de96acff65"
 }

package/src/server.js

@@ -17,6 +17,7 @@ import { createLogger } from '@ossy/observability'
 import { ConfigService } from './config.service.js'
 import { UsersMiddleware } from './users.middleware.js'
 import { WorkspacesMiddleware } from './workspaces.middleware.js'
+import { matchesGlob } from './tasks/glob.js'
 
 const log = createLogger('@ossy/platform')
 
@@ -61,8 +62,8 @@ export function loadManifest (buildDir) {
   const integrations = Array.isArray(manifest.integrations) ? manifest.integrations : []
   const startups = Array.isArray(manifest.startups) ? manifest.startups : []
   const actions = Array.isArray(manifest.actions) ? manifest.actions : []
-  for (const e of entries) {
-    if ((e.type === 'page' || e.type === 'api') && !validRoutable(e)) {
+  const layouts = Array.isArray(manifest.layouts) ? manifest.layouts : []
+  for (const e of entries) {    if ((e.type === 'page' || e.type === 'api') && !validRoutable(e)) {
       log.warn(`Skipping ${e.type} "${e.id}" — manifest entry has no path.`)
     }
   }
@@ -77,6 +78,7 @@ export function loadManifest (buildDir) {
     integrations,
     startups,
     actions,
+    layouts,
     config: manifest.config || {},
   }
 }
@@ -107,7 +109,6 @@ export async function startServer (options = {}) {
 
   const manifest = loadManifest(buildDir)
   const config = manifest.config
-
   for (const task of manifest.tasks ?? []) {
     try {
       const mod = await import(resolveEntryUrl(task.entry, buildDir))
@@ -176,6 +177,41 @@ export async function startServer (options = {}) {
     }
   }
 
+  // Layout loading — import each bundled layout module and store the default-
+  // exported React component in a map keyed by the layout's id. At render
+  // time we pick the first layout whose `applies` glob matches the page path.
+  const layoutModuleMap = new Map()
+  for (const layoutEntry of manifest.layouts ?? []) {
+    try {
+      const mod = await import(resolveEntryUrl(layoutEntry.entry, buildDir))
+      if (typeof mod.default === 'function') {
+        layoutModuleMap.set(layoutEntry.id, { component: mod.default, applies: layoutEntry.applies ?? '*' })
+      }
+    } catch (err) {
+      log.warn(`Failed to load layout "${layoutEntry.id}"`, undefined, err)
+    }
+  }
+
+  function findLayoutForPage (pagePathOrPaths) {
+    if (!layoutModuleMap.size) return null
+    const paths = typeof pagePathOrPaths === 'string'
+      ? [pagePathOrPaths]
+      : Object.values(pagePathOrPaths || {})
+    // Check specific (non-wildcard) layouts first, then fall back to catch-all '*'.
+    // This lets e.g. `applies: '/'` override a global `applies: '*'` layout.
+    let catchAll = null
+    for (const [, layout] of layoutModuleMap) {
+      if (layout.applies === '*') {
+        if (!catchAll) catchAll = layout.component
+        continue
+      }
+      for (const p of paths) {
+        if (matchesGlob(layout.applies, p)) return layout.component
+      }
+    }
+    return catchAll
+  }
+
   // Register the SDK so all tasks receive it as `sdk`.
   // Priority: explicit options.sdk → SDK.of() from env vars → null (direct-DB fallback in tasks).
   const botSdk = (process.env.API_URL && process.env.OSSY_API_KEY)
@@ -288,6 +324,7 @@ export async function startServer (options = {}) {
           res.status(503).type('text').send('SSR runtime unavailable')
           return
         }
+        const Layout = findLayoutForPage(pageEntry.path)
         const props = {
           ...config,
           ...(req.userAppSettings || {}),
@@ -299,6 +336,7 @@ export async function startServer (options = {}) {
           pages: manifest.pages.map((page) => ({ id: page.id, path: page.path })),
           pageId: pageRoute.id,
           componentEntries: manifest.components,
+          Layout: Layout ?? null,
         }
         const html = await mod.render(props)
         res.status(200).type('html').send(html)