@okam/directus-next 1.2.8 → 1.2.10

package/draft/route.d.ts

@@ -44,4 +44,4 @@ export type HandleDraftOptions = {
  *   })
  * }
  */
-export default function handleDraftRoute({ url, getDirectusLanguage, getDraftSecret, getJsonError, }: HandleDraftOptions): Response | undefined;
+export default function handleDraftRoute({ url, getDirectusLanguage, getDraftSecret, getJsonError, }: HandleDraftOptions): Promise<Response | undefined>;

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 router = require("./router-XhYR_hlg.js");
+const router = require("./router-DTZYUtal.js");
 const logger = require("@okam/logger");
 const coreLib = require("@okam/core-lib");
 function getJsonErrorResponse(data, status) {
@@ -98,7 +98,7 @@ function getPathFromRoute(routeUrl, url, index = 0) {
   });
   return radashi.template(routeUrl, map);
 }
-function handleDraftRoute({
+async function handleDraftRoute({
   url,
   getDirectusLanguage,
   getDraftSecret,
@@ -147,7 +147,7 @@ function handleDraftRoute({
     const withParams = redirectUrl.indexOf("?") !== -1;
     redirectUrl = `${redirectUrl}${withParams ? "&" : "?"}version=${encodeURIComponent(version)}`;
   }
-  headers.draftMode().enable();
+  (await headers.draftMode()).enable();
   navigation.redirect(redirectUrl);
   return void 0;
 }

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 "./router-BdkmiPvg.mjs";
-import { l, d, b, a, h } from "./router-BdkmiPvg.mjs";
+import { g as getRedirectSecretDefault } from "./router-CA4ItnAc.mjs";
+import { l, d, b, a, h } from "./router-CA4ItnAc.mjs";
 import { logger } from "@okam/logger";
 import { normalizePath } from "@okam/core-lib";
 function getJsonErrorResponse(data, status) {
@@ -97,7 +97,7 @@ function getPathFromRoute(routeUrl, url, index = 0) {
   });
   return template(routeUrl, map);
 }
-function handleDraftRoute({
+async function handleDraftRoute({
   url,
   getDirectusLanguage,
   getDraftSecret,
@@ -146,7 +146,7 @@ function handleDraftRoute({
     const withParams = redirectUrl.indexOf("?") !== -1;
     redirectUrl = `${redirectUrl}${withParams ? "&" : "?"}version=${encodeURIComponent(version)}`;
   }
-  draftMode().enable();
+  (await draftMode()).enable();
   redirect(redirectUrl);
   return void 0;
 }

package/logger.d.ts

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

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@okam/directus-next",
   "main": "./index.js",
-  "version": "1.2.8",
+  "version": "1.2.10",
   "types": "./index.d.ts",
   "exports": {
     ".": {
@@ -35,8 +35,8 @@
     "@okam/core-lib": "1.17.0",
     "@okam/directus-node": "0.6.2",
     "@okam/logger": "1.1.0",
-    "@okam/next-component": "1.2.1",
-    "next": "^14.1.1",
+    "@okam/next-component": "1.2.3",
+    "next": "^15.0.0",
     "radashi": "^12.3.0",
     "@okam/directus-query": "1.4.2",
     "server-only": "0.0.1",

package/pageSettings/context.d.ts

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

package/pageSettings/interface.d.ts

@@ -1,7 +1,8 @@
-import { type TypedDocumentNode } from '@graphql-typed-document-node/core';
-import type { Variables } from 'graphql-request';
-import type { TFiles } from '../files/interface';
-import type { DirectusRouteConfig } from '../types/directusRouteConfig';
+import { TypedDocumentNode } from '@graphql-typed-document-node/core';
+import { Variables } from 'graphql-request';
+import { TFiles } from '../files/interface';
+import { DirectusRouteConfig } from '../types/directusRouteConfig';
+
 export type Fragmentize<FragmentData, FragmentName extends string = string> = {
     ' $fragmentRefs'?: {
         [FragmentKey in FragmentName]?: FragmentData | null | undefined;

package/pageSettings/usePageSettings.d.ts

@@ -1,5 +1,6 @@
-import type { Variables } from 'graphql-request';
-import type { TUsePageSettingsProps, TPageSettingsQueryItem, TUsePageSettingsReturn } from './interface';
+import { Variables } from 'graphql-request';
+import { TUsePageSettingsProps, TPageSettingsQueryItem, TUsePageSettingsReturn } 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/redirect/route.d.ts

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

package/redirect/utils/getRedirectsRoute.d.ts

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

package/redirect/utils/handleRedirect.d.ts

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

package/router/router.d.ts

@@ -1,5 +1,33 @@
-import type { NextRequest, NextResponse as NextResponseType } from 'next/server';
-import type { DirectusRouteConfig } from '../types/directusRouteConfig';
+import { NextRequest, NextResponse as NextResponseType } from 'next/server';
+import { DirectusRouteConfig } from '../types/directusRouteConfig';
+
+/**
+ * Handles incoming middleware requests and rewrites the path to the new format according to fetched page settings.
+ * @param request - The NextRequest object
+ * @param config - The DirectusRouteConfig object
+ * @deprecated Use `directusRouteRouter(request, config)` instead. NextResponse is now directly imported in this file.
+ * @param NextResponse - The NextResponse object
+ * @returns NextResponse
+ *
+ * @example
+ * ```typescript
+ * export const directusConfig: DirectusRouteConfig = {
+ *  localeMap: {
+ *    'fr-CA': 'fr',
+ *    'en-CA': 'en',
+ *  },
+ *  collectionSettings: {
+ *    default: {
+ *      idField: 'id',
+ *    },
+ *  },
+ * }
+ *
+ * export async function middleware(request: NextRequest) {
+ *   return directusRouteRouter(request, directusConfig)
+ * }
+ * ```
+ */
 export declare function directusRouteRouter(request: NextRequest, config: DirectusRouteConfig, 
 /**
  * @deprecated Use `directusRouteRouter(request, config)` instead. NextResponse is now directly imported in this file.

package/router/utils/fetchPageSettingsTranslation.d.ts

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

package/router/utils/locale.d.ts

@@ -0,0 +1,22 @@
+import { DirectusRouteConfig } 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
+ * @param config The Directus route configuration containing the locale map
+ * @returns The validated locale string, or undefined if invalid
+ */
+export declare function getValidLocale(maybeLocale: string | null | undefined, config: DirectusRouteConfig): string | undefined;
+/**
+ * Splits the locale from the pathname and returns the locale and the pathname without the locale.
+ * @param pathname The pathname to split the locale from
+ * @param config The Directus route configuration containing the locale map
+ * @returns The locale and the pathname without the locale
+ */
+export declare function splitLocaleFromPathname(pathname: string, config: DirectusRouteConfig): {
+    locale: string;
+    pathname: string;
+} | {
+    locale: undefined;
+    pathname: string;
+};

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

@@ -137,9 +137,18 @@ async function fetchPageSettingsTranslation(path) {
     return null;
   }
 }
-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 getValidLocale(maybeLocale, config) {
+  const locale = Object.values(config.localeMap ?? {}).find((l) => l === maybeLocale);
+  return locale;
+}
+function splitLocaleFromPathname(pathname, config) {
+  const [, maybeLocale, ...parts] = pathname.split("/");
+  const locale = getValidLocale(maybeLocale, config);
+  if (locale) {
+    const newPathname = parts.length > 0 ? `/${parts.join("/")}` : "/";
+    return { locale, pathname: newPathname };
+  }
+  return { locale: void 0, pathname };
 }
 function getValidTranslation(translations, locale) {
   const translation = translations[0];
@@ -155,7 +164,7 @@ function getValidTranslation(translations, locale) {
 async function directusRouteRouter(request, config, NextResponse$1 = NextResponse) {
   var _a, _b, _c;
   const { pathname: localizedPathname } = request.nextUrl;
-  const { locale, pathname } = removeLocaleFromPathname(localizedPathname, config);
+  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) {

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

@@ -138,9 +138,18 @@ async function fetchPageSettingsTranslation(path) {
     return null;
   }
 }
-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 getValidLocale(maybeLocale, config) {
+  const locale = Object.values(config.localeMap ?? {}).find((l) => l === maybeLocale);
+  return locale;
+}
+function splitLocaleFromPathname(pathname, config) {
+  const [, maybeLocale, ...parts] = pathname.split("/");
+  const locale = getValidLocale(maybeLocale, config);
+  if (locale) {
+    const newPathname = parts.length > 0 ? `/${parts.join("/")}` : "/";
+    return { locale, pathname: newPathname };
+  }
+  return { locale: void 0, pathname };
 }
 function getValidTranslation(translations, locale) {
   const translation = translations[0];
@@ -156,7 +165,7 @@ function getValidTranslation(translations, locale) {
 async function directusRouteRouter(request, config, NextResponse = server.NextResponse) {
   var _a, _b, _c;
   const { pathname: localizedPathname } = request.nextUrl;
-  const { locale, pathname } = removeLocaleFromPathname(localizedPathname, config);
+  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) {

package/server.js

@@ -1,7 +1,7 @@
 "use server";
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const router = require("./router-XhYR_hlg.js");
+const router = require("./router-DTZYUtal.js");
 require("server-only");
 const react = require("react");
 const directusQuery = require("@okam/directus-query");

package/server.mjs

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