astro-loader-pocketbase 2.2.0-next.2 → 2.2.1-next.1

package/README.md

@@ -110,7 +110,7 @@ It's recommended to use e.g. the title of the entry to be easily searchable and
 
 ### Improved types
 
-By default PocketBase reports `number` and `boolean` fields as not required, even though the API will always return at least `0` and `false` respectively.
+By default PocketBase reports `number` and `boolean` fields as not required, even though the API will always return `0` and `false` respectively if no value is set.
 This means that the loader will add `undefined` to the type of these fields.
 If you want to enforce that these fields are always present, you can set the `improveTypes` option to `true`.
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-loader-pocketbase",
-  "version": "2.2.0-next.2",
+  "version": "2.2.1-next.1",
   "description": "A content loader for Astro that uses the PocketBase API",
   "license": "MIT",
   "author": "Luis Wolf <development@pawcode.de> (https://pawcode.de)",

package/src/pocketbase-loader.ts

@@ -5,6 +5,7 @@ import { generateSchema } from "./generate-schema";
 import { loadEntries } from "./load-entries";
 import type { PocketBaseLoaderOptions } from "./types/pocketbase-loader-options.type";
 import { getSuperuserToken } from "./utils/get-superuser-token";
+import { shouldRefresh } from "./utils/should-refresh";
 
 /**
  * Loader for collections stored in PocketBase.
@@ -15,13 +16,12 @@ export function pocketbaseLoader(options: PocketBaseLoaderOptions): Loader {
   return {
     name: "pocketbase-loader",
     load: async (context: LoaderContext): Promise<void> => {
-      if (
-        context.refreshContextData?.source === "astro-integration-pocketbase" &&
-        context.refreshContextData.collection &&
-        context.refreshContextData.collection !== options.collectionName
-      ) {
-        // Skip the refresh if the reload was triggered by the `astro-integration-pocketbase`
-        // and the collection name does not match the current collection.
+      // Check if the collection should be refreshed.
+      const refresh = shouldRefresh(
+        context.refreshContextData,
+        options.collectionName
+      );
+      if (!refresh) {
         return;
       }
 

package/src/utils/parse-schema.ts

@@ -25,11 +25,9 @@ export function parseSchema(
     // Determine the field type and create the corresponding Zod type
     switch (field.type) {
       case "number":
-        // Coerce the value to a number
         fieldType = z.number();
         break;
       case "bool":
-        // Coerce the value to a boolean
         fieldType = z.boolean();
         break;
       case "date":

package/src/utils/should-refresh.ts

@@ -0,0 +1,32 @@
+import type { LoaderContext } from "astro/loaders";
+
+/**
+ * Checks if the collection should be refreshed.
+ */
+export function shouldRefresh(
+  context: LoaderContext["refreshContextData"],
+  collectionName: string
+): boolean {
+  // Check if the refresh was triggered by the `astro-integration-pocketbase`
+  // and the correct metadata is provided.
+  if (
+    !context ||
+    context.source !== "astro-integration-pocketbase" ||
+    !context.collection
+  ) {
+    return true;
+  }
+
+  // Check if the collection name matches the current collection.
+  if (typeof context.collection === "string") {
+    return context.collection === collectionName;
+  }
+
+  // Check if the collection is included in the list of collections.
+  if (Array.isArray(context.collection)) {
+    return context.collection.includes(collectionName);
+  }
+
+  // Should not happen but return true to be safe.
+  return true;
+}