@okam/directus-next 1.2.26 → 1.2.28

package/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 1.2.27 (2026-01-21)
+
+### 🧱 Updated Dependencies
+
+- Updated core-lib to 1.17.2
+- Updated next-component to 1.3.5
+- Updated directus-node to 0.7.3
+- Updated directus-query to 1.5.3
+
 ## 1.2.26 (2026-01-19)
 
 ### 🧱 Updated Dependencies

package/draft/index.d.ts

@@ -1,3 +1,3 @@
-export { default as handleDraftRoute, getPathFromRoute, parseDraftParams } from './route';
 export { getDraftSecretDefault } from './env';
+export { getPathFromRoute, default as handleDraftRoute, parseDraftParams } from './route';
 export type { HandleDraftOptions } from './route';

package/draft/route.d.ts

@@ -30,12 +30,12 @@ export declare function parseDraftParams(url: string, expectedSecret: string): z
  * @returns {string}
  */
 export declare function getPathFromRoute(routeUrl: string, url: string, index?: number): string;
-export type HandleDraftOptions = {
+export interface HandleDraftOptions {
     url: string;
     getDirectusLanguage: () => string;
     getDraftSecret?: (() => string) | undefined;
     getJsonError?: (() => Response) | undefined;
-};
+}
 /**
  * Use handleDraft inside the default GET export of route.ts
  * You need to provide url and getDirectusLanguage

package/files/interface.d.ts

@@ -1,8 +1,8 @@
-export type TFiles = {
+export interface TFiles {
     id?: string | null;
     title?: string | null;
     description?: string | null;
-    tags?: any | null;
+    tags?: unknown;
     location?: string | null;
     storage?: string | null;
     focal_point_divider?: string | null;
@@ -21,4 +21,4 @@ export type TFiles = {
      * @deprecated Use `filename_download` instead
      */
     filenameDownload?: string | null;
-};
+}

package/index.d.ts

@@ -1,7 +1,7 @@
 export * from './draft';
-export * from './redirect';
+export type { TFiles } from './files/interface';
 export { logger as DirectusNextLogger } from './logger';
-export { directusRouteRouter } from './router/router';
+export * from './redirect';
 export { getJsonErrorResponse } from './response';
-export * from './types';
-export type { TFiles } from './files/interface';
+export { directusRouteRouter } from './router/router';
+export type * from './types';

package/index.js

@@ -1,10 +1,10 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const router = require("./router-CwzG5Cu9.js");
 const headers = require("next/headers");
 const navigation = require("next/navigation");
 const radashi = require("radashi");
 const zod = require("zod");
-const router = require("./router-DTZYUtal.js");
 const edge = require("@okam/directus-node/edge");
 function _interopNamespaceDefault(e) {
   const n = Object.create(null, { [Symbol.toStringTag]: { value: "Module" } });
@@ -23,9 +23,11 @@ function _interopNamespaceDefault(e) {
   return Object.freeze(n);
 }
 const zod__namespace = /* @__PURE__ */ _interopNamespaceDefault(zod);
+function getDraftSecretDefault() {
+  return process.env.NEXT_API_DRAFT_SECRET || "";
+}
 function getJsonErrorResponse(data, status) {
   const headers2 = {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     "Content-Type": "text/json; charset=UTF-8"
   };
   const body = JSON.stringify(data);
@@ -34,32 +36,33 @@ function getJsonErrorResponse(data, status) {
     headers: headers2
   });
 }
