@builder.io/react 5.0.2-8 → 5.0.2-9

package/dist/lib/package.json

@@ -1,6 +1,6 @@
 {
     "name": "@builder.io/react",
-    "version": "5.0.2-7",
+    "version": "5.0.2-8",
     "description": "",
     "keywords": [],
     "main": "dist/builder-react.cjs.js",

package/dist/lib/src/blocks/PersonalizationContainer.js

@@ -20,32 +20,48 @@ var sdk_1 = require("@builder.io/sdk");
 var react_2 = require("react");
 var builder_blocks_component_1 = require("../components/builder-blocks.component");
 var filter_with_custom_targeting_1 = require("../functions/filter-with-custom-targeting");
+var attributeCookieName = 'builder.attributes';
 function PersonalizationContainer(props) {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
-    var _l = (0, react_2.useState)(!props.clientSideOnly), isClient = _l[0], setIsClient = _l[1];
-    var _m = (0, react_2.useState)(0), update = _m[0], setUpdate = _m[1];
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t;
+    var isBeingHydrated = Boolean(sdk_1.Builder.isBrowser && ((_a = window.__hydrated) === null || _a === void 0 ? void 0 : _a[(_b = props.builderBlock) === null || _b === void 0 ? void 0 : _b.id]));
+    var _u = (0, react_2.useState)(isBeingHydrated), isClient = _u[0], setIsClient = _u[1];
+    var _v = (0, react_2.useState)(0), update = _v[0], setUpdate = _v[1];
     (0, react_2.useEffect)(function () {
         setIsClient(true);
-    }, []);
-    (0, react_2.useEffect)(function () {
         var subscriber = sdk_1.builder.userAttributesChanged.subscribe(function () {
+            sdk_1.builder.setCookie(attributeCookieName, JSON.stringify(sdk_1.builder.getUserAttributes()));
             setUpdate(update + 1);
         });
         return function () {
             subscriber.unsubscribe();
         };
     }, []);
+    if (sdk_1.Builder.isServer) {
+        react_1.default.createElement(react_1.default.Fragment, null, (_c = props.variants) === null || _c === void 0 ? void 0 :
+            _c.map(function (variant, index) {
+                var _a, _b;
+                return (react_1.default.createElement("template", { key: index, "data-variant-id": ((_a = props.builderBlock) === null || _a === void 0 ? void 0 : _a.id) + index },
+                    react_1.default.createElement(builder_blocks_component_1.BuilderBlocks, { blocks: variant.blocks, parentElementId: (_b = props.builderBlock) === null || _b === void 0 ? void 0 : _b.id, dataPath: "component.options.variants.".concat(index, ".blocks"), child: true })));
+            }),
+            react_1.default.createElement("script", { id: "variants-script-".concat((_d = props.builderBlock) === null || _d === void 0 ? void 0 : _d.id), dangerouslySetInnerHTML: { __html: getPersonalizationScript(props) } }),
+            react_1.default.createElement("div", __assign({}, props.attributes, { "data-default-variant-id": (_e = props.builderBlock) === null || _e === void 0 ? void 0 : _e.id, className: "builder-personalization-container ".concat(props.attributes.className) }),
+                react_1.default.createElement(builder_blocks_component_1.BuilderBlocks, { blocks: (_f = props.builderBlock) === null || _f === void 0 ? void 0 : _f.children, parentElementId: (_g = props.builderBlock) === null || _g === void 0 ? void 0 : _g.id, dataPath: "this.children", child: true })));
+    }
     var filteredVariants = (props.variants || []).filter(function (variant) {
         return (0, filter_with_custom_targeting_1.filterWithCustomTargeting)(sdk_1.builder.getUserAttributes(), variant.query, variant.startDate, variant.endDate);
     });
-    return (react_1.default.createElement("div", __assign({}, props.attributes, { style: __assign({ opacity: isClient ? 1 : 0, transition: 'opacity 0.2s ease-in-out' }, (_a = props.attributes) === null || _a === void 0 ? void 0 : _a.style), className: "builder-personalization-container ".concat(props.attributes.className, " ").concat(isClient ? '' : 'builder-personalization-container-loading') }), sdk_1.Builder.isEditing &&
-        typeof props.previewingIndex === 'number' &&
-        props.previewingIndex < (((_b = props.variants) === null || _b === void 0 ? void 0 : _b.length) || 0) ? (react_1.default.createElement(builder_blocks_component_1.BuilderBlocks, { blocks: (_d = (_c = props.variants) === null || _c === void 0 ? void 0 : _c[props.previewingIndex]) === null || _d === void 0 ? void 0 : _d.blocks, parentElementId: (_e = props.builderBlock) === null || _e === void 0 ? void 0 : _e.id, dataPath: "component.options.variants.".concat(props.previewingIndex, ".blocks"), child: true })) : // If editing the default or we're on the server and there are no matching variants show the default
-        (sdk_1.Builder.isEditing && typeof props.previewingIndex !== 'number') ||
-            !isClient ||
-            !filteredVariants.length ? (react_1.default.createElement(builder_blocks_component_1.BuilderBlocks, { blocks: (_f = props.builderBlock) === null || _f === void 0 ? void 0 : _f.children, parentElementId: (_g = props.builderBlock) === null || _g === void 0 ? void 0 : _g.id, dataPath: "this.children", child: true })) : (
-        // Show the variant matching the current user attributes
-        react_1.default.createElement(builder_blocks_component_1.BuilderBlocks, { blocks: (_h = filteredVariants[0]) === null || _h === void 0 ? void 0 : _h.blocks, parentElementId: (_j = props.builderBlock) === null || _j === void 0 ? void 0 : _j.id, dataPath: "component.options.variants.".concat((_k = props.variants) === null || _k === void 0 ? void 0 : _k.indexOf(filteredVariants[0]), ".blocks"), child: true }))));
+    return (react_1.default.createElement("div", __assign({}, props.attributes, { style: __assign({ opacity: isClient ? 1 : 0, transition: 'opacity 0.2s ease-in-out' }, (_h = props.attributes) === null || _h === void 0 ? void 0 : _h.style), className: "builder-personalization-container ".concat(props.attributes.className, " ").concat(isClient ? '' : 'builder-personalization-container-loading') }),
+        sdk_1.Builder.isEditing &&
+            typeof props.previewingIndex === 'number' &&
+            props.previewingIndex < (((_j = props.variants) === null || _j === void 0 ? void 0 : _j.length) || 0) ? (react_1.default.createElement(builder_blocks_component_1.BuilderBlocks, { blocks: (_l = (_k = props.variants) === null || _k === void 0 ? void 0 : _k[props.previewingIndex]) === null || _l === void 0 ? void 0 : _l.blocks, parentElementId: (_m = props.builderBlock) === null || _m === void 0 ? void 0 : _m.id, dataPath: "component.options.variants.".concat(props.previewingIndex, ".blocks"), child: true })) : // If editing the default or we're on the server and there are no matching variants show the default
+            (sdk_1.Builder.isEditing && typeof props.previewingIndex !== 'number') ||
+                !isClient ||
+                !filteredVariants.length ? (react_1.default.createElement(builder_blocks_component_1.BuilderBlocks, { blocks: (_o = props.builderBlock) === null || _o === void 0 ? void 0 : _o.children, parentElementId: (_p = props.builderBlock) === null || _p === void 0 ? void 0 : _p.id, dataPath: "this.children", child: true })) : (
+            // Show the variant matching the current user attributes
+            react_1.default.createElement(builder_blocks_component_1.BuilderBlocks, { blocks: (_q = filteredVariants[0]) === null || _q === void 0 ? void 0 : _q.blocks, parentElementId: (_r = props.builderBlock) === null || _r === void 0 ? void 0 : _r.id, dataPath: "component.options.variants.".concat((_s = props.variants) === null || _s === void 0 ? void 0 : _s.indexOf(filteredVariants[0]), ".blocks"), child: true })),
+        react_1.default.createElement("script", { dangerouslySetInnerHTML: {
+                __html: "\n         window.__hydrated = window.__hydrated || {};\n         window.__hydrated['".concat((_t = props.builderBlock) === null || _t === void 0 ? void 0 : _t.id, "'] = true;\n        ").replace(/\s+/g, ' '),
+            } })));
 }
 exports.PersonalizationContainer = PersonalizationContainer;
 sdk_1.Builder.registerComponent(PersonalizationContainer, {
@@ -86,11 +102,10 @@ sdk_1.Builder.registerComponent(PersonalizationContainer, {
                 },
             ],
         },
-        {
-            name: 'clientSideOnly',
-            type: 'boolean',
-            advanced: true,
-        }
     ],
 });
