Fixes 11ty#3850

Author: zachleat

src/Template.js

@@ -534,29 +534,43 @@ class Template extends TemplateContent {
 		});
 	}
 
+	async #renderComputedUnit(entry, data) {
+		if (typeof entry === "string") {
+			return this.renderComputedData(entry, data);
+		}
+
+		if (isPlainObject(entry)) {
+			for (let key in entry) {
+				entry[key] = await this.#renderComputedUnit(entry[key], data);
+			}
+		}
+
+		if (Array.isArray(entry)) {
+			for (let j = 0, k = entry.length; j < k; j++) {
+				entry[j] = await this.#renderComputedUnit(entry[j], data);
+			}
+		}
+
+		return entry;
+	}
+
 	_addComputedEntry(computedData, obj, parentKey, declaredDependencies) {
 		// this check must come before isPlainObject
 		if (typeof obj === "function") {
 			computedData.add(parentKey, obj, declaredDependencies);
-		} else if (Array.isArray(obj)) {
-			// Arrays are treated as one entry in the dependency graph now
+		} else if (Array.isArray(obj) || typeof obj === "string") {
+			// Arrays are treated as one entry in the dependency graph now, Issue #3728
 			computedData.addTemplateString(
 				parentKey,
 				async function (innerData) {
-					return Promise.all(
-						obj.map((entry) => {
-							if (typeof entry === "string") {
-								return this.tmpl.renderComputedData(entry, innerData);
-							}
-							return entry;
-						}),
-					);
+					return this.tmpl.#renderComputedUnit(obj, innerData);
 				},
 				declaredDependencies,
 				this.getParseForSymbolsFunction(obj),
 				this,
 			);
 		} else if (isPlainObject(obj)) {
+			// Arrays used to be computed here
 			for (let key in obj) {
 				let keys = [];
 				if (parentKey) {
@@ -565,16 +579,6 @@ class Template extends TemplateContent {
 				keys.push(key);
 				this._addComputedEntry(computedData, obj[key], keys.join("."), declaredDependencies);
 			}
-		} else if (typeof obj === "string") {
-			computedData.addTemplateString(
-				parentKey,
-				async function (innerData) {
-					return this.tmpl.renderComputedData(obj, innerData);
-				},
-				declaredDependencies,
-				this.getParseForSymbolsFunction(obj),
-				this,
-			);
 		} else {
 			// Numbers, booleans, etc
 			computedData.add(parentKey, obj, declaredDependencies);

test/Issue3850Test.js

@@ -0,0 +1,26 @@
+import test from "ava";
+import Eleventy from "../src/Eleventy.js";
+
+test("#3850 Computed Data regression part 2", async (t) => {
+  let elev = new Eleventy("test/noop", false, {
+    config(eleventyConfig) {
+      eleventyConfig.addTemplate("index.njk", `---
+site:
+  download_link_mac: "http://example.com/"
+eleventyComputed:
+  downloads:
+  -
+    links:
+    -
+      url: "{{ site.download_link_mac }}"
+---
+{{ site.download_link_mac }}:::{{ downloads | dump | safe }}`);
+    }
+  });
+
+  let results = await elev.toJSON();
+  results.sort();
+
+  t.is(results.length, 1);
+  t.is(results[0]?.content.trim(), `http://example.com/:::[{"links":[{"url":"http://example.com/"}]}]`)
+});