@uniformdev/redirect 19.7.0 → 19.9.2-alpha.3

package/dist/index.d.ts

@@ -83,6 +83,9 @@ declare class RedirectClient extends ApiClient<RedirectClientOptions> {
      * @param options - Different options available to the redirect engine
      */
     private static processDefinitionToResults;
+    static getTargetVariableExpandedUrl(url: string, redirectDefinition: RedirectDefinition['redirect'], isVariable?: (pathSegment: string) => boolean): string;
+    private static mergeQueryStrings;
+    private static getSourceVariables;
     private static processUrl;
 }
 declare class UncachedRedirectClient extends RedirectClient {
@@ -105,6 +108,8 @@ interface paths {
                     id?: string;
                     /** Ids of the redirects to retrieve */
                     ids?: string[];
+                    /** Source url to attempt to find redirects for */
+                    sourceUrl?: string;
                     /** Id of the project map the source or target belongs to. */
                     projectMapId?: string;
                     /** Id of the project map node to find redirects for. */

package/dist/index.esm.js

@@ -405,9 +405,56 @@ var _RedirectClient = class extends ApiClient {
       }, finalUrl) : void 0
     };
   }
+  static getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
+    const processedTarget = this.processUrl(redirectDefinition.targetUrl);
+    const processedSource = this.processUrl(redirectDefinition.sourceUrl);
+    let finalUrlPath = processedTarget.path;
+    const processedUrl = this.processUrl(url);
+    const variables = this.getSourceVariables(processedUrl.path, processedSource.path, isVariable);
+    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 = 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}`;
+  }
+  static mergeQueryStrings(qs1, qs2) {
+    let fragment = false;
+    if (qs1.startsWith("#")) {
+      fragment = true;
+      qs1 = qs1.substring(1);
+    }
+    if (qs2.startsWith("#")) {
+      fragment = true;
+      qs2 = qs2.substring(1);
+    }
+    const params1 = new URLSearchParams(qs1);
+    const params2 = new URLSearchParams(qs2);
+    const merged = new URLSearchParams([...params1, ...params2]).toString();
+    if (merged.length > 0)
+      return (fragment ? "#" : "?") + merged;
+    return "";
+  }
+  static getSourceVariables(path, source, isVariable = (pathSegment) => pathSegment.startsWith(":")) {
+    const variables = {};
+    const pathSegments = path.split("/");
+    const sourceSegments = source.split("/");
+    if (pathSegments.length !== sourceSegments.length) {
+      throw new Error("Path and source have different numbers of path segments, must be the same");
+    }
+    sourceSegments.forEach((sourceSegment, i) => {
+      if (isVariable(sourceSegment)) {
+        variables[sourceSegment] = pathSegments[i];
+      }
+    });
+    return variables;
+  }
   static 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}[^?#]*)(\?[^#]*|)(#.*|)$/);
     return {
       url,
       protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
@@ -415,7 +462,7 @@ var _RedirectClient = class extends ApiClient {
       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 : "",
-      hash: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+      fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
     };
   }
 };

package/dist/index.js

@@ -435,9 +435,56 @@ var _RedirectClient = class extends import_api.ApiClient {
       }, finalUrl) : void 0
     };
   }
+  static getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
+    const processedTarget = this.processUrl(redirectDefinition.targetUrl);
+    const processedSource = this.processUrl(redirectDefinition.sourceUrl);
+    let finalUrlPath = processedTarget.path;
+    const processedUrl = this.processUrl(url);
+    const variables = this.getSourceVariables(processedUrl.path, processedSource.path, isVariable);
+    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 = 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}`;
+  }
+  static mergeQueryStrings(qs1, qs2) {
+    let fragment = false;
+    if (qs1.startsWith("#")) {
+      fragment = true;
+      qs1 = qs1.substring(1);
+    }
+    if (qs2.startsWith("#")) {
+      fragment = true;
+      qs2 = qs2.substring(1);
+    }
+    const params1 = new URLSearchParams(qs1);
+    const params2 = new URLSearchParams(qs2);
+    const merged = new URLSearchParams([...params1, ...params2]).toString();
+    if (merged.length > 0)
+      return (fragment ? "#" : "?") + merged;
+    return "";
+  }
+  static getSourceVariables(path, source, isVariable = (pathSegment) => pathSegment.startsWith(":")) {
+    const variables = {};
+    const pathSegments = path.split("/");
+    const sourceSegments = source.split("/");
+    if (pathSegments.length !== sourceSegments.length) {
+      throw new Error("Path and source have different numbers of path segments, must be the same");
+    }
+    sourceSegments.forEach((sourceSegment, i) => {
+      if (isVariable(sourceSegment)) {
+        variables[sourceSegment] = pathSegments[i];
+      }
+    });
+    return variables;
+  }
   static 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}[^?#]*)(\?[^#]*|)(#.*|)$/);
     return {
       url,
       protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
@@ -445,7 +492,7 @@ var _RedirectClient = class extends import_api.ApiClient {
       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 : "",
-      hash: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+      fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
     };
   }
 };

