@builder.io/sdk-solid 0.5.8 → 0.5.9

package/CHANGELOG.md

@@ -1,3 +1,7 @@
+### 0.5.9
+
+No Changes.
+
 ### 0.5.8
 
 - Fix: properly serialize messages sent to visual editor.

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-solid",
-  "version": "0.5.8",
+  "version": "0.5.9",
   "description": "",
   "type": "module",
   "main": "./solid-index.jsx",

package/src/components/block/components/component-ref/component-ref.jsx

@@ -5,6 +5,7 @@ import BlockStyles from "../block-styles";
 import Block from "../../block";
 import InteractiveElement from "../interactive-element";
 import { getWrapperProps } from "./component-ref.helpers.js";
+import { wrapComponentRef } from "../../../content/wrap-component-ref.js";
 
 function ComponentRef(props) {
   const [Wrapper, setWrapper] = createSignal(

package/src/constants/sdk-version.js

@@ -1 +1 @@
-export const SDK_VERSION = "0.5.8"
+export const SDK_VERSION = "0.5.9"

package/src/functions/evaluate/browser-runtime/browser.js

@@ -0,0 +1,40 @@
+import { getFunctionArguments } from "../helpers.js";
+const runInBrowser = ({
+  code,
+  builder,
+  context,
+  event,
+  localState,
+  rootSetState,
+  rootState
+}) => {
+  const functionArgs = getFunctionArguments({
+    builder,
+    context,
+    event,
+    state: flattenState(rootState, localState, rootSetState)
+  });
+  return new Function(...functionArgs.map(([name]) => name), code)(...functionArgs.map(([, value]) => value));
+};
+function flattenState(rootState, localState, rootSetState) {
+  if (rootState === localState) {
+    throw new Error("rootState === localState");
+  }
+  return new Proxy(rootState, {
+    get: (_, prop) => {
+      if (localState && prop in localState) {
+        return localState[prop];
+      }
+      return rootState[prop];
+    },
+    set: (_, prop, value) => {
+      if (localState && prop in localState) {
+        throw new Error("Writing to local state is not allowed as it is read-only.");
+      }
+      rootState[prop] = value;
+      rootSetState == null ? void 0 : rootSetState(rootState);
+      return true;
+    }
+  });
+}
+export { flattenState, runInBrowser }

package/src/functions/evaluate/browser-runtime/index.js

@@ -0,0 +1,2 @@
+import { runInBrowser } from "./browser.js";
+export { runInBrowser as evaluator }

package/src/functions/evaluate/evaluate.js

@@ -1,8 +1,10 @@
 import { logger } from "../../helpers/logger.js";
 import { isBrowser } from "../is-browser.js";
 import { isEditing } from "../is-editing.js";
-import { isNonNodeServer } from "../is-non-node-server.js";
+import { getUserAttributes } from "../track/helpers.js";
+import { runInBrowser } from "./browser-runtime/browser.js";
 import { runInNonNode } from "./non-node-runtime/index.js";
+import { isNonNodeServer } from "../is-non-node-server.js";
 function evaluate({
   code,
   context,
@@ -19,12 +21,13 @@ function evaluate({
   const builder = {
     isEditing: isEditing(),
     isBrowser: isBrowser(),
-    isServer: !isBrowser()
+    isServer: !isBrowser(),
+    getUserAttributes: () => getUserAttributes()
   };
   const useReturn = isExpression && !(code.includes(";") || code.includes(" return ") || code.trim().startsWith("return "));
   const useCode = useReturn ? `return (${code});` : code;
   const args = {
-    useCode,
+    code: useCode,
     builder,
     context,
     event,
@@ -32,48 +35,15 @@ function evaluate({
     rootState,
     localState
   };
-  if (isBrowser()) return runInBrowser(args);
-  if (isNonNodeServer()) return runInNonNode(args);
-  return runInNode(args);
-}
-const runInBrowser = ({
-  useCode,
-  builder,
-  context,
-  event,
-  localState,
-  rootSetState,
-  rootState
-}) => {
-  const state = flattenState(rootState, localState, rootSetState);
   try {
-    return new Function("builder", "Builder", "state", "context", "event", useCode)(builder, builder, state, context, event);
+    if (isBrowser()) return runInBrowser(args);
+    if (isNonNodeServer()) return runInNonNode(args);
+    return runInBrowser(args);
   } catch (e) {
-    logger.warn("Builder custom code error: \n While Evaluating: \n ", useCode, "\n", e);
-  }
-};
-const runInNode = args => {
-  return runInBrowser(args);
-};
-function flattenState(rootState, localState, rootSetState) {
-  if (rootState === localState) {
-    throw new Error("rootState === localState");
+    logger.error("Failed code evaluation: " + e.message, {
+      code
+    });
+    return void 0;
   }
-  return new Proxy(rootState, {
-    get: (_, prop) => {
-      if (localState && prop in localState) {
-        return localState[prop];
-      }
-      return rootState[prop];
-    },
-    set: (_, prop, value) => {
-      if (localState && prop in localState) {
-        throw new Error("Writing to local state is not allowed as it is read-only.");
-      }
-      rootState[prop] = value;
-      rootSetState == null ? void 0 : rootSetState(rootState);
-      return true;
-    }
-  });
 }
-export { evaluate, flattenState, runInBrowser, runInNode }
+export { evaluate }

package/src/functions/evaluate/helpers.js

@@ -0,0 +1,15 @@
+const getFunctionArguments = ({
+  builder,
+  context,
+  event,
+  state
+}) => {
+  return Object.entries({
+    state,
+    Builder: builder,
+    builder,
+    context,
+    event
+  });
+};
+export { getFunctionArguments }

package/src/functions/evaluate/index.js

@@ -1,2 +1,2 @@
-import { evaluate } from "./evaluate";
+import { evaluate } from "./evaluate.js";
 export { evaluate }

package/src/functions/evaluate/node-runtime/index.js

@@ -0,0 +1,2 @@
+import { evaluator } from "../browser-runtime/index.js";
+export { evaluator }

package/src/functions/evaluate/non-node-runtime/non-node-runtime.js

@@ -15,9 +15,10 @@ var __spreadValues = (a, b) => {
   }
   return a;
 };
-import { logger } from "../../../helpers/logger";
-import { set } from "../../set";
-import Interpreter from "../acorn-interpreter.js";
+import { logger } from "../../../helpers/logger.js";
+import { set } from "../../set.js";
+import Interpreter from "./acorn-interpreter.js";
+import { getFunctionArguments } from "../helpers.js";
 const processCode = code => {
   return code.split("\n").map(line => {
     const trimmed = line.trim();
@@ -41,18 +42,17 @@ const runInNonNode = ({
   rootState,
   localState,
   rootSetState,
-  useCode
+  code
 }) => {
   const state = __spreadValues(__spreadValues({}, rootState), localState);
-  const properties = {
-    state,
-    Builder: builder,
+  const properties = getFunctionArguments({
     builder,
     context,
-    event
-  };
-  const prependedCode = Object.keys(properties).map(key => `var ${key} = JSON.parse(${getJSONValName(key)});`).join("\n");
-  const cleanedCode = processCode(useCode);
+    event,
+    state
+  });
+  const prependedCode = properties.map(([key]) => `var ${key} = JSON.parse(${getJSONValName(key)});`).join("\n");
+  const cleanedCode = processCode(code);
   if (cleanedCode === "") {
     logger.warn("Skipping evaluation of empty code block.");
     return;
@@ -70,8 +70,7 @@ theFunction();
     rootSetState == null ? void 0 : rootSetState(newState);
   };
   const initFunc = function (interpreter, globalObject) {
-    Object.keys(properties).forEach(key => {
-      const val = properties[key] || {};
+    properties.forEach(([key, val]) => {
       const jsonVal = JSON.stringify(val);
       interpreter.setProperty(globalObject, getJSONValName(key), jsonVal);
     });

package/src/functions/get-block-actions-handler.js

@@ -1,4 +1,4 @@
-import { evaluate } from "./evaluate";
+import { evaluate } from "./evaluate/index.js";
 const createEventHandler = (value, options) => event => evaluate({
   code: value,
   context: options.context,

package/src/index.js

@@ -1,12 +1,3 @@
 export * from "./index-helpers/top-of-file.js";
 export * from "./index-helpers/blocks-exports.js";
-import { isEditing } from "./functions/is-editing.js";
-import { isPreviewing } from "./functions/is-previewing.js";
-import { createRegisterComponentMessage } from "./functions/register-component.js";
-import { register } from "./functions/register.js";
-import { setEditorSettings } from "./functions/set-editor-settings.js";
-import { fetchEntries, fetchOneEntry, getAllContent, getContent, _processContentResult } from "./functions/get-content/index.js";
-import { getBuilderSearchParams } from "./functions/get-builder-search-params/index.js";
-import { track } from "./functions/track/index.js";
-import { fetchBuilderProps } from "./functions/fetch-builder-props.js";
-export { _processContentResult, createRegisterComponentMessage, fetchBuilderProps, fetchEntries, fetchOneEntry, getAllContent, getBuilderSearchParams, getContent, isEditing, isPreviewing, register, setEditorSettings, track }
+export * from "./server-index.js"

package/src/server-index.js

@@ -0,0 +1,11 @@
+export * from "./index-helpers/top-of-file.js";
+import { isEditing } from "./functions/is-editing.js";
+import { isPreviewing } from "./functions/is-previewing.js";
+import { createRegisterComponentMessage } from "./functions/register-component.js";
+import { register } from "./functions/register.js";
+import { setEditorSettings } from "./functions/set-editor-settings.js";
+import { fetchEntries, fetchOneEntry, getAllContent, getContent, _processContentResult } from "./functions/get-content/index.js";
+import { getBuilderSearchParams } from "./functions/get-builder-search-params/index.js";
+import { track } from "./functions/track/index.js";
+import { fetchBuilderProps } from "./functions/fetch-builder-props.js";
+export { _processContentResult, createRegisterComponentMessage, fetchBuilderProps, fetchEntries, fetchOneEntry, getAllContent, getBuilderSearchParams, getContent, isEditing, isPreviewing, register, setEditorSettings, track }