astro-integration-pocketbase 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-integration-pocketbase",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "license": "MIT",
   "author": "Luis Wolf <development@pawcode.de> (https://pawcode.de)",
   "homepage": "https://github.com/pawcoding/astro-integration-pocketbase",

package/src/middleware/index.ts

@@ -1,10 +1,10 @@
 import { defineMiddleware } from "astro/middleware";
-import { isPocketbaseEntry } from "./is-pocketbase-entry";
+import { isPocketbaseEntry, type PocketBaseEntry } from "./is-pocketbase-entry";
 
 export const onRequest = defineMiddleware(async (context, next) => {
   // Look for entities given as props to the page
   const props = Object.values(context.props);
-  const entities = props.filter(isPocketbaseEntry).map((prop) => prop.data);
+  const entities = findEntitiesRecursive(props).map((entity) => entity.data);
 
   const response = await next();
   const body = await response.text();
@@ -18,3 +18,26 @@ export const onRequest = defineMiddleware(async (context, next) => {
 
   return new Response(newBody, response);
 });
+
+/**
+ * Find PocketBase entities in the given data.
+ */
+function findEntitiesRecursive(data: unknown): Array<PocketBaseEntry> {
+  // Check if the data is an array and search for entities in each element
+  if (Array.isArray(data)) {
+    return data.flatMap(findEntitiesRecursive);
+  }
+
+  if (typeof data === "object" && data !== null) {
+    // Check if the data is an object and a PocketBase entry
+    if (isPocketbaseEntry(data)) {
+      return [data];
+    }
+
+    // Search for entities in all values
+    return findEntitiesRecursive(Object.values(data));
+  }
+
+  // No entities found
+  return [];
+}

package/src/middleware/is-pocketbase-entry.ts

@@ -4,7 +4,7 @@ import { z } from "astro/zod";
  * Schema for a PocketBase entry created with [astro-loader-pocketbase](https://github.com/pawcoding/astro-loader-pocketbase)
  */
 const pocketbaseEntrySchema = z.object({
-  id: z.string().length(15),
+  id: z.string(),
   data: z.object({
     id: z.string().length(15),
     collectionId: z.string().length(15),

package/src/toolbar/dom/create-entity.ts

@@ -34,7 +34,6 @@ export function createEntity(data: Entity, baseUrl?: string): DevToolbarCard {
   const entity = document.createElement("pre");
   entity.style.margin = "0";
   entity.style.overflow = "auto";
-  entity.style.height = "300px";
   entity.textContent = JSON.stringify(data, null, 2);
   content.appendChild(entity);
 

package/src/toolbar/init-toolbar.ts

@@ -30,6 +30,11 @@ export async function initToolbar(
 
   // Container for the main content
   const contentContainer = document.createElement("div");
+  contentContainer.style.display = "flex";
+  contentContainer.style.flexDirection = "column";
+  contentContainer.style.gap = "8px";
+  contentContainer.style.maxHeight = "400px";
+  contentContainer.style.overflowY = "auto";
   container.appendChild(contentContainer);
 
   const placeholder = createPlaceholder();