@uniformdev/redirect 19.36.1-alpha.7 → 19.37.1-alpha.4

package/dist/index.d.mts

@@ -3,9 +3,8 @@ import { ClientOptions, ApiClient } from '@uniformdev/context/api';
 interface pathTrieReturn<T> {
     data: T;
     variables: {
-        key: string;
-        value: string;
-    }[];
+        [variable: string]: string;
+    };
 }
 declare class PathTrie<T> {
     constructor(initialData?: PathTrieData<T>);
@@ -77,7 +76,6 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
             sourceMustMatchDomain?: boolean | undefined;
             targetPreserveIncomingProtocol?: boolean | undefined;
             targetPreserveIncomingDomain?: boolean | undefined;
-            stopExecutingAfter?: boolean | undefined;
             targetMergeQuerystring?: boolean | undefined;
             labelAsSystem?: boolean | undefined;
         };
@@ -97,8 +95,8 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
     upsertRedirect: (redirect: RedirectUpsertRequest['redirect']) => Promise<string>;
     deleteRedirect: (id: string) => Promise<string>;
     static processUrlBestMatch: (url: string, trie: PathTrie<DirectionAwareRedirectDefinition>, options?: RedirectOptions) => Promise<RedirectResult | undefined>;
-    processUrlBestMatch: (url: string, options?: RedirectOptions) => Promise<RedirectResult | undefined>;
-    processUrlAllMatches: (url: string, options?: RedirectOptions) => Promise<RedirectResult[]>;
+    processUrlBestMatch: (url: string, options?: RedirectOptions, useTrie?: boolean) => Promise<RedirectResult | undefined>;
+    processUrlAllMatches: (url: string, options?: RedirectOptions, useTrie?: boolean) => Promise<RedirectResult[]>;
     private static assembling;
     private static assemblingPromise;
     private assembleTrie;
