@okam/directus-next 0.2.0 → 0.4.0

package/CHANGELOG.md

@@ -0,0 +1,75 @@
+## 0.3.0 (2024-12-03)
+
+
+### 🚀 Features
+
+- **directus-next:** not a real change but need to trigger new version ([57f2a54](https://github.com/OKAMca/stack/commit/57f2a54))
+
+
+### ❤️  Thank You
+
+- David Paquet Pitts
+
+## 0.1.2 (2024-10-04)
+
+
+### 🩹 Fixes
+
+- **directus-next:** make package public ([#172](https://github.com/OKAMca/stack/pull/172))
+
+
+### ❤️  Thank You
+
+- yanmorinokamca @yanmorinokamca
+
+## 0.2.0 (2024-09-24)
+
+
+### 🚀 Features
+
+- **directus-next:** directus based routing ([196ab1e](https://github.com/OKAMca/stack/commit/196ab1e))
+
+
+### 🩹 Fixes
+
+- **directus-next:** make package public ([#172](https://github.com/OKAMca/stack/pull/172))
+
+
+### ❤️  Thank You
+
+- David Paquet Pitts
+- yanmorinokamca @yanmorinokamca
+
+## 0.1.1 (2024-08-13)
+
+
+### 🩹 Fixes
+
+- **directus-next:** update build dependencies, exclude next ([#179](https://github.com/OKAMca/stack/pull/179))
+
+
+### ❤️  Thank You
+
+- mykimd
+- poclerson
+- yanmorinokamca @yanmorinokamca
+
+## 0.1.0 (2024-08-01)
+
+
+### 🚀 Features
+
+- **directus-next:** adding draft route code ([64c665d](https://github.com/OKAMca/stack/commit/64c665d))
+
+
+### 🩹 Fixes
+
+- **publish:** add building packages step to workflow ([c9ce442](https://github.com/OKAMca/stack/commit/c9ce442))
+
+
+### ❤️  Thank You
+
+- Jérôme Trottier
+- Marie-Maxime Tanguay @marie-maxime
+- Pierre-Olivier Clerson @poclerson
+- Yan Morin

package/README.md

@@ -0,0 +1,42 @@
+# directus-next
+
+This library was generated with [Nx](https://nx.dev).
+
+## Building
+
+Run `nx build directus-next` to build the library.
+
+## Running unit tests
+
+Run `nx test directus-next` to execute the unit tests via [Jest](https://jestjs.io).
+
+## Draft
+
+### Installation
+In your next folder app/api/ directory:
+* Create directory draft/
+* Create file draft/route.ts
+* In route.ts, import handleDraftRoute,
+* Define GET function.
+
+### Example
+```
+import { handleDraftRoute } from '@okam/directus-next'
+
+// eslint-disable-next-line @typescript-eslint/naming-convention
+export async function GET(request: Request) {
+   return handleDraftRoute({
+     url: request.url,
+     getDirectusLanguage: () => 'en-CA' // default language to show
+   })
+}
+```
+
+### Environment
+Set the secret in your .env and your directus application (preview_secret field).
+
+.env
+```
+NEXT_API_DRAFT_SECRET=123
+```
+

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

@@ -2,7 +2,7 @@
 Object.defineProperties(exports, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });
 const headers = require("next/headers");
 const navigation = require("next/navigation");
-const radash = require("radash");
+const radashi = require("radashi");
 const response = require("../response.js");
 const env = require("./env.js");
 function parseParams(url) {
@@ -81,7 +81,7 @@ function getPathFromRoute(routeUrl, url, index = 0) {
       map[key] = param || "";
     }
   });
-  return radash.template(routeUrl, map);
+  return radashi.template(routeUrl, map);
 }
 function handleDraftRoute({
   url,

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

@@ -1,6 +1,6 @@
 import { draftMode } from "next/headers";
 import { redirect } from "next/navigation";
-import { template } from "radash";
+import { template } from "radashi";
 import { getJsonErrorResponse } from "../response.mjs";
 import { getDraftSecretDefault } from "./env.mjs";
 function parseParams(url) {

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

@@ -2,11 +2,13 @@
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
 const route = require("./draft/route.js");
 const env = require("./draft/env.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.getDraftSecretDefault = env.getDraftSecretDefault;
+exports.DirectusNextLogger = logger.logger;
 exports.directusRouteRouter = directusRouteRouter.directusRouteRouter;
 exports.getJsonErrorResponse = response.getJsonErrorResponse;

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

@@ -1,8 +1,10 @@
 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,

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

@@ -1,12 +1,8 @@
 "use strict";
 Object.defineProperty(exports, Symbol.toStringTag, { value: "Module" });
-function log(...messages) {
-  if (process.env.NODE_ENV === "development") {
-    console.log("[directusRouter]", ...messages);
-  }
-}
+const logger = require("../logger.js");
 async function fetchPageSettingsTranslation(path) {
-  const graphqlEndpoint = process.env.NEXT_PUBLIC_GRAPHQL_URL;
+  const graphqlEndpoint = process.env.NEXT_SERVER_GRAPHQL_URL || process.env.NEXT_PUBLIC_GRAPHQL_URL;
   const graphqlApiKey = process.env.NEXT_PUBLIC_API_TOKEN;
   if (!graphqlEndpoint || !graphqlApiKey) {
     throw new Error("Missing GraphQL configuration");
@@ -35,8 +31,8 @@ async function fetchPageSettingsTranslation(path) {
     }
   };
   try {
-    log("Executing GraphQL query:", query);
-    log("Query variables:", variables);
+    logger.log("Executing GraphQL query:", query);
+    logger.log("Query variables:", variables);
     const response = await fetch(graphqlEndpoint, {
       method: "POST",
       headers: {
@@ -46,47 +42,47 @@ async function fetchPageSettingsTranslation(path) {
       body: JSON.stringify({ query, variables })
     });
     const { data } = await response.json();
-    log("GraphQL response:", data);
+    logger.log("GraphQL response:", data);
     return data.page_settings_translations;
   } catch (error) {
-    log("GraphQL Error:", error);
+    logger.log("GraphQL Error:", error);
     return null;
   }
 }
 async function directusRouteRouter(request, config, NextResponse) {
   var _a, _b;
   const { pathname } = request.nextUrl;
-  log("Processing request for pathname:", pathname);
+  logger.log("Processing request for pathname:", pathname);
   const translations = await fetchPageSettingsTranslation(pathname);
   if (!translations || translations.length === 0) {
-    log("No translation found for path:", pathname);
+    logger.log("No translation found for path:", pathname);
     return NextResponse.next();
   }
   const translation = translations[0];
-  log("Using translation:", translation);
+  logger.log("Using translation:", translation);
   if (!translation.languages_code || !translation.page_settings_id) {
-    console.warn(`[directusRouter] Invalid translation data for path: ${pathname}`);
+    logger.log(`Invalid translation data for path: ${pathname}`, { pathname }, "warn");
     return NextResponse.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) {
-    console.warn(`[directusRouter] PageSettings with id ${id} was found but is not associated with any collection.`);
+    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;
-  log("Directus locale:", directusLocale);
-  log("Mapped locale:", mappedLocale);
-  log("Collection:", collection);
-  log("ID Field:", idField);
-  log("ID:", id);
+  logger.log("Directus locale:", directusLocale);
+  logger.log("Mapped locale:", mappedLocale);
+  logger.log("Collection:", collection);
+  logger.log("ID Field:", idField);
+  logger.log("ID:", id);
   const newPath = `/${mappedLocale}/${collection}/${id}`;
-  log("Rewriting path:", pathname, "->", newPath);
+  logger.log(`Rewriting path: ${pathname} -> ${newPath}`);
   const url = request.nextUrl.clone();
   url.pathname = newPath;
-  log("Rewriting to URL:", url.toString());
+  logger.log("Rewriting to URL:", url.toString());
   return NextResponse.rewrite(url);
 }
 exports.directusRouteRouter = directusRouteRouter;

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

@@ -1,10 +1,6 @@
-function log(...messages) {
-  if (process.env.NODE_ENV === "development") {
-    console.log("[directusRouter]", ...messages);
-  }
-}
+import { log } from "../logger.mjs";
 async function fetchPageSettingsTranslation(path) {
-  const graphqlEndpoint = process.env.NEXT_PUBLIC_GRAPHQL_URL;
+  const graphqlEndpoint = process.env.NEXT_SERVER_GRAPHQL_URL || process.env.NEXT_PUBLIC_GRAPHQL_URL;
   const graphqlApiKey = process.env.NEXT_PUBLIC_API_TOKEN;
   if (!graphqlEndpoint || !graphqlApiKey) {
     throw new Error("Missing GraphQL configuration");
@@ -63,14 +59,14 @@ async function directusRouteRouter(request, config, NextResponse) {
   const translation = translations[0];
   log("Using translation:", translation);
   if (!translation.languages_code || !translation.page_settings_id) {
-    console.warn(`[directusRouter] Invalid translation data for path: ${pathname}`);
+    log(`Invalid translation data for path: ${pathname}`, { pathname }, "warn");
     return NextResponse.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) {
-    console.warn(`[directusRouter] PageSettings with id ${id} was found but is not associated with any collection.`);
+    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;
@@ -81,7 +77,7 @@ async function directusRouteRouter(request, config, NextResponse) {
   log("ID Field:", idField);
   log("ID:", id);
   const newPath = `/${mappedLocale}/${collection}/${id}`;
-  log("Rewriting path:", pathname, "->", newPath);
+  log(`Rewriting path: ${pathname} -> ${newPath}`);
   const url = request.nextUrl.clone();
   url.pathname = newPath;
   log("Rewriting to URL:", url.toString());

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

@@ -0,0 +1,12 @@
+"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]");
+function log(msg, context, severity = "log") {
+  if (process.env.NODE_ENV === "development") {
+    logger.log(msg, severity, { context });
+  }
+}
+exports.log = log;
+exports.logger = logger;

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

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

package/index.d.ts

@@ -1,3 +1,4 @@
 export * from './draft';
+export { logger as DirectusNextLogger } from './logger';
 export { directusRouteRouter } from './lib/directusRouteRouter';
 export { getJsonErrorResponse } from './response';

package/logger.d.ts

@@ -0,0 +1,3 @@
+import type { LogSeverity } from '@okam/logger';
+export declare const logger: import("@okam/logger").Logger;
+export declare function log(msg: string, context?: unknown, severity?: LogSeverity): void;

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@okam/directus-next",
   "main": "./index.js",
-  "version": "0.2.0",
+  "version": "0.4.0",
   "types": "./index.d.ts",
   "exports": {
     ".": {
@@ -15,5 +15,13 @@
   },
   "repository": {
     "url": "https://github.com/OKAMca/stack.git"
+  },
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "@okam/logger": "1.1.0",
+    "next": "^14.1.1",
+    "radashi": "^12.3.0"
   }
 }

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

@@ -0,0 +1,8 @@
+"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

@@ -0,0 +1,9 @@
+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

@@ -0,0 +1,37 @@
+"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

@@ -0,0 +1,37 @@
+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
+};