@builder.io/sdk-react-native 3.0.1 → 3.0.2

package/lib/node/typescript/server-index.d.ts

@@ -15,7 +15,7 @@ export type { ContentVariantsPrps as ContentProps } from './components/content-v
 /**
  * General Builder types
  */
-export type { RegisteredComponent } from './context/types';
+export type { BuilderContextInterface, RegisteredComponent, RegisteredComponents } from './context/types';
 export type { BuilderBlock } from './types/builder-block';
 export type { BuilderContent } from './types/builder-content';
 export type { ComponentInfo } from './types/components';

package/lib/node/typescript/server-index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"server-index.d.ts","sourceRoot":"","sources":["../../../src/server-index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAE5C;;GAEG;AACH,YAAY,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,YAAY,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,YAAY,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,YAAY,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,YAAY,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,YAAY,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,YAAY,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,YAAY,EAAE,mBAAmB,IAAI,YAAY,EAAE,MAAM,sDAAsD,CAAC;AAEhH;;GAEG;AACH,YAAY,EAAE,mBAAmB,EAAE,MAAM,iBAAiB,CAAC;AAC3D,YAAY,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,YAAY,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnG,YAAY,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA"}
+{"version":3,"file":"server-index.d.ts","sourceRoot":"","sources":["../../../src/server-index.ts"],"names":[],"mappings":"AAAA,cAAc,6BAA6B,CAAC;AAE5C;;GAEG;AACH,YAAY,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAE,WAAW,EAAE,MAAM,gCAAgC,CAAC;AAClE,YAAY,EAAE,aAAa,EAAE,MAAM,kCAAkC,CAAC;AACtE,YAAY,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,YAAY,EAAE,YAAY,EAAE,MAAM,gCAAgC,CAAC;AACnE,YAAY,EAAE,WAAW,EAAE,MAAM,8BAA8B,CAAC;AAChE,YAAY,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AAC1D,YAAY,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAC7D,YAAY,EAAE,WAAW,EAAE,MAAM,kCAAkC,CAAC;AACpE,YAAY,EAAE,mBAAmB,IAAI,YAAY,EAAE,MAAM,sDAAsD,CAAC;AAEhH;;GAEG;AACH,YAAY,EAAE,uBAAuB,EAAE,mBAAmB,EAAE,oBAAoB,EAAE,MAAM,iBAAiB,CAAC;AAC1G,YAAY,EAAE,YAAY,EAAE,MAAM,uBAAuB,CAAC;AAC1D,YAAY,EAAE,cAAc,EAAE,MAAM,yBAAyB,CAAC;AAC9D,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAExD;;GAEG;AACH,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AACnD,OAAO,EAAE,YAAY,EAAE,MAAM,2BAA2B,CAAC;AACzD,OAAO,EAAE,8BAA8B,EAAE,MAAM,gCAAgC,CAAC;AAChF,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAChD,YAAY,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,sBAAsB,CAAC;AAC7E,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,YAAY,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,sBAAsB,EAAE,MAAM,6CAA6C,CAAC;AACrF,OAAO,EAAE,KAAK,EAAE,MAAM,yBAAyB,CAAC;AAChD,OAAO,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAC;AAElE;;GAEG;AACH,OAAO,EAAE,iBAAiB,EAAE,MAAM,iCAAiC,CAAC;AACpE,OAAO,EAAE,qBAAqB,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,+BAA+B,CAAC;AACnG,YAAY,EAAE,iBAAiB,EAAE,MAAM,+BAA+B,CAAA"}

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@builder.io/sdk-react-native",
   "description": "Builder.io SDK for React Native",
