@ninetailed/experience.js-react 4.2.0-beta.5 → 4.2.0-beta.7

package/index.cjs

@@ -1946,6 +1946,35 @@ const useExperiments = () => {
   };
 };
 
+const useExperienceSelectionMiddleware = ({
+  experiences,
+  baseline,
+  profile
+}) => {
+  const {
+    plugins
+  } = useNinetailed();
+  const [_, setCurrentTime] = React.useState(Date.now());
+  const {
+    addListeners,
+    removeListeners,
+    middleware
+  } = React.useMemo(() => experience_js.makeExperienceSelectMiddleware({
+    plugins,
+    experiences,
+    baseline,
+    profile,
+    onChange: () => setCurrentTime(Date.now())
+  }), [plugins, experiences, baseline, profile]);
+  React.useEffect(() => {
+    addListeners();
+    return () => {
+      removeListeners();
+    };
+  }, [addListeners, removeListeners]);
+  return middleware;
+};
+
 const useExperience = ({
   baseline,
   experiences
@@ -1959,6 +1988,31 @@ const useExperience = ({
     status,
     profile
   } = profileState;
+  const experienceSelectionMiddleware = useExperienceSelectionMiddleware({
+    experiences,
+    baseline,
+    profile
+  });
+  const overrideResult = _a => {
+    var {
+        experience: originalExperience,
+        variant: originalVariant
+      } = _a,
+      other = __rest(_a, ["experience", "variant"]);
+    const {
+      experience,
+      variant
+    } = experienceSelectionMiddleware({
+      experience: originalExperience,
+      variant: originalVariant
+    });
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    return Object.assign(Object.assign({}, other), {
+      experience,
+      variant
+    });
+  };
   const baseReturn = Object.assign(Object.assign({}, profileState), {
     hasVariants,
     baseline
@@ -1973,17 +2027,17 @@ const useExperience = ({
   if (status === 'loading') {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    return emptyReturn;
+    return overrideResult(emptyReturn);
   }
   if (status === 'error') {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    return emptyReturn;
+    return overrideResult(emptyReturn);
   }
   if (!profile) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    return emptyReturn;
+    return overrideResult(emptyReturn);
   }
   const activeExperiments = experience_js.selectActiveExperiments(experiments, profile);
   const experience = experience_js.selectExperience({
@@ -1994,9 +2048,9 @@ const useExperience = ({
   if (!experience) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    return Object.assign(Object.assign({}, emptyReturn), {
+    return overrideResult(Object.assign(Object.assign({}, emptyReturn), {
       profile
-    });
+    }));
   }
   const audience = experience.audience;
   const variant = experience_js.selectExperienceVariant({
@@ -2005,7 +2059,7 @@ const useExperience = ({
     profile
   });
   if (!variant) {
-    return Object.assign(Object.assign({}, baseReturn), {
+    return overrideResult(Object.assign(Object.assign({}, baseReturn), {
       status: 'success',
       loading: false,
       error: null,
@@ -2014,9 +2068,9 @@ const useExperience = ({
       audience: audience ? audience : null,
       profile,
       isPersonalized: false
-    });
+    }));
   }
-  return Object.assign(Object.assign({}, baseReturn), {
+  return overrideResult(Object.assign(Object.assign({}, baseReturn), {
     status: 'success',
     loading: false,
     error: null,
@@ -2025,7 +2079,7 @@ const useExperience = ({
     audience: audience ? audience : null,
     profile,
     isPersonalized: true
-  });
+  }));
 };
 
 const useJoinExperiment = () => {
@@ -2033,35 +2087,6 @@ const useJoinExperiment = () => {
   return context.joinExperiment;
 };
 
-const useExperienceSelectionMiddleware = ({
-  experiences,
-  baseline,
-  profile
-}) => {
-  const {
-    plugins
-  } = useNinetailed();
-  const [_, setCurrentTime] = React.useState(Date.now());
-  const {
-    addListeners,
-    removeListeners,
-    middleware
-  } = React.useMemo(() => experience_js.makeExperienceSelectMiddleware({
-    plugins,
-    experiences,
-    baseline,
-    profile,
-    onChange: () => setCurrentTime(Date.now())
-  }), [plugins, experiences, baseline, profile]);
-  React.useEffect(() => {
-    addListeners();
-    return () => {
-      removeListeners();
-    };
-  }, [addListeners, removeListeners]);
-  return middleware;
-};
-
 const DefaultExperienceLoadingComponent = _a => {
   var {
       component: Component,
@@ -2119,8 +2144,8 @@ const Experience = _a => {
   const {
     status,
     hasVariants,
-    experience: originalExperience,
-    variant: originalVariant,
+    experience,
+    variant,
     audience,
     isPersonalized,
     profile
@@ -2128,18 +2153,6 @@ const Experience = _a => {
     baseline,
     experiences
   });
-  const experienceSelectionMiddleware = useExperienceSelectionMiddleware({
-    experiences,
-    baseline,
-    profile
-  });
-  const {
-    experience,
-    variant
-  } = experienceSelectionMiddleware({
-    experience: originalExperience,
-    variant: originalVariant
-  });
   const joinExperiment = useJoinExperiment();
   React.useEffect(() => {
     if (status === 'success' && experience && profile) {

package/index.js

@@ -1,6 +1,6 @@
 import { jsxs, Fragment, jsx } from 'react/jsx-runtime';
 import React, { createContext, useContext, useEffect, useState, useRef, useMemo, createElement as createElement$1, useCallback } from 'react';
-import { selectDistribution, selectHasExperienceVariants, selectActiveExperiments, selectExperience, selectExperienceVariant, makeExperienceSelectMiddleware, Ninetailed, selectVariant } from '@ninetailed/experience.js';
+import { selectDistribution, makeExperienceSelectMiddleware, selectHasExperienceVariants, selectActiveExperiments, selectExperience, selectExperienceVariant, Ninetailed, selectVariant } from '@ninetailed/experience.js';
 import { useInView } from 'react-intersection-observer';
 import { isBrowser, logger } from '@ninetailed/experience.js-shared';
 import { isEqual, debounce as debounce$1, get as get$1 } from 'radash';
@@ -1938,6 +1938,35 @@ const useExperiments = () => {
   };
 };
 
+const useExperienceSelectionMiddleware = ({
+  experiences,
+  baseline,
+  profile
+}) => {
+  const {
+    plugins
+  } = useNinetailed();
+  const [_, setCurrentTime] = useState(Date.now());
+  const {
+    addListeners,
+    removeListeners,
+    middleware
+  } = useMemo(() => makeExperienceSelectMiddleware({
+    plugins,
+    experiences,
+    baseline,
+    profile,
+    onChange: () => setCurrentTime(Date.now())
+  }), [plugins, experiences, baseline, profile]);
+  useEffect(() => {
+    addListeners();
+    return () => {
+      removeListeners();
+    };
+  }, [addListeners, removeListeners]);
+  return middleware;
+};
+
 const useExperience = ({
   baseline,
   experiences
@@ -1951,6 +1980,31 @@ const useExperience = ({
     status,
     profile
   } = profileState;
+  const experienceSelectionMiddleware = useExperienceSelectionMiddleware({
+    experiences,
+    baseline,
+    profile
+  });
+  const overrideResult = _a => {
+    var {
+        experience: originalExperience,
+        variant: originalVariant
+      } = _a,
+      other = __rest(_a, ["experience", "variant"]);
+    const {
+      experience,
+      variant
+    } = experienceSelectionMiddleware({
+      experience: originalExperience,
+      variant: originalVariant
+    });
+    // eslint-disable-next-line @typescript-eslint/ban-ts-comment
+    // @ts-ignore
+    return Object.assign(Object.assign({}, other), {
+      experience,
+      variant
+    });
+  };
   const baseReturn = Object.assign(Object.assign({}, profileState), {
     hasVariants,
     baseline
@@ -1965,17 +2019,17 @@ const useExperience = ({
   if (status === 'loading') {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    return emptyReturn;
+    return overrideResult(emptyReturn);
   }
   if (status === 'error') {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    return emptyReturn;
+    return overrideResult(emptyReturn);
   }
   if (!profile) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    return emptyReturn;
+    return overrideResult(emptyReturn);
   }
   const activeExperiments = selectActiveExperiments(experiments, profile);
   const experience = selectExperience({
@@ -1986,9 +2040,9 @@ const useExperience = ({
   if (!experience) {
     // eslint-disable-next-line @typescript-eslint/ban-ts-comment
     // @ts-ignore
-    return Object.assign(Object.assign({}, emptyReturn), {
+    return overrideResult(Object.assign(Object.assign({}, emptyReturn), {
       profile
-    });
+    }));
   }
   const audience = experience.audience;
   const variant = selectExperienceVariant({
@@ -1997,7 +2051,7 @@ const useExperience = ({
     profile
   });
   if (!variant) {
-    return Object.assign(Object.assign({}, baseReturn), {
+    return overrideResult(Object.assign(Object.assign({}, baseReturn), {
       status: 'success',
       loading: false,
       error: null,
@@ -2006,9 +2060,9 @@ const useExperience = ({
       audience: audience ? audience : null,
       profile,
       isPersonalized: false
-    });
+    }));
   }
-  return Object.assign(Object.assign({}, baseReturn), {
+  return overrideResult(Object.assign(Object.assign({}, baseReturn), {
     status: 'success',
     loading: false,
     error: null,
@@ -2017,7 +2071,7 @@ const useExperience = ({
     audience: audience ? audience : null,
     profile,
     isPersonalized: true
-  });
+  }));
 };
 
 const useJoinExperiment = () => {
@@ -2025,35 +2079,6 @@ const useJoinExperiment = () => {
   return context.joinExperiment;
 };
 
-const useExperienceSelectionMiddleware = ({
-  experiences,
-  baseline,
-  profile
-}) => {
-  const {
-    plugins
-  } = useNinetailed();
-  const [_, setCurrentTime] = useState(Date.now());
-  const {
-    addListeners,
-    removeListeners,
-    middleware
-  } = useMemo(() => makeExperienceSelectMiddleware({
-    plugins,
-    experiences,
-    baseline,
-    profile,
-    onChange: () => setCurrentTime(Date.now())
-  }), [plugins, experiences, baseline, profile]);
-  useEffect(() => {
-    addListeners();
-    return () => {
-      removeListeners();
-    };
-  }, [addListeners, removeListeners]);
-  return middleware;
-};
-
 const DefaultExperienceLoadingComponent = _a => {
   var {
       component: Component,
@@ -2111,8 +2136,8 @@ const Experience = _a => {
   const {
     status,
     hasVariants,
-    experience: originalExperience,
-    variant: originalVariant,
+    experience,
+    variant,
     audience,
     isPersonalized,
     profile
@@ -2120,18 +2145,6 @@ const Experience = _a => {
     baseline,
     experiences
   });
-  const experienceSelectionMiddleware = useExperienceSelectionMiddleware({
-    experiences,
-    baseline,
-    profile
-  });
-  const {
-    experience,
-    variant
-  } = experienceSelectionMiddleware({
-    experience: originalExperience,
-    variant: originalVariant
-  });
   const joinExperiment = useJoinExperiment();
   useEffect(() => {
     if (status === 'success' && experience && profile) {

package/package.json

@@ -1,15 +1,15 @@
 {
   "name": "@ninetailed/experience.js-react",
-  "version": "4.2.0-beta.5",
+  "version": "4.2.0-beta.7",
   "peerDependencies": {
     "react": ">=16.8.0"
   },
   "dependencies": {
     "@analytics/google-analytics": "0.5.3",
     "react-visibility-sensor": "5.1.1",
-    "@ninetailed/experience.js": "4.2.0-beta.5",
+    "@ninetailed/experience.js": "4.2.0-beta.7",
     "react-intersection-observer": "8.34.0",
-    "@ninetailed/experience.js-shared": "4.2.0-beta.5",
+    "@ninetailed/experience.js-shared": "4.2.0-beta.7",
     "radash": "10.9.0",
     "analytics": "0.8.1"
   },