@okam/directus-next 1.2.1 → 1.2.2

package/index.mjs

@@ -0,0 +1,292 @@
+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 { logger } from "@okam/logger";
+import { normalizePath } from "@okam/core-lib";
+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);
+  return new Response(body, {
+    status,
+    headers
+  });
+}
+function getDraftSecretDefault() {
+  return process.env.NEXT_API_DRAFT_SECRET || "";
+}
+function parseDraftParams(url) {
+  const { searchParams } = new URL(url);
+  const secret = searchParams.get("secret") || "";
+  const languagesParam = searchParams.get("languages");
+  const pathsParam = searchParams.get("urls");
+  const routesParam = searchParams.get("routes");
+  const pkParam = searchParams.get("pk");
+  const versionParam = searchParams.get("version");
+  const emptyReturn = {
+    secret: "",
+    languages: [],
+    paths: [],
+    routes: [],
+    type: "",
+    pk: "",
+    version: ""
+  };
+  if (!secret || !languagesParam || !(pathsParam || routesParam)) {
+    return emptyReturn;
+  }
+  const pk = typeof pkParam === "string" ? pkParam : "";
+  const version = typeof versionParam === "string" ? versionParam : "";
+  try {
+    const languages = JSON.parse(languagesParam);
+    if (routesParam) {
+      const routes = JSON.parse(routesParam);
+      return {
+        secret,
+        languages,
+        paths: [],
+        routes,
+        type: "route",
+        pk,
+        version
+      };
+    }
+    if (!pathsParam) {
+      return emptyReturn;
+    }
+    const paths = JSON.parse(pathsParam);
+    return {
+      secret,
+      languages,
+      paths,
+      routes: [],
+      type: "path",
+      pk,
+      version
+    };
+  } catch (e) {
+    return emptyReturn;
+  }
+}
+function getPathFromRoute(routeUrl, url, index = 0) {
+  const { searchParams } = new URL(url);
+  const matches = [...routeUrl.matchAll(/\{\{([a-z]+)\}\}/gi)];
+  const map = {};
+  matches.forEach((match) => {
+    const key = match[1] || "";
+    if (!key) {
+      return;
+    }
+    const listkey = `${key}s`;
+    const listParam = searchParams.get(listkey);
+    if (listParam) {
+      try {
+        const list = JSON.parse(listParam);
+        map[key] = list[index] || "";
+      } catch (e) {
+        map[key] = "";
+      }
+    } else {
+      const param = searchParams.get(key);
+      map[key] = param || "";
+    }
+  });
+  return template(routeUrl, map);
+}
+function handleDraftRoute({
+  url,
+  getDirectusLanguage,
+  getDraftSecret,
+  getJsonError
+}) {
+  const getSecretFunction = getDraftSecret || getDraftSecretDefault;
+  const getJsonErrorResponseFunction = getJsonError || getJsonErrorResponse;
+  const { secret, languages, paths, routes, type, version } = parseDraftParams(url);
+  if (secret !== getSecretFunction()) {
+    return getJsonErrorResponseFunction({ error: "Invalid argument" }, 401);
+  }
+  if (type === "") {
+    return getJsonErrorResponseFunction({ error: "Invalid argument" }, 400);
+  }
+  if (!Array.isArray(languages) || languages.length <= 0) {
+    return getJsonErrorResponseFunction({ error: "Invalid languages argument" }, 400);
+  }
+  if (type === "path" && (!Array.isArray(paths) || paths.length <= 0)) {
+    return getJsonErrorResponseFunction({ error: "Invalid paths argument" }, 400);
+  }
+  if (type === "route" && (!Array.isArray(routes) || routes.length <= 0)) {
+    return getJsonErrorResponseFunction({ error: "Invalid routes argument" }, 400);
+  }
+  const directusLang = getDirectusLanguage();
+  const indexDefault = languages.indexOf(directusLang);
+  const index = indexDefault !== -1 ? indexDefault : 0;
+  let redirectUrl = "";
+  if (type === "path") {
+    const path = paths[index] || "";
+    if (!path) {
+      return getJsonErrorResponse({ error: "Invalid path" }, 400);
+    }
+    redirectUrl = path;
+  } else if (type === "route") {
+    const route = routes[index] || "";
+    if (!route) {
+      return getJsonErrorResponse({ error: "Invalid route" }, 400);
+    }
+    const pathFromRoute = getPathFromRoute(route, url, index);
+    if (!pathFromRoute) {
+      return getJsonErrorResponse({ error: "Invalid route" }, 400);
+    }
+    redirectUrl = pathFromRoute;
+  }
+  if (redirectUrl && version) {
+    const withParams = redirectUrl.indexOf("?") !== -1;
+    redirectUrl = `${redirectUrl}${withParams ? "&" : "?"}version=${encodeURIComponent(version)}`;
+  }
+  draftMode().enable();
+  redirect(redirectUrl);
+  return void 0;
+}
+function isRedirect(redirect2) {
+  return !!redirect2 && typeof redirect2 === "object" && "source" in redirect2 && "destination" in redirect2;
+}
+function normalizeRedirects(redirects) {
+  if (!redirects || !Array.isArray(redirects)) return [];
+  return redirects.flatMap((redirect2) => {
+    const { source, destination, ...rest } = redirect2 ?? {};
+    if (!redirect2 || !source || !destination || !isRedirect(redirect2)) return [];
+    return [
+      {
+        ...rest,
+        source: normalizePath(source),
+        destination: normalizePath(destination)
+      }
+    ];
+  });
+}
+const redirectDefaultLimit = 2e3;
+function getDefaultConfig() {
+  return {
+    graphqlEndpoint: process.env["NEXT_REDIRECT_GRAPHQL_URL"] || process.env["NEXT_PUBLIC_GRAPHQL_URL"] || "",
+    graphqlApiKey: process.env["NEXT_API_TOKEN_ADMIN"] || "",
+    redirectsFilename: "./redirect/redirects.json",
+    rewritesFilename: "./redirect/rewrites.json",
+    limit: redirectDefaultLimit
+  };
+}
+async function fetchRedirectsData(config, init) {
+  const {
+    graphqlApiKey: defaultGraphqlApiKey,
+    graphqlEndpoint: defaultGraphqlEndpoint,
+    limit: defaultLimit
+  } = getDefaultConfig();
+  const {
+    graphqlEndpoint = defaultGraphqlEndpoint,
+    graphqlApiKey = defaultGraphqlApiKey,
+    limit = defaultLimit
+  } = config;
+  if (!graphqlEndpoint) {
+    throw new Error(
+      "Missing fetchRedirects configuration `graphqlEndpoint`. Check environment variables NEXT_REDIRECT_GRAPHQL_URL or NEXT_PUBLIC_GRAPHQL_URL"
+    );
+  }
+  if (!graphqlApiKey) {
+    throw new Error(
+      "Missing fetchRedirects configuration `graphqlApiKey`. Check environment variable NEXT_API_TOKEN_ADMIN"
+    );
+  }
+  const query = `query fetchRedirects($limit: Int = 2000) {
+  redirects(filter: {status:{_eq:"published"},isrewrite:{_eq:false}}, sort: "sort", limit: $limit) {
+    source
+    destination
+    permanent
+    locale
+  }
+  rewrites: redirects(filter: {status:{_eq:"published"},isrewrite:{_eq:true}}, sort: "sort", limit: $limit) {
+    source
+    destination
+    permanent
+    locale
+  }
+}`;
+  const graphqlBody = {
+    query,
+    // "operationName": "",
+    variables: {
+      limit: Number(limit) || redirectDefaultLimit
+    }
+  };
+  try {
+    const response = await fetch(graphqlEndpoint, {
+      ...init,
+      method: "POST",
+      headers: {
+        // eslint-disable-next-line @typescript-eslint/naming-convention
+        "Content-Type": "application/json",
+        Authorization: `Bearer ${graphqlApiKey}`
+      },
+      body: JSON.stringify(graphqlBody)
+    });
+    const { data } = await response.json();
+    const { redirects, rewrites } = data ?? {};
+    if (!(redirects == null ? void 0 : redirects.length) && !(rewrites == null ? void 0 : rewrites.length)) {
+      logger.log("No redirects/rewrites found", "warn");
+      return {
+        redirects: [],
+        rewrites: []
+      };
+    }
+    logger.log(`Fetch redirects count: ${(redirects == null ? void 0 : redirects.length) || 0}, rewrites count: ${(rewrites == null ? void 0 : rewrites.length) || 0}`);
+    return {
+      redirects: normalizeRedirects(redirects),
+      rewrites: normalizeRedirects(rewrites)
+    };
+  } catch (e) {
+    logger.log(`Error fetching redirects: ${e.message}`, "error");
+  }
+  return {
+    redirects: [],
+    rewrites: []
+  };
+}
+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 {
+  l as DirectusNextLogger,
+  d as directusRouteRouter,
+  b as getApiRouteUrlDefault,
+  getDraftSecretDefault,
+  getJsonErrorResponse,
+  getPathFromRoute,
+  getRedirectSecretDefault,
+  a as getRedirectsRoute,
+  handleDraftRoute,
+  h as handleRedirect,
+  handleRedirectsRoute,
+  parseDraftParams,
+  parseRedirectParams
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@okam/directus-next",
   "main": "./index.js",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "types": "./index.d.ts",
   "exports": {
     ".": {
@@ -33,7 +33,7 @@
   },
   "dependencies": {
     "@okam/core-lib": "1.16.0",
-    "@okam/directus-node": "0.6.0",
+    "@okam/directus-node": "0.6.1",
     "@okam/logger": "1.1.0",
     "next": "^14.1.1",
     "radashi": "^12.3.0",

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

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

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

@@ -1,7 +1,18 @@
+"use server";
+import { c as log } from "./directusRouteRouter-Bt3bEq4S.mjs";
+import { d } from "./directusRouteRouter-Bt3bEq4S.mjs";
+import "server-only";
+import createServerContext from "server-only-context";
 import { queryGql } from "@okam/directus-query";
 import { isEqual, get, invert } from "radashi";
-import { log } from "../logger.mjs";
-import { pageSettingsContext, pageSettingsVariablesContext } from "./context.mjs";
+function pageSettingsContext(defaultValue) {
+  const [pageSettings, setPageSettings2] = createServerContext(defaultValue);
+  return [pageSettings, setPageSettings2];
+}
+function pageSettingsVariablesContext(variables) {
+  const [pageSettingsVariables, setPageSettingsVariables] = createServerContext(variables);
+  return [pageSettingsVariables, setPageSettingsVariables];
+}
 const [getPageSettings, setPageSettings] = pageSettingsContext();
 const [getVariables, setVariables] = pageSettingsVariablesContext();
 function isDirectusRouteConfig(config) {
@@ -47,5 +58,8 @@ async function usePageSettings(props, itemKey) {
   return currentItem;
 }
 export {
+  d as directusRouteRouter,
+  pageSettingsContext,
+  pageSettingsVariablesContext,
   usePageSettings
 };

package/directus-next/src/draft/env.js

@@ -1,6 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-function getDraftSecretDefault() {
-  return process.env.NEXT_API_DRAFT_SECRET || "";
-}
-exports.getDraftSecretDefault = getDraftSecretDefault;

package/directus-next/src/draft/env.mjs

@@ -1,6 +0,0 @@
-function getDraftSecretDefault() {
-  return process.env.NEXT_API_DRAFT_SECRET || "";
-}
-export {
-  getDraftSecretDefault
-};

package/directus-next/src/draft/route.js

@@ -1,141 +0,0 @@
-"use strict";
-Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const headers = require("next/headers");
-const navigation = require("next/navigation");
-const radashi = require("radashi");
-const response = require("../response.js");
-const env = require("./env.js");
-function parseDraftParams(url) {
-  const { searchParams } = new URL(url);
-  const secret = searchParams.get("secret") || "";
-  const languagesParam = searchParams.get("languages");
-  const pathsParam = searchParams.get("urls");
-  const routesParam = searchParams.get("routes");
-  const pkParam = searchParams.get("pk");
-  const versionParam = searchParams.get("version");
-  const emptyReturn = {
-    secret: "",
-    languages: [],
-    paths: [],
-    routes: [],
-    type: "",
-    pk: "",
-    version: ""
-  };
-  if (!secret || !languagesParam || !(pathsParam || routesParam)) {
-    return emptyReturn;
-  }
-  const pk = typeof pkParam === "string" ? pkParam : "";
-  const version = typeof versionParam === "string" ? versionParam : "";
-  try {
-    const languages = JSON.parse(languagesParam);
-    if (routesParam) {
-      const routes = JSON.parse(routesParam);
-      return {
-        secret,
-        languages,
-        paths: [],
-        routes,
-        type: "route",
-        pk,
-        version
-      };
-    }
-    if (!pathsParam) {
-      return emptyReturn;
-    }
-    const paths = JSON.parse(pathsParam);
-    return {
-      secret,
-      languages,
-      paths,
-      routes: [],
-      type: "path",
-      pk,
-      version
-    };
-  } catch (e) {
-    return emptyReturn;
-  }
-}
-function getPathFromRoute(routeUrl, url, index = 0) {
-  const { searchParams } = new URL(url);
-  const matches = [...routeUrl.matchAll(/\{\{([a-z]+)\}\}/gi)];
-  const map = {};
-  matches.forEach((match) => {
-    const key = match[1] || "";
-    if (!key) {
-      return;
-    }
-    const listkey = `${key}s`;
-    const listParam = searchParams.get(listkey);
-    if (listParam) {
-      try {
-        const list = JSON.parse(listParam);
-        map[key] = list[index] || "";
-      } catch (e) {
-        map[key] = "";
-      }
-    } else {
-      const param = searchParams.get(key);
-      map[key] = param || "";
-    }
-  });
-  return radashi.template(routeUrl, map);
-}
-function handleDraftRoute({
-  url,
-  getDirectusLanguage,
-  getDraftSecret,
-  getJsonError
-}) {
-  const getSecretFunction = getDraftSecret || env.getDraftSecretDefault;
-  const getJsonErrorResponseFunction = getJsonError || response.getJsonErrorResponse;
-  const { secret, languages, paths, routes, type, version } = parseDraftParams(url);
-  if (secret !== getSecretFunction()) {
-    return getJsonErrorResponseFunction({ error: "Invalid argument" }, 401);
-  }
-  if (type === "") {
-    return getJsonErrorResponseFunction({ error: "Invalid argument" }, 400);
-  }
-  if (!Array.isArray(languages) || languages.length <= 0) {
-    return getJsonErrorResponseFunction({ error: "Invalid languages argument" }, 400);
-  }
-  if (type === "path" && (!Array.isArray(paths) || paths.length <= 0)) {
-    return getJsonErrorResponseFunction({ error: "Invalid paths argument" }, 400);
-  }
-  if (type === "route" && (!Array.isArray(routes) || routes.length <= 0)) {
-    return getJsonErrorResponseFunction({ error: "Invalid routes argument" }, 400);
-  }
-  const directusLang = getDirectusLanguage();
-  const indexDefault = languages.indexOf(directusLang);
-  const index = indexDefault !== -1 ? indexDefault : 0;
-  let redirectUrl = "";
-  if (type === "path") {
-    const path = paths[index] || "";
-    if (!path) {
-      return response.getJsonErrorResponse({ error: "Invalid path" }, 400);
-    }
-    redirectUrl = path;
-  } else if (type === "route") {
-    const route = routes[index] || "";
-    if (!route) {
-      return response.getJsonErrorResponse({ error: "Invalid route" }, 400);
-    }
-    const pathFromRoute = getPathFromRoute(route, url, index);
-    if (!pathFromRoute) {
-      return response.getJsonErrorResponse({ error: "Invalid route" }, 400);
-    }
-    redirectUrl = pathFromRoute;
-  }
-  if (redirectUrl && version) {
-    const withParams = redirectUrl.indexOf("?") !== -1;
-    redirectUrl = `${redirectUrl}${withParams ? "&" : "?"}version=${encodeURIComponent(version)}`;
-  }
-  headers.draftMode().enable();
-  navigation.redirect(redirectUrl);
-  return void 0;
-}
-exports.default = handleDraftRoute;
-exports.getPathFromRoute = getPathFromRoute;
-exports.parseDraftParams = parseDraftParams;