@kanaries/graphic-walker 0.2.16 → 0.2.17

package/src/services.ts

@@ -1,6 +1,5 @@
 import { toJS } from 'mobx';
-import { View, Specification } from 'visual-insights';
-import { IRow, Filters, SemanticType, IMeasure, IMutField, IFilterField } from './interfaces';
+import { IRow, IMutField, IFilterField, Specification } from './interfaces';
 /* eslint import/no-webpack-loader-syntax:0 */
 // @ts-ignore
 // eslint-disable-next-line
@@ -8,20 +7,19 @@ import { IRow, Filters, SemanticType, IMeasure, IMutField, IFilterField } from '
 /* eslint import/no-webpack-loader-syntax:0 */
 // @ts-ignore
 // eslint-disable-next-line
-import ExplainerWorker from './workers/explainer.worker?worker&inline';
+// import ExplainerWorker from './workers/explainer.worker?worker&inline';
 import FilterWorker from './workers/filter.worker?worker&inline';
 import TransformDataWorker from './workers/transform.worker?worker&inline';
 import ViewQueryWorker from './workers/viewQuery.worker?worker&inline';
-import { IExplaination, IMeasureWithStat } from './insights';
-import { IViewQuery, queryView } from './lib/viewQuery';
+import { IViewQuery } from './lib/viewQuery';
 
-interface WorkerState {
-    eWorker: Worker | null;
-}
+// interface WorkerState {
+//     eWorker: Worker | null;
+// }
 
