tutuca 0.9.62 → 0.9.63

package/dist/tutuca-cli.js

@@ -4674,7 +4674,12 @@ class ValParser {
         const newS = px.frame.macroVars?.[name];
         if (newS !== undefined) {
           const tokens = tokenizeValue(newS.trim());
-          return tokens.length === 1 ? this.parseToken(tokens[0], px) : null;
+          if (tokens.length !== 1)
+            return null;
+          const val = this.parseToken(tokens[0], px);
+          if (val instanceof ConstVal)
+            val.fromMacroVar = true;
+          return val;
         }
         px.onParseIssue("bad-value", { role: "macro-var", name, value: s });
         return null;
@@ -4924,7 +4929,7 @@ var init_value = __esm(() => {
     toLiteralSource() {
       let out = "";
       for (const v of this.vals) {
-        if (!(v instanceof ConstVal))
+        if (!(v instanceof ConstVal) || v.fromMacroVar)
           return null;
         out += v.val;
       }
@@ -4940,9 +4945,10 @@ var init_value = __esm(() => {
       }
       let lo = 0;
       let hi = vals.length;
-      while (lo < hi && vals[lo] instanceof ConstVal && vals[lo].val === "")
+      const isTrimmable = (v) => v instanceof ConstVal && v.val === "" && !v.fromMacroVar;
+      while (lo < hi && isTrimmable(vals[lo]))
         lo++;
-      while (hi > lo && vals[hi - 1] instanceof ConstVal && vals[hi - 1].val === "")
+      while (hi > lo && isTrimmable(vals[hi - 1]))
         hi--;
       return new StrTplVal(lo === 0 && hi === vals.length ? vals : vals.slice(lo, hi));
     }
@@ -13896,7 +13902,7 @@ class App {
       const txnPath = path.compact().toTransactionPath();
       const value = txnPath.lookup(rootValue);
       const dragType = e.target.dataset.dragtype ?? "?";
-      const stack = txnPath.buildStack(this.makeStack(rootValue));
+      const stack = path.toTransactionPath().buildStack(this.makeStack(rootValue));
       this.dragInfo = new DragInfo(txnPath, stack, e, value, dragType, e.target);
     } else if (type3 === "drop") {
       e.preventDefault();

package/dist/tutuca-dev.js

@@ -8155,7 +8155,12 @@ class ValParser {
         const newS = px.frame.macroVars?.[name];
         if (newS !== undefined) {
           const tokens = tokenizeValue(newS.trim());
-          return tokens.length === 1 ? this.parseToken(tokens[0], px) : null;
+          if (tokens.length !== 1)
+            return null;
+          const val = this.parseToken(tokens[0], px);
+          if (val instanceof ConstVal)
+            val.fromMacroVar = true;
+          return val;
         }
         px.onParseIssue("bad-value", { role: "macro-var", name, value: s });
         return null;
@@ -8379,7 +8384,7 @@ class StrTplVal extends VarVal {
   toLiteralSource() {
     let out = "";
     for (const v of this.vals) {
-      if (!(v instanceof ConstVal))
+      if (!(v instanceof ConstVal) || v.fromMacroVar)
         return null;
       out += v.val;
     }
@@ -8395,9 +8400,10 @@ class StrTplVal extends VarVal {
     }
     let lo = 0;
     let hi = vals.length;
-    while (lo < hi && vals[lo] instanceof ConstVal && vals[lo].val === "")
+    const isTrimmable = (v) => v instanceof ConstVal && v.val === "" && !v.fromMacroVar;
+    while (lo < hi && isTrimmable(vals[lo]))
       lo++;
-    while (hi > lo && vals[hi - 1] instanceof ConstVal && vals[hi - 1].val === "")
+    while (hi > lo && isTrimmable(vals[hi - 1]))
       hi--;
     return new StrTplVal(lo === 0 && hi === vals.length ? vals : vals.slice(lo, hi));
   }
@@ -14256,7 +14262,7 @@ class App {
       const txnPath = path.compact().toTransactionPath();
       const value = txnPath.lookup(rootValue);
       const dragType = e.target.dataset.dragtype ?? "?";
-      const stack = txnPath.buildStack(this.makeStack(rootValue));
+      const stack = path.toTransactionPath().buildStack(this.makeStack(rootValue));
       this.dragInfo = new DragInfo(txnPath, stack, e, value, dragType, e.target);
     } else if (type3 === "drop") {
       e.preventDefault();