package/dist/index.mjs

@@ -405,9 +405,56 @@ var _RedirectClient = class extends ApiClient {
       }, finalUrl) : void 0
     };
   }
+  static getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
+    const processedTarget = this.processUrl(redirectDefinition.targetUrl);
+    const processedSource = this.processUrl(redirectDefinition.sourceUrl);
+    let finalUrlPath = processedTarget.path;
+    const processedUrl = this.processUrl(url);
+    const variables = this.getSourceVariables(processedUrl.path, processedSource.path, isVariable);
+    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 = 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}`;
+  }
+  static mergeQueryStrings(qs1, qs2) {
+    let fragment = false;
+    if (qs1.startsWith("#")) {
+      fragment = true;
+      qs1 = qs1.substring(1);
+    }
+    if (qs2.startsWith("#")) {
+      fragment = true;
+      qs2 = qs2.substring(1);
+    }
+    const params1 = new URLSearchParams(qs1);
+    const params2 = new URLSearchParams(qs2);
+    const merged = new URLSearchParams([...params1, ...params2]).toString();
+    if (merged.length > 0)
+      return (fragment ? "#" : "?") + merged;
+    return "";
+  }
+  static getSourceVariables(path, source, isVariable = (pathSegment) => pathSegment.startsWith(":")) {
+    const variables = {};
+    const pathSegments = path.split("/");
+    const sourceSegments = source.split("/");
+    if (pathSegments.length !== sourceSegments.length) {
+      throw new Error("Path and source have different numbers of path segments, must be the same");
+    }
+    sourceSegments.forEach((sourceSegment, i) => {
+      if (isVariable(sourceSegment)) {
+        variables[sourceSegment] = pathSegments[i];
+      }
+    });
+    return variables;
+  }
   static 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}[^?#]*)(\?[^#]*|)(#.*|)$/);
     return {
       url,
       protocol: (_a = matches == null ? void 0 : matches[1]) != null ? _a : "",
@@ -415,7 +462,7 @@ var _RedirectClient = class extends ApiClient {
       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 : "",
-      hash: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
+      fragment: (_f = matches == null ? void 0 : matches[7]) != null ? _f : ""
     };
   }
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/redirect",
-  "version": "19.7.0",
+  "version": "19.9.2-alpha.3+547c8b11d",
   "description": "Uniform redirect client",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,11 +32,11 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/context": "19.7.0",
+    "@uniformdev/context": "19.9.2-alpha.3+547c8b11d",
     "p-limit": "^3.1.0"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "bbcd8d36ccb082d87f1f434a94d6d9402ddb5424"
+  "gitHead": "547c8b11d4655b34250c2fbe3f016c9bc12c3905"
 }