@builder.io/sdk-solid 2.0.28 → 2.0.30

package/lib/node/dev.jsx

@@ -1534,6 +1534,13 @@ function BlocksWrapper(props) {
       props.classNameProp
     ].filter(Boolean).join(" ");
   });
+  const dataPath = createMemo6(() => {
+    if (!props.path) {
+      return void 0;
+    }
+    const pathPrefix = "component.options.";
+    return props.path.startsWith(pathPrefix) ? props.path : `${pathPrefix}${props.path || ""}`;
+  });
   function onClick() {
     if (isEditing() && !props.blocks?.length) {
       window.parent?.postMessage(
@@ -1541,7 +1548,7 @@ function BlocksWrapper(props) {
           type: "builder.clickEmptyBlocks",
           data: {
             parentElementId: props.parent,
-            dataPath: props.path
+            dataPath: dataPath()
           }
         },
         "*"
@@ -1555,7 +1562,7 @@ function BlocksWrapper(props) {
           type: "builder.hoverEmptyBlocks",
           data: {
             parentElementId: props.parent,
-            dataPath: props.path
+            dataPath: dataPath()
           }
         },
         "*"
@@ -1567,9 +1574,9 @@ function BlocksWrapper(props) {
   });
   return <>
     <Dynamic4
-      class={className() + " dynamic-6567ee94"}
+      class={className() + " dynamic-5b6a86b6"}
       ref={blocksWrapperRef}
-      builder-path={props.path}
+      builder-path={dataPath()}
       builder-parent-id={props.parent}
       {...{}}
       style={props.styleProp}
@@ -1579,7 +1586,7 @@ function BlocksWrapper(props) {
       {...props.BlocksWrapperProps}
       component={props.BlocksWrapper}
     >{props.children}</Dynamic4>
-    <style>{`.dynamic-6567ee94 {
+    <style>{`.dynamic-5b6a86b6 {
   display: flex;
   flex-direction: column;
   align-items: stretch;
@@ -1744,7 +1751,7 @@ function Columns(props) {
   }
   return <>
     <div
-      class={getColumnsClass(props.builderBlock?.id) + " div-a1dad3b8"}
+      class={getColumnsClass(props.builderBlock?.id) + " div-2ac94efa"}
       style={columnsCssVars()}
       {...{}}
     >
@@ -1761,7 +1768,7 @@ function Columns(props) {
           actionAttributes={{}}
           attributes={getAttributes(column, index)}
         ><Blocks_default
-          path={`component.options.columns.${index}.blocks`}
+          path={`columns.${index}.blocks`}
           parent={props.builderBlock.id}
           styleProp={{
             flexGrow: "1"
@@ -1773,7 +1780,7 @@ function Columns(props) {
         /></Dynamic_renderer_default>;
       }}</For4>
     </div>
-    <style>{`.div-a1dad3b8 {
+    <style>{`.div-2ac94efa {
   display: flex;
   line-height: normal;
 }`}</style>
@@ -2404,9 +2411,11 @@ function Accordion(props) {
         class={getAccordionTitleClassName(index)}
         style={{
           ...accordionTitleStyles(),
-          width: props.grid ? props.gridRowWidth : void 0,
-          ...{
-            order: openGridItemOrder() !== null ? convertOrderNumberToString(index) : convertOrderNumberToString(index + 1)
+          ...props.grid && {
+            width: props.gridRowWidth,
+            ...{
+              order: openGridItemOrder() !== null ? convertOrderNumberToString(index) : convertOrderNumberToString(index + 1)
+            }
           }
         }}
         data-index={index}
@@ -3145,7 +3154,7 @@ function Tabs(props) {
         onClick={(event) => onClick(index)}
       ><Blocks_default
         parent={props.builderBlock.id}
-        path={`component.options.tabs.${index}.label`}
+        path={`tabs.${index}.label`}
         blocks={tab.label}
         context={props.builderContext}
         registeredComponents={props.builderComponents}
@@ -3154,7 +3163,7 @@ function Tabs(props) {
     }}</For6></div>
     <Show10 when={activeTabContent(activeTab())}><div><Blocks_default
       parent={props.builderBlock.id}
-      path={`component.options.tabs.${activeTab()}.content`}
+      path={`tabs.${activeTab()}.content`}
       blocks={activeTabContent(activeTab())}
       context={props.builderContext}
       registeredComponents={props.builderComponents}
@@ -3611,6 +3620,15 @@ var getEnv = () => {
   return validEnvList.includes(env) ? env : "production";
 };
 
+// src/functions/log-fetch.ts
+function logFetch(url) {
+  if (typeof process !== "undefined" && process.env?.DEBUG) {
+    if (String(process.env.DEBUG) == "true") {
+      logger.log(url);
+    }
+  }
+}
+
 // src/blocks/form/form/form.tsx
 function FormComponent(props) {
   const [formState, setFormState] = createSignal14("unsubmitted");
@@ -3717,14 +3735,13 @@ function FormComponent(props) {
       const formUrl = `${getEnv() === "dev" ? "http://localhost:5000" : "https://builder.io"}/api/v1/form-submit?apiKey=${props.builderContext.apiKey}&to=${btoa(
         props.sendSubmissionsToEmail || ""
       )}&name=${encodeURIComponent(props.name || "")}`;
-      fetch(
-        props.sendSubmissionsTo === "email" ? formUrl : props.action,
-        {
-          body,
-          headers,
-          method: props.method || "post"
-        }
-      ).then(
+      const url = props.sendSubmissionsTo === "email" ? formUrl : props.action;
+      logFetch(url);
+      fetch(url, {
+        body,
+        headers,
+        method: props.method || "post"
+      }).then(
         async (res) => {
           let body2;
           const contentType = res.headers.get("content-type");
@@ -3831,14 +3848,14 @@ function FormComponent(props) {
         blocks={props.sendingMessage}
         context={props.builderContext}
       /></Show11>
-      <Show11 when={submissionState() === "error" && responseData()}><pre class="builder-form-error-text pre-2e825338">{JSON.stringify(responseData(), null, 2)}</pre></Show11>
+      <Show11 when={submissionState() === "error" && responseData()}><pre class="builder-form-error-text pre-6210236e">{JSON.stringify(responseData(), null, 2)}</pre></Show11>
       <Show11 when={submissionState() === "success"}><Blocks_default
         path="successMessage"
         blocks={props.successMessage}
         context={props.builderContext}
       /></Show11>
     </form>
-    <style>{`.pre-2e825338 {
+    <style>{`.pre-6210236e {
   padding: 10px;
   color: red;
   text-align: center;
@@ -4429,7 +4446,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.28";
+var SDK_VERSION = "2.0.30";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4858,7 +4875,9 @@ async function _track({
     return;
   }
   const baseUrl = apiHost || "https://cdn.builder.io";
-  return fetch(`${baseUrl}/api/v1/track`, {
+  const url = `${baseUrl}/api/v1/track`;
+  logFetch(url);
+  return fetch(url, {
     method: "POST",
     body: JSON.stringify({
       events: [await createEvent(eventProps)]
@@ -5337,6 +5356,7 @@ function EnableEditor(props) {
           })
         )
       );
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
           [key]: json

package/lib/node/index.js

@@ -1684,7 +1684,7 @@ function Block(props) {
   });
 }
 var block_default = Block;
-var _tmpl$2 = /* @__PURE__ */ template(`<style>.dynamic-6567ee94 {
+var _tmpl$2 = /* @__PURE__ */ template(`<style>.dynamic-5b6a86b6 {
   display: flex;
   flex-direction: column;
   align-items: stretch;
@@ -1693,13 +1693,20 @@ function BlocksWrapper(props) {
   const className = createMemo(() => {
     return ["builder-blocks", !props.blocks?.length ? "no-blocks" : "", props.classNameProp].filter(Boolean).join(" ");
   });
+  const dataPath = createMemo(() => {
+    if (!props.path) {
+      return void 0;
+    }
+    const pathPrefix = "component.options.";
+    return props.path.startsWith(pathPrefix) ? props.path : `${pathPrefix}${props.path || ""}`;
+  });
   function onClick() {
     if (isEditing() && !props.blocks?.length) {
       window.parent?.postMessage({
         type: "builder.clickEmptyBlocks",
         data: {
           parentElementId: props.parent,
-          dataPath: props.path
+          dataPath: dataPath()
         }
       }, "*");
     }
@@ -1710,7 +1717,7 @@ function BlocksWrapper(props) {
         type: "builder.hoverEmptyBlocks",
         data: {
           parentElementId: props.parent,
-          dataPath: props.path
+          dataPath: dataPath()
         }
       }, "*");
     }
@@ -1720,14 +1727,14 @@ function BlocksWrapper(props) {
   });
   return [createComponent(Dynamic, mergeProps({
     get ["class"]() {
-      return className() + " dynamic-6567ee94";
+      return className() + " dynamic-5b6a86b6";
     },
     ref(r$) {
       const _ref$ = blocksWrapperRef;
       typeof _ref$ === "function" ? _ref$(r$) : blocksWrapperRef = r$;
     },
     get ["builder-path"]() {
-      return props.path;
+      return dataPath();
     },
     get ["builder-parent-id"]() {
       return props.parent;
@@ -1819,7 +1826,7 @@ var getColumnsClass = (id) => {
 
 // src/blocks/columns/columns.tsx
 var _tmpl$3 = /* @__PURE__ */ template(`<div>`);
-var _tmpl$22 = /* @__PURE__ */ template(`<style>.div-a1dad3b8 {
+var _tmpl$22 = /* @__PURE__ */ template(`<style>.div-2ac94efa {
   display: flex;
   line-height: normal;
 }`);
@@ -1948,7 +1955,7 @@ function Columns(props) {
     const _el$ = _tmpl$3();
     spread(_el$, mergeProps({
       get ["class"]() {
-        return getColumnsClass(props.builderBlock?.id) + " div-a1dad3b8";
+        return getColumnsClass(props.builderBlock?.id) + " div-2ac94efa";
       },
       get style() {
         return columnsCssVars();
@@ -1985,7 +1992,7 @@ function Columns(props) {
           },
           get children() {
             return createComponent(blocks_default, {
-              path: `component.options.columns.${index}.blocks`,
+              path: `columns.${index}.blocks`,
               get parent() {
                 return props.builderBlock.id;
               },
@@ -2678,9 +2685,11 @@ function Accordion(props) {
           effect((_p$) => {
             const _v$ = getAccordionTitleClassName(index), _v$2 = {
               ...accordionTitleStyles(),
-              width: props.grid ? props.gridRowWidth : void 0,
-              ...{
-                order: openGridItemOrder() !== null ? convertOrderNumberToString(index) : convertOrderNumberToString(index + 1)
+              ...props.grid && {
+                width: props.gridRowWidth,
+                ...{
+                  order: openGridItemOrder() !== null ? convertOrderNumberToString(index) : convertOrderNumberToString(index + 1)
+                }
               }
             };
             _v$ !== _p$._v$ && className(_el$2, _p$._v$ = _v$);
@@ -3452,7 +3461,7 @@ function Tabs(props) {
             get parent() {
               return props.builderBlock.id;
             },
-            path: `component.options.tabs.${index}.label`,
+            path: `tabs.${index}.label`,
             get blocks() {
               return tab.label;
             },
@@ -3492,7 +3501,7 @@ function Tabs(props) {
             return props.builderBlock.id;
           },
           get path() {
-            return `component.options.tabs.${activeTab()}.content`;
+            return `tabs.${activeTab()}.content`;
           },
           get blocks() {
             return activeTabContent(activeTab());
@@ -3959,10 +3968,19 @@ var getEnv = () => {
   return validEnvList.includes(env) ? env : "production";
 };
 
+// src/functions/log-fetch.ts
+function logFetch(url) {
+  if (typeof process !== "undefined" && process.env?.DEBUG) {
+    if (String(process.env.DEBUG) == "true") {
+      logger.log(url);
+    }
+  }
+}
+
 // src/blocks/form/form/form.tsx
-var _tmpl$13 = /* @__PURE__ */ template(`<pre class="builder-form-error-text pre-2e825338">`);
+var _tmpl$13 = /* @__PURE__ */ template(`<pre class="builder-form-error-text pre-6210236e">`);
 var _tmpl$26 = /* @__PURE__ */ template(`<form>`);
-var _tmpl$34 = /* @__PURE__ */ template(`<style>.pre-2e825338 {
+var _tmpl$34 = /* @__PURE__ */ template(`<style>.pre-6210236e {
   padding: 10px;
   color: red;
   text-align: center;
@@ -4075,7 +4093,9 @@ function FormComponent(props) {
       }
       setFormState("sending");
       const formUrl = `${getEnv() === "dev" ? "http://localhost:5000" : "https://builder.io"}/api/v1/form-submit?apiKey=${props.builderContext.apiKey}&to=${btoa(props.sendSubmissionsToEmail || "")}&name=${encodeURIComponent(props.name || "")}`;
-      fetch(props.sendSubmissionsTo === "email" ? formUrl : props.action, {
+      const url = props.sendSubmissionsTo === "email" ? formUrl : props.action;
+      logFetch(url);
+      fetch(url, {
         body,
         headers,
         method: props.method || "post"
@@ -4933,7 +4953,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.28";
+var SDK_VERSION = "2.0.30";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -5358,7 +5378,9 @@ async function _track({
     return;
   }
   const baseUrl = apiHost || "https://cdn.builder.io";
-  return fetch(`${baseUrl}/api/v1/track`, {
+  const url = `${baseUrl}/api/v1/track`;
+  logFetch(url);
+  return fetch(url, {
     method: "POST",
     body: JSON.stringify({
       events: [await createEvent(eventProps)]
@@ -5831,6 +5853,7 @@ function EnableEditor(props) {
         rootState: props.builderContextSignal.rootState,
         rootSetState: props.builderContextSignal.rootSetState
       })));
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
           [key]: json

package/lib/node/index.jsx

@@ -1528,6 +1528,13 @@ function BlocksWrapper(props) {
       props.classNameProp
     ].filter(Boolean).join(" ");
   });
+  const dataPath = createMemo6(() => {
+    if (!props.path) {
+      return void 0;
+    }
+    const pathPrefix = "component.options.";
+    return props.path.startsWith(pathPrefix) ? props.path : `${pathPrefix}${props.path || ""}`;
+  });
   function onClick() {
     if (isEditing() && !props.blocks?.length) {
       window.parent?.postMessage(
@@ -1535,7 +1542,7 @@ function BlocksWrapper(props) {
           type: "builder.clickEmptyBlocks",
           data: {
             parentElementId: props.parent,
-            dataPath: props.path
+            dataPath: dataPath()
           }
         },
         "*"
@@ -1549,7 +1556,7 @@ function BlocksWrapper(props) {
           type: "builder.hoverEmptyBlocks",
           data: {
             parentElementId: props.parent,
-            dataPath: props.path
+            dataPath: dataPath()
           }
         },
         "*"
@@ -1561,9 +1568,9 @@ function BlocksWrapper(props) {
   });
   return <>
     <Dynamic4
-      class={className() + " dynamic-6567ee94"}
+      class={className() + " dynamic-5b6a86b6"}
       ref={blocksWrapperRef}
-      builder-path={props.path}
+      builder-path={dataPath()}
       builder-parent-id={props.parent}
       {...{}}
       style={props.styleProp}
@@ -1573,7 +1580,7 @@ function BlocksWrapper(props) {
       {...props.BlocksWrapperProps}
       component={props.BlocksWrapper}
     >{props.children}</Dynamic4>
-    <style>{`.dynamic-6567ee94 {
+    <style>{`.dynamic-5b6a86b6 {
   display: flex;
   flex-direction: column;
   align-items: stretch;
@@ -1738,7 +1745,7 @@ function Columns(props) {
   }
   return <>
     <div
-      class={getColumnsClass(props.builderBlock?.id) + " div-a1dad3b8"}
+      class={getColumnsClass(props.builderBlock?.id) + " div-2ac94efa"}
       style={columnsCssVars()}
       {...{}}
     >
@@ -1755,7 +1762,7 @@ function Columns(props) {
           actionAttributes={{}}
           attributes={getAttributes(column, index)}
         ><Blocks_default
-          path={`component.options.columns.${index}.blocks`}
+          path={`columns.${index}.blocks`}
           parent={props.builderBlock.id}
           styleProp={{
             flexGrow: "1"
@@ -1767,7 +1774,7 @@ function Columns(props) {
         /></Dynamic_renderer_default>;
       }}</For4>
     </div>
-    <style>{`.div-a1dad3b8 {
+    <style>{`.div-2ac94efa {
   display: flex;
   line-height: normal;
 }`}</style>
@@ -2397,9 +2404,11 @@ function Accordion(props) {
         class={getAccordionTitleClassName(index)}
         style={{
           ...accordionTitleStyles(),
-          width: props.grid ? props.gridRowWidth : void 0,
-          ...{
-            order: openGridItemOrder() !== null ? convertOrderNumberToString(index) : convertOrderNumberToString(index + 1)
+          ...props.grid && {
+            width: props.gridRowWidth,
+            ...{
+              order: openGridItemOrder() !== null ? convertOrderNumberToString(index) : convertOrderNumberToString(index + 1)
+            }
           }
         }}
         data-index={index}
@@ -3137,7 +3146,7 @@ function Tabs(props) {
         onClick={(event) => onClick(index)}
       ><Blocks_default
         parent={props.builderBlock.id}
-        path={`component.options.tabs.${index}.label`}
+        path={`tabs.${index}.label`}
         blocks={tab.label}
         context={props.builderContext}
         registeredComponents={props.builderComponents}
@@ -3146,7 +3155,7 @@ function Tabs(props) {
     }}</For6></div>
     <Show10 when={activeTabContent(activeTab())}><div><Blocks_default
       parent={props.builderBlock.id}
-      path={`component.options.tabs.${activeTab()}.content`}
+      path={`tabs.${activeTab()}.content`}
       blocks={activeTabContent(activeTab())}
       context={props.builderContext}
       registeredComponents={props.builderComponents}
@@ -3601,6 +3610,15 @@ var getEnv = () => {
   return validEnvList.includes(env) ? env : "production";
 };
 
+// src/functions/log-fetch.ts
+function logFetch(url) {
+  if (typeof process !== "undefined" && process.env?.DEBUG) {
+    if (String(process.env.DEBUG) == "true") {
+      logger.log(url);
+    }
+  }
+}
+
 // src/blocks/form/form/form.tsx
 function FormComponent(props) {
   const [formState, setFormState] = createSignal14("unsubmitted");
@@ -3707,14 +3725,13 @@ function FormComponent(props) {
       const formUrl = `${getEnv() === "dev" ? "http://localhost:5000" : "https://builder.io"}/api/v1/form-submit?apiKey=${props.builderContext.apiKey}&to=${btoa(
         props.sendSubmissionsToEmail || ""
       )}&name=${encodeURIComponent(props.name || "")}`;
-      fetch(
-        props.sendSubmissionsTo === "email" ? formUrl : props.action,
-        {
-          body,
-          headers,
-          method: props.method || "post"
-        }
-      ).then(
+      const url = props.sendSubmissionsTo === "email" ? formUrl : props.action;
+      logFetch(url);
+      fetch(url, {
+        body,
+        headers,
+        method: props.method || "post"
+      }).then(
         async (res) => {
           let body2;
           const contentType = res.headers.get("content-type");
@@ -3821,14 +3838,14 @@ function FormComponent(props) {
         blocks={props.sendingMessage}
         context={props.builderContext}
       /></Show11>
-      <Show11 when={submissionState() === "error" && responseData()}><pre class="builder-form-error-text pre-2e825338">{JSON.stringify(responseData(), null, 2)}</pre></Show11>
+      <Show11 when={submissionState() === "error" && responseData()}><pre class="builder-form-error-text pre-6210236e">{JSON.stringify(responseData(), null, 2)}</pre></Show11>
       <Show11 when={submissionState() === "success"}><Blocks_default
         path="successMessage"
         blocks={props.successMessage}
         context={props.builderContext}
       /></Show11>
     </form>
-    <style>{`.pre-2e825338 {
+    <style>{`.pre-6210236e {
   padding: 10px;
   color: red;
   text-align: center;
@@ -4419,7 +4436,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.28";
+var SDK_VERSION = "2.0.30";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4844,7 +4861,9 @@ async function _track({
     return;
   }
   const baseUrl = apiHost || "https://cdn.builder.io";
-  return fetch(`${baseUrl}/api/v1/track`, {
+  const url = `${baseUrl}/api/v1/track`;
+  logFetch(url);
+  return fetch(url, {
     method: "POST",
     body: JSON.stringify({
       events: [await createEvent(eventProps)]
@@ -5321,6 +5340,7 @@ function EnableEditor(props) {
           })
         )
       );
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
           [key]: json

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-solid",
-  "version": "2.0.28",
+  "version": "2.0.30",
   "description": "",
   "files": [
     "dist",