@builder.io/sdk-svelte 2.0.29 → 2.0.31

package/lib/browser/blocks/form/form/form.svelte

@@ -10,6 +10,7 @@ import { get } from "../../../functions/get";
 import { isEditing } from "../../../functions/is-editing";
 import { set } from "../../../functions/set";
 import { filterAttrs } from "../../helpers";
+import { logFetch } from "../../../functions/log-fetch";
 import { setAttrs } from "../../helpers";
 export let builderContext;
 export let previewState = undefined;
@@ -148,9 +149,11 @@ function onSubmit(event) {
         }
         formState = "sending";
         const formUrl = `${getEnv() === "dev" ? "http://localhost:5000" : "https://builder.io"}/api/v1/form-submit?apiKey=${$builderContext.apiKey}&to=${btoa(sendSubmissionsToEmail || "")}&name=${encodeURIComponent(name || "")}`;
-        fetch(sendSubmissionsTo === "email"
+        const url = sendSubmissionsTo === "email"
             ? formUrl
-            : action /* TODO: throw error if no action URL */, {
+            : action; /* TODO: throw error if no action URL */
+        logFetch(url);
+        fetch(url, {
             body,
             headers,
             method: method || "post",

package/lib/browser/components/content/components/enable-editor.svelte

@@ -8,6 +8,7 @@ import { fetchOneEntry } from "../../../functions/get-content/index";
 import { isBrowser } from "../../../functions/is-browser";
 import { isEditing } from "../../../functions/is-editing";
 import { isPreviewing } from "../../../functions/is-previewing";
+import { logFetch } from "../../../functions/log-fetch";
 import { createRegisterComponentMessage } from "../../../functions/register-component";
 import { _track } from "../../../functions/track/index";
 import { getInteractionPropertiesForEvent } from "../../../functions/track/interaction";
@@ -127,6 +128,7 @@ function runHttpRequests() {
             rootState: $builderContextSignal.rootState,
             rootSetState: $builderContextSignal.rootSetState,
         })));
+        logFetch(evaluatedUrl);
         fetch(evaluatedUrl)
             .then((response) => response.json())
             .then((json) => {

package/lib/browser/constants/sdk-version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "2.0.29";
+export declare const SDK_VERSION = "2.0.31";

package/lib/browser/constants/sdk-version.js

@@ -1 +1 @@
-export const SDK_VERSION = "2.0.29";
+export const SDK_VERSION = "2.0.31";

package/lib/browser/functions/get-content/generate-content-url.js

@@ -19,8 +19,15 @@ export const 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', omit || 'meta.componentsUsed');
@@ -56,8 +63,8 @@ export const 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 flattened = flattenMongoQuery({

package/lib/browser/functions/log-fetch.d.ts

@@ -0,0 +1 @@
+export declare function logFetch(url: string): void;

package/lib/browser/functions/log-fetch.js

@@ -0,0 +1,8 @@
+import { logger } from '../helpers/logger';
+export function logFetch(url) {
+    if (typeof process !== 'undefined' && process.env?.DEBUG) {
+        if (String(process.env.DEBUG) == 'true') {
+            logger.log(url);
+        }
+    }
+}

package/lib/browser/functions/register-component.js

@@ -9,7 +9,9 @@ const serializeFn = (fnValue) => {
     // 1. `function name(args) => {code}`
     // 2. `name(args) => {code}`
     // 3. `(args) => {}`
-    const appendFunction = !fnStr.startsWith('function') && !fnStr.startsWith('(');
+    // 4. `args => {}`
+    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)`;
 };
 export function serializeIncludingFunctions(info) {

package/lib/browser/functions/track/index.js

@@ -5,6 +5,7 @@ import { getSessionId } from '../../helpers/sessionId';
 import { getVisitorId } from '../../helpers/visitorId';
 import { isBrowser } from '../is-browser';
 import { isEditing } from '../is-editing';
+import { logFetch } from '../log-fetch';
 import { getUserAttributes } from './helpers';
 const getTrackingEventData = async ({ canTrack }) => {
     if (!canTrack) {
@@ -54,7 +55,9 @@ export async function _track({ apiHost, ...eventProps }) {
         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)]

package/lib/edge/blocks/form/form/form.svelte

@@ -10,6 +10,7 @@ import { get } from "../../../functions/get";
 import { isEditing } from "../../../functions/is-editing";
 import { set } from "../../../functions/set";
 import { filterAttrs } from "../../helpers";
+import { logFetch } from "../../../functions/log-fetch";
 import { setAttrs } from "../../helpers";
 export let builderContext;
 export let previewState = undefined;
@@ -148,9 +149,11 @@ function onSubmit(event) {
         }
         formState = "sending";
         const formUrl = `${getEnv() === "dev" ? "http://localhost:5000" : "https://builder.io"}/api/v1/form-submit?apiKey=${$builderContext.apiKey}&to=${btoa(sendSubmissionsToEmail || "")}&name=${encodeURIComponent(name || "")}`;
-        fetch(sendSubmissionsTo === "email"
+        const url = sendSubmissionsTo === "email"
             ? formUrl
-            : action /* TODO: throw error if no action URL */, {
+            : action; /* TODO: throw error if no action URL */
+        logFetch(url);
+        fetch(url, {
             body,
             headers,
             method: method || "post",

package/lib/edge/components/content/components/enable-editor.svelte

@@ -8,6 +8,7 @@ import { fetchOneEntry } from "../../../functions/get-content/index";
 import { isBrowser } from "../../../functions/is-browser";
 import { isEditing } from "../../../functions/is-editing";
 import { isPreviewing } from "../../../functions/is-previewing";
+import { logFetch } from "../../../functions/log-fetch";
 import { createRegisterComponentMessage } from "../../../functions/register-component";
 import { _track } from "../../../functions/track/index";
 import { getInteractionPropertiesForEvent } from "../../../functions/track/interaction";
@@ -127,6 +128,7 @@ function runHttpRequests() {
             rootState: $builderContextSignal.rootState,
             rootSetState: $builderContextSignal.rootSetState,
         })));
+        logFetch(evaluatedUrl);
         fetch(evaluatedUrl)
             .then((response) => response.json())
             .then((json) => {

package/lib/edge/constants/sdk-version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "2.0.29";
+export declare const SDK_VERSION = "2.0.31";

package/lib/edge/constants/sdk-version.js

@@ -1 +1 @@
-export const SDK_VERSION = "2.0.29";
+export const SDK_VERSION = "2.0.31";

package/lib/edge/functions/get-content/generate-content-url.js

@@ -19,8 +19,15 @@ export const 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', omit || 'meta.componentsUsed');
@@ -56,8 +63,8 @@ export const 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 flattened = flattenMongoQuery({

package/lib/edge/functions/log-fetch.d.ts

@@ -0,0 +1 @@
+export declare function logFetch(url: string): void;

package/lib/edge/functions/log-fetch.js

@@ -0,0 +1,8 @@
+import { logger } from '../helpers/logger';
+export function logFetch(url) {
+    if (typeof process !== 'undefined' && process.env?.DEBUG) {
+        if (String(process.env.DEBUG) == 'true') {
+            logger.log(url);
+        }
+    }
+}

package/lib/edge/functions/register-component.js

@@ -9,7 +9,9 @@ const serializeFn = (fnValue) => {
     // 1. `function name(args) => {code}`
     // 2. `name(args) => {code}`
     // 3. `(args) => {}`
-    const appendFunction = !fnStr.startsWith('function') && !fnStr.startsWith('(');
+    // 4. `args => {}`
+    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)`;
 };
 export function serializeIncludingFunctions(info) {

package/lib/edge/functions/track/index.js

@@ -5,6 +5,7 @@ import { getSessionId } from '../../helpers/sessionId';
 import { getVisitorId } from '../../helpers/visitorId';
 import { isBrowser } from '../is-browser';
 import { isEditing } from '../is-editing';
+import { logFetch } from '../log-fetch';
 import { getUserAttributes } from './helpers';
 const getTrackingEventData = async ({ canTrack }) => {
     if (!canTrack) {
@@ -54,7 +55,9 @@ export async function _track({ apiHost, ...eventProps }) {
         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)]

package/lib/node/blocks/form/form/form.svelte

@@ -10,6 +10,7 @@ import { get } from "../../../functions/get";
 import { isEditing } from "../../../functions/is-editing";
 import { set } from "../../../functions/set";
 import { filterAttrs } from "../../helpers";
+import { logFetch } from "../../../functions/log-fetch";
 import { setAttrs } from "../../helpers";
 export let builderContext;
 export let previewState = undefined;
@@ -148,9 +149,11 @@ function onSubmit(event) {
         }
         formState = "sending";
         const formUrl = `${getEnv() === "dev" ? "http://localhost:5000" : "https://builder.io"}/api/v1/form-submit?apiKey=${$builderContext.apiKey}&to=${btoa(sendSubmissionsToEmail || "")}&name=${encodeURIComponent(name || "")}`;
-        fetch(sendSubmissionsTo === "email"
+        const url = sendSubmissionsTo === "email"
             ? formUrl
-            : action /* TODO: throw error if no action URL */, {
+            : action; /* TODO: throw error if no action URL */
+        logFetch(url);
+        fetch(url, {
             body,
             headers,
             method: method || "post",

package/lib/node/components/content/components/enable-editor.svelte

@@ -8,6 +8,7 @@ import { fetchOneEntry } from "../../../functions/get-content/index";
 import { isBrowser } from "../../../functions/is-browser";
 import { isEditing } from "../../../functions/is-editing";
 import { isPreviewing } from "../../../functions/is-previewing";
+import { logFetch } from "../../../functions/log-fetch";
 import { createRegisterComponentMessage } from "../../../functions/register-component";
 import { _track } from "../../../functions/track/index";
 import { getInteractionPropertiesForEvent } from "../../../functions/track/interaction";
@@ -127,6 +128,7 @@ function runHttpRequests() {
             rootState: $builderContextSignal.rootState,
             rootSetState: $builderContextSignal.rootSetState,
         })));
+        logFetch(evaluatedUrl);
         fetch(evaluatedUrl)
             .then((response) => response.json())
             .then((json) => {

package/lib/node/constants/sdk-version.d.ts

@@ -1 +1 @@
-export declare const SDK_VERSION = "2.0.29";
+export declare const SDK_VERSION = "2.0.31";

package/lib/node/constants/sdk-version.js

@@ -1 +1 @@
-export const SDK_VERSION = "2.0.29";
+export const SDK_VERSION = "2.0.31";

package/lib/node/functions/get-content/generate-content-url.js

@@ -19,8 +19,15 @@ export const 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', omit || 'meta.componentsUsed');
@@ -56,8 +63,8 @@ export const 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 flattened = flattenMongoQuery({

package/lib/node/functions/log-fetch.d.ts

@@ -0,0 +1 @@
+export declare function logFetch(url: string): void;

package/lib/node/functions/log-fetch.js

@@ -0,0 +1,8 @@
+import { logger } from '../helpers/logger';
+export function logFetch(url) {
+    if (typeof process !== 'undefined' && process.env?.DEBUG) {
+        if (String(process.env.DEBUG) == 'true') {
+            logger.log(url);
+        }
+    }
+}

package/lib/node/functions/register-component.js

@@ -9,7 +9,9 @@ const serializeFn = (fnValue) => {
     // 1. `function name(args) => {code}`
     // 2. `name(args) => {code}`
     // 3. `(args) => {}`
-    const appendFunction = !fnStr.startsWith('function') && !fnStr.startsWith('(');
+    // 4. `args => {}`
+    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)`;
 };
 export function serializeIncludingFunctions(info) {

package/lib/node/functions/track/index.js

@@ -5,6 +5,7 @@ import { getSessionId } from '../../helpers/sessionId';
 import { getVisitorId } from '../../helpers/visitorId';
 import { isBrowser } from '../is-browser';
 import { isEditing } from '../is-editing';
+import { logFetch } from '../log-fetch';
 import { getUserAttributes } from './helpers';
 const getTrackingEventData = async ({ canTrack }) => {
     if (!canTrack) {
@@ -54,7 +55,9 @@ export async function _track({ apiHost, ...eventProps }) {
         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)]

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@builder.io/sdk-svelte",
   "description": "Builder.io SDK for Svelte",
-  "version": "2.0.29",
+  "version": "2.0.31",
   "type": "module",
   "files": [
     "lib",

package/src/blocks/form/form/form.svelte

@@ -49,6 +49,7 @@
   } from "../../../types/builder-props";
   import type { Dictionary } from "../../../types/typescript";
   import { filterAttrs } from "../../helpers";
+  import { logFetch } from "../../../functions/log-fetch";
   import { setAttrs } from "../../helpers";
 
   export let builderContext: FormProps["builderContext"];
@@ -195,16 +196,17 @@
       }/api/v1/form-submit?apiKey=${$builderContext.apiKey}&to=${btoa(
         sendSubmissionsToEmail || ""
       )}&name=${encodeURIComponent(name || "")}`;
-      fetch(
+      const url =
         sendSubmissionsTo === "email"
           ? formUrl
-          : action! /* TODO: throw error if no action URL */,
-        {
-          body,
-          headers,
-          method: method || "post",
-        }
-      ).then(
+          : action!; /* TODO: throw error if no action URL */
+
+      logFetch(url);
+      fetch(url, {
+        body,
+        headers,
+        method: method || "post",
+      }).then(
         async (res) => {
           let body;
           const contentType = res.headers.get("content-type");

package/src/components/content/components/enable-editor.svelte

@@ -25,6 +25,7 @@
   import { isBrowser } from "../../../functions/is-browser";
   import { isEditing } from "../../../functions/is-editing";
   import { isPreviewing } from "../../../functions/is-previewing";
+  import { logFetch } from "../../../functions/log-fetch";
   import { createRegisterComponentMessage } from "../../../functions/register-component";
   import { _track } from "../../../functions/track/index";
   import { getInteractionPropertiesForEvent } from "../../../functions/track/interaction";
@@ -163,6 +164,7 @@
           })
         )
       );
+      logFetch(evaluatedUrl);
       fetch(evaluatedUrl)
         .then((response) => response.json())
         .then((json) => {

package/src/constants/sdk-version.ts

@@ -1 +1 @@
-export const SDK_VERSION = "2.0.29"
+export const SDK_VERSION = "2.0.31"

package/src/functions/get-content/generate-content-url.ts

@@ -38,7 +38,15 @@ export const generateContentUrl = (options: GetContentOptions): URL => {
   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', omit || 'meta.componentsUsed');
   if (fields) {
@@ -75,8 +83,8 @@ export const generateContentUrl = (options: GetContentOptions): URL => {
   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 flattened = flattenMongoQuery({

package/src/functions/log-fetch.ts

@@ -0,0 +1,8 @@
+import { logger } from '../helpers/logger';
+export function logFetch(url: string) {
+  if (typeof process !== 'undefined' && process.env?.DEBUG) {
+    if (String(process.env.DEBUG) == 'true') {
+      logger.log(url);
+    }
+  }
+}

package/src/functions/register-component.ts

@@ -12,7 +12,9 @@ const serializeFn = (fnValue: Function) => {
   // 1. `function name(args) => {code}`
   // 2. `name(args) => {code}`
   // 3. `(args) => {}`
-  const appendFunction = !fnStr.startsWith('function') && !fnStr.startsWith('(');
+  // 4. `args => {}`
+  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)`;
 };
 export function serializeIncludingFunctions(info: ComponentInfo) {

package/src/functions/track/index.ts

@@ -7,6 +7,7 @@ import type { CanTrack } from '../../types/can-track';
 import type { Dictionary } from '../../types/typescript';
 import { isBrowser } from '../is-browser';
 import { isEditing } from '../is-editing';
+import { logFetch } from '../log-fetch';
 import { getUserAttributes } from './helpers';
 interface Event {
   /**
@@ -119,7 +120,9 @@ export 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)]