metaowl 0.2.10 → 0.2.11

package/modules/app-mounter.js

@@ -7,6 +7,7 @@
  */
 import { mount } from '@odoo/owl'
 import { mergeTemplates } from './templates-manager.js'
+import { resolveLayout, getLayout, mountWithLayout } from './layouts.js'
 
 const _defaults = {
   warnIfNoStaticProps: true,
@@ -43,5 +44,18 @@ export async function mountApp(route) {
   const mountElement = document.getElementById('metaowl')
   mountElement.innerHTML = ''
 
-  await mount(route[0].component, mountElement, { ..._config, templates })
+  const pageComponent = route[0].component
+  const pagePath = route[0].path
+
+  // Check for layout
+  const layoutName = resolveLayout(pageComponent, pagePath)
+  const LayoutClass = getLayout(layoutName)
+
+  if (LayoutClass) {
+    // Mount with layout
+    await mountWithLayout(pageComponent, mountElement, { routePath: pagePath, templates })
+  } else {
+    // Mount without layout
+    await mount(pageComponent, mountElement, { ..._config, templates })
+  }
 }

package/modules/layouts.js

@@ -272,7 +272,7 @@ export function createLayoutWrapper(layoutComponent, pageComponent, props = {})
  * @returns {Promise<Component>} Mounted component instance
  */
 export async function mountWithLayout(pageComponent, target, options = {}, config = {}) {
-  const { routePath, props = {} } = options
+  const { routePath, props = {}, templates } = options
 
   const layoutName = resolveLayout(pageComponent, routePath)
   const LayoutClass = getLayout(layoutName)
@@ -280,14 +280,14 @@ export async function mountWithLayout(pageComponent, target, options = {}, confi
   if (!LayoutClass) {
     console.warn(`[metaowl] Layout "${layoutName}" not found, mounting page without layout`)
     const { mount } = await import('@odoo/owl')
-    return mount(pageComponent, target, { ...config, props })
+    return mount(pageComponent, target, { ...config, props, templates })
   }
 
   // Create wrapper that combines layout and page
   const WrapperClass = createLayoutWrapper(LayoutClass, pageComponent, props)
 
   const { mount } = await import('@odoo/owl')
-  const instance = await mount(WrapperClass, target, config)
+  const instance = await mount(WrapperClass, target, { ...config, templates })
 
   _currentLayout = instance
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "metaowl",
-  "version": "0.2.10",
+  "version": "0.2.11",
   "description": "Lightweight meta-framework for Odoo OWL — file-based routing, app mounting, Fetch helper, Cache, Meta tags, SSG generator, and a Vite plugin.",
   "type": "module",
   "main": "index.js",

package/vite/plugin.js

@@ -187,10 +187,14 @@ export async function metaowlPlugin(options = {}) {
       transform(code, id) {
         if (!id.endsWith('/metaowl.js')) return
         const pagesRel = pagesDir.replace(new RegExp(`^${root}[\\/]`), '')
+        const layoutsRel = layoutsDir.replace(new RegExp(`^${root}[\\/]`), '')
         return {
           code: code.replace(
             /boot\(\s*\)/,
             `boot(import.meta.glob('./${pagesRel}/**/*.js', { eager: true }))`
+          ).replace(
+            /discoverLayouts\(\s*\)/,
+            `discoverLayouts(import.meta.glob('./${layoutsRel}/**/*.js', { eager: true }))`
           ),
           map: null
         }