Dynamic load detectors and transformers

.gitignore

@@ -37,6 +37,7 @@ celerybeat.pid
 **/node_modules
 node_modules
 .vscode/*
+.cursor/*
 *.pyc
 .vscode.env
 

.prettierrc

@@ -1,19 +1,4 @@
 {
     "tabWidth": 4,
-    "singleQuote": true,
-    "importOrder": [
-        "<THIRD_PARTY_MODULES>",
-        "^[a-zA-Z]+/(.*)$",
-        "^(..?/)+[a-zA-Z/]+$",
-        "^./(.*).scss$"
-    ],
-    "importOrderSeparation": true,
-    "importOrderSortSpecifiers": true,
-    "importOrderCaseInsensitive": true,
-    "importOrderParserPlugins": [
-        "typescript",
-        "jsx",
-        "classProperties",
-        "decorators-legacy"
-    ]
+    "singleQuote": true
 }

querybook/webapp/lib/query-result/detector.ts

@@ -7,7 +7,7 @@ import { isNumeric } from 'lib/utils/number';
 import { isCellValNull } from './helper';
 import { IColumnDetector } from './types';
 
-const columnDetectors: IColumnDetector[] = [
+const defaultColumnDetectors: IColumnDetector[] = [
     {
         type: 'string',
         priority: 0,
@@ -61,11 +61,16 @@ const columnDetectors: IColumnDetector[] = [
             return false;
         },
     },
-]
-    .concat(window.CUSTOM_COLUMN_DETECTORS ?? [])
-    .sort((a, b) => b.priority - a.priority) as IColumnDetector[];
+];
+
+const getCustomColumnDetectors = (): IColumnDetector[] =>
+    window.CUSTOM_COLUMN_DETECTORS ?? [];
 
 export function getColumnTypesForTable(columns: string[], rows: any[][]) {
+    const sortedColumnDetectors = (defaultColumnDetectors as IColumnDetector[])
+        .concat(getCustomColumnDetectors())
+        .sort((a, b) => b.priority - a.priority);
+
     const sizeOfSample = Math.max(
         DETECTOR_MIN_SAMPLE_SIZE,
         Math.floor(rows.length / 100)
@@ -76,11 +81,15 @@ export function getColumnTypesForTable(columns: string[], rows: any[][]) {
             .filter((value) => !isCellValNull(value));
 
         const sampledRowValues = sampleSize(notNullRowValues, sizeOfSample);
-        return findColumnType(colName, sampledRowValues);
+        return findColumnType(colName, sampledRowValues, sortedColumnDetectors);
     });
 }
 
-export function findColumnType(columnName: string, values: any[]) {
+export function findColumnType(
+    columnName: string,
+    values: any[],
+    columnDetectors: IColumnDetector[]
+) {
     for (const detector of columnDetectors) {
         if (detector.checker(columnName, values)) {
             return detector.type;

querybook/webapp/lib/query-result/transformer.tsx

@@ -34,7 +34,7 @@ const ReactJsonTheme: ThemeObject = {
     base0F: 'var(--text)', // int value
 };
 
-const queryResultTransformers: IColumnTransformer[] = [
+const defaultQueryResultTransformers: IColumnTransformer[] = [
     {
         key: 'with-comma',
         name: 'With Comma',
@@ -127,31 +127,38 @@ const queryResultTransformers: IColumnTransformer[] = [
             }
         },
     },
-]
-    .concat(window.CUSTOM_COLUMN_TRANSFORMERS ?? [])
-    .sort((a, b) => b.priority - a.priority) as IColumnTransformer[];
+];
 
-const transformersForType: Record<
-    string,
-    [IColumnTransformer[], IColumnTransformer | null]
-> = queryResultTransformers.reduce(
-    (hash: typeof transformersForType, transformer) => {
-        for (const type of transformer.appliesToType) {
-            if (!(type in hash)) {
-                hash[type] = [[], null];
-            }
+const getCustomColumnTransformers = (): IColumnTransformer[] =>
+    window.CUSTOM_COLUMN_TRANSFORMERS ?? [];
+
+export function getTransformersForType(colType: string) {
+    const queryResultTransformers = (
+        defaultQueryResultTransformers as IColumnTransformer[]
+    )
+        .concat(getCustomColumnTransformers())
+        .sort((a, b) => b.priority - a.priority);
+
+    const transformersForType: Record<
+        string,
+        [IColumnTransformer[], IColumnTransformer | null]
+    > = queryResultTransformers.reduce(
+        (hash: typeof transformersForType, transformer) => {
+            for (const type of transformer.appliesToType) {
+                if (!(type in hash)) {
+                    hash[type] = [[], null];
+                }
 
-            hash[type][0].push(transformer);
-            if (transformer.auto && hash[type][1] == null) {
-                hash[type][1] = transformer;
+                hash[type][0].push(transformer);
+                if (transformer.auto && hash[type][1] == null) {
+                    hash[type][1] = transformer;
+                }
             }
-        }
 
-        return hash;
-    },
-    {}
-);
+            return hash;
+        },
+        {}
+    );
 
-export function getTransformersForType(colType: string) {
     return transformersForType[colType] ?? [[], null];
 }