gemi 0.45.0 → 0.46.1

package/dist/app/index.js

@@ -1,4 +1,4 @@
 // @bun
-import{o as a,p as b}from"../chunk-ppn0j67g.js";import"../chunk-jxpwexpz.js";import"../chunk-atv6nybp.js";import"../chunk-p5r0t9jh.js";import"../chunk-xkrthw08.js";import"../chunk-4z53shav.js";import"../chunk-m0earq80.js";import"../chunk-f18weffa.js";export{b as prismaExtension,a as App};
+import{o as a,p as b}from"../chunk-r64ba1pf.js";import"../chunk-d9k245jt.js";import"../chunk-evkv0xa7.js";import"../chunk-p5r0t9jh.js";import"../chunk-xkrthw08.js";import"../chunk-4z53shav.js";import"../chunk-m0earq80.js";import"../chunk-f18weffa.js";export{b as prismaExtension,a as App};
 
 //# debugId=15EBDBCE0B2D702364756E2164756E21

package/dist/bin/gemi.js

@@ -9380,7 +9380,7 @@ var require_react_development = __commonJS((exports, module) => {
             type = type._init;
             try {
               return getComponentNameFromType(type(innerType));
-            } catch (x4) {}
+            } catch (x5) {}
         }
       return null;
     }
@@ -9392,7 +9392,7 @@ var require_react_development = __commonJS((exports, module) => {
       try {
         var name = getComponentNameFromType(type);
         return name ? "<" + name + ">" : "<...>";
-      } catch (x4) {
+      } catch (x5) {
         return "<...>";
       }
     }
@@ -9643,14 +9643,14 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
       prevActScopeDepth !== actScopeDepth - 1 && console.error("You seem to have overlapping act() calls, this is not supported. Be sure to await previous act() calls before making a new one. ");
       actScopeDepth = prevActScopeDepth;
     }
