@ada-support/embed2 1.14.22 → 1.14.24

package/dist/npm-entry/common/helpers/get-intro-for-url.d.ts

@@ -1,3 +1,4 @@
 export declare function getProcessedPath(path: string): string;
 export declare function getPathSearchRegex(path: string): RegExp;
+export declare const stripTrailingSlash: (value: string) => string;
 export declare function doesUrlMatchPath(url: string, path: string): boolean;

package/dist/npm-entry/index.js

@@ -16119,7 +16119,7 @@ const client = new BrowserClient({
     return event;
   },
   environment: "production",
-  release: "1.14.22-53dee13",
+  release: "1.14.24-b964ecf",
   sampleRate: 0.25,
   autoSessionTracking: false,
   // Integrations don't seem to work with Sentry: https://github.com/getsentry/sentry-javascript/issues/2541
@@ -16750,7 +16750,7 @@ function getEmbedURL(_ref) {
   } else {
     host = `http://${handle}.localhost:${ports.localhost.default}`;
   }
-  return `${host}/embed/${frameName}/${"53dee13"}/index.html`;
+  return `${host}/embed/${frameName}/${"b964ecf"}/index.html`;
 }
 function constructQueryString(query) {
   return Object.keys(query).map(key => {
@@ -17586,9 +17586,9 @@ async function log(message, extra, options) {
       service: "embed",
       env: "production",
       embedVersion: 2,
-      version: "1.14.22",
+      version: "1.14.24",
       isNpm: true,
-      commitHash: "53dee13"
+      commitHash: "b964ecf"
     }))
   });
 }
@@ -17597,34 +17597,48 @@ function getProcessedPath(path) {
   const regex = /^http(s)?:\/\/(www.)?/;
   return path.trim().replace(regex, "");
 }
+
+// Only "*" is a wildcard ("match anything"); every other character — including
+// regex metacharacters in a customer URL like "." or "(" — is matched literally,
+// so they are escaped rather than interpreted (or throwing on an unbalanced "("
+// or a trailing "\").
+function escapeLiteralsExpandWildcards(value) {
+  return value.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
+}
 function getPathSearchRegex(path) {
   const params = path.split("?");
   if (params.length > 1) {
-    const escapedParams = encodeURI(params[1]);
-    return new RegExp(`^${params[0]}\\?${escapedParams}$`);
+    // The pre-"?" half needs the same escaping as the wildcard branch below: an
+    // unescaped "|" here is a top-level alternation, which discards the "^…$"
+    // anchoring and silently widens the condition to a prefix wildcard.
+    const escapedPath = escapeLiteralsExpandWildcards(params[0]);
+    return new RegExp(`^${escapedPath}\\?${escapeLiteralsExpandWildcards(params[1])}$`);
   }
 
-  // Only "*" is a wildcard ("match anything"); every other character — including
-  // regex metacharacters in a customer URL like "." or "(" — is matched literally,
-  // so they are escaped rather than interpreted (or throwing on an unbalanced "("
-  // or a trailing "\"). A trailing "/*" is optional: "/help/*" also matches "/help"
-  // with nothing after it.
+  // A trailing "/*" is optional: "/help/*" also matches "/help" with nothing after it.
   const hasTrailingWildcard = path.endsWith("/*");
   const base = hasTrailingWildcard ? path.slice(0, -2) : path;
-  const escaped = base.replace(/[.+?^${}()|[\]\\]/g, "\\$&").replace(/\*/g, ".*");
+  const escaped = escapeLiteralsExpandWildcards(base);
   const newPath = hasTrailingWildcard ? `${escaped}(/.*)?` : escaped;
   return new RegExp(`^${newPath}$`);
 }
+
+// A trailing slash is not significant. docs.ada.cx documents "Exactly Matches" as matching
+// `https://www.example.com/checkout/` for a `https://www.example.com/checkout` condition,
+// and the `ends-with` arm in TriggerConditionEvaluator already tolerates one the same way —
+// so `equals` requiring an exact slash was the odd one out, not the documented behaviour.
+const stripTrailingSlash = value => value.endsWith("/") ? value.slice(0, -1) : value;
 function doesUrlMatchPath(url, path) {
-  const processedUrl = getProcessedPath(url);
-  const processedPath = getProcessedPath(path);
+  // Normalized on BOTH sides, so it does not matter which of the page URL or the authored
+  // condition carries the slash.
+  const processedUrl = stripTrailingSlash(getProcessedPath(url));
+  const processedPath = stripTrailingSlash(getProcessedPath(path));
   const pathRegex = getPathSearchRegex(processedPath);
   const matches = pathRegex.exec(processedUrl);
   return matches !== null;
 }
 ;// ./src/common/helpers/TriggerConditionEvaluator.ts
 
-const stripTrailingSlash = url => url.endsWith("/") ? url.slice(0, -1) : url;
 const evalUrlMatchTriggerCondition = (triggerConditions, url) => {
   /**
    * Behaviour
@@ -20394,7 +20408,7 @@ class ChatFrame extends d {
     log("Chat frame mount", {
       handle,
       chatUrl: this.url,
-      embedVersion: "53dee13".slice(0, 7),
+      embedVersion: "b964ecf".slice(0, 7),
       embedSettings: adaSettings
     });
 
@@ -20482,7 +20496,7 @@ class ChatFrame extends d {
     const hostPageUrlParams = new URL(window.location.href).searchParams;
     const smsToken = hostPageUrlParams.get("adaSMSToken");
     const queryParams = {
-      embedVersion: "53dee13".slice(0, 7),
+      embedVersion: "b964ecf".slice(0, 7),
       greeting,
       language,
       skipGreeting,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ada-support/embed2",
-  "version": "1.14.22",
+  "version": "1.14.24",
   "description": "",
   "main": "dist/npm-entry",
   "typings": "dist/npm-entry/index-npm.d.ts",
@@ -115,4 +115,4 @@
   "publishConfig": {
     "access": "public"
   }
-}
+}