-  "version": "3.0.1",
+  "version": "3.0.2",
   "homepage": "https://github.com/BuilderIO/builder/tree/main/packages/sdks/output/react-native",
   "repository": {
     "type": "git",

package/src/blocks/text/text.tsx

@@ -1,8 +1,7 @@
+import { RenderHTML } from '@builder.io/react-native-render-html';
 import * as React from 'react';
 import { useWindowDimensions } from 'react-native';
-import { RenderHTML } from '@builder.io/react-native-render-html';
 import BuilderContext from '../../context/builder.context';
-import { evaluate } from '../../functions/evaluate/index';
 
 /**
  * @typedef {{}} BuilderBlock
@@ -90,38 +89,17 @@ function getCss(block, inheritedStyles) {
 /**
  *
  * @param {{ text: string; builderBlock: BuilderBlock, builderContext: BuilderContext}} props
- * @returns 
+ * @returns
  */
 export default function Text(props) {
   const { width } = useWindowDimensions();
   const context = React.useContext(BuilderContext);
-  const {
-    context: contextContext,
-    localState,
-    rootState,
-    rootSetState,
-  } = context;
-
-  const processedText = String(props.text?.toString() || '').replace(
-        /{{([^}]+)}}/g, 
-        (match, group) => evaluate({
-          code: group,
-          context: contextContext,
-          localState,
-          rootState,
-          rootSetState,
-          
-        }).toString()
-      );
 
   return (
     <RenderHTML
       contentWidth={width}
       source={{
-        html: `<div style="${getCss(
-          props.builderBlock,
-          context.inheritedStyles
-        )}">${processedText}</div>`,
+        html: `<div style="${getCss(props.builderBlock, context.inheritedStyles)}">${props.text?.toString() || ''}</div>`,
       }}
     />
   );

package/src/components/block/block.tsx

@@ -72,7 +72,6 @@ function Block(props: BlockProps) {
           rootState: props.context.rootState,
           rootSetState: props.context.rootSetState,
           context: props.context.context,
-          shouldEvaluateBindings: true,
         });
     _processedBlock.value = blockToUse;
     _processedBlock.update = false;
