@uniformdev/redirect 19.25.1-alpha.8 → 19.26.0

package/dist/index.d.ts

@@ -45,8 +45,8 @@ type RedirectClientCacheOptions = {
 declare abstract class RedirectClientCache<RedirectClientCacheOptions> {
     options: RedirectClientCacheOptions;
     constructor(options: RedirectClientCacheOptions);
-    abstract get(key: string): Promise<PathTrie<RedirectDefinition>> | undefined;
-    abstract set(key: string, data: Promise<PathTrie<RedirectDefinition>>, refresh: () => Promise<PathTrie<RedirectDefinition>>): void;
+    abstract get(key: string): Promise<PathTrie<DirectionAwareRedirectDefinition>> | undefined;
+    abstract set(key: string, data: Promise<PathTrie<DirectionAwareRedirectDefinition>>, refresh: () => Promise<PathTrie<DirectionAwareRedirectDefinition>>): void;
     abstract refresh(): Promise<void[]>;
 }
 
@@ -90,13 +90,12 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
         total: number | undefined;
     }, void, unknown>;
     getRedirectTrie: (options?: {
-        reverse?: boolean;
         bypassDataCache?: boolean;
-    }) => Promise<PathTrie<RedirectDefinition>>;
+    }) => Promise<PathTrie<DirectionAwareRedirectDefinition>>;
     resetRedirectTrieDataCache: () => Promise<void>;
     upsertRedirect: (redirect: RedirectUpsertRequest['redirect']) => Promise<string>;
     deleteRedirect: (id: string) => Promise<string>;
-    static processUrlBestMatch: (url: string, trie: PathTrie<RedirectDefinition>, options?: RedirectOptions) => Promise<RedirectResult | undefined>;
+    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[]>;
     private assembleTrie;
@@ -372,6 +371,9 @@ type RedirectDefinition = RedirectGetResponse['redirects'][0];
 type RedirectDefinitions = {
     redirects: RedirectDefinition['redirect'][];
 };
+type DirectionAwareRedirectDefinition = RedirectDefinition & {
+    reverse: boolean;
+};
 type RedirectResult = {
     url: string;
     label?: string;
@@ -391,8 +393,8 @@ type RedirectClientGetRedirects = Pick<RedirectClientGetRequest, 'ids' | 'limit'
 declare class WithMemoryCache extends RedirectClientCache<RedirectClientCacheOptions> {
     constructor(options: RedirectClientCacheOptions);
     private static trieCache;
-    get(key: string): Promise<PathTrie<RedirectDefinition>> | undefined;
-    set(key: string, data: Promise<PathTrie<RedirectDefinition>> | undefined, refresh: (() => Promise<PathTrie<RedirectDefinition>>) | undefined): void;
+    get(key: string): Promise<PathTrie<DirectionAwareRedirectDefinition>> | undefined;
+    set(key: string, data: Promise<PathTrie<DirectionAwareRedirectDefinition>> | undefined, refresh: (() => Promise<PathTrie<DirectionAwareRedirectDefinition>>) | undefined): void;
     refresh(): Promise<void[]>;
 }
 
@@ -442,4 +444,4 @@ type ProcessedUrl = {
  */
 declare function processUrl(url: string): ProcessedUrl;
 
-export { ExtractWildcards, PathTrie, PathTrieData, ProcessedUrl, RedirectClient, RedirectClientGetRedirect, RedirectClientGetRedirects, RedirectClientGetRequest, RedirectClientOptions, RedirectDataCache, RedirectDefinition, RedirectDefinitions, RedirectDeleteRequest, RedirectDeleteResponse, RedirectFileConverter, RedirectFileConverterParams, RedirectGetRequest, RedirectGetResponse, RedirectOptions, RedirectResult, RedirectUpsertRequest, RedirectUpsertResponse, SourceAndTarget, SourceTargetAndWildcards, UncachedRedirectClient, Wildcard, WithMemoryCache, pathTrieReturn, processUrl };
+export { DirectionAwareRedirectDefinition, ExtractWildcards, PathTrie, PathTrieData, ProcessedUrl, RedirectClient, RedirectClientGetRedirect, RedirectClientGetRedirects, RedirectClientGetRequest, RedirectClientOptions, RedirectDataCache, RedirectDefinition, RedirectDefinitions, RedirectDeleteRequest, RedirectDeleteResponse, RedirectFileConverter, RedirectFileConverterParams, RedirectGetRequest, RedirectGetResponse, RedirectOptions, RedirectResult, RedirectUpsertRequest, RedirectUpsertResponse, SourceAndTarget, SourceTargetAndWildcards, UncachedRedirectClient, Wildcard, WithMemoryCache, pathTrieReturn, processUrl };

package/dist/index.esm.js

@@ -240,8 +240,8 @@ var _RedirectClient = class extends ApiClient {
         if (result)
           return result;
       }
-      const ret = this.assembleTrie(projectId);
-      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId));
+      const ret = this.assembleTrie();
+      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie());
       return ret;
     };
     this.resetRedirectTrieDataCache = async () => {
@@ -301,11 +301,11 @@ var _RedirectClient = class extends ApiClient {
     };
     this.processUrlBestMatch = async (url, options) => {
       var _a;
-      const trie = await this.getRedirectTrie({ reverse: Boolean(options == null ? void 0 : options.reverse) });
+      const trie = await this.getRedirectTrie();
       return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
     };
     this.processUrlAllMatches = async (url, options) => {
-      const trie = await this.getRedirectTrie({ reverse: Boolean(options == null ? void 0 : options.reverse) });
+      const trie = await this.getRedirectTrie();
       return _RedirectClient.processHops(url, trie, false, options);
     };
     if (options.dataCache && options.dataCache.options.prePopulate) {
@@ -341,13 +341,21 @@ var _RedirectClient = class extends ApiClient {
       }
     }
   }
