Improve code quality across JavaScript and TypeScript utilities (#3504)

Author: Copilot

scripts/db_tools/duplicate-doc.js

@@ -17,19 +17,22 @@ ShareDB.types.register(OTJson0.type);
 async function run() {
   const ws = utils.createWS(connectionConfig);
   const conn = new ShareDB.Connection(ws);
-  for (const docId of docIds) {
-    const document = conn.get(collection, docId);
-    await utils.fetchDoc(document);
-    const docParts = docId.split(':');
-    // Convert the book number part to book ID
-    const bookId = Scr.Canon.bookNumberToId(parseInt(docParts[1]));
-    const newDocId = `${docParts[0]}:${bookId}:${docParts[2]}:target`;
-    const newDoc = conn.get(collection, newDocId);
-    const newData = document.data;
-    newData.dataId = newDocId;
-    await utils.createDoc(newDoc, newData, OTJson0.type.name);
+  try {
+    for (const docId of docIds) {
+      const document = conn.get(collection, docId);
+      await utils.fetchDoc(document);
+      const docParts = docId.split(':');
+      // Convert the book number part to book ID
+      const bookId = Scr.Canon.bookNumberToId(parseInt(docParts[1]));
+      const newDocId = `${docParts[0]}:${bookId}:${docParts[2]}:target`;
+      const newDoc = conn.get(collection, newDocId);
+      const newData = document.data;
+      newData.dataId = newDocId;
+      await utils.createDoc(newDoc, newData, OTJson0.type.name);
+    }
+  } finally {
+    conn.close();
   }
-  conn.close();
 }
 
 run();

scripts/db_tools/utils.js

@@ -1,5 +1,41 @@
 const WebSocket = require('ws');
 
+// Configuration constants
+const devConfig = {
+  dbLocation: 'mongodb://localhost:27017/xforge',
+  wsConnectionString: 'ws://127.0.0.1:5003/?server=true',
+  origin: 'http://localhost:5000'
+};
+
+const qaConfig = {
+  dbLocation: 'mongodb://localhost:4017/xforge',
+  wsConnectionString: 'ws://127.0.0.1:4003/?server=true',
+  origin: 'https://qa.scriptureforge.org'
+};
+
+const liveConfig = {
+  dbLocation: 'mongodb://localhost:3017/xforge',
+  wsConnectionString: 'ws://127.0.0.1:3003/?server=true',
+  origin: 'https://scriptureforge.org'
+};
+
+const databaseConfigs = new Map();
+databaseConfigs.set('dev', devConfig);
+databaseConfigs.set('qa', qaConfig);
+databaseConfigs.set('live', liveConfig);
+
+/** Enum of colors and their bash 256-colour values. */
+const colors = Object.freeze({
+  darkGrey: 241,
+  red: 196,
+  lightBlue: 39,
+  lightGreen: 48,
+  yellow: 190,
+  orange: 208
+});
+
+let shouldUseColor = true;
+
 /**
  * @param {ShareDB.Doc} doc The doc to fetch
  */
@@ -55,7 +91,7 @@ function deleteDoc(doc) {
 function createDoc(doc, data, type) {
   return new Promise((resolve, reject) => {
     doc.create(data, type, undefined, err => {
-      if (err) {
+      if (err != null) {
         reject(err);
       } else {
         resolve();
@@ -90,8 +126,6 @@ function fetchSnapshotByTimestamp(conn, collection, docId, time) {
   });
 }
 
-let shouldUseColor = true;
-
 /** Specify if `colored()` should use colouring. Nice for output to a dark terminal. Not nice in log files. */
 function useColor(ifUseColor) {
   shouldUseColor = ifUseColor;
@@ -113,20 +147,10 @@ function colored(colorCode, textToColor) {
   }
 }
 
-/** Enum of colors and their bash 256-colour values. */
-const colors = Object.freeze({
-  darkGrey: 241,
-  red: 196,
-  lightBlue: 39,
-  lightGreen: 48,
-  yellow: 190,
-  orange: 208
-});
-
 /**
  * @param {Object[]} ops List of operations, where an operation can be any object for the purposes of this function
  * (though in practice the definition of an operation should be much more limited; this function is just flexible).
- * @param {showAttributes} Describe some op attributes inline.
+ * @param {boolean} showAttributes Describe some op attributes inline.
  */
 function visualizeOps(ops, showAttributes = false) {
   const result = ops
@@ -157,29 +181,6 @@ function createWS(connectionConfig) {
   return new WebSocket(connectionConfig.wsConnectionString, [], { origin: connectionConfig.origin });
 }
 
-const devConfig = {
-  dbLocation: 'mongodb://localhost:27017/xforge',
-  wsConnectionString: 'ws://127.0.0.1:5003/?server=true',
-  origin: 'http://localhost:5000'
-};
-
-const qaConfig = {
-  dbLocation: 'mongodb://localhost:4017/xforge',
-  wsConnectionString: 'ws://127.0.0.1:4003/?server=true',
-  origin: 'https://qa.scriptureforge.org'
-};
-
-const liveConfig = {
-  dbLocation: 'mongodb://localhost:3017/xforge',
-  wsConnectionString: 'ws://127.0.0.1:3003/?server=true',
-  origin: 'https://scriptureforge.org'
-};
-
-const databaseConfigs = new Map();
-databaseConfigs.set('dev', devConfig);
-databaseConfigs.set('qa', qaConfig);
-databaseConfigs.set('live', liveConfig);
-
 module.exports = {
   fetchDoc,
   submitDocOp,

scripts/update_from_crowdin.mts

@@ -113,7 +113,12 @@ async function copyFiles() {
     for await (const dirEntry of Deno.readDir(source)) {
       if (dirEntry.isFile) {
         const crowdinFileName = dirEntry.name;
-        const localeCodeInCrowdinFile = crowdinFileName.match(localeRegex)![1];
+        const localeMatch = crowdinFileName.match(localeRegex);
+        if (localeMatch == null) {
+          throw new Error(`Could not extract locale from file name: ${crowdinFileName}`);
+        }
+        
+        const localeCodeInCrowdinFile = localeMatch[1];
         const localeCodeWithHyphens = localeCodeInCrowdinFile.replaceAll("_", "-");
         const localeObject = locales.find(l => l.tags.includes(localeCodeWithHyphens));
         if (localeObject == null) continue;

src/SIL.XForge.Scripture/ClientApp/src/xforge-common/utils.ts

@@ -44,7 +44,7 @@ export function supportedBrowser(): boolean {
       'samsung internet': '>=17.0'
     }
   });
-  return isSupportedBrowser ? true : false;
+  return isSupportedBrowser ?? false;
 }
 
 export function isIosDevice(): boolean {
@@ -135,16 +135,16 @@ export function aspCultureCookieValue(language: string): string {
  */
 export function getAspCultureCookieLanguage(cookie: string): string {
   const parts = cookie.split('|');
-  let c: string;
-  let uic: string;
+  let c: string | undefined;
+  let uic: string | undefined;
   parts.forEach(value => {
     if (value.startsWith('c=')) {
       c = value.slice('c='.length);
     } else if (value.startsWith('uic=')) {
       uic = value.slice('uic='.length);
     }
   });
-  return uic! || c! || 'en';
+  return uic ?? c ?? 'en';
 }
 
 export function getI18nLocales(): Locale[] {