-const workerState: WorkerState = {
-    eWorker: null,
-}
+// const workerState: WorkerState = {
+//     eWorker: null,
+// }
 
 function workerService<T, R>(worker: Worker, data: R): Promise<T> {
     return new Promise<T>((resolve, reject) => {
@@ -38,72 +36,72 @@ function workerService<T, R>(worker: Worker, data: R): Promise<T> {
     });
 }
 
-interface ExplainParams {
-    dimensions: string[];
-    measures: string[];
-    dataSource: IRow[];
-    filters?: Filters;
-    currentSpace: {
-        dimensions: string[];
-        measures: IMeasure[];
-    };
-}
+// interface ExplainParams {
+//     dimensions: string[];
+//     measures: string[];
+//     dataSource: IRow[];
+//     filters?: Filters;
+//     currentSpace: {
+//         dimensions: string[];
+//         measures: IMeasure[];
+//     };
+// }
 export interface IVisSpace {
     dataView: IRow[];
     schema: Specification;
 }
-interface ExplainReturns {
-    explainations: IExplaination[];
-    valueExp: IMeasureWithStat[];
-    visSpaces: IVisSpace[];
-    fieldsWithSemanticType: Array<{ key: string; type: SemanticType }>;
-}
-export async function getExplaination(props: ExplainParams) {
-    const worker = workerState.eWorker;
-    if (worker === null) throw new Error('init worker first.')
-    let result: ExplainReturns = {
-        explainations: [],
-        valueExp: [],
-        visSpaces: [],
-        fieldsWithSemanticType: [],
-    };
-    try {
-        result = await workerService<ExplainReturns, { type: string; data: ExplainParams }>(
-            worker,
-            {
-                type: 'getExplaination',
-                data: props
-            }
-        );
-        return result;
-    } catch (error) {
-        console.error(error);
-    }
-    return result;
-}
+// interface ExplainReturns {
+//     explainations: IExplaination[];
+//     valueExp: IMeasureWithStat[];
+//     visSpaces: IVisSpace[];
+//     fieldsWithSemanticType: Array<{ key: string; type: SemanticType }>;
+// }
+// export async function getExplaination(props: ExplainParams) {
+//     const worker = workerState.eWorker;
+//     if (worker === null) throw new Error('init worker first.')
+//     let result: ExplainReturns = {
+//         explainations: [],
+//         valueExp: [],
+//         visSpaces: [],
+//         fieldsWithSemanticType: [],
+//     };
+//     try {
+//         result = await workerService<ExplainReturns, { type: string; data: ExplainParams }>(
+//             worker,
+//             {
+//                 type: 'getExplaination',
+//                 data: props
+//             }
+//         );
+//         return result;
+//     } catch (error) {
+//         console.error(error);
+//     }
+//     return result;
+// }
 
 interface PreAnalysisParams {
     fields: IMutField[];
     dataSource: IRow[];
 }
-export async function preAnalysis(props: PreAnalysisParams) {
-    if (workerState.eWorker !== null) {
-        workerState.eWorker.terminate();
-    }
-    try {
-        workerState.eWorker = new ExplainerWorker() as Worker;
-        const tmp = await workerService<boolean, { type: string; data: PreAnalysisParams}>(workerState.eWorker, { type: 'preAnalysis', data: props });
-    } catch (error) {
-        console.error(error)
-    }
-}
+// export async function preAnalysis(props: PreAnalysisParams) {
+//     if (workerState.eWorker !== null) {
+//         workerState.eWorker.terminate();
+//     }
+//     try {
+//         workerState.eWorker = new ExplainerWorker() as Worker;
+//         const tmp = await workerService<boolean, { type: string; data: PreAnalysisParams}>(workerState.eWorker, { type: 'preAnalysis', data: props });
+//     } catch (error) {
+//         console.error(error)
+//     }
+// }
 
-export function destroyWorker() {
-    if (workerState.eWorker) {
-        workerState.eWorker.terminate();
-        workerState.eWorker = null;
-    }
-}
+// export function destroyWorker() {
+//     if (workerState.eWorker) {
+//         workerState.eWorker.terminate();
+//         workerState.eWorker = null;
+//     }
+// }
 
 let filterWorker: Worker | null = null;
 let filterWorkerAutoTerminator: NodeJS.Timeout | null = null;

package/src/store/visualSpecStore.ts

@@ -1,15 +1,12 @@
 import { IReactionDisposer, makeAutoObservable, observable, reaction, toJS } from "mobx";
 import produce from "immer";
 import { v4 as uuidv4 } from "uuid";
-import { Specification } from "visual-insights";
-import { DataSet, DraggableFieldState, IExpression, IFilterRule, IViewField, IVisSpec, IVisualConfig } from "../interfaces";
+import { DataSet, DraggableFieldState, IFilterRule, IViewField, IVisSpec, IVisualConfig, Specification } from "../interfaces";
 import { CHANNEL_LIMIT, GEMO_TYPES, MetaFieldKeys } from "../config";
-import { makeBinField, makeLogField } from "../utils/normalization";
 import { VisSpecWithHistory } from "../models/visSpecHistory";
 import { IStoInfo, dumpsGWPureSpec, parseGWContent, parseGWPureSpec, stringifyGWContent } from "../utils/save";
 import { CommonStore } from "./commonStore";
 import { createCountField } from "../utils";
-import { IViewQuery } from "../lib/viewQuery";
 
 function getChannelSizeLimit(channel: string): number {
     if (typeof CHANNEL_LIMIT[channel] === "undefined") return Infinity;
@@ -649,6 +646,7 @@ export class VizSpecStore {
             // thi
             // const [xField, yField, ] = spec.position;
             this.clearState();
+            this.setVisualConfig('defaultAggregated', Boolean(spec.aggregate));
             if ((spec.geomType?.length ?? 0) > 0) {
                 this.setVisualConfig(
                     "geoms",

package/src/utils/autoMark.ts

@@ -1,4 +1,4 @@
-import { ISemanticType } from "visual-insights";
+import { ISemanticType } from "../interfaces";
 
 /**
  *

package/src/utils/dataPrep.ts

@@ -1,5 +1,4 @@
-import { IRow } from "visual-insights";
-import { IMutField } from "../interfaces";
+import { IMutField, IRow } from "../interfaces";
 
 function updateRowKeys(data: IRow[], keyEncodeList: {from: string; to: string}[]): IRow[] {
     return data.map((row) => {

package/src/vis/react-vega.tsx

@@ -40,6 +40,7 @@ interface ReactVegaProps {
   shape?: IViewField;
   theta?: IViewField;
   radius?: IViewField;
+  details?: Readonly<IViewField[]>;
   showActions: boolean;
   layoutMode: string;
   width: number;
@@ -97,6 +98,7 @@ const ReactVega = forwardRef<IReactVegaHandler, ReactVegaProps>(function ReactVe
     height,
     selectEncoding,
     brushEncoding,
+    details = [],
     themeKey = 'vega',
     dark = 'media'
   } = props;
@@ -189,6 +191,7 @@ const ReactVega = forwardRef<IReactVegaHandler, ReactVegaProps>(function ReactVe
         column: colFacetField,
         xOffset: NULL_FIELD,
         yOffset: NULL_FIELD,
+        details,
         defaultAggregated: defaultAggregate,
         stack,
         geomType,
@@ -257,6 +260,7 @@ const ReactVega = forwardRef<IReactVegaHandler, ReactVegaProps>(function ReactVe
             column: colFacetField,
             xOffset: NULL_FIELD,
             yOffset: NULL_FIELD,
+            details,
             defaultAggregated: defaultAggregate,
             stack,
             geomType,
@@ -368,6 +372,7 @@ const ReactVega = forwardRef<IReactVegaHandler, ReactVegaProps>(function ReactVe
     brushEncoding,
     crossFilterTriggerIdx,
     themeConfig,
+    details
   ]);
 
   useImperativeHandle(ref, () => ({

package/src/vis/spec/encode.ts

@@ -14,6 +14,7 @@ export interface IEncodeProps {
     column: IViewField;
     theta: IViewField;
     radius: IViewField;
+    details: Readonly<IViewField[]>;
 }
 function availableChannels(geomType: string): Set<string> {
     if (geomType === 'arc') {

package/src/vis/spec/mark.ts

@@ -1,4 +1,4 @@
-import { ISemanticType } from "visual-insights";
+import { ISemanticType } from "../../interfaces";
 
 /**
  *

package/src/vis/spec/tooltip.ts

@@ -0,0 +1,16 @@
+import { IViewField } from "../../interfaces";
+
+export function addTooltipEncode (encoding: {[key: string]: any}, details: Readonly<IViewField[]> = []) {
+    const encs = Object.keys(encoding).filter(ck => ck !== 'tooltip').map(ck => {
+        return {
+            field: encoding[ck].field,
+            type: encoding[ck].type,
+            title: encoding[ck].title
+        }
+    }).concat(details.map(f => ({
+        field: f.fid,
+        title: f.name,
+        type: f.semanticType
+    })))
+    encoding.tooltip = encs
+}

package/src/vis/spec/view.ts

@@ -1,15 +1,14 @@
-import { ISemanticType } from 'visual-insights';
-import { IStackMode, IViewField } from '../../interfaces';
+import { ISemanticType, IStackMode, IViewField } from '../../interfaces';
 import { autoMark } from './mark';
 import { NULL_FIELD } from './field';
 import { channelAggregate } from './aggregate';
 import { IEncodeProps, channelEncode } from './encode';
-import { channelStack } from './stack'
+import { channelStack } from './stack';
+import { addTooltipEncode } from './tooltip';
 
 const BRUSH_SIGNAL_NAME = '__gw_brush__';
 const POINT_SIGNAL_NAME = '__gw_point__';
 export interface SingleViewProps extends IEncodeProps {
-    
     defaultAggregated: boolean;
     stack: IStackMode;
     enableCrossFilter: boolean;
@@ -32,6 +31,7 @@ export function getSingleView(props: SingleViewProps) {
         column,
         xOffset,
         yOffset,
+        details,
         defaultAggregated,
         stack,
         geomType,
@@ -70,27 +70,25 @@ export function getSingleView(props: SingleViewProps) {
         yOffset,
         theta,
         radius,
+        details
     });
+    addTooltipEncode(encoding, details)
     if (defaultAggregated) {
         channelAggregate(encoding, fields);
     }
     channelStack(encoding, stack);
+    const mark = {
+        type: markType,
+        opacity: 0.96,
+        tooltip: { content: 'data' }
+    };
     if (!enableCrossFilter || (brushEncoding === 'none' && selectEncoding === 'none')) {
         return {
             config,
-            mark: {
-                type: markType,
-                opacity: 0.96,
-                tooltip: true,
-            },
+            mark,
             encoding,
         };
     }
-    const mark = {
-        type: markType,
-        opacity: 0.96,
-        tooltip: true,
-    };
 
     if (brushEncoding !== 'none') {
         return {