@reckona/mreact-router 0.0.184 → 0.0.186

package/dist/route-loader-runtime.d.ts

@@ -17,6 +17,7 @@ export declare function loadRouteDataFromModule(options: {
     context: RouteDataContext;
     hasLoader: boolean;
     loadModule(): Promise<RouteLoaderModule>;
+    onLoaderReady?: (() => void) | undefined;
     timing?: RouteLoaderRuntimeTiming | undefined;
 }): Promise<unknown>;
 //# sourceMappingURL=route-loader-runtime.d.ts.map

package/dist/route-loader-runtime.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"route-loader-runtime.d.ts","sourceRoot":"","sources":["../src/route-loader-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC;CACjD;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,mBAAmB,GAAG,oBAAoB,GAAG,IAAI,CAAC;IAC/F,KAAK,IAAI,MAAM,GAAG,SAAS,CAAC;CAC7B;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE;IACrD,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACzC,MAAM,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;CAC/C,GAAG,OAAO,CAAC,OAAO,CAAC,CA6BnB"}
+{"version":3,"file":"route-loader-runtime.d.ts","sourceRoot":"","sources":["../src/route-loader-runtime.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAE9C,MAAM,WAAW,gBAAgB;IAC/B,GAAG,CAAC,EAAE,OAAO,CAAC;IACd,MAAM,EAAE,WAAW,CAAC;IACpB,WAAW,EAAE,WAAW,CAAC;IACzB,OAAO,EAAE,OAAO,CAAC;CAClB;AAED,MAAM,WAAW,iBAAiB;IAChC,MAAM,CAAC,EAAE,CAAC,OAAO,EAAE,gBAAgB,KAAK,OAAO,CAAC;CACjD;AAED,MAAM,WAAW,wBAAwB;IACvC,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,SAAS,EAAE,KAAK,EAAE,mBAAmB,GAAG,oBAAoB,GAAG,IAAI,CAAC;IAC/F,KAAK,IAAI,MAAM,GAAG,SAAS,CAAC;CAC7B;AAED,wBAAsB,uBAAuB,CAAC,OAAO,EAAE;IACrD,OAAO,EAAE,gBAAgB,CAAC;IAC1B,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,IAAI,OAAO,CAAC,iBAAiB,CAAC,CAAC;IACzC,aAAa,CAAC,EAAE,CAAC,MAAM,IAAI,CAAC,GAAG,SAAS,CAAC;IACzC,MAAM,CAAC,EAAE,wBAAwB,GAAG,SAAS,CAAC;CAC/C,GAAG,OAAO,CAAC,OAAO,CAAC,CA+BnB"}

package/dist/route-loader-runtime.js

@@ -11,9 +11,11 @@ export async function loadRouteDataFromModule(options) {
         options.timing?.finish(moduleLoadStartedAt, "loaderModuleLoadMs");
     }
     if (module.loader === undefined) {
+        options.onLoaderReady?.();
         return undefined;
     }
     const executionStartedAt = options.timing?.start();
+    options.onLoaderReady?.();
     try {
         return await module.loader(options.context);
     }

package/dist/route-loader-runtime.js.map

@@ -1 +1 @@
-{"version":3,"file":"route-loader-runtime.js","sourceRoot":"","sources":["../src/route-loader-runtime.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAK7C;IACC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,MAAyB,CAAC;IAC9B,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;YAAS,CAAC;QACT,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IACnD,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;IAClE,CAAC;AACH,CAAC","sourcesContent":["import type { QueryClient } from \"@reckona/mreact-query\";\nimport type { RouteParams } from \"./types.js\";\n\nexport interface RouteDataContext {\n  env?: unknown;\n  params: RouteParams;\n  queryClient: QueryClient;\n  request: Request;\n}\n\nexport interface RouteLoaderModule {\n  loader?: (context: RouteDataContext) => unknown;\n}\n\nexport interface RouteLoaderRuntimeTiming {\n  finish(startedAt: number | undefined, phase: \"loaderExecutionMs\" | \"loaderModuleLoadMs\"): void;\n  start(): number | undefined;\n}\n\nexport async function loadRouteDataFromModule(options: {\n  context: RouteDataContext;\n  hasLoader: boolean;\n  loadModule(): Promise<RouteLoaderModule>;\n  timing?: RouteLoaderRuntimeTiming | undefined;\n}): Promise<unknown> {\n  if (!options.hasLoader) {\n    return undefined;\n  }\n\n  let module: RouteLoaderModule;\n  const moduleLoadStartedAt = options.timing?.start();\n  try {\n    module = await options.loadModule();\n  } finally {\n    options.timing?.finish(moduleLoadStartedAt, \"loaderModuleLoadMs\");\n  }\n\n  if (module.loader === undefined) {\n    return undefined;\n  }\n\n  const executionStartedAt = options.timing?.start();\n  try {\n    return await module.loader(options.context);\n  } catch (error) {\n    if (error instanceof Response) {\n      return error;\n    }\n\n    throw error;\n  } finally {\n    options.timing?.finish(executionStartedAt, \"loaderExecutionMs\");\n  }\n}\n"]}
+{"version":3,"file":"route-loader-runtime.js","sourceRoot":"","sources":["../src/route-loader-runtime.ts"],"names":[],"mappings":"AAmBA,MAAM,CAAC,KAAK,UAAU,uBAAuB,CAAC,OAM7C;IACC,IAAI,CAAC,OAAO,CAAC,SAAS,EAAE,CAAC;QACvB,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,IAAI,MAAyB,CAAC;IAC9B,MAAM,mBAAmB,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IACpD,IAAI,CAAC;QACH,MAAM,GAAG,MAAM,OAAO,CAAC,UAAU,EAAE,CAAC;IACtC,CAAC;YAAS,CAAC;QACT,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,mBAAmB,EAAE,oBAAoB,CAAC,CAAC;IACpE,CAAC;IAED,IAAI,MAAM,CAAC,MAAM,KAAK,SAAS,EAAE,CAAC;QAChC,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;QAC1B,OAAO,SAAS,CAAC;IACnB,CAAC;IAED,MAAM,kBAAkB,GAAG,OAAO,CAAC,MAAM,EAAE,KAAK,EAAE,CAAC;IACnD,OAAO,CAAC,aAAa,EAAE,EAAE,CAAC;IAC1B,IAAI,CAAC;QACH,OAAO,MAAM,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC9C,CAAC;IAAC,OAAO,KAAK,EAAE,CAAC;QACf,IAAI,KAAK,YAAY,QAAQ,EAAE,CAAC;YAC9B,OAAO,KAAK,CAAC;QACf,CAAC;QAED,MAAM,KAAK,CAAC;IACd,CAAC;YAAS,CAAC;QACT,OAAO,CAAC,MAAM,EAAE,MAAM,CAAC,kBAAkB,EAAE,mBAAmB,CAAC,CAAC;IAClE,CAAC;AACH,CAAC","sourcesContent":["import type { QueryClient } from \"@reckona/mreact-query\";\nimport type { RouteParams } from \"./types.js\";\n\nexport interface RouteDataContext {\n  env?: unknown;\n  params: RouteParams;\n  queryClient: QueryClient;\n  request: Request;\n}\n\nexport interface RouteLoaderModule {\n  loader?: (context: RouteDataContext) => unknown;\n}\n\nexport interface RouteLoaderRuntimeTiming {\n  finish(startedAt: number | undefined, phase: \"loaderExecutionMs\" | \"loaderModuleLoadMs\"): void;\n  start(): number | undefined;\n}\n\nexport async function loadRouteDataFromModule(options: {\n  context: RouteDataContext;\n  hasLoader: boolean;\n  loadModule(): Promise<RouteLoaderModule>;\n  onLoaderReady?: (() => void) | undefined;\n  timing?: RouteLoaderRuntimeTiming | undefined;\n}): Promise<unknown> {\n  if (!options.hasLoader) {\n    return undefined;\n  }\n\n  let module: RouteLoaderModule;\n  const moduleLoadStartedAt = options.timing?.start();\n  try {\n    module = await options.loadModule();\n  } finally {\n    options.timing?.finish(moduleLoadStartedAt, \"loaderModuleLoadMs\");\n  }\n\n  if (module.loader === undefined) {\n    options.onLoaderReady?.();\n    return undefined;\n  }\n\n  const executionStartedAt = options.timing?.start();\n  options.onLoaderReady?.();\n  try {\n    return await module.loader(options.context);\n  } catch (error) {\n    if (error instanceof Response) {\n      return error;\n    }\n\n    throw error;\n  } finally {\n    options.timing?.finish(executionStartedAt, \"loaderExecutionMs\");\n  }\n}\n"]}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@reckona/mreact-router",
-  "version": "0.0.184",
+  "version": "0.0.186",
   "description": "File-system app router, SSR, actions, and deployment adapters for mreact.",
   "keywords": [
     "jsx",
@@ -105,20 +105,20 @@
   },
   "dependencies": {
     "typescript": "^6.0.3",
-    "@reckona/mreact": "0.0.184",
-    "@reckona/mreact-compat": "0.0.184",
-    "@reckona/mreact-query": "0.0.184",
-    "@reckona/mreact-devtools": "0.0.184",
-    "@reckona/mreact-reactive-core": "0.0.184",
-    "@reckona/mreact-compiler": "0.0.184",
-    "@reckona/mreact-reactive-dom": "0.0.184",
-    "@reckona/mreact-server": "0.0.184",
-    "@reckona/mreact-shared": "0.0.184"
+    "@reckona/mreact": "0.0.186",
+    "@reckona/mreact-compat": "0.0.186",
+    "@reckona/mreact-compiler": "0.0.186",
+    "@reckona/mreact-query": "0.0.186",
+    "@reckona/mreact-devtools": "0.0.186",
+    "@reckona/mreact-reactive-core": "0.0.186",
+    "@reckona/mreact-reactive-dom": "0.0.186",
+    "@reckona/mreact-shared": "0.0.186",
+    "@reckona/mreact-server": "0.0.186"
   },
   "peerDependencies": {
     "vite": ">=8 <9"
   },
   "optionalDependencies": {
-    "@reckona/mreact-router-native": "0.0.184"
+    "@reckona/mreact-router-native": "0.0.186"
   }
 }

package/src/render.ts

@@ -715,6 +715,34 @@ async function readSettledPromiseAtNextTask<T>(
   ]);
 }
 