-function getDraftSecretDefault() {
-  return process.env.NEXT_API_DRAFT_SECRET || "";
+function jsonStringsArraySchema(message, code) {
+  return zod__namespace.string().transform((val, ctx) => {
+    try {
+      const decodedVal = decodeURIComponent(decodeURIComponent(val));
+      return JSON.parse(decodedVal);
+    } catch {
+      ctx.addIssue({
+        code: zod__namespace.ZodIssueCode.custom,
+        message: "Invalid JSON string",
+        params: { code }
+      });
+      return zod__namespace.NEVER;
+    }
+  }).pipe(zod__namespace.array(zod__namespace.string(), { error: () => ({ message }) }));
 }
-const jsonStringsArraySchema = (message, code) => zod__namespace.string().transform((val, ctx) => {
-  try {
-    const decodedVal = decodeURIComponent(decodeURIComponent(val));
-    return JSON.parse(decodedVal);
-  } catch (error) {
-    ctx.addIssue({
-      code: zod__namespace.ZodIssueCode.custom,
-      message: "Invalid JSON string",
-      params: { code }
-    });
-    return zod__namespace.NEVER;
-  }
-}).pipe(zod__namespace.array(zod__namespace.string(), { error: () => ({ message }) }));
 const languagesSchema = jsonStringsArraySchema("Invalid languages argument", 400);
 const commonSchema = zod__namespace.object({
   version: zod__namespace.string().optional(),
   enable: zod__namespace.enum(["true", "false"]).transform((val) => val === "true").optional(),
   pk: zod__namespace.string().optional()
 });
-const createSecretSchema = (expectedSecret) => zod__namespace.string({ error: () => ({ message: "Invalid secret argument" }) }).refine((val) => val === expectedSecret, {
-  message: "Invalid secret argument",
-  params: { code: 401 }
-});
+function createSecretSchema(expectedSecret) {
+  return zod__namespace.string({ error: () => ({ message: "Invalid secret argument" }) }).refine((val) => val === expectedSecret, {
+    message: "Invalid secret argument",
+    params: { code: 401 }
+  });
+}
 const draftParamsSchema = zod__namespace.discriminatedUnion(
   "type",
   [
@@ -97,22 +100,22 @@ function getPathFromRoute(routeUrl, url, index = 0) {
   const matches = [...routeUrl.matchAll(/\{\{([a-z]+)\}\}/gi)];
   const map = {};
   matches.forEach((match) => {
-    const key = match[1] || "";
-    if (!key) {
+    const key = match[1] ?? "";
+    if (key == null || key === "") {
       return;
     }
     const listkey = `${key}s`;
     const listParam = searchParams.get(listkey);
-    if (listParam) {
+    if (listParam != null && listParam !== "") {
       try {
         const list = JSON.parse(listParam);
-        map[key] = list[index] || "";
-      } catch (e) {
+        map[key] = list[index] ?? "";
+      } catch {
         map[key] = "";
       }
     } else {
       const param = searchParams.get(key);
-      map[key] = param || "";
+      map[key] = param ?? "";
     }
   });
   return radashi.template(routeUrl, map);
@@ -123,14 +126,15 @@ async function handleDraftRoute({
   getDraftSecret,
   getJsonError
 }) {
-  var _a, _b, _c;
-  const getSecretFunction = getDraftSecret || getDraftSecretDefault;
-  const getJsonErrorResponseFunction = getJsonError || getJsonErrorResponse;
+  const getSecretFunction = getDraftSecret ?? getDraftSecretDefault;
+  const getJsonErrorResponseFunction = getJsonError ?? getJsonErrorResponse;
   const { success, error, data } = parseDraftParams(url, getSecretFunction());
   if (!success) {
+    const issue = error.issues[0];
+    const statusCode = issue?.code === "custom" && typeof issue.params?.code === "number" ? issue.params.code : 400;
     return getJsonErrorResponseFunction(
       { error: error.issues },
-      ((_a = error.issues[0]) == null ? void 0 : _a.code) === "custom" ? (_c = (_b = error.issues[0]) == null ? void 0 : _b.params) == null ? void 0 : _c.code : 400
+      statusCode
     );
   }
   const { type, languages, version, enable } = data;
@@ -141,14 +145,14 @@ async function handleDraftRoute({
     const index = indexDefault !== -1 ? indexDefault : 0;
     if (type === "path") {
       const { urls } = data;
-      const path = urls[index] || "";
+      const path = urls[index] ?? "";
       if (!path) {
         return getJsonErrorResponseFunction({ error: "Invalid path" }, 400);
       }
       redirectUrl = path;
     } else if (type === "route") {
       const { routes } = data;
-      const route = (routes == null ? void 0 : routes[index]) || "";
+      const route = routes?.[index] ?? "";
       if (!route) {
         return getJsonErrorResponseFunction({ error: "Invalid route" }, 400);
       }
@@ -166,9 +170,9 @@ async function handleDraftRoute({
   if (enable === false) {
     draft.disable();
   }
-  if (redirectUrl) {
-    if (version) {
-      const withParams = redirectUrl.indexOf("?") !== -1;
+  if (redirectUrl != null && redirectUrl !== "") {
+    if (version != null && version !== "") {
+      const withParams = redirectUrl.includes("?");
       redirectUrl = `${redirectUrl}${withParams ? "&" : "?"}version=${encodeURIComponent(version)}`;
     }
     navigation.redirect(redirectUrl);
@@ -177,7 +181,7 @@ async function handleDraftRoute({
 }
 function parseRedirectParams(url) {
   const { searchParams } = new URL(url);
-  const secret = searchParams.get("secret") || "";
+  const secret = searchParams.get("secret") ?? "";
   return { secret };
 }
 async function handleRedirectsRoute({
@@ -193,8 +197,8 @@ async function handleRedirectsRoute({
   if (secret !== getRedirectSecret()) {
     return getJsonError({ error: "Invalid argument" }, 401);
   }
-  const graphqlEndpoint = getDirectusGraphqlUrl == null ? void 0 : getDirectusGraphqlUrl();
-  const graphqlApiKey = getDirectusApiToken == null ? void 0 : getDirectusApiToken();
+  const graphqlEndpoint = getDirectusGraphqlUrl?.();
+  const graphqlApiKey = getDirectusApiToken?.();
   const { redirects, rewrites } = await edge.fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
   return new Response(JSON.stringify({ redirects, rewrites }), { status: 200 });
 }

package/index.mjs

@@ -1,13 +1,15 @@
+import { g as getRedirectSecretDefault } from "./router-oaFeb_tY.mjs";
+import { l, d, b, a, h } from "./router-oaFeb_tY.mjs";
 import { draftMode } from "next/headers";
 import { redirect } from "next/navigation";
 import { template } from "radashi";
 import * as zod from "zod";
-import { g as getRedirectSecretDefault } from "./router-CA4ItnAc.mjs";
-import { l, d, b, a, h } from "./router-CA4ItnAc.mjs";
 import { fetchRedirectsData } from "@okam/directus-node/edge";
+function getDraftSecretDefault() {
+  return process.env.NEXT_API_DRAFT_SECRET || "";
+}
 function getJsonErrorResponse(data, status) {
   const headers = {
-    // eslint-disable-next-line @typescript-eslint/naming-convention
     "Content-Type": "text/json; charset=UTF-8"
   };
   const body = JSON.stringify(data);
@@ -16,32 +18,33 @@ function getJsonErrorResponse(data, status) {
     headers
   });
 }
-function getDraftSecretDefault() {
-  return process.env.NEXT_API_DRAFT_SECRET || "";
+function jsonStringsArraySchema(message, code) {
+  return zod.string().transform((val, ctx) => {
+    try {
+      const decodedVal = decodeURIComponent(decodeURIComponent(val));
+      return JSON.parse(decodedVal);
+    } catch {
+      ctx.addIssue({
+        code: zod.ZodIssueCode.custom,
+        message: "Invalid JSON string",
+        params: { code }
+      });
+      return zod.NEVER;
+    }
+  }).pipe(zod.array(zod.string(), { error: () => ({ message }) }));
 }
-const jsonStringsArraySchema = (message, code) => zod.string().transform((val, ctx) => {
-  try {
-    const decodedVal = decodeURIComponent(decodeURIComponent(val));
-    return JSON.parse(decodedVal);
-  } catch (error) {
-    ctx.addIssue({
-      code: zod.ZodIssueCode.custom,
-      message: "Invalid JSON string",
-      params: { code }
-    });
-    return zod.NEVER;
-  }
-}).pipe(zod.array(zod.string(), { error: () => ({ message }) }));
 const languagesSchema = jsonStringsArraySchema("Invalid languages argument", 400);
 const commonSchema = zod.object({
   version: zod.string().optional(),
   enable: zod.enum(["true", "false"]).transform((val) => val === "true").optional(),
   pk: zod.string().optional()
 });
-const createSecretSchema = (expectedSecret) => zod.string({ error: () => ({ message: "Invalid secret argument" }) }).refine((val) => val === expectedSecret, {
-  message: "Invalid secret argument",
-  params: { code: 401 }
-});
+function createSecretSchema(expectedSecret) {
+  return zod.string({ error: () => ({ message: "Invalid secret argument" }) }).refine((val) => val === expectedSecret, {
+    message: "Invalid secret argument",
+    params: { code: 401 }
+  });
+}
 const draftParamsSchema = zod.discriminatedUnion(
   "type",
   [
@@ -79,22 +82,22 @@ function getPathFromRoute(routeUrl, url, index = 0) {
   const matches = [...routeUrl.matchAll(/\{\{([a-z]+)\}\}/gi)];
   const map = {};
   matches.forEach((match) => {
-    const key = match[1] || "";
-    if (!key) {
+    const key = match[1] ?? "";
+    if (key == null || key === "") {
       return;
     }
     const listkey = `${key}s`;
     const listParam = searchParams.get(listkey);
-    if (listParam) {
+    if (listParam != null && listParam !== "") {
       try {
         const list = JSON.parse(listParam);
-        map[key] = list[index] || "";
-      } catch (e) {
+        map[key] = list[index] ?? "";
+      } catch {
         map[key] = "";
       }
     } else {
       const param = searchParams.get(key);
-      map[key] = param || "";
+      map[key] = param ?? "";
     }
   });
   return template(routeUrl, map);
@@ -105,14 +108,15 @@ async function handleDraftRoute({
   getDraftSecret,
   getJsonError
 }) {
-  var _a, _b, _c;
-  const getSecretFunction = getDraftSecret || getDraftSecretDefault;
-  const getJsonErrorResponseFunction = getJsonError || getJsonErrorResponse;
+  const getSecretFunction = getDraftSecret ?? getDraftSecretDefault;
+  const getJsonErrorResponseFunction = getJsonError ?? getJsonErrorResponse;
   const { success, error, data } = parseDraftParams(url, getSecretFunction());
   if (!success) {
+    const issue = error.issues[0];
+    const statusCode = issue?.code === "custom" && typeof issue.params?.code === "number" ? issue.params.code : 400;
     return getJsonErrorResponseFunction(
       { error: error.issues },
-      ((_a = error.issues[0]) == null ? void 0 : _a.code) === "custom" ? (_c = (_b = error.issues[0]) == null ? void 0 : _b.params) == null ? void 0 : _c.code : 400
+      statusCode
     );
   }
   const { type, languages, version, enable } = data;
@@ -123,14 +127,14 @@ async function handleDraftRoute({
     const index = indexDefault !== -1 ? indexDefault : 0;
     if (type === "path") {
       const { urls } = data;
-      const path = urls[index] || "";
+      const path = urls[index] ?? "";
       if (!path) {
         return getJsonErrorResponseFunction({ error: "Invalid path" }, 400);
       }
       redirectUrl = path;
     } else if (type === "route") {
       const { routes } = data;
-      const route = (routes == null ? void 0 : routes[index]) || "";
+      const route = routes?.[index] ?? "";
       if (!route) {
         return getJsonErrorResponseFunction({ error: "Invalid route" }, 400);
       }
@@ -148,9 +152,9 @@ async function handleDraftRoute({
   if (enable === false) {
     draft.disable();
   }
-  if (redirectUrl) {
-    if (version) {
-      const withParams = redirectUrl.indexOf("?") !== -1;
+  if (redirectUrl != null && redirectUrl !== "") {
+    if (version != null && version !== "") {
+      const withParams = redirectUrl.includes("?");
       redirectUrl = `${redirectUrl}${withParams ? "&" : "?"}version=${encodeURIComponent(version)}`;
     }
     redirect(redirectUrl);
@@ -159,7 +163,7 @@ async function handleDraftRoute({
 }
 function parseRedirectParams(url) {
   const { searchParams } = new URL(url);
-  const secret = searchParams.get("secret") || "";
+  const secret = searchParams.get("secret") ?? "";
   return { secret };
 }
 async function handleRedirectsRoute({
@@ -175,8 +179,8 @@ async function handleRedirectsRoute({
   if (secret !== getRedirectSecret()) {
     return getJsonError({ error: "Invalid argument" }, 401);
   }
-  const graphqlEndpoint = getDirectusGraphqlUrl == null ? void 0 : getDirectusGraphqlUrl();
-  const graphqlApiKey = getDirectusApiToken == null ? void 0 : getDirectusApiToken();
+  const graphqlEndpoint = getDirectusGraphqlUrl?.();
+  const graphqlApiKey = getDirectusApiToken?.();
   const { redirects, rewrites } = await fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
   return new Response(JSON.stringify({ redirects, rewrites }), { status: 200 });
 }

package/logger.d.ts

@@ -1,4 +1,3 @@
 import { LogSeverity } from '@okam/logger';
-
 export declare const logger: import('@okam/logger').Logger;
 export declare function log(msg: string, context?: unknown, severity?: LogSeverity): void;

package/package.json

@@ -1,8 +1,12 @@
 {
   "name": "@okam/directus-next",
-  "main": "./index.js",
-  "version": "1.2.26",
-  "types": "./index.d.ts",
+  "version": "1.2.28",
+  "repository": {
+    "url": "https://github.com/OKAMca/stack.git"
+  },
+  "sideEffects": [
+    "./server.mjs"
+  ],
   "exports": {
     ".": {
       "import": {
@@ -25,23 +29,28 @@
       }
     }
   },
-  "repository": {
-    "url": "https://github.com/OKAMca/stack.git"
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "engines": {
+    "node": ">=20.19.0"
   },
   "publishConfig": {
     "access": "public"
   },
+  "peerDependencies": {
+    "next": "^15.1.0 || ^16.0.0"
+  },
   "dependencies": {
-    "@okam/core-lib": "1.17.1",
-    "@okam/directus-node": "0.7.2",
+    "@graphql-typed-document-node/core": "3.2.0",
+    "@okam/core-lib": "1.17.3",
+    "@okam/directus-node": "0.7.4",
+    "@okam/directus-query": "1.5.4",
     "@okam/logger": "1.1.0",
-    "@okam/next-component": "1.3.4",
-    "next": "^15.0.0",
-    "radashi": "^12.3.0",
-    "@okam/directus-query": "1.5.2",
+    "@okam/next-component": "1.3.6",
     "graphql-request": "^7.1.2",
-    "@graphql-typed-document-node/core": "3.2.0",
-    "zod": "^4.3.5",
-    "server-only": "0.0.1"
+    "next": "^15.1.0 || ^16.0.0",
+    "radashi": "^12.3.0",
+    "server-only": "0.0.1",
+    "zod": "^4.3.5"
   }
 }

package/pageSettings/context.d.ts

@@ -1,6 +1,5 @@
 import { Variables } from 'graphql-request';
 import { TPageSettingsQueryItem } from '../types/pageSettings';
 import { TGetPageSettingsReturn } from './interface';
-
 export declare function pageSettingsContext<Item extends TPageSettingsQueryItem>(defaultValue?: TGetPageSettingsReturn<Item>): readonly [() => TGetPageSettingsReturn<Item> | undefined, (value: TGetPageSettingsReturn<Item> | undefined) => void];
 export declare function pageSettingsVariablesContext(variables?: Variables): readonly [() => object | undefined, (value: object | undefined) => void];

package/pageSettings/getPageSettings.d.ts

@@ -1,7 +1,6 @@
 import { Variables } from 'graphql-request';
 import { TPageSettingsQueryItem } from '../types/pageSettings';
 import { TGetPageSettingsProps, TGetPageSettingsReturn } from './interface';
-
 /**
  * @param props Optional props. Passing new props will trigger a new query if the variables have changed compared to the value of the variables in the cache. Omitting props will return the cached value.
  * @param itemKey Required if the query has more than a single root field

package/pageSettings/index.d.ts

@@ -1,2 +1,3 @@
-export type { TGetPageSettingsConfig, TGetPageSettingsProps, TGetPageSettingsReturn } from './interface';
+export * from './context';
 export { getPageSettings, usePageSettings } from './getPageSettings';
+export type { TGetPageSettingsConfig, TGetPageSettingsProps, TGetPageSettingsReturn } from './interface';

package/pageSettings/interface.d.ts

@@ -3,7 +3,6 @@ import { Variables } from 'graphql-request';
 import { TDirectusRouteConfig } from '../types/directusRouteConfig';
 import { Fragmentize } from '../types/Fragments';
 import { TPageSettings, TPageSettingsItemQuery, TPageSettingsQueryItem } from '../types/pageSettings';
-
 export type TPageSettingsItemDocument<Item extends TPageSettingsQueryItem, ItemKey extends string, QueryVariables extends Variables> = TypedDocumentNode<TPageSettingsItemQuery<Item, ItemKey>, QueryVariables>;
 export type TGetPageSettingsConfig = TDirectusRouteConfig | Record<string, string>;
 /**

package/redirect/index.d.ts

@@ -1,5 +1,5 @@
 export * from './env';
-export { default as handleRedirectsRoute, parseRedirectParams } from './route';
 export type { HandleRedirectOptions } from './interface';
+export { default as handleRedirectsRoute, parseRedirectParams } from './route';
 export { getRedirectsRoute } from './utils/getRedirectsRoute';
 export { handleRedirect } from './utils/handleRedirect';

package/redirect/interface.d.ts

@@ -12,7 +12,7 @@ export interface HandleRedirectOptions {
      * @default process.env.NEXT_API_TOKEN_ADMIN
      */
     getDirectusApiToken?: () => string;
-    getJsonError?: (data: any, status: number) => Response;
+    getJsonError?: (_data: unknown, _status: number) => Response;
     /**
      * @default 2000
      */

package/redirect/route.d.ts

@@ -1,5 +1,4 @@
 import { HandleRedirectOptions } from './interface';
-
 export declare function parseRedirectParams(url: string): {
     secret: string;
 };

package/redirect/utils/getRedirectsRoute.d.ts

@@ -1,6 +1,5 @@
 import { TFetchRedirectsResponse } from '@okam/directus-node/edge';
 import { TDirectusRouteRedirectsModule } from '../../types/directusRouteConfig';
-
 /**
  * Gets a response from `options.apiRoute`
  * @param {TDirectusRouteRedirectsModule} options

package/redirect/utils/handleRedirect.d.ts

@@ -1,6 +1,5 @@
 import { NextRequest, NextResponse } from 'next/server';
 import { TDirectusRouteRedirectsModule } from '../../types/directusRouteConfig';
-
 /**
  * Handles next redirection using directus redirects
  */

package/response.d.ts

@@ -1 +1 @@
-export declare function getJsonErrorResponse(data: any, status: number): Response;
+export declare function getJsonErrorResponse(data: unknown, status: number): Response;

package/router/router.d.ts

@@ -1,8 +1,7 @@
 import { NextRequest, NextResponse as NextResponseType } from 'next/server';
 import { TDirectusRouteConfig } from '../types/directusRouteConfig';
-
 /**
- * Handles incoming middleware requests and rewrites the path to the new format according to fetched page settings.
+ * Handles incoming proxy requests and rewrites the path to the new format according to fetched page settings.
  * @param request - The NextRequest object
  * @param config - The TDirectusRouteConfig object
  * @deprecated Use `directusRouteRouter(request, config)` instead. NextResponse is now directly imported in this file.
@@ -11,6 +10,7 @@ import { TDirectusRouteConfig } from '../types/directusRouteConfig';
  *
  * @example
  * ```typescript
+ * // proxy.ts (Next.js 16+) or middleware.ts (legacy)
  * export const directusConfig: TDirectusRouteConfig = {
  *  localeMap: {
  *    'fr-CA': 'fr',
@@ -23,7 +23,7 @@ import { TDirectusRouteConfig } from '../types/directusRouteConfig';
  *  },
  * }
  *
- * export async function middleware(request: NextRequest) {
+ * export async function proxy(request: NextRequest) {
  *   return directusRouteRouter(request, directusConfig)
  * }
  * ```

package/router/utils/fetchPageSettingsTranslation.d.ts

@@ -1,3 +1,2 @@
 import { TPageSettingsTranslation } from '../../types';
-
 export declare function fetchPageSettingsTranslation(path: string): Promise<TPageSettingsTranslation[] | null>;

package/router/utils/locale.d.ts

@@ -1,5 +1,4 @@
 import { TDirectusRouteConfig } from '../../types';
-
 /**
  * Validates if a given string is a valid locale from the directus route configuration.
  * @param maybeLocale The string to validate as a locale

package/{router-DTZYUtal.js → router-CwzG5Cu9.js}

@@ -15,12 +15,14 @@ function getRedirectSecretDefault() {
 }
 function getVercelUrl() {
   const url = process.env.VERCEL_URL;
-  if (!url) return null;
+  if (url == null || url === "")
+    return null;
   return `https://${url}`;
 }
 function getApiRouteUrlDefault() {
   const url = process.env.NEXT_MIDDLEWARE_REDIRECT_URL ?? getVercelUrl() ?? defaultInternalUrl;
-  if (URL.canParse(url)) return url;
+  if (URL.canParse(url))
+    return url;
   log(`Invalid URL ${url}. Falling back to default`, { url }, "warn");
   return defaultInternalUrl;
 }
@@ -47,8 +49,8 @@ async function getRedirectsRoute({
   }
 }
 function splitDestination(destination) {
-  const [pathname, search] = destination.split("?");
-  if (!search) {
+  const [pathname = "", search] = destination.split("?");
+  if (search == null || search === "") {
     return [pathname];
   }
   return [pathname, `?${search}`];
@@ -66,22 +68,23 @@ async function handleRedirect(request, options = {}) {
   const { redirects, rewrites } = await getRedirectsRoute(options);
   const redirect = redirects.find(({ source }) => source === normalizedPathname);
   const rewrite = rewrites.find(({ source }) => source === normalizedPathname);
-  const type = redirect ? "redirect" : "rewrite";
+  const type = redirect != null ? "redirect" : "rewrite";
   const reroute = redirect ?? rewrite;
-  if (!reroute) {
+  if (reroute == null) {
     return null;
   }
   const { permanent } = reroute;
   const status = permanent ? 308 : 307;
   const externalRedirect = validateExternalRedirect(reroute);
-  if (externalRedirect) {
+  if (externalRedirect != null && externalRedirect !== "") {
     log(`External ${type} found`, { [type]: externalRedirect, permanent });
     return server.NextResponse.redirect(externalRedirect, { status });
   }
   log(`${radashi.capitalize(type)} found`, { [type]: reroute, permanent });
   const { destination } = reroute;
   const [destinationPathname, search] = splitDestination(destination);
-  if (search) url.search = search;
+  if (search != null)
+    url.search = search;
   url.pathname = destinationPathname;
   log(`${radashi.capitalize(type)}ing to ${url.toString()} with status ${status}`);
   return server.NextResponse[type](url, { status });
@@ -106,10 +109,10 @@ const query = `
 async function fetchPageSettingsTranslation(path) {
   const graphqlEndpoint = process.env.NEXT_SERVER_GRAPHQL_URL || process.env.NEXT_PUBLIC_GRAPHQL_URL;
   const graphqlApiKey = process.env.NEXT_PUBLIC_API_TOKEN;
-  if (!graphqlEndpoint) {
+  if (graphqlEndpoint == null || graphqlEndpoint === "") {
     throw new Error("Missing GraphQL configuration `graphqlEndpoint`");
   }
-  if (!graphqlApiKey) {
+  if (graphqlApiKey == null || graphqlApiKey === "") {
     throw new Error("Missing GraphQL configuration `graphqlApiKey`");
   }
   const variables = {
@@ -124,15 +127,14 @@ async function fetchPageSettingsTranslation(path) {
     const response = await fetch(graphqlEndpoint, {
       method: "POST",
       headers: {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
         "Content-Type": "application/json",
-        Authorization: `Bearer ${graphqlApiKey}`
+        "Authorization": `Bearer ${graphqlApiKey}`
       },
       body: JSON.stringify({ query, variables })
     });
-    const { data } = await response.json();
-    log("GraphQL response:", data);
-    return data.page_settings_translations;
+    const json = await response.json();
+    log("GraphQL response:", json.data);
+    return json.data?.page_settings_translations ?? null;
   } catch (error) {
     log("GraphQL Error:", error);
     return null;
@@ -145,7 +147,7 @@ function getValidLocale(maybeLocale, config) {
 function splitLocaleFromPathname(pathname, config) {
   const [, maybeLocale, ...parts] = pathname.split("/");
   const locale = getValidLocale(maybeLocale, config);
-  if (locale) {
+  if (locale != null && locale !== "") {
     const newPathname = parts.length > 0 ? `/${parts.join("/")}` : "/";
     return { locale, pathname: newPathname };
   }
@@ -153,22 +155,18 @@ function splitLocaleFromPathname(pathname, config) {
 }
 function getValidTranslation(translations, locale) {
   const translation = translations[0];
-  if (!locale) {
+  if (locale == null || locale === "") {
     log("No locale provided, using first translation as default:", { translation });
     return translation;
   }
-  return (translations == null ? void 0 : translations.find((t) => {
-    var _a, _b;
-    return (_b = (_a = t.languages_code) == null ? void 0 : _a.code) == null ? void 0 : _b.startsWith(locale);
-  })) ?? translation;
+  return translations?.find((t) => t.languages_code?.code?.startsWith(locale)) ?? translation;
 }
 async function directusRouteRouter(request, config, NextResponse = server.NextResponse) {
-  var _a, _b, _c;
   const { pathname: localizedPathname } = request.nextUrl;
   const { locale, pathname } = splitLocaleFromPathname(localizedPathname, config);
   log("Processing request for pathname:", { locale, pathname });
-  const redirect = await handleRedirect(request, (_a = config.modules) == null ? void 0 : _a.redirects);
-  if (redirect) {
+  const redirect = await handleRedirect(request, config.modules?.redirects);
+  if (redirect != null) {
     return redirect;
   }
   const translations = await fetchPageSettingsTranslation(pathname);
@@ -178,23 +176,23 @@ async function directusRouteRouter(request, config, NextResponse = server.NextRe
   }
   const translation = getValidTranslation(translations, locale);
   log("Using translation:", translation);
-  if (!translation || !translation.languages_code || !translation.page_settings_id) {
+  if (translation == null || translation.languages_code == null || translation.page_settings_id == null) {
     log(`Invalid translation data for path: ${pathname}`, { pathname }, "warn");
     return NextResponse.next();
   }
   const directusLocale = translation.languages_code.code;
   const collection = translation.page_settings_id.belongs_to_collection;
   const id = translation.page_settings_id.belongs_to_key;
-  if (!collection) {
+  if (collection == null || collection === "") {
     log(`PageSettings with id ${id} was found but is not associated with any collection.`, { id }, "warn");
     return NextResponse.next();
   }
-  if (!directusLocale) {
+  if (directusLocale == null || directusLocale === "") {
     log(`PageSettings with id ${id} was found but is not associated with any locale.`, { id }, "warn");
     return NextResponse.next();
   }
-  const mappedLocale = ((_b = config.localeMap) == null ? void 0 : _b[directusLocale]) || directusLocale;
-  const idField = ((_c = config.collectionSettings[collection]) == null ? void 0 : _c.idField) || config.collectionSettings.default.idField;
+  const mappedLocale = config.localeMap?.[directusLocale] || directusLocale;
+  const idField = config.collectionSettings[collection]?.idField || config.collectionSettings.default.idField;
   log("Directus locale:", directusLocale);
   log("Mapped locale:", mappedLocale);
   log("Collection:", collection);

package/{router-CA4ItnAc.mjs → router-oaFeb_tY.mjs}

@@ -14,12 +14,14 @@ function getRedirectSecretDefault() {
 }
 function getVercelUrl() {
   const url = process.env.VERCEL_URL;
-  if (!url) return null;
+  if (url == null || url === "")
+    return null;
   return `https://${url}`;
 }
 function getApiRouteUrlDefault() {
   const url = process.env.NEXT_MIDDLEWARE_REDIRECT_URL ?? getVercelUrl() ?? defaultInternalUrl;
-  if (URL.canParse(url)) return url;
+  if (URL.canParse(url))
+    return url;
   log(`Invalid URL ${url}. Falling back to default`, { url }, "warn");
   return defaultInternalUrl;
 }
@@ -46,8 +48,8 @@ async function getRedirectsRoute({
   }
 }
 function splitDestination(destination) {
-  const [pathname, search] = destination.split("?");
-  if (!search) {
+  const [pathname = "", search] = destination.split("?");
+  if (search == null || search === "") {
     return [pathname];
   }
   return [pathname, `?${search}`];
@@ -65,22 +67,23 @@ async function handleRedirect(request, options = {}) {
   const { redirects, rewrites } = await getRedirectsRoute(options);
   const redirect = redirects.find(({ source }) => source === normalizedPathname);
   const rewrite = rewrites.find(({ source }) => source === normalizedPathname);
-  const type = redirect ? "redirect" : "rewrite";
+  const type = redirect != null ? "redirect" : "rewrite";
   const reroute = redirect ?? rewrite;
-  if (!reroute) {
+  if (reroute == null) {
     return null;
   }
   const { permanent } = reroute;
   const status = permanent ? 308 : 307;
   const externalRedirect = validateExternalRedirect(reroute);
-  if (externalRedirect) {
+  if (externalRedirect != null && externalRedirect !== "") {
     log(`External ${type} found`, { [type]: externalRedirect, permanent });
     return NextResponse.redirect(externalRedirect, { status });
   }
   log(`${capitalize(type)} found`, { [type]: reroute, permanent });
   const { destination } = reroute;
   const [destinationPathname, search] = splitDestination(destination);
-  if (search) url.search = search;
+  if (search != null)
+    url.search = search;
   url.pathname = destinationPathname;
   log(`${capitalize(type)}ing to ${url.toString()} with status ${status}`);
   return NextResponse[type](url, { status });
@@ -105,10 +108,10 @@ const query = `
 async function fetchPageSettingsTranslation(path) {
   const graphqlEndpoint = process.env.NEXT_SERVER_GRAPHQL_URL || process.env.NEXT_PUBLIC_GRAPHQL_URL;
   const graphqlApiKey = process.env.NEXT_PUBLIC_API_TOKEN;
-  if (!graphqlEndpoint) {
+  if (graphqlEndpoint == null || graphqlEndpoint === "") {
     throw new Error("Missing GraphQL configuration `graphqlEndpoint`");
   }
-  if (!graphqlApiKey) {
+  if (graphqlApiKey == null || graphqlApiKey === "") {
     throw new Error("Missing GraphQL configuration `graphqlApiKey`");
   }
   const variables = {
@@ -123,15 +126,14 @@ async function fetchPageSettingsTranslation(path) {
     const response = await fetch(graphqlEndpoint, {
       method: "POST",
       headers: {
-        // eslint-disable-next-line @typescript-eslint/naming-convention
         "Content-Type": "application/json",
-        Authorization: `Bearer ${graphqlApiKey}`
+        "Authorization": `Bearer ${graphqlApiKey}`
       },
       body: JSON.stringify({ query, variables })
     });
-    const { data } = await response.json();
-    log("GraphQL response:", data);
-    return data.page_settings_translations;
+    const json = await response.json();
+    log("GraphQL response:", json.data);
+    return json.data?.page_settings_translations ?? null;
   } catch (error) {
     log("GraphQL Error:", error);
     return null;
@@ -144,7 +146,7 @@ function getValidLocale(maybeLocale, config) {
 function splitLocaleFromPathname(pathname, config) {
   const [, maybeLocale, ...parts] = pathname.split("/");
   const locale = getValidLocale(maybeLocale, config);
-  if (locale) {
+  if (locale != null && locale !== "") {
     const newPathname = parts.length > 0 ? `/${parts.join("/")}` : "/";
     return { locale, pathname: newPathname };
   }
@@ -152,22 +154,18 @@ function splitLocaleFromPathname(pathname, config) {
 }
 function getValidTranslation(translations, locale) {
   const translation = translations[0];
-  if (!locale) {
+  if (locale == null || locale === "") {
     log("No locale provided, using first translation as default:", { translation });
     return translation;
   }
-  return (translations == null ? void 0 : translations.find((t) => {
-    var _a, _b;
-    return (_b = (_a = t.languages_code) == null ? void 0 : _a.code) == null ? void 0 : _b.startsWith(locale);
-  })) ?? translation;
+  return translations?.find((t) => t.languages_code?.code?.startsWith(locale)) ?? translation;
 }
 async function directusRouteRouter(request, config, NextResponse$1 = NextResponse) {
-  var _a, _b, _c;
   const { pathname: localizedPathname } = request.nextUrl;
   const { locale, pathname } = splitLocaleFromPathname(localizedPathname, config);
   log("Processing request for pathname:", { locale, pathname });
-  const redirect = await handleRedirect(request, (_a = config.modules) == null ? void 0 : _a.redirects);
-  if (redirect) {
+  const redirect = await handleRedirect(request, config.modules?.redirects);
+  if (redirect != null) {
     return redirect;
   }
   const translations = await fetchPageSettingsTranslation(pathname);
@@ -177,23 +175,23 @@ async function directusRouteRouter(request, config, NextResponse$1 = NextRespons
   }
   const translation = getValidTranslation(translations, locale);
   log("Using translation:", translation);
-  if (!translation || !translation.languages_code || !translation.page_settings_id) {
+  if (translation == null || translation.languages_code == null || translation.page_settings_id == null) {
     log(`Invalid translation data for path: ${pathname}`, { pathname }, "warn");
     return NextResponse$1.next();
   }
   const directusLocale = translation.languages_code.code;
   const collection = translation.page_settings_id.belongs_to_collection;
   const id = translation.page_settings_id.belongs_to_key;
-  if (!collection) {
+  if (collection == null || collection === "") {
     log(`PageSettings with id ${id} was found but is not associated with any collection.`, { id }, "warn");
     return NextResponse$1.next();
   }
-  if (!directusLocale) {
+  if (directusLocale == null || directusLocale === "") {
     log(`PageSettings with id ${id} was found but is not associated with any locale.`, { id }, "warn");
     return NextResponse$1.next();
   }
-  const mappedLocale = ((_b = config.localeMap) == null ? void 0 : _b[directusLocale]) || directusLocale;
-  const idField = ((_c = config.collectionSettings[collection]) == null ? void 0 : _c.idField) || config.collectionSettings.default.idField;
+  const mappedLocale = config.localeMap?.[directusLocale] || directusLocale;
+  const idField = config.collectionSettings[collection]?.idField || config.collectionSettings.default.idField;
   log("Directus locale:", directusLocale);
   log("Mapped locale:", mappedLocale);
   log("Collection:", collection);

package/server.d.ts

@@ -1,3 +1,3 @@
+export * from './pageSettings';
 export { directusRouteRouter } from './router/router';
 export type { TDirectusRouteConfig } from './types/directusRouteConfig';
-export * from './pageSettings';

package/server.js

@@ -1,11 +1,11 @@
 "use server";
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const router = require("./router-DTZYUtal.js");
+const router = require("./router-CwzG5Cu9.js");
 const directusQuery = require("@okam/directus-query");
 const radashi = require("radashi");
-require("server-only");
 const server = require("@okam/next-component/server");
+require("server-only");
 function pageSettingsContext(defaultValue) {
   const [pageSettings, setPageSettings] = server.createServerContext(defaultValue);
   return [pageSettings, setPageSettings];
@@ -17,11 +17,11 @@ function pageSettingsVariablesContext(variables) {
 const [getPageSettingsContext, setPageSettingsContext] = pageSettingsContext();
 const [getVariables, setVariables] = pageSettingsVariablesContext();
 function isTDirectusRouteConfig(config) {
-  return !!config && "localeMap" in config;
+  return config != null && "localeMap" in config;
 }
 function getDirectusVariables(variables, config) {
   const localeMap = isTDirectusRouteConfig(config) ? config.localeMap : config;
-  if (!localeMap) {
+  if (localeMap == null) {
     return variables;
   }
   const locale = radashi.get(variables, "locale");
@@ -29,27 +29,26 @@ function getDirectusVariables(variables, config) {
   return { ...variables, locale: directusLocale };
 }
 async function getPageSettings(props, itemKey) {
-  var _a, _b, _c, _d, _e;
   const { variables, config } = props ?? {};
   const directusVariables = getDirectusVariables(variables, config);
   const defaultReturn = getPageSettingsContext();
-  if (!props || radashi.isEqual(getVariables(), directusVariables)) {
-    router.log("Using cached page settings", { path: (_c = (_b = (_a = defaultReturn.page_settings) == null ? void 0 : _a.translations) == null ? void 0 : _b[0]) == null ? void 0 : _c.path });
+  if (props == null || radashi.isEqual(getVariables(), directusVariables)) {
+    router.log("Using cached page settings", { path: defaultReturn.page_settings?.translations?.[0]?.path });
     return defaultReturn;
   }
   const { document } = props;
   const key = itemKey ?? radashi.get(document, "definitions[0].selectionSet.selections[0].name.value");
   router.log("Querying new page settings", directusVariables);
   const result = await directusQuery.queryGql(document, directusVariables);
-  const items = result == null ? void 0 : result[key];
-  const currentItem = Array.isArray(items) ? items == null ? void 0 : items[0] : items;
-  const currentPageSettings = currentItem == null ? void 0 : currentItem.page_settings;
-  const currentPath = (_e = (_d = currentPageSettings == null ? void 0 : currentPageSettings.translations) == null ? void 0 : _d[0]) == null ? void 0 : _e.path;
-  if (!currentItem) {
+  const items = result?.[key];
+  const currentItem = Array.isArray(items) ? items?.[0] : items;
+  const currentPageSettings = currentItem?.page_settings;
+  const currentPath = currentPageSettings?.translations?.[0]?.path;
+  if (currentItem == null) {
     router.log("No item found. Falling back to cached page settings", { path: currentPath }, "warn");
     return defaultReturn;
   }
-  if (!currentPageSettings) {
+  if (currentPageSettings == null) {
     router.log("No page settings found. Falling back to cached page settings", { path: currentPath }, "warn");
     return defaultReturn;
   }
@@ -61,4 +60,6 @@ async function getPageSettings(props, itemKey) {
 const usePageSettings = getPageSettings;
 exports.directusRouteRouter = router.directusRouteRouter;
 exports.getPageSettings = getPageSettings;
+exports.pageSettingsContext = pageSettingsContext;
+exports.pageSettingsVariablesContext = pageSettingsVariablesContext;
 exports.usePageSettings = usePageSettings;

package/server.mjs

@@ -1,10 +1,10 @@
 "use server";
-import { c as log } from "./router-CA4ItnAc.mjs";
-import { d } from "./router-CA4ItnAc.mjs";
+import { c as log } from "./router-oaFeb_tY.mjs";
+import { d } from "./router-oaFeb_tY.mjs";
 import { queryGql } from "@okam/directus-query";
 import { isEqual, get, invert } from "radashi";
-import "server-only";
 import { createServerContext } from "@okam/next-component/server";
+import "server-only";
 function pageSettingsContext(defaultValue) {
   const [pageSettings, setPageSettings] = createServerContext(defaultValue);
   return [pageSettings, setPageSettings];
@@ -16,11 +16,11 @@ function pageSettingsVariablesContext(variables) {
 const [getPageSettingsContext, setPageSettingsContext] = pageSettingsContext();
 const [getVariables, setVariables] = pageSettingsVariablesContext();
 function isTDirectusRouteConfig(config) {
-  return !!config && "localeMap" in config;
+  return config != null && "localeMap" in config;
 }
 function getDirectusVariables(variables, config) {
   const localeMap = isTDirectusRouteConfig(config) ? config.localeMap : config;
-  if (!localeMap) {
+  if (localeMap == null) {
     return variables;
   }
   const locale = get(variables, "locale");
@@ -28,27 +28,26 @@ function getDirectusVariables(variables, config) {
   return { ...variables, locale: directusLocale };
 }
 async function getPageSettings(props, itemKey) {
-  var _a, _b, _c, _d, _e;
   const { variables, config } = props ?? {};
   const directusVariables = getDirectusVariables(variables, config);
   const defaultReturn = getPageSettingsContext();
-  if (!props || isEqual(getVariables(), directusVariables)) {
-    log("Using cached page settings", { path: (_c = (_b = (_a = defaultReturn.page_settings) == null ? void 0 : _a.translations) == null ? void 0 : _b[0]) == null ? void 0 : _c.path });
+  if (props == null || isEqual(getVariables(), directusVariables)) {
+    log("Using cached page settings", { path: defaultReturn.page_settings?.translations?.[0]?.path });
     return defaultReturn;
   }
   const { document } = props;
   const key = itemKey ?? get(document, "definitions[0].selectionSet.selections[0].name.value");
   log("Querying new page settings", directusVariables);
   const result = await queryGql(document, directusVariables);
-  const items = result == null ? void 0 : result[key];
-  const currentItem = Array.isArray(items) ? items == null ? void 0 : items[0] : items;
-  const currentPageSettings = currentItem == null ? void 0 : currentItem.page_settings;
-  const currentPath = (_e = (_d = currentPageSettings == null ? void 0 : currentPageSettings.translations) == null ? void 0 : _d[0]) == null ? void 0 : _e.path;
-  if (!currentItem) {
+  const items = result?.[key];
+  const currentItem = Array.isArray(items) ? items?.[0] : items;
+  const currentPageSettings = currentItem?.page_settings;
+  const currentPath = currentPageSettings?.translations?.[0]?.path;
+  if (currentItem == null) {
     log("No item found. Falling back to cached page settings", { path: currentPath }, "warn");
     return defaultReturn;
   }
-  if (!currentPageSettings) {
+  if (currentPageSettings == null) {
     log("No page settings found. Falling back to cached page settings", { path: currentPath }, "warn");
     return defaultReturn;
   }
@@ -61,5 +60,7 @@ const usePageSettings = getPageSettings;
 export {
   d as directusRouteRouter,
   getPageSettings,
+  pageSettingsContext,
+  pageSettingsVariablesContext,
   usePageSettings
 };

package/types/index.d.ts

@@ -1,2 +1,2 @@
 export type { TDirectusRouteConfig, TDirectusRouteRedirectsModule } from './directusRouteConfig';
-export type { TPageSettingsTranslation, TPageSettings, TPageSettingsItemQuery, TPageSettingsQueryItem, } from './pageSettings';
+export type { TPageSettings, TPageSettingsItemQuery, TPageSettingsQueryItem, TPageSettingsTranslation, } from './pageSettings';

package/types/pageSettings.d.ts

@@ -1,6 +1,5 @@
 import { TFiles } from '../files';
 import { Fragmentize } from './Fragments';
-
 export interface TPageSettingsTranslation {
     languages_code?: {
         code?: string | null | undefined;