+function getPersonalizationScript(props) {
+    var _a, _b, _c, _d;
+    return "\n      (function() {\n        function getCookie(name) {\n          var nameEQ = name + \"=\";\n          var ca = document.cookie.split(';');\n          for(var i=0;i < ca.length;i++) {\n              var c = ca[i];\n              while (c.charAt(0)==' ') c = c.substring(1,c.length);\n              if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);\n          }\n          return null;\n        }\n          function removeVariants() {\n            variants.forEach(function (template, index) {\n              document.querySelector('template[data-variant-id=\"' + \"".concat((_a = props.builderBlock) === null || _a === void 0 ? void 0 : _a.id, "\" + index + '\"]').remove();\n            });\n            document.getElementById('variants-script-").concat((_b = props.builderBlock) === null || _b === void 0 ? void 0 : _b.id, "').remove();\n          }\n\n        var attributes = JSON.parse(getCookie(\"").concat(attributeCookieName, "\") || \"{}\");\n        var variants = ").concat(JSON.stringify((_c = props.variants) === null || _c === void 0 ? void 0 : _c.map(function (v) { return ({ query: v.query, startDate: v.startDate, endDate: v.endDate }); })), ";\n        var winningVariantIndex = variants.findIndex(function(variant) {\n          return filterWithCustomTargeting(\n            attributes,\n            variant.query,\n            variant.startDate,\n            variant.endDate\n          );\n        });\n        if (winningVariantIndex !== -1) {\n          var winningVariant = document.querySelector('template[data-variant-index=\"' + \"").concat((_d = props.builderBlock) === null || _d === void 0 ? void 0 : _d.id, "\" + winningVariantIndex + '\"]');\n          if (winningVariant) {\n            var parentNode = winningVariant.parentNode;\n            var newParent = parentNode.cloneNode(false);\n            newParent.appendChild(winningVariant.content.firstChild);\n            parentNode.parentNode.replaceChild(newParent, parentNode);\n          }\n        } else if (variants.length > 0) {\n          removeVariants(); \n        }\n        function filterWithCustomTargeting(e,t,n,r){var i={query:t,startDate:n,endDate:r},o=e.date&&new Date(e.date)||new Date;return!(i.startDate&&new Date(i.startDate)>o)&&(!(i.endDate&&new Date(i.endDate)<o)&&(!i.query||!i.query.length||i.query.every((function(t){return objectMatchesQuery(e,t)}))))}function isString(e){return\"string\"==typeof e}function isNumber(e){return\"number\"==typeof e}function objectMatchesQuery(e,t){return function(){var n=t.property,r=t.operator,i=t.value;if(t&&\"urlPath\"===t.property&&t.value&&\"string\"==typeof t.value&&\"/\"!==t.value&&t.value.endsWith(\"/\")&&(i=t.value.slice(0,-1)),!n||!r)return!0;if(Array.isArray(i))return\"isNot\"===r?i.every((function(t){return objectMatchesQuery(e,{property:n,operator:r,value:t})})):!!i.find((function(t){return objectMatchesQuery(e,{property:n,operator:r,value:t})}));var o=e[n];if(Array.isArray(o))return o.includes(i);switch(r){case\"is\":return o===i;case\"isNot\":return o!==i;case\"contains\":return(isString(o)||Array.isArray(o))&&o.includes(String(i));case\"startsWith\":return isString(o)&&o.startsWith(String(i));case\"endsWith\":return isString(o)&&o.endsWith(String(i));case\"greaterThan\":return isNumber(o)&&isNumber(i)&&o>i;case\"lessThan\":return isNumber(o)&&isNumber(i)&&o<i;case\"greaterThanOrEqualTo\":return isNumber(o)&&isNumber(i)&&o>=i;case\"lessThanOrEqualTo\":return isNumber(o)&&isNumber(i)&&o<=i}return!1}()}\n      })();\n    ").replace(/\s+/g, ' ');
+}
 //# sourceMappingURL=PersonalizationContainer.js.map

