@builder.io/sdk-solid 0.7.0 → 0.7.1-0

package/lib/browser/dev.js

@@ -1,4 +1,4 @@
-import { delegateEvents, createComponent, spread, mergeProps, insert, effect, setAttribute, className, style, template, memo, Dynamic, use } from 'solid-js/web';
+import { createComponent, spread, mergeProps, insert, effect, setAttribute, className, style, template, memo, Dynamic, use } from 'solid-js/web';
 import { createContext, Show, useContext, For, createSignal, onMount, createEffect, on } from 'solid-js';
 import { css } from 'solid-styled-components';
 
@@ -185,6 +185,19 @@ var getFunctionArguments = ({
     event
   });
 };
+var getBuilderGlobals = () => ({
+  isEditing: isEditing(),
+  isBrowser: isBrowser(),
+  isServer: !isBrowser(),
+  getUserAttributes: () => getUserAttributes()
+});
+var parseCode = (code, {
+  isExpression = true
+}) => {
+  const useReturn = isExpression && !(code.includes(";") || code.includes(" return ") || code.trim().startsWith("return "));
+  const useCode = useReturn ? `return (${code});` : code;
+  return useCode;
+};
 
 // src/functions/evaluate/browser-runtime/browser.js
 var runInBrowser = ({
@@ -226,6 +239,9 @@ function flattenState(rootState, localState, rootSetState) {
   });
 }
 
