tree: enable strict-boolean-expressions (#14487)

## Description Enable strict-boolean-expressions to make code more readable when dealing with cases like optional booleans and strings that might be empty. Also migrate some test code which was failing these checks to newer apis (Map and "undefined")
microsoft · Mar 9, 2023 · 41b095a · 41b095a
1 parent 42f38ae
commit 41b095a
Show file tree

Hide file tree

Showing 6 changed files with 16 additions and 20 deletions.
diff --git a/packages/dds/tree/.eslintrc.js b/packages/dds/tree/.eslintrc.js
@@ -11,7 +11,6 @@ module.exports = {
 	rules: {
 		"@typescript-eslint/no-namespace": "off",
 		"@typescript-eslint/no-empty-interface": "off",
-		"@typescript-eslint/strict-boolean-expressions": "off",
 		"@typescript-eslint/explicit-member-accessibility": "error",
 	},
 };
diff --git a/packages/dds/tree/src/feature-libraries/sequence-field/compose.ts b/packages/dds/tree/src/feature-libraries/sequence-field/compose.ts
@@ -106,7 +106,7 @@ function composeMarkLists<TNodeChange>(
 	);
 	while (!queue.isEmpty()) {
 		const popped = queue.pop();
-		if (popped.areInverses) {
+		if (popped.areInverses === true) {
 			factory.pushOffset(getInputLength(popped.baseMark));
 			continue;
 		}

diff --git a/packages/dds/tree/src/feature-libraries/sequence-field/moveEffectTable.ts b/packages/dds/tree/src/feature-libraries/sequence-field/moveEffectTable.ts
@@ -215,7 +215,7 @@ function applyMoveEffectsToDest<T>(
 
 	assert(effect.modifyAfter === undefined, 0x566 /* Cannot modify move destination */);
 
-	if (!effect.shouldRemove) {
+	if (effect.shouldRemove !== true) {
 		const newMark: MoveIn | ReturnTo = {
 			...mark,
 			count: effect.count ?? mark.count,
@@ -277,7 +277,7 @@ function applyMoveEffectsToSource<T>(
 		mark.id,
 	);
 	const result: Mark<T>[] = [];
-	if (!effect.shouldRemove) {
+	if (effect.shouldRemove !== true) {
 		const newMark = cloneMark(mark);
 		newMark.count = effect.count ?? newMark.count;
 		if (effect.modifyAfter !== undefined) {

diff --git a/packages/dds/tree/src/test/domains/json/twitter.ts b/packages/dds/tree/src/test/domains/json/twitter.ts
@@ -637,13 +637,13 @@ export function parseSentencesIntoWords(inputSentences: string[]) {
 		const spaceSeparatedWords: string[] = inputSentence.split(" ");
 		spaceSeparatedWords.forEach((potentialWord) => {
 			const innerWords: string[] = [];
-			let previousChar: string | null = null;
+			let previousChar: string | undefined;
 			let currentWord = "";
 			for (let i = 0; i < potentialWord.length; i++) {
 				const currentChar = potentialWord.charAt(i);
 				if (isEscapeChar(currentChar) || isJapaneseSymbolOrPunctuation(currentChar)) {
 					if (
-						(previousChar && !isEscapeChar(previousChar)) ||
+						(previousChar !== undefined && !isEscapeChar(previousChar)) ||
 						isJapaneseSymbolOrPunctuation(currentChar)
 					) {
 						innerWords.push(`${currentWord}`);

diff --git a/packages/dds/tree/src/test/shared-tree/opSize.bench.ts b/packages/dds/tree/src/test/shared-tree/opSize.bench.ts
@@ -8,7 +8,7 @@ import { isInPerformanceTestingMode } from "@fluid-tools/benchmark";
 import { ISequencedDocumentMessage } from "@fluidframework/protocol-definitions";
 import { emptyField, FieldKinds, namedTreeSchema, singleTextCursor } from "../../feature-libraries";
 import { ISharedTree } from "../../shared-tree";
-import { brand } from "../../util";
+import { brand, getOrAddEmptyToMap } from "../../util";
 import { ITestTreeProvider, TestTreeProvider } from "../utils";
 import {
 	FieldKey,
@@ -349,7 +349,7 @@ const getSuccessfulOpByteSize = (
 const BENCHMARK_NODE_COUNT = 100;
 
 describe("SharedTree Op Size Benchmarks", () => {
-	const opsByBenchmarkName: Record<string, ISequencedDocumentMessage[]> = {};
+	const opsByBenchmarkName: Map<string, ISequencedDocumentMessage[]> = new Map();
 	let currentBenchmarkName = "";
 	const currentTestOps: ISequencedDocumentMessage[] = [];
 
@@ -412,10 +412,9 @@ describe("SharedTree Op Size Benchmarks", () => {
 	};
 
 	const saveAndResetCurrentOps = () => {
-		if (!opsByBenchmarkName[currentBenchmarkName]) {
-			opsByBenchmarkName[currentBenchmarkName] = [];
-		}
-		currentTestOps.forEach((op) => opsByBenchmarkName[currentBenchmarkName].push(op));
+		currentTestOps.forEach((op) =>
+			getOrAddEmptyToMap(opsByBenchmarkName, currentBenchmarkName).push(op),
+		);
 		currentTestOps.length = 0;
 	};
 
@@ -424,22 +423,20 @@ describe("SharedTree Op Size Benchmarks", () => {
 	};
 
 	afterEach(() => {
-		if (!opsByBenchmarkName[currentBenchmarkName]) {
-			opsByBenchmarkName[currentBenchmarkName] = [];
-		}
-		currentTestOps.forEach((op) => opsByBenchmarkName[currentBenchmarkName].push(op));
+		currentTestOps.forEach((op) =>
+			getOrAddEmptyToMap(opsByBenchmarkName, currentBenchmarkName).push(op),
+		);
 		currentTestOps.length = 0;
 	});
 
 	after(() => {
 		const allBenchmarkOpStats: any[] = [];
-		Object.entries(opsByBenchmarkName).forEach((entry) => {
-			const [benchmarkName, ops] = entry;
+		for (const [benchmarkName, ops] of opsByBenchmarkName) {
 			allBenchmarkOpStats.push({
 				"Test name": benchmarkName,
 				...getOperationsStats(ops),
 			});
-		});
+		}
 		const table = new Table();
 		allBenchmarkOpStats.forEach((data) => {
 			Object.keys(data).forEach((key) => table.cell(key, data[key]));

diff --git a/packages/dds/tree/src/util/utils.ts b/packages/dds/tree/src/util/utils.ts
@@ -162,7 +162,7 @@ export function* zipIterables<T, U>(
 	const iteratorB = iterableB[Symbol.iterator]();
 	for (
 		let nextA = iteratorA.next(), nextB = iteratorB.next();
-		!nextA.done && !nextB.done;
+		nextA.done !== true && nextB.done !== true;
 		nextA = iteratorA.next(), nextB = iteratorB.next()
 	) {
 		yield [nextA.value, nextB.value];