@uniformdev/redirect 19.79.1-alpha.11 → 19.79.1-alpha.13

package/dist/index.d.mts

@@ -452,4 +452,4 @@ type ProcessedUrl = {
  */
 declare function processUrl(url: string): ProcessedUrl;
 
-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, getSourceVariables, getTargetVariableExpandedUrl, mergeQueryStrings, pathTrieReturn, processUrl };
+export { type DirectionAwareRedirectDefinition, ExtractWildcards, PathTrie, PathTrieData, type ProcessedUrl, RedirectClient, type RedirectClientGetRedirect, type RedirectClientGetRedirects, type RedirectClientGetRequest, type RedirectClientOptions, type RedirectDataCache, type RedirectDefinition, type RedirectDefinitions, type RedirectDeleteRequest, type RedirectDeleteResponse, RedirectFileConverter, type RedirectFileConverterParams, type RedirectGetRequest, type RedirectGetResponse, type RedirectOptions, type RedirectResult, type RedirectUpsertRequest, type RedirectUpsertResponse, type SourceAndTarget, type SourceTargetAndWildcards, UncachedRedirectClient, type Wildcard, WithMemoryCache, getSourceVariables, getTargetVariableExpandedUrl, mergeQueryStrings, type pathTrieReturn, processUrl };

package/dist/index.d.ts

@@ -452,4 +452,4 @@ type ProcessedUrl = {
  */
 declare function processUrl(url: string): ProcessedUrl;
 
-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, getSourceVariables, getTargetVariableExpandedUrl, mergeQueryStrings, pathTrieReturn, processUrl };
+export { type DirectionAwareRedirectDefinition, ExtractWildcards, PathTrie, PathTrieData, type ProcessedUrl, RedirectClient, type RedirectClientGetRedirect, type RedirectClientGetRedirects, type RedirectClientGetRequest, type RedirectClientOptions, type RedirectDataCache, type RedirectDefinition, type RedirectDefinitions, type RedirectDeleteRequest, type RedirectDeleteResponse, RedirectFileConverter, type RedirectFileConverterParams, type RedirectGetRequest, type RedirectGetResponse, type RedirectOptions, type RedirectResult, type RedirectUpsertRequest, type RedirectUpsertResponse, type SourceAndTarget, type SourceTargetAndWildcards, UncachedRedirectClient, type Wildcard, WithMemoryCache, getSourceVariables, getTargetVariableExpandedUrl, mergeQueryStrings, type pathTrieReturn, processUrl };

package/dist/index.esm.js

@@ -260,15 +260,21 @@ import { ApiClient } from "@uniformdev/context/api";
 // src/util/url.ts
 function processUrl(url) {
   var _a, _b, _c, _d, _e, _f;
-  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
+  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#?]*|)(#.*|)$/);
+  const protocol = (_a = matches == null ? void 0 : matches[1]) != null ? _a : "";
+  const domain = (_b = matches == null ? void 0 : matches[3]) != null ? _b : "";
+  const port = (_c = matches == null ? void 0 : matches[4]) != null ? _c : "";
+  const path = (_d = matches == null ? void 0 : matches[5].replace(/\/+$/g, "")) != null ? _d : "";
+  const query = (_e = matches == null ? void 0 : matches[6]) != null ? _e : "";
+  const fragment = (_f = matches == null ? void 0 : matches[7]) != null ? _f : "";
   return {
-    url,
-    protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
-    domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
-    port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
-    path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
-    query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
-    fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+    url: `${protocol}${domain}${port}${path}${query}${fragment}`,
+    protocol,
+    domain,
+    port,
+    path,
+    query,
+    fragment
   };
 }
 
