@builder.io/sdk-solid 2.0.29 → 2.0.31

package/lib/browser/dev.js

@@ -3809,10 +3809,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;
@@ -3925,7 +3934,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"
@@ -4700,7 +4711,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -4783,7 +4795,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4911,8 +4923,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -4947,8 +4966,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -5212,7 +5231,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)]
@@ -5687,6 +5708,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/browser/dev.jsx

@@ -3449,6 +3449,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");
@@ -3555,14 +3564,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");
@@ -3669,14 +3677,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;
@@ -4182,7 +4190,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -4267,7 +4276,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4395,8 +4404,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -4431,8 +4447,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -4696,7 +4712,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)]
@@ -5175,6 +5193,7 @@ function EnableEditor(props) {
           })
         )
       );
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
           [key]: json

package/lib/browser/index.js

@@ -3799,10 +3799,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;
@@ -3915,7 +3924,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"
@@ -4690,7 +4701,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -4773,7 +4785,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4899,8 +4911,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -4935,8 +4954,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -5198,7 +5217,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)]
@@ -5671,6 +5692,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/browser/index.jsx

@@ -3439,6 +3439,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");
@@ -3545,14 +3554,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");
@@ -3659,14 +3667,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;
@@ -4172,7 +4180,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -4257,7 +4266,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4383,8 +4392,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -4419,8 +4435,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -4682,7 +4698,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)]
@@ -5159,6 +5177,7 @@ function EnableEditor(props) {
           })
         )
       );
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
           [key]: json

package/lib/edge/dev.js

@@ -6992,10 +6992,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;
@@ -7108,7 +7117,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"
@@ -7883,7 +7894,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -7966,7 +7978,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -8094,8 +8106,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -8130,8 +8149,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -8395,7 +8414,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)]
@@ -8870,6 +8891,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/edge/dev.jsx

@@ -6634,6 +6634,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");
@@ -6740,14 +6749,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");
@@ -6854,14 +6862,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;
@@ -7367,7 +7375,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -7452,7 +7461,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -7580,8 +7589,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -7616,8 +7632,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -7881,7 +7897,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)]
@@ -8360,6 +8378,7 @@ function EnableEditor(props) {
           })
         )
       );
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
           [key]: json

package/lib/edge/index.js

@@ -6982,10 +6982,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;
@@ -7098,7 +7107,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"
@@ -7873,7 +7884,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -7956,7 +7968,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -8082,8 +8094,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -8118,8 +8137,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -8381,7 +8400,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)]
@@ -8854,6 +8875,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/edge/index.jsx

@@ -6624,6 +6624,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");
@@ -6730,14 +6739,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");
@@ -6844,14 +6852,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;
@@ -7357,7 +7365,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -7442,7 +7451,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -7568,8 +7577,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -7604,8 +7620,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -7867,7 +7883,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)]
@@ -8344,6 +8362,7 @@ function EnableEditor(props) {
           })
         )
       );
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
           [key]: json

package/lib/node/dev.js

@@ -3978,10 +3978,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;
@@ -4094,7 +4103,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"
@@ -4869,7 +4880,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -4952,7 +4964,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -5080,8 +5092,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -5116,8 +5135,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -5381,7 +5400,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)]
@@ -5856,6 +5877,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/dev.jsx

@@ -3620,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");
@@ -3726,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");
@@ -3840,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;
@@ -4353,7 +4361,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -4438,7 +4447,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4566,8 +4575,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -4602,8 +4618,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -4867,7 +4883,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)]
@@ -5346,6 +5364,7 @@ function EnableEditor(props) {
           })
         )
       );
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
           [key]: json

package/lib/node/index.js

@@ -3968,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;
@@ -4084,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"
@@ -4859,7 +4870,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -4942,7 +4954,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -5068,8 +5080,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -5104,8 +5123,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -5367,7 +5386,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)]
@@ -5840,6 +5861,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

@@ -3610,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");
@@ -3716,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");
@@ -3830,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;
@@ -4343,7 +4351,8 @@ var createRegisterComponentMessage = (info) => ({
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
-  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
+  const isArrowWithoutParens = /^[a-zA-Z0-9_]+\s*=>/i.test(fnStr);
+  const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(") && !isArrowWithoutParens;
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
 function serializeIncludingFunctions(info) {
@@ -4428,7 +4437,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.29";
+var SDK_VERSION = "2.0.31";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -4554,8 +4563,15 @@ var generateContentUrl = (options) => {
   url.searchParams.set("limit", String(limit));
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
-  if (locale)
-    url.searchParams.set("locale", locale);
+  const finalLocale = locale || userAttributes?.locale;
+  let finalUserAttributes = userAttributes;
+  if (finalLocale) {
+    url.searchParams.set("locale", finalLocale);
+    finalUserAttributes = {
+      locale: finalLocale,
+      ...finalUserAttributes
+    };
+  }
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
   url.searchParams.set("omit", omit2 || "meta.componentsUsed");
@@ -4590,8 +4606,8 @@ var generateContentUrl = (options) => {
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (userAttributes) {
-    url.searchParams.set("userAttributes", JSON.stringify(userAttributes));
+  if (finalUserAttributes) {
+    url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
     const flattened2 = flattenMongoQuery({
@@ -4853,7 +4869,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)]
@@ -5330,6 +5348,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.29",
+  "version": "2.0.31",
   "description": "",
   "files": [
     "dist",