-    function recursivelyFlushAsyncActWork(returnValue, resolve, reject) {
+    function recursivelyFlushAsyncActWork(returnValue, resolve2, reject) {
       var queue = ReactSharedInternals.actQueue;
       if (queue !== null)
         if (queue.length !== 0)
           try {
             flushActQueue(queue);
             enqueueTask(function() {
-              return recursivelyFlushAsyncActWork(returnValue, resolve, reject);
+              return recursivelyFlushAsyncActWork(returnValue, resolve2, reject);
             });
             return;
           } catch (error) {
@@ -9658,7 +9658,7 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
           }
         else
           ReactSharedInternals.actQueue = null;
-      0 < ReactSharedInternals.thrownErrors.length ? (queue = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(queue)) : resolve(returnValue);
+      0 < ReactSharedInternals.thrownErrors.length ? (queue = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(queue)) : resolve2(returnValue);
     }
     function flushActQueue(queue) {
       if (!isFlushing) {
@@ -9834,14 +9834,14 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
           didAwaitActCall || didWarnNoAwaitAct || (didWarnNoAwaitAct = true, console.error("You called act(async () => ...) without await. This could lead to unexpected testing behaviour, interleaving multiple act calls and mixing their scopes. You should - await act(async () => ...);"));
         });
         return {
-          then: function(resolve, reject) {
+          then: function(resolve2, reject) {
             didAwaitActCall = true;
             thenable.then(function(returnValue) {
               popActScope(prevActQueue, prevActScopeDepth);
               if (prevActScopeDepth === 0) {
                 try {
                   flushActQueue(queue), enqueueTask(function() {
-                    return recursivelyFlushAsyncActWork(returnValue, resolve, reject);
+                    return recursivelyFlushAsyncActWork(returnValue, resolve2, reject);
                   });
                 } catch (error$0) {
                   ReactSharedInternals.thrownErrors.push(error$0);
@@ -9852,7 +9852,7 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
                   reject(_thrownError);
                 }
               } else
-                resolve(returnValue);
+                resolve2(returnValue);
             }, function(error) {
               popActScope(prevActQueue, prevActScopeDepth);
               0 < ReactSharedInternals.thrownErrors.length ? (error = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, reject(error)) : reject(error);
@@ -9868,11 +9868,11 @@ See https://react.dev/link/invalid-hook-call for tips about how to debug and fix
       if (0 < ReactSharedInternals.thrownErrors.length)
         throw callback = aggregateErrors(ReactSharedInternals.thrownErrors), ReactSharedInternals.thrownErrors.length = 0, callback;
       return {
-        then: function(resolve, reject) {
+        then: function(resolve2, reject) {
           didAwaitActCall = true;
           prevActScopeDepth === 0 ? (ReactSharedInternals.actQueue = queue, enqueueTask(function() {
-            return recursivelyFlushAsyncActWork(returnValue$jscomp$0, resolve, reject);
-          })) : resolve(returnValue$jscomp$0);
+            return recursivelyFlushAsyncActWork(returnValue$jscomp$0, resolve2, reject);
+          })) : resolve2(returnValue$jscomp$0);
         }
       };
     };
@@ -10352,11 +10352,11 @@ var require_tslib = __commonJS((exports, module) => {
     };
     __awaiter = function(thisArg, _arguments, P4, generator) {
       function adopt(value) {
-        return value instanceof P4 ? value : new P4(function(resolve) {
-          resolve(value);
+        return value instanceof P4 ? value : new P4(function(resolve2) {
+          resolve2(value);
         });
       }
-      return new (P4 || (P4 = Promise))(function(resolve, reject) {
+      return new (P4 || (P4 = Promise))(function(resolve2, reject) {
         function fulfilled(value) {
           try {
             step(generator.next(value));
@@ -10372,7 +10372,7 @@ var require_tslib = __commonJS((exports, module) => {
           }
         }
         function step(result) {
-          result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+          result.done ? resolve2(result.value) : adopt(result.value).then(fulfilled, rejected);
         }
         step((generator = generator.apply(thisArg, _arguments || [])).next());
       });
@@ -10601,14 +10601,14 @@ var require_tslib = __commonJS((exports, module) => {
       }, i3);
       function verb(n2) {
         i3[n2] = o2[n2] && function(v4) {
-          return new Promise(function(resolve, reject) {
-            v4 = o2[n2](v4), settle(resolve, reject, v4.done, v4.value);
+          return new Promise(function(resolve2, reject) {
+            v4 = o2[n2](v4), settle(resolve2, reject, v4.done, v4.value);
           });
         };
       }
-      function settle(resolve, reject, d3, v4) {
+      function settle(resolve2, reject, d3, v4) {
         Promise.resolve(v4).then(function(v5) {
-          resolve({ value: v5, done: d3 });
+          resolve2({ value: v5, done: d3 });
         }, reject);
       }
     };
@@ -50068,6 +50068,7 @@ class Metadata {
     description: null,
     openGraph: null
   };
+  touched = false;
   render() {
     return {
       title: this.content.title,
@@ -50076,9 +50077,11 @@ class Metadata {
     };
   }
   title(title) {
+    this.touched = true;
     this.content.title = title;
   }
   description(description) {
+    this.touched = true;
     this.content.description = description;
   }
   openGraph({
@@ -50095,6 +50098,7 @@ class Metadata {
     twitterImageWidth = imageWidth,
     twitterImageHeight = imageHeight
   }) {
+    this.touched = true;
     let _image = image;
     let _twitterImage = twitterImage;
     if (image && !image.startsWith("http")) {
@@ -51084,6 +51088,7 @@ class LayoutRoute {
   viewPath;
   children;
   middlewares = [];
+  alwaysRuns = false;
   handler = () => ({});
   constructor(viewPath, handlerOrRoutes, routes) {
     this.viewPath = viewPath;
@@ -51121,6 +51126,10 @@ class LayoutRoute {
       }
     };
   }
+  alwaysRun() {
+    this.alwaysRuns = true;
+    return this;
+  }
   middleware(middlewares) {
     this.middlewares = middlewares;
     return this;
@@ -67234,6 +67243,23 @@ function removeGroupPrefix(input) {
   const withoutDoubleSlashes = withoutParentheses.replace(/\/\//g, "/");
   return withoutDoubleSlashes;
 }
+function joinRoutePath(prefix, path) {
+  if (prefix === "/")
+    return path;
+  if (path === "/")
+    return prefix;
+  return `${prefix}${path}`;
+}
+function segmentPath(path) {
+  const withoutGroups = removeGroupPrefix(path);
+  return withoutGroups.length > 1 ? withoutGroups.replace(/\/$/, "") : withoutGroups;
+}
+function prefixSegments(prefix, segments) {
+  return segments.map((segment) => ({
+    ...segment,
+    path: segmentPath(joinRoutePath(prefix, segment.path))
+  }));
+}
 function createFlatViewRoutes(routes) {
   const flatRoutes = {};
   for (const [routePath, viewConfigOrViewRouter] of Object.entries(routes)) {
@@ -67242,14 +67268,21 @@ function createFlatViewRoutes(routes) {
       if ("children" in route) {
         const children = new route.children;
         const result = createFlatViewRoutes(children.routes);
-        for (const [path, { exec: exec2, middleware }] of Object.entries(result)) {
-          const key = routePath === "/" ? path : `${routePath}${path}`;
-          const _key = path === "/" && routePath !== "/" ? routePath : key;
+        for (const [path, { exec: exec2, middleware, segments }] of Object.entries(result)) {
+          const _key = joinRoutePath(routePath, path);
           const handler = (req) => route.run.call(route, req, routePath);
           flatRoutes[removeGroupPrefix(_key)] = {
             exec: [handler, ...exec2],
             middleware: [...route.middlewares, ...middleware],
-            viewPath: route.viewPath
+            viewPath: route.viewPath,
+            segments: [
+              {
+                path: segmentPath(routePath),
+                viewPath: route.viewPath,
+                ...route.alwaysRuns ? { alwaysRun: true } : {}
+              },
+              ...prefixSegments(routePath, segments)
+            ]
           };
         }
       } else {
@@ -67257,19 +67290,23 @@ function createFlatViewRoutes(routes) {
         flatRoutes[removeGroupPrefix(routePath)] = {
           exec: [handler],
           middleware: route.middlewares,
-          viewPath: route.viewPath
+          viewPath: route.viewPath,
+          segments: [{ path: segmentPath(routePath), viewPath: route.viewPath }]
         };
       }
     } else {
       const router = new viewConfigOrViewRouter;
       const result = createFlatViewRoutes(router.routes);
-      for (const [path, { exec: exec2, middleware, viewPath }] of Object.entries(result)) {
-        const key = routePath === "/" ? path : `${routePath}${path}`;
-        const _key = path === "/" && routePath !== "/" ? routePath : key;
+      for (const [
+        path,
+        { exec: exec2, middleware, viewPath, segments }
+      ] of Object.entries(result)) {
+        const _key = joinRoutePath(routePath, path);
         flatRoutes[removeGroupPrefix(_key)] = {
           exec: exec2,
           middleware: [...router.middlewares, ...middleware],
-          viewPath
+          viewPath,
+          segments: prefixSegments(routePath, segments)
         };
       }
     }
@@ -67281,10 +67318,6 @@ function createFlatViewRoutes(routes) {
   }));
 }
 
-// services/router/ViewRouterServiceContainer.ts
-var import_react = __toESM(require_react(), 1);
-import { renderToReadableStream } from "react-dom/server.browser";
-
 // ../../node_modules/.bun/urlpattern-polyfill@10.1.0/node_modules/urlpattern-polyfill/dist/urlpattern.js
 var Pe3 = Object.defineProperty;
 var a2 = (e2, t2) => Pe3(e2, "name", { value: t2, configurable: true });
@@ -68115,6 +68148,93 @@ var Y2 = class {
 };
 a2(Y2, "URLPattern");
 
+// services/router/matchViewRoute.ts
+function matchViewRoute(flatViewRoutes, pathname) {
+  for (const [routePath, route] of Object.entries(flatViewRoutes)) {
+    const pattern2 = new Y2({ pathname: routePath });
+    if (pattern2.test({ pathname })) {
+      return {
+        routePath,
+        params: pattern2.exec({ pathname })?.pathname.groups ?? {},
+        route
+      };
+    }
+  }
+  return null;
+}
+
+// services/router/planPartialRender.ts
+var NOTHING_SKIPPED = { startIndex: 0, carriedViews: [] };
+function resolve(segment, params) {
+  const resolved = applyParams(segment.path, params);
+  return resolved.includes("*") ? null : resolved;
+}
+function planPartialRender(from, to3) {
+  if (!from) {
+    return NOTHING_SKIPPED;
+  }
+  if (from.search !== to3.search) {
+    return NOTHING_SKIPPED;
+  }
+  const limit = Math.min(from.segments.length, to3.segments.length - 1);
+  let startIndex = 0;
+  while (startIndex < limit) {
+    const fromSegment = from.segments[startIndex];
+    const toSegment = to3.segments[startIndex];
+    if (toSegment.alwaysRun)
+      break;
+    if (fromSegment.viewPath !== toSegment.viewPath)
+      break;
+    const fromPath = resolve(fromSegment, from.params);
+    const toPath = resolve(toSegment, to3.params);
+    if (fromPath === null || toPath === null || fromPath !== toPath)
+      break;
+    startIndex++;
+  }
+  if (startIndex === 0) {
+    return NOTHING_SKIPPED;
+  }
+  return {
+    startIndex,
+    carriedViews: to3.segments.slice(0, startIndex).map(({ viewPath }) => viewPath)
+  };
+}
+function stripLocaleSegment(pathname, supportedLocales) {
+  const [, maybeLocale, ...rest] = pathname.split("/");
+  if (!supportedLocales.includes(maybeLocale)) {
+    return pathname;
+  }
+  const stripped = `/${rest.join("/")}`;
+  return stripped === "/" ? "/" : stripped.replace(/\/$/, "");
+}
+function resolvePartialRender(options) {
+  const { flatViewRoutes, supportedLocales, from, origin, to: to3 } = options;
+  if (!from) {
+    return NOTHING_SKIPPED;
+  }
+  let url;
+  try {
+    url = new URL(from, origin);
+  } catch {
+    return NOTHING_SKIPPED;
+  }
+  if (url.origin !== origin) {
+    return NOTHING_SKIPPED;
+  }
+  const match = matchViewRoute(flatViewRoutes, stripLocaleSegment(url.pathname, supportedLocales));
+  if (!match) {
+    return NOTHING_SKIPPED;
+  }
+  return planPartialRender({ segments: match.route.segments, params: match.params, search: url.search }, to3);
+}
+
+// utils/partialRender.ts
+var PARTIAL_RENDER_HEADER = "x-gemi-from";
+
+// services/router/ViewRouterServiceContainer.ts
+var import_react = __toESM(require_react(), 1);
+import { renderToReadableStream } from "react-dom/server.browser";
+
 // services/router/createRouteManifest.ts
 function removeGroupPrefix2(input) {
   const withoutParentheses = input.replace(/\([^)]*\)/g, "");
@@ -68434,15 +68554,27 @@ class ViewRouterServiceContainer extends ServiceContainer {
     let middlewares = [];
     let currentPathName = null;
     let params = {};
+    let partial = null;
     try {
-      for (const [pathname, handler] of Object.entries(this.flatViewRoutes)) {
-        const pattern2 = new Y2({ pathname });
-        if (pattern2.test({ pathname: urlPathname })) {
-          currentPathName = pathname;
-          params = pattern2.exec({ pathname: urlPathname })?.pathname.groups;
-          handlers = handler.exec;
-          middlewares = handler.middleware;
-          break;
+      const match = matchViewRoute(this.flatViewRoutes, urlPathname);
+      if (match) {
+        currentPathName = match.routePath;
+        params = match.params;
+        handlers = match.route.exec;
+        middlewares = match.route.middleware;
+        if (isViewDataRequest && this.service.partialRendering) {
+          const from = req.headers.get(PARTIAL_RENDER_HEADER);
+          const plan = resolvePartialRender({
+            flatViewRoutes: this.flatViewRoutes,
+            supportedLocales: i18nServiceContainer.service.supportedLocales,
+            from,
+            origin: url.origin,
+            to: { segments: match.route.segments, params, search: url.search }
+          });
+          if (plan.startIndex > 0) {
+            handlers = handlers.slice(plan.startIndex);
+            partial = { from, carriedViews: plan.carriedViews };
+          }
         }
       }
     } catch (err2) {
@@ -68483,9 +68615,11 @@ class ViewRouterServiceContainer extends ServiceContainer {
             defaultLocale: i18nServiceContainer2.service.defaultLocale
           };
         }
-        const data = await Promise.all([
-          ...handlers.map((fn2) => fn2(httpRequest2)),
-          ...Array.from(ctx.prefetchPromiseQueue).map((fn2) => fn2())
+        const handlerPromises = handlers.map((fn2) => fn2(httpRequest2));
+        const prefetchPromises = Array.from(ctx.prefetchPromiseQueue).map((fn2) => fn2());
+        const [data] = await Promise.all([
+          Promise.all(handlerPromises),
+          Promise.all(prefetchPromises)
         ]);
         const cookies = ctx.cookies;
         const headers = ctx.headers;
@@ -68529,10 +68663,11 @@ class ViewRouterServiceContainer extends ServiceContainer {
         }
         if (isViewDataRequest) {
           headers.set("Content-Type", "application/json; charset=utf-8");
+          headers.append("Vary", PARTIAL_RENDER_HEADER);
           cookies.forEach((cookie) => headers.append("Set-Cookie", cookie.toString()));
           await this.service.onRequestEnd(httpRequest2);
           return new Response(JSON.stringify({
-            meta: pageData.meta,
+            meta: partial && !ctx.metadata.touched ? null : pageData.meta,
             data: {
               [urlPathname]: viewData
             },
@@ -68540,7 +68675,8 @@ class ViewRouterServiceContainer extends ServiceContainer {
             prefetchedData: pageData.prefetchedData,
             i18n,
             is404: !currentPathName2,
-            appId: pageData.appId
+            appId: pageData.appId,
+            partial
           }), {
             headers
           });
@@ -68822,13 +68958,13 @@ function createWorker() {
 async function runInWorker(jobName, args) {
   const worker = createWorker();
   worker.postMessage({ jobName, args });
-  return await new Promise((resolve, reject) => {
+  return await new Promise((resolve2, reject) => {
     worker.onmessage = (e2) => {
       const data = e2.data;
       if ("error" in data) {
         reject(data.error);
       } else {
-        resolve(data.result);
+        resolve2(data.result);
       }
     };
   });
@@ -68857,7 +68993,7 @@ class QueueServiceContainer extends ServiceContainer {
       this.isRunning = true;
     }
     if (this.activeRunningJobsCount >= this.service.concurrency) {
-      await new Promise((resolve) => setTimeout(resolve, 1000));
+      await new Promise((resolve2) => setTimeout(resolve2, 1000));
       return this.next();
     }
     const jobDefinition = this.queue.values().next().value;
@@ -69613,5 +69749,5 @@ program.command("app:route-manifest").action(async () => {
 });
 program.parse();
 
-//# debugId=4F1ACECB8A1785DF64756E2164756E21
+//# debugId=971DE98EAA769ECD64756E2164756E21
 //# sourceMappingURL=gemi.js.map