package/dist/lib/src/blocks/PersonalizationContainer.js.map

@@ -1 +1 @@
-{"version":3,"file":"PersonalizationContainer.js","sourceRoot":"","sources":["../../../../src/blocks/PersonalizationContainer.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"PersonalizationContainer.js","sourceRoot":"","sources":["../../../../src/blocks/PersonalizationContainer.tsx"],"names":[],"mappings":"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"}

package/dist/lib/src/functions/filter-with-custom-targeting.js.map

@@ -1 +1 @@
-{"version":3,"file":"filter-with-custom-targeting.js","sourceRoot":"","sources":["../../../../src/functions/filter-with-custom-targeting.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"filter-with-custom-targeting.js","sourceRoot":"","sources":["../../../../src/functions/filter-with-custom-targeting.ts"],"names":[],"mappings":"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"}

package/dist/types/src/blocks/PersonalizationContainer.d.ts

@@ -14,6 +14,5 @@ export type PersonalizationContainerProps = {
         }
     ];
     attributes: any;
-    clientSideOnly?: boolean;
 };
 export declare function PersonalizationContainer(props: PersonalizationContainerProps): React.JSX.Element;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/react",
-  "version": "5.0.2-8",
+  "version": "5.0.2-9",
   "description": "",
   "keywords": [],
   "main": "dist/builder-react.cjs.js",
@@ -107,5 +107,5 @@
   "installConfig": {
     "hoistingLimits": "workspaces"
   },
-  "stableVersion": "5.0.2-7"
+  "stableVersion": "5.0.2-8"
 }

package/src/blocks/PersonalizationContainer.tsx

@@ -4,6 +4,7 @@ import { useEffect, useState } from 'react';
 import { BuilderBlocks } from '../components/builder-blocks.component';
 import { filterWithCustomTargeting, Query } from '../functions/filter-with-custom-targeting';
 
+const attributeCookieName = 'builder.attributes';
 export type PersonalizationContainerProps = {
   children: React.ReactNode;
   previewingIndex: number | null;
@@ -17,19 +18,19 @@ export type PersonalizationContainerProps = {
     },
   ];
   attributes: any;
-  clientSideOnly?: boolean;
 };
 
 export function PersonalizationContainer(props: PersonalizationContainerProps) {
-  const [isClient, setIsClient] = useState(!props.clientSideOnly);
+  const isBeingHydrated = Boolean(
+    Builder.isBrowser && (window as any).__hydrated?.[props.builderBlock?.id!]
+  );
+  const [isClient, setIsClient] = useState(isBeingHydrated);
   const [update, setUpdate] = useState(0);
 
   useEffect(() => {
     setIsClient(true);
-  }, []);
-
-  useEffect(() => {
     const subscriber = builder.userAttributesChanged.subscribe(() => {
+      builder.setCookie(attributeCookieName, JSON.stringify(builder.getUserAttributes()));
       setUpdate(update + 1);
     });
     return () => {
@@ -37,6 +38,37 @@ export function PersonalizationContainer(props: PersonalizationContainerProps) {
     };
   }, []);
 
+  if (Builder.isServer) {
+    <>
+      {props.variants?.map((variant, index) => (
+        <template key={index} data-variant-id={props.builderBlock?.id! + index}>
+          <BuilderBlocks
+            blocks={variant.blocks}
+            parentElementId={props.builderBlock?.id}
+            dataPath={`component.options.variants.${index}.blocks`}
+            child
+          />
+        </template>
+      ))}
+      <script
+        id={`variants-script-${props.builderBlock?.id}`}
+        dangerouslySetInnerHTML={{ __html: getPersonalizationScript(props) }}
+      />
+      <div
+        {...props.attributes}
+        data-default-variant-id={props.builderBlock?.id}
+        className={`builder-personalization-container ${props.attributes.className}`}
+      >
+        <BuilderBlocks
+          blocks={props.builderBlock?.children}
+          parentElementId={props.builderBlock?.id}
+          dataPath="this.children"
+          child
+        />
+      </div>
+    </>;
+  }
+
   const filteredVariants = (props.variants || []).filter(variant => {
     return filterWithCustomTargeting(
       builder.getUserAttributes(),
@@ -89,6 +121,15 @@ export function PersonalizationContainer(props: PersonalizationContainerProps) {
           child
         />
       )}
+
+      <script
+        dangerouslySetInnerHTML={{
+          __html: `
+         window.__hydrated = window.__hydrated || {};
+         window.__hydrated['${props.builderBlock?.id}'] = true;
+        `.replace(/\s+/g, ' '),
+        }}
+      />
     </div>
   );
 }
@@ -132,10 +173,51 @@ Builder.registerComponent(PersonalizationContainer, {
         },
       ],
     },
-    {
-      name: 'clientSideOnly',
-      type: 'boolean',
-      advanced: true,
-    }
   ],
 });