@@ -328,6 +334,7 @@ function mergeQueryStrings(qs1, qs2) {
 var _RedirectClient = class _RedirectClient extends ApiClient {
   constructor(options) {
     super(options);
+    // Get a single redirect by ID or project map id
     this.getRedirect = async (options) => {
       var _a;
       const { projectId } = this.options;
@@ -335,12 +342,14 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       const results = await this.apiClient(fetchUri);
       return (_a = results.redirects) == null ? void 0 : _a[0];
     };
+    // Get redirects by list of IDs, source URL, target URL, or search
     this.getRedirects = async (options) => {
       const { projectId } = this.options;
       const fetchUri = this.createUrl("/api/v1/redirect", { ...options, projectId });
       const results = await this.apiClient(fetchUri);
       return results;
     };
+    // Assemble a trie powered search structure, used to have instant resolution of redirects.  Note, result set may be large.
     this.getRedirectTrie = async (options) => {
       var _a, _b;
       const { projectId } = this.options;
@@ -432,6 +441,8 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       const trie = await this.getRedirectTrie();
       return (_b = _RedirectClient.processHops(sanitizedUrl, trie, true, options)) == null ? void 0 : _b[0];
     };
+    // Caculate redirect matches based on an incoming URL with an option to use a trie storage structure to streamline future
+    // redirect resolutions.  Note this may cause a large in memory load for large collections of redirect, off by default.
     this.processUrlAllMatches = async (url, options, useTrie) => {
       const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
@@ -464,6 +475,7 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       }
     }
   }
+  // Get all redirects in Uniform 500 at a time.
   async *getAllRedirects(orderBy = "updated_at desc") {
     var _a, _b;
     const { projectId } = this.options;
@@ -512,6 +524,8 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     }
     return await _RedirectClient.assemblingPromise;
   }