+// src/functions/evaluate/choose-eval.js
+var chooseBrowserOrServerEval = (args) => isBrowser() ? runInBrowser(args) : runInBrowser(args);
+
 // src/functions/evaluate/evaluate.js
 function evaluate({
   code,
@@ -240,17 +256,11 @@ function evaluate({
     logger.warn("Skipping evaluation of empty code block.");
     return;
   }
-  const builder = {
-    isEditing: isEditing(),
-    isBrowser: isBrowser(),
-    isServer: !isBrowser(),
-    getUserAttributes: () => getUserAttributes()
-  };
-  const useReturn = isExpression && !(code.includes(";") || code.includes(" return ") || code.trim().startsWith("return "));
-  const useCode = useReturn ? `return (${code});` : code;
   const args = {
-    code: useCode,
-    builder,
+    code: parseCode(code, {
+      isExpression
+    }),
+    builder: getBuilderGlobals(),
     context,
     event,
     rootSetState,
@@ -258,7 +268,7 @@ function evaluate({
     localState
   };
   try {
-    return runInBrowser(args);
+    return chooseBrowserOrServerEval(args);
   } catch (e) {
     logger.error("Failed code evaluation: " + e.message, {
       code
@@ -2683,42 +2693,40 @@ var _tmpl$13 = /* @__PURE__ */ template(`<div>`);
 function CustomCode(props) {
   const [scriptsInserted, setScriptsInserted] = createSignal([]);
   const [scriptsRun, setScriptsRun] = createSignal([]);
-  function findAndRunScripts() {
-    if (elem && elem.getElementsByTagName && typeof window !== "undefined") {
-      const scripts = elem.getElementsByTagName("script");
-      for (let i = 0; i < scripts.length; i++) {
-        const script = scripts[i];
-        if (script.src) {
-          if (scriptsInserted().includes(script.src)) {
-            continue;
-          }
-          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 (scriptsRun().includes(script.innerText)) {
-            continue;
-          }
-          try {
-            scriptsRun().push(script.innerText);
-            new Function(script.innerText)();
-          } catch (error) {
-            console.warn("`CustomCode`: Error running script:", error);
-          }
+  let elementRef;
+  onMount(() => {
+    if (!elementRef?.getElementsByTagName || typeof window === "undefined") {
+      return;
+    }
+    const scripts = elementRef.getElementsByTagName("script");
+    for (let i = 0; i < scripts.length; i++) {
+      const script = scripts[i];
+      if (script.src) {
+        if (scriptsInserted().includes(script.src)) {
+          continue;
+        }
+        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 (scriptsRun().includes(script.innerText)) {
+          continue;
+        }
+        try {
+          scriptsRun().push(script.innerText);
+          new Function(script.innerText)();
+        } catch (error) {
+          console.warn("`CustomCode`: Error running script:", error);
         }
       }
     }
-  }
-  let elem;
-  onMount(() => {
-    findAndRunScripts();
   });
   return (() => {
     const _el$ = _tmpl$13();
-    const _ref$ = elem;
-    typeof _ref$ === "function" ? use(_ref$, _el$) : elem = _el$;
+    const _ref$ = elementRef;
+    typeof _ref$ === "function" ? use(_ref$, _el$) : elementRef = _el$;
     effect((_p$) => {
       const _v$ = "builder-custom-code" + (props.replaceNodes ? " replace-nodes" : ""), _v$2 = props.code;
       _v$ !== _p$._v$ && className(_el$, _p$._v$ = _v$);
@@ -3381,7 +3389,7 @@ var track = (args) => _track(__spreadProps9(__spreadValues12({}, args), {
 }));
 
 // src/constants/sdk-version.js
-var SDK_VERSION = "0.7.0";
+var SDK_VERSION = "0.7.1-0";
 
 // src/functions/register.js
 var registry = {};
@@ -3835,6 +3843,7 @@ var __spreadValues15 = (a, b) => {
     }
   return a;
 };
+var isPositiveNumber = (thing) => typeof thing === "number" && !isNaN(thing) && thing >= 0;
 var generateContentUrl = (options) => {
   let {
     noTraverse = false
@@ -3848,7 +3857,14 @@ var generateContentUrl = (options) => {
     includeRefs = true,
     enrich,
     locale,
-    apiVersion = DEFAULT_API_VERSION
+    apiVersion = DEFAULT_API_VERSION,
+    fields,
+    omit,
+    offset,
+    cacheSeconds,
+    staleCacheSeconds,
+    sort,
+    includeUnpublished
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -3860,6 +3876,30 @@ var generateContentUrl = (options) => {
     noTraverse = true;
   }
   const url = new URL(`https://cdn.builder.io/api/${apiVersion}/content/${model}?apiKey=${apiKey}&limit=${limit}&noTraverse=${noTraverse}&includeRefs=${includeRefs}${locale ? `&locale=${locale}` : ""}${enrich ? `&enrich=${enrich}` : ""}`);
+  url.searchParams.set("omit", omit || "meta.componentsUsed");
+  if (fields) {
+    url.searchParams.set("fields", fields);
+  }
+  if (Number.isFinite(offset) && offset > -1) {
+    url.searchParams.set("offset", String(Math.floor(offset)));
+  }
+  if (typeof includeUnpublished === "boolean") {
+    url.searchParams.set("includeUnpublished", String(includeUnpublished));
+  }
+  if (cacheSeconds && isPositiveNumber(cacheSeconds)) {
+    url.searchParams.set("cacheSeconds", String(cacheSeconds));
+  }
+  if (staleCacheSeconds && isPositiveNumber(staleCacheSeconds)) {
+    url.searchParams.set("staleCacheSeconds", String(staleCacheSeconds));
+  }
+  if (sort) {
+    const flattened2 = flatten({
+      sort
+    });
+    for (const key in flattened2) {
+      url.searchParams.set(key, JSON.stringify(flattened2[key]));
+    }
+  }
   const queryOptions = __spreadValues15(__spreadValues15({}, getBuilderSearchParamsFromWindow()), normalizeSearchParams(options.options || {}));
   const flattened = flatten(queryOptions);
   for (const key in flattened) {
@@ -4150,11 +4190,8 @@ function EnableEditor(props) {
   }
   let elementRef;
   onMount(() => {
-    if (!props.apiKey) {
-      logger.error("No API key provided to `RenderContent` component. This can cause issues. Please provide an API key using the `apiKey` prop.");
-    }
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && true) {
         setForceReRenderCount(forceReRenderCount() + 1);
         window.addEventListener("message", processMessage);
         registerInsertMenu();
@@ -4175,18 +4212,20 @@ function EnableEditor(props) {
         });
         window.addEventListener("builder:component:stateChangeListenerActivated", emitStateUpdate);
       }
-      if (props.builderContextSignal.content) {
+      const shouldTrackImpression = props.builderContextSignal.content && getDefaultCanTrack(props.canTrack);
+      if (shouldTrackImpression) {
         const variationId = props.builderContextSignal.content?.testVariationId;
         const contentId = props.builderContextSignal.content?.id;
+        const apiKeyProp = props.apiKey;
         _track({
           type: "impression",
-          canTrack: getDefaultCanTrack(props.canTrack),
+          canTrack: true,
           contentId,
-          apiKey: props.apiKey,
+          apiKey: apiKeyProp,
           variationId: variationId !== contentId ? variationId : void 0
         });
       }
-      if (isPreviewing()) {
+      if (isPreviewing() && true) {
         const searchParams = new URL(location.href).searchParams;
         const searchParamPreviewModel = searchParams.get("builder.preview");
         const searchParamPreviewId = searchParams.get(`builder.preview.${searchParamPreviewModel}`);
@@ -4203,11 +4242,16 @@ function EnableEditor(props) {
           });
         }
       }
-      evaluateJsCode();
-      runHttpRequests();
-      emitStateUpdate();
     }
   });
+  onMount(() => {
+    if (!props.apiKey) {
+      logger.error("No API key provided to `RenderContent` component. This can cause issues. Please provide an API key using the `apiKey` prop.");
+    }
+    evaluateJsCode();
+    runHttpRequests();
+    emitStateUpdate();
+  });
   function onUpdateFn_0() {
     if (props.content) {
       mergeNewContent(props.content);
@@ -4240,16 +4284,17 @@ function EnableEditor(props) {
         },
         get children() {
           const _el$ = _tmpl$14();
-          _el$.$$click = (event) => onClick(event);
           const _ref$ = elementRef;
           typeof _ref$ === "function" ? use(_ref$, _el$) : elementRef = _el$;
           spread(_el$, mergeProps({
             get ["class"]() {
               return props.classNameProp;
-            },
+            }
+          }, {}, {
             get key() {
               return forceReRenderCount();
             },
+            "onClick": (event) => onClick(event),
             get ["builder-content-id"]() {
               return props.builderContextSignal.content?.id;
             },
@@ -4268,7 +4313,6 @@ function EnableEditor(props) {
   });
 }
 var enable_editor_default = EnableEditor;
-delegateEvents(["click"]);
 var _tmpl$15 = /* @__PURE__ */ template(`<script>`);
 function InlinedScript(props) {
   return (() => {

package/lib/browser/dev.jsx

@@ -172,6 +172,19 @@ var getFunctionArguments = ({
     event
   });
 };
+var getBuilderGlobals = () => ({
+  isEditing: isEditing(),
+  isBrowser: isBrowser(),
+  isServer: !isBrowser(),
+  getUserAttributes: () => getUserAttributes()
+});
+var parseCode = (code, {
+  isExpression = true
+}) => {
+  const useReturn = isExpression && !(code.includes(";") || code.includes(" return ") || code.trim().startsWith("return "));
+  const useCode = useReturn ? `return (${code});` : code;
+  return useCode;
+};
 
 // src/functions/evaluate/browser-runtime/browser.js
 var runInBrowser = ({
@@ -213,6 +226,9 @@ function flattenState(rootState, localState, rootSetState) {
   });
 }
 
+// src/functions/evaluate/choose-eval.js
+var chooseBrowserOrServerEval = (args) => isBrowser() ? runInBrowser(args) : runInBrowser(args);
+
 // src/functions/evaluate/evaluate.js
 function evaluate({
   code,
@@ -227,17 +243,11 @@ function evaluate({
     logger.warn("Skipping evaluation of empty code block.");
     return;
   }
-  const builder = {
-    isEditing: isEditing(),
-    isBrowser: isBrowser(),
-    isServer: !isBrowser(),
-    getUserAttributes: () => getUserAttributes()
-  };
-  const useReturn = isExpression && !(code.includes(";") || code.includes(" return ") || code.trim().startsWith("return "));
-  const useCode = useReturn ? `return (${code});` : code;
   const args = {
-    code: useCode,
-    builder,
+    code: parseCode(code, {
+      isExpression
+    }),
+    builder: getBuilderGlobals(),
     context,
     event,
     rootSetState,
@@ -245,7 +255,7 @@ function evaluate({
     localState
   };
   try {
-    return runInBrowser(args);
+    return chooseBrowserOrServerEval(args);
   } catch (e) {
     logger.error("Failed code evaluation: " + e.message, {
       code
@@ -2412,45 +2422,43 @@ import { onMount, createSignal as createSignal10 } from "solid-js";
 function CustomCode(props) {
   const [scriptsInserted, setScriptsInserted] = createSignal10([]);
   const [scriptsRun, setScriptsRun] = createSignal10([]);
-  function findAndRunScripts() {
-    if (elem && elem.getElementsByTagName && typeof window !== "undefined") {
-      const scripts = elem.getElementsByTagName("script");
-      for (let i = 0; i < scripts.length; i++) {
-        const script = scripts[i];
-        if (script.src) {
-          if (scriptsInserted().includes(script.src)) {
-            continue;
-          }
-          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 (scriptsRun().includes(script.innerText)) {
-            continue;
-          }
-          try {
-            scriptsRun().push(script.innerText);
-            new Function(script.innerText)();
-          } catch (error) {
-            console.warn("`CustomCode`: Error running script:", error);
-          }
+  let elementRef;
+  onMount(() => {
+    if (!elementRef?.getElementsByTagName || typeof window === "undefined") {
+      return;
+    }
+    const scripts = elementRef.getElementsByTagName("script");
+    for (let i = 0; i < scripts.length; i++) {
+      const script = scripts[i];
+      if (script.src) {
+        if (scriptsInserted().includes(script.src)) {
+          continue;
+        }
+        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 (scriptsRun().includes(script.innerText)) {
+          continue;
+        }
+        try {
+          scriptsRun().push(script.innerText);
+          new Function(script.innerText)();
+        } catch (error) {
+          console.warn("`CustomCode`: Error running script:", error);
         }
       }
     }
-  }
-  let elem;
-  onMount(() => {
-    findAndRunScripts();
   });
   return <div
     class={"builder-custom-code" + (props.replaceNodes ? " replace-nodes" : "")}
-    ref={elem}
+    ref={elementRef}
     innerHTML={props.code}
   />;
 }
@@ -3108,7 +3116,7 @@ var track = (args) => _track(__spreadProps9(__spreadValues12({}, args), {
 }));
 
 // src/constants/sdk-version.js
-var SDK_VERSION = "0.7.0";
+var SDK_VERSION = "0.7.1-0";
 
 // src/functions/register.js
 var registry = {};
@@ -3562,6 +3570,7 @@ var __spreadValues15 = (a, b) => {
     }
   return a;
 };
+var isPositiveNumber = (thing) => typeof thing === "number" && !isNaN(thing) && thing >= 0;
 var generateContentUrl = (options) => {
   let {
     noTraverse = false
@@ -3575,7 +3584,14 @@ var generateContentUrl = (options) => {
     includeRefs = true,
     enrich,
     locale,
-    apiVersion = DEFAULT_API_VERSION
+    apiVersion = DEFAULT_API_VERSION,
+    fields,
+    omit,
+    offset,
+    cacheSeconds,
+    staleCacheSeconds,
+    sort,
+    includeUnpublished
   } = options;
   if (!apiKey) {
     throw new Error("Missing API key");
@@ -3587,6 +3603,30 @@ var generateContentUrl = (options) => {
     noTraverse = true;
   }
   const url = new URL(`https://cdn.builder.io/api/${apiVersion}/content/${model}?apiKey=${apiKey}&limit=${limit}&noTraverse=${noTraverse}&includeRefs=${includeRefs}${locale ? `&locale=${locale}` : ""}${enrich ? `&enrich=${enrich}` : ""}`);
+  url.searchParams.set("omit", omit || "meta.componentsUsed");
+  if (fields) {
+    url.searchParams.set("fields", fields);
+  }
+  if (Number.isFinite(offset) && offset > -1) {
+    url.searchParams.set("offset", String(Math.floor(offset)));
+  }
+  if (typeof includeUnpublished === "boolean") {
+    url.searchParams.set("includeUnpublished", String(includeUnpublished));
+  }
+  if (cacheSeconds && isPositiveNumber(cacheSeconds)) {
+    url.searchParams.set("cacheSeconds", String(cacheSeconds));
+  }
+  if (staleCacheSeconds && isPositiveNumber(staleCacheSeconds)) {
+    url.searchParams.set("staleCacheSeconds", String(staleCacheSeconds));
+  }
+  if (sort) {
+    const flattened2 = flatten({
+      sort
+    });
+    for (const key in flattened2) {
+      url.searchParams.set(key, JSON.stringify(flattened2[key]));
+    }
+  }
   const queryOptions = __spreadValues15(__spreadValues15({}, getBuilderSearchParamsFromWindow()), normalizeSearchParams(options.options || {}));
   const flattened = flatten(queryOptions);
   for (const key in flattened) {
@@ -3873,13 +3913,8 @@ function EnableEditor(props) {
   }
   let elementRef;
   onMount2(() => {
-    if (!props.apiKey) {
-      logger.error(
-        "No API key provided to `RenderContent` component. This can cause issues. Please provide an API key using the `apiKey` prop."
-      );
-    }
     if (isBrowser()) {
-      if (isEditing()) {
+      if (isEditing() && true) {
         setForceReRenderCount(forceReRenderCount() + 1);
         window.addEventListener("message", processMessage);
         registerInsertMenu();
@@ -3905,18 +3940,20 @@ function EnableEditor(props) {
           emitStateUpdate
         );
       }
-      if (props.builderContextSignal.content) {
+      const shouldTrackImpression = props.builderContextSignal.content && getDefaultCanTrack(props.canTrack);
+      if (shouldTrackImpression) {
         const variationId = props.builderContextSignal.content?.testVariationId;
         const contentId = props.builderContextSignal.content?.id;
+        const apiKeyProp = props.apiKey;
         _track({
           type: "impression",
-          canTrack: getDefaultCanTrack(props.canTrack),
+          canTrack: true,
           contentId,
-          apiKey: props.apiKey,
+          apiKey: apiKeyProp,
           variationId: variationId !== contentId ? variationId : void 0
         });
       }
-      if (isPreviewing()) {
+      if (isPreviewing() && true) {
         const searchParams = new URL(location.href).searchParams;
         const searchParamPreviewModel = searchParams.get("builder.preview");
         const searchParamPreviewId = searchParams.get(
@@ -3935,11 +3972,18 @@ function EnableEditor(props) {
           });
         }
       }
-      evaluateJsCode();
-      runHttpRequests();
-      emitStateUpdate();
     }
   });
+  onMount2(() => {
+    if (!props.apiKey) {
+      logger.error(
+        "No API key provided to `RenderContent` component. This can cause issues. Please provide an API key using the `apiKey` prop."
+      );
+    }
+    evaluateJsCode();
+    runHttpRequests();
+    emitStateUpdate();
+  });
   function onUpdateFn_0() {
     if (props.content) {
       mergeNewContent(props.content);
@@ -3976,6 +4020,7 @@ function EnableEditor(props) {
   createEffect2(on2(() => [props.builderContextSignal.rootState], onUpdateFn_4));
   return <stdin_default.Provider value={props.builderContextSignal}><Show9 when={props.builderContextSignal.content}><div
     class={props.classNameProp}
+    {...{}}
     key={forceReRenderCount()}
     ref={elementRef}
     onClick={(event) => onClick(event)}