Shorten code for serializing Sets + Maps [refactor]

overlookmotel · Dec 16, 2023 · abe6bec · abe6bec
1 parent c445992
commit abe6bec
Showing 1 changed file with 2 additions and 8 deletions.
diff --git a/lib/serialize/setsMaps.js b/lib/serialize/setsMaps.js
@@ -41,11 +41,7 @@ module.exports = {
 		const entryNodes = [];
 		entries.forEach((val, index) => {
 			const valRecord = this.serializeValue(val, `${varName}_${index}`, `<Set value ${index}>`);
-			if (isUnordered) {
-				isCircular = recordIsCircular(valRecord);
-			} else if (!isCircular && recordIsCircular(valRecord)) {
-				isCircular = true;
-			}
+			if (isUnordered || !isCircular) isCircular = recordIsCircular(valRecord);
 
 			if (isCircular) {
 				const arr = [valRecord.varNode];
@@ -91,10 +87,8 @@ module.exports = {
 		entries.forEach(([key, val], index) => {
 			const keyRecord = this.serializeValue(key, `${varName}Keys_${index}`, `<Map key ${index}>`);
 			const valRecord = this.serializeValue(val, `${varName}Values_${index}`, `<Map value ${index}>`);
-			if (isUnordered) {
+			if (isUnordered || !isCircular) {
 				isCircular = recordIsCircular(keyRecord) || recordIsCircular(valRecord);
-			} else if (!isCircular && (recordIsCircular(keyRecord) || recordIsCircular(valRecord))) {
-				isCircular = true;
 			}
 
 			const pair = [keyRecord.varNode, valRecord.varNode];