@okam/directus-next 2.1.1 → 2.2.0

package/index.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const router = require("./router-DorBYKUX.js");
+const router = require("./router-gCcQYkLJ.js");
 const headers = require("next/headers");
 const navigation = require("next/navigation");
 const radashi = require("radashi");
@@ -36,6 +36,7 @@ function getJsonErrorResponse(data, status) {
     headers: headers2
   });
 }
+const TEMPLATE_VAR_RE = /\{\{([a-z]+)\}\}/gi;
 function jsonStringsArraySchema(message, code) {
   return zod__namespace.string().transform((val, ctx) => {
     try {
@@ -97,7 +98,7 @@ function parseDraftParams(url, expectedSecret) {
 }
 function getPathFromRoute(routeUrl, url, index = 0) {
   const { searchParams } = new URL(url);
-  const matches = [...routeUrl.matchAll(/\{\{([a-z]+)\}\}/gi)];
+  const matches = [...routeUrl.matchAll(TEMPLATE_VAR_RE)];
   const map = {};
   matches.forEach((match) => {
     const key = match[1] ?? "";
@@ -202,13 +203,18 @@ async function handleRedirectsRoute({
   const { redirects, rewrites } = await edge.fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
   return new Response(JSON.stringify({ redirects, rewrites }), { status: 200 });
 }
+var DirectusRouteLocalePrefix = /* @__PURE__ */ ((DirectusRouteLocalePrefix2) => {
+  DirectusRouteLocalePrefix2["AsNeeded"] = "as-needed";
+  DirectusRouteLocalePrefix2["Always"] = "always";
+  return DirectusRouteLocalePrefix2;
+})(DirectusRouteLocalePrefix || {});
 exports.DirectusNextLogger = router.logger;
-exports.DirectusRouteLocalePrefix = router.DirectusRouteLocalePrefix;
 exports.directusRouteRouter = router.directusRouteRouter;
 exports.getApiRouteUrlDefault = router.getApiRouteUrlDefault;
 exports.getRedirectSecretDefault = router.getRedirectSecretDefault;
 exports.getRedirectsRoute = router.getRedirectsRoute;
 exports.handleRedirect = router.handleRedirect;
+exports.DirectusRouteLocalePrefix = DirectusRouteLocalePrefix;
 exports.getDraftSecretDefault = getDraftSecretDefault;
 exports.getJsonErrorResponse = getJsonErrorResponse;
 exports.getPathFromRoute = getPathFromRoute;

package/index.mjs

@@ -1,5 +1,5 @@
-import { g as getRedirectSecretDefault } from "./router-DC6WVUlz.mjs";
-import { l, D, d, a, b, h } from "./router-DC6WVUlz.mjs";
+import { g as getRedirectSecretDefault } from "./router-CnD4Qckn.mjs";
+import { l, d, a, b, h } from "./router-CnD4Qckn.mjs";
 import { draftMode } from "next/headers";
 import { redirect } from "next/navigation";
 import { template } from "radashi";
@@ -18,6 +18,7 @@ function getJsonErrorResponse(data, status) {
     headers
   });
 }
+const TEMPLATE_VAR_RE = /\{\{([a-z]+)\}\}/gi;
 function jsonStringsArraySchema(message, code) {
   return zod.string().transform((val, ctx) => {
     try {
@@ -79,7 +80,7 @@ function parseDraftParams(url, expectedSecret) {
 }
 function getPathFromRoute(routeUrl, url, index = 0) {
   const { searchParams } = new URL(url);
-  const matches = [...routeUrl.matchAll(/\{\{([a-z]+)\}\}/gi)];
+  const matches = [...routeUrl.matchAll(TEMPLATE_VAR_RE)];
   const map = {};
   matches.forEach((match) => {
     const key = match[1] ?? "";
@@ -184,9 +185,14 @@ async function handleRedirectsRoute({
   const { redirects, rewrites } = await fetchRedirectsData({ graphqlEndpoint, graphqlApiKey, limit }, init);
   return new Response(JSON.stringify({ redirects, rewrites }), { status: 200 });
 }
+var DirectusRouteLocalePrefix = /* @__PURE__ */ ((DirectusRouteLocalePrefix2) => {
+  DirectusRouteLocalePrefix2["AsNeeded"] = "as-needed";
+  DirectusRouteLocalePrefix2["Always"] = "always";
+  return DirectusRouteLocalePrefix2;
+})(DirectusRouteLocalePrefix || {});
 export {
   l as DirectusNextLogger,
-  D as DirectusRouteLocalePrefix,
+  DirectusRouteLocalePrefix,
   d as directusRouteRouter,
   a as getApiRouteUrlDefault,
   getDraftSecretDefault,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okam/directus-next",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "repository": {
     "url": "https://github.com/OKAMca/stack.git"
   },
@@ -42,9 +42,9 @@
   },
   "dependencies": {
     "@graphql-typed-document-node/core": "3.2.0",
-    "@okam/core-lib": "2.0.0",
-    "@okam/directus-node": "1.0.0",
-    "@okam/directus-query": "2.0.1",
+    "@okam/core-lib": "2.1.0",
+    "@okam/directus-node": "1.1.0",
+    "@okam/directus-query": "2.1.0",
     "@okam/logger": "1.1.0",
     "@okam/next-component": "2.1.0",
     "graphql-request": "^7.1.2",

package/{router-DC6WVUlz.mjs → router-CnD4Qckn.mjs}

@@ -1,3 +1,4 @@
+import { LocalePrefix } from "@okam/next-component/server";
 import { NextResponse } from "next/server";
 import { capitalize, isEmpty } from "radashi";
 import { createLogger } from "@okam/logger";
@@ -88,11 +89,6 @@ async function handleRedirect(request, options = {}) {
   log(`${capitalize(type)}ing to ${url.toString()} with status ${status}`);
   return NextResponse[type](url, { status });
 }
-var DirectusRouteLocalePrefix = /* @__PURE__ */ ((DirectusRouteLocalePrefix2) => {
-  DirectusRouteLocalePrefix2["AsNeeded"] = "as-needed";
-  DirectusRouteLocalePrefix2["Always"] = "always";
-  return DirectusRouteLocalePrefix2;
-})(DirectusRouteLocalePrefix || {});
 const query = `
   query Languages_code($filter: page_settings_translations_filter) {
     page_settings_translations(filter: $filter) {
@@ -195,11 +191,11 @@ async function directusRouteRouter(request, config, NextResponse$1 = NextRespons
     log(`PageSettings with id ${id} was found but is not associated with any locale.`, { id }, "warn");
     return NextResponse$1.next();
   }
-  const { localeMap, collectionSettings, localePrefix = DirectusRouteLocalePrefix.Always, defaultLocale } = config;
+  const { localeMap, collectionSettings, localePrefix = LocalePrefix.Always, defaultLocale } = config;
   const mappedLocale = localeMap?.[directusLocale] || directusLocale;
   const isDirectusRouteLocalePrefixedMap = {
-    [DirectusRouteLocalePrefix.Always]: true,
-    [DirectusRouteLocalePrefix.AsNeeded]: directusLocale !== defaultLocale
+    [LocalePrefix.Always]: true,
+    [LocalePrefix.AsNeeded]: directusLocale !== defaultLocale
   };
   const isDirectusRouteLocalePrefixed = isDirectusRouteLocalePrefixedMap[localePrefix];
   const displayedLocale = isDirectusRouteLocalePrefixed ? `/${mappedLocale}` : "";
@@ -217,7 +213,6 @@ async function directusRouteRouter(request, config, NextResponse$1 = NextRespons
   return NextResponse$1.rewrite(url);
 }
 export {
-  DirectusRouteLocalePrefix as D,
   getApiRouteUrlDefault as a,
   getRedirectsRoute as b,
   log as c,

package/{router-DorBYKUX.js → router-gCcQYkLJ.js}

@@ -1,4 +1,5 @@
 "use strict";
+const server$1 = require("@okam/next-component/server");
 const server = require("next/server");
 const radashi = require("radashi");
 const logger$1 = require("@okam/logger");
@@ -89,11 +90,6 @@ async function handleRedirect(request, options = {}) {
   log(`${radashi.capitalize(type)}ing to ${url.toString()} with status ${status}`);
   return server.NextResponse[type](url, { status });
 }
-var DirectusRouteLocalePrefix = /* @__PURE__ */ ((DirectusRouteLocalePrefix2) => {
-  DirectusRouteLocalePrefix2["AsNeeded"] = "as-needed";
-  DirectusRouteLocalePrefix2["Always"] = "always";
-  return DirectusRouteLocalePrefix2;
-})(DirectusRouteLocalePrefix || {});
 const query = `
   query Languages_code($filter: page_settings_translations_filter) {
     page_settings_translations(filter: $filter) {
@@ -196,11 +192,11 @@ async function directusRouteRouter(request, config, NextResponse = server.NextRe
     log(`PageSettings with id ${id} was found but is not associated with any locale.`, { id }, "warn");
     return NextResponse.next();
   }
-  const { localeMap, collectionSettings, localePrefix = DirectusRouteLocalePrefix.Always, defaultLocale } = config;
+  const { localeMap, collectionSettings, localePrefix = server$1.LocalePrefix.Always, defaultLocale } = config;
   const mappedLocale = localeMap?.[directusLocale] || directusLocale;
   const isDirectusRouteLocalePrefixedMap = {
-    [DirectusRouteLocalePrefix.Always]: true,
-    [DirectusRouteLocalePrefix.AsNeeded]: directusLocale !== defaultLocale
+    [server$1.LocalePrefix.Always]: true,
+    [server$1.LocalePrefix.AsNeeded]: directusLocale !== defaultLocale
   };
   const isDirectusRouteLocalePrefixed = isDirectusRouteLocalePrefixedMap[localePrefix];
   const displayedLocale = isDirectusRouteLocalePrefixed ? `/${mappedLocale}` : "";
@@ -217,7 +213,6 @@ async function directusRouteRouter(request, config, NextResponse = server.NextRe
   log("Rewriting to URL:", url.toString());
   return NextResponse.rewrite(url);
 }
-exports.DirectusRouteLocalePrefix = DirectusRouteLocalePrefix;
 exports.directusRouteRouter = directusRouteRouter;
 exports.getApiRouteUrlDefault = getApiRouteUrlDefault;
 exports.getRedirectSecretDefault = getRedirectSecretDefault;

package/server.js

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

package/server.mjs

@@ -1,6 +1,6 @@
 import "server-only";
-import { c as log } from "./router-DC6WVUlz.mjs";
-import { d } from "./router-DC6WVUlz.mjs";
+import { c as log } from "./router-CnD4Qckn.mjs";
+import { d } from "./router-CnD4Qckn.mjs";
 import { queryGql, defaultGraphqlRequestClient } from "@okam/directus-query";
 import { isEqual, get, invert } from "radashi";
 import { createServerContext } from "@okam/next-component/server";

package/types/directusRouteConfig.d.ts

@@ -1,3 +1,4 @@
+import { LocalePrefix } from '@okam/next-component/server';
 export interface TDirectusRouteRedirectsModule {
     /**
      * @default process.env.NEXT_API_REDIRECT_SECRET
@@ -12,6 +13,10 @@ export interface TDirectusRouteRedirectsModule {
      */
     apiRoute?: string;
 }
+/**
+ * @deprecated
+ * Use `LocalePrefix` from `@okam/next-component` instead.
+ */
 export declare enum DirectusRouteLocalePrefix {
     /**
      * The pathname will be prefixed with the locale only when it is not the default locale
@@ -66,16 +71,10 @@ export declare enum DirectusRouteLocalePrefix {
 }
 export type TDirectusRouteI18n<Locales extends string> = {
     defaultLocale: Locales;
-    /**
-     * {@link DirectusRouteLocalePrefix}
-     */
-    localePrefix: `${DirectusRouteLocalePrefix.AsNeeded}`;
+    localePrefix: `${LocalePrefix.AsNeeded}`;
 } | {
     defaultLocale?: Locales;
-    /**
-     * {@link DirectusRouteLocalePrefix}
-     */
-    localePrefix?: `${DirectusRouteLocalePrefix.Always}` | undefined;
+    localePrefix?: `${LocalePrefix.Always}` | undefined;
 };
 export type TDirectusRouteConfig<Locales extends string = string> = {
     localeMap?: Record<Locales, string>;