fix linting

Author: willwade

.gitignore

@@ -1,4 +1,5 @@
 .DS_Store
+obla-improvements/
 tmp/
 # Logs
 logs

src/optional/analytics/metrics/comparison.ts

@@ -114,14 +114,18 @@ export class ComparisonAnalyzer {
     });
 
     highEffortWords.sort((a, b) => {
-      const diffA = targetWords.get(a)!.effort - (compareWords.get(a)?.effort || 0);
-      const diffB = targetWords.get(b)!.effort - (compareWords.get(b)?.effort || 0);
+      const targetBtnA = targetWords.get(a);
+      const targetBtnB = targetWords.get(b);
+      const diffA = (targetBtnA?.effort || 0) - (compareWords.get(a)?.effort || 0);
+      const diffB = (targetBtnB?.effort || 0) - (compareWords.get(b)?.effort || 0);
       return diffB - diffA;
     });
 
     lowEffortWords.sort((a, b) => {
-      const diffA = (compareWords.get(a)?.effort || 0) - targetWords.get(a)!.effort;
-      const diffB = (compareWords.get(b)?.effort || 0) - targetWords.get(b)!.effort;
+      const targetBtnA = targetWords.get(a);
+      const targetBtnB = targetWords.get(b);
+      const diffA = (compareWords.get(a)?.effort || 0) - (targetBtnA?.effort || 0);
+      const diffB = (compareWords.get(b)?.effort || 0) - (targetBtnB?.effort || 0);
       return diffB - diffA;
     });
 

src/optional/analytics/metrics/core.ts

