@uniformdev/redirect 20.81.1-alpha.7.sha-91a5b13e0c → 20.81.2-alpha.3.sha-a53553700b

package/dist/index.d.mts

@@ -440,7 +440,22 @@ declare class WithMemoryCache extends RedirectClientCache<RedirectClientCacheOpt
     refresh(): Promise<void[]>;
 }
 
-declare function getTargetVariableExpandedUrl(url: string, redirectDefinition: RedirectDefinition['redirect'], isVariable?: (pathSegment: string) => boolean): string;
+/**
+ * Given a redirect definition and an incoming URL, calculate what the final outgoing URL is to be.
+ * Wildcards in the target are filled from the matching source wildcards; a source splat can be
+ * written in the target either as `*` or as `:splat`.
+ *
+ * `isVariable` overrides which source path segments count as wildcards.  It receives whether the
+ * segment is the last one in the source, which is what distinguishes a trailing splat from a
+ * literal `*`; a callback that ignores it cannot match splats.  The default accepts both.
+ */
+declare function getTargetVariableExpandedUrl(url: string, redirectDefinition: RedirectDefinition['redirect'], isVariable?: (pathSegment: string, isLast: boolean) => boolean): string;
+/**
+ * Extract the variables and their respective values given a source URL and a path.  The source URL
+ * is expected to contain wildcards in it or end with a splat.  A named wildcard takes the single
+ * path segment in its position; a trailing splat takes everything left in the path, which is an
+ * empty string when the path ends at the splat's parent — a splat covers that path too.
+ */
 declare function getSourceVariables(path: string, source: string, isVariable?: (pathSegment: string, isLast: boolean) => boolean): {
     [variable: string]: string;
 };

package/dist/index.d.ts

@@ -440,7 +440,22 @@ declare class WithMemoryCache extends RedirectClientCache<RedirectClientCacheOpt
     refresh(): Promise<void[]>;
 }
 
-declare function getTargetVariableExpandedUrl(url: string, redirectDefinition: RedirectDefinition['redirect'], isVariable?: (pathSegment: string) => boolean): string;
+/**
+ * Given a redirect definition and an incoming URL, calculate what the final outgoing URL is to be.
+ * Wildcards in the target are filled from the matching source wildcards; a source splat can be
+ * written in the target either as `*` or as `:splat`.
+ *
+ * `isVariable` overrides which source path segments count as wildcards.  It receives whether the
+ * segment is the last one in the source, which is what distinguishes a trailing splat from a
+ * literal `*`; a callback that ignores it cannot match splats.  The default accepts both.
+ */
+declare function getTargetVariableExpandedUrl(url: string, redirectDefinition: RedirectDefinition['redirect'], isVariable?: (pathSegment: string, isLast: boolean) => boolean): string;
+/**
+ * Extract the variables and their respective values given a source URL and a path.  The source URL
+ * is expected to contain wildcards in it or end with a splat.  A named wildcard takes the single
+ * path segment in its position; a trailing splat takes everything left in the path, which is an
+ * empty string when the path ends at the splat's parent — a splat covers that path too.
+ */
 declare function getSourceVariables(path: string, source: string, isVariable?: (pathSegment: string, isLast: boolean) => boolean): {
     [variable: string]: string;
 };

package/dist/index.esm.js

@@ -179,6 +179,23 @@ var PathTrie = class {
       }
       return result;
     };