@@ -129,7 +128,7 @@ function Block(props: BlockProps) {
       blockChildren: processedBlock().children ?? [],
       componentRef: blockComponent?.()?.component,
       componentOptions: {
-        ...getBlockComponentOptions(processedBlock()),
+        ...getBlockComponentOptions(processedBlock(), props.context),
         ...provideBuilderBlock(blockComponent(), processedBlock()),
         ...provideBuilderContext(blockComponent(), props.context),
         ...provideLinkComponent(blockComponent(), props.linkComponent),

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

@@ -282,14 +282,23 @@ function EnableEditor(props: BuilderEditorProps) {
      * TO-DO: should we only update the state when there is a change?
      **/
     if (
-      searchParamPreviewModel === props.model &&
-      previewApiKey === props.apiKey &&
-      (!props.content || searchParamPreviewId === props.content.id)
+      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,
+        ...(searchParamPreviewModel === "BUILDER_STUDIO" &&
+        props.context?.symbolId
+          ? {
+              query: {
+                id: props.context.symbolId,
+              },
+            }
+          : {}),
       }).then((content) => {
         if (content) {
           mergeNewContent(content);
@@ -382,14 +391,23 @@ function EnableEditor(props: BuilderEditorProps) {
          * TO-DO: should we only update the state when there is a change?
          **/
         if (
-          searchParamPreviewModel === props.model &&
-          previewApiKey === props.apiKey &&
-          (!props.content || searchParamPreviewId === props.content.id)
+          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,
+            ...(searchParamPreviewModel === "BUILDER_STUDIO" &&
+            props.context?.symbolId
+              ? {
+                  query: {
+                    id: props.context.symbolId,
+                  },
+                }
+              : {}),
           }).then((content) => {
             if (content) {
               mergeNewContent(content);

package/src/constants/sdk-version.ts

@@ -1 +1 @@
-export const SDK_VERSION = "3.0.1"
+export const SDK_VERSION = "3.0.2"

package/src/functions/evaluate/edge-runtime/edge-runtime.ts

@@ -1,4 +1,3 @@
-import { logger } from '../../../helpers/logger';
 import type { ExecutorArgs } from '../helpers';
 import { flattenState, getFunctionArguments } from '../helpers';
 import Interpreter from './acorn-interpreter';
@@ -95,10 +94,7 @@ export const 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.');
-    return;
-  }
+  if (cleanedCode === '') return;
   const transformed = `
 function theFunction() {
   ${prependedCode}

package/src/functions/get-block-component-options.ts

@@ -1,7 +1,24 @@
+import type { BuilderContextInterface } from '../context/types';
 import type { BuilderBlock } from '../types/builder-block';
-export function getBlockComponentOptions(block: BuilderBlock) {
+import { evaluate } from './evaluate/evaluate';
+export function getBlockComponentOptions(block: BuilderBlock, context: Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>) {
   return {
     ...block.component?.options,
-    ...(block as any).options
+    ...(block as any).options,
+    ...evaluateTextComponentTextOption(block, context)
   };
+}
+const evaluateTextComponentTextOption = (block: BuilderBlock, context: Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>) => {
+  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: string, group: string) => (evaluate({
+        code: group,
+        context,
+        localState: context.localState,
+        rootState: context.rootState,
+        rootSetState: context.rootSetState
+      }) as string))
+    };
+  }
 }

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

@@ -1,7 +1,8 @@
-import { flatten, flattenMongoQuery } from '../../helpers/flatten';
+import { flatten, flattenMongoQuery, unflatten } from '../../helpers/flatten';
 import { normalizeSearchParams } from '../../helpers/search/search';
 import { DEFAULT_API_VERSION } from '../../types/api-version';
 import { getBuilderSearchParamsFromWindow } from '../get-builder-search-params/index';
+import { isBrowser } from '../is-browser';
 import type { GetContentOptions } from './types';
 const isPositiveNumber = (thing: unknown) => typeof thing === 'number' && !isNaN(thing) && thing >= 0;
 export const generateContentUrl = (options: GetContentOptions): URL => {
@@ -39,7 +40,7 @@ export const generateContentUrl = (options: GetContentOptions): URL => {
   url.searchParams.set('noTraverse', String(noTraverse));
   url.searchParams.set('includeRefs', String(true));
   const finalLocale = locale || userAttributes?.locale;
-  let finalUserAttributes = userAttributes;
+  let finalUserAttributes: Record<string, any> = userAttributes || {};
   if (finalLocale) {
     url.searchParams.set('locale', finalLocale);
     finalUserAttributes = {
@@ -79,11 +80,15 @@ export const generateContentUrl = (options: GetContentOptions): URL => {
     ...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) {
@@ -95,4 +100,26 @@ export const generateContentUrl = (options: GetContentOptions): URL => {
     }
   }
   return url;
+};
+const getUserAttributesFromQueryOptions = (queryOptions: any) => {
+  const newUserAttributes: any = {};
+  for (const key in queryOptions) {
+    if (key.startsWith('userAttributes.')) {
+      newUserAttributes[key] = queryOptions[key];
+      delete queryOptions[key];
+    }
+  }
+  return newUserAttributes;
+};
+const getUserAttributesAsJSON = (queryOptions: any) => {
+  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 {};
 }

package/src/functions/get-processed-block.ts

@@ -85,29 +85,19 @@ const evaluateBindings = ({
 export function getProcessedBlock({
   block,
   context,
-  shouldEvaluateBindings,
   localState,
   rootState,
   rootSetState
 }: {
   block: BuilderBlock;
-  /**
-   * In some cases, we want to avoid evaluating bindings and only want framework-specific block transformation. It is
-   * also sometimes too early to consider bindings, e.g. when we might be looking at a repeated block.
-   */
-  shouldEvaluateBindings: boolean;
 } & Pick<BuilderContextInterface, 'localState' | 'context' | 'rootState' | 'rootSetState'>): BuilderBlock {
   let transformedBlock = resolveLocalizedValues(block, (rootState.locale as string | undefined));
   transformedBlock = transformBlock(transformedBlock);
-  if (shouldEvaluateBindings) {
-    return evaluateBindings({
-      block: transformedBlock,
-      localState,
-      rootState,
-      rootSetState,
-      context
-    });
-  } else {
-    return transformedBlock;
-  }
+  return evaluateBindings({
+    block: transformedBlock,
+    localState,
+    rootState,
+    rootSetState,
+    context
+  });
 }

package/src/helpers/flatten.ts

@@ -38,4 +38,27 @@ export function flattenMongoQuery(obj: any, _current?: any, _res: any = {}): {
     }
   }
   return _res;
+}
+
+/**
+ * Unflatten a flat object with dot-separated keys back into a nested object.
+ *
+ * { 'foo.bar': 'baz' } -> { foo: { bar: 'baz' }}
+ */
+export function unflatten(obj: any): any {
+  const result: any = {};
+  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;
 }

package/src/server-index.ts

@@ -17,7 +17,7 @@ export type { ContentVariantsPrps as ContentProps } from './components/content-v
 /**
  * General Builder types
  */
-export type { RegisteredComponent } from './context/types';
+export type { BuilderContextInterface, RegisteredComponent, RegisteredComponents } from './context/types';
 export type { BuilderBlock } from './types/builder-block';
 export type { BuilderContent } from './types/builder-content';
 export type { ComponentInfo } from './types/components';