@builder.io/sdk-svelte 1.0.16 → 1.0.17

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

@@ -122,41 +122,40 @@ function onClick(event) {
         clicked = true;
     }
 }
-function evalExpression(expression) {
-    return expression.replace(/{{([^}]+)}}/g, (_match, group) => String(evaluate({
-        code: group,
-        context: context || {},
-        localState: undefined,
-        rootState: $builderContextSignal.rootState,
-        rootSetState: $builderContextSignal.rootSetState,
-        enableCache: true,
-    })));
-}
-function handleRequest({ url, key }) {
-    fetch(url)
-        .then((response) => response.json())
-        .then((json) => {
-        const newState = {
-            ...$builderContextSignal.rootState,
-            [key]: json,
-        };
-        $builderContextSignal.rootSetState?.(newState);
-        httpReqsData[key] = true;
-    })
-        .catch((err) => {
-        console.error("error fetching dynamic data", url, err);
-    });
-}
 function runHttpRequests() {
     const requests = $builderContextSignal.content?.data?.httpRequests ?? {};
     Object.entries(requests).forEach(([key, url]) => {
-        if (url && (!httpReqsData[key] || isEditing())) {
-            const evaluatedUrl = evalExpression(url);
-            handleRequest({
-                url: evaluatedUrl,
-                key,
+        if (!url)
+            return;
+        // request already in progress
+        if (httpReqsPending[key])
+            return;
+        // request already completed, and not in edit mode
+        if (httpReqsData[key] && !isEditing())
+            return;
+        httpReqsPending[key] = true;
+        const evaluatedUrl = url.replace(/{{([^}]+)}}/g, (_match, group) => String(evaluate({
+            code: group,
+            context: context || {},
+            localState: undefined,
+            rootState: $builderContextSignal.rootState,
+            rootSetState: $builderContextSignal.rootSetState,
+            enableCache: true,
+        })));
+        fetch(evaluatedUrl)
+            .then((response) => response.json())
+            .then((json) => {
+            mergeNewRootState({
+                [key]: json,
             });
-        }
+            httpReqsData[key] = true;
+        })
+            .catch((err) => {
+            console.error("error fetching dynamic data", url, err);
+        })
+            .finally(() => {
+            httpReqsPending[key] = false;
+        });
     });
 }
 function emitStateUpdate() {
@@ -228,6 +227,7 @@ function elementRef_onInitpreviewingbldr(event) {
 let elementRef;
 let ContentWrapper = contentWrapper || "div";
 let httpReqsData = {};
+let httpReqsPending = {};
 let clicked = false;
 onMount(() => {
     if (isBrowser()) {

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

@@ -1 +1 @@
-export declare const SDK_VERSION = "1.0.16";
+export declare const SDK_VERSION = "1.0.17";

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

@@ -1 +1 @@
-export const SDK_VERSION = "1.0.16";
+export const SDK_VERSION = "1.0.17";

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

@@ -122,41 +122,40 @@ function onClick(event) {
         clicked = true;
     }
 }
-function evalExpression(expression) {
-    return expression.replace(/{{([^}]+)}}/g, (_match, group) => String(evaluate({
-        code: group,
-        context: context || {},
-        localState: undefined,
-        rootState: $builderContextSignal.rootState,
-        rootSetState: $builderContextSignal.rootSetState,
-        enableCache: true,
-    })));
-}
-function handleRequest({ url, key }) {
-    fetch(url)
-        .then((response) => response.json())
-        .then((json) => {
-        const newState = {
-            ...$builderContextSignal.rootState,
-            [key]: json,
-        };
-        $builderContextSignal.rootSetState?.(newState);
-        httpReqsData[key] = true;
-    })
-        .catch((err) => {
-        console.error("error fetching dynamic data", url, err);
-    });
-}
 function runHttpRequests() {
     const requests = $builderContextSignal.content?.data?.httpRequests ?? {};
     Object.entries(requests).forEach(([key, url]) => {
-        if (url && (!httpReqsData[key] || isEditing())) {
-            const evaluatedUrl = evalExpression(url);
-            handleRequest({
-                url: evaluatedUrl,
-                key,
+        if (!url)
+            return;
+        // request already in progress
+        if (httpReqsPending[key])
+            return;
+        // request already completed, and not in edit mode
+        if (httpReqsData[key] && !isEditing())
+            return;
+        httpReqsPending[key] = true;
+        const evaluatedUrl = url.replace(/{{([^}]+)}}/g, (_match, group) => String(evaluate({
+            code: group,
+            context: context || {},
+            localState: undefined,
+            rootState: $builderContextSignal.rootState,
+            rootSetState: $builderContextSignal.rootSetState,
+            enableCache: true,
+        })));
+        fetch(evaluatedUrl)
+            .then((response) => response.json())
+            .then((json) => {
+            mergeNewRootState({
+                [key]: json,
             });
-        }
+            httpReqsData[key] = true;
+        })
+            .catch((err) => {
+            console.error("error fetching dynamic data", url, err);
+        })
+            .finally(() => {
+            httpReqsPending[key] = false;
+        });
     });
 }
 function emitStateUpdate() {
@@ -228,6 +227,7 @@ function elementRef_onInitpreviewingbldr(event) {
 let elementRef;
 let ContentWrapper = contentWrapper || "div";
 let httpReqsData = {};
+let httpReqsPending = {};
 let clicked = false;
 onMount(() => {
     if (isBrowser()) {

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

@@ -1 +1 @@
-export declare const SDK_VERSION = "1.0.16";
+export declare const SDK_VERSION = "1.0.17";

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

@@ -1 +1 @@
-export const SDK_VERSION = "1.0.16";
+export const SDK_VERSION = "1.0.17";

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

@@ -122,41 +122,40 @@ function onClick(event) {
         clicked = true;
     }
 }
-function evalExpression(expression) {
-    return expression.replace(/{{([^}]+)}}/g, (_match, group) => String(evaluate({
-        code: group,
-        context: context || {},
-        localState: undefined,
-        rootState: $builderContextSignal.rootState,
-        rootSetState: $builderContextSignal.rootSetState,
-        enableCache: true,
-    })));
-}
-function handleRequest({ url, key }) {
-    fetch(url)
-        .then((response) => response.json())
-        .then((json) => {
-        const newState = {
-            ...$builderContextSignal.rootState,
-            [key]: json,
-        };
-        $builderContextSignal.rootSetState?.(newState);
-        httpReqsData[key] = true;
-    })
-        .catch((err) => {
-        console.error("error fetching dynamic data", url, err);
-    });
-}
 function runHttpRequests() {
     const requests = $builderContextSignal.content?.data?.httpRequests ?? {};
     Object.entries(requests).forEach(([key, url]) => {
-        if (url && (!httpReqsData[key] || isEditing())) {
-            const evaluatedUrl = evalExpression(url);
-            handleRequest({
-                url: evaluatedUrl,
-                key,
+        if (!url)
+            return;
+        // request already in progress
+        if (httpReqsPending[key])
+            return;
+        // request already completed, and not in edit mode
+        if (httpReqsData[key] && !isEditing())
+            return;
+        httpReqsPending[key] = true;
+        const evaluatedUrl = url.replace(/{{([^}]+)}}/g, (_match, group) => String(evaluate({
+            code: group,
+            context: context || {},
+            localState: undefined,
+            rootState: $builderContextSignal.rootState,
+            rootSetState: $builderContextSignal.rootSetState,
+            enableCache: true,
+        })));
+        fetch(evaluatedUrl)
+            .then((response) => response.json())
+            .then((json) => {
+            mergeNewRootState({
+                [key]: json,
             });
-        }
+            httpReqsData[key] = true;
+        })
+            .catch((err) => {
+            console.error("error fetching dynamic data", url, err);
+        })
+            .finally(() => {
+            httpReqsPending[key] = false;
+        });
     });
 }
 function emitStateUpdate() {
@@ -228,6 +227,7 @@ function elementRef_onInitpreviewingbldr(event) {
 let elementRef;
 let ContentWrapper = contentWrapper || "div";
 let httpReqsData = {};
+let httpReqsPending = {};
 let clicked = false;
 onMount(() => {
     if (isBrowser()) {

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

@@ -1 +1 @@
-export declare const SDK_VERSION = "1.0.16";
+export declare const SDK_VERSION = "1.0.17";

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

@@ -1 +1 @@
-export const SDK_VERSION = "1.0.16";
+export const SDK_VERSION = "1.0.17";

package/package.json

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

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

@@ -154,47 +154,45 @@
       clicked = true;
     }
   }
-  function evalExpression(expression: string) {
-    return expression.replace(/{{([^}]+)}}/g, (_match, group) =>
-      String(
-        evaluate({
-          code: group,
-          context: context || {},
-          localState: undefined,
-          rootState: $builderContextSignal.rootState,
-          rootSetState: $builderContextSignal.rootSetState,
-          enableCache: true,
-        })
-      )
-    );
-  }
-  function handleRequest({ url, key }: { key: string; url: string }) {
-    fetch(url)
-      .then((response) => response.json())
-      .then((json) => {
-        const newState = {
-          ...$builderContextSignal.rootState,
-          [key]: json,
-        };
-        $builderContextSignal.rootSetState?.(newState);
-        httpReqsData[key] = true;
-      })
-      .catch((err) => {
-        console.error("error fetching dynamic data", url, err);
-      });
-  }
   function runHttpRequests() {
     const requests: {
       [key: string]: string;
     } = $builderContextSignal.content?.data?.httpRequests ?? {};
     Object.entries(requests).forEach(([key, url]) => {
-      if (url && (!httpReqsData[key] || isEditing())) {
-        const evaluatedUrl = evalExpression(url);
-        handleRequest({
-          url: evaluatedUrl,
-          key,
+      if (!url) return;
+
+      // request already in progress
+      if (httpReqsPending[key]) return;
+
+      // request already completed, and not in edit mode
+      if (httpReqsData[key] && !isEditing()) return;
+      httpReqsPending[key] = true;
+      const evaluatedUrl = url.replace(/{{([^}]+)}}/g, (_match, group) =>
+        String(
+          evaluate({
+            code: group,
+            context: context || {},
+            localState: undefined,
+            rootState: $builderContextSignal.rootState,
+            rootSetState: $builderContextSignal.rootSetState,
+            enableCache: true,
+          })
+        )
+      );
+      fetch(evaluatedUrl)
+        .then((response) => response.json())
+        .then((json) => {
+          mergeNewRootState({
+            [key]: json,
+          });
+          httpReqsData[key] = true;
+        })
+        .catch((err) => {
+          console.error("error fetching dynamic data", url, err);
+        })
+        .finally(() => {
+          httpReqsPending[key] = false;
         });
-      }
     });
   }
   function emitStateUpdate() {
@@ -284,6 +282,7 @@
 
   let ContentWrapper = contentWrapper || "div";
   let httpReqsData = {};
+  let httpReqsPending = {};
   let clicked = false;
 
   onMount(() => {

package/src/constants/sdk-version.ts

@@ -1 +1 @@
-export const SDK_VERSION = "1.0.16"
+export const SDK_VERSION = "1.0.17"