@okam/directus-next-component 1.3.0 → 1.4.0

package/hooks/directus-link.js

@@ -4,9 +4,9 @@ const directusFile = require("./directus-file.js");
 function useFile(props) {
   const { file } = props;
   const { filename_download: filenameDownload } = file ?? {};
-  const href = directusFile(file);
+  const { src } = directusFile(file) ?? {};
   return {
-    href: (href == null ? void 0 : href.toString()) ?? void 0,
+    href: src,
     download: filenameDownload ?? true
   };
 }

package/hooks/directus-link.mjs

@@ -3,9 +3,9 @@ import useDirectusFile from "./directus-file.mjs";
 function useFile(props) {
   const { file } = props;
   const { filename_download: filenameDownload } = file ?? {};
-  const href = useDirectusFile(file);
+  const { src } = useDirectusFile(file) ?? {};
   return {
-    href: (href == null ? void 0 : href.toString()) ?? void 0,
+    href: src,
     download: filenameDownload ?? true
   };
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@okam/directus-next-component",
-  "version": "1.3.0",
+  "version": "1.4.0",
   "main": "./index.js",
   "types": "./index.d.ts",
   "exports": {

package/server.d.ts

@@ -1,9 +1,8 @@
 export { default as withDirectus } from './lib/withDirectus';
-export * from './lib/directus-next-rewrite';
-export { default as DirectusLink } from './components/DirectusLink';
+export { default as DirectusFile } from './components/DirectusFile';
 export { default as DirectusImg } from './components/DirectusImg';
+export { default as DirectusLink } from './components/DirectusLink';
 export { default as DirectusVideo } from './components/DirectusVideo';
-export { default as DirectusFile } from './components/DirectusFile';
 export { default as useDirectusFile } from './hooks/directus-file';
 export { default as useDirectusLink } from './hooks/directus-link';
 export { default as useNavigationItems } from './hooks/navigation-items';

package/server.js

@@ -1,22 +1,18 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const withDirectus = require("./lib/withDirectus.js");
-const directusNextRewrite = require("./lib/directus-next-rewrite.js");
-const index = require("./components/DirectusLink/index.js");
+const index = require("./components/DirectusFile/index.js");
 const index$1 = require("./components/DirectusImg/index.js");
-const index$2 = require("./components/DirectusVideo/index.js");
-const index$3 = require("./components/DirectusFile/index.js");
+const index$2 = require("./components/DirectusLink/index.js");
+const index$3 = require("./components/DirectusVideo/index.js");
 const directusFile = require("./hooks/directus-file.js");
 const directusLink = require("./hooks/directus-link.js");
 const navigationItems = require("./hooks/navigation-items.js");
 exports.withDirectus = withDirectus;
-exports.config = directusNextRewrite.config;
-exports.directusRouteMiddleware = directusNextRewrite.directusRouteMiddleware;
-exports.fetchPageSettings = directusNextRewrite.fetchPageSettings;
-exports.DirectusLink = index;
+exports.DirectusFile = index;
 exports.DirectusImg = index$1;
-exports.DirectusVideo = index$2;
-exports.DirectusFile = index$3;
+exports.DirectusLink = index$2;
+exports.DirectusVideo = index$3;
 exports.useDirectusFile = directusFile;
 exports.useDirectusLink = directusLink;
 exports.useNavigationItems = navigationItems;

package/server.mjs

@@ -1,20 +1,16 @@
 import { default as default2 } from "./lib/withDirectus.mjs";
-import { config, directusRouteMiddleware, fetchPageSettings } from "./lib/directus-next-rewrite.mjs";
-import { default as default3 } from "./components/DirectusLink/index.mjs";
+import { default as default3 } from "./components/DirectusFile/index.mjs";
 import { default as default4 } from "./components/DirectusImg/index.mjs";
-import { default as default5 } from "./components/DirectusVideo/index.mjs";
-import { default as default6 } from "./components/DirectusFile/index.mjs";
+import { default as default5 } from "./components/DirectusLink/index.mjs";
+import { default as default6 } from "./components/DirectusVideo/index.mjs";
 import { default as default7 } from "./hooks/directus-file.mjs";
 import { default as default8 } from "./hooks/directus-link.mjs";
 import { default as default9 } from "./hooks/navigation-items.mjs";
 export {
-  default6 as DirectusFile,
+  default3 as DirectusFile,
   default4 as DirectusImg,
-  default3 as DirectusLink,
-  default5 as DirectusVideo,
-  config,
-  directusRouteMiddleware,
-  fetchPageSettings,
+  default5 as DirectusLink,
+  default6 as DirectusVideo,
   default7 as useDirectusFile,
   default8 as useDirectusLink,
   default9 as useNavigationItems,

package/lib/directus-next-rewrite.d.ts

@@ -1,7 +0,0 @@
-import type { NextRequest } from 'next/server';
-import { NextResponse } from 'next/server';
-export declare function fetchPageSettings(pathName: string, lang?: string): Promise<string | null>;
-export declare function directusRouteMiddleware(request: NextRequest, locales: string[]): Promise<NextResponse<unknown>>;
-export declare const config: {
-    matcher: string[];
-};

package/lib/directus-next-rewrite.js

@@ -1,87 +0,0 @@
-"use strict";
-Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-const server_js = require("next/server.js");
-const radash = require("radash");
-async function fetchPageSettings(pathName, lang = "fr-CA") {
-  const graphqlEndpoint = process.env.NEXT_PUBLIC_GRAPHQL_URL;
-  const graphqlApiKey = process.env.NEXT_PUBLIC_API_TOKEN;
-  if (!graphqlEndpoint || !graphqlApiKey) {
-    throw new Error("Missing graphql configuration: NEXT_PUBLIC_GRAPHQL_URL or NEXT_API_TOKEN_ADMIN");
-  }
-  let langCodeFilter = "_eq";
-  if (lang.length === 2) {
-    langCodeFilter = "_contains";
-  }
-  const query = `
-    query PageSettings($path: String = null, $lang: String = "fr-CA") {
-      page_settings(
-        filter: { translations: { path: { _eq: $path }, languages_code: {code: {${langCodeFilter}: $lang}} }},
-        limit: 1
-      ) {
-          belongs_to_key
-          belongs_to_collection
-      }
-    }
-  `;
-  const graphqlBody = {
-    query,
-    variables: {
-      lang,
-      path: pathName
-    }
-  };
-  try {
-    const response = await fetch(graphqlEndpoint, {
-      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 key = radash.get(data, "page_settings.0.belongs_to_key");
-    const collection = radash.get(data, "page_settings.0.belongs_to_collection");
-    if (key == null || collection == null) {
-      throw new Error("No page settings found");
-    }
-    return `/${collection}/${key}`;
-  } catch (e) {
-    console.error("GraphQL Error", e.message);
-    return null;
-  }
-}
-function removeLocaleFromPathName(pathName, locale) {
-  if (pathName.includes(locale)) {
-    return pathName.replace(`/${locale}`, "");
-  }
-  return pathName;
-}
-async function directusRouteMiddleware(request, locales) {
-  const { pathname } = request.nextUrl;
-  const locale = locales.find((l) => pathname.startsWith(`/${l}`));
-  const pathNameWithoutLocale = locale ? removeLocaleFromPathName(pathname, locale) : pathname;
-  const route = await fetchPageSettings(pathNameWithoutLocale, locale);
-  if (route === null) {
-    return server_js.NextResponse.next();
-  }
-  const url = request.nextUrl.clone();
-  url.pathname = route;
-  return server_js.NextResponse.rewrite(url);
-}
-const config = {
-  matcher: [
-    /*
-     * Match all request paths except for the ones starting with:
-     * - api (API routes)
-     * - _next/static (static files)
-     * - _next/image (image optimization files)
-     * - favicon.ico (favicon file)
-     */
-    "/((?!api|_next/static|_next/image|favicon.ico).*)"
-  ]
-};
-exports.config = config;
-exports.directusRouteMiddleware = directusRouteMiddleware;
-exports.fetchPageSettings = fetchPageSettings;

package/lib/directus-next-rewrite.mjs

@@ -1,87 +0,0 @@
-import { NextResponse } from "next/server.js";
-import { get } from "radash";
-async function fetchPageSettings(pathName, lang = "fr-CA") {
-  const graphqlEndpoint = process.env.NEXT_PUBLIC_GRAPHQL_URL;
-  const graphqlApiKey = process.env.NEXT_PUBLIC_API_TOKEN;
-  if (!graphqlEndpoint || !graphqlApiKey) {
-    throw new Error("Missing graphql configuration: NEXT_PUBLIC_GRAPHQL_URL or NEXT_API_TOKEN_ADMIN");
-  }
-  let langCodeFilter = "_eq";
-  if (lang.length === 2) {
-    langCodeFilter = "_contains";
-  }
-  const query = `
-    query PageSettings($path: String = null, $lang: String = "fr-CA") {
-      page_settings(
-        filter: { translations: { path: { _eq: $path }, languages_code: {code: {${langCodeFilter}: $lang}} }},
-        limit: 1
-      ) {
-          belongs_to_key
-          belongs_to_collection
-      }
-    }
-  `;
-  const graphqlBody = {
-    query,
-    variables: {
-      lang,
-      path: pathName
-    }
-  };
-  try {
-    const response = await fetch(graphqlEndpoint, {
-      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 key = get(data, "page_settings.0.belongs_to_key");
-    const collection = get(data, "page_settings.0.belongs_to_collection");
-    if (key == null || collection == null) {
-      throw new Error("No page settings found");
-    }
-    return `/${collection}/${key}`;
-  } catch (e) {
-    console.error("GraphQL Error", e.message);
-    return null;
-  }
-}
-function removeLocaleFromPathName(pathName, locale) {
-  if (pathName.includes(locale)) {
-    return pathName.replace(`/${locale}`, "");
-  }
-  return pathName;
-}
-async function directusRouteMiddleware(request, locales) {
-  const { pathname } = request.nextUrl;
-  const locale = locales.find((l) => pathname.startsWith(`/${l}`));
-  const pathNameWithoutLocale = locale ? removeLocaleFromPathName(pathname, locale) : pathname;
-  const route = await fetchPageSettings(pathNameWithoutLocale, locale);
-  if (route === null) {
-    return NextResponse.next();
-  }
-  const url = request.nextUrl.clone();
-  url.pathname = route;
-  return NextResponse.rewrite(url);
-}
-const config = {
-  matcher: [
-    /*
-     * Match all request paths except for the ones starting with:
-     * - api (API routes)
-     * - _next/static (static files)
-     * - _next/image (image optimization files)
-     * - favicon.ico (favicon file)
-     */
-    "/((?!api|_next/static|_next/image|favicon.ico).*)"
-  ]
-};
-export {
-  config,
-  directusRouteMiddleware,
-  fetchPageSettings
-};