fix ojs interpreter bug with mutable and non-mutable expressions in s…

…ame cell
quarto-dev · Nov 1, 2023 · 9317fa9 · 9317fa9
1 parent 36e9535
commit 9317fa9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/resources/formats/html/ojs/quarto-ojs-runtime.js b/src/resources/formats/html/ojs/quarto-ojs-runtime.js
@@ -12055,17 +12055,20 @@ var dist = {exports: {}};
 	  let bodyText = cell.input.substring(cell.body.start, cell.body.end);
 	  let expressionMap = {};
 	  let references = [];
+	  let counter = 0;
 	  const cellReferences = Array.from(new Set((cell.references || []).map(ref => {
 	    if (ref.type === "ViewExpression") {
 	      if (expressionMap[ref.id.name] === undefined) {
-	        expressionMap[ref.id.name] = ref.id.name;
-	        references.push(ref.id.name);
+	        const newName = `$${counter++}`;
+	        expressionMap[ref.id.name] = newName;
+	        references.push(newName);
 	      }
 	      return "viewof " + ref.id.name;
 	    } else if (ref.type === "MutableExpression") {
 	      if (expressionMap[ref.id.name] === undefined) {
-	        expressionMap[ref.id.name] = ref.id.name;
-	        references.push(ref.id.name);
+	        const newName = `$${counter++}`;
+	        expressionMap[ref.id.name] = newName;
+	        references.push(newName);
 	      }
 	      return "mutable " + ref.id.name;
 	    } else {

diff --git a/src/resources/formats/html/ojs/quarto-ojs-runtime.min.js b/src/resources/formats/html/ojs/quarto-ojs-runtime.min.js