bun-plugin-stx 0.2.553 → 0.2.554

package/dist/serve.js

@@ -9455,6 +9455,7 @@ After installing: bun add bun-plugin-stx`);
   let discoveredPagePaths = null;
   let assetsInitialized = false;
   const htmlCache = boundedCache(options.renderCacheLimit ?? 512);
+  const pendingShellRenders = new Map;
   const ENABLE_HTML_CACHE = options.renderCache === true;
   const RENDER_CACHE_VARY = options.renderCacheVary ?? "request";
   const cssCssCache = boundedCache(options.cssCacheLimit ?? 512);
@@ -10353,82 +10354,100 @@ function __stxOverlay(errs){
         return fillRouteParams(cachedEntry.html, paramsObj);
       }
     }
-    const context = {
-      __filename: filePath,
-      __dirname: nodePath.dirname(filePath),
-      __route: routePath,
-      __stx_runtime_head: {}
-    };
-    for (const name of paramNames) {
-      context[name] = paramsObj[name];
-    }
-    context.params = paramsObj;
-    const { processDirectives, extractVariables, defaultConfig, injectRouterScript: injectRouter } = await stxModule;
-    injectServeLocaleContext(context);
-    injectServeRequestContext(context, reqCtx);
-    context.__stx_options = stxConfig;
-    for (const scriptBody of dynServerScripts) {
-      await extractVariables(scriptBody, context, filePath);
+    let releaseShell;
+    if (cacheShell) {
+      const pending = pendingShellRenders.get(filePath);
+      if (pending) {
+        await pending;
+        return processTemplateDynamic(filePath, paramNames, paramValues, routePath, reqCtx);
+      }
+      pendingShellRenders.set(filePath, new Promise((resolve) => {
+        releaseShell = resolve;
+      }));
     }
-    context.__stx_head_preset = true;
-    const config = {
-      ...defaultConfig,
-      root: process19.cwd(),
-      ...componentsDir && { componentsDir },
-      ...layoutsDir && { layoutsDir },
-      ...fallbackLayoutsDir && { fallbackLayoutsDir },
-      ...fallbackComponentsDir && { fallbackComponentsDir },
-      ...partialsDir && { partialsDir },
-      autoShell: true,
-      buildMode: "serve",
-      ssr: stxConfig.ssr ?? defaultStxConfig.ssr ?? true,
-      app: stxConfig.app || {},
-      runtimeConfig: stxConfig.runtimeConfig,
-      ..."strict" in stxConfig && { strict: stxConfig.strict },
-      ..."router" in stxConfig && { router: stxConfig.router },
-      ..."debug" in stxConfig && { debug: stxConfig.debug },
-      ..."skipDefaultSeoTags" in stxConfig && { skipDefaultSeoTags: stxConfig.skipDefaultSeoTags },
-      ..."defaultTitle" in stxConfig && { defaultTitle: stxConfig.defaultTitle },
-      ..."defaultDescription" in stxConfig && { defaultDescription: stxConfig.defaultDescription },
-      ..."defaultImage" in stxConfig && { defaultImage: stxConfig.defaultImage },
-      ..."seo" in stxConfig && { seo: stxConfig.seo },
-      ..."analytics" in stxConfig && { analytics: stxConfig.analytics },
-      ..."offline" in stxConfig && { offline: stxConfig.offline },
-      ..."_pluginComponentDirs" in stxConfig && { _pluginComponentDirs: stxConfig._pluginComponentDirs },
-      ..."_pluginPageDirs" in stxConfig && { _pluginPageDirs: stxConfig._pluginPageDirs }
-    };
-    let output = templateContent;
-    const dependencies = new Set;
-    output = await processDirectives(output, context, filePath, config, dependencies);
-    applyRecordedResponse(context, reqCtx);
-    if (paramNames.length > 0) {
-      const serializedParams = cacheShell ? ROUTE_PARAMS_PLACEHOLDER : serializeRouteParams(paramsObj);
-      const paramsScript = `<script data-stx-route-params>(function(){var p=${serializedParams};window.__stx_rp=p;if(window.stx){window.stx._rp=p;if(window.stx.setRouteParams)window.stx.setRouteParams(p)}})()</script>`;
-      if (output.includes("</head>")) {
-        output = output.replace("</head>", `${paramsScript}
+    try {
+      const context = {
+        __filename: filePath,
+        __dirname: nodePath.dirname(filePath),
+        __route: routePath,
+        __stx_runtime_head: {}
+      };
+      for (const name of paramNames) {
+        context[name] = paramsObj[name];
+      }
+      context.params = paramsObj;
+      const { processDirectives, extractVariables, defaultConfig, injectRouterScript: injectRouter } = await stxModule;
+      injectServeLocaleContext(context);
+      injectServeRequestContext(context, reqCtx);
+      context.__stx_options = stxConfig;
+      for (const scriptBody of dynServerScripts) {
+        await extractVariables(scriptBody, context, filePath);
+      }
+      context.__stx_head_preset = true;
+      const config = {
+        ...defaultConfig,
+        root: process19.cwd(),
+        ...componentsDir && { componentsDir },
+        ...layoutsDir && { layoutsDir },
+        ...fallbackLayoutsDir && { fallbackLayoutsDir },
+        ...fallbackComponentsDir && { fallbackComponentsDir },
+        ...partialsDir && { partialsDir },
+        autoShell: true,
+        buildMode: "serve",
+        ssr: stxConfig.ssr ?? defaultStxConfig.ssr ?? true,
+        app: stxConfig.app || {},
+        runtimeConfig: stxConfig.runtimeConfig,
+        ..."strict" in stxConfig && { strict: stxConfig.strict },
+        ..."router" in stxConfig && { router: stxConfig.router },
+        ..."debug" in stxConfig && { debug: stxConfig.debug },
+        ..."skipDefaultSeoTags" in stxConfig && { skipDefaultSeoTags: stxConfig.skipDefaultSeoTags },
+        ..."defaultTitle" in stxConfig && { defaultTitle: stxConfig.defaultTitle },
+        ..."defaultDescription" in stxConfig && { defaultDescription: stxConfig.defaultDescription },
+        ..."defaultImage" in stxConfig && { defaultImage: stxConfig.defaultImage },
+        ..."seo" in stxConfig && { seo: stxConfig.seo },
+        ..."analytics" in stxConfig && { analytics: stxConfig.analytics },
+        ..."offline" in stxConfig && { offline: stxConfig.offline },
+        ..."_pluginComponentDirs" in stxConfig && { _pluginComponentDirs: stxConfig._pluginComponentDirs },
+        ..."_pluginPageDirs" in stxConfig && { _pluginPageDirs: stxConfig._pluginPageDirs }
+      };
+      let output = templateContent;
+      const dependencies = new Set;
+      output = await processDirectives(output, context, filePath, config, dependencies);
+      applyRecordedResponse(context, reqCtx);
+      if (paramNames.length > 0) {
+        const serializedParams = cacheShell ? ROUTE_PARAMS_PLACEHOLDER : serializeRouteParams(paramsObj);
+        const paramsScript = `<script data-stx-route-params>(function(){var p=${serializedParams};window.__stx_rp=p;if(window.stx){window.stx._rp=p;if(window.stx.setRouteParams)window.stx.setRouteParams(p)}})()</script>`;
+        if (output.includes("</head>")) {
+          output = output.replace("</head>", `${paramsScript}
 </head>`);
-      } else {
-        output = `${paramsScript}
+        } else {
+          output = `${paramsScript}
 ${output}`;
+        }
+      }
+      output = await injectRouter(output, getRouterInjectOptions());
+      const directiveTemplateRe2 = REACTIVE_TEMPLATE_DIRECTIVE_RE;
+      output = output.replace(/<template(?:\s[^>]*)?>|<\/template>/gi, (match) => {
+        if (directiveTemplateRe2.test(match))
+          return match;
+        if (match === "</template>")
+          return match;
+        return "";
+      });
+      if (!cacheShell)
+        return output;
+      const recordedResponse = readResponseStatus(context) !== undefined || !!readResponseHeaders(context);
+      if (!context.__stx_skip_cache && !recordedResponse && isRenderableCacheCandidate(output) && placeholdersAreReady) {
+        const signature = await buildTemplateSignature(filePath, dependencies);
+        htmlCache.remember(filePath, { html: output, signature, status: reqCtx?.responseStatus ?? 200, headers: reqCtx?.responseHeaders });
+      }
+      return fillRouteParams(output, paramsObj);
+    } finally {
+      if (releaseShell) {
+        pendingShellRenders.delete(filePath);
+        releaseShell();
       }
     }
-    output = await injectRouter(output, getRouterInjectOptions());
-    const directiveTemplateRe2 = REACTIVE_TEMPLATE_DIRECTIVE_RE;
-    output = output.replace(/<template(?:\s[^>]*)?>|<\/template>/gi, (match) => {
-      if (directiveTemplateRe2.test(match))
-        return match;
-      if (match === "</template>")
-        return match;
-      return "";
-    });
-    if (!cacheShell)
-      return output;
-    const recordedResponse = readResponseStatus(context) !== undefined || !!readResponseHeaders(context);
-    if (!context.__stx_skip_cache && !recordedResponse && isRenderableCacheCandidate(output) && placeholdersAreReady) {
-      const signature = await buildTemplateSignature(filePath, dependencies);
-      htmlCache.remember(filePath, { html: output, signature, status: reqCtx?.responseStatus ?? 200, headers: reqCtx?.responseHeaders });
-    }
-    return fillRouteParams(output, paramsObj);
   }
   const startTime = performance.now();
   await discoverFiles();

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.553",
+  "version": "0.2.554",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -74,7 +74,7 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/stx": "0.2.553",
-    "stx-router": "0.2.553"
+    "@stacksjs/stx": "0.2.554",
+    "stx-router": "0.2.554"
   }
 }