@builder.io/sdk-solid 2.0.22 → 2.0.23

package/lib/node/dev.js

@@ -145,6 +145,12 @@ var logger = {
   debug: (...message) => console.debug(MSG_PREFIX, ...message)
 };
 
+// src/functions/get.ts
+var get = (obj, path, defaultValue) => {
+  const result = String.prototype.split.call(path, /[,[\].]+?/).filter(Boolean).reduce((res, key) => res !== null && res !== void 0 ? res[key] : res, obj);
+  return result === void 0 || result === obj ? defaultValue : result;
+};
+
 // src/functions/is-browser.ts
 function isBrowser() {
   return typeof window !== "undefined" && typeof document !== "undefined";
@@ -532,30 +538,10 @@ var chooseBrowserOrServerEval = (args) => isBrowser() || shouldForceBrowserRunti
 }) ? 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();
-  static getCacheKey(args) {
-    return JSON.stringify({
-      ...args,
-      // replace the event with a random number to break cache
-      // thats because we can't serialize the event object due to circular refs in DOM node refs.
-      event: args.event ? Math.random() : void 0
-    });
-  }
-  static getCachedValue(key) {
-    const cachedVal = _EvalCache.cache.get(key);
-    return cachedVal;
-  }
-  static setCachedValue(key, value) {
-    if (_EvalCache.cache.size > 20) {
-      _EvalCache.cache.delete(_EvalCache.cache.keys().next().value);
-    }
-    _EvalCache.cache.set(key, {
-      value
-    });
-  }
+var STATE_GETTER_REGEX = /^(return )?(\s*)?state(?<getPath>(\.\w+)+)(\s*);?$/;
+var VIRTUAL_INDEX_REGEX = /(\s)*var(\s)+_virtual_index(\s)*=(\s)*state(?<getPath>(\.\w+)+)(\s*);?(\s)*return(\s)*_virtual_index(\s)*/;
+var getSimpleExpressionGetPath = (code) => {
+  return STATE_GETTER_REGEX.exec(code.trim())?.groups?.getPath?.slice(1) || VIRTUAL_INDEX_REGEX.exec(code.trim())?.groups?.getPath?.slice(1);
 };
 function evaluate({
   code,
@@ -564,12 +550,18 @@ function evaluate({
   rootState,
   rootSetState,
   event,
-  isExpression = true,
-  enableCache
+  isExpression = true
 }) {
-  if (code === "") {
+  if (code.trim() === "") {
     return void 0;
   }
+  const getPath = getSimpleExpressionGetPath(code.trim());
+  if (getPath) {
+    return get({
+      ...rootState,
+      ...localState
+    }, getPath);
+  }
   const args = {
     code: parseCode(code, {
       isExpression
@@ -581,19 +573,8 @@ function evaluate({
     rootState,
     localState
   };
-  if (enableCache && !DISABLE_CACHE) {
-    const cacheKey = EvalCache.getCacheKey(args);
-    const cachedValue = EvalCache.getCachedValue(cacheKey);
-    if (cachedValue) {
-      return cachedValue.value;
-    }
-  }
   try {
     const newEval = chooseBrowserOrServerEval(args);
-    if (enableCache) {
-      const cacheKey = EvalCache.getCacheKey(args);
-      EvalCache.setCachedValue(cacheKey, newEval);
-    }
     return newEval;
   } catch (e) {
     logger.error("Failed code evaluation: " + e.message, {
@@ -674,8 +655,7 @@ var evaluateBindings = ({
       localState,
       rootState,
       rootSetState,
-      context,
-      enableCache: true
+      context
     });
     set(copied, binding, value);
   }
@@ -981,8 +961,7 @@ var getRepeatItemData = ({
     localState: context.localState,
     rootState: context.rootState,
     rootSetState: context.rootSetState,
-    context: context.context,
-    enableCache: true
+    context: context.context
   });
   if (!Array.isArray(itemsArray)) {
     return void 0;
@@ -1187,8 +1166,7 @@ var createEventHandler = (value, options) => (event) => evaluate({
   rootState: options.rootState,
   rootSetState: options.rootSetState,
   event,
-  isExpression: false,
-  enableCache: true
+  isExpression: false
 });
 
 // src/functions/get-block-actions.ts
@@ -3576,8 +3554,7 @@ function Text(props) {
       context: contextContext,
       localState,
       rootState,
-      rootSetState,
-      enableCache: false
+      rootSetState
     }));
   });
   return (() => {
@@ -3982,12 +3959,6 @@ var getEnv = () => {
   return validEnvList.includes(env) ? env : "production";
 };
 
-// src/functions/get.ts
-var get = (obj, path, defaultValue) => {
-  const result = String.prototype.split.call(path, /[,[\].]+?/).filter(Boolean).reduce((res, key) => res !== null && res !== void 0 ? res[key] : res, obj);
-  return result === void 0 || result === obj ? defaultValue : result;
-};
-
 // src/blocks/form/form/form.tsx
 var _tmpl$13 = /* @__PURE__ */ template(`<pre class="builder-form-error-text pre-2e825338">`);
 var _tmpl$26 = /* @__PURE__ */ template(`<form>`);
@@ -5455,7 +5426,7 @@ function isFromTrustedHost(trustedHosts, e) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.22";
+var SDK_VERSION = "2.0.23";
 
 // src/functions/register.ts
 var registry = {};
@@ -5842,8 +5813,7 @@ function EnableEditor(props) {
         context: props.context || {},
         localState: void 0,
         rootState: props.builderContextSignal.rootState,
-        rootSetState: props.builderContextSignal.rootSetState,
-        enableCache: true
+        rootSetState: props.builderContextSignal.rootSetState
       })));
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
@@ -6137,11 +6107,7 @@ function ContentComponent(props) {
           rootState: newState
         }));
       },
-      isExpression: false,
-      /**
-       * We don't want to cache the result of the JS code, since it's arbitrary side effect code.
-       */
-      enableCache: false
+      isExpression: false
     });
   }
   return createComponent(components_context_default.Provider, {

package/lib/node/dev.jsx

@@ -137,6 +137,12 @@ var logger = {
   debug: (...message) => console.debug(MSG_PREFIX, ...message)
 };
 
+// src/functions/get.ts
+var get = (obj, path, defaultValue) => {
+  const result = String.prototype.split.call(path, /[,[\].]+?/).filter(Boolean).reduce((res, key) => res !== null && res !== void 0 ? res[key] : res, obj);
+  return result === void 0 || result === obj ? defaultValue : result;
+};
+
 // src/functions/is-browser.ts
 function isBrowser() {
   return typeof window !== "undefined" && typeof document !== "undefined";
@@ -527,30 +533,10 @@ var chooseBrowserOrServerEval = (args) => isBrowser() || shouldForceBrowserRunti
 }) ? 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();
-  static getCacheKey(args) {
-    return JSON.stringify({
-      ...args,
-      // replace the event with a random number to break cache
-      // thats because we can't serialize the event object due to circular refs in DOM node refs.
-      event: args.event ? Math.random() : void 0
-    });
-  }
-  static getCachedValue(key) {
-    const cachedVal = _EvalCache.cache.get(key);
-    return cachedVal;
-  }
-  static setCachedValue(key, value) {
-    if (_EvalCache.cache.size > 20) {
-      _EvalCache.cache.delete(_EvalCache.cache.keys().next().value);
-    }
-    _EvalCache.cache.set(key, {
-      value
-    });
-  }
+var STATE_GETTER_REGEX = /^(return )?(\s*)?state(?<getPath>(\.\w+)+)(\s*);?$/;
+var VIRTUAL_INDEX_REGEX = /(\s)*var(\s)+_virtual_index(\s)*=(\s)*state(?<getPath>(\.\w+)+)(\s*);?(\s)*return(\s)*_virtual_index(\s)*/;
+var getSimpleExpressionGetPath = (code) => {
+  return STATE_GETTER_REGEX.exec(code.trim())?.groups?.getPath?.slice(1) || VIRTUAL_INDEX_REGEX.exec(code.trim())?.groups?.getPath?.slice(1);
 };
 function evaluate({
   code,
@@ -559,12 +545,18 @@ function evaluate({
   rootState,
   rootSetState,
   event,
-  isExpression = true,
-  enableCache
+  isExpression = true
 }) {
-  if (code === "") {
+  if (code.trim() === "") {
     return void 0;
   }
+  const getPath = getSimpleExpressionGetPath(code.trim());
+  if (getPath) {
+    return get({
+      ...rootState,
+      ...localState
+    }, getPath);
+  }
   const args = {
     code: parseCode(code, {
       isExpression
@@ -576,19 +568,8 @@ function evaluate({
     rootState,
     localState
   };
-  if (enableCache && !DISABLE_CACHE) {
-    const cacheKey = EvalCache.getCacheKey(args);
-    const cachedValue = EvalCache.getCachedValue(cacheKey);
-    if (cachedValue) {
-      return cachedValue.value;
-    }
-  }
   try {
     const newEval = chooseBrowserOrServerEval(args);
-    if (enableCache) {
-      const cacheKey = EvalCache.getCacheKey(args);
-      EvalCache.setCachedValue(cacheKey, newEval);
-    }
     return newEval;
   } catch (e) {
     logger.error("Failed code evaluation: " + e.message, {
@@ -669,8 +650,7 @@ var evaluateBindings = ({
       localState,
       rootState,
       rootSetState,
-      context,
-      enableCache: true
+      context
     });
     set(copied, binding, value);
   }
@@ -976,8 +956,7 @@ var getRepeatItemData = ({
     localState: context.localState,
     rootState: context.rootState,
     rootSetState: context.rootSetState,
-    context: context.context,
-    enableCache: true
+    context: context.context
   });
   if (!Array.isArray(itemsArray)) {
     return void 0;
@@ -1180,8 +1159,7 @@ var createEventHandler = (value, options) => (event) => evaluate({
   rootState: options.rootState,
   rootSetState: options.rootSetState,
   event,
-  isExpression: false,
-  enableCache: true
+  isExpression: false
 });
 
 // src/functions/get-block-actions.ts
@@ -3221,8 +3199,7 @@ function Text(props) {
         context: contextContext,
         localState,
         rootState,
-        rootSetState,
-        enableCache: false
+        rootSetState
       })
     );
   });
@@ -3626,12 +3603,6 @@ var getEnv = () => {
   return validEnvList.includes(env) ? env : "production";
 };
 
-// src/functions/get.ts
-var get = (obj, path, defaultValue) => {
-  const result = String.prototype.split.call(path, /[,[\].]+?/).filter(Boolean).reduce((res, key) => res !== null && res !== void 0 ? res[key] : res, obj);
-  return result === void 0 || result === obj ? defaultValue : result;
-};
-
 // src/blocks/form/form/form.tsx
 function FormComponent(props) {
   const [formState, setFormState] = createSignal14("unsubmitted");
@@ -4943,7 +4914,7 @@ function isFromTrustedHost(trustedHosts, e) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.22";
+var SDK_VERSION = "2.0.23";
 
 // src/functions/register.ts
 var registry = {};
@@ -5332,8 +5303,7 @@ function EnableEditor(props) {
             context: props.context || {},
             localState: void 0,
             rootState: props.builderContextSignal.rootState,
-            rootSetState: props.builderContextSignal.rootSetState,
-            enableCache: true
+            rootSetState: props.builderContextSignal.rootSetState
           })
         )
       );
@@ -5633,11 +5603,7 @@ function ContentComponent(props) {
           rootState: newState
         }));
       },
-      isExpression: false,
-      /**
-       * We don't want to cache the result of the JS code, since it's arbitrary side effect code.
-       */
-      enableCache: false
+      isExpression: false
     });
   }
   return <><components_context_default.Provider

