@builder.io/sdk-solid 0.0.8-15 → 0.0.8-18

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-solid",
-  "version": "0.0.8-15",
+  "version": "0.0.8-18",
   "description": "",
   "type": "module",
   "main": "./src/solid-index.jsx",

package/src/blocks/columns/component-info.js

@@ -186,7 +186,31 @@ const componentInfo = {
           ]
         }
       ],
-      onChange: "        function clearWidths() {          columns.forEach(col => {            col.delete('width');          });        }        const columns = options.get('columns') as Array<Map<String, any>>;        if (Array.isArray(columns)) {          const containsColumnWithWidth = !!columns.find(col => col.get('width'));          if (containsColumnWithWidth) {            const containsColumnWithoutWidth = !!columns.find(col => !col.get('width'));            if (containsColumnWithoutWidth) {              clearWidths();            } else {              const sumWidths = columns.reduce((memo, col) => {                return memo + col.get('width');              }, 0);              const widthsDontAddUp = sumWidths !== 100;              if (widthsDontAddUp) {                clearWidths();              }            }          }        }      "
+      onChange(options) {
+        function clearWidths() {
+          columns.forEach((col) => {
+            col.delete("width");
+          });
+        }
+        const columns = options.get("columns");
+        if (Array.isArray(columns)) {
+          const containsColumnWithWidth = !!columns.find((col) => col.get("width"));
+          if (containsColumnWithWidth) {
+            const containsColumnWithoutWidth = !!columns.find((col) => !col.get("width"));
+            if (containsColumnWithoutWidth) {
+              clearWidths();
+            } else {
+              const sumWidths = columns.reduce((memo, col) => {
+                return memo + col.get("width");
+              }, 0);
+              const widthsDontAddUp = sumWidths !== 100;
+              if (widthsDontAddUp) {
+                clearWidths();
+              }
+            }
+          }
+        }
+      }
     },
     {
       name: "space",

package/src/blocks/custom-code/custom-code.jsx

@@ -1,4 +1,4 @@
-import { onMount, useRef } from "solid-js";
+import { onMount } from "solid-js";
 import { createMutable } from "solid-js/store";
 
 function CustomCode(props) {
@@ -41,7 +41,7 @@ function CustomCode(props) {
     }
 
   });
-  const elem = useRef();
+  let elem;
   onMount(() => {
     state.findAndRunScripts();
   });

package/src/blocks/embed/component-info.js

