@uniformdev/redirect 19.38.2 → 19.38.3-alpha.78

package/dist/index.d.mts

@@ -137,6 +137,8 @@ interface paths {
                     ids?: string[];
                     /** Source url to attempt to find redirects for */
                     sourceUrl?: string;
+                    /** Find redirects that could redirect to this url */
+                    targetUrl?: string;
                     /** Id of the project map the source or target belongs to. */
                     projectMapId?: string;
                     /** Id of the project map node to find redirects for. */
@@ -389,7 +391,7 @@ type RedirectDataCache = {
     preload?: boolean;
 };
 type RedirectClientGetRedirect = Pick<RedirectClientGetRequest, 'id' | 'projectMapId' | 'sourceProjectMapNodeId' | 'targetProjectMapNodeId'>;
-type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search' | 'sourceUrl'>;
+type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search' | 'sourceUrl' | 'targetUrl'>;
 
 declare class WithMemoryCache extends RedirectClientCache<RedirectClientCacheOptions> {
     private static refresher?;

package/dist/index.d.ts

@@ -137,6 +137,8 @@ interface paths {
                     ids?: string[];
                     /** Source url to attempt to find redirects for */
                     sourceUrl?: string;
+                    /** Find redirects that could redirect to this url */
+                    targetUrl?: string;
                     /** Id of the project map the source or target belongs to. */
                     projectMapId?: string;
                     /** Id of the project map node to find redirects for. */
@@ -389,7 +391,7 @@ type RedirectDataCache = {
     preload?: boolean;
 };
 type RedirectClientGetRedirect = Pick<RedirectClientGetRequest, 'id' | 'projectMapId' | 'sourceProjectMapNodeId' | 'targetProjectMapNodeId'>;
-type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search' | 'sourceUrl'>;
+type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search' | 'sourceUrl' | 'targetUrl'>;
 
 declare class WithMemoryCache extends RedirectClientCache<RedirectClientCacheOptions> {
     private static refresher?;

package/dist/index.esm.js

@@ -359,39 +359,50 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       return result.id;
     };
     this.processUrlBestMatch = async (url, options, useTrie) => {
-      var _a;
+      var _a, _b;
+      const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
-        const redirects = await this.getRedirects({ sourceUrl: url });
-        const processedUrl = processUrl(url);
-        const redirect = redirects.redirects[0];
+        const redirects = await this.getRedirects(
+          (options == null ? void 0 : options.reverse) ? { targetUrl: sanitizedUrl } : { sourceUrl: sanitizedUrl }
+        );
+        const processedUrl = processUrl(sanitizedUrl);
+        const redirect = (_a = redirects == null ? void 0 : redirects.redirects) == null ? void 0 : _a[0];
+        if (!redirect)
+          return void 0;
         return _RedirectClient.processDefinitionToResults(
           processedUrl,
           redirect,
-          _RedirectClient.getSourceVariables(processedUrl.path, processUrl(redirect.redirect.sourceUrl).path),
+          _RedirectClient.getSourceVariables(
+            processedUrl.path,
+            processUrl((options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl).path
+          ),
           options
         );
       }
       const trie = await this.getRedirectTrie();
-      return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
+      return (_b = _RedirectClient.processHops(sanitizedUrl, trie, true, options)) == null ? void 0 : _b[0];
     };
     this.processUrlAllMatches = async (url, options, useTrie) => {
+      const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
-        const redirects = await this.getRedirects({ sourceUrl: url });
-        const processedUrl = processUrl(url);
-        return redirects.redirects.filter((redirect) => redirect.redirect).map(
-          (redirect) => _RedirectClient.processDefinitionToResults(
+        const redirects = await this.getRedirects(
+          (options == null ? void 0 : options.reverse) ? { targetUrl: sanitizedUrl } : { sourceUrl: sanitizedUrl }
+        );
+        const processedUrl = processUrl(sanitizedUrl);
+        return redirects.redirects.filter((redirect) => redirect.redirect).map((redirect) => {
+          return _RedirectClient.processDefinitionToResults(
             processedUrl,
             redirect,
             _RedirectClient.getSourceVariables(
               processedUrl.path,
-              processUrl(redirect.redirect.sourceUrl).path
+              processUrl((options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl).path
             ),
             options
-          )
-        );
+          );
+        });
       }
       const trie = await this.getRedirectTrie();
-      return _RedirectClient.processHops(url, trie, false, options);
+      return _RedirectClient.processHops(sanitizedUrl, trie, false, options);
     };
     if (options.dataCache && options.dataCache.options.prePopulate) {
       if (!options.dataCache.get(options.projectId)) {
@@ -613,7 +624,7 @@ var UncachedRedirectClient = class extends RedirectClient {
 
 // src/util/RedirectFileConverter.ts
 var getDefaultClient = async () => {
-  const dotenv = await import("./main-HWDEQR7W.mjs");
+  const dotenv = await import("./main-4Y7KG46W.mjs");
   dotenv.config();
   return new RedirectClient({
     apiKey: process.env.UNIFORM_API_KEY,

package/dist/index.js

@@ -30,12 +30,12 @@ var __toESM = (mod, isNodeMode, target) => (target = mod != null ? __create(__ge
 ));
 var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
 
-// ../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/package.json
+// ../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/package.json
 var require_package = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/package.json"(exports, module2) {
+  "../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/package.json"(exports, module2) {
     module2.exports = {
       name: "dotenv",
-      version: "16.1.3",
+      version: "16.3.1",
       description: "Loads environment variables from .env file",
       main: "lib/main.js",
       types: "lib/main.d.ts",
@@ -100,9 +100,9 @@ var require_package = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/lib/main.js
+// ../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/lib/main.js
 var require_main = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/lib/main.js"(exports, module2) {
+  "../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/lib/main.js"(exports, module2) {
     "use strict";
     var fs = require("fs");
     var path = require("path");
@@ -136,7 +136,7 @@ var require_main = __commonJS({
       if (!result.parsed) {
         throw new Error(`MISSING_DATA: Cannot parse ${vaultPath} for an unknown reason`);
       }
-      const keys = _dotenvKey().split(",");
+      const keys = _dotenvKey(options).split(",");
       const length = keys.length;
       let decrypted;
       for (let i = 0; i < length; i++) {
@@ -162,7 +162,10 @@ var require_main = __commonJS({
     function _debug(message) {
       console.log(`[dotenv@${version}][DEBUG] ${message}`);
     }
-    function _dotenvKey() {
+    function _dotenvKey(options) {
+      if (options && options.DOTENV_KEY && options.DOTENV_KEY.length > 0) {
+        return options.DOTENV_KEY;
+      }
       if (process.env.DOTENV_KEY && process.env.DOTENV_KEY.length > 0) {
         return process.env.DOTENV_KEY;
       }
@@ -206,7 +209,11 @@ var require_main = __commonJS({
     function _configVault(options) {
       _log("Loading env from encrypted .env.vault");
       const parsed = DotenvModule._parseVault(options);
-      DotenvModule.populate(process.env, parsed, options);
+      let processEnv = process.env;
+      if (options && options.processEnv != null) {
+        processEnv = options.processEnv;
+      }
+      DotenvModule.populate(processEnv, parsed, options);
       return { parsed };
     }
     function configDotenv(options) {
@@ -223,7 +230,11 @@ var require_main = __commonJS({
       }
       try {
         const parsed = DotenvModule.parse(fs.readFileSync(dotenvPath, { encoding }));
-        DotenvModule.populate(process.env, parsed, options);
+        let processEnv = process.env;
+        if (options && options.processEnv != null) {
+          processEnv = options.processEnv;
+        }
+        DotenvModule.populate(processEnv, parsed, options);
         return { parsed };
       } catch (e) {
         if (debug) {
@@ -234,7 +245,7 @@ var require_main = __commonJS({
     }
     function config(options) {
       const vaultPath = _vaultPath(options);
-      if (_dotenvKey().length === 0) {
+      if (_dotenvKey(options).length === 0) {
         return DotenvModule.configDotenv(options);
       }
       if (!fs.existsSync(vaultPath)) {
@@ -686,39 +697,50 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
       return result.id;
     };
     this.processUrlBestMatch = async (url, options, useTrie) => {
-      var _a;
+      var _a, _b;
+      const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
-        const redirects = await this.getRedirects({ sourceUrl: url });
-        const processedUrl = processUrl(url);
-        const redirect = redirects.redirects[0];
+        const redirects = await this.getRedirects(
+          (options == null ? void 0 : options.reverse) ? { targetUrl: sanitizedUrl } : { sourceUrl: sanitizedUrl }
+        );
+        const processedUrl = processUrl(sanitizedUrl);
+        const redirect = (_a = redirects == null ? void 0 : redirects.redirects) == null ? void 0 : _a[0];
+        if (!redirect)
+          return void 0;
         return _RedirectClient.processDefinitionToResults(
           processedUrl,
           redirect,
-          _RedirectClient.getSourceVariables(processedUrl.path, processUrl(redirect.redirect.sourceUrl).path),
+          _RedirectClient.getSourceVariables(
+            processedUrl.path,
+            processUrl((options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl).path
+          ),
           options
         );
       }
       const trie = await this.getRedirectTrie();
-      return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
+      return (_b = _RedirectClient.processHops(sanitizedUrl, trie, true, options)) == null ? void 0 : _b[0];
     };
     this.processUrlAllMatches = async (url, options, useTrie) => {
+      const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
-        const redirects = await this.getRedirects({ sourceUrl: url });
-        const processedUrl = processUrl(url);
-        return redirects.redirects.filter((redirect) => redirect.redirect).map(
-          (redirect) => _RedirectClient.processDefinitionToResults(
+        const redirects = await this.getRedirects(
+          (options == null ? void 0 : options.reverse) ? { targetUrl: sanitizedUrl } : { sourceUrl: sanitizedUrl }
+        );
+        const processedUrl = processUrl(sanitizedUrl);
+        return redirects.redirects.filter((redirect) => redirect.redirect).map((redirect) => {
+          return _RedirectClient.processDefinitionToResults(
             processedUrl,
             redirect,
             _RedirectClient.getSourceVariables(
               processedUrl.path,
-              processUrl(redirect.redirect.sourceUrl).path
+              processUrl((options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl).path
             ),
             options
-          )
-        );
+          );
+        });
       }
       const trie = await this.getRedirectTrie();
-      return _RedirectClient.processHops(url, trie, false, options);
+      return _RedirectClient.processHops(sanitizedUrl, trie, false, options);
     };
     if (options.dataCache && options.dataCache.options.prePopulate) {
       if (!options.dataCache.get(options.projectId)) {

package/dist/index.mjs

@@ -359,39 +359,50 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       return result.id;
     };
     this.processUrlBestMatch = async (url, options, useTrie) => {
-      var _a;
+      var _a, _b;
+      const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
-        const redirects = await this.getRedirects({ sourceUrl: url });
-        const processedUrl = processUrl(url);
-        const redirect = redirects.redirects[0];
+        const redirects = await this.getRedirects(
+          (options == null ? void 0 : options.reverse) ? { targetUrl: sanitizedUrl } : { sourceUrl: sanitizedUrl }
+        );
+        const processedUrl = processUrl(sanitizedUrl);
+        const redirect = (_a = redirects == null ? void 0 : redirects.redirects) == null ? void 0 : _a[0];
+        if (!redirect)
+          return void 0;
         return _RedirectClient.processDefinitionToResults(
           processedUrl,
           redirect,
-          _RedirectClient.getSourceVariables(processedUrl.path, processUrl(redirect.redirect.sourceUrl).path),
+          _RedirectClient.getSourceVariables(
+            processedUrl.path,
+            processUrl((options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl).path
+          ),
           options
         );
       }
       const trie = await this.getRedirectTrie();
-      return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
+      return (_b = _RedirectClient.processHops(sanitizedUrl, trie, true, options)) == null ? void 0 : _b[0];
     };
     this.processUrlAllMatches = async (url, options, useTrie) => {
+      const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
-        const redirects = await this.getRedirects({ sourceUrl: url });
-        const processedUrl = processUrl(url);
-        return redirects.redirects.filter((redirect) => redirect.redirect).map(
-          (redirect) => _RedirectClient.processDefinitionToResults(
+        const redirects = await this.getRedirects(
+          (options == null ? void 0 : options.reverse) ? { targetUrl: sanitizedUrl } : { sourceUrl: sanitizedUrl }
+        );
+        const processedUrl = processUrl(sanitizedUrl);
+        return redirects.redirects.filter((redirect) => redirect.redirect).map((redirect) => {
+          return _RedirectClient.processDefinitionToResults(
             processedUrl,
             redirect,
             _RedirectClient.getSourceVariables(
               processedUrl.path,
-              processUrl(redirect.redirect.sourceUrl).path
+              processUrl((options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl).path
             ),
             options
-          )
-        );
+          );
+        });
       }
       const trie = await this.getRedirectTrie();
-      return _RedirectClient.processHops(url, trie, false, options);
+      return _RedirectClient.processHops(sanitizedUrl, trie, false, options);
     };
     if (options.dataCache && options.dataCache.options.prePopulate) {
       if (!options.dataCache.get(options.projectId)) {
@@ -613,7 +624,7 @@ var UncachedRedirectClient = class extends RedirectClient {
 
 // src/util/RedirectFileConverter.ts
 var getDefaultClient = async () => {
-  const dotenv = await import("./main-HWDEQR7W.mjs");
+  const dotenv = await import("./main-4Y7KG46W.mjs");
   dotenv.config();
   return new RedirectClient({
     apiKey: process.env.UNIFORM_API_KEY,

package/dist/{main-HWDEQR7W.mjs → main-4Y7KG46W.mjs}

@@ -3,12 +3,12 @@ import {
   __require
 } from "./chunk-TLYAXJ7N.mjs";
 
-// ../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/package.json
+// ../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/package.json
 var require_package = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/package.json"(exports, module) {
+  "../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/package.json"(exports, module) {
     module.exports = {
       name: "dotenv",
-      version: "16.1.3",
+      version: "16.3.1",
       description: "Loads environment variables from .env file",
       main: "lib/main.js",
       types: "lib/main.d.ts",
@@ -73,9 +73,9 @@ var require_package = __commonJS({
   }
 });
 
-// ../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/lib/main.js
+// ../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/lib/main.js
 var require_main = __commonJS({
-  "../../node_modules/.pnpm/dotenv@16.1.3/node_modules/dotenv/lib/main.js"(exports, module) {
+  "../../node_modules/.pnpm/dotenv@16.3.1/node_modules/dotenv/lib/main.js"(exports, module) {
     var fs = __require("fs");
     var path = __require("path");
     var os = __require("os");
@@ -108,7 +108,7 @@ var require_main = __commonJS({
       if (!result.parsed) {
         throw new Error(`MISSING_DATA: Cannot parse ${vaultPath} for an unknown reason`);
       }
-      const keys = _dotenvKey().split(",");
+      const keys = _dotenvKey(options).split(",");
       const length = keys.length;
       let decrypted;
       for (let i = 0; i < length; i++) {
@@ -134,7 +134,10 @@ var require_main = __commonJS({
     function _debug(message) {
       console.log(`[dotenv@${version}][DEBUG] ${message}`);
     }
-    function _dotenvKey() {
+    function _dotenvKey(options) {
+      if (options && options.DOTENV_KEY && options.DOTENV_KEY.length > 0) {
+        return options.DOTENV_KEY;
+      }
       if (process.env.DOTENV_KEY && process.env.DOTENV_KEY.length > 0) {
         return process.env.DOTENV_KEY;
       }
@@ -178,7 +181,11 @@ var require_main = __commonJS({
     function _configVault(options) {
       _log("Loading env from encrypted .env.vault");
       const parsed = DotenvModule._parseVault(options);
-      DotenvModule.populate(process.env, parsed, options);
+      let processEnv = process.env;
+      if (options && options.processEnv != null) {
+        processEnv = options.processEnv;
+      }
+      DotenvModule.populate(processEnv, parsed, options);
       return { parsed };
     }
     function configDotenv(options) {
@@ -195,7 +202,11 @@ var require_main = __commonJS({
       }
       try {
         const parsed = DotenvModule.parse(fs.readFileSync(dotenvPath, { encoding }));
-        DotenvModule.populate(process.env, parsed, options);
+        let processEnv = process.env;
+        if (options && options.processEnv != null) {
+          processEnv = options.processEnv;
+        }
+        DotenvModule.populate(processEnv, parsed, options);
         return { parsed };
       } catch (e) {
         if (debug) {
@@ -206,7 +217,7 @@ var require_main = __commonJS({
     }
     function config(options) {
       const vaultPath = _vaultPath(options);
-      if (_dotenvKey().length === 0) {
+      if (_dotenvKey(options).length === 0) {
         return DotenvModule.configDotenv(options);
       }
       if (!fs.existsSync(vaultPath)) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/redirect",
-  "version": "19.38.2",
+  "version": "19.38.3-alpha.78+5c9892bf1",
   "description": "Uniform redirect client",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,12 +32,12 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/context": "19.38.2",
+    "@uniformdev/context": "19.38.3-alpha.78+5c9892bf1",
     "p-limit": "^3.1.0",
     "rfdc": "^1.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "b97fd17fd44e0f5bd3806e942b516cb2bd218096"
+  "gitHead": "5c9892bf101584d351d06b65e1658a1237594cfb"
 }