+
+function getPersonalizationScript(props: PersonalizationContainerProps) {
+  return `
+      (function() {
+        function getCookie(name) {
+          var nameEQ = name + "=";
+          var ca = document.cookie.split(';');
+          for(var i=0;i < ca.length;i++) {
+              var c = ca[i];
+              while (c.charAt(0)==' ') c = c.substring(1,c.length);
+              if (c.indexOf(nameEQ) == 0) return c.substring(nameEQ.length,c.length);
+          }
+          return null;
+        }
+          function removeVariants() {
+            variants.forEach(function (template, index) {
+              document.querySelector('template[data-variant-id="' + "${props.builderBlock?.id}" + index + '"]').remove();
+            });
+            document.getElementById('variants-script-${props.builderBlock?.id}').remove();
+          }
+
+        var attributes = JSON.parse(getCookie("${attributeCookieName}") || "{}");
+        var variants = ${JSON.stringify(props.variants?.map(v => ({ query: v.query, startDate: v.startDate, endDate: v.endDate })))};
+        var winningVariantIndex = variants.findIndex(function(variant) {
+          return filterWithCustomTargeting(
+            attributes,
+            variant.query,
+            variant.startDate,
+            variant.endDate
+          );
+        });
+        if (winningVariantIndex !== -1) {
+          var winningVariant = document.querySelector('template[data-variant-index="' + "${props.builderBlock?.id}" + winningVariantIndex + '"]');
+          if (winningVariant) {
+            var parentNode = winningVariant.parentNode;
+            var newParent = parentNode.cloneNode(false);
+            newParent.appendChild(winningVariant.content.firstChild);
+            parentNode.parentNode.replaceChild(newParent, parentNode);
+          }
+        } else if (variants.length > 0) {
+          removeVariants(); 
+        }
+        function filterWithCustomTargeting(e,t,n,r){var i={query:t,startDate:n,endDate:r},o=e.date&&new Date(e.date)||new Date;return!(i.startDate&&new Date(i.startDate)>o)&&(!(i.endDate&&new Date(i.endDate)<o)&&(!i.query||!i.query.length||i.query.every((function(t){return objectMatchesQuery(e,t)}))))}function isString(e){return"string"==typeof e}function isNumber(e){return"number"==typeof e}function objectMatchesQuery(e,t){return function(){var n=t.property,r=t.operator,i=t.value;if(t&&"urlPath"===t.property&&t.value&&"string"==typeof t.value&&"/"!==t.value&&t.value.endsWith("/")&&(i=t.value.slice(0,-1)),!n||!r)return!0;if(Array.isArray(i))return"isNot"===r?i.every((function(t){return objectMatchesQuery(e,{property:n,operator:r,value:t})})):!!i.find((function(t){return objectMatchesQuery(e,{property:n,operator:r,value:t})}));var o=e[n];if(Array.isArray(o))return o.includes(i);switch(r){case"is":return o===i;case"isNot":return o!==i;case"contains":return(isString(o)||Array.isArray(o))&&o.includes(String(i));case"startsWith":return isString(o)&&o.startsWith(String(i));case"endsWith":return isString(o)&&o.endsWith(String(i));case"greaterThan":return isNumber(o)&&isNumber(i)&&o>i;case"lessThan":return isNumber(o)&&isNumber(i)&&o<i;case"greaterThanOrEqualTo":return isNumber(o)&&isNumber(i)&&o>=i;case"lessThanOrEqualTo":return isNumber(o)&&isNumber(i)&&o<=i}return!1}()}
+      })();
+    `.replace(/\s+/g, ' ');
+}

