bun-plugin-stx 0.2.6 → 0.2.8

package/dist/client.js

@@ -1,5 +1,5 @@
 // @bun
-import"./chunk-eecw9x2f.js";
+import"./chunk-2mx7fq49.js";
 
 // src/client.ts
 var version = "1.0.0";

package/dist/index.js

@@ -8,8 +8,8 @@ import {
   startWatchMode,
   stxPlugin,
   watchAndBuild
-} from "./chunk-j0k3wkwg.js";
-import"./chunk-eecw9x2f.js";
+} from "./chunk-a3qganyh.js";
+import"./chunk-2mx7fq49.js";
 export {
   watchAndBuild,
   stxPlugin,

package/dist/preload.js

@@ -1,8 +1,8 @@
 // @bun
 import {
   src_default
-} from "./chunk-j0k3wkwg.js";
-import"./chunk-eecw9x2f.js";
+} from "./chunk-a3qganyh.js";
+import"./chunk-2mx7fq49.js";
 
 // src/preload.ts
 var {plugin } = globalThis.Bun;

package/dist/serve.d.ts

@@ -9,4 +9,7 @@ export declare interface ServeOptions {
   componentsDir?: string
   layoutsDir?: string
   partialsDir?: string
+  quiet?: boolean
+  routes?: Record<string, (req: Request) => Response | Promise<Response>>
+  onRequest?: (req: Request) => Response | Promise<Response> | null | undefined
 }

package/dist/serve.js

@@ -2,7 +2,7 @@
 // @bun
 import {
   __require
-} from "./chunk-eecw9x2f.js";
+} from "./chunk-2mx7fq49.js";
 
 // src/serve.ts
 var {serve: bunServe, Glob } = globalThis.Bun;
@@ -5145,9 +5145,8 @@ After installing: bun add bun-plugin-stx`);
       return crosswindModule;
     crosswindLoadAttempted = true;
     try {
-      const mod = await import("@cwcss/crosswind");
+      const mod = await import("./chunk-fj6fej0j.js");
       crosswindModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
-      console.log("\u2705 Crosswind CSS engine loaded");
       return crosswindModule;
     } catch {
       try {
@@ -5155,10 +5154,8 @@ After installing: bun add bun-plugin-stx`);
         const localPath = nodePath.join(process13.env.HOME || "", "Code/Tools/crosswind/packages/crosswind/src/index.ts");
         const mod = await import(localPath);
         crosswindModule = { CSSGenerator: mod.CSSGenerator, config: mod.config };
-        console.log("\u2705 Crosswind CSS engine loaded from local path");
         return crosswindModule;
       } catch {
-        console.warn("\u26A0\uFE0F Crosswind CSS engine not available");
         return null;
       }
     }
@@ -5193,15 +5190,30 @@ After installing: bun add bun-plugin-stx`);
   async function processTemplate(filePath) {
     const path = await import("path");
     const content = await Bun.file(filePath).text();
-    const serverScriptMatch = content.match(/<script\s+server\b[^>]*>([\s\S]*?)<\/script>/i);
-    const scriptContent = serverScriptMatch ? serverScriptMatch[1] : "";
-    const templateContent = serverScriptMatch ? content.replace(/<script\s+server\b[^>]*>[\s\S]*?<\/script>/gi, "") : content;
+    const scriptRegex = /<script\b([^>]*)>([\s\S]*?)<\/script>/gi;
+    const clientScripts = [];
+    const serverScripts = [];
+    let scriptMatch;
+    while ((scriptMatch = scriptRegex.exec(content)) !== null) {
+      const attrs = scriptMatch[1];
+      const scriptBody = scriptMatch[2];
+      const fullScript = scriptMatch[0];
+      const isClientScript = attrs.includes("client") || attrs.includes('type="module"') || attrs.includes("src=");
+      if (isClientScript) {
+        clientScripts.push(fullScript);
+      } else {
+        serverScripts.push(scriptBody);
+      }
+    }
+    let templateContent = content.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "");
     const context = {
       __filename: filePath,
       __dirname: path.dirname(filePath)
     };
-    const { processDirectives, extractVariables, defaultConfig: defaultConfig3, generateSpaShell } = await import("@stacksjs/stx");
-    await extractVariables(scriptContent, context, filePath);
+    const { processDirectives, extractVariables, defaultConfig: defaultConfig3, generateSpaShell, injectRouterScript } = await import("@stacksjs/stx");
+    for (const scriptBody of serverScripts) {
+      await extractVariables(scriptBody, context, filePath);
+    }
     const config3 = {
       ...defaultConfig3,
       ...componentsDir && { componentsDir },
@@ -5218,6 +5230,7 @@ After installing: bun add bun-plugin-stx`);
     let output = templateContent;
     const dependencies = new Set;
     output = await processDirectives(output, context, filePath, config3, dependencies);
