webspresso 0.0.82 → 0.0.83

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "webspresso",
-  "version": "0.0.82",
+  "version": "0.0.83",
   "description": "Minimal, production-ready SSR framework for Node.js with file-based routing, Nunjucks templating, built-in i18n, and CLI tooling",
   "main": "index.js",
   "types": "index.d.ts",

package/plugins/admin-panel/app.js

@@ -227,28 +227,36 @@ function wrapCustomPageWithLayout(page, rawComp) {
 
   return {
     oninit: function(vnode) {
-      if (typeof rawComp.oninit === 'function') return rawComp.oninit.call(this, vnode);
+      vnode.state.instance = typeof rawComp === 'function' ? rawComp.call(this, vnode) : rawComp;
+      if (vnode.state.instance && typeof vnode.state.instance.oninit === 'function') {
+        return vnode.state.instance.oninit.call(this, vnode);
+      }
     },
     oncreate: function(vnode) {
-      if (typeof rawComp.oncreate === 'function') return rawComp.oncreate.call(this, vnode);
+      const comp = vnode.state.instance || rawComp;
+      if (comp && typeof comp.oncreate === 'function') return comp.oncreate.call(this, vnode);
     },
     onupdate: function(vnode) {
-      if (typeof rawComp.onupdate === 'function') return rawComp.onupdate.call(this, vnode);
+      const comp = vnode.state.instance || rawComp;
+      if (comp && typeof comp.onupdate === 'function') return comp.onupdate.call(this, vnode);
     },
     onbeforeremove: function(vnode) {
-      if (typeof rawComp.onbeforeremove === 'function') return rawComp.onbeforeremove.call(this, vnode);
+      const comp = vnode.state.instance || rawComp;
+      if (comp && typeof comp.onbeforeremove === 'function') return comp.onbeforeremove.call(this, vnode);
     },
     onremove: function(vnode) {
-      if (typeof rawComp.onremove === 'function') return rawComp.onremove.call(this, vnode);
+      const comp = vnode.state.instance || rawComp;
+      if (comp && typeof comp.onremove === 'function') return comp.onremove.call(this, vnode);
     },
     view: function(vnode) {
+      const comp = vnode.state.instance || rawComp;
       var content;
-      if (typeof rawComp.view === 'function') {
-        content = rawComp.view.call(this, vnode);
-      } else if (typeof rawComp === 'function') {
-        content = rawComp.call(this, vnode);
+      if (comp && typeof comp.view === 'function') {
+        content = comp.view.call(this, vnode);
+      } else if (typeof comp === 'function') {
+        content = comp.call(this, vnode);
       } else {
-        content = rawComp;
+        content = comp;
       }
       if (content && (content.tag === Layout || (content.tag && content.tag.name === 'Layout'))) {
         return content;

package/plugins/admin-panel/core/admin-module.js

@@ -265,7 +265,20 @@ function registerApiRoutes(moduleId, apiConfig, deps) {
     const useAuth = route.auth !== undefined ? route.auth : defaultAuth;
     const authMiddleware = useAuth ? requireAuth : optionalAuth;
 
-    ctx.addRoute(method, fullPath, authMiddleware, route.handler);
+    const safeHandler = async (req, res, next) => {
+      try {
+        await route.handler(req, res, next);
+      } catch (err) {
+        if (typeof next === 'function') {
+          next(err);
+        } else {
+          throw err;
+        }
+      }
+    };
+    safeHandler._originalHandler = route.handler;
+
+    ctx.addRoute(method, fullPath, authMiddleware, safeHandler);
   }
 }
 

package/plugins/audit-log/admin-component.js

@@ -34,9 +34,11 @@ function generateAuditLogComponent(options = {}) {
         rows = res.data || [];
         total = (res.meta && res.meta.total) || 0;
         loading = false;
+        if (typeof m !== 'undefined' && m.redraw) m.redraw();
       }).catch(function(e) {
         error = e.message || String(e);
         loading = false;
+        if (typeof m !== 'undefined' && m.redraw) m.redraw();
       });
     }