package/src/functions/filter-with-custom-targeting.ts

@@ -1,127 +1,126 @@
 type UserAttributes = {
-    date?: string | Date;
-    urlPath?: string;
-    [key: string]: any;  // Allow any other properties
-  };
-  
-  // Query type
-  type QueryOperator = 
-    | 'is' 
-    | 'isNot' 
-    | 'contains' 
-    | 'startsWith' 
-    | 'endsWith' 
-    | 'greaterThan' 
-    | 'lessThan' 
-    | 'greaterThanOrEqualTo' 
-    | 'lessThanOrEqualTo';
-  
-  type QueryValue = string | number | boolean | Array<string | number | boolean>;
-  
-  export type Query = {
-    property: string;
-    operator: QueryOperator;
-    value: QueryValue;
-  };
+  date?: string | Date;
+  urlPath?: string;
+  [key: string]: any; // Allow any other properties
+};
+
+// Query type
+type QueryOperator =
+  | 'is'
+  | 'isNot'
+  | 'contains'
+  | 'startsWith'
+  | 'endsWith'
+  | 'greaterThan'
+  | 'lessThan'
+  | 'greaterThanOrEqualTo'
+  | 'lessThanOrEqualTo';
+
+type QueryValue = string | number | boolean | Array<string | number | boolean>;
+
+export type Query = {
+  property: string;
+  operator: QueryOperator;
+  value: QueryValue;
+};
 
 export function filterWithCustomTargeting(
-    userAttributes: UserAttributes,
-    query: Query[],
-    startDate?: string,
-    endDate?: string
-  ) {
-    const item = {
-      query,
-      startDate,
-      endDate,
-    };
-  
-    const now = (userAttributes.date && new Date(userAttributes.date)) || new Date();
-  
-    if (item.startDate && new Date(item.startDate) > now) {
-      return false;
-    } else if (item.endDate && new Date(item.endDate) < now) {
-      return false;
+  userAttributes: UserAttributes,
+  query: Query[],
+  startDate?: string,
+  endDate?: string
+) {
+  const item = {
+    query,
+    startDate,
+    endDate,
+  };
+
+  const now = (userAttributes.date && new Date(userAttributes.date)) || new Date();
+
+  if (item.startDate && new Date(item.startDate) > now) {
+    return false;
+  } else if (item.endDate && new Date(item.endDate) < now) {
+    return false;
+  }
+
+  if (!item.query || !item.query.length) {
+    return true;
+  }
+
+  return item.query.every((filter: Query) => {
+    return objectMatchesQuery(userAttributes, filter);
+  });
+}
+
+function isString(val: unknown): val is string {
+  return typeof val === 'string';
+}
+
+function isNumber(val: unknown): val is number {
+  return typeof val === 'number';
+}
+
+function objectMatchesQuery(userattr: UserAttributes, query: Query): boolean {
+  const result = (() => {
+    const property = query.property;
+    const operator = query.operator;
+    let testValue = query.value;
+
+    if (
+      query &&
+      query.property === 'urlPath' &&
+      query.value &&
+      typeof query.value === 'string' &&
+      query.value !== '/' &&
+      query.value.endsWith('/')
+    ) {
+      testValue = query.value.slice(0, -1);
     }
-  
-    if (!item.query || !item.query.length) {
+
+    // Check is query property is present in userAttributes. Proceed only if it is present.
+    if (!(property && operator)) {
       return true;
     }
-  
-    return item.query.every((filter: Query) => {
-      return objectMatchesQuery(userAttributes, filter);
-    });
-  }
-  
-  function isString(val: unknown): val is string {
-    return typeof val === 'string';
-  }
-  
-  function isNumber(val: unknown): val is number {
-    return typeof val === 'number';
-  }
-    
-  function objectMatchesQuery(userattr: UserAttributes, query: Query): boolean {
-    const result = (() => {
-      const property = query.property;
-      const operator = query.operator;
-      let testValue = query.value;
-
-      if (
-        query &&
-        query.property === 'urlPath' &&
-        query.value &&
-        typeof query.value === 'string' &&
-        query.value !== '/' &&
-        query.value.endsWith('/')
-      ) {
-        testValue = query.value.slice(0, -1);
-      }
 
-  
-      // Check is query property is present in userAttributes. Proceed only if it is present.
-      if (!(property && operator)) {
-        return true;
-      }
-  
-      if (Array.isArray(testValue)) {
-        if (operator === 'isNot') {
-          return testValue.every(val =>
-            objectMatchesQuery(userattr, { property, operator, value: val })
-          );
-        }
-        return !!testValue.find(val =>
+    if (Array.isArray(testValue)) {
+      if (operator === 'isNot') {
+        return testValue.every(val =>
           objectMatchesQuery(userattr, { property, operator, value: val })
         );
       }
-      const value = userattr[property];
-  
-      if (Array.isArray(value)) {
-        return value.includes(testValue);
-      }
-  
-      switch (operator) {
-        case 'is':
-          return value === testValue;
-        case 'isNot':
-          return value !== testValue;
-        case 'contains':
-          return (isString(value) || Array.isArray(value)) && value.includes(String(testValue));
-        case 'startsWith':
-          return isString(value) && value.startsWith(String(testValue));
-        case 'endsWith':
-          return isString(value) && value.endsWith(String(testValue));
-        case 'greaterThan':
-          return isNumber(value) && isNumber(testValue) && value > testValue;
-        case 'lessThan':
-          return isNumber(value) && isNumber(testValue) && value < testValue;
-        case 'greaterThanOrEqualTo':
-          return isNumber(value) && isNumber(testValue) && value >= testValue;
-        case 'lessThanOrEqualTo':
-          return isNumber(value) && isNumber(testValue) && value <= testValue;
-      }
-      return false;
-    })();
-  
-    return result;
-  }
+      return !!testValue.find(val =>
+        objectMatchesQuery(userattr, { property, operator, value: val })
+      );
+    }
+    const value = userattr[property];
+
+    if (Array.isArray(value)) {
+      return value.includes(testValue);
+    }
+
+    switch (operator) {
+      case 'is':
+        return value === testValue;
+      case 'isNot':
+        return value !== testValue;
+      case 'contains':
+        return (isString(value) || Array.isArray(value)) && value.includes(String(testValue));
+      case 'startsWith':
+        return isString(value) && value.startsWith(String(testValue));
+      case 'endsWith':
+        return isString(value) && value.endsWith(String(testValue));
+      case 'greaterThan':
+        return isNumber(value) && isNumber(testValue) && value > testValue;
+      case 'lessThan':
+        return isNumber(value) && isNumber(testValue) && value < testValue;
+      case 'greaterThanOrEqualTo':
+        return isNumber(value) && isNumber(testValue) && value >= testValue;
+      case 'lessThanOrEqualTo':
+        return isNumber(value) && isNumber(testValue) && value <= testValue;
+    }
+    return false;
+  })();
+
+  return result;
+}