@okam/directus-next 1.2.0 → 1.2.1

package/CHANGELOG.md

@@ -1,3 +1,17 @@
+## 1.2.1 (2025-07-22)
+
+### 🩹 Fixes
+
+- **directus-next:** import from direrctus-node/edge instead ([99d3bce](https://github.com/OKAMca/stack/commit/99d3bce))
+
+### 🧱 Updated Dependencies
+
+- Updated directus-node to 0.6.0
+
+### ❤️ Thank You
+
+- poclerson
+
 ## 1.2.0 (2025-07-22)
 
 ### 🚀 Features

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
-const directusNode = require("@okam/directus-node");
+const fetchRedirectsData = require("../../../directus-node/src/lib/redirection/fetchRedirectsData.js");
+require("@okam/core-lib");
 const response = require("../response.js");
 const env = require("./env.js");
 function parseRedirectParams(url) {
@@ -23,7 +24,7 @@ async function handleRedirectsRoute({
   }
   const graphqlEndpoint = getDirectusGraphqlUrl == null ? void 0 : getDirectusGraphqlUrl();
   const graphqlApiKey = getDirectusApiToken == null ? void 0 : getDirectusApiToken();
-  const { redirects, rewrites } = await directusNode.fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
+  const { redirects, rewrites } = await fetchRedirectsData.fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
   return new Response(JSON.stringify({ redirects, rewrites }), { status: 200 });
 }
 exports.default = handleRedirectsRoute;

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

@@ -1,4 +1,5 @@
-import { fetchRedirectsData } from "@okam/directus-node";
+import { fetchRedirectsData } from "../../../directus-node/src/lib/redirection/fetchRedirectsData.mjs";
+import "@okam/core-lib";
 import { getJsonErrorResponse } from "../response.mjs";
 import { getRedirectSecretDefault } from "./env.mjs";
 function parseRedirectParams(url) {

package/directus-node/src/lib/redirection/fetchRedirectsData.js

@@ -0,0 +1,92 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const logger = require("@okam/logger");
+const validateRedirects = require("./utils/validateRedirects.js");
+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.logger.log("No redirects/rewrites found", "warn");
+      return {
+        redirects: [],
+        rewrites: []
+      };
+    }
+    logger.logger.log(`Fetch redirects count: ${(redirects == null ? void 0 : redirects.length) || 0}, rewrites count: ${(rewrites == null ? void 0 : rewrites.length) || 0}`);
+    return {
+      redirects: validateRedirects.normalizeRedirects(redirects),
+      rewrites: validateRedirects.normalizeRedirects(rewrites)
+    };
+  } catch (e) {
+    logger.logger.log(`Error fetching redirects: ${e.message}`, "error");
+  }
+  return {
+    redirects: [],
+    rewrites: []
+  };
+}
+exports.fetchRedirectsData = fetchRedirectsData;
+exports.getDefaultConfig = getDefaultConfig;
+exports.redirectDefaultLimit = redirectDefaultLimit;

package/directus-node/src/lib/redirection/fetchRedirectsData.mjs

@@ -0,0 +1,92 @@
+import { logger } from "@okam/logger";
+import { normalizeRedirects } from "./utils/validateRedirects.mjs";
+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: []
+  };
+}
+export {
+  fetchRedirectsData,
+  getDefaultConfig,
+  redirectDefaultLimit
+};

package/directus-node/src/lib/redirection/utils/validateRedirects.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
+const coreLib = require("@okam/core-lib");
+function isRedirect(redirect) {
+  return !!redirect && typeof redirect === "object" && "source" in redirect && "destination" in redirect;
+}
+function normalizeRedirects(redirects) {
+  if (!redirects || !Array.isArray(redirects)) return [];
+  return redirects.flatMap((redirect) => {
+    const { source, destination, ...rest } = redirect ?? {};
+    if (!redirect || !source || !destination || !isRedirect(redirect)) return [];
+    return [
+      {
+        ...rest,
+        source: coreLib.normalizePath(source),
+        destination: coreLib.normalizePath(destination)
+      }
+    ];
+  });
+}
+exports.isRedirect = isRedirect;
+exports.normalizeRedirects = normalizeRedirects;

package/directus-node/src/lib/redirection/utils/validateRedirects.mjs

@@ -0,0 +1,22 @@
+import { normalizePath } from "@okam/core-lib";
+function isRedirect(redirect) {
+  return !!redirect && typeof redirect === "object" && "source" in redirect && "destination" in redirect;
+}
+function normalizeRedirects(redirects) {
+  if (!redirects || !Array.isArray(redirects)) return [];
+  return redirects.flatMap((redirect) => {
+    const { source, destination, ...rest } = redirect ?? {};
+    if (!redirect || !source || !destination || !isRedirect(redirect)) return [];
+    return [
+      {
+        ...rest,
+        source: normalizePath(source),
+        destination: normalizePath(destination)
+      }
+    ];
+  });
+}
+export {
+  isRedirect,
+  normalizeRedirects
+};

package/package.json

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

package/redirect/utils/getRedirectsRoute.d.ts

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