+function createDeferredSignal(): {
+  promise: Promise<void>;
+  resolve(): void;
+} {
+  let resolve: (() => void) | undefined;
+  const promise = new Promise<void>((innerResolve) => {
+    resolve = innerResolve;
+  });
+
+  return {
+    promise,
+    resolve() {
+      resolve?.();
+    },
+  };
+}
+
+async function waitForLoaderReadyOrSettled(
+  dataPromise: Promise<unknown>,
+  loaderReady: Promise<void> | undefined,
+): Promise<void> {
+  if (loaderReady === undefined) {
+    return;
+  }
+
+  await Promise.race([loaderReady, dataPromise.then(() => undefined, () => undefined)]);
+}
+
 function addRenderTimingPhaseDuration(
   timing: RenderTiming | undefined,
   startedAt: number | undefined,
@@ -1087,6 +1115,7 @@ async function renderAppRequestInternal(
     const clientInference = routeAnalysis.clientInference;
     const clientRoute = clientInference.client;
     phaseStartedAt = renderTimingPhaseStartedAt(timing);
+    const loaderReady = routeAnalysis.hasLoader ? createDeferredSignal() : undefined;
     const dataPromise = routeAnalysis.hasLoader
       ? loadRouteDataWithInstrumentation({
           appDir: options.appDir,
@@ -1109,6 +1138,7 @@ async function renderAppRequestInternal(
           define: options.define,
           vitePlugins: options.vitePlugins,
           timing,
+          onLoaderReady: loaderReady?.resolve,
         })
       : undefined;
     finishRenderTimingPhase(timing, phaseStartedAt, "loaderStartMs");
@@ -1316,6 +1346,8 @@ async function renderAppRequestInternal(
               return settledData.value;
             }
             streamDataPromise = Promise.resolve(settledData.value);
+          } else {
+            await waitForLoaderReadyOrSettled(streamDataPromise, loaderReady?.promise);
           }
         } finally {
           finishRenderTimingPhase(timing, phaseStartedAt, "loaderWaitMs");
@@ -4466,6 +4498,7 @@ async function loadRouteData(options: {
   devServerModuleCacheVersion?: string | undefined;
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
+  onLoaderReady?: (() => void) | undefined;
   serverModules?: ReadonlyMap<string, BuiltServerModuleArtifact> | undefined;
   serverModuleCacheVersion?: string | undefined;
   timing?: RenderTiming | undefined;
@@ -4475,6 +4508,7 @@ async function loadRouteData(options: {
     context: options.context,
     hasLoader: hasLoaderExport(options.code),
     loadModule: () => loadRouteLoaderModule(options),
+    onLoaderReady: options.onLoaderReady,
     timing: {
       finish(startedAt, phase) {
         finishRenderTimingPhase(options.timing, startedAt, phase);
@@ -4495,6 +4529,7 @@ async function loadRouteDataWithInstrumentation(options: {
   filename: string;
   importPolicy?: AppRouterImportPolicy | undefined;
   instrumentation?: RouterInstrumentation | undefined;
+  onLoaderReady?: (() => void) | undefined;
   request: Request;
   routeId: string;
   routePath: string;

package/src/route-loader-runtime.ts

@@ -21,6 +21,7 @@ export async function loadRouteDataFromModule(options: {
   context: RouteDataContext;
   hasLoader: boolean;
   loadModule(): Promise<RouteLoaderModule>;
+  onLoaderReady?: (() => void) | undefined;
   timing?: RouteLoaderRuntimeTiming | undefined;
 }): Promise<unknown> {
   if (!options.hasLoader) {
@@ -36,10 +37,12 @@ export async function loadRouteDataFromModule(options: {
   }
 
   if (module.loader === undefined) {
+    options.onLoaderReady?.();
     return undefined;
   }
 
   const executionStartedAt = options.timing?.start();
+  options.onLoaderReady?.();
   try {
     return await module.loader(options.context);
   } catch (error) {