@builder.io/sdk-solid 2.0.8 → 2.0.13

package/lib/node/index.jsx

@@ -103,7 +103,13 @@ import { createContext as createContext2 } from "solid-js";
 var components_context_default = createContext2({ registeredComponents: {} });
 
 // src/components/block/block.tsx
-import { Show as Show4, For as For2, onMount, createMemo as createMemo5 } from "solid-js";
+import {
+  Show as Show4,
+  For as For2,
+  onMount,
+  createMemo as createMemo5,
+  createSignal as createSignal5
+} from "solid-js";
 
 // src/functions/get-block-component-options.ts
 function getBlockComponentOptions(block) {
@@ -113,6 +119,15 @@ function getBlockComponentOptions(block) {
   };
 }
 
+// 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 MSG_PREFIX = "[Builder.io]: ";
 var logger = {
@@ -385,7 +400,7 @@ if (typeof output === 'object' && output !== null) {
 };
 var IVM_INSTANCE = null;
 var IVM_CONTEXT = null;
-var SHOULD_MENTION_INITIALIZE_SCRIPT = SDK_NAME === "@builder.io/sdk-react-nextjs" || SDK_NAME === "@builder.io/sdk-react";
+var SHOULD_MENTION_INITIALIZE_SCRIPT = SDK_NAME === "@builder.io/sdk-react-nextjs" || SDK_NAME === "@builder.io/sdk-react" || SDK_NAME === "@builder.io/sdk-qwik";
 var getIvm = () => {
   try {
     if (IVM_INSTANCE)
@@ -400,7 +415,7 @@ var getIvm = () => {
     
     SOLUTION: In a server-only execution path within your application, do one of the following:
   
-    ${SHOULD_MENTION_INITIALIZE_SCRIPT ? '- import and call `initializeNodeRuntime()` from "${SDK_NAME}/node/init".' : ""}
+    ${SHOULD_MENTION_INITIALIZE_SCRIPT ? `- import and call \`initializeNodeRuntime()\` from "${SDK_NAME}/node/init".` : ""}
     - add the following import: \`await import('isolated-vm')\`.
 
     For more information, visit https://builder.io/c/docs/integration-tips#enabling-data-bindings-in-node-environments`;
@@ -504,6 +519,7 @@ var shouldForceBrowserRuntimeInNode = () => {
 var chooseBrowserOrServerEval = (args) => isBrowser() || shouldForceBrowserRuntimeInNode() ? runInBrowser(args) : runInNode(args);
 
 // src/functions/evaluate/evaluate.ts
+var DISABLE_CACHE = true;
 var EvalCache = class _EvalCache {
   static cacheLimit = 20;
   static cache = /* @__PURE__ */ new Map();
@@ -552,7 +568,7 @@ function evaluate({
     rootState,
     localState
   };
-  if (enableCache) {
+  if (enableCache && !DISABLE_CACHE) {
     const cacheKey = EvalCache.getCacheKey(args);
     const cachedValue = EvalCache.getCachedValue(cacheKey);
     if (cachedValue) {
@@ -580,6 +596,53 @@ function transformBlock(block) {
 }
 
 // src/functions/get-processed-block.ts
+function deepCloneWithConditions(obj) {
+  if (obj === null || typeof obj !== "object") {
+    return obj;
+  }
+  if (Array.isArray(obj)) {
+    return obj.map((item) => deepCloneWithConditions(item));
+  }
+  if (obj["@type"] === "@builder.io/sdk:Element") {
+    return obj;
+  }
+  const clonedObj = {};
+  for (const key in obj) {
+    if (key !== "meta" && Object.prototype.hasOwnProperty.call(obj, key)) {
+      clonedObj[key] = deepCloneWithConditions(obj[key]);
+    }
+  }
+  return clonedObj;
+}
+var IS_SDK_WITHOUT_CACHED_PROCESSED_BLOCK = ["svelte", "vue", "angular", "qwik", "solid"].includes(TARGET);
+var getCopy = (block) => {
+  if (IS_SDK_WITHOUT_CACHED_PROCESSED_BLOCK) {
+    const copy = fastClone(block);
+    const copied = {
+      ...copy,
+      properties: {
+        ...copy.properties
+      },
+      actions: {
+        ...copy.actions
+      }
+    };
+    return copied;
+  } else {
+    const copy = deepCloneWithConditions(omit(block, "children", "meta"));
+    return {
+      ...copy,
+      properties: {
+        ...copy.properties
+      },
+      actions: {
+        ...copy.actions
+      },
+      children: block.children,
+      meta: block.meta
+    };
+  }
+};
 var evaluateBindings = ({
   block,
   context,
@@ -590,16 +653,7 @@ var evaluateBindings = ({
   if (!block.bindings) {
     return block;
   }
-  const copy = fastClone(block);
-  const copied = {
-    ...copy,
-    properties: {
-      ...copy.properties
-    },
-    actions: {
-      ...copy.actions
-    }
-  };
+  const copied = getCopy(block);
   for (const binding in block.bindings) {
     const expression = block.bindings[binding];
     const value = evaluate({
@@ -881,17 +935,9 @@ function mapStyleObjToStrIfNeeded(style) {
 // src/components/block/block.helpers.ts
 var getComponent = ({
   block,
-  context,
   registeredComponents
 }) => {
-  const componentName = getProcessedBlock({
-    block,
-    localState: context.localState,
-    rootState: context.rootState,
-    rootSetState: context.rootSetState,
-    context: context.context,
-    shouldEvaluateBindings: false
-  }).component?.name;
+  const componentName = block.component?.name;
   if (!componentName) {
     return null;
   }
@@ -1035,14 +1081,7 @@ var Inlined_styles_default = InlinedStyles;
 // src/components/block/components/block-styles.tsx
 function BlockStyles(props) {
   const canShowBlock = createMemo(() => {
-    const processedBlock = getProcessedBlock({
-      block: props.block,
-      localState: props.context.localState,
-      rootState: props.context.rootState,
-      rootSetState: props.context.rootSetState,
-      context: props.context.context,
-      shouldEvaluateBindings: true
-    });
+    const processedBlock = props.block;
     if (checkIsDefined(processedBlock.hide)) {
       return !processedBlock.hide;
     }
@@ -1052,14 +1091,7 @@ function BlockStyles(props) {
     return true;
   });
   const css = createMemo(() => {
-    const processedBlock = getProcessedBlock({
-      block: props.block,
-      localState: props.context.localState,
-      rootState: props.context.rootState,
-      rootSetState: props.context.rootSetState,
-      context: props.context.context,
-      shouldEvaluateBindings: true
-    });
+    const processedBlock = props.block;
     const styles = processedBlock.responsiveStyles;
     const content = props.context.content;
     const sizesWithUpdatedBreakpoints = getSizesForBreakpoints(
@@ -1328,12 +1360,9 @@ var Repeated_block_default = RepeatedBlock;
 
 // src/components/block/block.tsx
 function Block(props) {
-  const blockComponent = createMemo5(() => {
-    return getComponent({
-      block: props.block,
-      context: props.context,
-      registeredComponents: props.registeredComponents
-    });
+  const [_processedBlock, set_processedBlock] = createSignal5({
+    value: null,
+    update: false
   });
   const repeatItem = createMemo5(() => {
     return getRepeatItemData({
@@ -1342,7 +1371,7 @@ function Block(props) {
     });
   });
   const processedBlock = createMemo5(() => {
-    return props.block.repeat?.collection ? props.block : getProcessedBlock({
+    const blockToUse = props.block.repeat?.collection ? props.block : getProcessedBlock({
       block: props.block,
       localState: props.context.localState,
       rootState: props.context.rootState,
@@ -1350,6 +1379,13 @@ function Block(props) {
       context: props.context.context,
       shouldEvaluateBindings: true
     });
+    return blockToUse;
+  });
+  const blockComponent = createMemo5(() => {
+    return getComponent({
+      block: processedBlock(),
+      registeredComponents: props.registeredComponents
+    });
   });
   const Tag = createMemo5(() => {
     const shouldUseLink = props.block.tagName === "a" || processedBlock().properties?.href || processedBlock().href;
@@ -1407,9 +1443,24 @@ function Block(props) {
     }
   });
   return <><Show4 when={canShowBlock()}>
-    <Block_styles_default block={props.block} context={props.context} />
+    <Block_styles_default
+      block={processedBlock()}
+      context={props.context}
+    />
     <Show4
-      fallback={<Component_ref_default
+      fallback={<Show4
+        fallback={<For2 each={repeatItem()}>{(data, _index) => {
+          const index = _index();
+          return <Repeated_block_default
+            key={index}
+            repeatContext={data.context}
+            block={data.block}
+            registeredComponents={props.registeredComponents}
+            linkComponent={props.linkComponent}
+          />;
+        }}</For2>}
+        when={!repeatItem()}
+      ><Component_ref_default
         componentRef={componentRefProps().componentRef}
         componentOptions={componentRefProps().componentOptions}
         blockChildren={componentRefProps().blockChildren}
@@ -1419,7 +1470,7 @@ function Block(props) {
         builderBlock={componentRefProps().builderBlock}
         includeBlockProps={componentRefProps().includeBlockProps}
         isInteractive={componentRefProps().isInteractive}
-      />}
+      /></Show4>}
       when={!blockComponent()?.noWrap}
     ><Show4
       fallback={<For2 each={repeatItem()}>{(data, _index) => {
@@ -1465,7 +1516,7 @@ function Block(props) {
 var Block_default = Block;
 
 // src/components/blocks/blocks-wrapper.tsx
-import { createMemo as createMemo6 } from "solid-js";
+import { onMount as onMount2, createMemo as createMemo6 } from "solid-js";
 import { Dynamic as Dynamic4 } from "solid-js/web";
 function BlocksWrapper(props) {
   const className = createMemo6(() => {
@@ -1499,9 +1550,13 @@ function BlocksWrapper(props) {
       );
     }
   }
+  let blocksWrapperRef;
+  onMount2(() => {
+  });
   return <>
     <Dynamic4
-      class={className() + " dynamic-1bb6a3a2"}
+      class={className() + " dynamic-4da8c6f4"}
+      ref={blocksWrapperRef}
       builder-path={props.path}
       builder-parent-id={props.parent}
       {...{}}
@@ -1512,7 +1567,7 @@ function BlocksWrapper(props) {
       {...props.BlocksWrapperProps}
       component={props.BlocksWrapper}
     >{props.children}</Dynamic4>
-    <style>{`.dynamic-1bb6a3a2 {
+    <style>{`.dynamic-4da8c6f4 {
   display: flex;
   flex-direction: column;
   align-items: stretch;
@@ -1716,7 +1771,7 @@ function FragmentComponent(props) {
 var fragment_default = FragmentComponent;
 
 // src/blocks/image/image.tsx
-import { Show as Show7, onMount as onMount2, createMemo as createMemo8 } from "solid-js";
+import { Show as Show7, onMount as onMount3, createMemo as createMemo8 } from "solid-js";
 
 // src/blocks/image/image.helpers.ts
 function removeProtocol(path) {
@@ -1805,7 +1860,7 @@ function Image(props) {
     const out = props.aspectRatio ? aspectRatioStyles : void 0;
     return out;
   });
-  onMount2(() => {
+  onMount3(() => {
   });
   return <>
     <>
@@ -1881,10 +1936,10 @@ function SectionComponent(props) {
 var section_default = SectionComponent;
 
 // src/blocks/symbol/symbol.tsx
-import { onMount as onMount6, on as on3, createEffect as createEffect3, createMemo as createMemo20, createSignal as createSignal20 } from "solid-js";
+import { onMount as onMount7, on as on4, createEffect as createEffect4, createMemo as createMemo20, createSignal as createSignal20 } from "solid-js";
 
 // src/components/content-variants/content-variants.tsx
-import { Show as Show14, For as For9, onMount as onMount5, createSignal as createSignal19, createMemo as createMemo19 } from "solid-js";
+import { Show as Show14, For as For9, onMount as onMount6, createSignal as createSignal19, createMemo as createMemo19 } from "solid-js";
 
 // src/helpers/url.ts
 var getTopLevelDomain = (host) => {
@@ -2823,7 +2878,8 @@ var componentInfo7 = {
     defaultValue: "children"
   }],
   shouldReceiveBuilderProps: {
-    builderContext: true
+    builderContext: true,
+    builderComponents: true
   }
 };
 
@@ -2840,6 +2896,7 @@ function Slot(props) {
     parent={props.builderContext.context?.symbolId}
     path={`symbol.data.${props.name}`}
     context={props.builderContext}
+    registeredComponents={props.builderComponents}
     blocks={props.builderContext.rootState?.[props.name]}
   /></div></>;
 }
@@ -3172,12 +3229,12 @@ var componentInfo11 = {
 };
 
 // src/blocks/custom-code/custom-code.tsx
-import { onMount as onMount3, createSignal as createSignal12 } from "solid-js";
+import { onMount as onMount4, createSignal as createSignal12 } from "solid-js";
 function CustomCode(props) {
   const [scriptsInserted, setScriptsInserted] = createSignal12([]);
   const [scriptsRun, setScriptsRun] = createSignal12([]);
   let elementRef;
-  onMount3(() => {
+  onMount4(() => {
     if (!elementRef?.getElementsByTagName || typeof window === "undefined") {
       return;
     }
@@ -3236,7 +3293,7 @@ var componentInfo12 = {
 };
 
 // src/blocks/embed/embed.tsx
-import { on, createEffect, createMemo as createMemo13, createSignal as createSignal13 } from "solid-js";
+import { on as on2, createEffect as createEffect2, createMemo as createMemo13, createSignal as createSignal13 } from "solid-js";
 
 // src/blocks/embed/helpers.ts
 var SCRIPT_MIME_TYPES = ["text/javascript", "application/javascript", "application/ecmascript"];
@@ -3277,8 +3334,8 @@ function Embed(props) {
       findAndRunScripts();
     }
   }
-  createEffect(
-    on(() => [onUpdateFn_0_elem(), onUpdateFn_0_ranInitFn__()], onUpdateFn_0)
+  createEffect2(
+    on2(() => [onUpdateFn_0_elem(), onUpdateFn_0_ranInitFn__()], onUpdateFn_0)
   );
   return <><div class="builder-embed" ref={elem} innerHTML={props.content} /></>;
 }
@@ -4269,14 +4326,14 @@ var getDefaultRegisteredComponents = () => [{
 // src/functions/register-component.ts
 var createRegisterComponentMessage = (info) => ({
   type: "builder.registerComponent",
-  data: serializeComponentInfo(info)
+  data: serializeIncludingFunctions(info)
 });
 var serializeFn = (fnValue) => {
   const fnStr = fnValue.toString().trim();
   const appendFunction = !fnStr.startsWith("function") && !fnStr.startsWith("(");
   return `return (${appendFunction ? "function " : ""}${fnStr}).apply(this, arguments)`;
 };
-function serializeComponentInfo(info) {
+function serializeIncludingFunctions(info) {
   return JSON.parse(JSON.stringify(info, (key, value) => {
     if (typeof value === "function") {
       return serializeFn(value);
@@ -4344,9 +4401,9 @@ var Inlined_script_default = InlinedScript;
 // src/components/content/components/enable-editor.tsx
 import {
   Show as Show12,
-  onMount as onMount4,
-  on as on2,
-  createEffect as createEffect2,
+  onMount as onMount5,
+  on as on3,
+  createEffect as createEffect3,
   createMemo as createMemo16,
   createSignal as createSignal16
 } from "solid-js";
@@ -4453,7 +4510,7 @@ var generateContentUrl = (options) => {
     locale,
     apiVersion = DEFAULT_API_VERSION,
     fields,
-    omit,
+    omit: omit2,
     offset,
     cacheSeconds,
     staleCacheSeconds,
@@ -4476,7 +4533,7 @@ var generateContentUrl = (options) => {
     url.searchParams.set("locale", locale);
   if (enrich)
     url.searchParams.set("enrich", String(enrich));
-  url.searchParams.set("omit", omit || "meta.componentsUsed");
+  url.searchParams.set("omit", omit2 || "meta.componentsUsed");
   if (fields) {
     url.searchParams.set("fields", fields);
   }
@@ -4846,11 +4903,14 @@ function isFromTrustedHost(trustedHosts, e) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.8";
+var SDK_VERSION = "2.0.13";
 
 // src/functions/register.ts
 var registry = {};
 function register(type, info) {
+  if (type === "plugin") {
+    info = serializeIncludingFunctions(info);
+  }
   let typeList = registry[type];
   if (!typeList) {
     typeList = registry[type] = [];
@@ -5281,7 +5341,7 @@ function EnableEditor(props) {
     }
   }
   let elementRef;
-  onMount4(() => {
+  onMount5(() => {
     if (isBrowser()) {
       if (isEditing()) {
         window.addEventListener("message", processMessage);
@@ -5342,7 +5402,7 @@ function EnableEditor(props) {
       }
     }
   });
-  onMount4(() => {
+  onMount5(() => {
     if (!props.apiKey) {
       logger.error(
         "No API key provided to `Content` component. This can cause issues. Please provide an API key using the `apiKey` prop."
@@ -5358,13 +5418,13 @@ function EnableEditor(props) {
       mergeNewContent(props.content);
     }
   }
-  createEffect2(on2(() => [onUpdateFn_0_props_content()], onUpdateFn_0));
+  createEffect3(on3(() => [onUpdateFn_0_props_content()], onUpdateFn_0));
   const onUpdateFn_1_props_builderContextSignal_content__data__jsCode = createMemo16(() => props.builderContextSignal.content?.data?.jsCode);
   function onUpdateFn_1() {
     evaluateJsCode();
   }
-  createEffect2(
-    on2(
+  createEffect3(
+    on3(
       () => [onUpdateFn_1_props_builderContextSignal_content__data__jsCode()],
       onUpdateFn_1
     )
@@ -5373,8 +5433,8 @@ function EnableEditor(props) {
   function onUpdateFn_2() {
     runHttpRequests();
   }
-  createEffect2(
-    on2(
+  createEffect3(
+    on3(
       () => [
         onUpdateFn_2_props_builderContextSignal_content__data__httpRequests()
       ],
@@ -5387,8 +5447,8 @@ function EnableEditor(props) {
   function onUpdateFn_3() {
     emitStateUpdate();
   }
-  createEffect2(
-    on2(
+  createEffect3(
+    on3(
       () => [onUpdateFn_3_props_builderContextSignal_rootState()],
       onUpdateFn_3
     )
@@ -5399,7 +5459,7 @@ function EnableEditor(props) {
       mergeNewRootState(props.data);
     }
   }
-  createEffect2(on2(() => [onUpdateFn_4_props_data()], onUpdateFn_4));
+  createEffect3(on3(() => [onUpdateFn_4_props_data()], onUpdateFn_4));
   const onUpdateFn_5_props_locale = createMemo16(() => props.locale);
   function onUpdateFn_5() {
     if (props.locale) {
@@ -5408,7 +5468,7 @@ function EnableEditor(props) {
       });
     }
   }
-  createEffect2(on2(() => [onUpdateFn_5_props_locale()], onUpdateFn_5));
+  createEffect3(on3(() => [onUpdateFn_5_props_locale()], onUpdateFn_5));
   return <><builder_context_default.Provider value={props.builderContextSignal}><Show12 when={props.builderContextSignal.content}><Dynamic5
     class={getWrapperClassName(
       props.content?.testVariationId || props.content?.id
@@ -5510,7 +5570,7 @@ function ContentComponent(props) {
         ...acc,
         [info.name]: {
           component,
-          ...serializeComponentInfo(info)
+          ...serializeIncludingFunctions(info)
         }
       }),
       {}
@@ -5544,7 +5604,7 @@ function ContentComponent(props) {
     ].reduce(
       (acc, { component: _, ...info }) => ({
         ...acc,
-        [info.name]: serializeComponentInfo(info)
+        [info.name]: serializeIncludingFunctions(info)
       }),
       {}
     ),
@@ -5633,7 +5693,7 @@ function ContentVariants(props) {
       canTrack: getDefaultCanTrack(props.canTrack)
     });
   });
-  onMount5(() => {
+  onMount6(() => {
     setShouldRenderVariants(false);
   });
   return <><>
@@ -5761,13 +5821,13 @@ function Symbol(props) {
       }
     });
   }
-  onMount6(() => {
+  onMount7(() => {
   });
   const onUpdateFn_0_props_symbol = createMemo20(() => props.symbol);
   function onUpdateFn_0() {
     setContent();
   }
-  createEffect3(on3(() => [onUpdateFn_0_props_symbol()], onUpdateFn_0));
+  createEffect4(on4(() => [onUpdateFn_0_props_symbol()], onUpdateFn_0));
   return <><div class={className()} {...{}} {...props.attributes} {...{}}><Content_variants_default
     nonce={props.builderContext.nonce}
     isNestedRender={true}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-solid",
-  "version": "2.0.8",
+  "version": "2.0.13",
   "description": "",
   "files": [
     "dist",
@@ -97,8 +97,8 @@
     "@builder.io/sdks": "workspace:*",
     "esbuild": "^0.18.15",
     "esbuild-plugin-solid": "^0.5.0",
-    "nx": "16.10.0",
-    "nx-cloud": "16.5.2",
+    "nx": "^19.6.5",
+    "nx-cloud": "^19.0.0",
     "solid-js": "^1.7.8",
     "tsup": "^7.1.0",
     "tsup-preset-solid": "^2.0.1",