+    const collectSplats = (node, remainderFrom) => {
+      if (!Object.hasOwn(node, "*")) {
+        return;
+      }
+      const splatData = node["*"][dataProp];
+      if (!splatData) {
+        return;
+      }
+      splatData.forEach((splat) => {
+        const vars = getVariables();
+        vars[":splat"] = segments.slice(remainderFrom).join("/");
+        splats.push({
+          data: splat,
+          variables: vars
+        });
+      });
+    };
     const scanWildcards = () => {
       let wildcard = void 0;
       while ((!wildcard || wildcard.active) && wildcards.length) {
@@ -197,16 +214,7 @@ var PathTrie = class {
     };
     for (let i = 0; i < segments.length; i++) {
       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: vars
-          });
-        });
-      }
+      collectSplats(cur, i);
       getPropsStartingWithColon(cur).forEach((wildcard) => {
         if (!processed.has(wildcard + i)) {
           wildcards.push({
@@ -221,6 +229,7 @@ var PathTrie = class {
       if (Object.hasOwn(cur, segment)) {
         cur = cur[segment];
         if (i === segments.length - 1) {
+          collectSplats(cur, i + 1);
           if (cur[dataProp]) {
             cur[dataProp].forEach((d) => ret.push({ data: d, variables: getVariables() }));
           } else {
@@ -274,6 +283,8 @@ function processUrl(url) {
 }
 
 // src/util/process.ts
+var splatSegment = "*";
+var splatVariable = ":splat";
 function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   const processedTarget = processUrl(redirectDefinition.targetUrl);
   const processedSource = processUrl(redirectDefinition.sourceUrl);
@@ -283,6 +294,14 @@ function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   for (const variable in variables) {
     finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
   }
+  const splatValue = variables[splatSegment];
+  if (typeof splatValue !== "undefined") {
+    finalUrlPath = finalUrlPath.replace(splatVariable, splatValue);
+    const targetNamesSplat = processedTarget.path.includes(splatVariable) || processedTarget.path.includes(splatSegment);
+    if (splatValue === "" && targetNamesSplat) {
+      finalUrlPath = finalUrlPath.replace(/\/+$/, "") || "/";
+    }
+  }
   let protocol = redirectDefinition.targetPreserveIncomingProtocol || processedTarget.protocol === "" ? processedUrl.protocol : processedTarget.protocol;
   const domain = protocol !== "" ? redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.domain : processedTarget.domain : "";
   if (domain === "" && protocol !== "") {
@@ -293,12 +312,17 @@ function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
   return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;
 }
-function getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === "*" && isLast) {
+function getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === splatSegment && isLast) {
   const variables = {};
   const pathSegments = path.split("/");
   const sourceSegments = source.split("/");
   sourceSegments.forEach((sourceSegment, i) => {
-    if (pathSegments.length >= i && isVariable(sourceSegment, i === sourceSegments.length - 1)) {
+    const isLast = i === sourceSegments.length - 1;
+    if (pathSegments.length >= i && isVariable(sourceSegment, isLast)) {
+      if (sourceSegment === splatSegment && isLast) {
+        variables[sourceSegment] = pathSegments.slice(i).join("/");
+        return;
+      }
       variables[sourceSegment] = pathSegments[i];
     }
   });
@@ -574,10 +598,7 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
    * @param options - Different options available to the redirect engine
    */
   static processDefinitionToResults(processedUrl, definition, variables, options) {
-    const resultUrl = (options == null ? void 0 : options.reverse) ? definition.redirect.sourceUrl : definition.redirect.targetUrl;
-    const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
-    if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain) return void 0;
     const finalUrl = (options == null ? void 0 : options.reverse) ? "n/a" : getTargetVariableExpandedUrl(processedUrl.url, redirect);
     return {
       url: finalUrl,

package/dist/index.js

@@ -225,6 +225,23 @@ var PathTrie = class {
       }
       return result;
     };
+    const collectSplats = (node, remainderFrom) => {
+      if (!Object.hasOwn(node, "*")) {
+        return;
+      }
+      const splatData = node["*"][dataProp];
+      if (!splatData) {
+        return;
+      }
+      splatData.forEach((splat) => {
+        const vars = getVariables();
+        vars[":splat"] = segments.slice(remainderFrom).join("/");
+        splats.push({
+          data: splat,
+          variables: vars
+        });
+      });
+    };
     const scanWildcards = () => {
       let wildcard = void 0;
       while ((!wildcard || wildcard.active) && wildcards.length) {
@@ -243,16 +260,7 @@ var PathTrie = class {
     };
     for (let i = 0; i < segments.length; i++) {
       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: vars
-          });
-        });
-      }
+      collectSplats(cur, i);
       getPropsStartingWithColon(cur).forEach((wildcard) => {
         if (!processed.has(wildcard + i)) {
           wildcards.push({
@@ -267,6 +275,7 @@ var PathTrie = class {
       if (Object.hasOwn(cur, segment)) {
         cur = cur[segment];
         if (i === segments.length - 1) {
+          collectSplats(cur, i + 1);
           if (cur[dataProp]) {
             cur[dataProp].forEach((d) => ret.push({ data: d, variables: getVariables() }));
           } else {
@@ -320,6 +329,8 @@ function processUrl(url) {
 }
 
 // src/util/process.ts
+var splatSegment = "*";
+var splatVariable = ":splat";
 function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   const processedTarget = processUrl(redirectDefinition.targetUrl);
   const processedSource = processUrl(redirectDefinition.sourceUrl);
@@ -329,6 +340,14 @@ function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   for (const variable in variables) {
     finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
   }
+  const splatValue = variables[splatSegment];
+  if (typeof splatValue !== "undefined") {
+    finalUrlPath = finalUrlPath.replace(splatVariable, splatValue);
+    const targetNamesSplat = processedTarget.path.includes(splatVariable) || processedTarget.path.includes(splatSegment);
+    if (splatValue === "" && targetNamesSplat) {
+      finalUrlPath = finalUrlPath.replace(/\/+$/, "") || "/";
+    }
+  }
   let protocol = redirectDefinition.targetPreserveIncomingProtocol || processedTarget.protocol === "" ? processedUrl.protocol : processedTarget.protocol;
   const domain = protocol !== "" ? redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.domain : processedTarget.domain : "";
   if (domain === "" && protocol !== "") {
@@ -339,12 +358,17 @@ function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
   return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;
 }
-function getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === "*" && isLast) {
+function getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === splatSegment && isLast) {
   const variables = {};
   const pathSegments = path.split("/");
   const sourceSegments = source.split("/");
   sourceSegments.forEach((sourceSegment, i) => {
-    if (pathSegments.length >= i && isVariable(sourceSegment, i === sourceSegments.length - 1)) {
+    const isLast = i === sourceSegments.length - 1;
+    if (pathSegments.length >= i && isVariable(sourceSegment, isLast)) {
+      if (sourceSegment === splatSegment && isLast) {
+        variables[sourceSegment] = pathSegments.slice(i).join("/");
+        return;
+      }
       variables[sourceSegment] = pathSegments[i];
     }
   });
@@ -620,10 +644,7 @@ var _RedirectClient = class _RedirectClient extends import_api.ApiClient {
    * @param options - Different options available to the redirect engine
    */
   static processDefinitionToResults(processedUrl, definition, variables, options) {
-    const resultUrl = (options == null ? void 0 : options.reverse) ? definition.redirect.sourceUrl : definition.redirect.targetUrl;
-    const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
-    if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain) return void 0;
     const finalUrl = (options == null ? void 0 : options.reverse) ? "n/a" : getTargetVariableExpandedUrl(processedUrl.url, redirect);
     return {
       url: finalUrl,

package/dist/index.mjs

@@ -179,6 +179,23 @@ var PathTrie = class {
       }
       return result;
     };
+    const collectSplats = (node, remainderFrom) => {
+      if (!Object.hasOwn(node, "*")) {
+        return;
+      }
+      const splatData = node["*"][dataProp];
+      if (!splatData) {
+        return;
+      }
+      splatData.forEach((splat) => {
+        const vars = getVariables();
+        vars[":splat"] = segments.slice(remainderFrom).join("/");
+        splats.push({
+          data: splat,
+          variables: vars
+        });
+      });
+    };
     const scanWildcards = () => {
       let wildcard = void 0;
       while ((!wildcard || wildcard.active) && wildcards.length) {
@@ -197,16 +214,7 @@ var PathTrie = class {
     };
     for (let i = 0; i < segments.length; i++) {
       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: vars
-          });
-        });
-      }
+      collectSplats(cur, i);
       getPropsStartingWithColon(cur).forEach((wildcard) => {
         if (!processed.has(wildcard + i)) {
           wildcards.push({
@@ -221,6 +229,7 @@ var PathTrie = class {
       if (Object.hasOwn(cur, segment)) {
         cur = cur[segment];
         if (i === segments.length - 1) {
+          collectSplats(cur, i + 1);
           if (cur[dataProp]) {
             cur[dataProp].forEach((d) => ret.push({ data: d, variables: getVariables() }));
           } else {
@@ -274,6 +283,8 @@ function processUrl(url) {
 }
 
 // src/util/process.ts
+var splatSegment = "*";
+var splatVariable = ":splat";
 function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   const processedTarget = processUrl(redirectDefinition.targetUrl);
   const processedSource = processUrl(redirectDefinition.sourceUrl);
@@ -283,6 +294,14 @@ function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   for (const variable in variables) {
     finalUrlPath = finalUrlPath.replace(variable, variables[variable]);
   }
+  const splatValue = variables[splatSegment];
+  if (typeof splatValue !== "undefined") {
+    finalUrlPath = finalUrlPath.replace(splatVariable, splatValue);
+    const targetNamesSplat = processedTarget.path.includes(splatVariable) || processedTarget.path.includes(splatSegment);
+    if (splatValue === "" && targetNamesSplat) {
+      finalUrlPath = finalUrlPath.replace(/\/+$/, "") || "/";
+    }
+  }
   let protocol = redirectDefinition.targetPreserveIncomingProtocol || processedTarget.protocol === "" ? processedUrl.protocol : processedTarget.protocol;
   const domain = protocol !== "" ? redirectDefinition.targetPreserveIncomingDomain || processedTarget.domain === "" ? processedUrl.domain : processedTarget.domain : "";
   if (domain === "" && protocol !== "") {
@@ -293,12 +312,17 @@ function getTargetVariableExpandedUrl(url, redirectDefinition, isVariable) {
   const fragment = redirectDefinition.sourceRetainQuerystring && redirectDefinition.targetMergeQuerystring ? mergeQueryStrings(processedUrl.fragment, processedTarget.fragment) : !redirectDefinition.targetMergeQuerystring && redirectDefinition.sourceRetainQuerystring ? processedUrl.fragment : processedTarget.fragment;
   return `${protocol}${domain}${port}${finalUrlPath}${query}${fragment}`;
 }
-function getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === "*" && isLast) {
+function getSourceVariables(path, source, isVariable = (pathSegment, isLast) => pathSegment.startsWith(":") || pathSegment === splatSegment && isLast) {
   const variables = {};
   const pathSegments = path.split("/");
   const sourceSegments = source.split("/");
   sourceSegments.forEach((sourceSegment, i) => {
-    if (pathSegments.length >= i && isVariable(sourceSegment, i === sourceSegments.length - 1)) {
+    const isLast = i === sourceSegments.length - 1;
+    if (pathSegments.length >= i && isVariable(sourceSegment, isLast)) {
+      if (sourceSegment === splatSegment && isLast) {
+        variables[sourceSegment] = pathSegments.slice(i).join("/");
+        return;
+      }
       variables[sourceSegment] = pathSegments[i];
     }
   });
@@ -574,10 +598,7 @@ var _RedirectClient = class _RedirectClient extends ApiClient {
    * @param options - Different options available to the redirect engine
    */
   static processDefinitionToResults(processedUrl, definition, variables, options) {
-    const resultUrl = (options == null ? void 0 : options.reverse) ? definition.redirect.sourceUrl : definition.redirect.targetUrl;
-    const processedResult = processUrl(resultUrl);
     const redirect = definition == null ? void 0 : definition.redirect;
-    if (redirect.sourceMustMatchDomain && processedUrl.domain !== processedResult.domain) return void 0;
     const finalUrl = (options == null ? void 0 : options.reverse) ? "n/a" : getTargetVariableExpandedUrl(processedUrl.url, redirect);
     return {
       url: finalUrl,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@uniformdev/redirect",
-  "version": "20.81.1-alpha.7.sha-91a5b13e0c",
+  "version": "20.81.2-alpha.3.sha-a53553700b",
   "description": "Uniform redirect client",
   "license": "SEE LICENSE IN LICENSE.txt",
   "main": "./dist/index.js",
@@ -32,12 +32,12 @@
     "/dist"
   ],
   "dependencies": {
-    "@uniformdev/context": "20.81.1-alpha.7.sha-91a5b13e0c",
+    "@uniformdev/context": "20.81.2-alpha.3.sha-a53553700b",
     "p-limit": "^3.1.0",
     "rfdc": "^1.4.1"
   },
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "91a5b13e0c542a6925de81498cec7118847f0311"
+  "gitHead": "a53553700b84000bd3e1fbe15d187bdd85c1b097"
 }