Fixes for tsc

Author: eatonphil

desktop/crud.ts

@@ -62,7 +62,7 @@ export class GenericCrud<T extends { id: string }> {
         this.entity
       }" WHERE id = ${stubMaker()}`
     );
-    const row = stmt.get(id);
+    const row = stmt.get(id) as { data_json: string, position: number };
     if (!row) {
       return [null, -1];
     }
@@ -130,7 +130,7 @@ export const exportDestination = {};
 export const metadataCrud = {
   get(db: sqlite3.Database) {
     const stmt = db.prepare('SELECT * FROM ds_metadata');
-    const rows = stmt.all();
+    const rows = stmt.all() as Array<{key: string; value: string}>;
     const metadata: Record<string, string> = {};
     for (const row of rows) {
       metadata[row.key] = row.value;

desktop/secret.ts

@@ -6,7 +6,7 @@ import {
   encodeBase64,
   encodeUTF8,
 } from 'tweetnacl-util';
-import { doOnEncryptFields, Encrypt } from '../shared/state';
+import { Encrypt, doOnEncryptFields } from '../shared/state';
 import { ensureFile } from './fs';
 
 function getSigningKeyPath(signingKeyPath?: string) {

desktop/store.ts

@@ -10,7 +10,6 @@ import {
   ConnectorInfo,
   DatabaseConnectorInfo,
   DatabasePanelInfo,
-  doOnEncryptFields,
   Encrypt,
   FilePanelInfo,
   FilterAggregatePanelInfo,
@@ -25,11 +24,12 @@ import {
   ProjectState,
   ServerInfo,
   TablePanelInfo,
+  doOnEncryptFields,
 } from '../shared/state';
 import { CODE_ROOT, DISK_ROOT, PROJECT_EXTENSION } from './constants';
 import {
-  connectorCrud,
   GenericCrud,
+  connectorCrud,
   metadataCrud,
   pageCrud,
   panelCrud,
@@ -147,7 +147,7 @@ export class Store {
   validateSQLiteDriver() {
     const memdb = new sqlite3.default(':memory:');
     const stmt = memdb.prepare('SELECT sqlite_version() AS version');
-    const row = stmt.get();
+    const row = stmt.get() as {version: string};
     if (!minSemver(row.version, '3.38.1')) {
       throw new Error(
         'Unsupported SQLite driver version: ' + JSON.stringify(row)
@@ -361,7 +361,7 @@ SELECT
 FROM ds_result o
 GROUP BY panel_id
 `);
-      const results = stmt.all();
+      const results = stmt.all() as Array<{panel_id: string; data_json: string}>;
 
       const resultPanelMap: Record<string, PanelResult> = {};
       for (const result of results) {
@@ -587,7 +587,7 @@ GROUP BY panel_id
         const getStmt = db.prepare(
           `SELECT id FROM ${panelCrud.entity} WHERE page_id = ?`
         );
-        const allExisting: Array<{ id: string }> = getStmt.all(data.pageId);
+        const allExisting = getStmt.all(data.pageId) as Array<{ id: string }>;
 
         // Then sort the existing ones based on the positions passed in
         allExisting.sort((a, b) => {

server/auth.ts

@@ -1,10 +1,10 @@
 import express from 'express';
 import session from 'express-session';
 import {
-  Client as OpenIDClient,
-  generators,
   Issuer,
+  Client as OpenIDClient,
   TokenSet,
+  generators,
 } from 'openid-client';
 import passport from 'passport';
 import { App } from './app';

shared/state.ts

@@ -180,8 +180,8 @@ export type SQLConnectorType =
   | 'postgres'
   | 'mysql'
   | 'sqlite'
-  | 'oracle'
-  | 'sqlserver'
+  //| 'oracle'
+  //| 'sqlserver'
   | 'presto'
   | 'clickhouse'
   | 'snowflake'
@@ -200,7 +200,7 @@ export type DatabaseConnectorInfoType =
   | SQLConnectorType
   | 'google-sheets'
   | 'airtable'
-  | 'mongo'
+  //| 'mongo'
   | 'elasticsearch'
   | 'splunk'
   | 'prometheus'

ui/Connector.tsx

@@ -1,10 +1,10 @@
 import { IconTrash } from '@tabler/icons';
 import * as React from 'react';
 import { ConnectorInfo, DatabaseConnectorInfo } from '../shared/state';
+import { DatabaseConnector } from './DatabaseConnector';
 import { Button } from './components/Button';
 import { Confirm } from './components/Confirm';
 import { Input } from './components/Input';
-import { DatabaseConnector } from './DatabaseConnector';
 
 export function Connector({
   connector,

ui/ConnectorList.tsx

@@ -5,9 +5,9 @@ import {
   DatabaseConnectorInfoType,
   ProjectState,
 } from '../shared/state';
+import { Connector } from './Connector';
 import { Button } from './components/Button';
 import { Dropdown } from './components/Dropdown';
-import { Connector } from './Connector';
 import { VENDORS, VENDOR_GROUPS } from './connectors';
 
 function NewConnector({

ui/Editor.tsx

@@ -1,14 +1,14 @@
 import * as React from 'react';
 import { MODE_FEATURES } from '../shared/constants';
 import '../shared/polyfill';
-import { ErrorBoundary } from './components/ErrorBoundary';
 import { ConnectorList } from './ConnectorList';
 import { Footer } from './Footer';
 import { PageList } from './PageList';
 import { ServerList } from './ServerList';
 import { Sidebar } from './Sidebar';
-import { ProjectContext } from './state';
 import { Updates } from './Updates';
+import { ErrorBoundary } from './components/ErrorBoundary';
+import { ProjectContext } from './state';
 import { UrlStateContext } from './urlState';
 
 export function Editor() {

ui/Header.tsx

@@ -2,8 +2,8 @@ import * as React from 'react';
 import { APP_NAME, MODE } from '../shared/constants';
 import '../shared/polyfill';
 import { DEFAULT_PROJECT } from '../shared/state';
-import { Link } from './components/Link';
 import { LocalStorageStore } from './ProjectStore';
+import { Link } from './components/Link';
 import { UrlStateContext } from './urlState';
 
 export function loadDefaultProject() {

ui/MakeSelectProject.tsx

@@ -8,13 +8,13 @@ import {
   MakeProjectResponse,
 } from '../shared/rpc';
 import { ProjectState } from '../shared/state';
+import { Footer } from './Footer';
 import { asyncRPC } from './asyncRPC';
 import { Alert } from './components/Alert';
 import { Button } from './components/Button';
 import { Input } from './components/Input';
 import { Loading } from './components/Loading';
 import { Select } from './components/Select';
-import { Footer } from './Footer';
 import { SAMPLES } from './samples';
 
 export function MakeSelectProject() {