+  // Find all redirects involved for the current URL, this is for the case where a redirect definition leads to
+  // another redirect.  This also involves cycle busting error handling
   static processHops(initialUrl, trie, bestMatch, options) {
     const url = (options == null ? void 0 : options.reverse) ? initialUrl.replace(/\/:/, "/~~") : initialUrl;
     const isCycle = (id, result) => {

package/dist/index.js

@@ -306,15 +306,21 @@ var import_api = require("@uniformdev/context/api");
 // src/util/url.ts
 function processUrl(url) {
   var _a, _b, _c, _d, _e, _f;
-  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
+  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#?]*|)(#.*|)$/);
+  const protocol = (_a = matches == null ? void 0 : matches[1]) != null ? _a : "";
+  const domain = (_b = matches == null ? void 0 : matches[3]) != null ? _b : "";
+  const port = (_c = matches == null ? void 0 : matches[4]) != null ? _c : "";
+  const path = (_d = matches == null ? void 0 : matches[5].replace(/\/+$/g, "")) != null ? _d : "";
+  const query = (_e = matches == null ? void 0 : matches[6]) != null ? _e : "";
+  const fragment = (_f = matches == null ? void 0 : matches[7]) != null ? _f : "";
   return {
-    url,
-    protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
-    domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
-    port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
-    path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
-    query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
-    fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+    url: `${protocol}${domain}${port}${path}${query}${fragment}`,
+    protocol,
+    domain,
+    port,
+    path,
+    query,
+    fragment
   };
 }
 
@@ -374,6 +380,7 @@ function mergeQueryStrings(qs1, qs2) {
 var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
   constructor(options) {
     super(options);
+    // Get a single redirect by ID or project map id
     this.getRedirect = async (options) => {
       var _a;
       const { projectId } = this.options;
@@ -381,12 +388,14 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
       const results = await this.apiClient(fetchUri);
       return (_a = results.redirects) == null ? void 0 : _a[0];
     };
+    // Get redirects by list of IDs, source URL, target URL, or search
     this.getRedirects = async (options) => {
       const { projectId } = this.options;
       const fetchUri = this.createUrl("/api/v1/redirect", { ...options, projectId });
       const results = await this.apiClient(fetchUri);
       return results;
     };
+    // Assemble a trie powered search structure, used to have instant resolution of redirects.  Note, result set may be large.
     this.getRedirectTrie = async (options) => {
       var _a, _b;
       const { projectId } = this.options;
@@ -478,6 +487,8 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
       const trie = await this.getRedirectTrie();
       return (_b = _RedirectClient.processHops(sanitizedUrl, trie, true, options)) == null ? void 0 : _b[0];
     };
+    // Caculate redirect matches based on an incoming URL with an option to use a trie storage structure to streamline future
+    // redirect resolutions.  Note this may cause a large in memory load for large collections of redirect, off by default.
     this.processUrlAllMatches = async (url, options, useTrie) => {
       const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
@@ -510,6 +521,7 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
       }
     }
   }
+  // Get all redirects in Uniform 500 at a time.
   async *getAllRedirects(orderBy = "updated_at desc") {
     var _a, _b;
     const { projectId } = this.options;
@@ -558,6 +570,8 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
     }
     return await _RedirectClient.assemblingPromise;
   }
+  // Find all redirects involved for the current URL, this is for the case where a redirect definition leads to
+  // another redirect.  This also involves cycle busting error handling
   static processHops(initialUrl, trie, bestMatch, options) {
     const url = (options == null ? void 0 : options.reverse) ? initialUrl.replace(/\/:/, "/~~") : initialUrl;
     const isCycle = (id, result) => {

package/dist/index.mjs

@@ -260,15 +260,21 @@ import { ApiClient } from "@uniformdev/context/api";
 // src/util/url.ts
 function processUrl(url) {
   var _a, _b, _c, _d, _e, _f;
-  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#]*|)(#.*|)$/);
+  const matches = url.match(/^(https?:\/\/)?(([^:/?#]*)(?:(:[0-9]+))?)?([/]{0,1}[^?#]*)(\?[^#?]*|)(#.*|)$/);
+  const protocol = (_a = matches == null ? void 0 : matches[1]) != null ? _a : "";
+  const domain = (_b = matches == null ? void 0 : matches[3]) != null ? _b : "";
+  const port = (_c = matches == null ? void 0 : matches[4]) != null ? _c : "";
+  const path = (_d = matches == null ? void 0 : matches[5].replace(/\/+$/g, "")) != null ? _d : "";
+  const query = (_e = matches == null ? void 0 : matches[6]) != null ? _e : "";
+  const fragment = (_f = matches == null ? void 0 : matches[7]) != null ? _f : "";
   return {
-    url,
-    protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
-    domain: (_b = matches == null ? void 0 : matches[3]) != null ? _b : "",
-    port: (_c = matches == null ? void 0 : matches[4]) != null ? _c : "",
-    path: (_d = matches == null ? void 0 : matches[5]) != null ? _d : "",
-    query: (_e = matches == null ? void 0 : matches[6]) != null ? _e : "",
-    fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+    url: `${protocol}${domain}${port}${path}${query}${fragment}`,
+    protocol,
+    domain,
+    port,
+    path,
+    query,
+    fragment
   };
 }
 
@@ -328,6 +334,7 @@ function mergeQueryStrings(qs1, qs2) {
 var _RedirectClient = class _RedirectClient extends ApiClient {
   constructor(options) {
     super(options);
+    // Get a single redirect by ID or project map id
     this.getRedirect = async (options) => {
       var _a;
       const { projectId } = this.options;
@@ -335,12 +342,14 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       const results = await this.apiClient(fetchUri);
       return (_a = results.redirects) == null ? void 0 : _a[0];
     };
+    // Get redirects by list of IDs, source URL, target URL, or search
     this.getRedirects = async (options) => {
       const { projectId } = this.options;
       const fetchUri = this.createUrl("/api/v1/redirect", { ...options, projectId });
       const results = await this.apiClient(fetchUri);
       return results;
     };
+    // Assemble a trie powered search structure, used to have instant resolution of redirects.  Note, result set may be large.
     this.getRedirectTrie = async (options) => {
       var _a, _b;
       const { projectId } = this.options;
@@ -432,6 +441,8 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       const trie = await this.getRedirectTrie();
       return (_b = _RedirectClient.processHops(sanitizedUrl, trie, true, options)) == null ? void 0 : _b[0];
     };
+    // Caculate redirect matches based on an incoming URL with an option to use a trie storage structure to streamline future
+    // redirect resolutions.  Note this may cause a large in memory load for large collections of redirect, off by default.
     this.processUrlAllMatches = async (url, options, useTrie) => {
       const sanitizedUrl = url.endsWith("/") ? url.replace(/\/+$/, "") : url;
       if (!useTrie) {
@@ -464,6 +475,7 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
       }
     }
   }
+  // Get all redirects in Uniform 500 at a time.
   async *getAllRedirects(orderBy = "updated_at desc") {
     var _a, _b;
     const { projectId } = this.options;
@@ -512,6 +524,8 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
     }
     return await _RedirectClient.assemblingPromise;
   }
+  // Find all redirects involved for the current URL, this is for the case where a redirect definition leads to
+  // another redirect.  This also involves cycle busting error handling
   static processHops(initialUrl, trie, bestMatch, options) {
     const url = (options == null ? void 0 : options.reverse) ? initialUrl.replace(/\/:/, "/~~") : initialUrl;
     const isCycle = (id, result) => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/redirect",
-  "version": "19.79.1-alpha.11+4547ef846",
+  "version": "19.79.1-alpha.13+608a273da",
   "description": "Uniform redirect client",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -33,12 +33,12 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/context": "19.79.1-alpha.11+4547ef846",
+    "@uniformdev/context": "19.79.1-alpha.13+608a273da",
     "p-limit": "^3.1.0",
     "rfdc": "^1.3.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "4547ef8469f21f7f2341bcd87203372c4646bc08"
+  "gitHead": "608a273da87aa432f17b2c8ce15d747dadab0cd1"
 }