+    output = injectRouterScript(output);
     const hasDirectiveTemplates = /<template\s[^>]*(?:@for|:for|@if|:if)/.test(output);
     if (hasDirectiveTemplates) {
       output = output.replace(/<template(?:\s[^>]*)?>|<\/template>/gi, (match) => {
@@ -5346,9 +5359,22 @@ ${crosswindCSS}</style>`;
   async function processTemplateDynamic(filePath, paramNames, paramValues, routePath) {
     const path = await import("path");
     const content = await Bun.file(filePath).text();
-    const serverScriptMatch = content.match(/<script\s+server\b[^>]*>([\s\S]*?)<\/script>/i);
-    const scriptContent = serverScriptMatch ? serverScriptMatch[1] : "";
-    const templateContent = serverScriptMatch ? content.replace(/<script\s+server\b[^>]*>[\s\S]*?<\/script>/gi, "") : content;
+    const dynScriptRegex = /<script\b([^>]*)>([\s\S]*?)<\/script>/gi;
+    const dynClientScripts = [];
+    const dynServerScripts = [];
+    let dynScriptMatch;
+    while ((dynScriptMatch = dynScriptRegex.exec(content)) !== null) {
+      const attrs = dynScriptMatch[1];
+      const scriptBody = dynScriptMatch[2];
+      const fullScript = dynScriptMatch[0];
+      const isClientScript = attrs.includes("client") || attrs.includes('type="module"') || attrs.includes("src=");
+      if (isClientScript) {
+        dynClientScripts.push(fullScript);
+      } else {
+        dynServerScripts.push(scriptBody);
+      }
+    }
+    const templateContent = content.replace(/<script\b[^>]*>[\s\S]*?<\/script>/gi, "");
     const context = {
       __filename: filePath,
       __dirname: path.dirname(filePath),
@@ -5357,8 +5383,10 @@ ${crosswindCSS}</style>`;
     for (let i = 0;i < paramNames.length; i++) {
       context[paramNames[i]] = paramValues[i];
     }
-    const { processDirectives, extractVariables, defaultConfig: defaultConfig3 } = await import("@stacksjs/stx");
-    await extractVariables(scriptContent, context, filePath);
+    const { processDirectives, extractVariables, defaultConfig: defaultConfig3, injectRouterScript: injectRouter } = await import("@stacksjs/stx");
+    for (const scriptBody of dynServerScripts) {
+      await extractVariables(scriptBody, context, filePath);
+    }
     const config3 = {
       ...defaultConfig3,
       ...componentsDir && { componentsDir },
@@ -5368,6 +5396,7 @@ ${crosswindCSS}</style>`;
     let output = templateContent;
     const dependencies = new Set;
     output = await processDirectives(output, context, filePath, config3, dependencies);
+    output = injectRouter(output);
     output = output.replace(/<template[^>]*>/gi, "").replace(/<\/template>/gi, "");
     const crosswindCSS = await generateCrosswindCSS(output);
     if (crosswindCSS) {
@@ -5385,9 +5414,8 @@ ${crosswindCSS}</style>`;
     }
     return output;
   }
-  console.log(`\uD83C\uDF10 Server running at: http://localhost:${port}`);
-  console.log(`\uD83D\uDCA1 Templates will be processed on first request
-`);
+  if (!options.quiet)
+    console.log(`  \u2713 Frontend running at http://localhost:${port}`);
   const corsHeaders = {
     "Access-Control-Allow-Origin": "*",
     "Access-Control-Allow-Methods": "GET, POST, OPTIONS",
@@ -5401,6 +5429,17 @@ ${crosswindCSS}</style>`;
       if (req.method === "OPTIONS") {
         return new Response(null, { headers: corsHeaders });
       }
+      if (options.onRequest) {
+        const customResponse = await options.onRequest(req);
+        if (customResponse)
+          return customResponse;
+      }
+      if (options.routes) {
+        const routeHandler = options.routes[path];
+        if (routeHandler) {
+          return routeHandler(req);
+        }
+      }
       if (path.startsWith("/api/data/") && req.method === "POST") {
         try {
           const tableName = path.replace("/api/data/", "").split("/")[0];

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "bun-plugin-stx",
   "type": "module",
-  "version": "0.2.6",
+  "version": "0.2.8",
   "description": "A Bun plugin that allows for using Laravel Blade-like syntax.",
   "author": "Chris Breuer <chris@stacksjs.org>",
   "license": "MIT",
@@ -25,20 +25,25 @@
   ],
   "exports": {
     ".": {
+      "bun": "./src/index.ts",
       "types": "./dist/index.d.ts",
       "import": "./dist/index.js"
     },
     "./client": {
+      "bun": "./src/client.ts",
       "types": "./dist/client.d.ts",
       "import": "./dist/client.js"
     },
     "./preload": {
+      "bun": "./src/preload.ts",
       "import": "./dist/preload.js"
     },
     "./serve": {
+      "bun": "./src/serve.ts",
       "import": "./dist/serve.js"
     },
     "./*": {
+      "bun": "./src/*",
       "import": "./dist/*"
     }
   },
@@ -67,6 +72,6 @@
     "typecheck": "bun tsc --noEmit"
   },
   "dependencies": {
-    "@stacksjs/stx": "0.2.6"
+    "@stacksjs/stx": "0.2.8"
   }
 }