@okam/directus-node 0.4.0 → 0.6.0

package/CHANGELOG.md

@@ -1,3 +1,32 @@
+## 0.6.0 (2025-07-22)
+
+### 🚀 Features
+
+- **directus-next:** /api/redirect route handler to fetch + cache directus redirects ([c21b953](https://github.com/OKAMca/stack/commit/c21b953))
+
+### 🩹 Fixes
+
+- **directus-node:** export edge-compatible code from separate file ([9f77744](https://github.com/OKAMca/stack/commit/9f77744))
+- package deps error ([b665a45](https://github.com/OKAMca/stack/commit/b665a45))
+- search field icon ([0850fde](https://github.com/OKAMca/stack/commit/0850fde))
+
+### ❤️ Thank You
+
+- Marie-Maxime Tanguay
+- Pierre-Olivier Clerson @poclerson
+- poclerson
+
+## 0.5.0 (2025-01-30)
+
+### 🚀 Features
+
+- **redirection:** use new variable for redirection ([0c21683](https://github.com/OKAMca/stack/commit/0c21683))
+- **directus-node:** adding unit test, fix logger and adding read/write functions for redirections ([6d68bb4](https://github.com/OKAMca/stack/commit/6d68bb4))
+
+### ❤️ Thank You
+
+- Yan Morin
+
 ## 0.3.0 (2024-09-11)
 
 

package/README.md

@@ -57,13 +57,22 @@ module.exports = {
   redirects: async () => redirects,
   rewrites: async () => rewrites,
 }
+```
+
+4.1 or redirect/index.mjs
+```
+import redirectsData from './redirects.json' with { type: 'json' }
+import rewritesData from './rewrites.json' with { type: 'json' }
 
+export const redirects = async () => redirectsData
+export const rewrites = async () => rewritesData
 ```
 
 5. Define environments variables
 ```
-NEXT_PUBLIC_GRAPHQL_URL=
-NEXT_API_TOKEN_ADMIN=
+NEXT_REDIRECT_GRAPHQL_URL=http://server.some.url/graphql
+NEXT_PUBLIC_GRAPHQL_URL=https://server.external/graphql
+NEXT_API_TOKEN_ADMIN=user_token_for_graphql
 ```
 
 6. Generate redirect/redirects.json and redirect/rewrites.json using fetch-redirect (or build project with nx)
@@ -75,13 +84,23 @@ npx env-cmd -f ../../.env.local node fetch-redirect.js
 ```
 const { rewrites, redirects } = require('./redirect/index')
 ```
+
+for next.config.mjs
+```
+import { redirects, rewrites } from './redirect/index.mjs'
+```
+
+and
+
 ```
 const nextConfig = {
 ...
   async redirects() {
     const rest = await redirects()
     return [
+      // optional i18nrouter should be before
        ...i18nReRouter({locale: false, permanent: true}, 'redirect'),
+      // custom redirect should be here
        ...rest,
     ]
     return rest
@@ -90,9 +109,11 @@ const nextConfig = {
     const fallback = await rewrites()
     return {
       beforeFiles: [
+        // optional i18n router
         ...i18nReRouter({locale: false}, 'rewrite'),
       ],
       afterFiles: [
+        // optional i18n router
         ...i18nRewriter({...i18nConfigWithoutLocaleDetector, localeDetector: false}),
       ],
       fallback,
@@ -101,3 +122,6 @@ const nextConfig = {
 ...
 }
 ```
+
+## Warning
+In production (build), you can't reload dynamically in next.config.(m?)js in rewrites()/redirects() because it was compiled in `.nx/route-manifest.json`. Updating the files in redirects/ won't work. In dev mode, both rewrites()/redirects() of next.config.(m?)js are runned on each server start.

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@okam/directus-node",
   "main": "./src/index.js",
-  "version": "0.4.0",
+  "version": "0.6.0",
   "types": "./src/index.d.ts",
   "publishConfig": {
     "access": "public"
@@ -12,7 +12,8 @@
   "dependencies": {
     "@graphql-codegen/cli": "^5.0.3",
     "@okam/logger": "1.1.0",
-    "tslib": "^2.8.1"
+    "tslib": "^2.8.1",
+    "@okam/core-lib": "1.16.0"
   },
   "type": "commonjs"
 }

package/src/edge.d.ts

@@ -0,0 +1,6 @@
+/**
+ * @fileoverview Export file for functions that are used in edge functions (middleware-compatible)
+ */
+export type { TFetchRedirectsConfig, TFetchRedirectsResponse, TRedirectData, TRedirectType, } from './lib/redirection/interface';
+export { fetchRedirectsData, getDefaultConfig } from './lib/redirection/fetchRedirectsData';
+export { isRedirect, normalizeRedirects } from './lib/redirection/utils/validateRedirects';

package/src/edge.js

@@ -0,0 +1,13 @@
+"use strict";
+/**
+ * @fileoverview Export file for functions that are used in edge functions (middleware-compatible)
+ */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.normalizeRedirects = exports.isRedirect = exports.getDefaultConfig = exports.fetchRedirectsData = void 0;
+var fetchRedirectsData_1 = require("./lib/redirection/fetchRedirectsData");
+Object.defineProperty(exports, "fetchRedirectsData", { enumerable: true, get: function () { return fetchRedirectsData_1.fetchRedirectsData; } });
+Object.defineProperty(exports, "getDefaultConfig", { enumerable: true, get: function () { return fetchRedirectsData_1.getDefaultConfig; } });
+var validateRedirects_1 = require("./lib/redirection/utils/validateRedirects");
+Object.defineProperty(exports, "isRedirect", { enumerable: true, get: function () { return validateRedirects_1.isRedirect; } });
+Object.defineProperty(exports, "normalizeRedirects", { enumerable: true, get: function () { return validateRedirects_1.normalizeRedirects; } });
+//# sourceMappingURL=edge.js.map

package/src/edge.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"edge.js","sourceRoot":"","sources":["../../../../../libs/directus/directus-node/src/edge.ts"],"names":[],"mappings":";AAAA;;GAEG;;;AASH,2EAA2F;AAAlF,wHAAA,kBAAkB,OAAA;AAAE,sHAAA,gBAAgB,OAAA;AAC7C,+EAA0F;AAAjF,+GAAA,UAAU,OAAA;AAAE,uHAAA,kBAAkB,OAAA"}

package/src/lib/redirection/fetchRedirectsData.d.ts

@@ -0,0 +1,8 @@
+import type { TFetchRedirectsConfig, TFetchRedirectsResponse } from './interface';
+export declare const redirectDefaultLimit = 2000;
+/**
+ * Get Fetch Redirects Configuration
+ * @returns {object}
+ */
+export declare function getDefaultConfig(): TFetchRedirectsConfig;
+export declare function fetchRedirectsData(config: TFetchRedirectsConfig, init?: Omit<RequestInit, 'body' | 'method' | 'headers'>): Promise<TFetchRedirectsResponse>;

package/src/lib/redirection/fetchRedirectsData.js

@@ -0,0 +1,85 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redirectDefaultLimit = void 0;
+exports.getDefaultConfig = getDefaultConfig;
+exports.fetchRedirectsData = fetchRedirectsData;
+const tslib_1 = require("tslib");
+const logger_1 = require("@okam/logger");
+const validateRedirects_1 = require("./utils/validateRedirects");
+exports.redirectDefaultLimit = 2000;
+/**
+ * Get Fetch Redirects Configuration
+ * @returns {object}
+ */
+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: exports.redirectDefaultLimit,
+    };
+}
+function fetchRedirectsData(config, init) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        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) || exports.redirectDefaultLimit,
+            },
+        };
+        try {
+            // console.info(`Fetching redirects on ${graphqlEndpoint}`)
+            const response = yield fetch(graphqlEndpoint, Object.assign(Object.assign({}, 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 } = yield response.json();
+            const { redirects, rewrites } = data !== null && data !== void 0 ? data : {};
+            if (!(redirects === null || redirects === void 0 ? void 0 : redirects.length) && !(rewrites === null || rewrites === void 0 ? void 0 : rewrites.length)) {
+                logger_1.logger.log('No redirects/rewrites found', 'warn');
+                return {
+                    redirects: [],
+                    rewrites: [],
+                };
+            }
+            logger_1.logger.log(`Fetch redirects count: ${(redirects === null || redirects === void 0 ? void 0 : redirects.length) || 0}, rewrites count: ${(rewrites === null || rewrites === void 0 ? void 0 : rewrites.length) || 0}`);
+            return {
+                redirects: (0, validateRedirects_1.normalizeRedirects)(redirects),
+                rewrites: (0, validateRedirects_1.normalizeRedirects)(rewrites),
+            };
+        }
+        catch (e) {
+            logger_1.logger.log(`Error fetching redirects: ${e.message}`, 'error');
+        }
+        return {
+            redirects: [],
+            rewrites: [],
+        };
+    });
+}
+//# sourceMappingURL=fetchRedirectsData.js.map

package/src/lib/redirection/fetchRedirectsData.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"fetchRedirectsData.js","sourceRoot":"","sources":["../../../../../../../libs/directus/directus-node/src/lib/redirection/fetchRedirectsData.ts"],"names":[],"mappings":"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"}

package/src/lib/redirection/index.d.ts

@@ -0,0 +1,16 @@
+import * as fetchRedirectsDataFile from './fetchRedirectsData';
+/**
+ * @deprecated Import from `@okam/directus-node/edge` instead
+ */
+export declare const fetchRedirectsData: typeof fetchRedirectsDataFile.fetchRedirectsData;
+/**
+ * @deprecated Import from `@okam/directus-node/edge` instead
+ */
+export declare const getDefaultConfig: typeof fetchRedirectsDataFile.getDefaultConfig;
+/**
+ * @deprecated Import from `@okam/directus-node/edge` instead
+ */
+export declare const redirectDefaultLimit = 2000;
+export type { TFetchRedirectsConfig, TFetchRedirectsResponse, TRedirectData, TRedirectType } from './interface';
+export * from './utils/validateRedirects';
+export * from './redirectsFile';

package/src/lib/redirection/index.js

@@ -0,0 +1,22 @@
+"use strict";
+/* eslint-disable prefer-destructuring */
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.redirectDefaultLimit = exports.getDefaultConfig = exports.fetchRedirectsData = void 0;
+const tslib_1 = require("tslib");
+const fetchRedirectsDataFile = tslib_1.__importStar(require("./fetchRedirectsData"));
+// Re-export with deprecation warnings
+/**
+ * @deprecated Import from `@okam/directus-node/edge` instead
+ */
+exports.fetchRedirectsData = fetchRedirectsDataFile.fetchRedirectsData;
+/**
+ * @deprecated Import from `@okam/directus-node/edge` instead
+ */
+exports.getDefaultConfig = fetchRedirectsDataFile.getDefaultConfig;
+/**
+ * @deprecated Import from `@okam/directus-node/edge` instead
+ */
+exports.redirectDefaultLimit = fetchRedirectsDataFile.redirectDefaultLimit;
+tslib_1.__exportStar(require("./utils/validateRedirects"), exports);
+tslib_1.__exportStar(require("./redirectsFile"), exports);
+//# sourceMappingURL=index.js.map

package/src/lib/redirection/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../../../libs/directus/directus-node/src/lib/redirection/index.ts"],"names":[],"mappings":";AAAA,yCAAyC;;;;AAEzC,qFAA8D;AAC9D,sCAAsC;AACtC;;GAEG;AACU,QAAA,kBAAkB,GAAG,sBAAsB,CAAC,kBAAkB,CAAA;AAC3E;;GAEG;AACU,QAAA,gBAAgB,GAAG,sBAAsB,CAAC,gBAAgB,CAAA;AACvE;;GAEG;AACU,QAAA,oBAAoB,GAAG,sBAAsB,CAAC,oBAAoB,CAAA;AAG/E,oEAAyC;AACzC,0DAA+B"}

package/src/lib/redirection/interface.d.ts

@@ -0,0 +1,18 @@
+export interface TFetchRedirectsConfig {
+    graphqlEndpoint: string | undefined;
+    graphqlApiKey: string | undefined;
+    redirectsFilename?: string;
+    rewritesFilename?: string;
+    limit: number | undefined;
+}
+export interface TFetchRedirectsResponse {
+    redirects: TRedirectData[];
+    rewrites: TRedirectData[];
+}
+export interface TRedirectData {
+    source: string;
+    destination: string;
+    permanent?: boolean;
+    locale?: boolean;
+}
+export type TRedirectType = 'redirects' | 'rewrites';

package/src/lib/redirection/interface.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=interface.js.map

package/src/lib/redirection/interface.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../../../../../libs/directus/directus-node/src/lib/redirection/interface.ts"],"names":[],"mappings":""}

package/src/lib/redirection/redirectsFile.d.ts

@@ -0,0 +1,22 @@
+import type { TFetchRedirectsConfig, TRedirectType, TRedirectData } from './interface';
+/**
+ * Write Redirect Data
+ * @param {string} filename filename
+ * @param {unknown} data redirects data (rewrites or redirects)
+ */
+export declare function writeRedirectFile(filename: string, data: unknown): Promise<boolean>;
+export declare function readRedirectFileData(filename: string): Promise<unknown>;
+/**
+ * Read one redirects or rewrites file
+ * @param {string} filePath relative file path like './redirect/redirects.json' to the current working dir
+ * @param {TRedirectType} type redirects or rewrites
+ * @returns {Promise<TRedirectData[]>} an array of redirect information
+ */
+export declare function readRedirectFile(filePath: string, type?: TRedirectType): Promise<TRedirectData[]>;
+/**
+ * Fetch and write redirects and rewrites files
+ * @param {TFetchRedirectsConfig} config fetch redirects configuration
+ * @returns {Promise<boolean>} true
+ * @throws {Error}
+ */
+export declare function fetchRedirects(config: TFetchRedirectsConfig): Promise<boolean>;

package/src/lib/redirection/redirectsFile.js

@@ -0,0 +1,88 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.writeRedirectFile = writeRedirectFile;
+exports.readRedirectFileData = readRedirectFileData;
+exports.readRedirectFile = readRedirectFile;
+exports.fetchRedirects = fetchRedirects;
+const tslib_1 = require("tslib");
+const promises_1 = require("fs/promises");
+const path = tslib_1.__importStar(require("path"));
+const logger_1 = require("../../logger");
+const fetchRedirectsData_1 = require("./fetchRedirectsData");
+/**
+ * Write Redirect Data
+ * @param {string} filename filename
+ * @param {unknown} data redirects data (rewrites or redirects)
+ */
+function writeRedirectFile(filename, data) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            const writeData = JSON.stringify(data || []);
+            yield (0, promises_1.writeFile)(filename, writeData);
+            return true;
+        }
+        catch (e) {
+            logger_1.logger.log(`Error writing redirect file ${filename}: ${e.message}`, 'error');
+        }
+        return false;
+    });
+}
+function readRedirectFileData(filename) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        try {
+            const file = yield (0, promises_1.readFile)(filename, { encoding: 'utf8' });
+            const data = JSON.parse(file);
+            return data;
+        }
+        catch (e) {
+            logger_1.logger.log(`Failed loading redirects JSON from ${filename}: ${e.message}`, 'error');
+        }
+        return [];
+    });
+}
+/**
+ * Read one redirects or rewrites file
+ * @param {string} filePath relative file path like './redirect/redirects.json' to the current working dir
+ * @param {TRedirectType} type redirects or rewrites
+ * @returns {Promise<TRedirectData[]>} an array of redirect information
+ */
+function readRedirectFile(filePath_1) {
+    return tslib_1.__awaiter(this, arguments, void 0, function* (filePath, type = 'redirects') {
+        const absolutePath = path.resolve(process.cwd(), filePath);
+        const data = yield readRedirectFileData(absolutePath);
+        if (Array.isArray(data)) {
+            // check data integrity
+            const checkedData = data.filter((x) => {
+                return x && typeof (x === null || x === void 0 ? void 0 : x.source) === 'string' && typeof (x === null || x === void 0 ? void 0 : x.destination) === 'string';
+            });
+            logger_1.logger.log(`Loading ${type} length: ${checkedData.length}`);
+            return checkedData;
+        }
+        logger_1.logger.log(`Failed loading ${type}, not a valid array`, 'error');
+        return [];
+    });
+}
+/**
+ * Fetch and write redirects and rewrites files
+ * @param {TFetchRedirectsConfig} config fetch redirects configuration
+ * @returns {Promise<boolean>} true
+ * @throws {Error}
+ */
+function fetchRedirects(config) {
+    return tslib_1.__awaiter(this, void 0, void 0, function* () {
+        const { redirectsFilename, rewritesFilename } = config;
+        if (!redirectsFilename) {
+            throw new Error('Missing fetchRedirects configuration `redirectsFilename`');
+        }
+        if (!rewritesFilename) {
+            throw new Error('Missing fetchRedirects configuration `rewritesFilename`');
+        }
+        // fetch can throw
+        const data = yield (0, fetchRedirectsData_1.fetchRedirectsData)(config);
+        // should not throw
+        yield writeRedirectFile(redirectsFilename, data.redirects);
+        yield writeRedirectFile(rewritesFilename, data.rewrites);
+        return true;
+    });
+}
+//# sourceMappingURL=redirectsFile.js.map

package/src/lib/redirection/redirectsFile.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"redirectsFile.js","sourceRoot":"","sources":["../../../../../../../libs/directus/directus-node/src/lib/redirection/redirectsFile.ts"],"names":[],"mappings":"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"}

package/src/lib/redirection/utils/validateRedirects.d.ts

@@ -0,0 +1,3 @@
+import type { TRedirectData } from '../interface';
+export declare function isRedirect(redirect: unknown): boolean;
+export declare function normalizeRedirects(redirects: (TRedirectData | null)[] | null): TRedirectData[];

package/src/lib/redirection/utils/validateRedirects.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isRedirect = isRedirect;
+exports.normalizeRedirects = normalizeRedirects;
+const tslib_1 = require("tslib");
+const core_lib_1 = 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 _a = redirect !== null && redirect !== void 0 ? redirect : {}, { source, destination } = _a, rest = tslib_1.__rest(_a, ["source", "destination"]);
+        if (!redirect || !source || !destination || !isRedirect(redirect))
+            return [];
+        return [
+            Object.assign(Object.assign({}, rest), { source: (0, core_lib_1.normalizePath)(source), destination: (0, core_lib_1.normalizePath)(destination) }),
+        ];
+    });
+}
+//# sourceMappingURL=validateRedirects.js.map

package/src/lib/redirection/utils/validateRedirects.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validateRedirects.js","sourceRoot":"","sources":["../../../../../../../../libs/directus/directus-node/src/lib/redirection/utils/validateRedirects.ts"],"names":[],"mappings":";;AAGA,gCAEC;AAED,gDAaC;;AApBD,6CAA8C;AAG9C,SAAgB,UAAU,CAAC,QAAiB;IAC1C,OAAO,CAAC,CAAC,QAAQ,IAAI,OAAO,QAAQ,KAAK,QAAQ,IAAI,QAAQ,IAAI,QAAQ,IAAI,aAAa,IAAI,QAAQ,CAAA;AACxG,CAAC;AAED,SAAgB,kBAAkB,CAAC,SAA0C;IAC3E,IAAI,CAAC,SAAS,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC;QAAE,OAAO,EAAE,CAAA;IACtD,OAAO,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;QACpC,MAAM,KAAmC,QAAQ,aAAR,QAAQ,cAAR,QAAQ,GAAI,EAAE,EAAjD,EAAE,MAAM,EAAE,WAAW,OAA4B,EAAvB,IAAI,sBAA9B,yBAAgC,CAAiB,CAAA;QACvD,IAAI,CAAC,QAAQ,IAAI,CAAC,MAAM,IAAI,CAAC,WAAW,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC;YAAE,OAAO,EAAE,CAAA;QAC5E,OAAO;4CAEA,IAAI,KACP,MAAM,EAAE,IAAA,wBAAa,EAAC,MAAM,CAAC,EAC7B,WAAW,EAAE,IAAA,wBAAa,EAAC,WAAW,CAAC;SAE1C,CAAA;IACH,CAAC,CAAC,CAAA;AACJ,CAAC"}

package/src/logger.d.ts

@@ -1,2 +1 @@
 export declare const logger: import("@okam/logger").Logger;
-export declare const log: (message: string, severity?: import("@okam/logger").LogSeverity, context?: Record<string, unknown>) => void;

package/src/logger.js

@@ -1,7 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.log = exports.logger = void 0;
+exports.logger = void 0;
 const logger_1 = require("@okam/logger");
 exports.logger = (0, logger_1.createLogger)('[DirectusNode]');
-exports.log = exports.logger.log;
 //# sourceMappingURL=logger.js.map

package/src/logger.js.map

@@ -1 +1 @@
-{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../libs/directus/directus-node/src/logger.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAE9B,QAAA,MAAM,GAAG,IAAA,qBAAY,EAAC,gBAAgB,CAAC,CAAA;AAErC,WAAG,GAAK,cAAM,KAAA"}
+{"version":3,"file":"logger.js","sourceRoot":"","sources":["../../../../../libs/directus/directus-node/src/logger.ts"],"names":[],"mappings":";;;AAAA,yCAA2C;AAE9B,QAAA,MAAM,GAAG,IAAA,qBAAY,EAAC,gBAAgB,CAAC,CAAA"}

package/src/lib/redirection.d.ts

@@ -1,15 +0,0 @@
-interface TFetchRedirectsConfig {
-    graphqlEndpoint: string;
-    graphqlApiKey: string;
-    redirectsFilename: string;
-    rewritesFilename: string;
-    limit: number | undefined;
-}
-export declare const redirectDefaultLimit = 2000;
-/**
- * Get Fetch Redirects Configuration
- * @returns {object}
- */
-export declare function getDefaultConfig(): TFetchRedirectsConfig;
-export declare function fetchRedirects(config: TFetchRedirectsConfig): Promise<boolean>;
-export {};

package/src/lib/redirection.js

@@ -1,79 +0,0 @@
-"use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.redirectDefaultLimit = void 0;
-exports.getDefaultConfig = getDefaultConfig;
-exports.fetchRedirects = fetchRedirects;
-const tslib_1 = require("tslib");
-const promises_1 = require("node:fs/promises");
-const logger_1 = require("../logger");
-exports.redirectDefaultLimit = 2000;
-/**
- * Get Fetch Redirects Configuration
- * @returns {object}
- */
-function getDefaultConfig() {
-    return {
-        graphqlEndpoint: process.env['NEXT_PUBLIC_GRAPHQL_URL'] || '',
-        graphqlApiKey: process.env['NEXT_API_TOKEN_ADMIN'] || '',
-        redirectsFilename: './redirect/redirects.json',
-        rewritesFilename: './redirect/rewrites.json',
-        limit: exports.redirectDefaultLimit,
-    };
-}
-function fetchRedirects(config) {
-    return tslib_1.__awaiter(this, void 0, void 0, function* () {
-        var _a, _b;
-        const { graphqlEndpoint, graphqlApiKey, redirectsFilename, rewritesFilename, limit } = config;
-        if (!graphqlEndpoint || !graphqlApiKey) {
-            throw new Error('Missing graphql configuration: NEXT_PUBLIC_GRAPHQL_URL or NEXT_API_TOKEN_ADMIN');
-        }
-        if (!redirectsFilename || !rewritesFilename) {
-            throw new Error('Missing filename');
-        }
-        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) || exports.redirectDefaultLimit,
-            },
-        };
-        try {
-            // console.info(`Fetching redirects on ${graphqlEndpoint}`)
-            const response = yield 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 } = yield response.json();
-            const writeDataRedirects = JSON.stringify(data.redirects || []);
-            yield (0, promises_1.writeFile)(redirectsFilename, writeDataRedirects);
-            const writeDataRewrites = JSON.stringify(data.rewrites || []);
-            yield (0, promises_1.writeFile)(rewritesFilename, writeDataRewrites);
-            (0, logger_1.log)(`Redirects count: ${((_a = data.redirects) === null || _a === void 0 ? void 0 : _a.length) || 0}, Rewrites count: ${((_b = data.rewrites) === null || _b === void 0 ? void 0 : _b.length) || 0}`);
-        }
-        catch (e) {
-            (0, logger_1.log)(`Error fetching redirects: ${e.message}`, 'error');
-            return true; // still want build to pass
-        }
-        return true;
-    });
-}
-//# sourceMappingURL=redirection.js.map

package/src/lib/redirection.js.map

@@ -1 +0,0 @@
-{"version":3,"file":"redirection.js","sourceRoot":"","sources":["../../../../../../libs/directus/directus-node/src/lib/redirection.ts"],"names":[],"mappings":";;;AAkBA,4CAQC;AAED,wCA4DC;;AAxFD,+CAA4C;AAE5C,sCAA+B;AAUlB,QAAA,oBAAoB,GAAG,IAAI,CAAA;AAExC;;;GAGG;AACH,SAAgB,gBAAgB;IAC9B,OAAO;QACL,eAAe,EAAE,OAAO,CAAC,GAAG,CAAC,yBAAyB,CAAC,IAAI,EAAE;QAC7D,aAAa,EAAE,OAAO,CAAC,GAAG,CAAC,sBAAsB,CAAC,IAAI,EAAE;QACxD,iBAAiB,EAAE,2BAA2B;QAC9C,gBAAgB,EAAE,0BAA0B;QAC5C,KAAK,EAAE,4BAAoB;KAC5B,CAAA;AACH,CAAC;AAED,SAAsB,cAAc,CAAC,MAA6B;;;QAChE,MAAM,EAAE,eAAe,EAAE,aAAa,EAAE,iBAAiB,EAAE,gBAAgB,EAAE,KAAK,EAAE,GAAG,MAAM,CAAA;QAE7F,IAAI,CAAC,eAAe,IAAI,CAAC,aAAa,EAAE,CAAC;YACvC,MAAM,IAAI,KAAK,CAAC,gFAAgF,CAAC,CAAA;QACnG,CAAC;QAED,IAAI,CAAC,iBAAiB,IAAI,CAAC,gBAAgB,EAAE,CAAC;YAC5C,MAAM,IAAI,KAAK,CAAC,kBAAkB,CAAC,CAAA;QACrC,CAAC;QAED,MAAM,KAAK,GAAG;;;;;;;;;;;;;EAad,CAAA;QAEA,MAAM,WAAW,GAAG;YAClB,KAAK;YACL,uBAAuB;YACvB,SAAS,EAAE;gBACT,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,IAAI,4BAAoB;aAC7C;SACF,CAAA;QAED,IAAI,CAAC;YACH,2DAA2D;YAC3D,MAAM,QAAQ,GAAG,MAAM,KAAK,CAAC,eAAe,EAAE;gBAC5C,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE;oBACP,gEAAgE;oBAChE,cAAc,EAAE,kBAAkB;oBAClC,aAAa,EAAE,UAAU,aAAa,EAAE;iBACzC;gBACD,IAAI,EAAE,IAAI,CAAC,SAAS,CAAC,WAAW,CAAC;aAClC,CAAC,CAAA;YACF,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,QAAQ,CAAC,IAAI,EAAE,CAAA;YAEtC,MAAM,kBAAkB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,SAAS,IAAI,EAAE,CAAC,CAAA;YAC/D,MAAM,IAAA,oBAAS,EAAC,iBAAiB,EAAE,kBAAkB,CAAC,CAAA;YAEtD,MAAM,iBAAiB,GAAG,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC,CAAA;YAC7D,MAAM,IAAA,oBAAS,EAAC,gBAAgB,EAAE,iBAAiB,CAAC,CAAA;YAEpD,IAAA,YAAG,EAAC,oBAAoB,CAAA,MAAA,IAAI,CAAC,SAAS,0CAAE,MAAM,KAAI,CAAC,qBAAqB,CAAA,MAAA,IAAI,CAAC,QAAQ,0CAAE,MAAM,KAAI,CAAC,EAAE,CAAC,CAAA;QACvG,CAAC;QAAC,OAAO,CAAC,EAAE,CAAC;YACX,IAAA,YAAG,EAAC,6BAA8B,CAAW,CAAC,OAAO,EAAE,EAAE,OAAO,CAAC,CAAA;YACjE,OAAO,IAAI,CAAA,CAAC,2BAA2B;QACzC,CAAC;QAED,OAAO,IAAI,CAAA;IACb,CAAC;CAAA"}