@builder.io/sdk-solid 0.12.4 → 0.12.6

package/lib/node/index.js

@@ -243,27 +243,43 @@ var runInBrowser = ({
     builder,
     context,
     event,
-    state: flattenState(rootState, localState, rootSetState)
+    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");
-  }
+function flattenState({
+  rootState,
+  localState,
+  rootSetState
+}) {
   return new Proxy(rootState, {
-    get: (_, prop) => {
+    get: (target, prop) => {
       if (localState && prop in localState) {
         return localState[prop];
       }
-      return rootState[prop];
+      const val = target[prop];
+      if (typeof val === "object") {
+        return flattenState({
+          rootState: val,
+          localState: void 0,
+          rootSetState: rootSetState ? (subState) => {
+            target[prop] = subState;
+            rootSetState(target);
+          } : void 0
+        });
+      }
+      return val;
     },
-    set: (_, prop, value) => {
+    set: (target, 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?.(rootState);
+      target[prop] = value;
+      rootSetState?.(target);
       return true;
     }
   });
@@ -404,8 +420,33 @@ var runInNode = ({
   }
 };
 
+// src/helpers/nullable.ts
+var checkIsDefined = (maybeT) => maybeT !== null && maybeT !== void 0;
+
+// src/functions/is-node-runtime.ts
+function isNodeRuntime() {
+  return typeof process !== "undefined" && checkIsDefined(process?.versions?.node);
+}
+
+// src/functions/evaluate/should-force-browser-runtime-in-node.ts
+var shouldForceBrowserRuntimeInNode = () => {
+  if (!isNodeRuntime())
+    return false;
+  const isArm64 = process.arch === "arm64";
+  const isNode20 = process.version.startsWith("v20");
+  const hasNoNodeSnapshotNodeOption = process.env.NODE_OPTIONS?.includes("--no-node-snapshot");
+  if (isArm64 && isNode20 && !hasNoNodeSnapshotNodeOption) {
+    logger.log(`Skipping usage of \`isolated-vm\` to avoid crashes in Node v20 on an arm64 machine.
+    If you would like to use the \`isolated-vm\` package on this machine, please provide the \`NODE_OPTIONS=--no-node-snapshot\` config to your Node process.
+    See https://github.com/BuilderIO/builder/blob/main/packages/sdks/README.md#node-v20--m1-macs-apple-silicon-support for more information.
+    `);
+    return true;
+  }
+  return false;
+};
+
 // src/functions/evaluate/choose-eval.ts
-var chooseBrowserOrServerEval = (args) => isBrowser() ? runInBrowser(args) : runInNode(args);
+var chooseBrowserOrServerEval = (args) => isBrowser() || shouldForceBrowserRuntimeInNode() ? runInBrowser(args) : runInNode(args);
 
 // src/functions/evaluate/evaluate.ts
 function evaluate({
@@ -618,9 +659,6 @@ var getSizesForBreakpoints = ({
 // src/functions/camel-to-kebab-case.ts
 var camelToKebabCase = (string) => string.replace(/([a-z0-9]|(?=[A-Z]))([A-Z])/g, "$1-$2").toLowerCase();
 
-// src/helpers/nullable.ts
-var checkIsDefined = (maybeT) => maybeT !== null && maybeT !== void 0;
-
 // src/helpers/css.ts
 var convertStyleMapToCSSArray = (style) => {
   const cssProps = Object.entries(style).map(([key, value]) => {
@@ -3481,7 +3519,7 @@ var getInteractionPropertiesForEvent = (event) => {
 };
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "0.12.4";
+var SDK_VERSION = "0.12.6";
 
 // src/functions/register.ts
 var registry = {};
@@ -3856,7 +3894,7 @@ function EnableEditor(props) {
   function onUpdateFn_2() {
     evaluateJsCode();
   }
-  createEffect(on(() => [props.builderContextSignal.content?.data?.jsCode, props.builderContextSignal.rootState], onUpdateFn_2));
+  createEffect(on(() => [props.builderContextSignal.content?.data?.jsCode], onUpdateFn_2));
   function onUpdateFn_3() {
     runHttpRequests();
   }

package/lib/node/index.jsx

@@ -229,27 +229,43 @@ var runInBrowser = ({
     builder,
     context,
     event,
-    state: flattenState(rootState, localState, rootSetState)
+    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");
-  }
+function flattenState({
+  rootState,
+  localState,
+  rootSetState
+}) {
   return new Proxy(rootState, {
-    get: (_, prop) => {
+    get: (target, prop) => {
       if (localState && prop in localState) {
         return localState[prop];
       }
-      return rootState[prop];
+      const val = target[prop];
+      if (typeof val === "object") {
+        return flattenState({
+          rootState: val,
+          localState: void 0,
+          rootSetState: rootSetState ? (subState) => {
+            target[prop] = subState;
+            rootSetState(target);
+          } : void 0
+        });
+      }
+      return val;
     },
-    set: (_, prop, value) => {
+    set: (target, 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?.(rootState);
+      target[prop] = value;
+      rootSetState?.(target);
       return true;
     }
   });
@@ -393,8 +409,33 @@ var runInNode = ({
   }
 };
 
+// src/helpers/nullable.ts
+var checkIsDefined = (maybeT) => maybeT !== null && maybeT !== void 0;
+
+// src/functions/is-node-runtime.ts
+function isNodeRuntime() {
+  return typeof process !== "undefined" && checkIsDefined(process?.versions?.node);
+}
+
+// src/functions/evaluate/should-force-browser-runtime-in-node.ts
+var shouldForceBrowserRuntimeInNode = () => {
+  if (!isNodeRuntime())
+    return false;
+  const isArm64 = process.arch === "arm64";
+  const isNode20 = process.version.startsWith("v20");
+  const hasNoNodeSnapshotNodeOption = process.env.NODE_OPTIONS?.includes("--no-node-snapshot");
+  if (isArm64 && isNode20 && !hasNoNodeSnapshotNodeOption) {
+    logger.log(`Skipping usage of \`isolated-vm\` to avoid crashes in Node v20 on an arm64 machine.
+    If you would like to use the \`isolated-vm\` package on this machine, please provide the \`NODE_OPTIONS=--no-node-snapshot\` config to your Node process.
+    See https://github.com/BuilderIO/builder/blob/main/packages/sdks/README.md#node-v20--m1-macs-apple-silicon-support for more information.
+    `);
+    return true;
+  }
+  return false;
+};
+
 // src/functions/evaluate/choose-eval.ts
-var chooseBrowserOrServerEval = (args) => isBrowser() ? runInBrowser(args) : runInNode(args);
+var chooseBrowserOrServerEval = (args) => isBrowser() || shouldForceBrowserRuntimeInNode() ? runInBrowser(args) : runInNode(args);
 
 // src/functions/evaluate/evaluate.ts
 function evaluate({
@@ -610,9 +651,6 @@ var getSizesForBreakpoints = ({
 // src/functions/camel-to-kebab-case.ts
 var camelToKebabCase = (string) => string.replace(/([a-z0-9]|(?=[A-Z]))([A-Z])/g, "$1-$2").toLowerCase();
 
-// src/helpers/nullable.ts
-var checkIsDefined = (maybeT) => maybeT !== null && maybeT !== void 0;
-
 // src/helpers/css.ts
 var convertStyleMapToCSSArray = (style) => {
   const cssProps = Object.entries(style).map(([key, value]) => {
@@ -3155,7 +3193,7 @@ var getInteractionPropertiesForEvent = (event) => {
 };
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "0.12.4";
+var SDK_VERSION = "0.12.6";
 
 // src/functions/register.ts
 var registry = {};
@@ -3542,13 +3580,7 @@ function EnableEditor(props) {
     evaluateJsCode();
   }
   createEffect2(
-    on2(
-      () => [
-        props.builderContextSignal.content?.data?.jsCode,
-        props.builderContextSignal.rootState
-      ],
-      onUpdateFn_2
-    )
+    on2(() => [props.builderContextSignal.content?.data?.jsCode], onUpdateFn_2)
   );
   function onUpdateFn_3() {
     runHttpRequests();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@builder.io/sdk-solid",
-  "version": "0.12.4",
+  "version": "0.12.6",
   "description": "",
   "files": [
     "dist",