@okam/directus-next 1.1.0 → 1.2.0

package/CHANGELOG.md

@@ -1,3 +1,28 @@
+## 1.2.0 (2025-07-22)
+
+### 🚀 Features
+
+- **directus-next:** /api/redirect route handler to fetch + cache directus redirects ([c21b953](https://github.com/OKAMca/stack/commit/c21b953))
+
+### ❤️ Thank You
+
+- Pierre-Olivier Clerson @poclerson
+
+## 1.1.1 (2025-07-09)
+
+### 🩹 Fixes
+
+- **directus-next:** missing external deps for build ([8146c77](https://github.com/OKAMca/stack/commit/8146c77))
+- update vite-plugin-dts to version 3 ([5d33c77](https://github.com/OKAMca/stack/commit/5d33c77))
+- package deps error ([b665a45](https://github.com/OKAMca/stack/commit/b665a45))
+- search field icon ([0850fde](https://github.com/OKAMca/stack/commit/0850fde))
+
+### ❤️ Thank You
+
+- Marie-Maxime Tanguay
+- Pierre-Olivier Clerson @poclerson
+- poclerson
+
 ## 0.3.0 (2024-12-03)
 
 

package/draft/index.d.ts

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

package/draft/route.d.ts

@@ -1,4 +1,4 @@
-export declare function parseParams(url: string): {
+export declare function parseDraftParams(url: string): {
     secret: string;
     languages: any;
     paths: never[];

package/{directus/directus-next/src/draft → draft}/route.js

@@ -5,7 +5,7 @@ const navigation = require("next/navigation");
 const radashi = require("radashi");
 const response = require("../response.js");
 const env = require("./env.js");
-function parseParams(url) {
+function parseDraftParams(url) {
   const { searchParams } = new URL(url);
   const secret = searchParams.get("secret") || "";
   const languagesParam = searchParams.get("languages");
@@ -91,7 +91,7 @@ function handleDraftRoute({
 }) {
   const getSecretFunction = getDraftSecret || env.getDraftSecretDefault;
   const getJsonErrorResponseFunction = getJsonError || response.getJsonErrorResponse;
-  const { secret, languages, paths, routes, type, version } = parseParams(url);
+  const { secret, languages, paths, routes, type, version } = parseDraftParams(url);
   if (secret !== getSecretFunction()) {
     return getJsonErrorResponseFunction({ error: "Invalid argument" }, 401);
   }
@@ -138,4 +138,4 @@ function handleDraftRoute({
 }
 exports.default = handleDraftRoute;
 exports.getPathFromRoute = getPathFromRoute;
-exports.parseParams = parseParams;
+exports.parseDraftParams = parseDraftParams;

package/{directus/directus-next/src/draft → draft}/route.mjs

@@ -3,7 +3,7 @@ import { redirect } from "next/navigation";
 import { template } from "radashi";
 import { getJsonErrorResponse } from "../response.mjs";
 import { getDraftSecretDefault } from "./env.mjs";
-function parseParams(url) {
+function parseDraftParams(url) {
   const { searchParams } = new URL(url);
   const secret = searchParams.get("secret") || "";
   const languagesParam = searchParams.get("languages");
@@ -89,7 +89,7 @@ function handleDraftRoute({
 }) {
   const getSecretFunction = getDraftSecret || getDraftSecretDefault;
   const getJsonErrorResponseFunction = getJsonError || getJsonErrorResponse;
-  const { secret, languages, paths, routes, type, version } = parseParams(url);
+  const { secret, languages, paths, routes, type, version } = parseDraftParams(url);
   if (secret !== getSecretFunction()) {
     return getJsonErrorResponseFunction({ error: "Invalid argument" }, 401);
   }
@@ -137,5 +137,5 @@ function handleDraftRoute({
 export {
   handleDraftRoute as default,
   getPathFromRoute,
-  parseParams
+  parseDraftParams
 };

package/files/index.d.ts

@@ -0,0 +1 @@
+export type { TFiles } from './interface';

package/index.d.ts

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

package/{directus/directus-next/src/index.js → index.js}

@@ -2,13 +2,23 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const route = require("./draft/route.js");
 const env = require("./draft/env.js");
+const env$1 = require("./redirect/env.js");
+const route$1 = require("./redirect/route.js");
+const getRedirectsRoute = require("./redirect/utils/getRedirectsRoute.js");
+const handleRedirect = require("./redirect/utils/handleRedirect.js");
 const logger = require("./logger.js");
 const directusRouteRouter = require("./lib/directusRouteRouter.js");
 const response = require("./response.js");
 exports.getPathFromRoute = route.getPathFromRoute;
 exports.handleDraftRoute = route.default;
-exports.parseParams = route.parseParams;
+exports.parseDraftParams = route.parseDraftParams;
 exports.getDraftSecretDefault = env.getDraftSecretDefault;
+exports.getApiRouteUrlDefault = env$1.getApiRouteUrlDefault;
+exports.getRedirectSecretDefault = env$1.getRedirectSecretDefault;
+exports.handleRedirectsRoute = route$1.default;
+exports.parseRedirectParams = route$1.parseRedirectParams;
+exports.getRedirectsRoute = getRedirectsRoute.getRedirectsRoute;
+exports.handleRedirect = handleRedirect.handleRedirect;
 exports.DirectusNextLogger = logger.logger;
 exports.directusRouteRouter = directusRouteRouter.directusRouteRouter;
 exports.getJsonErrorResponse = response.getJsonErrorResponse;

package/index.mjs

@@ -0,0 +1,24 @@
+import { getPathFromRoute, default as default2, parseDraftParams } from "./draft/route.mjs";
+import { getDraftSecretDefault } from "./draft/env.mjs";
+import { getApiRouteUrlDefault, getRedirectSecretDefault } from "./redirect/env.mjs";
+import { default as default3, parseRedirectParams } from "./redirect/route.mjs";
+import { getRedirectsRoute } from "./redirect/utils/getRedirectsRoute.mjs";
+import { handleRedirect } from "./redirect/utils/handleRedirect.mjs";
+import { logger } from "./logger.mjs";
+import { directusRouteRouter } from "./lib/directusRouteRouter.mjs";
+import { getJsonErrorResponse } from "./response.mjs";
+export {
+  logger as DirectusNextLogger,
+  directusRouteRouter,
+  getApiRouteUrlDefault,
+  getDraftSecretDefault,
+  getJsonErrorResponse,
+  getPathFromRoute,
+  getRedirectSecretDefault,
+  getRedirectsRoute,
+  default2 as handleDraftRoute,
+  handleRedirect,
+  default3 as handleRedirectsRoute,
+  parseDraftParams,
+  parseRedirectParams
+};

package/lib/directusRouteRouter.d.ts

@@ -1,15 +1,10 @@
+import type { NextRequest, NextResponse as NextResponseType } from 'next/server';
 import type { DirectusRouteConfig } from '../types/directusRouteConfig';
-interface MinimalNextUrl {
-    pathname: string;
-    clone: () => MinimalNextUrl;
-}
-interface MinimalNextRequest {
-    nextUrl: MinimalNextUrl;
-}
-interface MinimalNextResponse {
-    next: () => MinimalNextResponse;
-    notFound: () => MinimalNextResponse;
-    rewrite: (url: MinimalNextUrl | URL) => MinimalNextResponse;
-}
-export declare function directusRouteRouter(request: MinimalNextRequest, config: DirectusRouteConfig, NextResponse: MinimalNextResponse): Promise<MinimalNextResponse>;
-export {};
+/**
+ * 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>;

package/{directus/directus-next/src/lib → lib}/directusRouteRouter.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const server = require("next/server");
 const logger = require("../logger.js");
+const handleRedirect = require("../redirect/utils/handleRedirect.js");
 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;
@@ -56,11 +58,15 @@ function removeLocaleFromPathname(pathname, config) {
   const currentLocale = Object.values(config.localeMap ?? {}).find((locale) => pathname.startsWith(`/${locale}/`));
   return { locale: currentLocale, pathname: currentLocale ? pathname.replace(`/${currentLocale}/`, "/") : pathname };
 }
-async function directusRouteRouter(request, config, NextResponse) {
-  var _a, _b;
+async function directusRouteRouter(request, config, NextResponse = server.NextResponse) {
+  var _a, _b, _c;
   const { pathname: localizedPathname } = request.nextUrl;
   const { locale, pathname } = removeLocaleFromPathname(localizedPathname, config);
   logger.log("Processing request for pathname:", { locale, pathname });
+  const redirect = await handleRedirect.handleRedirect(request, (_a = config.modules) == null ? void 0 : _a.redirects);
+  if (redirect) {
+    return redirect;
+  }
   const translations = await fetchPageSettingsTranslation(pathname);
   if (!translations || translations.length === 0) {
     logger.log("No translation found for path:", pathname);
@@ -79,8 +85,8 @@ async function directusRouteRouter(request, config, NextResponse) {
     logger.log(`PageSettings with id ${id} was found but is not associated with any collection.`, { id }, "warn");
     return NextResponse.next();
   }
-  const mappedLocale = ((_a = config.localeMap) == null ? void 0 : _a[directusLocale]) || directusLocale;
-  const idField = ((_b = config.collectionSettings[collection]) == null ? void 0 : _b.idField) || config.collectionSettings.default.idField;
+  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;
   logger.log("Directus locale:", directusLocale);
   logger.log("Mapped locale:", mappedLocale);
   logger.log("Collection:", collection);

package/{directus/directus-next/src/lib → lib}/directusRouteRouter.mjs

@@ -1,4 +1,6 @@
+import { NextResponse } from "next/server";
 import { log } from "../logger.mjs";
+import { handleRedirect } from "../redirect/utils/handleRedirect.mjs";
 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;
@@ -54,31 +56,35 @@ function removeLocaleFromPathname(pathname, config) {
   const currentLocale = Object.values(config.localeMap ?? {}).find((locale) => pathname.startsWith(`/${locale}/`));
   return { locale: currentLocale, pathname: currentLocale ? pathname.replace(`/${currentLocale}/`, "/") : pathname };
 }
-async function directusRouteRouter(request, config, NextResponse) {
-  var _a, _b;
+async function directusRouteRouter(request, config, NextResponse$1 = NextResponse) {
+  var _a, _b, _c;
   const { pathname: localizedPathname } = request.nextUrl;
   const { locale, pathname } = removeLocaleFromPathname(localizedPathname, config);
   log("Processing request for pathname:", { locale, pathname });
+  const redirect = await handleRedirect(request, (_a = config.modules) == null ? void 0 : _a.redirects);
+  if (redirect) {
+    return redirect;
+  }
   const translations = await fetchPageSettingsTranslation(pathname);
   if (!translations || translations.length === 0) {
     log("No translation found for path:", pathname);
-    return NextResponse.next();
+    return NextResponse$1.next();
   }
   const translation = translations[0];
   log("Using translation:", translation);
   if (!translation.languages_code || !translation.page_settings_id) {
     log(`Invalid translation data for path: ${pathname}`, { pathname }, "warn");
-    return NextResponse.next();
+    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) {
     log(`PageSettings with id ${id} was found but is not associated with any collection.`, { id }, "warn");
-    return NextResponse.next();
+    return NextResponse$1.next();
   }
-  const mappedLocale = ((_a = config.localeMap) == null ? void 0 : _a[directusLocale]) || directusLocale;
-  const idField = ((_b = config.collectionSettings[collection]) == null ? void 0 : _b.idField) || config.collectionSettings.default.idField;
+  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);
   log("Mapped locale:", mappedLocale);
   log("Collection:", collection);
@@ -89,7 +95,7 @@ async function directusRouteRouter(request, config, NextResponse) {
   const url = request.nextUrl.clone();
   url.pathname = newPath;
   log("Rewriting to URL:", url.toString());
-  return NextResponse.rewrite(url);
+  return NextResponse$1.rewrite(url);
 }
 export {
   directusRouteRouter

package/{directus/directus-next/src/logger.js → logger.js}

@@ -1,8 +1,7 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../../stack/logger/src/lib/logger.js");
-const factoryLogger = require("../../../stack/logger/src/lib/factoryLogger.js");
-const logger = factoryLogger("[DirectusNext]");
+const logger$1 = require("@okam/logger");
+const logger = logger$1.createLogger("[DirectusNext]");
 function log(msg, context, severity = "log") {
   if (process.env.NODE_ENV === "development") {
     logger.log(msg, severity, { context });

package/{directus/directus-next/src/logger.mjs → logger.mjs}

@@ -1,5 +1,4 @@
-import "../../../stack/logger/src/lib/logger.mjs";
-import createLogger from "../../../stack/logger/src/lib/factoryLogger.mjs";
+import { createLogger } from "@okam/logger";
 const logger = createLogger("[DirectusNext]");
 function log(msg, context, severity = "log") {
   if (process.env.NODE_ENV === "development") {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@okam/directus-next",
   "main": "./index.js",
-  "version": "1.1.0",
+  "version": "1.2.0",
   "types": "./index.d.ts",
   "exports": {
     ".": {
@@ -32,6 +32,8 @@
     "access": "public"
   },
   "dependencies": {
+    "@okam/core-lib": "1.16.0",
+    "@okam/directus-node": "0.5.0",
     "@okam/logger": "1.1.0",
     "next": "^14.1.1",
     "radashi": "^12.3.0",

package/{directus/directus-next/src/pageSettings → pageSettings}/usePageSettings.js

@@ -1,11 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("@tanstack/react-query");
-const query = require("../../../directus-query/src/lib/query.js");
-require("../../../directus-query/src/lib/request.js");
-require("../../../directus-query/src/logger.js");
-require("graphql-request");
-require("../../../directus-query/src/lib/config.js");
+const directusQuery = require("@okam/directus-query");
 const radashi = require("radashi");
 const logger = require("../logger.js");
 const context = require("./context.js");
@@ -35,7 +30,7 @@ async function usePageSettings(props, itemKey) {
   const { document } = props;
   const key = itemKey ?? radashi.get(document, "definitions[0].selectionSet.selections[0].name.value");
   logger.log("Querying new page settings", directusVariables);
-  const result = await query.queryGql(document, 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;

package/{directus/directus-next/src/pageSettings → pageSettings}/usePageSettings.mjs

@@ -1,9 +1,4 @@
-import "@tanstack/react-query";
-import { queryGql } from "../../../directus-query/src/lib/query.mjs";
-import "../../../directus-query/src/lib/request.mjs";
-import "../../../directus-query/src/logger.mjs";
-import "graphql-request";
-import "../../../directus-query/src/lib/config.mjs";
+import { queryGql } from "@okam/directus-query";
 import { isEqual, get, invert } from "radashi";
 import { log } from "../logger.mjs";
 import { pageSettingsContext, pageSettingsVariablesContext } from "./context.mjs";

package/redirect/env.d.ts

@@ -0,0 +1,2 @@
+export declare function getRedirectSecretDefault(): string;
+export declare function getApiRouteUrlDefault(): string;

package/redirect/env.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const logger = require("../logger.js");
+const defaultInternalUrl = "http://localhost:3000";
+function getRedirectSecretDefault() {
+  return process.env.NEXT_API_REDIRECT_SECRET || "";
+}
+function getVercelUrl() {
+  const url = process.env.VERCEL_URL;
+  if (!url) return null;
+  return `https://${url}`;
+}
+function getApiRouteUrlDefault() {
+  const url = process.env.NEXT_MIDDLEWARE_REDIRECT_URL ?? getVercelUrl() ?? defaultInternalUrl;
+  if (URL.canParse(url)) return url;
+  logger.log(`Invalid URL ${url}. Falling back to default`, { url }, "warn");
+  return defaultInternalUrl;
+}
+exports.getApiRouteUrlDefault = getApiRouteUrlDefault;
+exports.getRedirectSecretDefault = getRedirectSecretDefault;

package/redirect/env.mjs

@@ -0,0 +1,20 @@
+import { log } from "../logger.mjs";
+const defaultInternalUrl = "http://localhost:3000";
+function getRedirectSecretDefault() {
+  return process.env.NEXT_API_REDIRECT_SECRET || "";
+}
+function getVercelUrl() {
+  const url = process.env.VERCEL_URL;
+  if (!url) return null;
+  return `https://${url}`;
+}
+function getApiRouteUrlDefault() {
+  const url = process.env.NEXT_MIDDLEWARE_REDIRECT_URL ?? getVercelUrl() ?? defaultInternalUrl;
+  if (URL.canParse(url)) return url;
+  log(`Invalid URL ${url}. Falling back to default`, { url }, "warn");
+  return defaultInternalUrl;
+}
+export {
+  getApiRouteUrlDefault,
+  getRedirectSecretDefault
+};

package/redirect/index.d.ts

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

package/redirect/interface.d.ts

@@ -0,0 +1,25 @@
+export interface HandleRedirectOptions {
+    url: string;
+    /**
+     * @default process.env.NEXT_API_REDIRECT_SECRET
+     */
+    getRedirectSecret?: () => string;
+    /**
+     * @default process.env.NEXT_REDIRECT_GRAPHQL_URL || process.env.NEXT_PUBLIC_GRAPHQL_URL
+     */
+    getDirectusGraphqlUrl?: () => string;
+    /**
+     * @default process.env.NEXT_API_TOKEN_ADMIN
+     */
+    getDirectusApiToken?: () => string;
+    getJsonError?: (data: any, status: number) => Response;
+    /**
+     * @default 2000
+     */
+    limit?: number;
+    /**
+     * Gets spread into the second argument of fetch.
+     * Allows passing options like `cache` or `next.revalidate`
+     */
+    init?: Omit<RequestInit, 'body' | 'method' | 'headers'>;
+}

package/redirect/route.d.ts

@@ -0,0 +1,8 @@
+import type { HandleRedirectOptions } from './interface';
+export declare function parseRedirectParams(url: string): {
+    secret: string;
+};
+/**
+ * Wrapper for `fetchRedirectsData` with secret validation
+ */
+export default function handleRedirectsRoute({ url, getRedirectSecret, getJsonError, getDirectusApiToken, getDirectusGraphqlUrl, limit, init, }: HandleRedirectOptions): Promise<Response | undefined>;

package/redirect/route.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
+const directusNode = require("@okam/directus-node");
+const response = require("../response.js");
+const env = require("./env.js");
+function parseRedirectParams(url) {
+  const { searchParams } = new URL(url);
+  const secret = searchParams.get("secret") || "";
+  return { secret };
+}
+async function handleRedirectsRoute({
+  url,
+  getRedirectSecret = env.getRedirectSecretDefault,
+  getJsonError = response.getJsonErrorResponse,
+  getDirectusApiToken,
+  getDirectusGraphqlUrl,
+  limit,
+  init
+}) {
+  const { secret } = parseRedirectParams(url);
+  if (secret !== getRedirectSecret()) {
+    return getJsonError({ error: "Invalid argument" }, 401);
+  }
+  const graphqlEndpoint = getDirectusGraphqlUrl == null ? void 0 : getDirectusGraphqlUrl();
+  const graphqlApiKey = getDirectusApiToken == null ? void 0 : getDirectusApiToken();
+  const { redirects, rewrites } = await directusNode.fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
+  return new Response(JSON.stringify({ redirects, rewrites }), { status: 200 });
+}
+exports.default = handleRedirectsRoute;
+exports.parseRedirectParams = parseRedirectParams;

package/redirect/route.mjs

@@ -0,0 +1,30 @@
+import { fetchRedirectsData } from "@okam/directus-node";
+import { getJsonErrorResponse } from "../response.mjs";
+import { getRedirectSecretDefault } from "./env.mjs";
+function parseRedirectParams(url) {
+  const { searchParams } = new URL(url);
+  const secret = searchParams.get("secret") || "";
+  return { secret };
+}
+async function handleRedirectsRoute({
+  url,
+  getRedirectSecret = getRedirectSecretDefault,
+  getJsonError = getJsonErrorResponse,
+  getDirectusApiToken,
+  getDirectusGraphqlUrl,
+  limit,
+  init
+}) {
+  const { secret } = parseRedirectParams(url);
+  if (secret !== getRedirectSecret()) {
+    return getJsonError({ error: "Invalid argument" }, 401);
+  }
+  const graphqlEndpoint = getDirectusGraphqlUrl == null ? void 0 : getDirectusGraphqlUrl();
+  const graphqlApiKey = getDirectusApiToken == null ? void 0 : getDirectusApiToken();
+  const { redirects, rewrites } = await fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
+  return new Response(JSON.stringify({ redirects, rewrites }), { status: 200 });
+}
+export {
+  handleRedirectsRoute as default,
+  parseRedirectParams
+};

package/redirect/utils/getRedirectsRoute.d.ts

@@ -0,0 +1,8 @@
+import type { TFetchRedirectsResponse } from '@okam/directus-node';
+import type { DirectusRouteRedirectsModule } from '../../types/directusRouteConfig';
+/**
+ * Gets a response from `options.apiRoute`
+ * @param {DirectusRouteRedirectsModule} options
+ * @returns {Promise<TFetchRedirectsResponse>}
+ */
+export declare function getRedirectsRoute({ apiRoute, getApiRouteUrl, getRedirectSecret, }?: DirectusRouteRedirectsModule): Promise<TFetchRedirectsResponse>;

package/redirect/utils/getRedirectsRoute.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const logger = require("../../logger.js");
+const env = require("../env.js");
+const defaultApiRoute = "/api/redirect";
+async function getRedirectsRoute({
+  apiRoute = defaultApiRoute,
+  getApiRouteUrl = env.getApiRouteUrlDefault,
+  getRedirectSecret = env.getRedirectSecretDefault
+} = {}) {
+  const secret = getRedirectSecret();
+  try {
+    const url = new URL(apiRoute, getApiRouteUrl());
+    url.searchParams.set("secret", encodeURIComponent(secret));
+    const response = await fetch(url);
+    if (!response.ok) {
+      logger.log(`${apiRoute} not ok. Returned`, { status: response.status }, "error");
+      return { redirects: [], rewrites: [] };
+    }
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    logger.log(`Error fetching redirects from ${apiRoute}.`, { error }, "error");
+    return { redirects: [], rewrites: [] };
+  }
+}
+exports.getRedirectsRoute = getRedirectsRoute;

package/redirect/utils/getRedirectsRoute.mjs

@@ -0,0 +1,27 @@
+import { log } from "../../logger.mjs";
+import { getApiRouteUrlDefault, getRedirectSecretDefault } from "../env.mjs";
+const defaultApiRoute = "/api/redirect";
+async function getRedirectsRoute({
+  apiRoute = defaultApiRoute,
+  getApiRouteUrl = getApiRouteUrlDefault,
+  getRedirectSecret = getRedirectSecretDefault
+} = {}) {
+  const secret = getRedirectSecret();
+  try {
+    const url = new URL(apiRoute, getApiRouteUrl());
+    url.searchParams.set("secret", encodeURIComponent(secret));
+    const response = await fetch(url);
+    if (!response.ok) {
+      log(`${apiRoute} not ok. Returned`, { status: response.status }, "error");
+      return { redirects: [], rewrites: [] };
+    }
+    const data = await response.json();
+    return data;
+  } catch (error) {
+    log(`Error fetching redirects from ${apiRoute}.`, { error }, "error");
+    return { redirects: [], rewrites: [] };
+  }
+}
+export {
+  getRedirectsRoute
+};

package/redirect/utils/handleRedirect.d.ts

@@ -0,0 +1,7 @@
+import type { NextRequest } from 'next/server';
+import { NextResponse } from 'next/server';
+import type { DirectusRouteRedirectsModule } from '../../types/directusRouteConfig';
+/**
+ * Handles next redirection using directus redirects
+ */
+export declare function handleRedirect(request: NextRequest, options?: DirectusRouteRedirectsModule): Promise<NextResponse<unknown> | null>;

package/redirect/utils/handleRedirect.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const coreLib = require("@okam/core-lib");
+const server = require("next/server");
+const radashi = require("radashi");
+const logger = require("../../logger.js");
+const getRedirectsRoute = require("./getRedirectsRoute.js");
+function splitDestination(destination) {
+  const [pathname, search] = destination.split("?");
+  if (!search) {
+    return [pathname];
+  }
+  return [pathname, `?${search}`];
+}
+function validateExternalRedirect(redirect) {
+  if (!URL.canParse(redirect.destination)) {
+    return null;
+  }
+  return redirect.destination;
+}
+async function handleRedirect(request, options = {}) {
+  const url = request.nextUrl.clone();
+  const { pathname } = request.nextUrl;
+  const normalizedPathname = coreLib.normalizePath(pathname);
+  const { redirects, rewrites } = await getRedirectsRoute.getRedirectsRoute(options);
+  const redirect = redirects.find(({ source }) => source === normalizedPathname);
+  const rewrite = rewrites.find(({ source }) => source === normalizedPathname);
+  const type = redirect ? "redirect" : "rewrite";
+  const reroute = redirect ?? rewrite;
+  if (!reroute) {
+    return null;
+  }
+  const { permanent } = reroute;
+  const status = permanent ? 308 : 307;
+  const externalRedirect = validateExternalRedirect(reroute);
+  if (externalRedirect) {
+    logger.log(`External ${type} found`, { [type]: externalRedirect, permanent });
+    return server.NextResponse.redirect(externalRedirect, { status });
+  }
+  logger.log(`${radashi.capitalize(type)} found`, { [type]: reroute, permanent });
+  const { destination } = reroute;
+  const [destinationPathname, search] = splitDestination(destination);
+  if (search) url.search = search;
+  url.pathname = destinationPathname;
+  logger.log(`${radashi.capitalize(type)}ing to ${url.toString()} with status ${status}`);
+  return server.NextResponse[type](url, { status });
+}
+exports.handleRedirect = handleRedirect;

package/redirect/utils/handleRedirect.mjs

@@ -0,0 +1,48 @@
+import { normalizePath } from "@okam/core-lib";
+import { NextResponse } from "next/server";
+import { capitalize } from "radashi";
+import { log } from "../../logger.mjs";
+import { getRedirectsRoute } from "./getRedirectsRoute.mjs";
+function splitDestination(destination) {
+  const [pathname, search] = destination.split("?");
+  if (!search) {
+    return [pathname];
+  }
+  return [pathname, `?${search}`];
+}
+function validateExternalRedirect(redirect) {
+  if (!URL.canParse(redirect.destination)) {
+    return null;
+  }
+  return redirect.destination;
+}
+async function handleRedirect(request, options = {}) {
+  const url = request.nextUrl.clone();
+  const { pathname } = request.nextUrl;
+  const normalizedPathname = normalizePath(pathname);
+  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 reroute = redirect ?? rewrite;
+  if (!reroute) {
+    return null;
+  }
+  const { permanent } = reroute;
+  const status = permanent ? 308 : 307;
+  const externalRedirect = validateExternalRedirect(reroute);
+  if (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;
+  url.pathname = destinationPathname;
+  log(`${capitalize(type)}ing to ${url.toString()} with status ${status}`);
+  return NextResponse[type](url, { status });
+}
+export {
+  handleRedirect
+};

package/types/directusRouteConfig.d.ts

@@ -1,3 +1,17 @@
+export interface DirectusRouteRedirectsModule {
+    /**
+     * @default process.env.NEXT_API_REDIRECT_SECRET
+     */
+    getRedirectSecret?: () => string;
+    /**
+     * @default process.env.NEXT_MIDDLEWARE_REDIRECT_URL ?? `https://${process.env.VERCEL_URL}` ?? 'http://localhost:3000'
+     */
+    getApiRouteUrl?: () => string;
+    /**
+     * @default /api/redirects
+     */
+    apiRoute?: string;
+}
 export interface DirectusRouteConfig {
     localeMap?: Record<string, string>;
     collectionSettings: {
@@ -9,4 +23,7 @@ export interface DirectusRouteConfig {
             idField: string;
         };
     };
+    modules?: {
+        redirects?: DirectusRouteRedirectsModule;
+    };
 }

package/types/index.d.ts

@@ -0,0 +1,2 @@
+export type { DirectusRouteConfig, DirectusRouteRedirectsModule } from './directusRouteConfig';
+export type { PageSettingsTranslation } from './pageSettings';

package/types/next.d.ts

@@ -0,0 +1,12 @@
+export interface MinimalNextUrl extends URL {
+    clone: () => MinimalNextUrl;
+}
+export interface MinimalNextRequest {
+    nextUrl: MinimalNextUrl;
+}
+export interface MinimalNextResponse {
+    next: () => MinimalNextResponse;
+    notFound: () => MinimalNextResponse;
+    rewrite: (url: MinimalNextUrl | URL | string, options?: ResponseInit) => MinimalNextResponse;
+    redirect: (url: MinimalNextUrl | URL | string, options?: ResponseInit) => MinimalNextResponse;
+}

package/types/pageSettings.d.ts

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

package/directus/directus-next/src/index.mjs

@@ -1,14 +0,0 @@
-import { getPathFromRoute, default as default2, parseParams } from "./draft/route.mjs";
-import { getDraftSecretDefault } from "./draft/env.mjs";
-import { logger } from "./logger.mjs";
-import { directusRouteRouter } from "./lib/directusRouteRouter.mjs";
-import { getJsonErrorResponse } from "./response.mjs";
-export {
-  logger as DirectusNextLogger,
-  directusRouteRouter,
-  getDraftSecretDefault,
-  getJsonErrorResponse,
-  getPathFromRoute,
-  default2 as handleDraftRoute,
-  parseParams
-};

package/directus/directus-query/src/lib/config.js

@@ -1,3 +0,0 @@
-"use strict";
-process.env.NEXT_PUBLIC_GRAPHQL_URL;
-process.env.NEXT_PUBLIC_API_TOKEN;

package/directus/directus-query/src/lib/config.mjs

@@ -1,2 +0,0 @@
-process.env.NEXT_PUBLIC_GRAPHQL_URL;
-process.env.NEXT_PUBLIC_API_TOKEN;

package/directus/directus-query/src/lib/query.js

@@ -1,10 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("radashi");
-const request = require("./request.js");
-function queryGql(document, queryKey, client = request.graphqlRequestClient) {
-  return client.request(document, {
-    ...queryKey
-  });
-}
-exports.queryGql = queryGql;

package/directus/directus-query/src/lib/query.mjs

@@ -1,10 +0,0 @@
-import "radashi";
-import { graphqlRequestClient } from "./request.mjs";
-function queryGql(document, queryKey, client = graphqlRequestClient) {
-  return client.request(document, {
-    ...queryKey
-  });
-}
-export {
-  queryGql
-};

package/directus/directus-query/src/lib/request.js

@@ -1,40 +0,0 @@
-"use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const reactQuery = require("@tanstack/react-query");
-const graphqlRequest = require("graphql-request");
-const logger = require("../logger.js");
-const GRAPHQL_ENDPOINT_PUBLIC = process.env.NEXT_PUBLIC_GRAPHQL_URL;
-const GRAPHQL_ENDPOINT_SERVER = process.env.NEXT_SERVER_GRAPHQL_URL;
-const GRAPHQL_ENDPOINT_ADMIN = process.env.NEXT_GRAPHQL_URL_ADMIN;
-const AUTH_TOKEN = process.env.NEXT_PUBLIC_API_TOKEN ?? "";
-const AUTH_TOKEN_ADMIN = process.env.NEXT_PUBLIC_API_TOKEN;
-const graphqlRequestClient = new graphqlRequest.GraphQLClient(GRAPHQL_ENDPOINT_SERVER || GRAPHQL_ENDPOINT_PUBLIC, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${AUTH_TOKEN}`
-  }
-});
-new graphqlRequest.GraphQLClient(GRAPHQL_ENDPOINT_ADMIN, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${AUTH_TOKEN_ADMIN}`
-  }
-});
-new reactQuery.QueryClient({
-  queryCache: new reactQuery.QueryCache({
-    onError: (error) => {
-      logger.logger.log("QueryClient Error", "error", { error });
-    }
-  }),
-  defaultOptions: {
-    queries: {
-      staleTime: 5 * 1e3
-    }
-  }
-});
-exports.default = graphqlRequestClient;
-exports.graphqlRequestClient = graphqlRequestClient;

package/directus/directus-query/src/lib/request.mjs

@@ -1,40 +0,0 @@
-import { QueryClient, QueryCache } from "@tanstack/react-query";
-import { GraphQLClient } from "graphql-request";
-import { logger } from "../logger.mjs";
-const GRAPHQL_ENDPOINT_PUBLIC = process.env.NEXT_PUBLIC_GRAPHQL_URL;
-const GRAPHQL_ENDPOINT_SERVER = process.env.NEXT_SERVER_GRAPHQL_URL;
-const GRAPHQL_ENDPOINT_ADMIN = process.env.NEXT_GRAPHQL_URL_ADMIN;
-const AUTH_TOKEN = process.env.NEXT_PUBLIC_API_TOKEN ?? "";
-const AUTH_TOKEN_ADMIN = process.env.NEXT_PUBLIC_API_TOKEN;
-const graphqlRequestClient = new GraphQLClient(GRAPHQL_ENDPOINT_SERVER || GRAPHQL_ENDPOINT_PUBLIC, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${AUTH_TOKEN}`
-  }
-});
-new GraphQLClient(GRAPHQL_ENDPOINT_ADMIN, {
-  credentials: "include",
-  mode: "cors",
-  fetch,
-  headers: {
-    Authorization: `Bearer ${AUTH_TOKEN_ADMIN}`
-  }
-});
-new QueryClient({
-  queryCache: new QueryCache({
-    onError: (error) => {
-      logger.log("QueryClient Error", "error", { error });
-    }
-  }),
-  defaultOptions: {
-    queries: {
-      staleTime: 5 * 1e3
-    }
-  }
-});
-export {
-  graphqlRequestClient as default,
-  graphqlRequestClient
-};

package/directus/directus-query/src/logger.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-require("../../../stack/logger/src/lib/logger.js");
-const factoryLogger = require("../../../stack/logger/src/lib/factoryLogger.js");
-const logger = factoryLogger("[DirectusQuery]");
-exports.logger = logger;

package/directus/directus-query/src/logger.mjs

@@ -1,6 +0,0 @@
-import "../../../stack/logger/src/lib/logger.mjs";
-import createLogger from "../../../stack/logger/src/lib/factoryLogger.mjs";
-const logger = createLogger("[DirectusQuery]");
-export {
-  logger
-};

package/stack/logger/src/lib/factoryLogger.js

@@ -1,8 +0,0 @@
-"use strict";
-const logger = require("./logger.js");
-const createLogger = (name, logger$1, suppressConsole = false) => {
-  const log = new logger.Logger(name, logger$1, suppressConsole);
-  log.log(`Logger initialized`, "info");
-  return log;
-};
-module.exports = createLogger;

package/stack/logger/src/lib/factoryLogger.mjs

@@ -1,9 +0,0 @@
-import { Logger } from "./logger.mjs";
-const createLogger = (name, logger, suppressConsole = false) => {
-  const log = new Logger(name, logger, suppressConsole);
-  log.log(`Logger initialized`, "info");
-  return log;
-};
-export {
-  createLogger as default
-};

package/stack/logger/src/lib/logger.js

@@ -1,37 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-class Logger {
-  constructor(nameSpace, logger2, suppressConsole) {
-    this.nameSpace = "[STACK]";
-    this.suppressConsole = false;
-    this.env = process.env["NODE_ENV"];
-    this.nameSpace = nameSpace ?? this.nameSpace;
-    this.suppressConsole = suppressConsole ?? this.suppressConsole;
-    this.logger = logger2 ?? this.internalLogger;
-  }
-  internalLogger(message, severity, context) {
-    if (this.env === "production") {
-      return;
-    }
-    console[severity || "log"](`${this.nameSpace} ${message}`.trimStart(), context ?? "");
-  }
-  setLogger(logger2) {
-    this.logger = (message, severity, context) => {
-      if (this.suppressConsole) {
-        this.internalLogger(message, severity, context);
-      }
-      logger2(message, severity, context);
-    };
-  }
-  static getInstance() {
-    if (!Logger.instance) {
-      Logger.instance = new Logger();
-    }
-    return Logger.instance;
-  }
-  log(message, severity, context) {
-    this.logger(message, severity, context);
-  }
-}
-Logger.getInstance();
-exports.Logger = Logger;

package/stack/logger/src/lib/logger.mjs

@@ -1,37 +0,0 @@
-class Logger {
-  constructor(nameSpace, logger2, suppressConsole) {
-    this.nameSpace = "[STACK]";
-    this.suppressConsole = false;
-    this.env = process.env["NODE_ENV"];
-    this.nameSpace = nameSpace ?? this.nameSpace;
-    this.suppressConsole = suppressConsole ?? this.suppressConsole;
-    this.logger = logger2 ?? this.internalLogger;
-  }
-  internalLogger(message, severity, context) {
-    if (this.env === "production") {
-      return;
-    }
-    console[severity || "log"](`${this.nameSpace} ${message}`.trimStart(), context ?? "");
-  }
-  setLogger(logger2) {
-    this.logger = (message, severity, context) => {
-      if (this.suppressConsole) {
-        this.internalLogger(message, severity, context);
-      }
-      logger2(message, severity, context);
-    };
-  }
-  static getInstance() {
-    if (!Logger.instance) {
-      Logger.instance = new Logger();
-    }
-    return Logger.instance;
-  }
-  log(message, severity, context) {
-    this.logger(message, severity, context);
-  }
-}
-Logger.getInstance();
-export {
-  Logger
-};