package/lib/node/index.js

@@ -145,6 +145,12 @@ var logger = {
   debug: (...message) => void 0
 };
 
+// src/functions/get.ts
+var get = (obj, path, defaultValue) => {
+  const result = String.prototype.split.call(path, /[,[\].]+?/).filter(Boolean).reduce((res, key) => res !== null && res !== void 0 ? res[key] : res, obj);
+  return result === void 0 || result === obj ? defaultValue : result;
+};
+
 // src/functions/is-browser.ts
 function isBrowser() {
   return typeof window !== "undefined" && typeof document !== "undefined";
@@ -530,30 +536,10 @@ var chooseBrowserOrServerEval = (args) => isBrowser() || shouldForceBrowserRunti
 }) ? 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();
-  static getCacheKey(args) {
-    return JSON.stringify({
-      ...args,
-      // replace the event with a random number to break cache
-      // thats because we can't serialize the event object due to circular refs in DOM node refs.
-      event: args.event ? Math.random() : void 0
-    });
-  }
-  static getCachedValue(key) {
-    const cachedVal = _EvalCache.cache.get(key);
-    return cachedVal;
-  }
-  static setCachedValue(key, value) {
-    if (_EvalCache.cache.size > 20) {
-      _EvalCache.cache.delete(_EvalCache.cache.keys().next().value);
-    }
-    _EvalCache.cache.set(key, {
-      value
-    });
-  }
+var STATE_GETTER_REGEX = /^(return )?(\s*)?state(?<getPath>(\.\w+)+)(\s*);?$/;
+var VIRTUAL_INDEX_REGEX = /(\s)*var(\s)+_virtual_index(\s)*=(\s)*state(?<getPath>(\.\w+)+)(\s*);?(\s)*return(\s)*_virtual_index(\s)*/;
+var getSimpleExpressionGetPath = (code) => {
+  return STATE_GETTER_REGEX.exec(code.trim())?.groups?.getPath?.slice(1) || VIRTUAL_INDEX_REGEX.exec(code.trim())?.groups?.getPath?.slice(1);
 };
 function evaluate({
   code,
@@ -562,12 +548,18 @@ function evaluate({
   rootState,
   rootSetState,
   event,
-  isExpression = true,
-  enableCache
+  isExpression = true
 }) {
-  if (code === "") {
+  if (code.trim() === "") {
     return void 0;
   }
+  const getPath = getSimpleExpressionGetPath(code.trim());
+  if (getPath) {
+    return get({
+      ...rootState,
+      ...localState
+    }, getPath);
+  }
   const args = {
     code: parseCode(code, {
       isExpression
@@ -579,19 +571,8 @@ function evaluate({
     rootState,
     localState
   };
-  if (enableCache && !DISABLE_CACHE) {
-    const cacheKey = EvalCache.getCacheKey(args);
-    const cachedValue = EvalCache.getCachedValue(cacheKey);
-    if (cachedValue) {
-      return cachedValue.value;
-    }
-  }
   try {
     const newEval = chooseBrowserOrServerEval(args);
-    if (enableCache) {
-      const cacheKey = EvalCache.getCacheKey(args);
-      EvalCache.setCachedValue(cacheKey, newEval);
-    }
     return newEval;
   } catch (e) {
     logger.error("Failed code evaluation: " + e.message, {
@@ -672,8 +653,7 @@ var evaluateBindings = ({
       localState,
       rootState,
       rootSetState,
-      context,
-      enableCache: true
+      context
     });
     set(copied, binding, value);
   }
@@ -975,8 +955,7 @@ var getRepeatItemData = ({
     localState: context.localState,
     rootState: context.rootState,
     rootSetState: context.rootSetState,
-    context: context.context,
-    enableCache: true
+    context: context.context
   });
   if (!Array.isArray(itemsArray)) {
     return void 0;
@@ -1181,8 +1160,7 @@ var createEventHandler = (value, options) => (event) => evaluate({
   rootState: options.rootState,
   rootSetState: options.rootSetState,
   event,
-  isExpression: false,
-  enableCache: true
+  isExpression: false
 });
 
 // src/functions/get-block-actions.ts
@@ -3568,8 +3546,7 @@ function Text(props) {
       context: contextContext,
       localState,
       rootState,
-      rootSetState,
-      enableCache: false
+      rootSetState
     }));
   });
   return (() => {
@@ -3972,12 +3949,6 @@ var getEnv = () => {
   return validEnvList.includes(env) ? env : "production";
 };
 
-// src/functions/get.ts
-var get = (obj, path, defaultValue) => {
-  const result = String.prototype.split.call(path, /[,[\].]+?/).filter(Boolean).reduce((res, key) => res !== null && res !== void 0 ? res[key] : res, obj);
-  return result === void 0 || result === obj ? defaultValue : result;
-};
-
 // src/blocks/form/form/form.tsx
 var _tmpl$13 = /* @__PURE__ */ template(`<pre class="builder-form-error-text pre-2e825338">`);
 var _tmpl$26 = /* @__PURE__ */ template(`<form>`);
@@ -5440,7 +5411,7 @@ function isFromTrustedHost(trustedHosts, e) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.22";
+var SDK_VERSION = "2.0.23";
 
 // src/functions/register.ts
 var registry = {};
@@ -5826,8 +5797,7 @@ function EnableEditor(props) {
         context: props.context || {},
         localState: void 0,
         rootState: props.builderContextSignal.rootState,
-        rootSetState: props.builderContextSignal.rootSetState,
-        enableCache: true
+        rootSetState: props.builderContextSignal.rootSetState
       })));
       fetch(evaluatedUrl).then((response) => response.json()).then((json) => {
         mergeNewRootState({
@@ -6120,11 +6090,7 @@ function ContentComponent(props) {
           rootState: newState
         }));
       },
-      isExpression: false,
-      /**
-       * We don't want to cache the result of the JS code, since it's arbitrary side effect code.
-       */
-      enableCache: false
+      isExpression: false
     });
   }
   return createComponent(components_context_default.Provider, {

package/lib/node/index.jsx

@@ -137,6 +137,12 @@ var logger = {
   debug: (...message) => void 0
 };
 
+// src/functions/get.ts
+var get = (obj, path, defaultValue) => {
+  const result = String.prototype.split.call(path, /[,[\].]+?/).filter(Boolean).reduce((res, key) => res !== null && res !== void 0 ? res[key] : res, obj);
+  return result === void 0 || result === obj ? defaultValue : result;
+};
+
 // src/functions/is-browser.ts
 function isBrowser() {
   return typeof window !== "undefined" && typeof document !== "undefined";
@@ -525,30 +531,10 @@ var chooseBrowserOrServerEval = (args) => isBrowser() || shouldForceBrowserRunti
 }) ? 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();
-  static getCacheKey(args) {
-    return JSON.stringify({
-      ...args,
-      // replace the event with a random number to break cache
-      // thats because we can't serialize the event object due to circular refs in DOM node refs.
-      event: args.event ? Math.random() : void 0
-    });
-  }
-  static getCachedValue(key) {
-    const cachedVal = _EvalCache.cache.get(key);
-    return cachedVal;
-  }
-  static setCachedValue(key, value) {
-    if (_EvalCache.cache.size > 20) {
-      _EvalCache.cache.delete(_EvalCache.cache.keys().next().value);
-    }
-    _EvalCache.cache.set(key, {
-      value
-    });
-  }
+var STATE_GETTER_REGEX = /^(return )?(\s*)?state(?<getPath>(\.\w+)+)(\s*);?$/;
+var VIRTUAL_INDEX_REGEX = /(\s)*var(\s)+_virtual_index(\s)*=(\s)*state(?<getPath>(\.\w+)+)(\s*);?(\s)*return(\s)*_virtual_index(\s)*/;
+var getSimpleExpressionGetPath = (code) => {
+  return STATE_GETTER_REGEX.exec(code.trim())?.groups?.getPath?.slice(1) || VIRTUAL_INDEX_REGEX.exec(code.trim())?.groups?.getPath?.slice(1);
 };
 function evaluate({
   code,
@@ -557,12 +543,18 @@ function evaluate({
   rootState,
   rootSetState,
   event,
-  isExpression = true,
-  enableCache
+  isExpression = true
 }) {
-  if (code === "") {
+  if (code.trim() === "") {
     return void 0;
   }
+  const getPath = getSimpleExpressionGetPath(code.trim());
+  if (getPath) {
+    return get({
+      ...rootState,
+      ...localState
+    }, getPath);
+  }
   const args = {
     code: parseCode(code, {
       isExpression
@@ -574,19 +566,8 @@ function evaluate({
     rootState,
     localState
   };
-  if (enableCache && !DISABLE_CACHE) {
-    const cacheKey = EvalCache.getCacheKey(args);
-    const cachedValue = EvalCache.getCachedValue(cacheKey);
-    if (cachedValue) {
-      return cachedValue.value;
-    }
-  }
   try {
     const newEval = chooseBrowserOrServerEval(args);
-    if (enableCache) {
-      const cacheKey = EvalCache.getCacheKey(args);
-      EvalCache.setCachedValue(cacheKey, newEval);
-    }
     return newEval;
   } catch (e) {
     logger.error("Failed code evaluation: " + e.message, {
@@ -667,8 +648,7 @@ var evaluateBindings = ({
       localState,
       rootState,
       rootSetState,
-      context,
-      enableCache: true
+      context
     });
     set(copied, binding, value);
   }
@@ -970,8 +950,7 @@ var getRepeatItemData = ({
     localState: context.localState,
     rootState: context.rootState,
     rootSetState: context.rootSetState,
-    context: context.context,
-    enableCache: true
+    context: context.context
   });
   if (!Array.isArray(itemsArray)) {
     return void 0;
@@ -1174,8 +1153,7 @@ var createEventHandler = (value, options) => (event) => evaluate({
   rootState: options.rootState,
   rootSetState: options.rootSetState,
   event,
-  isExpression: false,
-  enableCache: true
+  isExpression: false
 });
 
 // src/functions/get-block-actions.ts
@@ -3213,8 +3191,7 @@ function Text(props) {
         context: contextContext,
         localState,
         rootState,
-        rootSetState,
-        enableCache: false
+        rootSetState
       })
     );
   });
@@ -3616,12 +3593,6 @@ var getEnv = () => {
   return validEnvList.includes(env) ? env : "production";
 };
 
-// src/functions/get.ts
-var get = (obj, path, defaultValue) => {
-  const result = String.prototype.split.call(path, /[,[\].]+?/).filter(Boolean).reduce((res, key) => res !== null && res !== void 0 ? res[key] : res, obj);
-  return result === void 0 || result === obj ? defaultValue : result;
-};
-
 // src/blocks/form/form/form.tsx
 function FormComponent(props) {
   const [formState, setFormState] = createSignal14("unsubmitted");
@@ -4928,7 +4899,7 @@ function isFromTrustedHost(trustedHosts, e) {
 }
 
 // src/constants/sdk-version.ts
-var SDK_VERSION = "2.0.22";
+var SDK_VERSION = "2.0.23";
 
 // src/functions/register.ts
 var registry = {};
@@ -5316,8 +5287,7 @@ function EnableEditor(props) {
             context: props.context || {},
             localState: void 0,
             rootState: props.builderContextSignal.rootState,
-            rootSetState: props.builderContextSignal.rootSetState,
-            enableCache: true
+            rootSetState: props.builderContextSignal.rootSetState
           })
         )
       );
@@ -5616,11 +5586,7 @@ function ContentComponent(props) {
           rootState: newState
         }));
       },
-      isExpression: false,
-      /**
-       * We don't want to cache the result of the JS code, since it's arbitrary side effect code.
-       */
-      enableCache: false
+      isExpression: false
     });
   }
   return <><components_context_default.Provider

package/package.json

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