zuby 1.0.37 → 1.0.38

package/config.js

@@ -114,12 +114,6 @@ export const mergeDefaultConfig = async (config) => {
     config.vite.build.ssrManifest = config.vite.build.ssrManifest ?? 'chunks-manifest.json';
     config.vite.build.ssrEmitAssets = config.vite.build.ssrEmitAssets ?? true;
     config.vite.optimizeDeps = config.vite.optimizeDeps ?? {};
-    config.vite.optimizeDeps = {
-        ...config.vite.optimizeDeps,
-        entries: ['**/*', ...(config.vite.optimizeDeps?.entries ?? [])],
-        include: ['**/*', ...(config.vite.optimizeDeps?.include ?? [])],
-        disabled: false,
-    };
     // Merge built-in plugins with user plugins
     config.vite.plugins = [
         ...getBuiltInPlugins(),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "zuby",
-  "version": "1.0.37",
+  "version": "1.0.38",
   "description": "Zuby.js is framework for building SPA apps using Vite",
   "type": "module",
   "main": "index.js",

package/server/index.js

@@ -8366,7 +8366,7 @@ var TEMPLATES = {
 
 // src/templates/pathUtils.ts
 function findMatchingTemplate(templates, path2) {
-  for (const template of templates) {
+  for (const [index, template] of templates.entries()) {
     const match2 = template.pathRegex.exec(path2);
     if (!match2)
       continue;
@@ -8379,6 +8379,7 @@ function findMatchingTemplate(templates, path2) {
     );
     return {
       template,
+      index,
       params: matchedParams
     };
   }
@@ -8415,15 +8416,23 @@ var ZubyRenderer = class {
     this.renderToString = this.zubyContext.renderToString;
     this.renderToStream = this.zubyContext.renderToStream;
   }
-  async executeHandler(pageContext) {
-    const handlers = this.zubyContext?.templates?.handlers || [];
-    const { template: handler, params } = findMatchingTemplate(handlers, pageContext.url.pathname);
-    if (!handler)
-      return;
-    pageContext.params = params;
-    const handlerModule = await handler?.component();
-    const handlerFunction = handlerModule.default || handlerModule;
-    return handlerFunction(pageContext);
+  async executeHandlers(pageContext) {
+    let handlers = [...this.zubyContext?.templates?.handlers || []];
+    const next = async () => {
+      const {
+        template: handler,
+        index = 0,
+        params
+      } = findMatchingTemplate(handlers, pageContext.url.pathname);
+      if (!handler)
+        return;
+      handlers = handlers.slice(index + 1);
+      pageContext.params = params;
+      const handlerModule = await handler?.component();
+      const handlerFunction = handlerModule.default || handlerModule;
+      return handlerFunction(pageContext, next);
+    };
+    return next();
   }
   async executeProps(pageContext) {
     const propsHeader = pageContext.request?.headers.get("x-zuby-props");
@@ -8509,7 +8518,7 @@ var ZubyRenderer = class {
   }
   async render(req) {
     const pageContext = this.createPageContext(req);
-    return await this.executeHandler(pageContext) || await this.executeProps(pageContext) || await this.executeEntry(pageContext);
+    return await this.executeHandlers(pageContext) || await this.executeProps(pageContext) || await this.executeEntry(pageContext);
   }
 };
 

package/server/zubyRenderer.d.ts

@@ -16,7 +16,7 @@ export default class ZubyRenderer {
     constructor(outDir: string);
     reload(): Promise<void>;
     init(): Promise<void>;
-    executeHandler(pageContext: ZubyPageContext): Promise<undefined | Response>;
+    executeHandlers(pageContext: ZubyPageContext): Promise<undefined | Response>;
     executeProps(pageContext: ZubyPageContext): Promise<undefined | Response>;
     executeEntry(pageContext: ZubyPageContext): Promise<Response>;
     createPageContext(req: Request): ZubyPageContext;

package/server/zubyRenderer.js

@@ -32,19 +32,24 @@ export default class ZubyRenderer {
         this.renderToString = this.zubyContext.renderToString;
         this.renderToStream = this.zubyContext.renderToStream;
     }
-    async executeHandler(pageContext) {
-        const handlers = this.zubyContext?.templates?.handlers || [];
-        const { template: handler, params } = findMatchingTemplate(handlers, pageContext.url.pathname);
-        // Nothing to execute if no handler was found
-        if (!handler)
-            return;
-        // Assign matched params to pageContext. Handler can have different params than the page.
-        pageContext.params = params;
-        // Load and find module default export
-        const handlerModule = await handler?.component();
-        const handlerFunction = handlerModule.default || handlerModule;
-        // Execute the handler function
-        return handlerFunction(pageContext);
+    async executeHandlers(pageContext) {
+        let handlers = [...(this.zubyContext?.templates?.handlers || [])];
+        const next = async () => {
+            const { template: handler, index = 0, params, } = findMatchingTemplate(handlers, pageContext.url.pathname);
+            // Nothing to execute if no handler was found
+            if (!handler)
+                return;
+            // Remove all handlers before the matched one
+            handlers = handlers.slice(index + 1);
+            // Assign matched params to pageContext. Handler can have different params than the page.
+            pageContext.params = params;
+            // Load and find module default export
+            const handlerModule = await handler?.component();
+            const handlerFunction = handlerModule.default || handlerModule;
+            // Execute the handler function
+            return handlerFunction(pageContext, next);
+        };
+        return next();
     }
     async executeProps(pageContext) {
         const propsHeader = pageContext.request?.headers.get('x-zuby-props');
@@ -143,7 +148,7 @@ export default class ZubyRenderer {
     }
     async render(req) {
         const pageContext = this.createPageContext(req);
-        return ((await this.executeHandler(pageContext)) ||
+        return ((await this.executeHandlers(pageContext)) ||
             (await this.executeProps(pageContext)) ||
             (await this.executeEntry(pageContext)));
     }

package/templates/pathUtils.d.ts

@@ -4,6 +4,7 @@ import { LazyTemplate, Template } from './types.js';
  */
 export declare function findMatchingTemplate<T extends Template | LazyTemplate>(templates: T[], path: string): {
     template?: T;
+    index?: number;
     params: Record<string, string>;
 };
 export declare const pathToRegexp: (pathPattern: string) => {

package/templates/pathUtils.js

@@ -3,7 +3,7 @@ import { BASE_TEMPLATES } from './types.js';
  * Returns the matching template for the given path.
  */
 export function findMatchingTemplate(templates, path) {
-    for (const template of templates) {
+    for (const [index, template] of templates.entries()) {
         const match = template.pathRegex.exec(path);
         if (!match)
             continue;
@@ -13,6 +13,7 @@ export function findMatchingTemplate(templates, path) {
         }, {});
         return {
             template,
+            index,
             params: matchedParams,
         };
     }