@builder.io/sdk-react-native 0.0.6-0 → 0.0.6-2

package/package.json

@@ -1,23 +1,23 @@
 {
   "name": "@builder.io/sdk-react-native",
   "description": "Builder.io SDK for React Native",
-  "version": "0.0.6-0",
+  "version": "0.0.6-2",
   "main": "src/index.js",
   "scripts": {
     "release:patch": "npm version patch --no-git-tag-version && npm publish --access public",
     "release:dev": "npm version prerelease --no-git-tag-version && npm publish --tag dev --access public"
   },
   "dependencies": {
-    "@react-native-async-storage/async-storage": "^1.17.10",
-    "@react-native-cookies/cookies": "^6.2.1",
     "react-native-render-html": "^6.3.4",
     "react-native-storage": "^1.0.1",
     "react-native-video": "^5.1.1"
   },
   "peerDependencies": {
+    "@react-native-async-storage/async-storage": "^1.17.10",
     "react-native": "^0.64.3"
   },
   "devDependencies": {
+    "@react-native-async-storage/async-storage": "^1.17.10",
     "@types/react-native-video": "^5.0.9",
     "react-native": "^0.64.3"
   }

package/src/functions/get-content/ab-testing.js

@@ -22,62 +22,76 @@ import {
   getContentVariationCookie,
   setContentVariationCookie
 } from "../../helpers/ab-tests.js";
-const getRandomTestGroupId = (variations) => {
+const checkIsBuilderContentWithVariations = (item) => !item.id || !item.variations || Object.keys(item.variations).length === 0;
+const getRandomVariationId = ({
+  id,
+  variations
+}) => {
+  var _a;
   let n = 0;
   const random = Math.random();
-  for (const id in variations) {
-    const testRatio = variations[id].testRatio;
+  for (const id2 in variations) {
+    const testRatio = (_a = variations[id2]) == null ? void 0 : _a.testRatio;
     n += testRatio;
     if (random < n) {
-      return id;
+      return id2;
     }
   }
-  return void 0;
+  return id;
+};
+const getTestFields = ({
+  item,
+  testGroupId
+}) => {
+  const variationValue = item.variations[testGroupId];
+  if (testGroupId === item.id || !variationValue) {
+    return {
+      testVariationId: item.id,
+      testVariationName: "Default"
+    };
+  } else {
+    return {
+      data: variationValue.data,
+      testVariationId: variationValue.id,
+      testVariationName: variationValue.name || (variationValue.id === item.id ? "Default" : "")
+    };
+  }
 };
 const getContentVariation = (_0) => __async(void 0, [_0], function* ({
   item,
-  orgId
+  canTrack
 }) {
-  if (!item.id || !item.variations || Object.keys(item.variations).length === 0) {
-    return;
-  }
   const testGroupId = yield getContentVariationCookie({
-    canTrack: true,
-    contentId: item.id,
-    orgId
+    canTrack,
+    contentId: item.id
   });
-  console.log("found test group id", testGroupId);
-  const variationValue = testGroupId ? item.variations[testGroupId] : void 0;
-  if (variationValue) {
-    return variationValue;
+  const testFields = testGroupId ? getTestFields({ item, testGroupId }) : void 0;
+  if (testFields) {
+    return testFields;
   } else {
-    const randomTestGroupId = getRandomTestGroupId(item.variations);
-    if (randomTestGroupId) {
-      yield setContentVariationCookie({
-        contentId: item.id,
-        value: randomTestGroupId,
-        canTrack: true,
-        orgId
-      });
-    }
-    const randomVariationValue = randomTestGroupId ? item.variations[randomTestGroupId] : void 0;
-    return randomVariationValue;
+    const randomVariationId = getRandomVariationId({
+      variations: item.variations,
+      id: item.id
+    });
+    setContentVariationCookie({
+      contentId: item.id,
+      value: randomVariationId,
+      canTrack
+    }).catch((err) => {
+      console.error("could not store A/B test variation: ", err);
+    });
+    return getTestFields({ item, testGroupId: randomVariationId });
   }
 });
 const handleABTesting = (_0) => __async(void 0, [_0], function* ({
   item,
-  orgId
+  canTrack
 }) {
-  const variationValue = yield getContentVariation({ item, orgId });
-  const newValues = variationValue ? {
-    data: variationValue.data,
-    testVariationId: variationValue.id,
-    testVariationName: variationValue.name || (variationValue.id === item.id ? "Default" : "")
-  } : {
-    testVariationId: item.id,
-    testVariationName: "Default"
-  };
-  Object.assign(item, newValues);
+  if (!checkIsBuilderContentWithVariations(item)) {
+    return;
+  }
+  const variationValue = yield getContentVariation({ item, canTrack });
+  Object.assign(item, variationValue);
 });
 export {
   handleABTesting

package/src/functions/get-content/index.js

@@ -80,8 +80,11 @@ function getAllContent(options) {
     const url = generateContentUrl(options);
     const fetch = yield getFetch();
     const content = yield fetch(url.href).then((res) => res.json());
-    for (const item of content.results) {
-      yield handleABTesting({ item, orgId: options.apiKey });
+    const canTrack = options.canTrack !== false;
+    if (canTrack) {
+      for (const item of content.results) {
+        yield handleABTesting({ item, canTrack });
+      }
     }
     return content;
   });

package/src/functions/sanitize-styles.js

@@ -48,8 +48,7 @@ const sanitizeBlockStyles = (styles) => {
       const newValue = parseFloat(propertyValue);
       const normalizedValue = normalizeNumber(newValue);
       if (normalizedValue) {
-        const valueWithUnits = propertyValue.endsWith("%") ? `${normalizedValue}%` : "";
-        return __spreadProps(__spreadValues({}, acc), { [key]: valueWithUnits });
+        return __spreadProps(__spreadValues({}, acc), { [key]: normalizedValue });
       } else {
         return acc;
       }

package/src/functions/track.js

@@ -55,13 +55,12 @@ import { getVisitorId } from "../helpers/visitorId.js";
 import { isBrowser } from "./is-browser.js";
 import { isEditing } from "./is-editing.js";
 const getTrackingEventData = (_0) => __async(void 0, [_0], function* ({
-  canTrack,
-  orgId
+  canTrack
 }) {
   if (!canTrack) {
     return { visitorId: void 0, sessionId: void 0 };
   }
-  const sessionId = yield getSessionId({ canTrack, orgId });
+  const sessionId = yield getSessionId({ canTrack });
   const visitorId = getVisitorId({ canTrack });
   return {
     sessionId,
@@ -82,7 +81,7 @@ const createEvent = (_a) => __async(void 0, null, function* () {
   ]);
   return {
     type: eventType,
-    data: __spreadProps(__spreadValues(__spreadValues({}, properties), yield getTrackingEventData({ canTrack, orgId })), {
+    data: __spreadProps(__spreadValues(__spreadValues({}, properties), yield getTrackingEventData({ canTrack })), {
       ownerId: orgId,
       contentId
     })

package/src/helpers/ab-tests.js

@@ -1,17 +1,15 @@
 import { getCookie, setCookie } from "./cookie.js";
-const BUILDER_STORE_PREFIX = "builder.tests";
+const BUILDER_STORE_PREFIX = "builderio.variations";
 const getContentTestKey = (id) => `${BUILDER_STORE_PREFIX}.${id}`;
 const getContentVariationCookie = ({
   contentId,
-  canTrack,
-  orgId
-}) => getCookie({ name: getContentTestKey(contentId), canTrack, orgId });
+  canTrack
+}) => getCookie({ name: getContentTestKey(contentId), canTrack });
 const setContentVariationCookie = ({
   contentId,
   canTrack,
-  value,
-  orgId
-}) => setCookie({ name: getContentTestKey(contentId), value, canTrack, orgId });
+  value
+}) => setCookie({ name: getContentTestKey(contentId), value, canTrack });
 export {
   getContentVariationCookie,
   setContentVariationCookie

package/src/helpers/cookie.js

@@ -18,7 +18,22 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
-import storage from "./storage";
+import Storage from "react-native-storage";
+import { isBrowser } from "../functions/is-browser.js";
+import AsyncStorage from "@react-native-async-storage/async-storage";
+const ONE_DAY = 1e3 * 60 * 60 * 24;
+const initStorage = () => {
+  const backend = isBrowser() ? window.localStorage : AsyncStorage;
+  const storage2 = new Storage({
+    size: 1e3,
+    storageBackend: backend,
+    defaultExpires: ONE_DAY * 30,
+    enableCache: true
+  });
+  return storage2;
+};
+const storage = initStorage();
+const getStorageName = (name) => `builderio.${name}`;
 const getCookie = (_0) => __async(void 0, [_0], function* ({
   name,
   canTrack
@@ -28,8 +43,8 @@ const getCookie = (_0) => __async(void 0, [_0], function* ({
       return void 0;
     }
     const parsedName = name.replace(/_/g, ".");
-    const data = yield (yield storage).load(parsedName);
-    console.log("data", data);
+    const data = yield storage.load({ key: getStorageName(parsedName) });
+    console.log("loaded data: ", data.value);
     return data.value;
   } catch (err) {
     console.debug("[COOKIE] GET error: ", err);
@@ -45,8 +60,8 @@ const setCookie = (_0) => __async(void 0, [_0], function* ({
     if (!canTrack) {
       return void 0;
     }
-    yield (yield storage).save({ key: name, data: { value }, expires });
-    console.log("data", yield storage);
+    yield storage.save({ key: getStorageName(name), data: { value }, expires });
+    console.log("saved data: ", { key: name, data: { value }, expires });
   } catch (err) {
     console.warn("[COOKIE] SET error: ", err);
   }

package/src/helpers/sessionId.js

@@ -22,28 +22,26 @@ import { getCookie, setCookie } from "./cookie.js";
 import { checkIsDefined } from "./nullable.js";
 import { uuid } from "./uuid.js";
 const SESSION_LOCAL_STORAGE_KEY = "builderSessionId";
-const getSessionId = (_0) => __async(void 0, [_0], function* ({ canTrack, orgId }) {
+const getSessionId = (_0) => __async(void 0, [_0], function* ({ canTrack }) {
   if (!canTrack) {
     return void 0;
   }
   const sessionId = yield getCookie({
     name: SESSION_LOCAL_STORAGE_KEY,
-    canTrack,
-    orgId
+    canTrack
   });
   if (checkIsDefined(sessionId)) {
     return sessionId;
   } else {
     const newSessionId = createSessionId();
-    setSessionId({ id: newSessionId, canTrack, orgId });
+    setSessionId({ id: newSessionId, canTrack });
   }
 });
 const createSessionId = () => uuid();
 const setSessionId = ({
   id,
-  canTrack,
-  orgId
-}) => setCookie({ name: SESSION_LOCAL_STORAGE_KEY, value: id, canTrack, orgId });
+  canTrack
+}) => setCookie({ name: SESSION_LOCAL_STORAGE_KEY, value: id, canTrack });
 export {
   createSessionId,
   getSessionId,

package/src/helpers/storage.js

@@ -1,37 +0,0 @@
-var __async = (__this, __arguments, generator) => {
-  return new Promise((resolve, reject) => {
-    var fulfilled = (value) => {
-      try {
-        step(generator.next(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var rejected = (value) => {
-      try {
-        step(generator.throw(value));
-      } catch (e) {
-        reject(e);
-      }
-    };
-    var step = (x) => x.done ? resolve(x.value) : Promise.resolve(x.value).then(fulfilled, rejected);
-    step((generator = generator.apply(__this, __arguments)).next());
-  });
-};
-import Storage from "react-native-storage";
-import { isBrowser } from "../functions/is-browser.js";
-const ONE_DAY = 1e3 * 60 * 60 * 24;
-const initStorage = () => __async(void 0, null, function* () {
-  const backend = isBrowser() ? window.localStorage : yield import("@react-native-async-storage/async-storage");
-  const storage = new Storage({
-    size: 1e3,
-    storageBackend: backend,
-    defaultExpires: ONE_DAY * 30,
-    enableCache: true
-  });
-  return storage;
-});
-var stdin_default = initStorage();
-export {
-  stdin_default as default
-};