@okam/directus-next 1.2.2 → 1.2.4

package/CHANGELOG.md

@@ -1,3 +1,21 @@
+## 1.2.4 (2025-08-05)
+
+### 🩹 Fixes
+
+- **directus-next:** bump version ([e9441ad](https://github.com/OKAMca/stack/commit/e9441ad))
+
+### ❤️ Thank You
+
+- poclerson
+
+## 1.2.3 (2025-07-24)
+
+### 🧱 Updated Dependencies
+
+- Updated core-lib to 1.17.0
+- Updated directus-node to 0.6.2
+- Updated directus-query to 1.4.2
+
 ## 1.2.2 (2025-07-23)
 
 ### 🩹 Fixes

package/index.d.ts

@@ -1,7 +1,7 @@
 export * from './draft';
 export * from './redirect';
 export { logger as DirectusNextLogger } from './logger';
-export { directusRouteRouter } from './lib/directusRouteRouter';
+export { directusRouteRouter } from './router/router';
 export { getJsonErrorResponse } from './response';
 export * from './types';
 export type { TPageSettings, TPageSettingsTranslation, TPageSettingsItemQuery, TPageSettingsItemDocument, TUsePageSettingsProps, } from './pageSettings/interface';

package/index.js

@@ -3,7 +3,7 @@ Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const headers = require("next/headers");
 const navigation = require("next/navigation");
 const radashi = require("radashi");
-const directusRouteRouter = require("./directusRouteRouter-CfK0xrh0.js");
+const router = require("./router-XhYR_hlg.js");
 const logger = require("@okam/logger");
 const coreLib = require("@okam/core-lib");
 function getJsonErrorResponse(data, status) {
@@ -260,7 +260,7 @@ function parseRedirectParams(url) {
 }
 async function handleRedirectsRoute({
   url,
-  getRedirectSecret = directusRouteRouter.getRedirectSecretDefault,
+  getRedirectSecret = router.getRedirectSecretDefault,
   getJsonError = getJsonErrorResponse,
   getDirectusApiToken,
   getDirectusGraphqlUrl,
@@ -276,12 +276,12 @@ async function handleRedirectsRoute({
   const { redirects, rewrites } = await fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
   return new Response(JSON.stringify({ redirects, rewrites }), { status: 200 });
 }
-exports.DirectusNextLogger = directusRouteRouter.logger;
-exports.directusRouteRouter = directusRouteRouter.directusRouteRouter;
-exports.getApiRouteUrlDefault = directusRouteRouter.getApiRouteUrlDefault;
-exports.getRedirectSecretDefault = directusRouteRouter.getRedirectSecretDefault;
-exports.getRedirectsRoute = directusRouteRouter.getRedirectsRoute;
-exports.handleRedirect = directusRouteRouter.handleRedirect;
+exports.DirectusNextLogger = router.logger;
+exports.directusRouteRouter = router.directusRouteRouter;
+exports.getApiRouteUrlDefault = router.getApiRouteUrlDefault;
+exports.getRedirectSecretDefault = router.getRedirectSecretDefault;
+exports.getRedirectsRoute = router.getRedirectsRoute;
+exports.handleRedirect = router.handleRedirect;
 exports.getDraftSecretDefault = getDraftSecretDefault;
 exports.getJsonErrorResponse = getJsonErrorResponse;
 exports.getPathFromRoute = getPathFromRoute;

package/index.mjs

@@ -1,8 +1,8 @@
 import { draftMode } from "next/headers";
 import { redirect } from "next/navigation";
 import { template } from "radashi";
-import { g as getRedirectSecretDefault } from "./directusRouteRouter-Bt3bEq4S.mjs";
-import { l, d, b, a, h } from "./directusRouteRouter-Bt3bEq4S.mjs";
+import { g as getRedirectSecretDefault } from "./router-BdkmiPvg.mjs";
+import { l, d, b, a, h } from "./router-BdkmiPvg.mjs";
 import { logger } from "@okam/logger";
 import { normalizePath } from "@okam/core-lib";
 function getJsonErrorResponse(data, status) {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@okam/directus-next",
   "main": "./index.js",
-  "version": "1.2.2",
+  "version": "1.2.4",
   "types": "./index.d.ts",
   "exports": {
     ".": {
@@ -32,12 +32,12 @@
     "access": "public"
   },
   "dependencies": {
-    "@okam/core-lib": "1.16.0",
-    "@okam/directus-node": "0.6.1",
+    "@okam/core-lib": "1.17.0",
+    "@okam/directus-node": "0.6.2",
     "@okam/logger": "1.1.0",
     "next": "^14.1.1",
     "radashi": "^12.3.0",
-    "@okam/directus-query": "1.4.1",
+    "@okam/directus-query": "1.4.2",
     "server-only": "0.0.1",
     "graphql-request": "7.1.2",
     "server-only-context": "0.1.0",

package/router/router.d.ts

@@ -0,0 +1,7 @@
+import type { NextRequest, NextResponse as NextResponseType } from 'next/server';
+import type { DirectusRouteConfig } from '../types/directusRouteConfig';
+export declare function directusRouteRouter(request: NextRequest, config: DirectusRouteConfig, 
+/**
+ * @deprecated Use `directusRouteRouter(request, config)` instead. NextResponse is now directly imported in this file.
+ */
+NextResponse?: typeof NextResponseType): Promise<NextResponseType>;

package/router/utils/fetchPageSettingsTranslation.d.ts

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

package/{directusRouteRouter-Bt3bEq4S.mjs → router-BdkmiPvg.mjs}

@@ -1,7 +1,7 @@
 import { NextResponse } from "next/server";
+import { capitalize, isEmpty } from "radashi";
 import { createLogger } from "@okam/logger";
 import { normalizePath } from "@okam/core-lib";
-import { capitalize } from "radashi";
 const logger = createLogger("[DirectusNext]");
 function log(msg, context, severity = "log") {
   if (process.env.NODE_ENV === "development") {
@@ -85,6 +85,23 @@ async function handleRedirect(request, options = {}) {
   log(`${capitalize(type)}ing to ${url.toString()} with status ${status}`);
   return NextResponse[type](url, { status });
 }
+const query = `
+  query Languages_code($filter: page_settings_translations_filter) {
+    page_settings_translations(filter: $filter) {
+      languages_code {
+        code
+      }
+      id
+      page_settings_id {
+        belongs_to_collection
+        belongs_to_key
+      }
+      title
+      slug
+      path
+    }
+  }
+`;
 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;
@@ -94,23 +111,6 @@ async function fetchPageSettingsTranslation(path) {
   if (!graphqlApiKey) {
     throw new Error("Missing GraphQL configuration `graphqlApiKey`");
   }
-  const query = `
-    query Languages_code($filter: page_settings_translations_filter) {
-      page_settings_translations(filter: $filter) {
-        languages_code {
-          code
-        }
-        id
-        page_settings_id {
-          belongs_to_collection
-          belongs_to_key
-        }
-        title
-        slug
-        path
-      }
-    }
-  `;
   const variables = {
     filter: {
       path: { _eq: path },
@@ -123,6 +123,7 @@ 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}`
       },
@@ -140,6 +141,17 @@ function removeLocaleFromPathname(pathname, config) {
   const currentLocale = Object.values(config.localeMap ?? {}).find((locale) => pathname.startsWith(`/${locale}/`));
   return { locale: currentLocale, pathname: currentLocale ? pathname.replace(`/${currentLocale}/`, "/") : pathname };
 }
+function getValidTranslation(translations, locale) {
+  const translation = translations[0];
+  if (!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;
+}
 async function directusRouteRouter(request, config, NextResponse$1 = NextResponse) {
   var _a, _b, _c;
   const { pathname: localizedPathname } = request.nextUrl;
@@ -150,13 +162,13 @@ async function directusRouteRouter(request, config, NextResponse$1 = NextRespons
     return redirect;
   }
   const translations = await fetchPageSettingsTranslation(pathname);
-  if (!translations || translations.length === 0) {
+  if (isEmpty(translations)) {
     log("No translation found for path:", pathname);
     return NextResponse$1.next();
   }
-  const translation = translations[0];
+  const translation = getValidTranslation(translations, locale);
   log("Using translation:", translation);
-  if (!translation.languages_code || !translation.page_settings_id) {
+  if (!translation || !translation.languages_code || !translation.page_settings_id) {
     log(`Invalid translation data for path: ${pathname}`, { pathname }, "warn");
     return NextResponse$1.next();
   }
@@ -167,6 +179,10 @@ async function directusRouteRouter(request, config, NextResponse$1 = NextRespons
     log(`PageSettings with id ${id} was found but is not associated with any collection.`, { id }, "warn");
     return NextResponse$1.next();
   }
+  if (!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;
   log("Directus locale:", directusLocale);

package/{directusRouteRouter-CfK0xrh0.js → router-XhYR_hlg.js}

@@ -1,8 +1,8 @@
 "use strict";
 const server = require("next/server");
+const radashi = require("radashi");
 const logger$1 = require("@okam/logger");
 const coreLib = require("@okam/core-lib");
-const radashi = require("radashi");
 const logger = logger$1.createLogger("[DirectusNext]");
 function log(msg, context, severity = "log") {
   if (process.env.NODE_ENV === "development") {
@@ -86,6 +86,23 @@ async function handleRedirect(request, options = {}) {
   log(`${radashi.capitalize(type)}ing to ${url.toString()} with status ${status}`);
   return server.NextResponse[type](url, { status });
 }
+const query = `
+  query Languages_code($filter: page_settings_translations_filter) {
+    page_settings_translations(filter: $filter) {
+      languages_code {
+        code
+      }
+      id
+      page_settings_id {
+        belongs_to_collection
+        belongs_to_key
+      }
+      title
+      slug
+      path
+    }
+  }
+`;
 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;
@@ -95,23 +112,6 @@ async function fetchPageSettingsTranslation(path) {
   if (!graphqlApiKey) {
     throw new Error("Missing GraphQL configuration `graphqlApiKey`");
   }
-  const query = `
-    query Languages_code($filter: page_settings_translations_filter) {
-      page_settings_translations(filter: $filter) {
-        languages_code {
-          code
-        }
-        id
-        page_settings_id {
-          belongs_to_collection
-          belongs_to_key
-        }
-        title
-        slug
-        path
-      }
-    }
-  `;
   const variables = {
     filter: {
       path: { _eq: path },
@@ -124,6 +124,7 @@ 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}`
       },
@@ -141,6 +142,17 @@ function removeLocaleFromPathname(pathname, config) {
   const currentLocale = Object.values(config.localeMap ?? {}).find((locale) => pathname.startsWith(`/${locale}/`));
   return { locale: currentLocale, pathname: currentLocale ? pathname.replace(`/${currentLocale}/`, "/") : pathname };
 }
+function getValidTranslation(translations, locale) {
+  const translation = translations[0];
+  if (!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;
+}
 async function directusRouteRouter(request, config, NextResponse = server.NextResponse) {
   var _a, _b, _c;
   const { pathname: localizedPathname } = request.nextUrl;
@@ -151,13 +163,13 @@ async function directusRouteRouter(request, config, NextResponse = server.NextRe
     return redirect;
   }
   const translations = await fetchPageSettingsTranslation(pathname);
-  if (!translations || translations.length === 0) {
+  if (radashi.isEmpty(translations)) {
     log("No translation found for path:", pathname);
     return NextResponse.next();
   }
-  const translation = translations[0];
+  const translation = getValidTranslation(translations, locale);
   log("Using translation:", translation);
-  if (!translation.languages_code || !translation.page_settings_id) {
+  if (!translation || !translation.languages_code || !translation.page_settings_id) {
     log(`Invalid translation data for path: ${pathname}`, { pathname }, "warn");
     return NextResponse.next();
   }
@@ -168,6 +180,10 @@ async function directusRouteRouter(request, config, NextResponse = server.NextRe
     log(`PageSettings with id ${id} was found but is not associated with any collection.`, { id }, "warn");
     return NextResponse.next();
   }
+  if (!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;
   log("Directus locale:", directusLocale);

package/server.d.ts

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

package/server.js

@@ -1,7 +1,7 @@
 "use server";
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const directusRouteRouter = require("./directusRouteRouter-CfK0xrh0.js");
+const router = require("./router-XhYR_hlg.js");
 require("server-only");
 const createServerContext = require("server-only-context");
 const directusQuery = require("@okam/directus-query");
@@ -34,31 +34,31 @@ async function usePageSettings(props, itemKey) {
   const directusVariables = getDirectusVariables(variables, config);
   const defaultReturn = getPageSettings() ?? {};
   if (!props || radashi.isEqual(getVariables(), directusVariables)) {
-    directusRouteRouter.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 });
+    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 });
     return defaultReturn;
   }
   const { document } = props;
   const key = itemKey ?? radashi.get(document, "definitions[0].selectionSet.selections[0].name.value");
-  directusRouteRouter.log("Querying new page settings", directusVariables);
+  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) {
-    directusRouteRouter.log("No item found. Falling back to cached page settings", { path: currentPath }, "warn");
+    router.log("No item found. Falling back to cached page settings", { path: currentPath }, "warn");
     return defaultReturn;
   }
   if (!currentPageSettings) {
-    directusRouteRouter.log("No page settings found. Falling back to cached page settings", { path: currentPath }, "warn");
+    router.log("No page settings found. Falling back to cached page settings", { path: currentPath }, "warn");
     return defaultReturn;
   }
-  directusRouteRouter.log("Caching new page settings", { path: currentPath });
+  router.log("Caching new page settings", { path: currentPath });
   setPageSettings(currentItem);
   setVariables(variables);
   return currentItem;
 }
-exports.directusRouteRouter = directusRouteRouter.directusRouteRouter;
+exports.directusRouteRouter = router.directusRouteRouter;
 exports.pageSettingsContext = pageSettingsContext;
 exports.pageSettingsVariablesContext = pageSettingsVariablesContext;
 exports.usePageSettings = usePageSettings;

package/server.mjs

@@ -1,6 +1,6 @@
 "use server";
-import { c as log } from "./directusRouteRouter-Bt3bEq4S.mjs";
-import { d } from "./directusRouteRouter-Bt3bEq4S.mjs";
+import { c as log } from "./router-BdkmiPvg.mjs";
+import { d } from "./router-BdkmiPvg.mjs";
 import "server-only";
 import createServerContext from "server-only-context";
 import { queryGql } from "@okam/directus-query";

package/types/pageSettings.d.ts

@@ -1,13 +1,13 @@
 export interface PageSettingsTranslation {
-    languages_code: {
-        code: string;
-    };
+    languages_code?: {
+        code?: string | null | undefined;
+    } | null | undefined;
     id: string;
-    page_settings_id: {
-        belongs_to_collection: string;
-        belongs_to_key: string;
-    };
-    title: string;
-    slug: string;
-    path: string;
+    page_settings_id?: {
+        belongs_to_collection?: string | null | undefined;
+        belongs_to_key?: string | null | undefined;
+    } | null | undefined;
+    title?: string | null | undefined;
+    slug?: string | null | undefined;
+    path?: string | null | undefined;
 }

package/lib/directusRouteRouter.d.ts

@@ -1,10 +0,0 @@
-import type { NextRequest, NextResponse as NextResponseType } from 'next/server';
-import type { DirectusRouteConfig } from '../types/directusRouteConfig';
-/**
- * Handles routing for Directus.
- *
- * @param {NextRequest} request - The incoming request object.
- * @param {DirectusRouteConfig} config - Configuration for routing.
- * @returns {Promise<NextResponse>} The response object.
- */
-export declare function directusRouteRouter(request: NextRequest, config: DirectusRouteConfig): Promise<NextResponseType>;