@@ -9,7 +9,26 @@ const componentInfo = {
       required: true,
       defaultValue: "",
       helperText: "e.g. enter a youtube url, google map, etc",
-      onChange: "        const url = options.get('url');        if (url) {          options.set('content', 'Loading...');          // TODO: get this out of here!          const apiKey = 'ae0e60e78201a3f2b0de4b';          return fetch(`https://iframe.ly/api/iframely?url=${url}&api_key=${apiKey}`)            .then(res => res.json())            .then(data => {              if (options.get('url') === url) {                if (data.html) {                  options.set('content', data.html);                } else {                  options.set('content', 'Invalid url, please try another');                }              }            })            .catch(err => {              options.set(                'content',                'There was an error embedding this URL, please try again or another URL'              );            });        } else {          options.delete('content');        }      "
+      onChange(options) {
+        const url = options.get("url");
+        if (url) {
+          options.set("content", "Loading...");
+          const apiKey = "ae0e60e78201a3f2b0de4b";
+          return fetch(`https://iframe.ly/api/iframely?url=${url}&api_key=${apiKey}`).then((res) => res.json()).then((data) => {
+            if (options.get("url") === url) {
+              if (data.html) {
+                options.set("content", data.html);
+              } else {
+                options.set("content", "Invalid url, please try another");
+              }
+            }
+          }).catch((_err) => {
+            options.set("content", "There was an error embedding this URL, please try again or another URL");
+          });
+        } else {
+          options.delete("content");
+        }
+      }
     },
     {
       name: "content",

package/src/blocks/embed/embed.jsx

@@ -1,50 +1,47 @@
-import { onMount, useRef } from "solid-js";
+import { on, createEffect } from "solid-js";
 import { createMutable } from "solid-js/store";
+import { isJsScript } from "./helpers";
 
 function Embed(props) {
   const state = createMutable({
     scriptsInserted: [],
     scriptsRun: [],
+    ranInitFn: false,
 
     findAndRunScripts() {
-      // TODO: Move this function to standalone one in '@builder.io/utils'
-      if (elem && typeof window !== "undefined") {
-        const scripts = elem.getElementsByTagName("script");
-
-        for (let i = 0; i < scripts.length; i++) {
-          const script = scripts[i];
-
-          if (script.src) {
-            if (state.scriptsInserted.includes(script.src)) {
-              continue;
-            }
-
-            state.scriptsInserted.push(script.src);
-            const newScript = document.createElement("script");
-            newScript.async = true;
-            newScript.src = script.src;
-            document.head.appendChild(newScript);
-          } else if (!script.type || ["text/javascript", "application/javascript", "application/ecmascript"].includes(script.type)) {
-            if (state.scriptsRun.includes(script.innerText)) {
-              continue;
-            }
-
-            try {
-              state.scriptsRun.push(script.innerText);
-              new Function(script.innerText)();
-            } catch (error) {
-              console.warn("`Embed`: Error running script:", error);
-            }
+      const scripts = elem.getElementsByTagName("script");
+
+      for (let i = 0; i < scripts.length; i++) {
+        const script = scripts[i];
+
+        if (script.src && !state.scriptsInserted.includes(script.src)) {
+          state.scriptsInserted.push(script.src);
+          const newScript = document.createElement("script");
+          newScript.async = true;
+          newScript.src = script.src;
+          document.head.appendChild(newScript);
+        } else if (isJsScript(script) && !state.scriptsRun.includes(script.innerText)) {
+          try {
+            state.scriptsRun.push(script.innerText);
+            new Function(script.innerText)();
+          } catch (error) {
+            console.warn("`Embed`: Error running script:", error);
           }
         }
       }
     }
 
   });
-  const elem = useRef();
-  onMount(() => {
-    state.findAndRunScripts();
-  });
+  let elem;
+
+  function onUpdateFn_0() {
+    if (elem && !state.ranInitFn) {
+      state.ranInitFn = true;
+      state.findAndRunScripts();
+    }
+  }
+
+  createEffect(on(() => [elem, state.ranInitFn], onUpdateFn_0));
   return <div class="builder-embed" ref={elem} innerHTML={props.content}></div>;
 }
 

package/src/blocks/embed/helpers.js

@@ -0,0 +1,9 @@
+const SCRIPT_MIME_TYPES = [
+  "text/javascript",
+  "application/javascript",
+  "application/ecmascript"
+];
+const isJsScript = (script) => SCRIPT_MIME_TYPES.includes(script.type);
+export {
+  isJsScript
+};

package/src/blocks/form/form.jsx

@@ -1,4 +1,4 @@
-import { Show, For, useRef } from "solid-js";
+import { Show, For } from "solid-js";
 import { createMutable } from "solid-js/store";
 import { css } from "solid-styled-components";
 import RenderBlock from "../../components/render-block/render-block.jsx";
@@ -218,7 +218,7 @@ function FormComponent(props) {
     }
 
   });
-  const formRef = useRef();
+  let formRef;
   return <form {...props.attributes} validate={props.validate} ref={formRef} action={!props.sendWithJs && props.action} method={props.method} name={props.name} onSubmit={event => state.onSubmit(event)}>
       <Show when={props.builderBlock && props.builderBlock.children}>
         <For each={props.builderBlock?.children}>

package/src/blocks/image/component-info.js

@@ -18,7 +18,53 @@ const componentInfo = {
       allowedFileTypes: ["jpeg", "jpg", "png", "svg"],
       required: true,
       defaultValue: "https://cdn.builder.io/api/v1/image/assets%2Fpwgjf0RoYWbdnJSbpBAjXNRMe9F2%2Ffb27a7c790324294af8be1c35fe30f4d",
-      onChange: "        const DEFAULT_ASPECT_RATIO = 0.7041;        options.delete('srcset');        options.delete('noWebp');        function loadImage(url, timeout) {          return new Promise((resolve, reject) => {            const img = document.createElement('img');            let loaded = false;            img.onload = () => {              loaded = true;              resolve(img);            };            img.addEventListener('error', event => {              console.warn('Image load failed', event.error);              reject(event.error);            });            img.src = url;            setTimeout(() => {              if (!loaded) {                reject(new Error('Image load timed out'));              }            }, timeout);          });        }        function round(num) {          return Math.round(num * 1000) / 1000;        }        const value = options.get('image');        const aspectRatio = options.get('aspectRatio');        // For SVG images - don't render as webp, keep them as SVG        fetch(value)          .then(res => res.blob())          .then(blob => {            if (blob.type.includes('svg')) {              options.set('noWebp', true);            }          });        if (value && (!aspectRatio || aspectRatio === DEFAULT_ASPECT_RATIO)) {          return loadImage(value).then(img => {            const possiblyUpdatedAspectRatio = options.get('aspectRatio');            if (              options.get('image') === value &&              (!possiblyUpdatedAspectRatio || possiblyUpdatedAspectRatio === DEFAULT_ASPECT_RATIO)            ) {              if (img.width && img.height) {                options.set('aspectRatio', round(img.height / img.width));                options.set('height', img.height);                options.set('width', img.width);              }            }          });        }"
+      onChange(options) {
+        const DEFAULT_ASPECT_RATIO = 0.7041;
+        options.delete("srcset");
+        options.delete("noWebp");
+        function loadImage(url, timeout = 6e4) {
+          return new Promise((resolve, reject) => {
+            const img = document.createElement("img");
+            let loaded = false;
+            img.onload = () => {
+              loaded = true;
+              resolve(img);
+            };
+            img.addEventListener("error", (event) => {
+              console.warn("Image load failed", event.error);
+              reject(event.error);
+            });
+            img.src = url;
+            setTimeout(() => {
+              if (!loaded) {
+                reject(new Error("Image load timed out"));
+              }
+            }, timeout);
+          });
+        }
+        function round(num) {
+          return Math.round(num * 1e3) / 1e3;
+        }
+        const value = options.get("image");
+        const aspectRatio = options.get("aspectRatio");
+        fetch(value).then((res) => res.blob()).then((blob) => {
+          if (blob.type.includes("svg")) {
+            options.set("noWebp", true);
+          }
+        });
+        if (value && (!aspectRatio || aspectRatio === DEFAULT_ASPECT_RATIO)) {
+          return loadImage(value).then((img) => {
+            const possiblyUpdatedAspectRatio = options.get("aspectRatio");
+            if (options.get("image") === value && (!possiblyUpdatedAspectRatio || possiblyUpdatedAspectRatio === DEFAULT_ASPECT_RATIO)) {
+              if (img.width && img.height) {
+                options.set("aspectRatio", round(img.height / img.width));
+                options.set("height", img.height);
+                options.set("width", img.width);
+              }
+            }
+          });
+        }
+      }
     },
     {
       name: "backgroundSize",

package/src/blocks/image/image.helpers.js

@@ -0,0 +1,48 @@
+function removeProtocol(path) {
+  return path.replace(/http(s)?:/, "");
+}
+function updateQueryParam(uri = "", key, value) {
+  const re = new RegExp("([?&])" + key + "=.*?(&|$)", "i");
+  const separator = uri.indexOf("?") !== -1 ? "&" : "?";
+  if (uri.match(re)) {
+    return uri.replace(re, "$1" + key + "=" + encodeURIComponent(value) + "$2");
+  }
+  return uri + separator + key + "=" + encodeURIComponent(value);
+}
+function getShopifyImageUrl(src, size) {
+  if (!src || !(src == null ? void 0 : src.match(/cdn\.shopify\.com/)) || !size) {
+    return src;
+  }
+  if (size === "master") {
+    return removeProtocol(src);
+  }
+  const match = src.match(/(_\d+x(\d+)?)?(\.(jpg|jpeg|gif|png|bmp|bitmap|tiff|tif)(\?v=\d+)?)/i);
+  if (match) {
+    const prefix = src.split(match[0]);
+    const suffix = match[3];
+    const useSize = size.match("x") ? size : `${size}x`;
+    return removeProtocol(`${prefix[0]}_${useSize}${suffix}`);
+  }
+  return null;
+}
+function getSrcSet(url) {
+  if (!url) {
+    return url;
+  }
+  const sizes = [100, 200, 400, 800, 1200, 1600, 2e3];
+  if (url.match(/builder\.io/)) {
+    let srcUrl = url;
+    const widthInSrc = Number(url.split("?width=")[1]);
+    if (!isNaN(widthInSrc)) {
+      srcUrl = `${srcUrl} ${widthInSrc}w`;
+    }
+    return sizes.filter((size) => size !== widthInSrc).map((size) => `${updateQueryParam(url, "width", size)} ${size}w`).concat([srcUrl]).join(", ");
+  }
+  if (url.match(/cdn\.shopify\.com/)) {
+    return sizes.map((size) => [getShopifyImageUrl(url, `${size}x${size}`), size]).filter(([sizeUrl]) => !!sizeUrl).map(([sizeUrl, size]) => `${sizeUrl} ${size}w`).concat([url]).join(", ");
+  }
+  return url;
+}
+export {
+  getSrcSet
+};

package/src/blocks/image/image.jsx

@@ -1,11 +1,48 @@
 import { Show } from "solid-js";
+import { createMutable } from "solid-js/store";
 import { css } from "solid-styled-components";
+import { getSrcSet } from "./image.helpers";
 
 function Image(props) {
+  const state = createMutable({
+    get srcSetToUse() {
+      const imageToUse = props.image || props.src;
+      const url = imageToUse;
+
+      if (!url || // We can auto add srcset for cdn.builder.io and shopify
+      // images, otherwise you can supply this prop manually
+      !(url.match(/builder\.io/) || url.match(/cdn\.shopify\.com/))) {
+        return props.srcset;
+      }
+
+      if (props.srcset && props.image?.includes("builder.io/api/v1/image")) {
+        if (!props.srcset.includes(props.image.split("?")[0])) {
+          console.debug("Removed given srcset");
+          return getSrcSet(url);
+        }
+      } else if (props.image && !props.srcset) {
+        return getSrcSet(url);
+      }
+
+      return getSrcSet(url);
+    },
+
+    get webpSrcSet() {
+      if (state.srcSetToUse?.match(/builder\.io/) && !props.noWebp) {
+        return state.srcSetToUse.replace(/\?/g, "?format=webp&");
+      } else {
+        return "";
+      }
+    }
+
+  });
   return <div class={css({
     position: "relative"
   })}>
       <picture>
+        <Show when={state.webpSrcSet}>
+          <source type="image/webp" srcset={state.webpSrcSet} />
+        </Show>
         <img class={"builder-image" + (props.className ? " " + props.className : "") + " " + css({
         opacity: "1",
         transition: "opacity 0.2s ease-in-out",
@@ -17,8 +54,8 @@ function Image(props) {
       })} loading="lazy" alt={props.altText} role={props.altText ? "presentation" : undefined} style={{
         "object-position": props.backgroundSize || "center",
         "object-fit": props.backgroundSize || "cover"
-      }} src={props.image} srcset={props.srcset} sizes={props.sizes} />
-        <source srcset={props.srcset} />
+      }} src={props.image} srcset={state.srcSetToUse} sizes={props.sizes} />
+        <source srcset={state.srcSetToUse} />
       </picture>
       <Show when={props.aspectRatio && !(props.fitContent && props.builderBlock?.children?.length)}>
         <div class={"builder-image-sizer " + css({
@@ -26,6 +63,7 @@ function Image(props) {
         pointerEvents: "none",
         fontSize: "0"
       })} style={{
+        // eslint-disable-next-line @typescript-eslint/no-non-null-assertion
         "padding-top": props.aspectRatio * 100 + "%"
       }}></div>
       </Show>

package/src/blocks/symbol/symbol.jsx

@@ -1,7 +1,8 @@
-import { useContext, onMount } from "solid-js";
+import { useContext, onMount, on, createEffect } from "solid-js";
 import { createMutable } from "solid-js/store";
 import RenderContent from "../../components/render-content/render-content.jsx";
 import BuilderContext from "../../context/builder.context";
+import { getContent } from "../../functions/get-content/index.js";
 
 function Symbol(props) {
   const state = createMutable({
@@ -12,10 +13,37 @@ function Symbol(props) {
   onMount(() => {
     state.content = props.symbol?.content;
   });
+
+  function onUpdateFn_0() {
+    const symbolToUse = props.symbol;
+    /**
+     * If:
+     * - we have a symbol prop
+     * - yet it does not have any content
+     * - and we have not already stored content from before
+     * - and it has a model name
+     *
+     * then we want to re-fetch the symbol content.
+     */
+
+    if (symbolToUse && !symbolToUse.content && !state.content && symbolToUse.model) {
+      getContent({
+        model: symbolToUse.model,
+        apiKey: builderContext.apiKey,
+        query: {
+          id: symbolToUse.entry
+        }
+      }).then(response => {
+        state.content = response;
+      });
+    }
+  }
+
+  createEffect(on(() => [props.symbol?.content, props.symbol?.model, props.symbol?.entry, state.content], onUpdateFn_0));
   return <div class={state.className} {...props.attributes} dataSet={{
     class: state.className
   }}>
-      <RenderContent apiKey={builderContext.apiKey} context={builderContext.context} data={{ ...props.symbol?.data,
+      <RenderContent apiKey={builderContext.apiKey} context={builderContext.context} customComponents={Object.values(builderContext.registeredComponents)} data={{ ...props.symbol?.data,
       ...builderContext.state,
       ...props.symbol?.content?.data?.state
     }} model={props.symbol?.model} content={state.content}></RenderContent>

package/src/blocks/video/video.jsx

@@ -8,7 +8,7 @@ function Video(props) {
     // Hack to get object fit to work as expected and
     // not have the video overflow
     "border-radius": 1
-  }} key={props.video || "no-src"} poster={props.posterImage} autoPlay={props.autoPlay} muted={props.muted} controls={props.controls} loop={props.loop}></video>;
+  }} src={props.video || "no-src"} poster={props.posterImage} autoPlay={props.autoPlay} muted={props.muted} controls={props.controls} loop={props.loop}></video>;
 }
 
 export default Video;

package/src/components/render-block/render-block.jsx

@@ -139,34 +139,30 @@ function RenderBlock(props) {
         return undefined;
       }
 
-      const {
-        collection,
-        itemName
-      } = repeat;
       const itemsArray = evaluate({
-        code: collection,
+        code: repeat.collection,
         state: builderContext.state,
         context: builderContext.context
       });
 
-      if (Array.isArray(itemsArray)) {
-        const collectionName = collection.split(".").pop();
-        const itemNameToUse = itemName || (collectionName ? collectionName + "Item" : "item");
-        const repeatArray = itemsArray.map((item, index) => ({
-          context: { ...builderContext,
-            state: { ...builderContext.state,
-              $index: index,
-              $item: item,
-              [itemNameToUse]: item,
-              [`$${itemNameToUse}Index`]: index
-            }
-          },
-          block: blockWithoutRepeat
-        }));
-        return repeatArray;
-      } else {
+      if (!Array.isArray(itemsArray)) {
         return undefined;
       }
+
+      const collectionName = repeat.collection.split(".").pop();
+      const itemNameToUse = repeat.itemName || (collectionName ? collectionName + "Item" : "item");
+      const repeatArray = itemsArray.map((item, index) => ({
+        context: { ...builderContext,
+          state: { ...builderContext.state,
+            $index: index,
+            $item: item,
+            [itemNameToUse]: item,
+            [`$${itemNameToUse}Index`]: index
+          }
+        },
+        block: blockWithoutRepeat
+      }));
+      return repeatArray;
     }
 
   });
@@ -174,7 +170,7 @@ function RenderBlock(props) {
   return <Show fallback={<RenderComponent {...state.renderComponentProps}></RenderComponent>} when={state.shouldWrap}>
       <Show fallback={<Dynamic {...state.attributes} component={state.tagName}></Dynamic>} when={!isEmptyHtmlElement(state.tagName)}>
         <Dynamic {...state.attributes} component={state.tagName}>
-          <Show fallback={<RenderComponent {...state.renderComponentProps}></RenderComponent>} when={state.repeatItemData}>
+          <Show when={state.repeatItemData}>
             <For each={state.repeatItemData}>
               {(data, _index) => {
               const index = _index();
@@ -183,6 +179,9 @@ function RenderBlock(props) {
             }}
             </For>
           </Show>
+          <Show when={!state.repeatItemData}>
+            <RenderComponent {...state.renderComponentProps}></RenderComponent>
+          </Show>
           <For each={state.childrenWithoutParentComponent}>
             {(child, _index) => {
             const index = _index();

package/src/components/render-content/render-content.jsx

@@ -1,17 +1,15 @@
-import { Show, onMount } from "solid-js";
+import { Show, onMount, on, createEffect } from "solid-js";
 import { Dynamic } from "solid-js/web";
 import { createMutable } from "solid-js/store";
 import { getDefaultRegisteredComponents } from "../../constants/builder-registered-components.js";
 import { TARGET } from "../../constants/target.js";
 import BuilderContext from "../../context/builder.context";
 import { evaluate } from "../../functions/evaluate.js";
-import { convertSearchParamsToQueryObject, getBuilderSearchParams } from "../../functions/get-builder-search-params/index.js";
 import { getContent } from "../../functions/get-content/index.js";
 import { getFetch } from "../../functions/get-fetch.js";
 import { isBrowser } from "../../functions/is-browser.js";
 import { isEditing } from "../../functions/is-editing.js";
 import { isPreviewing } from "../../functions/is-previewing.js";
-import { previewingModelName } from "../../functions/previewing-model-name.js";
 import { components, createRegisterComponentMessage } from "../../functions/register-component.js";
 import { track } from "../../functions/track.js";
 import RenderBlocks from "../render-blocks.jsx";
@@ -153,6 +151,10 @@ function RenderContent(props) {
           }
         }));
       }
+    },
+
+    get shouldRenderContentStyles() {
+      return Boolean((state.useContent?.data?.cssCode || state.useContent?.data?.customFonts?.length) && TARGET !== "reactNative");
     }
 
   });
@@ -175,15 +177,15 @@ function RenderContent(props) {
 
 
       if (isPreviewing()) {
-        if (props.model && previewingModelName() === props.model) {
-          const currentUrl = new URL(location.href);
-          const previewApiKey = currentUrl.searchParams.get("apiKey");
+        const searchParams = new URL(location.href).searchParams;
+
+        if (props.model && searchParams.get("builder.preview") === props.model) {
+          const previewApiKey = searchParams.get("apiKey") || searchParams.get("builder.space");
 
           if (previewApiKey) {
             getContent({
               model: props.model,
-              apiKey: previewApiKey,
-              options: getBuilderSearchParams(convertSearchParamsToQueryObject(currentUrl.searchParams))
+              apiKey: previewApiKey
             }).then(content => {
               if (content) {
                 state.overrideContent = content;
@@ -198,6 +200,24 @@ function RenderContent(props) {
       state.emitStateUpdate();
     }
   });
+
+  function onUpdateFn_0() {
+    state.evaluateJsCode();
+  }
+
+  createEffect(on(() => [state.useContent?.data?.jsCode], onUpdateFn_0));
+
+  function onUpdateFn_1() {
+    state.runHttpRequests();
+  }
+
+  createEffect(on(() => [state.useContent?.data?.httpRequests], onUpdateFn_1));
+
+  function onUpdateFn_2() {
+    state.emitStateUpdate();
+  }
+
+  createEffect(on(() => [state.contentState], onUpdateFn_2));
   return <Dynamic value={{
     get content() {
       return state.useContent;
@@ -224,8 +244,8 @@ function RenderContent(props) {
         <div onClick={event => track("click", {
         contentId: state.useContent.id
       })} data-builder-content-id={state.useContent?.id}>
-          <Show when={(state.useContent?.data?.cssCode || state.useContent?.data?.customFonts?.length) && TARGET !== "reactNative"}>
-            <RenderContentStyles cssCode={state.useContent.data.cssCode} customFonts={state.useContent.data.customFonts}></RenderContentStyles>
+          <Show when={state.shouldRenderContentStyles}>
+            <RenderContentStyles cssCode={state.useContent?.data?.cssCode} customFonts={state.useContent?.data?.customFonts}></RenderContentStyles>
           </Show>
           <RenderBlocks blocks={state.useContent?.data?.blocks}></RenderBlocks>
         </div>

package/src/constants/builder-registered-components.js

@@ -30,6 +30,8 @@ import { componentInfo as textComponentInfo } from "../blocks/text/component-inf
 import { default as Text } from "../blocks/text/text.jsx";
 import { componentInfo as videoComponentInfo } from "../blocks/video/component-info";
 import { default as Video } from "../blocks/video/video.jsx";
+import { componentInfo as embedComponentInfo } from "../blocks/embed/component-info";
+import { default as embed } from "../blocks/embed/embed.jsx";
 const getDefaultRegisteredComponents = () => [
   __spreadValues({ component: Columns }, columnsComponentInfo),
   __spreadValues({ component: Image }, imageComponentInfo),
@@ -38,7 +40,8 @@ const getDefaultRegisteredComponents = () => [
   __spreadValues({ component: Symbol }, symbolComponentInfo),
   __spreadValues({ component: Button }, buttonComponentInfo),
   __spreadValues({ component: Section }, sectionComponentInfo),
-  __spreadValues({ component: Fragment }, fragmentComponentInfo)
+  __spreadValues({ component: Fragment }, fragmentComponentInfo),
+  __spreadValues({ component: embed }, embedComponentInfo)
 ];
 export {
   getDefaultRegisteredComponents

package/src/functions/get-builder-search-params/index.js

@@ -1,3 +1,4 @@
+import { isBrowser } from "../is-browser";
 const BUILDER_SEARCHPARAMS_PREFIX = "builder.";
 const convertSearchParamsToQueryObject = (searchParams) => {
   const options = {};
@@ -16,7 +17,17 @@ const getBuilderSearchParams = (options) => {
   });
   return newOptions;
 };
+const getBuilderSearchParamsFromWindow = () => {
+  if (!isBrowser()) {
+    return {};
+  }
+  const searchParams = new URLSearchParams(window.location.search);
+  return getBuilderSearchParams(convertSearchParamsToQueryObject(searchParams));
+};
+const normalizeSearchParams = (searchParams) => searchParams instanceof URLSearchParams ? convertSearchParamsToQueryObject(searchParams) : searchParams;
 export {
   convertSearchParamsToQueryObject,
-  getBuilderSearchParams
+  getBuilderSearchParams,
+  getBuilderSearchParamsFromWindow,
+  normalizeSearchParams
 };

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

@@ -0,0 +1,38 @@
+const handleABTesting = (item, testGroups) => {
+  if (item.variations && Object.keys(item.variations).length) {
+    const testGroup = item.id ? testGroups[item.id] : void 0;
+    const variationValue = testGroup ? item.variations[testGroup] : void 0;
+    if (testGroup && variationValue) {
+      item.data = variationValue.data;
+      item.testVariationId = variationValue.id;
+      item.testVariationName = variationValue.name;
+    } else {
+      let n = 0;
+      const random = Math.random();
+      let set = false;
+      for (const id in item.variations) {
+        const variation = item.variations[id];
+        const testRatio = variation.testRatio;
+        n += testRatio;
+        if (random < n) {
+          const variationName = variation.name || (variation.id === item.id ? "Default variation" : "");
+          set = true;
+          Object.assign(item, {
+            data: variation.data,
+            testVariationId: variation.id,
+            testVariationName: variationName
+          });
+        }
+      }
+      if (!set) {
+        Object.assign(item, {
+          testVariationId: item.id,
+          testVariationName: "Default"
+        });
+      }
+    }
+  }
+};
+export {
+  handleABTesting
+};

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

@@ -37,20 +37,14 @@ var __async = (__this, __arguments, generator) => {
     step((generator = generator.apply(__this, __arguments)).next());
   });
 };
+import { flatten } from "../../helpers/flatten.js";
+import {
+  getBuilderSearchParamsFromWindow,
+  normalizeSearchParams
+} from "../get-builder-search-params/index.js";
 import { getFetch } from "../get-fetch.js";
+import { handleABTesting } from "./ab-testing.js";
 const fetch$ = getFetch();
-function flatten(object, path = null, separator = ".") {
-  return Object.keys(object).reduce((acc, key) => {
-    const value = object[key];
-    const newPath = [path, key].filter(Boolean).join(separator);
-    const isObject = [
-      typeof value === "object",
-      value !== null,
-      !(Array.isArray(value) && value.length === 0)
-    ].every(Boolean);
-    return isObject ? __spreadValues(__spreadValues({}, acc), flatten(value, newPath, separator)) : __spreadProps(__spreadValues({}, acc), { [newPath]: value });
-  }, {});
-}
 function getContent(options) {
   return __async(this, null, function* () {
     return (yield getAllContent(__spreadProps(__spreadValues({}, options), { limit: 1 }))).results[0] || null;
@@ -66,67 +60,31 @@ const generateContentUrl = (options) => {
     apiKey
   } = options;
   const url = new URL(`https://cdn.builder.io/api/v2/content/${model}?apiKey=${apiKey}&limit=${limit}&noTraverse=${noTraverse}`);
-  if (options.options) {
-    const flattened = flatten(options.options);
-    for (const key in flattened) {
-      url.searchParams.set(key, String(flattened[key]));
-    }
+  const queryOptions = __spreadValues(__spreadValues({}, getBuilderSearchParamsFromWindow()), normalizeSearchParams(options.options || {}));
+  const flattened = flatten(queryOptions);
+  for (const key in flattened) {
+    url.searchParams.set(key, String(flattened[key]));
   }
   if (userAttributes) {
     url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
   }
   if (query) {
-    const flattened = flatten({ query });
-    for (const key in flattened) {
-      url.searchParams.set(key, JSON.stringify(flattened[key]));
+    const flattened2 = flatten({ query });
+    for (const key in flattened2) {
+      url.searchParams.set(key, JSON.stringify(flattened2[key]));
     }
   }
   return url;
 };
-const handleABTesting = (content, testGroups) => {
-  for (const item of content.results) {
-    if (item.variations && Object.keys(item.variations).length) {
-      const testGroup = testGroups[item.id];
-      const variationValue = item.variations[testGroup];
-      if (testGroup && variationValue) {
-        item.data = variationValue.data;
-        item.testVariationId = variationValue.id;
-        item.testVariationName = variationValue.name;
-      } else {
-        let n = 0;
-        const random = Math.random();
-        let set = false;
-        for (const id in item.variations) {
-          const variation = item.variations[id];
-          const testRatio = variation.testRatio;
-          n += testRatio;
-          if (random < n) {
-            const variationName = variation.name || (variation.id === item.id ? "Default variation" : "");
-            set = true;
-            Object.assign(item, {
-              data: variation.data,
-              testVariationId: variation.id,
-              testVariationName: variationName
-            });
-          }
-        }
-        if (!set) {
-          Object.assign(item, {
-            testVariationId: item.id,
-            testVariationName: "Default"
-          });
-        }
-      }
-    }
-  }
-};
 function getAllContent(options) {
   return __async(this, null, function* () {
     const url = generateContentUrl(options);
     const fetch = yield fetch$;
     const content = yield fetch(url.href).then((res) => res.json());
     if (options.testGroups) {
-      handleABTesting(content, options.testGroups);
+      for (const item of content.results) {
+        handleABTesting(item, options.testGroups);
+      }
     }
     return content;
   });

package/src/functions/register-component.js

@@ -29,7 +29,6 @@ var __objRest = (source, exclude) => {
     }
   return target;
 };
-import { fastClone } from "./fast-clone.js";
 const components = [];
 function registerComponent(component, info) {
   components.push(__spreadValues({ component }, info));
@@ -38,31 +37,34 @@ function registerComponent(component, info) {
 }
 const createRegisterComponentMessage = (_a) => {
   var _b = _a, {
-    component
+    component: _
   } = _b, info = __objRest(_b, [
     "component"
   ]);
   return {
     type: "builder.registerComponent",
-    data: prepareComponentInfoToSend(fastClone(info))
+    data: prepareComponentInfoToSend(info)
   };
 };
-function prepareComponentInfoToSend(info) {
-  return __spreadValues(__spreadValues({}, info), info.inputs && {
-    inputs: info.inputs.map((input) => {
-      const keysToConvertFnToString = ["onChange", "showIf"];
-      for (const key of keysToConvertFnToString) {
-        const fn = input[key];
-        if (fn && typeof fn === "function") {
-          input = __spreadProps(__spreadValues({}, input), {
-            [key]: `return (${fn.toString()}).apply(this, arguments)`
-          });
-        }
-      }
-      return input;
-    })
+const fastClone = (obj) => JSON.parse(JSON.stringify(obj));
+const serializeValue = (value) => typeof value === "function" ? serializeFn(value) : fastClone(value);
+const serializeFn = (fnValue) => {
+  const fnStr = fnValue.toString().trim();
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
+};
+const prepareComponentInfoToSend = (_c) => {
+  var _d = _c, {
+    inputs
+  } = _d, info = __objRest(_d, [
+    "inputs"
+  ]);
+  return __spreadProps(__spreadValues({}, fastClone(info)), {
+    inputs: inputs == null ? void 0 : inputs.map((input) => Object.entries(input).reduce((acc, [key, value]) => __spreadProps(__spreadValues({}, acc), {
+      [key]: serializeValue(value)
+    }), {}))
   });
-}
+};
 export {
   components,
   createRegisterComponentMessage,

package/src/helpers/flatten.js

@@ -0,0 +1,34 @@
+var __defProp = Object.defineProperty;
+var __defProps = Object.defineProperties;
+var __getOwnPropDescs = Object.getOwnPropertyDescriptors;
+var __getOwnPropSymbols = Object.getOwnPropertySymbols;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __propIsEnum = Object.prototype.propertyIsEnumerable;
+var __defNormalProp = (obj, key, value) => key in obj ? __defProp(obj, key, { enumerable: true, configurable: true, writable: true, value }) : obj[key] = value;
+var __spreadValues = (a, b) => {
+  for (var prop in b || (b = {}))
+    if (__hasOwnProp.call(b, prop))
+      __defNormalProp(a, prop, b[prop]);
+  if (__getOwnPropSymbols)
+    for (var prop of __getOwnPropSymbols(b)) {
+      if (__propIsEnum.call(b, prop))
+        __defNormalProp(a, prop, b[prop]);
+    }
+  return a;
+};
+var __spreadProps = (a, b) => __defProps(a, __getOwnPropDescs(b));
+function flatten(object, path = null, separator = ".") {
+  return Object.keys(object).reduce((acc, key) => {
+    const value = object[key];
+    const newPath = [path, key].filter(Boolean).join(separator);
+    const isObject = [
+      typeof value === "object",
+      value !== null,
+      !(Array.isArray(value) && value.length === 0)
+    ].every(Boolean);
+    return isObject ? __spreadValues(__spreadValues({}, acc), flatten(value, newPath, separator)) : __spreadProps(__spreadValues({}, acc), { [newPath]: value });
+  }, {});
+}
+export {
+  flatten
+};

package/src/functions/fast-clone.js

@@ -1,4 +0,0 @@
-const fastClone = (obj) => JSON.parse(JSON.stringify(obj));
-export {
-  fastClone
-};

package/src/functions/previewing-model-name.js

@@ -1,11 +0,0 @@
-import { isPreviewing } from "./is-previewing.js";
-function previewingModelName() {
-  if (!isPreviewing()) {
-    return null;
-  }
-  const url = new URL(location.href);
-  return url.searchParams.get("builder.preview");
-}
-export {
-  previewingModelName
-};