astro-loader-pocketbase 2.7.1-next.1 → 2.7.1-next.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "astro-loader-pocketbase",
-  "version": "2.7.1-next.1",
+  "version": "2.7.1-next.2",
   "description": "A content loader for Astro that uses the PocketBase API",
   "keywords": [
     "astro",
@@ -29,8 +29,8 @@
   "scripts": {
     "format": "npx prettier . --write --cache",
     "format:check": "npx prettier . --check --cache",
-    "lint": "npx eslint --cache",
-    "lint:fix": "npx eslint --fix --cache",
+    "lint": "oxlint",
+    "lint:fix": "oxlint --fix",
     "prepare": "husky",
     "test": "vitest run",
     "test:e2e": "vitest run $(find test -name '*.e2e-spec.ts')",
@@ -45,27 +45,23 @@
   "devDependencies": {
     "@commitlint/cli": "^19.8.1",
     "@commitlint/config-conventional": "^19.8.1",
-    "@eslint/js": "^9.30.1",
-    "@stylistic/eslint-plugin": "^5.1.0",
     "@types/node": "^22.14.1",
     "@vitest/coverage-v8": "^3.2.4",
-    "astro": "^5.11.0",
-    "eslint": "^9.30.1",
-    "eslint-config-prettier": "^10.1.5",
+    "astro": "^5.12.8",
     "globals": "^16.3.0",
     "husky": "^9.1.7",
-    "lint-staged": "^16.1.2",
+    "lint-staged": "^16.1.4",
+    "oxlint": "^1.10.0",
     "prettier": "^3.6.2",
-    "prettier-plugin-organize-imports": "^4.1.0",
-    "prettier-plugin-packagejson": "^2.5.18",
-    "typescript": "^5.8.3",
-    "typescript-eslint": "^8.35.1",
+    "prettier-plugin-organize-imports": "^4.2.0",
+    "prettier-plugin-packagejson": "^2.5.19",
+    "typescript": "^5.9.2",
     "vitest": "^3.2.4"
   },
   "peerDependencies": {
     "astro": "^5.0.0"
   },
-  "packageManager": "npm@11.4.2",
+  "packageManager": "npm@11.5.2",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/pocketbase-loader.ts

@@ -3,7 +3,7 @@ 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";
+import { createTokenPromise } from "./utils/create-token-promise";
 
 /**
  * Loader for collections stored in PocketBase.
@@ -11,24 +11,8 @@ import { getSuperuserToken } from "./utils/get-superuser-token";
  * @param options Options for the loader. See {@link PocketBaseLoaderOptions} for more details.
  */
 export function pocketbaseLoader(options: PocketBaseLoaderOptions): Loader {
-  let tokenPromise: Promise<string | undefined>;
-  if (options.superuserCredentials) {
-    if ("impersonateToken" in options.superuserCredentials) {
-      // Impersonate token provided, so use it directly.
-      tokenPromise = Promise.resolve(
-        options.superuserCredentials.impersonateToken
-      );
-    } else {
-      // Email and password provided, so get a temporary superuser token.
-      tokenPromise = getSuperuserToken(
-        options.url,
-        options.superuserCredentials
-      );
-    }
-  } else {
-    // No credentials provided, so no token can be used.
-    tokenPromise = Promise.resolve(undefined);
-  }
+  // Create shared promise for the superuser token, which can be reused
+  const tokenPromise = createTokenPromise(options);
 
   return {
     name: "pocketbase-loader",

package/src/schema/parse-schema.ts

@@ -41,7 +41,7 @@ export function parseSchema(
           lat: z.number()
         });
         break;
-      case "select":
+      case "select": {
         if (!field.values) {
           throw new Error(
             `Field ${field.name} is of type "select" but has no values defined.`
@@ -55,6 +55,7 @@ export function parseSchema(
         // Parse the field type based on the number of values it can have
         fieldType = parseSingleOrMultipleValues(field, values);
         break;
+      }
       case "relation":
       case "file":
         // NOTE: Relations are currently not supported and are treated as strings
@@ -116,7 +117,7 @@ function parseSingleOrMultipleValues(
   // If the select allows multiple values, create an array of the enum
   if (field.maxSelect === undefined || field.maxSelect === 1) {
     return type;
-  } else {
-    return z.array(type);
   }
+
+  return z.array(type);
 }

package/src/utils/create-token-promise.ts

@@ -0,0 +1,25 @@
+import type { PocketBaseLoaderOptions } from "../types/pocketbase-loader-options.type";
+import { getSuperuserToken } from "./get-superuser-token";
+
+/**
+ * Creates a promise that resolves to a superuser token or undefined.
+ */
+export async function createTokenPromise(
+  options: Pick<PocketBaseLoaderOptions, "url" | "superuserCredentials">
+): Promise<string | undefined> {
+  if (options.superuserCredentials) {
+    if ("impersonateToken" in options.superuserCredentials) {
+      // Impersonate token provided, so use it directly.
+      return options.superuserCredentials.impersonateToken;
+    }
+    // Email and password provided, so get a temporary superuser token.
+    const token = await getSuperuserToken(
+      options.url,
+      options.superuserCredentials
+    );
+    return token;
+  }
+
+  // No credentials provided, so no token can be used.
+  return undefined;
+}

package/src/utils/slugify.ts

@@ -10,13 +10,13 @@ export function slugify(input: string): string {
   return input
     .toString()
     .toLowerCase()
-    .replace(/\s+/g, "-") // Replace spaces with -
-    .replace(/ä/g, "ae") // Replace umlauts
-    .replace(/ö/g, "oe")
-    .replace(/ü/g, "ue")
-    .replace(/ß/g, "ss")
-    .replace(/[^\w-]+/g, "") // Remove all non-word chars
-    .replace(/--+/g, "-") // Replace multiple - with single -
+    .replaceAll(/\s+/g, "-") // Replace spaces with -
+    .replaceAll("ä", "ae") // Replace umlauts
+    .replaceAll("ö", "oe")
+    .replaceAll("ü", "ue")
+    .replaceAll("ß", "ss")
+    .replaceAll(/[^\w-]+/g, "") // Remove all non-word chars
+    .replaceAll(/--+/g, "-") // Replace multiple - with single -
     .replace(/^-+/, "") // Trim - from start of text
     .replace(/-+$/, ""); // Trim - from end of text
 }