astro-loader-pocketbase 2.6.2 → 2.6.3-next.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-loader-pocketbase",
-  "version": "2.6.2",
+  "version": "2.6.3-next.1",
   "description": "A content loader for Astro that uses the PocketBase API",
   "keywords": [
     "astro",

package/src/loader/loader.ts

@@ -1,15 +1,18 @@
 import type { LoaderContext } from "astro/loaders";
 import packageJson from "../../package.json";
 import type { PocketBaseLoaderOptions } from "../types/pocketbase-loader-options.type";
-import { getSuperuserToken } from "../utils/get-superuser-token";
 import { shouldRefresh } from "../utils/should-refresh";
 import { cleanupEntries } from "./cleanup-entries";
 import { handleRealtimeUpdates } from "./handle-realtime-updates";
 import { loadEntries } from "./load-entries";
 
+/**
+ * Load entries from a PocketBase collection.
+ */
 export async function loader(
   context: LoaderContext,
-  options: PocketBaseLoaderOptions
+  options: PocketBaseLoaderOptions,
+  token: string | undefined
 ): Promise<void> {
   context.logger.label = `pocketbase-loader:${options.collectionName}`;
 
@@ -59,16 +62,6 @@ export async function loader(
     lastModified = undefined;
   }
 
-  // Try to get a superuser token to access all resources.
-  let token: string | undefined;
-  if (options.superuserCredentials) {
-    token = await getSuperuserToken(
-      options.url,
-      options.superuserCredentials,
-      context.logger
-    );
-  }
-
   if (context.store.keys().length > 0) {
     // Cleanup entries that are no longer in the collection
     await cleanupEntries(options, context, token);

package/src/pocketbase-loader.ts

@@ -1,7 +1,9 @@
 import type { Loader } from "astro/loaders";
+import type { ZodSchema } from "astro/zod";
 import { loader } from "./loader/loader";
 import { generateSchema } from "./schema/generate-schema";
 import type { PocketBaseLoaderOptions } from "./types/pocketbase-loader-options.type";
+import { getSuperuserToken } from "./utils/get-superuser-token";
 
 /**
  * Loader for collections stored in PocketBase.
@@ -9,11 +11,27 @@ import type { PocketBaseLoaderOptions } from "./types/pocketbase-loader-options.
  * @param options Options for the loader. See {@link PocketBaseLoaderOptions} for more details.
  */
 export function pocketbaseLoader(options: PocketBaseLoaderOptions): Loader {
+  // Get a superuser token if credentials are provided
+  let tokenPromise: Promise<string | undefined>;
+  if (options.superuserCredentials) {
+    tokenPromise = getSuperuserToken(options.url, options.superuserCredentials);
+  } else {
+    tokenPromise = Promise.resolve(undefined);
+  }
+
   return {
     name: "pocketbase-loader",
-    // Load the entries from the collection
-    load: async (context) => loader(context, options),
-    // Generate the schema for the collection according to the API
-    schema: async () => await generateSchema(options)
+    load: async (context): Promise<void> => {
+      const token = await tokenPromise;
+
+      // Load the entries from the collection
+      await loader(context, options, token);
+    },
+    schema: async (): Promise<ZodSchema> => {
+      const token = await tokenPromise;
+
+      // Generate the schema for the collection according to the API
+      return await generateSchema(options, token);
+    }
   };
 }

package/src/schema/generate-schema.ts

@@ -28,14 +28,18 @@ const VALID_ID_TYPES = ["text", "number", "email", "url", "date"];
  * If a path to a local schema file is provided, the schema is read from the file.
  *
  * @param options Options for the loader. See {@link PocketBaseLoaderOptions} for more details.
+ * @param token The superuser token to authenticate the request.
  */
 export async function generateSchema(
-  options: PocketBaseLoaderOptions
+  options: PocketBaseLoaderOptions,
+  token: string | undefined
 ): Promise<ZodSchema> {
   let collection: PocketBaseCollection | undefined;
 
-  // Try to get the schema directly from the PocketBase instance
-  collection = await getRemoteSchema(options);
+  if (token) {
+    // Try to get the schema directly from the PocketBase instance
+    collection = await getRemoteSchema(options, token);
+  }
 
   const hasSuperuserRights = !!collection || !!options.superuserCredentials;
 

package/src/schema/get-remote-schema.ts

@@ -1,30 +1,16 @@
 import type { PocketBaseLoaderOptions } from "../types/pocketbase-loader-options.type";
 import type { PocketBaseCollection } from "../types/pocketbase-schema.type";
-import { getSuperuserToken } from "../utils/get-superuser-token";
 
 /**
  * Fetches the schema for the specified collection from the PocketBase instance.
  *
  * @param options Options for the loader. See {@link PocketBaseLoaderOptions} for more details.
+ * @param token The superuser token to authenticate the request.
  */
 export async function getRemoteSchema(
-  options: PocketBaseLoaderOptions
+  options: PocketBaseLoaderOptions,
+  token: string
 ): Promise<PocketBaseCollection | undefined> {
-  if (!options.superuserCredentials) {
-    return undefined;
-  }
-
-  // Get a superuser token
-  const token = await getSuperuserToken(
-    options.url,
-    options.superuserCredentials
-  );
-
-  // If the token is invalid try another method
-  if (!token) {
-    return undefined;
-  }
-
   // Build URL and headers for the schema request
   const schemaUrl = new URL(
     `api/collections/${options.collectionName}`,