-  async assembleTrie(projectId, options) {
+  async assembleTrie() {
     const trie = new PathTrie();
     for await (const redirect of this.getAllRedirects()) {
-      const path = processUrl(
-        (options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl
-      ).path;
-      trie.insert(path, redirect);
+      const source = processUrl(redirect.redirect.sourceUrl);
+      const target = processUrl(redirect.redirect.targetUrl);
+      trie.insert(source.path, {
+        redirect: redirect.redirect,
+        metadata: redirect.metadata,
+        reverse: false
+      });
+      trie.insert(target.path, {
+        redirect: redirect.redirect,
+        metadata: redirect.metadata,
+        reverse: true
+      });
     }
     return trie;
   }
@@ -405,7 +413,9 @@ var _RedirectClient = class extends ApiClient {
       definition = trie.find(processedUrl.path, bestMatch);
     }
     if (definition == null ? void 0 : definition.length) {
-      return definition.filter((def) => _RedirectClient.validateRedirect(url, def.data.redirect)).map(
+      return definition.filter(
+        (def) => def.data.reverse === Boolean(options == null ? void 0 : options.reverse) && _RedirectClient.validateRedirect(url, def.data.redirect)
+      ).map(
         (def) => this.processDefinitionToResults(processedUrl, def.data, def.variables, options)
       ).filter((r) => Boolean(r));
     }

package/dist/index.js

@@ -566,8 +566,8 @@ var _RedirectClient = class extends import_api.ApiClient {
         if (result)
           return result;
       }
-      const ret = this.assembleTrie(projectId);
-      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId));
+      const ret = this.assembleTrie();
+      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie());
       return ret;
     };
     this.resetRedirectTrieDataCache = async () => {
@@ -627,11 +627,11 @@ var _RedirectClient = class extends import_api.ApiClient {
     };
     this.processUrlBestMatch = async (url, options) => {
       var _a;
-      const trie = await this.getRedirectTrie({ reverse: Boolean(options == null ? void 0 : options.reverse) });
+      const trie = await this.getRedirectTrie();
       return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
     };
     this.processUrlAllMatches = async (url, options) => {
-      const trie = await this.getRedirectTrie({ reverse: Boolean(options == null ? void 0 : options.reverse) });
+      const trie = await this.getRedirectTrie();
       return _RedirectClient.processHops(url, trie, false, options);
     };
     if (options.dataCache && options.dataCache.options.prePopulate) {
@@ -667,13 +667,21 @@ var _RedirectClient = class extends import_api.ApiClient {
       }
     }
   }