@@ -260,7 +260,8 @@ export class MetricsCalculator {
     const levels: { [level: number]: ButtonMetrics[] } = {};
 
     while (toVisit.length > 0) {
-      const item = toVisit.shift()!;
+      const item = toVisit.shift();
+      if (!item) break;
       const { board, level, entryX, entryY, priorEffort = 0, temporaryHomeId } = item;
 
       // Skip if already visited at a lower level with equal or better prior effort
@@ -450,11 +451,11 @@ export class MetricsCalculator {
           buttonEffort += priorEffort;
 
           // Track scan blocks for block scanning, otherwise track individual buttons
-          if (
-            blockScanEnabled &&
-            (btn.scanBlock || (btn.scanBlocks && btn.scanBlocks.length > 0))
-          ) {
-            priorScanBlocks.add(btn.scanBlock || btn.scanBlocks![0]);
+          if (blockScanEnabled) {
+            const scanBlockId = btn.scanBlock ?? btn.scanBlocks?.[0];
+            if (scanBlockId !== undefined && scanBlockId !== null) {
+              priorScanBlocks.add(scanBlockId);
+            }
           }
 
           // Handle navigation buttons

src/optional/symbolTools.ts

@@ -1,9 +1,5 @@
 import path from 'path';
 import fs from 'fs';
-import {
-  getZipEntriesWithPassword,
-  resolveGridsetPasswordFromEnv,
-} from '../processors/gridset/password';
 import { extractSymbolReferences } from '../processors/gridset/symbols';
 
 // Dynamic imports for optional dependencies
@@ -68,10 +64,13 @@ export class SnapSymbolResolver extends SymbolResolver {
 let AdmZip: AdmZip | null = null;
 let XMLParser: XMLParser | null = null;
 try {
+  // Dynamic requires for optional dependencies
   // eslint-disable-next-line @typescript-eslint/no-var-requires
-  AdmZip = require('adm-zip');
+  const admZipModule = require('adm-zip');
   // eslint-disable-next-line @typescript-eslint/no-var-requires
-  XMLParser = require('fast-xml-parser').XMLParser;
+  const fxpModule = require('fast-xml-parser');
+  AdmZip = admZipModule;
+  XMLParser = fxpModule.XMLParser;
 } catch {
   AdmZip = null;
   XMLParser = null;
@@ -82,6 +81,7 @@ export class Grid3SymbolExtractor extends SymbolExtractor {
     if (!AdmZip || !XMLParser) throw new Error('adm-zip or fast-xml-parser not installed');
 
     // Import GridsetProcessor dynamically to avoid circular dependencies
+    // eslint-disable-next-line @typescript-eslint/no-var-requires
     const { GridsetProcessor } = require('../processors/gridsetProcessor');
     const proc = new GridsetProcessor();
     const tree = proc.loadIntoTree(filePath);

src/processors/gridset/symbolExtractor.ts

@@ -180,10 +180,11 @@ export function extractSymbolLibraryImage(
   }
 
   // Successfully extracted!
-  const format = detectImageFormat(resolved.data!);
+  const data = resolved.data;
+  const format = data ? detectImageFormat(data) : 'unknown';
   return {
     found: true,
-    data: resolved.data,
+    data,
     format,
     source: 'symbol-library',
     reference: reference,

src/processors/gridset/symbolSearch.ts

@@ -145,14 +145,16 @@ export function searchSymbols(
   for (const [libraryName, index] of indexes.entries()) {
     // Exact match first
     if (index.searchTerms.has(lowerSearchTerm)) {
-      const symbolFilename = index.searchTerms.get(lowerSearchTerm)!;
-      results.push({
-        searchTerm: lowerSearchTerm,
-        symbolFilename,
-        displayName: index.filenames.get(symbolFilename) || lowerSearchTerm,
-        library: libraryName,
-        exactMatch: true,
-      });
+      const symbolFilename = index.searchTerms.get(lowerSearchTerm);
+      if (symbolFilename) {
+        results.push({
+          searchTerm: lowerSearchTerm,
+          symbolFilename,
+          displayName: index.filenames.get(symbolFilename) || lowerSearchTerm,
+          library: libraryName,
+          exactMatch: true,
+        });
+      }
     }
 
     // Fuzzy match if enabled

src/processors/gridsetProcessor.ts

@@ -532,11 +532,22 @@ class GridsetProcessor extends BaseProcessor {
 
             // Map Grid 3 visibility values to AAC standard values
             // Grid 3 can have additional values like TouchOnly, PointerOnly that map to PointerAndTouchOnly
-            let cellVisibility: 'Visible' | 'Hidden' | 'Disabled' | 'PointerAndTouchOnly' | 'Empty' | undefined;
+            let cellVisibility:
+              | 'Visible'
+              | 'Hidden'
+              | 'Disabled'
+              | 'PointerAndTouchOnly'
+              | 'Empty'
+              | undefined;
             if (grid3Visibility) {
               const vis = String(grid3Visibility);
               // Direct mapping for standard values
-              if (vis === 'Visible' || vis === 'Hidden' || vis === 'Disabled' || vis === 'PointerAndTouchOnly') {
+              if (
+                vis === 'Visible' ||
+                vis === 'Hidden' ||
+                vis === 'Disabled' ||
+                vis === 'PointerAndTouchOnly'
+              ) {
                 cellVisibility = vis;
               }
               // Map Grid 3 specific values to AAC standard
@@ -573,7 +584,11 @@ class GridsetProcessor extends BaseProcessor {
               // For cells without captions, check if they have images/symbols before skipping
               if (content.ContentType === 'AutoContent') {
                 label = `AutoContent_${idx}`;
-              } else if (hasImageCandidate || content.ContentType === 'Workspace' || content.ContentType === 'LiveCell') {
+              } else if (
+                hasImageCandidate ||
+                content.ContentType === 'Workspace' ||
+                content.ContentType === 'LiveCell'
+              ) {
                 // Keep cells with images/symbols even if no caption
                 label = `Cell_${idx}`;
               } else {

src/processors/touchchatProcessor.ts

@@ -89,7 +89,9 @@ function intToHex(colorInt: number | null | undefined): string | undefined {
  * TouchChat: 0 = Hidden, 1 = Visible
  * Maps to: 'Hidden' | 'Visible' | undefined
  */
-function mapTouchChatVisibility(visible: number | null | undefined): 'Visible' | 'Hidden' | undefined {
+function mapTouchChatVisibility(
+  visible: number | null | undefined
+): 'Visible' | 'Hidden' | undefined {
   if (visible === null || visible === undefined) {
     return undefined; // Default to visible
   }
@@ -268,8 +270,13 @@ class TouchChatProcessor extends BaseProcessor {
             label: cell.label || '',
             message: cell.message || '',
             semanticAction: semanticAction,
-            semantic_id: (cell as any).symbol_link_id || (cell as any).symbolLinkId || undefined, // Extract semantic_id from symbol_link_id
-            visibility: mapTouchChatVisibility((cell as any).visible),
+            semantic_id:
+              (((cell as any).symbol_link_id || (cell as any).symbolLinkId) as
+                | string
+                | undefined) || undefined, // Extract semantic_id from symbol_link_id
+            visibility: mapTouchChatVisibility(
+              ((cell as any).visible as number | null | undefined) || undefined
+            ),
             // Note: TouchChat does not use scan blocks in the file
             // Scanning is a runtime feature (linear/row-column patterns)
             // scanBlock defaults to 1 (no grouping)
@@ -289,9 +296,9 @@ class TouchChatProcessor extends BaseProcessor {
           });
           buttonBoxes.get(cell.box_id)?.push({
             button,
-            location: (cell as any).location,
-            spanX: (cell as any).span_x,
-            spanY: (cell as any).span_y,
+            location: ((cell as any).location as number) || 0,
+            spanX: ((cell as any).span_x as number) || 1,
+            spanY: ((cell as any).span_y as number) || 1,
           });
         });
 

test/obfsetProcessor.test.ts

@@ -14,13 +14,19 @@ describe('ObfsetProcessor', () => {
     expect(tree.rootId).toBe('root');
     expect(Object.keys(tree.pages).length).toBe(2);
 
-    const rootPage = tree.getPage('root')!;
+    const rootPage = tree.getPage('root');
+    if (!rootPage) {
+      throw new Error('Expected root page to exist');
+    }
     expect(rootPage.name).toBe('Home');
     expect(rootPage.grid[0][0]?.label).toBe('Hello');
     expect(rootPage.grid[0][0]?.semantic_id).toBe('greeting-1');
     expect(rootPage.buttons.length).toBe(2);
 
-    const page2 = tree.getPage('page2')!;
+    const page2 = tree.getPage('page2');
+    if (!page2) {
+      throw new Error('Expected page2 to exist');
+    }
     expect(page2.parentId).toBe('root');
     expect(page2.grid[0][0]?.label).toBe('World');
     expect(page2.grid[0][0]?.clone_id).toBe('world-1');