@builder.io/sdk-solid 3.0.1 → 3.0.2

package/lib/edge/index.js

@@ -125,23 +125,6 @@ var builder_context_default = createContext({
 });
 var components_context_default = createContext({ registeredComponents: {} });
 
-// src/functions/get-block-component-options.ts
-function getBlockComponentOptions(block) {
-  return {
-    ...block.component?.options,
-    ...block.options
-  };
-}
-
-// src/helpers/omit.ts
-function omit(obj, ...values) {
-  const newObject = Object.assign({}, obj);
-  for (const key of values) {
-    delete newObject[key];
-  }
-  return newObject;
-}
-
 // src/helpers/logger.ts
 var logger = {
   log: (...message) => void 0,
@@ -3474,10 +3457,8 @@ var runInEdge = ({
     return `var ${key} = ${jsonValName} === undefined ? undefined : JSON.parse(${jsonValName});`;
   }).join("\n");
   const cleanedCode = processCode(code);
-  if (cleanedCode === "") {
-    logger.warn("Skipping evaluation of empty code block.");
+  if (cleanedCode === "")
     return;
-  }
   const transformed = `
 function theFunction() {
   ${prependedCode}
@@ -3583,6 +3564,38 @@ function evaluate({
   }
 }
 
+// src/functions/get-block-component-options.ts
+function getBlockComponentOptions(block, context) {
+  return {
+    ...block.component?.options,
+    ...block.options,
+    ...evaluateTextComponentTextOption(block, context)
+  };
+}
+var evaluateTextComponentTextOption = (block, context) => {
+  if (block.component?.name === "Text" && block.component.options?.text && typeof block.component.options.text === "string") {
+    return {
+      ...block.component.options,
+      text: block.component.options.text.replace(/{{([^}]+)}}/g, (_match, group) => evaluate({
+        code: group,
+        context,
+        localState: context.localState,
+        rootState: context.rootState,
+        rootSetState: context.rootSetState
+      }))
+    };
+  }
+};
+
+// src/helpers/omit.ts
+function omit(obj, ...values) {
+  const newObject = Object.assign({}, obj);
+  for (const key of values) {
+    delete newObject[key];
+  }
+  return newObject;
+}
+
 // src/functions/traverse.ts
 function traverse(obj, callback, parent2 = null, key = null, visited = /* @__PURE__ */ new WeakSet()) {
   if (obj == null || typeof obj !== "object") {
@@ -3744,24 +3757,19 @@ var evaluateBindings = ({
 function getProcessedBlock({
   block,
   context,
-  shouldEvaluateBindings,
   localState,
   rootState,
   rootSetState
 }) {
   let transformedBlock = resolveLocalizedValues(block, rootState.locale);
   transformedBlock = transformBlock(transformedBlock);
-  if (shouldEvaluateBindings) {
-    return evaluateBindings({
-      block: transformedBlock,
-      localState,
-      rootState,
-      rootSetState,
-      context
-    });
-  } else {
-    return transformedBlock;
-  }
+  return evaluateBindings({
+    block: transformedBlock,
+    localState,
+    rootState,
+    rootSetState,
+    context
+  });
 }
 
 // src/functions/camel-to-kebab-case.ts
@@ -4537,8 +4545,7 @@ function Block(props) {
       localState: props.context.localState,
       rootState: props.context.rootState,
       rootSetState: props.context.rootSetState,
-      context: props.context.context,
-      shouldEvaluateBindings: true
+      context: props.context.context
     });
     return blockToUse;
   });
@@ -4575,7 +4582,7 @@ function Block(props) {
       blockChildren: processedBlock().children ?? [],
       componentRef: blockComponent()?.component,
       componentOptions: {
-        ...getBlockComponentOptions(processedBlock()),
+        ...getBlockComponentOptions(processedBlock(), props.context),
         ...provideBuilderBlock(blockComponent(), processedBlock()),
         ...provideBuilderContext(blockComponent(), props.context),
         ...provideLinkComponent(blockComponent(), props.linkComponent),
@@ -6653,26 +6660,10 @@ var componentInfo10 = {
 };
 var _tmpl$10 = /* @__PURE__ */ template(`<div class=builder-text>`);
 function Text(props) {
-  const processedText = createMemo(() => {
-    const context = props.builderContext;
-    const {
-      context: contextContext,
-      localState,
-      rootState,
-      rootSetState
-    } = context;
-    return String(props.text?.toString() || "").replace(/{{([^}]+)}}/g, (match, group) => evaluate({
-      code: group,
-      context: contextContext,
-      localState,
-      rootState,
-      rootSetState
-    }));
-  });
   return (() => {
     const _el$ = _tmpl$10();
     _el$.style.setProperty("outline", "none");
-    effect(() => _el$.innerHTML = processedText());
+    effect(() => _el$.innerHTML = props.text?.toString() || "");
     return _el$;
   })();
 }
@@ -8055,7 +8046,7 @@ function getPreviewContent(_searchParams) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "3.0.1";
+var SDK_VERSION = "3.0.2";
 
 // src/helpers/sdk-headers.ts
 var getSdkHeaders = () => ({
@@ -8118,6 +8109,23 @@ function flattenMongoQuery(obj, _current, _res = {}) {
   }
   return _res;
 }
+function unflatten(obj) {
+  const result = {};
+  for (const key in obj) {
+    const parts = key.split(".");
+    let current = result;
+    for (let i = 0; i < parts.length; i++) {
+      const part = parts[i];
+      if (i === parts.length - 1) {
+        current[part] = obj[key];
+      } else {
+        current[part] = current[part] || {};
+        current = current[part];
+      }
+    }
+  }
+  return result;
+}
 
 // src/types/api-version.ts
 var DEFAULT_API_VERSION = "v3";
@@ -8182,7 +8190,7 @@ var generateContentUrl = (options) => {
   url.searchParams.set("noTraverse", String(noTraverse));
   url.searchParams.set("includeRefs", String(true));
   const finalLocale = locale || userAttributes?.locale;
-  let finalUserAttributes = userAttributes;
+  let finalUserAttributes = userAttributes || {};
   if (finalLocale) {
     url.searchParams.set("locale", finalLocale);
     finalUserAttributes = {
@@ -8220,11 +8228,15 @@ var generateContentUrl = (options) => {
     ...getBuilderSearchParamsFromWindow(),
     ...normalizeSearchParams(options.options || {})
   };
+  finalUserAttributes = {
+    ...finalUserAttributes,
+    ...getUserAttributesAsJSON(queryOptions)
+  };
   const flattened = flatten(queryOptions);
   for (const key in flattened) {
     url.searchParams.set(key, String(flattened[key]));
   }
-  if (finalUserAttributes) {
+  if (Object.keys(finalUserAttributes).length > 0) {
     url.searchParams.set("userAttributes", JSON.stringify(finalUserAttributes));
   }
   if (query) {
@@ -8237,6 +8249,28 @@ var generateContentUrl = (options) => {
   }
   return url;
 };
+var getUserAttributesFromQueryOptions = (queryOptions) => {
+  const newUserAttributes = {};
+  for (const key in queryOptions) {
+    if (key.startsWith("userAttributes.")) {
+      newUserAttributes[key] = queryOptions[key];
+      delete queryOptions[key];
+    }
+  }
+  return newUserAttributes;
+};
+var getUserAttributesAsJSON = (queryOptions) => {
+  if (isBrowser() && queryOptions["preview"] === "BUILDER_STUDIO") {
+    queryOptions["userAttributes.urlPath"] = window.location.pathname;
+    queryOptions["userAttributes.host"] = window.location.host;
+    const queryOptionsForUserAttributes = getUserAttributesFromQueryOptions(queryOptions);
+    const {
+      userAttributes
+    } = unflatten(queryOptionsForUserAttributes);
+    return userAttributes;
+  }
+  return {};
+};
 
 // src/functions/get-content/index.ts
 var checkContentHasResults = (content) => "results" in content;
@@ -9033,11 +9067,16 @@ function EnableEditor(props) {
         const searchParamPreviewModel = searchParams.get("builder.preview");
         const searchParamPreviewId = searchParams.get(`builder.overrides.${searchParamPreviewModel}`);
         const previewApiKey = searchParams.get("apiKey") || searchParams.get("builder.space");
-        if (searchParamPreviewModel === props.model && previewApiKey === props.apiKey && (!props.content || searchParamPreviewId === props.content.id)) {
+        if (searchParamPreviewModel === "BUILDER_STUDIO" || searchParamPreviewModel === props.model && previewApiKey === props.apiKey && (!props.content || searchParamPreviewId === props.content.id)) {
           fetchOneEntry({
-            model: props.model,
+            model: props.model || "",
             apiKey: props.apiKey,
-            apiVersion: props.builderContextSignal.apiVersion
+            apiVersion: props.builderContextSignal.apiVersion,
+            ...searchParamPreviewModel === "BUILDER_STUDIO" && props.context?.symbolId ? {
+              query: {
+                id: props.context.symbolId
+              }
+            } : {}
           }).then((content) => {
             if (content) {
               mergeNewContent(content);