-  async assembleTrie(projectId, options) {
+  async assembleTrie() {
     const trie = new PathTrie();
     for await (const redirect of this.getAllRedirects()) {
-      const path = processUrl(
-        (options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl
-      ).path;
-      trie.insert(path, redirect);
+      const source = processUrl(redirect.redirect.sourceUrl);
+      const target = processUrl(redirect.redirect.targetUrl);
+      trie.insert(source.path, {
+        redirect: redirect.redirect,
+        metadata: redirect.metadata,
+        reverse: false
+      });
+      trie.insert(target.path, {
+        redirect: redirect.redirect,
+        metadata: redirect.metadata,
+        reverse: true
+      });
     }
     return trie;
   }
@@ -731,7 +739,9 @@ var _RedirectClient = class extends import_api.ApiClient {
       definition = trie.find(processedUrl.path, bestMatch);
     }
     if (definition == null ? void 0 : definition.length) {
-      return definition.filter((def) => _RedirectClient.validateRedirect(url, def.data.redirect)).map(
+      return definition.filter(
+        (def) => def.data.reverse === Boolean(options == null ? void 0 : options.reverse) && _RedirectClient.validateRedirect(url, def.data.redirect)
+      ).map(
         (def) => this.processDefinitionToResults(processedUrl, def.data, def.variables, options)
       ).filter((r) => Boolean(r));
     }

package/dist/index.mjs

@@ -240,8 +240,8 @@ var _RedirectClient = class extends ApiClient {
         if (result)
           return result;
       }
-      const ret = this.assembleTrie(projectId);
-      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie(projectId));
+      const ret = this.assembleTrie();
+      (_b = this.options.dataCache) == null ? void 0 : _b.set(key, ret, () => this.assembleTrie());
       return ret;
     };
     this.resetRedirectTrieDataCache = async () => {
@@ -301,11 +301,11 @@ var _RedirectClient = class extends ApiClient {
     };
     this.processUrlBestMatch = async (url, options) => {
       var _a;
-      const trie = await this.getRedirectTrie({ reverse: Boolean(options == null ? void 0 : options.reverse) });
+      const trie = await this.getRedirectTrie();
       return (_a = _RedirectClient.processHops(url, trie, true, options)) == null ? void 0 : _a[0];
     };
     this.processUrlAllMatches = async (url, options) => {
-      const trie = await this.getRedirectTrie({ reverse: Boolean(options == null ? void 0 : options.reverse) });
+      const trie = await this.getRedirectTrie();
       return _RedirectClient.processHops(url, trie, false, options);
     };
     if (options.dataCache && options.dataCache.options.prePopulate) {
@@ -341,13 +341,21 @@ var _RedirectClient = class extends ApiClient {
       }
     }
   }
-  async assembleTrie(projectId, options) {
+  async assembleTrie() {
     const trie = new PathTrie();
     for await (const redirect of this.getAllRedirects()) {
-      const path = processUrl(
-        (options == null ? void 0 : options.reverse) ? redirect.redirect.targetUrl : redirect.redirect.sourceUrl
-      ).path;
-      trie.insert(path, redirect);
+      const source = processUrl(redirect.redirect.sourceUrl);
+      const target = processUrl(redirect.redirect.targetUrl);
+      trie.insert(source.path, {
+        redirect: redirect.redirect,
+        metadata: redirect.metadata,
+        reverse: false
+      });
+      trie.insert(target.path, {
+        redirect: redirect.redirect,
+        metadata: redirect.metadata,
+        reverse: true
+      });
     }
     return trie;
   }
@@ -405,7 +413,9 @@ var _RedirectClient = class extends ApiClient {
       definition = trie.find(processedUrl.path, bestMatch);
     }
     if (definition == null ? void 0 : definition.length) {
-      return definition.filter((def) => _RedirectClient.validateRedirect(url, def.data.redirect)).map(
+      return definition.filter(
+        (def) => def.data.reverse === Boolean(options == null ? void 0 : options.reverse) && _RedirectClient.validateRedirect(url, def.data.redirect)
+      ).map(
         (def) => this.processDefinitionToResults(processedUrl, def.data, def.variables, options)
       ).filter((r) => Boolean(r));
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/redirect",
-  "version": "19.25.1-alpha.8+dfec6f601",
+  "version": "19.26.0",
   "description": "Uniform redirect client",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,12 +32,12 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/context": "19.25.1-alpha.8+dfec6f601",
+    "@uniformdev/context": "19.26.0",
     "p-limit": "^3.1.0",
     "rfdc": "^1.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "dfec6f6014629a7f86d8778af3af37d96b3cf9e6"
+  "gitHead": "860f4f8ae7161b5fb0b7a670bdfd1566fce45bee"
 }