@reearth/core 0.0.7-alpha.60 → 0.0.7-alpha.62

package/src/mantle/evaluator/simple/expression/variableReplacer.ts

@@ -14,6 +14,7 @@ export function replaceVariables(expression: string, feature?: any): [string, JP
   const featureDefined = typeof feature !== "undefined";
   const jsonPathCache: Record<string, any[]> = {};
   const varExpRegex = /^\$./;
+  const quotedStringRegex = /^(["'])(.+)\1$/;
   while (i >= 0) {
     if (isInsideQuotes(exp, i)) {
       const closeQuote = findCloseQuote(exp, i);
@@ -24,7 +25,22 @@ export function replaceVariables(expression: string, feature?: any): [string, JP
       result += exp.slice(0, i);
       const j = getCloseBracketIndex(exp, i);
       const varExp = exp.slice(i + 2, j);
-      if (varExpRegex.test(varExp)) {
+      const quotedMatch = varExp.match(quotedStringRegex);
+      if (quotedMatch) {
+        // Handle quoted property names like ${"user info"}
+        if (!featureDefined) {
+          return [result, []];
+        }
+        const propertyName = quotedMatch[2];
+        const propertyValue = feature[propertyName];
+        // Return empty string for missing properties to match regular variable behavior
+        const placeholderLiteral = generateRandomString(10);
+        literalJP.push({
+          literalName: placeholderLiteral,
+          literalValue: typeof propertyValue !== "undefined" ? propertyValue : "",
+        });
+        result += placeholderLiteral;
+      } else if (varExpRegex.test(varExp)) {
         if (!featureDefined) {
           return [result, []];
         }
@@ -37,16 +53,13 @@ export function replaceVariables(expression: string, feature?: any): [string, JP
             return [result, []];
           }
         }
-        if (res.length !== 0) {
-          const placeholderLiteral = generateRandomString(10);
-          literalJP.push({
-            literalName: placeholderLiteral,
-            literalValue: res[0],
-          });
-          result += placeholderLiteral;
-        } else {
-          return ["false", []];
-        }
+        // Return empty string for missing properties to match regular variable behavior
+        const placeholderLiteral = generateRandomString(10);
+        literalJP.push({
+          literalName: placeholderLiteral,
+          literalValue: res.length !== 0 ? res[0] : "",
+        });
+        result += placeholderLiteral;
       } else {
         const replacedVarExp = replaceReservedWord(varExp);
         result += `${VARIABLE_PREFIX}${replacedVarExp}`;