astro-tractstack 2.0.5 → 2.0.7

package/dist/index.js

@@ -1,6 +1,6 @@
 import { fileURLToPath as d } from "node:url";
 import { dirname as i, resolve as l } from "node:path";
-import { existsSync as r, mkdirSync as x, copyFileSync as k, writeFileSync as u } from "node:fs";
+import { existsSync as n, mkdirSync as x, copyFileSync as k, writeFileSync as u } from "node:fs";
 import { resolve as a } from "path";
 function b(t) {
   const e = i(d(t));
@@ -10,7 +10,7 @@ function b(t) {
 }
 function g(t, e) {
   e.info("TractStack configuration applied"), t.enableMultiTenant && e.info("Multi-tenant mode enabled"), t.includeExamples && e.info("Example components will be included");
-  const c = process.env.PUBLIC_GO_BACKEND, o = process.env.PUBLIC_TENANTID;
+  const c = process.env.PUBLIC_GO_BACKEND, r = process.env.PUBLIC_TENANTID;
   if (!c)
     e.warn("PUBLIC_GO_BACKEND not set - this will be required at runtime");
   else
@@ -19,11 +19,11 @@ function g(t, e) {
     } catch {
       e.error(`PUBLIC_GO_BACKEND is not a valid URL: ${c}`);
     }
-  return o ? /^[a-zA-Z0-9_-]+$/.test(o) ? e.info(`Tenant ID validated: ${o}`) : e.error(`PUBLIC_TENANTID contains invalid characters: ${o}`) : e.warn("PUBLIC_TENANTID not set - this will be required at runtime"), t;
+  return r ? /^[a-zA-Z0-9_-]+$/.test(r) ? e.info(`Tenant ID validated: ${r}`) : e.error(`PUBLIC_TENANTID contains invalid characters: ${r}`) : e.warn("PUBLIC_TENANTID not set - this will be required at runtime"), t;
 }
 async function w(t, e, c) {
   e.info("TractStack: Injecting template files");
-  const o = [
+  const r = [
     // Core Configuration
     {
       src: t("../templates/env.example"),
@@ -564,6 +564,10 @@ async function w(t, e, c) {
       src: t("../templates/src/stores/backend.ts"),
       dest: "src/stores/backend.ts"
     },
+    {
+      src: t("../templates/src/stores/resources.ts"),
+      dest: "src/stores/resources.ts"
+    },
     // Compositor stores
     {
       src: t("../templates/src/stores/nodes.ts"),
@@ -1298,6 +1302,10 @@ async function w(t, e, c) {
       src: t("../templates/src/lib/session.ts"),
       dest: "src/lib/session.ts"
     },
+    {
+      src: t("../templates/src/lib/resources.ts"),
+      dest: "src/lib/resources.ts"
+    },
     // Client Scripts
     {
       src: t("../templates/src/client/htmx.min.js"),
@@ -2056,6 +2064,13 @@ async function w(t, e, c) {
       dest: "src/custom/CustomRoutes.astro",
       protected: !0
     },
+    {
+      src: t(
+        c?.includeExamples ? "../templates/custom/with-examples/HeaderWidget.astro" : "../templates/custom/minimal/HeaderWidget.astro"
+      ),
+      dest: "src/custom/HeaderWidget.astro",
+      protected: !0
+    },
     {
       src: t("../templates/src/utils/customHelpers.ts"),
       dest: "src/utils/customHelpers.ts",
@@ -2099,13 +2114,13 @@ async function w(t, e, c) {
       }
     ] : []
   ];
-  for (const s of o)
+  for (const s of r)
     try {
       const p = i(s.dest);
-      r(p) || x(p, { recursive: !0 });
-      const n = !s.protected && (s.dest === "tailwind.config.cjs" || s.dest.startsWith("src/components/codehooks/") || s.dest.startsWith("src/components/widgets/") || s.dest.startsWith("src/") || s.dest.startsWith("public/client/") || s.dest === ".gitignore");
-      if (!r(s.dest) || n)
-        if (r(s.src))
+      n(p) || x(p, { recursive: !0 });
+      const o = !s.protected && (s.dest === "tailwind.config.cjs" || s.dest.startsWith("src/components/codehooks/") || s.dest.startsWith("src/components/widgets/") || s.dest.startsWith("src/") || s.dest.startsWith("public/client/") || s.dest === ".gitignore");
+      if (!n(s.dest) || o)
+        if (n(s.src))
           k(s.src, s.dest), e.info(`Updated ${s.dest}`);
         else {
           const m = _(s.dest);
@@ -2113,8 +2128,8 @@ async function w(t, e, c) {
         }
       else s.protected ? e.info(`Protected: ${s.dest} (skipped overwrite)`) : e.info(`Skipped existing ${s.dest}`);
     } catch (p) {
-      const n = p instanceof Error ? p.message : String(p);
-      e.error(`Failed to create ${s.dest}: ${n}`);
+      const o = p instanceof Error ? p.message : String(p);
+      e.error(`Failed to create ${s.dest}: ${o}`);
     }
 }
 function _(t) {
@@ -2133,7 +2148,7 @@ function C(t = {}) {
   return {
     name: "astro-tractstack",
     hooks: {
-      "astro:config:setup": async ({ config: c, updateConfig: o, logger: s }) => {
+      "astro:config:setup": async ({ config: c, updateConfig: r, logger: s }) => {
         g(t, s);
         const p = t.enableMultiTenant || !1;
         if (s.info(
@@ -2153,7 +2168,7 @@ function C(t = {}) {
           ), new Error(
             "TractStack requires an SSR adapter. Please add @astrojs/node adapter to your astro.config.mjs"
           );
-        o({
+        r({
           vite: {
             define: {
               __TRACTSTACK_VERSION__: JSON.stringify("2.0.0-alpha.1"),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-tractstack",
-  "version": "2.0.5",
+  "version": "2.0.7",
   "description": "Astro integration for TractStack - redeeming the web from boring experiences",
   "type": "module",
   "main": "dist/index.js",

package/templates/custom/minimal/HeaderWidget.astro

@@ -0,0 +1,35 @@
+---
+/*
+// ========================================================================================
+// CUSTOM HEADER WIDGET
+// ========================================================================================
+// This widget is rendered on every page above the main header. It is designed to
+// fetch and display site-wide content, such as promotional banners or alerts.
+//
+// To activate this component:
+// 1. Uncomment all the code within these '---' fences.
+// 2. Define your desired resource categories in the `resourceCategories` array.
+// 3. Add your Astro/HTML markup in the empty space after the closing '---' below.
+// ========================================================================================
+
+// --- UNCOMMENT BELOW TO ACTIVATE ---
+
+// import { getHeaderResources } from '@/lib/resources';
+// import type { ResourceNode } from '@/types/compositorTypes';
+
+// export interface Props {
+//   tenantId: string;
+// }
+// const { tenantId } = Astro.props;
+
+// // Add the slugs of the resource categories you want to fetch here.
+// const resourceCategories = []; // e.g., ['promotions', 'site-alerts']
+
+// // This function automatically fetches and caches the resources.
+// const resources: ResourceNode[] =
+//   resourceCategories.length > 0
+//     ? await getHeaderResources(tenantId, resourceCategories)
+//     : [];
+
+*/
+---

package/templates/custom/with-examples/HeaderWidget.astro

@@ -0,0 +1,35 @@
+---
+/*
+// ========================================================================================
+// CUSTOM HEADER WIDGET
+// ========================================================================================
+// This widget is rendered on every page above the main header. It is designed to
+// fetch and display site-wide content, such as promotional banners or alerts.
+//
+// To activate this component:
+// 1. Uncomment all the code within these '---' fences.
+// 2. Define your desired resource categories in the `resourceCategories` array.
+// 3. Add your Astro/HTML markup in the empty space after the closing '---' below.
+// ========================================================================================
+
+// --- UNCOMMENT BELOW TO ACTIVATE ---
+
+// import { getHeaderResources } from '@/lib/resources';
+// import type { ResourceNode } from '@/types/compositorTypes';
+
+// export interface Props {
+//   tenantId: string;
+// }
+// const { tenantId } = Astro.props;
+
+// // Add the slugs of the resource categories you want to fetch here.
+// const resourceCategories = []; // e.g., ['promotions', 'site-alerts']
+
+// // This function automatically fetches and caches the resources.
+// const resources: ResourceNode[] =
+//   resourceCategories.length > 0
+//     ? await getHeaderResources(tenantId, resourceCategories)
+//     : [];
+
+*/
+---

package/templates/src/components/edit/panels/StyleLinkPanel_config.tsx

@@ -67,8 +67,20 @@ const StyleLinkConfigPanel = ({ node, config }: StyleLinkConfigPanelProps) => {
         linkNode.tagName = 'button';
       } else if (callbackPayload.startsWith('(bunnyMoment')) {
         linkNode.tagName = 'button';
-        newButtonPayload.bunnyPayload =
-          (tokens && preParseBunny([tokens])) ?? undefined;
+        if (
+          tokens &&
+          Array.isArray(tokens) &&
+          tokens[0] === 'bunnyMoment' &&
+          Array.isArray(tokens[1])
+        ) {
+          const params = tokens[1];
+          if (params.length === 2) {
+            newButtonPayload.bunnyPayload = {
+              videoId: String(params[0]),
+              t: String(params[1]),
+            };
+          }
+        }
       } else if (callbackPayload.startsWith('(goto')) {
         const targetUrl =
           tokens && preParseAction([tokens], slug, isContext, config);

package/templates/src/components/form/ActionBuilderField.tsx

@@ -87,10 +87,11 @@ export default function ActionBuilderField({
       return;
     }
 
-    if (command === 'identifyAs') {
+    if (command === 'bunnyMoment') {
+      onChange(trimmedParams);
+    } else if (command === 'identifyAs') {
       const firstSpaceIndex = trimmedParams.indexOf(' ');
       if (firstSpaceIndex === -1) {
-        // Handle case with only beliefId and no value
         onChange(`(${command} ${trimmedParams})`);
       } else {
         const beliefId = trimmedParams.substring(0, firstSpaceIndex);
@@ -99,7 +100,6 @@ export default function ActionBuilderField({
         onChange(`(${command} ${beliefId} ${finalValue})`);
       }
     } else {
-      // Original behavior for all other commands
       onChange(`(${command} ${trimmedParams})`);
     }
   };

package/templates/src/layouts/Layout.astro

@@ -1,5 +1,6 @@
 ---
 import { ClientRouter } from 'astro:transitions';
+import HeaderWidget from '@/custom/HeaderWidget.astro';
 import Header from '@/components/Header.astro';
 import Footer from '@/components/Footer.astro';
 import { getBrandConfig } from '@/utils/api/brandConfig';
@@ -238,6 +239,7 @@ const enableBunny = import.meta.env.PUBLIC_ENABLE_BUNNY === 'true';
   </head>
   <body class="font-main w-full">
     <div class="overflow-hidden">
+      {!isStoryKeep && !isEditor && <HeaderWidget tenantId={tenantId} />}
       {
         !isEditor && (
           <Header

package/templates/src/lib/resources.ts

@@ -0,0 +1,69 @@
+import { headerResourcesStore, HEADER_RESOURCES_TTL } from '@/stores/resources';
+import type { ResourceNode } from '@/types/compositorTypes';
+
+/**
+ * Fetches resource nodes based on categories, with server-side in-memory caching
+ * to prevent redundant API calls for high-traffic, site-wide components.
+ *
+ * @param tenantId The ID of the current tenant.
+ * @param categories An array of resource category slugs to fetch.
+ * @param ttl Optional. The Time-To-Live for the cache in milliseconds. Defaults to 5 minutes.
+ * @returns A promise that resolves to an array of ResourceNode objects.
+ */
+export async function getHeaderResources(
+  tenantId: string,
+  categories: string[],
+  ttl: number = HEADER_RESOURCES_TTL
+): Promise<ResourceNode[]> {
+  const cache = headerResourcesStore.get();
+  const now = Date.now();
+
+  // If we have fresh data in the cache, return it immediately.
+  if (cache.data.length > 0 && now - cache.lastFetched < ttl) {
+    return cache.data;
+  }
+
+  // If no categories are requested, there's nothing to fetch.
+  if (!categories || categories.length === 0) {
+    return [];
+  }
+
+  const goBackend =
+    import.meta.env.PUBLIC_GO_BACKEND || 'http://localhost:8080';
+
+  try {
+    // THIS IS THE CORRECTED ENDPOINT
+    const response = await fetch(`${goBackend}/api/v1/nodes/resources`, {
+      method: 'POST',
+      headers: {
+        'Content-Type': 'application/json',
+        'X-Tenant-ID': tenantId,
+      },
+      body: JSON.stringify({ categories }),
+    });
+
+    if (!response.ok) {
+      console.error(
+        `Failed to fetch header resources. Status: ${response.status}`
+      );
+      // Gracefully degrade: return old data if we have it, otherwise an empty array.
+      return cache.data;
+    }
+
+    // The backend returns a payload like { resources: [...] }
+    const responsePayload = await response.json();
+    const resources: ResourceNode[] = responsePayload.resources || [];
+
+    // Update the store with the new data and timestamp.
+    headerResourcesStore.set({
+      data: resources,
+      lastFetched: now,
+    });
+
+    return resources;
+  } catch (error) {
+    console.error('Error fetching header resources:', error);
+    // On network error, also return stale data if available.
+    return cache.data;
+  }
+}

package/templates/src/stores/resources.ts

@@ -0,0 +1,17 @@
+import { atom } from 'nanostores';
+import type { ResourceNode } from '@/types/compositorTypes';
+
+export interface ResourcesCache {
+  data: ResourceNode[];
+  lastFetched: number;
+}
+
+// Initialize with an empty state. This atom will live on the server and persist
+// across page requests for the lifetime of the server instance.
+export const headerResourcesStore = atom<ResourcesCache>({
+  data: [],
+  lastFetched: 0,
+});
+
+// Default Time-To-Live for the cache: 5 minutes in milliseconds.
+export const HEADER_RESOURCES_TTL = 5 * 60 * 1000;

package/utils/inject-files.ts

@@ -566,6 +566,10 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/stores/backend.ts'),
       dest: 'src/stores/backend.ts',
     },
+    {
+      src: resolve('../templates/src/stores/resources.ts'),
+      dest: 'src/stores/resources.ts',
+    },
 
     // Compositor stores
     {
@@ -1322,6 +1326,10 @@ export async function injectTemplateFiles(
       src: resolve('../templates/src/lib/session.ts'),
       dest: 'src/lib/session.ts',
     },
+    {
+      src: resolve('../templates/src/lib/resources.ts'),
+      dest: 'src/lib/resources.ts',
+    },
 
     // Client Scripts
     {
@@ -2098,6 +2106,15 @@ export async function injectTemplateFiles(
       dest: 'src/custom/CustomRoutes.astro',
       protected: true,
     },
+    {
+      src: resolve(
+        config?.includeExamples
+          ? '../templates/custom/with-examples/HeaderWidget.astro'
+          : '../templates/custom/minimal/HeaderWidget.astro'
+      ),
+      dest: 'src/custom/HeaderWidget.astro',
+      protected: true,
+    },
     {
       src: resolve('../templates/src/utils/customHelpers.ts'),
       dest: 'src/utils/customHelpers.ts',