@@ -311,8 +309,6 @@ interface components {
             targetPreserveIncomingProtocol?: boolean;
             /** @description Rewritten url should match the domain of the incoming request regardless of what is defined in the redirection target. */
             targetPreserveIncomingDomain?: boolean;
-            /** @description Stop running rules after this redirect rule gets executed. */
-            stopExecutingAfter?: boolean;
             /** @description Merge incoming querystring with the querystring defined on the redirection target, taking the incoming querystring parameter where a merge is not possible. */
             targetMergeQuerystring?: boolean;
             /** @description Label as system generated or user generated. */
@@ -393,7 +389,7 @@ type RedirectDataCache = {
     preload?: boolean;
 };
 type RedirectClientGetRedirect = Pick<RedirectClientGetRequest, 'id' | 'projectMapId' | 'sourceProjectMapNodeId' | 'targetProjectMapNodeId'>;
-type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search'>;
+type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search' | 'sourceUrl'>;
 
 declare class WithMemoryCache extends RedirectClientCache<RedirectClientCacheOptions> {
     private static refresher?;

package/dist/index.d.ts

@@ -3,9 +3,8 @@ import { ClientOptions, ApiClient } from '@uniformdev/context/api';
 interface pathTrieReturn<T> {
     data: T;
     variables: {
-        key: string;
-        value: string;
-    }[];
+        [variable: string]: string;
+    };
 }
 declare class PathTrie<T> {
     constructor(initialData?: PathTrieData<T>);
@@ -77,7 +76,6 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
             sourceMustMatchDomain?: boolean | undefined;
             targetPreserveIncomingProtocol?: boolean | undefined;
             targetPreserveIncomingDomain?: boolean | undefined;
-            stopExecutingAfter?: boolean | undefined;
             targetMergeQuerystring?: boolean | undefined;
             labelAsSystem?: boolean | undefined;
         };
@@ -97,8 +95,8 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
     upsertRedirect: (redirect: RedirectUpsertRequest['redirect']) => Promise<string>;
     deleteRedirect: (id: string) => Promise<string>;
     static processUrlBestMatch: (url: string, trie: PathTrie<DirectionAwareRedirectDefinition>, options?: RedirectOptions) => Promise<RedirectResult | undefined>;
-    processUrlBestMatch: (url: string, options?: RedirectOptions) => Promise<RedirectResult | undefined>;
-    processUrlAllMatches: (url: string, options?: RedirectOptions) => Promise<RedirectResult[]>;
+    processUrlBestMatch: (url: string, options?: RedirectOptions, useTrie?: boolean) => Promise<RedirectResult | undefined>;
+    processUrlAllMatches: (url: string, options?: RedirectOptions, useTrie?: boolean) => Promise<RedirectResult[]>;
     private static assembling;
     private static assemblingPromise;
     private assembleTrie;
@@ -311,8 +309,6 @@ interface components {
             targetPreserveIncomingProtocol?: boolean;
             /** @description Rewritten url should match the domain of the incoming request regardless of what is defined in the redirection target. */
             targetPreserveIncomingDomain?: boolean;
-            /** @description Stop running rules after this redirect rule gets executed. */
-            stopExecutingAfter?: boolean;
             /** @description Merge incoming querystring with the querystring defined on the redirection target, taking the incoming querystring parameter where a merge is not possible. */
             targetMergeQuerystring?: boolean;
             /** @description Label as system generated or user generated. */
@@ -393,7 +389,7 @@ type RedirectDataCache = {
     preload?: boolean;
 };
 type RedirectClientGetRedirect = Pick<RedirectClientGetRequest, 'id' | 'projectMapId' | 'sourceProjectMapNodeId' | 'targetProjectMapNodeId'>;
-type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search'>;
+type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit' | 'offset' | 'orderBy' | 'search' | 'sourceUrl'>;
 
 declare class WithMemoryCache extends RedirectClientCache<RedirectClientCacheOptions> {
     private static refresher?;

package/dist/index.esm.js

@@ -166,11 +166,10 @@ var PathTrie = class {
     const splats = [];
     const processed = /* @__PURE__ */ new Set();
     const getVariables = () => {
-      return wildcards.map((wildcard) => {
-        if (wildcard.active)
-          return { key: wildcard.name, value: segments[wildcard.start] };
-        return void 0;
-      }).filter((wildcard) => Boolean(wildcard));
+      return wildcards.filter((wildcard) => Boolean(wildcard) && wildcard.active).reduce((variables, wildcard) => {
+        variables[wildcard.name] = segments[wildcard.start];
+        return variables;
+      }, new Object());
     };
     const getPropsStartingWithColon = (obj) => {
       const result = [];
@@ -202,9 +201,11 @@ var PathTrie = class {
       const segment = segments[i];
       if (Object.hasOwn(cur, "*")) {
         cur["*"][dataProp].forEach((splat) => {
+          const vars = getVariables();
+          vars[":splat"] = segments.slice(i).join("/");
           splats.push({
             data: splat,
-            variables: [...getVariables(), { key: ":splat", value: segments.slice(i).join("/") }]
+            variables: vars
           });
         });
       }
@@ -319,7 +320,6 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
         sourceMustMatchDomain,
         sourceProjectMapNodeId,
         sourceRetainQuerystring,
-        stopExecutingAfter,
         targetMergeQuerystring,
         targetPreserveIncomingDomain,
         targetPreserveIncomingProtocol,
@@ -339,7 +339,6 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
             sourceMustMatchDomain,
             sourceProjectMapNodeId,
             sourceRetainQuerystring,
-            stopExecutingAfter,
             targetMergeQuerystring,
             targetPreserveIncomingDomain,
             targetPreserveIncomingProtocol,
@@ -359,12 +358,38 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       this.resetRedirectTrieDataCache();
       return result.id;
     };
-    this.processUrlBestMatch = async (url, options) => {
+    this.processUrlBestMatch = async (url, options, useTrie) => {
       var _a;
+      if (!useTrie) {
+        const redirects = await this.getRedirects({ sourceUrl: url });
+        const processedUrl = processUrl(url);
+        const redirect = redirects.redirects[0];
+        return _RedirectClient.processDefinitionToResults(
+          processedUrl,
+          redirect,
+          _RedirectClient.getSourceVariables(processedUrl.path, processUrl(redirect.redirect.sourceUrl).path),
+          options
+        );
+      }
       const trie = await this.getRedirectTrie();
       return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
     };
-    this.processUrlAllMatches = async (url, options) => {
+    this.processUrlAllMatches = async (url, options, useTrie) => {
+      if (!useTrie) {
+        const redirects = await this.getRedirects({ sourceUrl: url });
+        const processedUrl = processUrl(url);
+        return redirects.redirects.filter((redirect) => redirect.redirect).map(
+          (redirect) => _RedirectClient.processDefinitionToResults(
+            processedUrl,
+            redirect,
+            _RedirectClient.getSourceVariables(
+              processedUrl.path,
+              processUrl(redirect.redirect.sourceUrl).path
+            ),
+            options
+          )
+        );
+      }
       const trie = await this.getRedirectTrie();
       return _RedirectClient.processHops(url, trie, false, options);
     };
@@ -385,8 +410,8 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     let results = void 0;
     while (requestCount === 0 || ((_a = results == null ? void 0 : results.redirects) == null ? void 0 : _a.length)) {
       const fetchUri = this.createUrl("/api/v1/redirect", {
-        limit: 50,
-        offset: requestCount * 50,
+        limit: 500,
+        offset: requestCount * 500,
         orderBy,
         projectId
       });
@@ -396,7 +421,7 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
         yield { total: results.total, ...results.redirects[i] };
       }
       requestCount++;
-      if (requestCount * 50 > ((_b = results.total) != null ? _b : 0)) {
+      if (requestCount * 500 > ((_b = results.total) != null ? _b : 0)) {
         break;
       }
     }
@@ -427,17 +452,16 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     return await _RedirectClient.assemblingPromise;
   }
   static processHops(initialUrl, trie, bestMatch, options) {
-    var _a;
     const url = (options == null ? void 0 : options.reverse) ? initialUrl.replace(/\/:/, "/~~") : initialUrl;
     const isCycle = (id, result) => {
-      var _a2;
+      var _a;
       if (!id || !result.lastHop)
         return false;
       const set = /* @__PURE__ */ new Set([id]);
       const cycleStack = [result];
       while (cycleStack.length > 0) {
         const cur = cycleStack.pop();
-        const redirect = (_a2 = cur == null ? void 0 : cur.definition) == null ? void 0 : _a2.redirect;
+        const redirect = (_a = cur == null ? void 0 : cur.definition) == null ? void 0 : _a.redirect;
         if (!(redirect == null ? void 0 : redirect.id))
           continue;
         if (set.has(redirect.id))
@@ -455,11 +479,10 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       const result = stack.pop();
       if (!(result == null ? void 0 : result.url))
         continue;
-      const redirect = (_a = result.definition) == null ? void 0 : _a.redirect;
-      const hop = (redirect == null ? void 0 : redirect.stopExecutingAfter) ? [] : this.processHop(result == null ? void 0 : result.url, trie, bestMatch, options).filter(
+      const hop = this.processHop(result == null ? void 0 : result.url, trie, bestMatch, options).filter(
         (h) => {
-          var _a2, _b;
-          return ((_a2 = h.definition) == null ? void 0 : _a2.redirect.id) && !isCycle((_b = h.definition) == null ? void 0 : _b.redirect.id, result);
+          var _a, _b;
+          return ((_a = h.definition) == null ? void 0 : _a.redirect.id) && !isCycle((_b = h.definition) == null ? void 0 : _b.redirect.id, result);
         }
       );
       if (hop.length === 0) {
@@ -500,8 +523,8 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     return {
       url: finalUrl,
       definition,
-      label: (options == null ? void 0 : options.label) ? variables.reduce((cur, o) => {
-        return cur.replace(o.key, `<em>${o.value}</em>`);
+      label: (options == null ? void 0 : options.label) ? Object.keys(variables).reduce((cur, o) => {
+        return cur.replace(variables[o], `<em>${variables[o]}</em>`);
       }, finalUrl) : void 0
     };
   }
@@ -531,9 +554,12 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     for (const variable in variables) {
       finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
     }
-    const protocol = redirectDefinition.targetPreserveIncomingProtocol ? processedUrl.protocol : processedTarget.protocol;
-    const domain = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.domain : processedTarget.domain;
-    const port = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.port : processedTarget.port;
+    let protocol = redirectDefinition.targetPreserveIncomingProtocol || processedTarget.protocol === "" ? processedUrl.protocol : processedTarget.protocol;
+    const domain = protocol !== "" ? redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.domain : processedTarget.domain : "";
+    if (domain === "" && protocol !== "") {
+      protocol = "";
+    }
+    const port = domain === "" ? "" : redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.port : processedTarget.port;
     const query = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.query, processedTarget.query) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.query : processedTarget.query;
     const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
     return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;

package/dist/index.js

@@ -493,11 +493,10 @@ var PathTrie = class {
     const splats = [];
     const processed = /* @__PURE__ */ new Set();
     const getVariables = () => {
-      return wildcards.map((wildcard) => {
-        if (wildcard.active)
-          return { key: wildcard.name, value: segments[wildcard.start] };
-        return void 0;
-      }).filter((wildcard) => Boolean(wildcard));
+      return wildcards.filter((wildcard) => Boolean(wildcard) && wildcard.active).reduce((variables, wildcard) => {
+        variables[wildcard.name] = segments[wildcard.start];
+        return variables;
+      }, new Object());
     };
     const getPropsStartingWithColon = (obj) => {
       const result = [];
@@ -529,9 +528,11 @@ var PathTrie = class {
       const segment = segments[i];
       if (Object.hasOwn(cur, "*")) {
         cur["*"][dataProp].forEach((splat) => {
+          const vars = getVariables();
+          vars[":splat"] = segments.slice(i).join("/");
           splats.push({
             data: splat,
-            variables: [...getVariables(), { key: ":splat", value: segments.slice(i).join("/") }]
+            variables: vars
           });
         });
       }
@@ -646,7 +647,6 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
         sourceMustMatchDomain,
         sourceProjectMapNodeId,
         sourceRetainQuerystring,
-        stopExecutingAfter,
         targetMergeQuerystring,
         targetPreserveIncomingDomain,
         targetPreserveIncomingProtocol,
@@ -666,7 +666,6 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
             sourceMustMatchDomain,
             sourceProjectMapNodeId,
             sourceRetainQuerystring,
-            stopExecutingAfter,
             targetMergeQuerystring,
             targetPreserveIncomingDomain,
             targetPreserveIncomingProtocol,
@@ -686,12 +685,38 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
       this.resetRedirectTrieDataCache();
       return result.id;
     };
-    this.processUrlBestMatch = async (url, options) => {
+    this.processUrlBestMatch = async (url, options, useTrie) => {
       var _a;
+      if (!useTrie) {
+        const redirects = await this.getRedirects({ sourceUrl: url });
+        const processedUrl = processUrl(url);
+        const redirect = redirects.redirects[0];
+        return _RedirectClient.processDefinitionToResults(
+          processedUrl,
+          redirect,
+          _RedirectClient.getSourceVariables(processedUrl.path, processUrl(redirect.redirect.sourceUrl).path),
+          options
+        );
+      }
       const trie = await this.getRedirectTrie();
       return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
     };
-    this.processUrlAllMatches = async (url, options) => {
+    this.processUrlAllMatches = async (url, options, useTrie) => {
+      if (!useTrie) {
+        const redirects = await this.getRedirects({ sourceUrl: url });
+        const processedUrl = processUrl(url);
+        return redirects.redirects.filter((redirect) => redirect.redirect).map(
+          (redirect) => _RedirectClient.processDefinitionToResults(
+            processedUrl,
+            redirect,
+            _RedirectClient.getSourceVariables(
+              processedUrl.path,
+              processUrl(redirect.redirect.sourceUrl).path
+            ),
+            options
+          )
+        );
+      }
       const trie = await this.getRedirectTrie();
       return _RedirectClient.processHops(url, trie, false, options);
     };
@@ -712,8 +737,8 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
     let results = void 0;
     while (requestCount === 0 || ((_a = results == null ? void 0 : results.redirects) == null ? void 0 : _a.length)) {
       const fetchUri = this.createUrl("/api/v1/redirect", {
-        limit: 50,
-        offset: requestCount * 50,
+        limit: 500,
+        offset: requestCount * 500,
         orderBy,
         projectId
       });
@@ -723,7 +748,7 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
         yield { total: results.total, ...results.redirects[i] };
       }
       requestCount++;
-      if (requestCount * 50 > ((_b = results.total) != null ? _b : 0)) {
+      if (requestCount * 500 > ((_b = results.total) != null ? _b : 0)) {
         break;
       }
     }
@@ -754,17 +779,16 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
     return await _RedirectClient.assemblingPromise;
   }
   static processHops(initialUrl, trie, bestMatch, options) {
-    var _a;
     const url = (options == null ? void 0 : options.reverse) ? initialUrl.replace(/\/:/, "/~~") : initialUrl;
     const isCycle = (id, result) => {
-      var _a2;
+      var _a;
       if (!id || !result.lastHop)
         return false;
       const set = /* @__PURE__ */ new Set([id]);
       const cycleStack = [result];
       while (cycleStack.length > 0) {
         const cur = cycleStack.pop();
-        const redirect = (_a2 = cur == null ? void 0 : cur.definition) == null ? void 0 : _a2.redirect;
+        const redirect = (_a = cur == null ? void 0 : cur.definition) == null ? void 0 : _a.redirect;
         if (!(redirect == null ? void 0 : redirect.id))
           continue;
         if (set.has(redirect.id))
@@ -782,11 +806,10 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
       const result = stack.pop();
       if (!(result == null ? void 0 : result.url))
         continue;
-      const redirect = (_a = result.definition) == null ? void 0 : _a.redirect;
-      const hop = (redirect == null ? void 0 : redirect.stopExecutingAfter) ? [] : this.processHop(result == null ? void 0 : result.url, trie, bestMatch, options).filter(
+      const hop = this.processHop(result == null ? void 0 : result.url, trie, bestMatch, options).filter(
         (h) => {
-          var _a2, _b;
-          return ((_a2 = h.definition) == null ? void 0 : _a2.redirect.id) && !isCycle((_b = h.definition) == null ? void 0 : _b.redirect.id, result);
+          var _a, _b;
+          return ((_a = h.definition) == null ? void 0 : _a.redirect.id) && !isCycle((_b = h.definition) == null ? void 0 : _b.redirect.id, result);
         }
       );
       if (hop.length === 0) {
@@ -827,8 +850,8 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
     return {
       url: finalUrl,
       definition,
-      label: (options == null ? void 0 : options.label) ? variables.reduce((cur, o) => {
-        return cur.replace(o.key, `<em>${o.value}</em>`);
+      label: (options == null ? void 0 : options.label) ? Object.keys(variables).reduce((cur, o) => {
+        return cur.replace(variables[o], `<em>${variables[o]}</em>`);
       }, finalUrl) : void 0
     };
   }
@@ -858,9 +881,12 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
     for (const variable in variables) {
       finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
     }
-    const protocol = redirectDefinition.targetPreserveIncomingProtocol ? processedUrl.protocol : processedTarget.protocol;
-    const domain = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.domain : processedTarget.domain;
-    const port = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.port : processedTarget.port;
+    let protocol = redirectDefinition.targetPreserveIncomingProtocol || processedTarget.protocol === "" ? processedUrl.protocol : processedTarget.protocol;
+    const domain = protocol !== "" ? redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.domain : processedTarget.domain : "";
+    if (domain === "" && protocol !== "") {
+      protocol = "";
+    }
+    const port = domain === "" ? "" : redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.port : processedTarget.port;
     const query = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.query, processedTarget.query) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.query : processedTarget.query;
     const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
     return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;

package/dist/index.mjs

@@ -166,11 +166,10 @@ var PathTrie = class {
     const splats = [];
     const processed = /* @__PURE__ */ new Set();
     const getVariables = () => {
-      return wildcards.map((wildcard) => {
-        if (wildcard.active)
-          return { key: wildcard.name, value: segments[wildcard.start] };
-        return void 0;
-      }).filter((wildcard) => Boolean(wildcard));
+      return wildcards.filter((wildcard) => Boolean(wildcard) && wildcard.active).reduce((variables, wildcard) => {
+        variables[wildcard.name] = segments[wildcard.start];
+        return variables;
+      }, new Object());
     };
     const getPropsStartingWithColon = (obj) => {
       const result = [];
@@ -202,9 +201,11 @@ var PathTrie = class {
       const segment = segments[i];
       if (Object.hasOwn(cur, "*")) {
         cur["*"][dataProp].forEach((splat) => {
+          const vars = getVariables();
+          vars[":splat"] = segments.slice(i).join("/");
           splats.push({
             data: splat,
-            variables: [...getVariables(), { key: ":splat", value: segments.slice(i).join("/") }]
+            variables: vars
           });
         });
       }
@@ -319,7 +320,6 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
         sourceMustMatchDomain,
         sourceProjectMapNodeId,
         sourceRetainQuerystring,
-        stopExecutingAfter,
         targetMergeQuerystring,
         targetPreserveIncomingDomain,
         targetPreserveIncomingProtocol,
@@ -339,7 +339,6 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
             sourceMustMatchDomain,
             sourceProjectMapNodeId,
             sourceRetainQuerystring,
-            stopExecutingAfter,
             targetMergeQuerystring,
             targetPreserveIncomingDomain,
             targetPreserveIncomingProtocol,
@@ -359,12 +358,38 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       this.resetRedirectTrieDataCache();
       return result.id;
     };
-    this.processUrlBestMatch = async (url, options) => {
+    this.processUrlBestMatch = async (url, options, useTrie) => {
       var _a;
+      if (!useTrie) {
+        const redirects = await this.getRedirects({ sourceUrl: url });
+        const processedUrl = processUrl(url);
+        const redirect = redirects.redirects[0];
+        return _RedirectClient.processDefinitionToResults(
+          processedUrl,
+          redirect,
+          _RedirectClient.getSourceVariables(processedUrl.path, processUrl(redirect.redirect.sourceUrl).path),
+          options
+        );
+      }
       const trie = await this.getRedirectTrie();
       return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
     };
-    this.processUrlAllMatches = async (url, options) => {
+    this.processUrlAllMatches = async (url, options, useTrie) => {
+      if (!useTrie) {
+        const redirects = await this.getRedirects({ sourceUrl: url });
+        const processedUrl = processUrl(url);
+        return redirects.redirects.filter((redirect) => redirect.redirect).map(
+          (redirect) => _RedirectClient.processDefinitionToResults(
+            processedUrl,
+            redirect,
+            _RedirectClient.getSourceVariables(
+              processedUrl.path,
+              processUrl(redirect.redirect.sourceUrl).path
+            ),
+            options
+          )
+        );
+      }
       const trie = await this.getRedirectTrie();
       return _RedirectClient.processHops(url, trie, false, options);
     };
@@ -385,8 +410,8 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     let results = void 0;
     while (requestCount === 0 || ((_a = results == null ? void 0 : results.redirects) == null ? void 0 : _a.length)) {
       const fetchUri = this.createUrl("/api/v1/redirect", {
-        limit: 50,
-        offset: requestCount * 50,
+        limit: 500,
+        offset: requestCount * 500,
         orderBy,
         projectId
       });
@@ -396,7 +421,7 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
         yield { total: results.total, ...results.redirects[i] };
       }
       requestCount++;
-      if (requestCount * 50 > ((_b = results.total) != null ? _b : 0)) {
+      if (requestCount * 500 > ((_b = results.total) != null ? _b : 0)) {
         break;
       }
     }
@@ -427,17 +452,16 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     return await _RedirectClient.assemblingPromise;
   }
   static processHops(initialUrl, trie, bestMatch, options) {
-    var _a;
     const url = (options == null ? void 0 : options.reverse) ? initialUrl.replace(/\/:/, "/~~") : initialUrl;
     const isCycle = (id, result) => {
-      var _a2;
+      var _a;
       if (!id || !result.lastHop)
         return false;
       const set = /* @__PURE__ */ new Set([id]);
       const cycleStack = [result];
       while (cycleStack.length > 0) {
         const cur = cycleStack.pop();
-        const redirect = (_a2 = cur == null ? void 0 : cur.definition) == null ? void 0 : _a2.redirect;
+        const redirect = (_a = cur == null ? void 0 : cur.definition) == null ? void 0 : _a.redirect;
         if (!(redirect == null ? void 0 : redirect.id))
           continue;
         if (set.has(redirect.id))
@@ -455,11 +479,10 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       const result = stack.pop();
       if (!(result == null ? void 0 : result.url))
         continue;
-      const redirect = (_a = result.definition) == null ? void 0 : _a.redirect;
-      const hop = (redirect == null ? void 0 : redirect.stopExecutingAfter) ? [] : this.processHop(result == null ? void 0 : result.url, trie, bestMatch, options).filter(
+      const hop = this.processHop(result == null ? void 0 : result.url, trie, bestMatch, options).filter(
         (h) => {
-          var _a2, _b;
-          return ((_a2 = h.definition) == null ? void 0 : _a2.redirect.id) && !isCycle((_b = h.definition) == null ? void 0 : _b.redirect.id, result);
+          var _a, _b;
+          return ((_a = h.definition) == null ? void 0 : _a.redirect.id) && !isCycle((_b = h.definition) == null ? void 0 : _b.redirect.id, result);
         }
       );
       if (hop.length === 0) {
@@ -500,8 +523,8 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     return {
       url: finalUrl,
       definition,
-      label: (options == null ? void 0 : options.label) ? variables.reduce((cur, o) => {
-        return cur.replace(o.key, `<em>${o.value}</em>`);
+      label: (options == null ? void 0 : options.label) ? Object.keys(variables).reduce((cur, o) => {
+        return cur.replace(variables[o], `<em>${variables[o]}</em>`);
       }, finalUrl) : void 0
     };
   }
@@ -531,9 +554,12 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     for (const variable in variables) {
       finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
     }
-    const protocol = redirectDefinition.targetPreserveIncomingProtocol ? processedUrl.protocol : processedTarget.protocol;
-    const domain = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.domain : processedTarget.domain;
-    const port = redirectDefinition.targetPreserveIncomingDomain ? processedUrl.port : processedTarget.port;
+    let protocol = redirectDefinition.targetPreserveIncomingProtocol || processedTarget.protocol === "" ? processedUrl.protocol : processedTarget.protocol;
+    const domain = protocol !== "" ? redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.domain : processedTarget.domain : "";
+    if (domain === "" && protocol !== "") {
+      protocol = "";
+    }
+    const port = domain === "" ? "" : redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.port : processedTarget.port;
     const query = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.query, processedTarget.query) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.query : processedTarget.query;
     const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? this.mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
     return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/redirect",
-  "version": "19.36.1-alpha.7+859ce3f29",
+  "version": "19.37.1-alpha.4+d2fd8a8f3",
   "description": "Uniform redirect client",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,12 +32,12 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/context": "19.36.1-alpha.7+859ce3f29",
+    "@uniformdev/context": "19.37.1-alpha.4+d2fd8a8f3",
     "p-limit": "^3.1.0",
     "rfdc": "^1.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "859ce3f295642c78d0308620f988a51ce933bd64"
+  "gitHead": "d2fd8a8f3cd9348ecdd87bdd821e1ab89a7b8054"
 }