refactor: improve readability

libraries/android-bin/src/cmd.ts

@@ -38,27 +38,27 @@ export class Cmd extends AdbCommandBase {
         command: string,
         ...args: string[]
     ) {
-        let supportAbb: boolean;
+        let supportsAbb: boolean;
-        let supportCmd: boolean = this.supportsCmd;
+        let supportsCmd: boolean = this.supportsCmd;
         let service: string;
         let Protocol: AdbSubprocessProtocolConstructor;
         if (shellProtocol) {
-            supportAbb = this._supportsAbb;
+            supportsAbb = this._supportsAbb;
-            supportCmd &&= this.supportsShellV2;
+            supportsCmd &&= this.supportsShellV2;
             service = "abb";
             Protocol = AdbSubprocessShellProtocol;
         } else {
-            supportAbb = this._supportsAbbExec;
+            supportsAbb = this._supportsAbbExec;
             service = "abb_exec";
             Protocol = AdbSubprocessNoneProtocol;
         }
 
-        if (supportAbb) {
+        if (supportsAbb) {
             const socket = await this.adb.createSocket(
                 `${service}:${command}\0${args.join("\0")}\0`
             );
             return new Protocol(socket);
-        } else if (supportCmd) {
+        } else if (supportsCmd) {
             return Protocol.raw(this.adb, `cmd ${command} ${args.join(" ")}`);
         } else {
             throw new Error("Not supported");

libraries/android-bin/src/logcat.ts

@@ -116,46 +116,34 @@ export interface AndroidLogEntry extends LoggerEntry {
     toString(format?: LogcatFormat, modifiers?: LogcatFormatModifiers): string;
 }
 
+function padZero(number: number, length: number) {
+    return number.toString().padStart(length, "0");
+}
+
 function formatSeconds(seconds: number, modifiers: LogcatFormatModifiers) {
     if (modifiers.monotonic) {
-        return seconds.toString().padStart(6);
+        return padZero(seconds, 6);
     }
 
     if (modifiers.epoch) {
-        return seconds.toString().padStart(19);
+        return padZero(seconds, 19);
     }
 
     const date = new Date(seconds * 1000);
 
+    const month = padZero(date.getMonth() + 1, 2);
+    const day = padZero(date.getDate(), 2);
+    const hour = padZero(date.getHours(), 2);
+    const minute = padZero(date.getMinutes(), 2);
+    const second = padZero(date.getSeconds(), 2);
+    const result = `${month}-${day} ${hour}:${minute}:${second}`;
+
     if (modifiers.year) {
-        // prettier-ignore
+        const year = padZero(date.getFullYear(), 4);
-        return `${
+        return `${year}-${result}`;
-            date.getFullYear().toString().padStart(4, "0")
-        }-${
-            (date.getMonth() + 1).toString().padStart(2, "0")
-        }-${
-            date.getDate().toString().padStart(2, "0")
-        } ${
-            date.getHours().toString().padStart(2, "0")
-        }:${
-            date.getMinutes().toString().padStart(2, "0")
-        }:${
-            date.getSeconds().toString().padStart(2, "0")
-        }`;
     }
 
-    // prettier-ignore
+    return result;
-    return `${
-        (date.getMonth() + 1).toString().padStart(2, "0")
-    }-${
-        date.getDate().toString().padStart(2, "0")
-    } ${
-        date.getHours().toString().padStart(2, "0")
-    }:${
-        date.getMinutes().toString().padStart(2, "0")
-    }:${
-        date.getSeconds().toString().padStart(2, "0")
-    }`;
 }
 
 function formatNanoseconds(
@@ -163,14 +151,14 @@ function formatNanoseconds(
     modifiers: LogcatFormatModifiers
 ) {
     if (modifiers.nanoseconds) {
-        return nanoseconds.toString().padStart(9, "0");
+        return padZero(nanoseconds, 9);
     }
 
     if (modifiers.microseconds) {
-        return ((nanoseconds / 1000) | 0).toString().padStart(6, "0");
+        return padZero(nanoseconds / 1000, 6);
     }
 
-    return ((nanoseconds / 1000000) | 0).toString().padStart(3, "0");
+    return padZero(nanoseconds / 1000000, 3);
 }
 
 function formatTimezone(seconds: number, modifiers: LogcatFormatModifiers) {

libraries/android-bin/src/settings.ts

@@ -39,14 +39,14 @@ export class Settings extends AdbCommandBase {
         tag?: string,
         makeDefault?: boolean
     ) {
-        return this.base(
+        const args = [key, value];
-            "put",
+        if (tag) {
-            namespace,
+            args.push(tag);
-            key,
+        }
-            value,
+        if (makeDefault) {
-            ...(tag ? [tag] : []),
+            args.push("default");
-            ...(makeDefault ? ["default"] : [])
+        }
-        );
+        return this.base("put", namespace, ...args);
     }
 
     public reset(
@@ -63,12 +63,11 @@ export class Settings extends AdbCommandBase {
         modeOrPackageName: string,
         tag?: string
     ): Promise<string> {
-        return this.base(
+        const args = [modeOrPackageName];
-            "reset",
+        if (tag) {
-            namespace,
+            args.push(tag);
-            modeOrPackageName,
+        }
-            ...(tag ? [tag] : [])
+        return this.base("reset", namespace, ...args);
-        );
     }
 
     public async list(namespace: SettingsNamespace): Promise<string[]> {

libraries/b-tree/src/index.ts

@@ -142,13 +142,16 @@ export class BTreeNode {
 
     public has(value: number): boolean {
         let index = this.search(value);
+
         if (index >= 0) {
             return true;
         }
+
         if (this.height > 0) {
             index = ~index;
             return this.children[index]!.has(value);
         }
+
         return false;
     }
 
@@ -192,16 +195,18 @@ export class BTreeNode {
             return true;
         }
 
-        if (this.height > 0) {
+        if (this.height === 0) {
-            index = ~index;
+            return false;
-            const deleted = this.children[index]!.delete(value);
-            if (deleted) {
-                this.balance(index);
-            }
-            return deleted;
         }
 
-        return false;
+        index = ~index;
+        const deleted = this.children[index]!.delete(value);
+
+        if (deleted) {
+            this.balance(index);
+        }
+
+        return deleted;
     }
 
     public max(): number {
@@ -340,17 +345,12 @@ export class BTree {
 
     public constructor(order: number) {
         this._order = order;
-        this._root = new BTreeNode(
+        const keys = new Int32Array(order - 1);
-            order,
+        const children = new Array<BTreeNode>(order);
-            new Int32Array(order - 1),
+        this._root = new BTreeNode(order, keys, 0, 0, children);
-            0,
-            0,
-            new Array<BTreeNode>(order)
-        );
     }
 
     public has(value: number) {
-        // TODO(btree): benchmark this non-recursive version
         let node = this._root;
         while (true) {
             const index = node.search(value);