@visactor/vchart 2.1.0-alpha.1 → 2.1.0-alpha.10

package/esm/data/data-view-utils.js

@@ -0,0 +1,46 @@
+const getDataViewsInDataSet = dataView => {
+    var _a;
+    const dataViewMap = null === (_a = null == dataView ? void 0 : dataView.dataSet) || void 0 === _a ? void 0 : _a.dataViewMap;
+    return dataViewMap ? Object.values(dataViewMap).filter(Boolean) : [];
+}, detachDataViewListener = (source, target) => {
+    var _a, _b;
+    null === (_a = null == source ? void 0 : source.target) || void 0 === _a || _a.removeListener("change", target.reRunAllTransform), 
+    null === (_b = null == source ? void 0 : source.target) || void 0 === _b || _b.removeListener("markRunning", target.markRunning);
+};
+
+export const detachDataViewDependencies = dataView => {
+    if (!dataView) return;
+    getDataViewsInDataSet(dataView).forEach((source => {
+        detachDataViewListener(source, dataView);
+    }));
+    const dependencies = null == dataView ? void 0 : dataView.rawData;
+    Array.isArray(dependencies) && dependencies.forEach((dependency => {
+        detachDataViewListener(dependency, dataView);
+    }));
+};
+
+export const releaseDataViews = dataViews => {
+    const releaseDataViews = Array.from(new Set(dataViews.filter(Boolean)));
+    releaseDataViews.length && (releaseDataViews.forEach(detachDataViewDependencies), 
+    releaseDataViews.forEach((dataView => {
+        var _a;
+        null === (_a = dataView.destroy) || void 0 === _a || _a.call(dataView);
+    })));
+};
+
+export const releaseDataView = dataView => {
+    releaseDataViews([ dataView ]);
+};
+
+export const releaseDataViewWithDependencies = (dataView, shouldReleaseDependency) => {
+    if (!dataView) return;
+    const dataViewsInDataSet = new Set(getDataViewsInDataSet(dataView)), releaseDependencies = [], collectReleaseDependencies = currentDataView => {
+        const dependencies = null == currentDataView ? void 0 : currentDataView.rawData;
+        Array.isArray(dependencies) && dependencies.forEach((dependency => {
+            dataViewsInDataSet.has(dependency) && shouldReleaseDependency(dependency) && !releaseDependencies.includes(dependency) && (releaseDependencies.push(dependency), 
+            collectReleaseDependencies(dependency));
+        }));
+    };
+    collectReleaseDependencies(dataView), releaseDataViews([ dataView, ...releaseDependencies ]);
+};
+//# sourceMappingURL=data-view-utils.js.map

package/esm/data/data-view-utils.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../src/data/data-view-utils.ts"],"names":[],"mappings":"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","file":"data-view-utils.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\n\nconst getDataViewsInDataSet = (dataView?: DataView | null) => {\n  const dataViewMap = dataView?.dataSet?.dataViewMap;\n\n  return dataViewMap ? (Object.values(dataViewMap).filter(Boolean) as DataView[]) : [];\n};\n\nconst detachDataViewListener = (source: DataView, target: DataView) => {\n  source?.target?.removeListener('change', target.reRunAllTransform);\n  source?.target?.removeListener('markRunning', target.markRunning);\n};\n\nexport const detachDataViewDependencies = (dataView?: DataView | null) => {\n  if (!dataView) {\n    return;\n  }\n\n  const dataViews = getDataViewsInDataSet(dataView);\n\n  dataViews.forEach(source => {\n    detachDataViewListener(source, dataView);\n  });\n\n  const dependencies = (dataView as unknown as { rawData?: DataView[] })?.rawData;\n\n  if (Array.isArray(dependencies)) {\n    dependencies.forEach(dependency => {\n      detachDataViewListener(dependency, dataView);\n    });\n  }\n};\n\nexport const releaseDataViews = (dataViews: Array<DataView | null | undefined>) => {\n  const releaseDataViews = Array.from(new Set(dataViews.filter(Boolean) as DataView[]));\n\n  if (!releaseDataViews.length) {\n    return;\n  }\n\n  releaseDataViews.forEach(detachDataViewDependencies);\n  releaseDataViews.forEach(dataView => {\n    dataView.destroy?.();\n  });\n};\n\nexport const releaseDataView = (dataView?: DataView | null) => {\n  releaseDataViews([dataView]);\n};\n\nexport const releaseDataViewWithDependencies = (\n  dataView: DataView | null | undefined,\n  shouldReleaseDependency: (dataView: DataView) => boolean\n) => {\n  if (!dataView) {\n    return;\n  }\n\n  const dataViewsInDataSet = new Set(getDataViewsInDataSet(dataView));\n  const releaseDependencies: DataView[] = [];\n  const collectReleaseDependencies = (currentDataView: DataView) => {\n    const dependencies = (currentDataView as unknown as { rawData?: DataView[] })?.rawData;\n\n    if (!Array.isArray(dependencies)) {\n      return;\n    }\n\n    dependencies.forEach(dependency => {\n      if (\n        dataViewsInDataSet.has(dependency) &&\n        shouldReleaseDependency(dependency) &&\n        !releaseDependencies.includes(dependency)\n      ) {\n        releaseDependencies.push(dependency);\n        collectReleaseDependencies(dependency);\n      }\n    });\n  };\n\n  collectReleaseDependencies(dataView);\n  releaseDataViews([dataView, ...releaseDependencies]);\n};\n"]}

package/esm/data/register.js

@@ -5,4 +5,4 @@ export function registerDataSetInstanceTransform(dataSet, name, transform) {
 export function registerDataSetInstanceParser(dataSet, name, parse) {
     dataSet.getParser(name) || dataSet.registerParser(name, parse);
 }
-//# sourceMappingURL=register.js.map
+//# sourceMappingURL=register.js.map

package/esm/data/transforms/box-plot.d.ts

@@ -1,6 +1,9 @@
+import type { DataView } from '@visactor/vdataset';
 export interface IBoxPlotOutlierOpt {
     dimensionField: string[];
     outliersField: string;
     seriesField?: string;
 }
-export declare const foldOutlierData: (data: Array<DataView>, op: IBoxPlotOutlierOpt) => any;
+type BoxPlotOutlierOption = IBoxPlotOutlierOpt | (() => IBoxPlotOutlierOpt);
+export declare const foldOutlierData: (data: Array<DataView>, op: BoxPlotOutlierOption) => Record<string, unknown>[];
+export {};

package/esm/data/transforms/box-plot.js

@@ -1,12 +1,12 @@
-import { isArray, isValid } from "@visactor/vutils";
+import { isArray, isFunction, isValid } from "@visactor/vutils";
 
 import { BOX_PLOT_OUTLIER_VALUE_FIELD } from "../../constant/box-plot";
 
 export const foldOutlierData = (data, op) => {
-    const result = [], {outliersField: outliersField, dimensionField: dimensionField, seriesField: seriesField} = op;
+    const result = [], options = isFunction(op) ? op() : op, {outliersField: outliersField, dimensionField: dimensionField, seriesField: seriesField} = options;
     return (data[0].latestData || []).forEach((d => {
-        let outlierValues = d[outliersField];
-        isArray(outlierValues) || (outlierValues = [ outlierValues ]), result.push(...outlierValues.map((v => {
+        const rawOutlierValues = d[outliersField], outlierValues = isArray(rawOutlierValues) ? rawOutlierValues : [ rawOutlierValues ];
+        result.push(...outlierValues.map((v => {
             const resData = {
                 [BOX_PLOT_OUTLIER_VALUE_FIELD]: v
             };

package/esm/data/transforms/box-plot.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/box-plot.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AACpD,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAcvE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAqB,EAAE,EAAsB,EAAE,EAAE;IAC/E,MAAM,MAAM,GAAQ,EAAE,CAAC;IACvB,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,EAAE,CAAC;IAC1D,MAAM,UAAU,GAAI,IAAI,CAAC,CAAC,CAAS,CAAC,UAAU,IAAI,EAAE,CAAC;IAErD,UAAU,CAAC,OAAO,CAAC,CAAC,CAAQ,EAAE,EAAE;QAC9B,IAAI,aAAa,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC;QACrC,IAAI,CAAC,OAAO,CAAC,aAAa,CAAC,EAAE;YAC3B,aAAa,GAAG,CAAC,aAAa,CAAC,CAAC;SACjC;QACD,MAAM,CAAC,IAAI,CACT,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAM,EAAE,EAAE;YAC9B,MAAM,OAAO,GAAG;gBACd,CAAC,4BAA4B,CAAC,EAAE,CAAC;aAClC,CAAC;YACF,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC5B,OAAe,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;YACrC,CAAC,CAAC,CAAC;YAEH,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE;gBACvB,OAAe,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;aAChD;YAED,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC","file":"box-plot.js","sourcesContent":["import { isArray, isValid } from '@visactor/vutils';\nimport { BOX_PLOT_OUTLIER_VALUE_FIELD } from '../../constant/box-plot';\nimport type { Datum } from '../../typings';\n\nexport interface IBoxPlotOutlierOpt {\n  dimensionField: string[];\n  outliersField: string;\n  seriesField?: string;\n}\n/**\n * 将箱型图outlier数组展平\n * @param data\n * @param options\n * @returns\n */\nexport const foldOutlierData = (data: Array<DataView>, op: IBoxPlotOutlierOpt) => {\n  const result: any = [];\n  const { outliersField, dimensionField, seriesField } = op;\n  const latestData = (data[0] as any).latestData || [];\n\n  latestData.forEach((d: Datum) => {\n    let outlierValues = d[outliersField];\n    if (!isArray(outlierValues)) {\n      outlierValues = [outlierValues];\n    }\n    result.push(\n      ...outlierValues.map((v: any) => {\n        const resData = {\n          [BOX_PLOT_OUTLIER_VALUE_FIELD]: v\n        };\n        dimensionField.forEach(field => {\n          (resData as any)[field] = d[field];\n        });\n\n        if (isValid(seriesField)) {\n          (resData as any)[seriesField] = d[seriesField];\n        }\n\n        return resData;\n      })\n    );\n  });\n  return result;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/box-plot.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAChE,OAAO,EAAE,4BAA4B,EAAE,MAAM,yBAAyB,CAAC;AAevE,MAAM,CAAC,MAAM,eAAe,GAAG,CAAC,IAAqB,EAAE,EAAwB,EAAE,EAAE;IACjF,MAAM,MAAM,GAAmC,EAAE,CAAC;IAClD,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3C,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,WAAW,EAAE,GAAG,OAAO,CAAC;IAC/D,MAAM,UAAU,GAAI,IAAI,CAAC,CAAC,CAAgE,CAAC,UAAU,IAAI,EAAE,CAAC;IAE5G,UAAU,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACrB,MAAM,gBAAgB,GAAG,CAAC,CAAC,aAAa,CAAC,CAAC;QAC1C,MAAM,aAAa,GAAG,OAAO,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC,CAAC,CAAC,gBAAgB,CAAC,CAAC;QACxF,MAAM,CAAC,IAAI,CACT,GAAG,aAAa,CAAC,GAAG,CAAC,CAAC,CAAU,EAAE,EAAE;YAClC,MAAM,OAAO,GAA4B;gBACvC,CAAC,4BAA4B,CAAC,EAAE,CAAC;aAClC,CAAC;YACF,cAAc,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;gBAC7B,OAAO,CAAC,KAAK,CAAC,GAAG,CAAC,CAAC,KAAK,CAAC,CAAC;YAC5B,CAAC,CAAC,CAAC;YAEH,IAAI,OAAO,CAAC,WAAW,CAAC,EAAE;gBACxB,OAAO,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,WAAW,CAAC,CAAC;aACvC;YAED,OAAO,OAAO,CAAC;QACjB,CAAC,CAAC,CACH,CAAC;IACJ,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC","file":"box-plot.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isArray, isFunction, isValid } from '@visactor/vutils';\nimport { BOX_PLOT_OUTLIER_VALUE_FIELD } from '../../constant/box-plot';\n\nexport interface IBoxPlotOutlierOpt {\n  dimensionField: string[];\n  outliersField: string;\n  seriesField?: string;\n}\n\ntype BoxPlotOutlierOption = IBoxPlotOutlierOpt | (() => IBoxPlotOutlierOpt);\n/**\n * 将箱型图outlier数组展平\n * @param data\n * @param options\n * @returns\n */\nexport const foldOutlierData = (data: Array<DataView>, op: BoxPlotOutlierOption) => {\n  const result: Array<Record<string, unknown>> = [];\n  const options = isFunction(op) ? op() : op;\n  const { outliersField, dimensionField, seriesField } = options;\n  const latestData = (data[0] as unknown as { latestData?: Array<Record<string, unknown>> }).latestData || [];\n\n  latestData.forEach(d => {\n    const rawOutlierValues = d[outliersField];\n    const outlierValues = isArray(rawOutlierValues) ? rawOutlierValues : [rawOutlierValues];\n    result.push(\n      ...outlierValues.map((v: unknown) => {\n        const resData: Record<string, unknown> = {\n          [BOX_PLOT_OUTLIER_VALUE_FIELD]: v\n        };\n        dimensionField.forEach(field => {\n          resData[field] = d[field];\n        });\n\n        if (isValid(seriesField)) {\n          resData[seriesField] = d[seriesField];\n        }\n\n        return resData;\n      })\n    );\n  });\n  return result;\n};\n"]}

package/esm/data/transforms/correlation-center.d.ts

@@ -1,4 +1,11 @@
-export declare const correlationCenter: (data: any, options: any) => {
-    [x: string]: any;
-    [x: number]: any;
-};
+type CorrelationCenterOptionValue<T> = T | (() => T);
+type CorrelationCenterData = Array<{
+    latestData: Array<Record<string, unknown>>;
+}>;
+export interface ICorrelationCenterOpt {
+    keyword: CorrelationCenterOptionValue<string>;
+    categoryField: CorrelationCenterOptionValue<string>;
+}
+export declare const correlationCenter: (data: CorrelationCenterData, options: ICorrelationCenterOpt) => Record<string, unknown> | [
+];
+export {};

package/esm/data/transforms/correlation-center.js

@@ -1,10 +1,12 @@
-import { isArray } from "@visactor/vutils";
+import { isArray, isFunction } from "@visactor/vutils";
 
 import { DEFAULT_DATA_INDEX, DEFAULT_DATA_SERIES_FIELD } from "../../constant/data";
 
+const resolveOptionValue = option => isFunction(option) ? option() : option;
+
 export const correlationCenter = (data, options) => {
     if (!data || !isArray(data)) return [];
-    const {keyword: keyword, categoryField: categoryField} = options, nodeInfo = data[0].latestData[0];
+    const keyword = resolveOptionValue(options.keyword), categoryField = resolveOptionValue(options.categoryField), nodeInfo = data[0].latestData[0];
     return {
         [categoryField]: keyword,
         [DEFAULT_DATA_INDEX]: null == nodeInfo ? void 0 : nodeInfo[DEFAULT_DATA_INDEX],

package/esm/data/transforms/correlation-center.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/correlation-center.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAC3C,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAEpF,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAAC,IAAS,EAAE,OAAY,EAAE,EAAE;IAC3D,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,EAAE,OAAO,EAAE,aAAa,EAAE,GAAG,OAAO,CAAC;IAE3C,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAEvC,MAAM,UAAU,GAAG;QACjB,CAAC,aAAa,CAAC,EAAE,OAAO;QACxB,CAAC,kBAAkB,CAAC,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,kBAAkB,CAAC;QACpD,CAAC,yBAAyB,CAAC,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,yBAAyB,CAAC;KACnE,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC","file":"correlation-center.js","sourcesContent":["import { isArray } from '@visactor/vutils';\nimport { DEFAULT_DATA_INDEX, DEFAULT_DATA_SERIES_FIELD } from '../../constant/data';\n\nexport const correlationCenter = (data: any, options: any) => {\n  if (!data || !isArray(data)) {\n    return [];\n  }\n\n  const { keyword, categoryField } = options;\n\n  const nodeInfo = data[0].latestData[0];\n\n  const centerInfo = {\n    [categoryField]: keyword,\n    [DEFAULT_DATA_INDEX]: nodeInfo?.[DEFAULT_DATA_INDEX],\n    [DEFAULT_DATA_SERIES_FIELD]: nodeInfo?.[DEFAULT_DATA_SERIES_FIELD]\n  };\n\n  return centerInfo;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/correlation-center.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AACvD,OAAO,EAAE,kBAAkB,EAAE,yBAAyB,EAAE,MAAM,qBAAqB,CAAC;AAUpF,MAAM,kBAAkB,GAAG,CAAI,MAAuC,EAAE,EAAE,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAEpH,MAAM,CAAC,MAAM,iBAAiB,GAAG,CAC/B,IAA2B,EAC3B,OAA8B,EACA,EAAE;IAChC,IAAI,CAAC,IAAI,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;QAC3B,OAAO,EAAE,CAAC;KACX;IAED,MAAM,OAAO,GAAG,kBAAkB,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IACpD,MAAM,aAAa,GAAG,kBAAkB,CAAC,OAAO,CAAC,aAAa,CAAC,CAAC;IAEhE,MAAM,QAAQ,GAAG,IAAI,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;IAEvC,MAAM,UAAU,GAAG;QACjB,CAAC,aAAa,CAAC,EAAE,OAAO;QACxB,CAAC,kBAAkB,CAAC,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,kBAAkB,CAAC;QACpD,CAAC,yBAAyB,CAAC,EAAE,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAG,yBAAyB,CAAC;KACnE,CAAC;IAEF,OAAO,UAAU,CAAC;AACpB,CAAC,CAAC","file":"correlation-center.js","sourcesContent":["import { isArray, isFunction } from '@visactor/vutils';\nimport { DEFAULT_DATA_INDEX, DEFAULT_DATA_SERIES_FIELD } from '../../constant/data';\n\ntype CorrelationCenterOptionValue<T> = T | (() => T);\ntype CorrelationCenterData = Array<{ latestData: Array<Record<string, unknown>> }>;\n\nexport interface ICorrelationCenterOpt {\n  keyword: CorrelationCenterOptionValue<string>;\n  categoryField: CorrelationCenterOptionValue<string>;\n}\n\nconst resolveOptionValue = <T>(option: CorrelationCenterOptionValue<T>) => (isFunction(option) ? option() : option);\n\nexport const correlationCenter = (\n  data: CorrelationCenterData,\n  options: ICorrelationCenterOpt\n): Record<string, unknown> | [] => {\n  if (!data || !isArray(data)) {\n    return [];\n  }\n\n  const keyword = resolveOptionValue(options.keyword);\n  const categoryField = resolveOptionValue(options.categoryField);\n\n  const nodeInfo = data[0].latestData[0];\n\n  const centerInfo = {\n    [categoryField]: keyword,\n    [DEFAULT_DATA_INDEX]: nodeInfo?.[DEFAULT_DATA_INDEX],\n    [DEFAULT_DATA_SERIES_FIELD]: nodeInfo?.[DEFAULT_DATA_SERIES_FIELD]\n  };\n\n  return centerInfo;\n};\n"]}

package/esm/data/transforms/correlation.d.ts

@@ -1,17 +1,20 @@
+type CorrelationOptionValue<T> = T | (() => T);
 export interface ICorrelationOpt {
-    field: string;
-    radiusField?: string;
-    radiusRange?: [number, number];
-    center?: [string | number, string | number];
-    startAngle?: number;
-    endAngle?: number;
-    innerRadius?: string | number;
-    outerRadius?: string | number;
+    view: () => {
+        x0: number;
+        x1: number;
+        y0: number;
+        y1: number;
+    };
+    field: CorrelationOptionValue<string>;
+    radiusField?: CorrelationOptionValue<string | undefined>;
+    radiusRange?: CorrelationOptionValue<[number, number] | undefined>;
+    center?: CorrelationOptionValue<[string | number, string | number] | undefined>;
+    startAngle?: CorrelationOptionValue<number | undefined>;
+    endAngle?: CorrelationOptionValue<number | undefined>;
+    innerRadius?: CorrelationOptionValue<string | number | undefined>;
+    outerRadius?: CorrelationOptionValue<string | number | undefined>;
 }
-export interface CircularRelationItem {
-    x: number;
-    y: number;
-    size: number;
-    datum: any;
-}
-export declare const correlation: (data: any, options: any) => any;
+export type CircularRelationItem = Record<string, unknown>;
+export declare const correlation: (data: unknown, options: ICorrelationOpt) => unknown;
+export {};

package/esm/data/transforms/correlation.js

@@ -1,20 +1,22 @@
-import { isNil, isNumber, degreeToRadian, isArray, field as getFieldAccessor, extent, toPercent } from "@visactor/vutils";
+import { isNil, isNumber, degreeToRadian, isArray, isFunction, field as getFieldAccessor, extent, toPercent } from "@visactor/vutils";
 
 import { CORRELATION_X, CORRELATION_Y, CORRELATION_SIZE } from "../../constant/correlation";
 
+const resolveOptionValue = option => isFunction(option) ? option() : option;
+
 export const correlation = (data, options) => {
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q;
+    var _a, _b, _c, _d, _e, _f, _g, _h;
     if (!data || !(null == options ? void 0 : options.view) || !isArray(data)) return data;
-    const viewBox = options.view();
+    const dataList = data, viewBox = options.view();
     if (viewBox.x1 - viewBox.x0 == 0 || viewBox.y1 - viewBox.y0 == 0 || viewBox.x1 - viewBox.x0 == -1 / 0 || viewBox.x1 - viewBox.x0 == 1 / 0 || viewBox.y1 - viewBox.y0 == -1 / 0 || viewBox.y1 - viewBox.y0 == 1 / 0) return data;
-    const startAngle = degreeToRadian(null !== (_a = options.startAngle) && void 0 !== _a ? _a : -90), endAngle = degreeToRadian(null !== (_b = options.endAngle) && void 0 !== _b ? _b : 270), maxRadius = Math.max((viewBox.x1 - viewBox.x0) / 2, (viewBox.y1 - viewBox.y0) / 2), innerRadius = toPercent(null !== (_c = options.innerRadius) && void 0 !== _c ? _c : 0, maxRadius), outerRadius = toPercent(options.outerRadius, maxRadius), center = [ isNumber(null === (_d = options.center) || void 0 === _d ? void 0 : _d[0]) ? options.center[0] : viewBox.x0 + toPercent(null !== (_f = null === (_e = options.center) || void 0 === _e ? void 0 : _e[0]) && void 0 !== _f ? _f : "50%", viewBox.x1 - viewBox.x0), isNumber(null === (_g = options.center) || void 0 === _g ? void 0 : _g[1]) ? options.center[1] : viewBox.y0 + toPercent(null !== (_j = null === (_h = options.center) || void 0 === _h ? void 0 : _h[1]) && void 0 !== _j ? _j : "50%", viewBox.y1 - viewBox.y0) ], fieldAccessor = getFieldAccessor(options.field), values = data.map(fieldAccessor), [min, max] = extent(values), radiusScale = min === max ? val => (innerRadius + outerRadius) / 2 : val => innerRadius + (outerRadius - innerRadius) * (val - min) / (max - min), sizeAccessor = isNil(options.radiusField) ? fieldAccessor : getFieldAccessor(options.radiusField), defaultSize = null !== (_l = null === (_k = null == options ? void 0 : options.radiusRange) || void 0 === _k ? void 0 : _k[1]) && void 0 !== _l ? _l : 5;
+    const startAngle = degreeToRadian(null !== (_a = resolveOptionValue(options.startAngle)) && void 0 !== _a ? _a : -90), endAngle = degreeToRadian(null !== (_b = resolveOptionValue(options.endAngle)) && void 0 !== _b ? _b : 270), maxRadius = Math.max((viewBox.x1 - viewBox.x0) / 2, (viewBox.y1 - viewBox.y0) / 2), innerRadius = toPercent(null !== (_c = resolveOptionValue(options.innerRadius)) && void 0 !== _c ? _c : 0, maxRadius), outerRadius = toPercent(resolveOptionValue(options.outerRadius), maxRadius), centerOption = resolveOptionValue(options.center), center = [ isNumber(null == centerOption ? void 0 : centerOption[0]) ? centerOption[0] : viewBox.x0 + toPercent(null !== (_d = null == centerOption ? void 0 : centerOption[0]) && void 0 !== _d ? _d : "50%", viewBox.x1 - viewBox.x0), isNumber(null == centerOption ? void 0 : centerOption[1]) ? centerOption[1] : viewBox.y0 + toPercent(null !== (_e = null == centerOption ? void 0 : centerOption[1]) && void 0 !== _e ? _e : "50%", viewBox.y1 - viewBox.y0) ], fieldAccessor = getFieldAccessor(resolveOptionValue(options.field)), values = dataList.map(fieldAccessor), [min, max] = extent(values), radiusScale = min === max ? val => (innerRadius + outerRadius) / 2 : val => innerRadius + (outerRadius - innerRadius) * (val - min) / (max - min), radiusField = resolveOptionValue(options.radiusField), radiusRange = resolveOptionValue(options.radiusRange), sizeAccessor = isNil(radiusField) ? fieldAccessor : getFieldAccessor(radiusField), defaultSize = null !== (_f = null == radiusRange ? void 0 : radiusRange[1]) && void 0 !== _f ? _f : 5;
     let sizeScale = datum => defaultSize;
     if (sizeAccessor) {
-        const [minSize, maxSize] = sizeAccessor !== fieldAccessor ? extent(data.map(sizeAccessor)) : [ min, max ], minR = null !== (_o = null === (_m = options.radiusRange) || void 0 === _m ? void 0 : _m[0]) && void 0 !== _o ? _o : 5, maxR = null !== (_q = null === (_p = options.radiusRange) || void 0 === _p ? void 0 : _p[1]) && void 0 !== _q ? _q : 5;
+        const [minSize, maxSize] = sizeAccessor !== fieldAccessor ? extent(dataList.map(sizeAccessor)) : [ min, max ], minR = null !== (_g = null == radiusRange ? void 0 : radiusRange[0]) && void 0 !== _g ? _g : 5, maxR = null !== (_h = null == radiusRange ? void 0 : radiusRange[1]) && void 0 !== _h ? _h : 5;
         minSize !== maxSize && (sizeScale = datum => minR + (maxR - minR) * (sizeAccessor(datum) - minSize) / (maxSize - minSize));
     }
-    const minAngle = Math.min(startAngle, endAngle), maxAngle = Math.max(startAngle, endAngle), angles = getPartialAngles(minAngle, maxAngle, data.length), res = [], searchAngle = (maxAngle - minAngle) / 60;
-    return data.forEach(((datum, index) => {
+    const minAngle = Math.min(startAngle, endAngle), maxAngle = Math.max(startAngle, endAngle), angles = getPartialAngles(minAngle, maxAngle, dataList.length), res = [], searchAngle = (maxAngle - minAngle) / 60;
+    return dataList.forEach(((datum, index) => {
         const radius = radiusScale(values[index]), size = sizeScale(datum);
         let x, y, angle = angles[index];
         for (let i = 0; i < 60 && (x = center[0] + radius * Math.cos(angle), y = center[1] + radius * Math.sin(angle), 
@@ -41,5 +43,8 @@ const getPartialAngles = (minAngle, maxAngle, count) => {
     startAngle = -1 === stepSign ? maxAngle - offsetAngle : minAngle + offsetAngle, 
     stepIndex >= 2 && (stepAngle /= 2, stepCount *= 2));
     return res;
-}, hasOverlap = (item, arr) => !(!arr || !arr.length) && arr.some((entry => Math.pow(item.x - entry.x, 2) + Math.pow(item.y - entry.y, 2) < Math.pow(item.size + entry.size, 2)));
+}, hasOverlap = (item, arr) => !(!arr || !arr.length) && arr.some((entry => {
+    const x = entry.x, y = entry.y, size = entry.size;
+    return Math.pow(item.x - x, 2) + Math.pow(item.y - y, 2) < Math.pow(item.size + size, 2);
+}));
 //# sourceMappingURL=correlation.js.map

package/esm/data/transforms/correlation.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/correlation.ts"],"names":[],"mappings":"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","file":"correlation.js","sourcesContent":["import {\n  isNil,\n  isNumber,\n  degreeToRadian,\n  isArray,\n  field as getFieldAccessor,\n  extent,\n  toPercent\n} from '@visactor/vutils';\nimport { CORRELATION_X, CORRELATION_Y, CORRELATION_SIZE } from '../../constant/correlation';\n\nexport interface ICorrelationOpt {\n  field: string;\n  radiusField?: string;\n  radiusRange?: [number, number];\n  center?: [string | number, string | number];\n  startAngle?: number;\n  endAngle?: number;\n  innerRadius?: string | number;\n  outerRadius?: string | number;\n}\n\nexport interface CircularRelationItem {\n  x: number;\n  y: number;\n  size: number;\n  datum: any;\n}\n\nexport const correlation = (data: any, options: any) => {\n  if (!data || !options?.view || !isArray(data)) {\n    return data;\n  }\n\n  const viewBox = options.view();\n\n  if (\n    viewBox.x1 - viewBox.x0 === 0 ||\n    viewBox.y1 - viewBox.y0 === 0 ||\n    viewBox.x1 - viewBox.x0 === -Infinity ||\n    viewBox.x1 - viewBox.x0 === Infinity ||\n    viewBox.y1 - viewBox.y0 === -Infinity ||\n    viewBox.y1 - viewBox.y0 === Infinity\n  ) {\n    return data;\n  }\n\n  const startAngle = degreeToRadian(options.startAngle ?? -90);\n  const endAngle = degreeToRadian(options.endAngle ?? 270);\n  const maxRadius = Math.max((viewBox.x1 - viewBox.x0) / 2, (viewBox.y1 - viewBox.y0) / 2);\n  const innerRadius = toPercent(options.innerRadius ?? 0, maxRadius);\n  const outerRadius = toPercent(options.outerRadius, maxRadius);\n\n  const center = [\n    isNumber(options.center?.[0])\n      ? options.center[0]\n      : viewBox.x0 + toPercent(options.center?.[0] ?? '50%', viewBox.x1 - viewBox.x0),\n    isNumber(options.center?.[1])\n      ? options.center[1]\n      : viewBox.y0 + toPercent(options.center?.[1] ?? '50%', viewBox.y1 - viewBox.y0)\n  ] as [number, number];\n  const fieldAccessor = getFieldAccessor(options.field);\n  const values = data.map(fieldAccessor);\n  const [min, max] = extent(values);\n  const radiusScale =\n    min === max\n      ? (val: number) => (innerRadius + outerRadius) / 2\n      : (val: number) => innerRadius + ((outerRadius - innerRadius) * (val - min)) / (max - min);\n\n  const sizeAccessor = !isNil(options.radiusField) ? getFieldAccessor(options.radiusField) : fieldAccessor;\n  const defaultSize = options?.radiusRange?.[1] ?? 5;\n  let sizeScale = (datum: any) => defaultSize;\n\n  if (sizeAccessor) {\n    const [minSize, maxSize] = sizeAccessor !== fieldAccessor ? extent(data.map(sizeAccessor)) : [min, max];\n    const minR = options.radiusRange?.[0] ?? 5;\n    const maxR = options.radiusRange?.[1] ?? 5;\n\n    if (minSize !== maxSize) {\n      sizeScale = (datum: any) => minR + ((maxR - minR) * (sizeAccessor(datum) - minSize)) / (maxSize - minSize);\n    }\n  }\n\n  const minAngle = Math.min(startAngle, endAngle);\n  const maxAngle = Math.max(startAngle, endAngle);\n  const angles = getPartialAngles(minAngle, maxAngle, data.length);\n\n  const res: CircularRelationItem[] = [];\n  const searchStep = 60;\n  const searchAngle = (maxAngle - minAngle) / searchStep;\n\n  data.forEach((datum, index) => {\n    const radius = radiusScale(values[index] as number);\n    const size = sizeScale(datum);\n    let x: number;\n    let y: number;\n    let angle = angles[index];\n\n    for (let i = 0; i < searchStep; i++) {\n      x = center[0] + radius * Math.cos(angle);\n      y = center[1] + radius * Math.sin(angle);\n\n      if (\n        hasOverlap({ x, y, size }, res) ||\n        x - size < viewBox.x0 ||\n        x + size > viewBox.x1 ||\n        y - size < viewBox.y0 ||\n        y + size > viewBox.y1\n      ) {\n        if (i < searchStep - 1) {\n          angle += searchAngle;\n\n          if (angle > maxAngle) {\n            angle = minAngle;\n          } else if (angle < minAngle) {\n            angle = maxAngle;\n          }\n        }\n        continue;\n      } else {\n        break;\n      }\n    }\n\n    res.push({ [CORRELATION_X]: x, [CORRELATION_Y]: y, [CORRELATION_SIZE]: size, ...datum });\n  });\n  return res;\n};\n\nconst getPartialAngles = (minAngle: number, maxAngle: number, count: number) => {\n  let offsetAngle = 0;\n  let stepCount = Math.max(Math.ceil((2 * (maxAngle - minAngle)) / Math.PI), 2);\n  let stepAngle = (maxAngle - minAngle) / stepCount;\n  let stepIndex = 0;\n  let stepSign = 1;\n  let i = 0;\n  let j = 0;\n  const res: number[] = [];\n  let startAngle = minAngle;\n\n  while (i < count) {\n    if (j < stepCount) {\n      res.push(startAngle + (j % 2 ? Math.floor(j / 2) + Math.floor(stepCount / 2) : j / 2) * stepAngle * stepSign);\n      j++;\n    }\n\n    i++;\n\n    if (j === stepCount) {\n      j = 0;\n      stepIndex += 1;\n      stepSign *= -1;\n\n      if (offsetAngle === 0) {\n        offsetAngle = stepAngle / 2;\n      } else {\n        offsetAngle /= 2;\n      }\n      startAngle = stepSign === -1 ? maxAngle - offsetAngle : minAngle + offsetAngle;\n\n      if (stepIndex >= 2) {\n        stepAngle /= 2;\n        stepCount *= 2;\n      }\n    }\n  }\n\n  return res;\n};\n\nconst hasOverlap = (item: Omit<CircularRelationItem, 'datum'>, arr: CircularRelationItem[]) => {\n  if (!arr || !arr.length) {\n    return false;\n  }\n\n  return arr.some(entry => {\n    return Math.pow(item.x - entry.x, 2) + Math.pow(item.y - entry.y, 2) < Math.pow(item.size + entry.size, 2);\n  });\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/correlation.ts"],"names":[],"mappings":"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","file":"correlation.js","sourcesContent":["import {\n  isNil,\n  isNumber,\n  degreeToRadian,\n  isArray,\n  isFunction,\n  field as getFieldAccessor,\n  extent,\n  toPercent\n} from '@visactor/vutils';\nimport { CORRELATION_X, CORRELATION_Y, CORRELATION_SIZE } from '../../constant/correlation';\n\ntype CorrelationOptionValue<T> = T | (() => T);\ntype CorrelationDatum = Record<string, unknown>;\n\nexport interface ICorrelationOpt {\n  view: () => { x0: number; x1: number; y0: number; y1: number };\n  field: CorrelationOptionValue<string>;\n  radiusField?: CorrelationOptionValue<string | undefined>;\n  radiusRange?: CorrelationOptionValue<[number, number] | undefined>;\n  center?: CorrelationOptionValue<[string | number, string | number] | undefined>;\n  startAngle?: CorrelationOptionValue<number | undefined>;\n  endAngle?: CorrelationOptionValue<number | undefined>;\n  innerRadius?: CorrelationOptionValue<string | number | undefined>;\n  outerRadius?: CorrelationOptionValue<string | number | undefined>;\n}\n\ninterface CorrelationLayoutItem {\n  x: number;\n  y: number;\n  size: number;\n}\n\nexport type CircularRelationItem = Record<string, unknown>;\n\nconst resolveOptionValue = <T>(option: CorrelationOptionValue<T>) => (isFunction(option) ? option() : option);\n\nexport const correlation = (data: unknown, options: ICorrelationOpt) => {\n  if (!data || !options?.view || !isArray(data)) {\n    return data;\n  }\n  const dataList = data as CorrelationDatum[];\n\n  const viewBox = options.view();\n\n  if (\n    viewBox.x1 - viewBox.x0 === 0 ||\n    viewBox.y1 - viewBox.y0 === 0 ||\n    viewBox.x1 - viewBox.x0 === -Infinity ||\n    viewBox.x1 - viewBox.x0 === Infinity ||\n    viewBox.y1 - viewBox.y0 === -Infinity ||\n    viewBox.y1 - viewBox.y0 === Infinity\n  ) {\n    return data;\n  }\n\n  const startAngle = degreeToRadian(resolveOptionValue(options.startAngle) ?? -90);\n  const endAngle = degreeToRadian(resolveOptionValue(options.endAngle) ?? 270);\n  const maxRadius = Math.max((viewBox.x1 - viewBox.x0) / 2, (viewBox.y1 - viewBox.y0) / 2);\n  const innerRadius = toPercent(resolveOptionValue(options.innerRadius) ?? 0, maxRadius);\n  const outerRadius = toPercent(resolveOptionValue(options.outerRadius), maxRadius);\n  const centerOption = resolveOptionValue(options.center);\n\n  const center = [\n    isNumber(centerOption?.[0])\n      ? centerOption[0]\n      : viewBox.x0 + toPercent(centerOption?.[0] ?? '50%', viewBox.x1 - viewBox.x0),\n    isNumber(centerOption?.[1])\n      ? centerOption[1]\n      : viewBox.y0 + toPercent(centerOption?.[1] ?? '50%', viewBox.y1 - viewBox.y0)\n  ] as [number, number];\n  const fieldAccessor = getFieldAccessor(resolveOptionValue(options.field));\n  const values = dataList.map(fieldAccessor);\n  const [min, max] = extent(values);\n  const radiusScale =\n    min === max\n      ? (val: number) => (innerRadius + outerRadius) / 2\n      : (val: number) => innerRadius + ((outerRadius - innerRadius) * (val - min)) / (max - min);\n\n  const radiusField = resolveOptionValue(options.radiusField);\n  const radiusRange = resolveOptionValue(options.radiusRange);\n  const sizeAccessor = !isNil(radiusField) ? getFieldAccessor(radiusField) : fieldAccessor;\n  const defaultSize = radiusRange?.[1] ?? 5;\n  let sizeScale = (datum: CorrelationDatum) => defaultSize;\n\n  if (sizeAccessor) {\n    const [minSize, maxSize] = sizeAccessor !== fieldAccessor ? extent(dataList.map(sizeAccessor)) : [min, max];\n    const minR = radiusRange?.[0] ?? 5;\n    const maxR = radiusRange?.[1] ?? 5;\n\n    if (minSize !== maxSize) {\n      sizeScale = (datum: CorrelationDatum) =>\n        minR + ((maxR - minR) * (sizeAccessor(datum) - minSize)) / (maxSize - minSize);\n    }\n  }\n\n  const minAngle = Math.min(startAngle, endAngle);\n  const maxAngle = Math.max(startAngle, endAngle);\n  const angles = getPartialAngles(minAngle, maxAngle, dataList.length);\n\n  const res: CircularRelationItem[] = [];\n  const searchStep = 60;\n  const searchAngle = (maxAngle - minAngle) / searchStep;\n\n  dataList.forEach((datum, index) => {\n    const radius = radiusScale(values[index] as number);\n    const size = sizeScale(datum);\n    let x: number;\n    let y: number;\n    let angle = angles[index];\n\n    for (let i = 0; i < searchStep; i++) {\n      x = center[0] + radius * Math.cos(angle);\n      y = center[1] + radius * Math.sin(angle);\n\n      if (\n        hasOverlap({ x, y, size }, res) ||\n        x - size < viewBox.x0 ||\n        x + size > viewBox.x1 ||\n        y - size < viewBox.y0 ||\n        y + size > viewBox.y1\n      ) {\n        if (i < searchStep - 1) {\n          angle += searchAngle;\n\n          if (angle > maxAngle) {\n            angle = minAngle;\n          } else if (angle < minAngle) {\n            angle = maxAngle;\n          }\n        }\n        continue;\n      } else {\n        break;\n      }\n    }\n\n    res.push({ [CORRELATION_X]: x, [CORRELATION_Y]: y, [CORRELATION_SIZE]: size, ...datum });\n  });\n  return res;\n};\n\nconst getPartialAngles = (minAngle: number, maxAngle: number, count: number) => {\n  let offsetAngle = 0;\n  let stepCount = Math.max(Math.ceil((2 * (maxAngle - minAngle)) / Math.PI), 2);\n  let stepAngle = (maxAngle - minAngle) / stepCount;\n  let stepIndex = 0;\n  let stepSign = 1;\n  let i = 0;\n  let j = 0;\n  const res: number[] = [];\n  let startAngle = minAngle;\n\n  while (i < count) {\n    if (j < stepCount) {\n      res.push(startAngle + (j % 2 ? Math.floor(j / 2) + Math.floor(stepCount / 2) : j / 2) * stepAngle * stepSign);\n      j++;\n    }\n\n    i++;\n\n    if (j === stepCount) {\n      j = 0;\n      stepIndex += 1;\n      stepSign *= -1;\n\n      if (offsetAngle === 0) {\n        offsetAngle = stepAngle / 2;\n      } else {\n        offsetAngle /= 2;\n      }\n      startAngle = stepSign === -1 ? maxAngle - offsetAngle : minAngle + offsetAngle;\n\n      if (stepIndex >= 2) {\n        stepAngle /= 2;\n        stepCount *= 2;\n      }\n    }\n  }\n\n  return res;\n};\n\nconst hasOverlap = (item: CorrelationLayoutItem, arr: CircularRelationItem[]) => {\n  if (!arr || !arr.length) {\n    return false;\n  }\n\n  return arr.some(entry => {\n    const x = entry.x as number;\n    const y = entry.y as number;\n    const size = entry.size as number;\n    return Math.pow(item.x - x, 2) + Math.pow(item.y - y, 2) < Math.pow(item.size + size, 2);\n  });\n};\n"]}

package/esm/data/transforms/funnel.d.ts

@@ -1,6 +1,7 @@
 import type { DataView } from '@visactor/vdataset';
+type FunnelOptionValue<T> = T | (() => T);
 export interface IFunnelOpt {
-    valueField: string;
+    valueField: FunnelOptionValue<string>;
     asTransformRatio: string;
     asReachRatio: string;
     asHeightRatio: string;
@@ -10,12 +11,12 @@ export interface IFunnelOpt {
     asCurrentValue: string;
     asLastValue: string;
     asNextValue: string;
-    isCone?: boolean;
-    heightVisual?: boolean;
-    range?: {
-        min: number;
-        max: number;
-    };
+    isCone?: FunnelOptionValue<boolean | undefined>;
+    heightVisual?: FunnelOptionValue<boolean | undefined>;
+    range?: FunnelOptionValue<{
+        min?: number;
+        max?: number;
+    } | undefined>;
 }
 export declare const funnel: (originData: Array<DataView>, op: IFunnelOpt) => {
     dataSet: import("@visactor/vdataset").DataSet;
@@ -43,4 +44,5 @@ export declare const funnel: (originData: Array<DataView>, op: IFunnelOpt) => {
 export interface IFunnelTransformOpt {
     asIsTransformLevel: string;
 }
-export declare const funnelTransform: (originData: Array<DataView>, op: IFunnelTransformOpt) => any;
+export declare const funnelTransform: (originData: Array<DataView>, op: IFunnelTransformOpt) => Record<string, unknown>[];
+export {};

package/esm/data/transforms/funnel.js

@@ -1,10 +1,12 @@
-import { isValidNumber } from "@visactor/vutils";
+import { isFunction, isValidNumber } from "@visactor/vutils";
+
+const resolveOptionValue = option => isFunction(option) ? option() : option;
 
 export const funnel = (originData, op) => {
-    var _a, _b;
+    var _a, _b, _c, _d;
     const data = originData.map((datum => Object.assign({}, datum)));
     if (!data || 0 === data.length) return data;
-    const {valueField: valueField, asTransformRatio: asTransformRatio, asReachRatio: asReachRatio, asHeightRatio: asHeightRatio, asValueRatio: asValueRatio, asNextValueRatio: asNextValueRatio, asLastValueRatio: asLastValueRatio, asLastValue: asLastValue, asCurrentValue: asCurrentValue, asNextValue: asNextValue, heightVisual: heightVisual = !1, isCone: isCone = !0, range: range} = op, max = data.reduce(((m, d) => Math.max(m, Number.parseFloat(d[valueField]) || -1 / 0)), -1 / 0), min = data.reduce(((m, d) => Math.min(m, Number.parseFloat(d[valueField]) || 1 / 0)), 1 / 0), rangeArr = [ null !== (_a = null == range ? void 0 : range.min) && void 0 !== _a ? _a : min, null !== (_b = null == range ? void 0 : range.max) && void 0 !== _b ? _b : max ];
+    const {asTransformRatio: asTransformRatio, asReachRatio: asReachRatio, asHeightRatio: asHeightRatio, asValueRatio: asValueRatio, asNextValueRatio: asNextValueRatio, asLastValueRatio: asLastValueRatio, asLastValue: asLastValue, asCurrentValue: asCurrentValue, asNextValue: asNextValue} = op, valueField = resolveOptionValue(op.valueField), heightVisual = null !== (_a = resolveOptionValue(op.heightVisual)) && void 0 !== _a && _a, isCone = null === (_b = resolveOptionValue(op.isCone)) || void 0 === _b || _b, range = resolveOptionValue(op.range), max = data.reduce(((m, d) => Math.max(m, Number.parseFloat(d[valueField]) || -1 / 0)), -1 / 0), min = data.reduce(((m, d) => Math.min(m, Number.parseFloat(d[valueField]) || 1 / 0)), 1 / 0), rangeArr = [ null !== (_c = null == range ? void 0 : range.min) && void 0 !== _c ? _c : min, null !== (_d = null == range ? void 0 : range.max) && void 0 !== _d ? _d : max ];
     return data.forEach(((d, i) => {
         var _a, _b;
         const currentValue = Number.parseFloat(d[valueField]), lastValue = Number.parseFloat(null === (_a = data[i - 1]) || void 0 === _a ? void 0 : _a[valueField]), nextValue = Number.parseFloat(null === (_b = data[i + 1]) || void 0 === _b ? void 0 : _b[valueField]), transformRatio = isValidNumber(nextValue * currentValue) && 0 !== currentValue ? nextValue / currentValue : 0, reachRatio = isValidNumber(currentValue * lastValue) && 0 !== lastValue ? currentValue / lastValue : 0;

package/esm/data/transforms/funnel.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/funnel.ts"],"names":[],"mappings":"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","file":"funnel.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isValidNumber } from '@visactor/vutils';\n\nexport interface IFunnelOpt {\n  valueField: string;\n  /** 转化率（当前层到下一层的比例） **/\n  asTransformRatio: string;\n  /** 到达率 （上一层到当前层的比例）*/\n  asReachRatio: string;\n  /** 高度轴占总量的比例 **/\n  asHeightRatio: string;\n  /** 当前值大小占比 */\n  asValueRatio: string;\n  /** 上一层值大小占比 */\n  asLastValueRatio: string;\n  /** 下一层值大小占比 */\n  asNextValueRatio: string;\n  /** 当前层的值 */\n  asCurrentValue: string;\n  /** 上一层的值 **/\n  asLastValue: string;\n  /** 下一层的值 **/\n  asNextValue: string;\n\n  /** 最底层漏斗是否为锥形 */\n  isCone?: boolean;\n  /** 高度是否进行数据映射 **/\n  heightVisual?: boolean;\n\n  /** 数值范围 */\n  range?: { min: number; max: number };\n}\n\nexport const funnel = (originData: Array<DataView>, op: IFunnelOpt) => {\n  const data = originData.map(datum => ({ ...datum }));\n  if (!data || data.length === 0) {\n    return data;\n  }\n  const {\n    valueField,\n    asTransformRatio,\n    asReachRatio,\n    asHeightRatio,\n    asValueRatio,\n    asNextValueRatio,\n    asLastValueRatio,\n    asLastValue,\n    asCurrentValue,\n    asNextValue,\n    heightVisual = false,\n    isCone = true,\n    range\n  } = op;\n\n  const max = data.reduce((m, d) => Math.max(m, Number.parseFloat(d[valueField]) || -Infinity), -Infinity);\n  const min = data.reduce((m, d) => Math.min(m, Number.parseFloat(d[valueField]) || Infinity), Infinity);\n  const rangeArr = [range?.min ?? min, range?.max ?? max];\n\n  data.forEach((d, i) => {\n    const currentValue: number = Number.parseFloat(d[valueField]);\n    const lastValue: number = Number.parseFloat(data[i - 1]?.[valueField]);\n    const nextValue: number = Number.parseFloat(data[i + 1]?.[valueField]);\n\n    const transformRatio =\n      !isValidNumber(nextValue * currentValue) || currentValue === 0 ? 0 : nextValue / currentValue;\n    const reachRatio = !isValidNumber(currentValue * lastValue) || lastValue === 0 ? 0 : currentValue / lastValue;\n\n    asLastValue && (d[asLastValue] = lastValue);\n    asNextValue && (d[asNextValue] = nextValue);\n    asTransformRatio && (d[asTransformRatio] = transformRatio);\n    asReachRatio && (d[asReachRatio] = i === 0 ? 1 : reachRatio);\n    asHeightRatio && (d[asHeightRatio] = heightVisual === true ? transformRatio : 1 / data.length);\n    asValueRatio && (d[asValueRatio] = currentValue / rangeArr[1]);\n    asNextValueRatio &&\n      (d[asNextValueRatio] = i === data.length - 1 ? (isCone ? 0 : d[asValueRatio]) : nextValue / rangeArr[1]);\n    asLastValueRatio && (d[asLastValueRatio] = i === 0 ? 1 : lastValue / rangeArr[1]);\n    asCurrentValue && (d[asCurrentValue] = currentValue);\n  });\n\n  return data;\n};\n\nexport interface IFunnelTransformOpt {\n  asIsTransformLevel: string;\n}\n\nexport const funnelTransform = (originData: Array<DataView>, op: IFunnelTransformOpt) => {\n  const data = originData[0]?.latestData?.map((datum: any) => ({ ...datum }));\n  if (!data || data.length === 0) {\n    return data;\n  }\n  data.shift();\n  data.forEach((d: any) => {\n    d[op.asIsTransformLevel] = true;\n  });\n  return data;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/funnel.ts"],"names":[],"mappings":"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","file":"funnel.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isFunction, isValidNumber } from '@visactor/vutils';\n\ntype FunnelOptionValue<T> = T | (() => T);\n\nexport interface IFunnelOpt {\n  valueField: FunnelOptionValue<string>;\n  /** 转化率（当前层到下一层的比例） **/\n  asTransformRatio: string;\n  /** 到达率 （上一层到当前层的比例）*/\n  asReachRatio: string;\n  /** 高度轴占总量的比例 **/\n  asHeightRatio: string;\n  /** 当前值大小占比 */\n  asValueRatio: string;\n  /** 上一层值大小占比 */\n  asLastValueRatio: string;\n  /** 下一层值大小占比 */\n  asNextValueRatio: string;\n  /** 当前层的值 */\n  asCurrentValue: string;\n  /** 上一层的值 **/\n  asLastValue: string;\n  /** 下一层的值 **/\n  asNextValue: string;\n\n  /** 最底层漏斗是否为锥形 */\n  isCone?: FunnelOptionValue<boolean | undefined>;\n  /** 高度是否进行数据映射 **/\n  heightVisual?: FunnelOptionValue<boolean | undefined>;\n\n  /** 数值范围 */\n  range?: FunnelOptionValue<{ min?: number; max?: number } | undefined>;\n}\n\nconst resolveOptionValue = <T>(option: FunnelOptionValue<T>) => (isFunction(option) ? option() : option);\n\nexport const funnel = (originData: Array<DataView>, op: IFunnelOpt) => {\n  const data = originData.map(datum => ({ ...datum }));\n  if (!data || data.length === 0) {\n    return data;\n  }\n  const {\n    asTransformRatio,\n    asReachRatio,\n    asHeightRatio,\n    asValueRatio,\n    asNextValueRatio,\n    asLastValueRatio,\n    asLastValue,\n    asCurrentValue,\n    asNextValue,\n  } = op;\n  const valueField = resolveOptionValue(op.valueField);\n  const heightVisual = resolveOptionValue(op.heightVisual) ?? false;\n  const isCone = resolveOptionValue(op.isCone) ?? true;\n  const range = resolveOptionValue(op.range);\n\n  const max = data.reduce((m, d) => Math.max(m, Number.parseFloat(d[valueField]) || -Infinity), -Infinity);\n  const min = data.reduce((m, d) => Math.min(m, Number.parseFloat(d[valueField]) || Infinity), Infinity);\n  const rangeArr = [range?.min ?? min, range?.max ?? max];\n\n  data.forEach((d, i) => {\n    const currentValue: number = Number.parseFloat(d[valueField]);\n    const lastValue: number = Number.parseFloat(data[i - 1]?.[valueField]);\n    const nextValue: number = Number.parseFloat(data[i + 1]?.[valueField]);\n\n    const transformRatio =\n      !isValidNumber(nextValue * currentValue) || currentValue === 0 ? 0 : nextValue / currentValue;\n    const reachRatio = !isValidNumber(currentValue * lastValue) || lastValue === 0 ? 0 : currentValue / lastValue;\n\n    asLastValue && (d[asLastValue] = lastValue);\n    asNextValue && (d[asNextValue] = nextValue);\n    asTransformRatio && (d[asTransformRatio] = transformRatio);\n    asReachRatio && (d[asReachRatio] = i === 0 ? 1 : reachRatio);\n    asHeightRatio && (d[asHeightRatio] = heightVisual === true ? transformRatio : 1 / data.length);\n    asValueRatio && (d[asValueRatio] = currentValue / rangeArr[1]);\n    asNextValueRatio &&\n      (d[asNextValueRatio] = i === data.length - 1 ? (isCone ? 0 : d[asValueRatio]) : nextValue / rangeArr[1]);\n    asLastValueRatio && (d[asLastValueRatio] = i === 0 ? 1 : lastValue / rangeArr[1]);\n    asCurrentValue && (d[asCurrentValue] = currentValue);\n  });\n\n  return data;\n};\n\nexport interface IFunnelTransformOpt {\n  asIsTransformLevel: string;\n}\n\nexport const funnelTransform = (originData: Array<DataView>, op: IFunnelTransformOpt) => {\n  const data: Array<Record<string, unknown>> | undefined = originData[0]?.latestData?.map(\n    (datum: Record<string, unknown>) => ({ ...datum })\n  );\n  if (!data || data.length === 0) {\n    return data;\n  }\n  data.shift();\n  data.forEach(d => {\n    d[op.asIsTransformLevel] = true;\n  });\n  return data;\n};\n"]}

package/esm/data/transforms/lookup.d.ts

@@ -3,10 +3,10 @@ import type { Datum } from '../../typings';
 export interface ILookUpOpt {
     from: () => object[];
     key: string;
-    fields: string;
+    fields: string | (() => string);
     values?: string[];
     as?: string[];
-    default?: any;
-    set?: (A: Datum, B: Datum) => void;
+    default?: unknown;
+    set?: (A: Datum, B?: Datum) => void;
 }
 export declare const lookup: (data: Array<DataView>, opt: ILookUpOpt) => DataView[];

package/esm/data/transforms/lookup.js

@@ -1,22 +1,28 @@
 import { isFunction, isNil, isValid } from "@visactor/vutils";
 
+const resolveOptionValue = option => isFunction(option) ? option() : option;
+
 export const lookup = (data, opt) => {
-    if (!opt.from || !opt.from()) return data;
-    const fields = opt.fields, key = opt.key, values = opt.values, defaultValue = opt.default, as = opt.as || [ fields ], index = opt.from().reduce((function(map, obj) {
-        return obj[fields] && map.set(obj[fields], obj), map;
+    var _a;
+    const fromData = null === (_a = opt.from) || void 0 === _a ? void 0 : _a.call(opt);
+    if (!fromData) return data;
+    const fields = (option = opt.fields, isFunction(option) ? option() : option);
+    var option;
+    const key = opt.key, values = opt.values, defaultValue = opt.default, as = opt.as || [ fields ], index = fromData.reduce((function(map, obj) {
+        return obj[fields] && map.set(`${obj[fields]}`, obj), map;
     }), new Map);
     let set;
     if (isFunction(opt.set)) set = function(d) {
-        const v = index.get(d[key]);
+        const v = index.get(`${d[key]}`);
         opt.set(d, v);
     }; else if (values) {
         const m = values.length;
         set = function(d) {
-            const v = index.get(d[key]);
+            const v = index.get(`${d[key]}`);
             if (isNil(v)) for (let i = 0; i < m; ++i) d[as[i]] = defaultValue; else for (let i = 0; i < m; ++i) d[as[i]] = v[values[i]];
         };
     } else set = function(d) {
-        const v = index.get(d[key]);
+        const v = index.get(`${d[key]}`);
         d[as[0]] = isValid(v) ? v : defaultValue;
     };
     return 0 === data.length ? [] : data.map((d => (set(d), d)));

package/esm/data/transforms/lookup.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/lookup.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,kBAAkB,CAAC;AAc9D,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAqB,EAAE,GAAe,EAAE,EAAE;IAC/D,IAAI,CAAC,GAAG,CAAC,IAAI,IAAI,CAAC,GAAG,CAAC,IAAI,EAAE,EAAE;QAC5B,OAAO,IAAI,CAAC;KACb;IAED,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,GAAG,GAAG,GAAG,CAAC,GAAG,CAAC;IACpB,MAAM,MAAM,GAAG,GAAG,CAAC,MAAM,CAAC;IAC1B,MAAM,YAAY,GAAG,GAAG,CAAC,OAAO,CAAC;IACjC,MAAM,EAAE,GAAG,GAAG,CAAC,EAAE,IAAI,CAAC,MAAM,CAAC,CAAC;IAC9B,MAAM,KAAK,GAAG,GAAG,CAAC,IAAI,EAAE,CAAC,MAAM,CAAC,UAAU,GAAwB,EAAE,GAAG;QACrE,IAAI,GAAG,CAAC,MAAM,CAAC,EAAE;YACf,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,GAAG,CAAC,CAAC;SAC3B;QACD,OAAO,GAAG,CAAC;IACb,CAAC,EAAE,IAAI,GAAG,EAAkB,CAAC,CAAC;IAE9B,IAAI,GAAqB,CAAC;IAC1B,IAAI,UAAU,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE;QACvB,GAAG,GAAG,UAAU,CAAM;YACpB,MAAM,CAAC,GAAI,KAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,GAAG,CAAC,GAAG,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;QAChB,CAAC,CAAC;KACH;SAAM,IAAI,MAAM,EAAE;QACjB,MAAM,CAAC,GAAG,MAAM,CAAC,MAAM,CAAC;QACxB,GAAG,GAAG,UAAU,CAAM;YACpB,MAAM,CAAC,GAAI,KAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,IAAI,KAAK,CAAC,CAAC,CAAC,EAAE;gBACZ,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;oBAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,YAAY,CAAC;iBACzB;aACF;iBAAM;gBACL,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,EAAE,EAAE,CAAC,EAAE;oBAC1B,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;iBACzB;aACF;QACH,CAAC,CAAC;KACH;SAAM;QACL,GAAG,GAAG,UAAU,CAAM;YACpB,MAAM,CAAC,GAAI,KAA6B,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC;YACrD,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC;QAC3C,CAAC,CAAC;KACH;IAED,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QACrB,OAAO,EAAE,CAAC;KACX;IACD,OAAO,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE;QAClB,GAAG,CAAC,CAAC,CAAC,CAAC;QACP,OAAO,CAAC,CAAC;IACX,CAAC,CAAC,CAAC;AACL,CAAC,CAAC","file":"lookup.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isFunction, isNil, isValid } from '@visactor/vutils';\nimport type { Datum } from '../../typings';\n\nexport interface ILookUpOpt {\n  from: () => object[];\n  key: string;\n  // 暂时不支持Multi-field lookup\n  fields: string;\n  values?: string[];\n  as?: string[];\n  default?: any;\n  set?: (A: Datum, B: Datum) => void;\n}\n\nexport const lookup = (data: Array<DataView>, opt: ILookUpOpt) => {\n  if (!opt.from || !opt.from()) {\n    return data;\n  }\n\n  const fields = opt.fields;\n  const key = opt.key;\n  const values = opt.values;\n  const defaultValue = opt.default;\n  const as = opt.as || [fields];\n  const index = opt.from().reduce(function (map: Map<string, object>, obj) {\n    if (obj[fields]) {\n      map.set(obj[fields], obj);\n    }\n    return map;\n  }, new Map<string, object>());\n\n  let set: (d: any) => void;\n  if (isFunction(opt.set)) {\n    set = function (d: any) {\n      const v = (index as Map<string, object>).get(d[key]);\n      opt.set(d, v);\n    };\n  } else if (values) {\n    const m = values.length;\n    set = function (d: any) {\n      const v = (index as Map<string, object>).get(d[key]);\n      if (isNil(v)) {\n        for (let i = 0; i < m; ++i) {\n          d[as[i]] = defaultValue;\n        }\n      } else {\n        for (let i = 0; i < m; ++i) {\n          d[as[i]] = v[values[i]];\n        }\n      }\n    };\n  } else {\n    set = function (d: any) {\n      const v = (index as Map<string, object>).get(d[key]);\n      d[as[0]] = isValid(v) ? v : defaultValue;\n    };\n  }\n\n  if (data.length === 0) {\n    return [];\n  }\n  return data.map(d => {\n    set(d);\n    return d;\n  });\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/lookup.ts"],"names":[],"mappings":"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","file":"lookup.js","sourcesContent":["import type { DataView } from '@visactor/vdataset';\nimport { isFunction, isNil, isValid } from '@visactor/vutils';\nimport type { Datum } from '../../typings';\n\nexport interface ILookUpOpt {\n  from: () => object[];\n  key: string;\n  // 暂时不支持Multi-field lookup\n  fields: string | (() => string);\n  values?: string[];\n  as?: string[];\n  default?: unknown;\n  set?: (A: Datum, B?: Datum) => void;\n}\n\nconst resolveOptionValue = <T>(option: T | (() => T)) => (isFunction(option) ? option() : option);\n\nexport const lookup = (data: Array<DataView>, opt: ILookUpOpt) => {\n  const fromData = opt.from?.();\n  if (!fromData) {\n    return data;\n  }\n\n  const fields = resolveOptionValue(opt.fields);\n  const key = opt.key;\n  const values = opt.values;\n  const defaultValue = opt.default;\n  const as = opt.as || [fields];\n  const index = (fromData as Array<Record<string, unknown>>).reduce(function (\n    map: Map<string, Record<string, unknown>>,\n    obj\n  ) {\n    if (obj[fields]) {\n      map.set(`${obj[fields]}`, obj);\n    }\n    return map;\n  }, new Map<string, Record<string, unknown>>());\n\n  let set: (d: Record<string, unknown>) => void;\n  if (isFunction(opt.set)) {\n    set = function (d: Record<string, unknown>) {\n      const v = index.get(`${d[key]}`);\n      opt.set(d as Datum, v as Datum);\n    };\n  } else if (values) {\n    const m = values.length;\n    set = function (d: Record<string, unknown>) {\n      const v = index.get(`${d[key]}`);\n      if (isNil(v)) {\n        for (let i = 0; i < m; ++i) {\n          d[as[i]] = defaultValue;\n        }\n      } else {\n        for (let i = 0; i < m; ++i) {\n          d[as[i]] = v[values[i]];\n        }\n      }\n    };\n  } else {\n    set = function (d: Record<string, unknown>) {\n      const v = index.get(`${d[key]}`);\n      d[as[0]] = isValid(v) ? v : defaultValue;\n    };\n  }\n\n  if (data.length === 0) {\n    return [];\n  }\n  return (data as unknown as Array<Record<string, unknown>>).map(d => {\n    set(d);\n    return d;\n  }) as unknown as Array<DataView>;\n};\n"]}

package/esm/data/transforms/map.d.ts

@@ -1,6 +1,12 @@
 import type { GeoSourceType } from '../../typings/geo';
 export interface IMapOpt {
-    nameMap: Record<string, string>;
+    nameMap: Record<string, unknown>;
     nameProperty: string;
 }
-export declare const map: (data: GeoSourceType, opt: IMapOpt) => any;
+type MapFeature = {
+    properties?: Record<string, unknown>;
+    [key: string]: unknown;
+};
+type MapOption = IMapOpt | (() => IMapOpt);
+export declare const map: (data: GeoSourceType, opt: MapOption) => MapFeature[];
+export {};

package/esm/data/transforms/map.js

@@ -1,9 +1,14 @@
 import { DEFAULT_DATA_INDEX, DEFAULT_MAP_LOOK_UP_KEY } from "../../constant/data";
 
-export const map = (data, opt) => (data.features && data.features.forEach(((f, index) => {
-    var _a;
-    f[DEFAULT_DATA_INDEX] = index;
-    const name = null === (_a = f.properties) || void 0 === _a ? void 0 : _a[opt.nameProperty];
-    opt.nameMap && opt.nameMap[name] ? f[DEFAULT_MAP_LOOK_UP_KEY] = opt.nameMap[name] : f[DEFAULT_MAP_LOOK_UP_KEY] = name;
-})), data.features);
+import { isFunction } from "@visactor/vutils";
+
+export const map = (data, opt) => {
+    const options = isFunction(opt) ? opt() : opt, features = data.features;
+    return features && features.forEach(((f, index) => {
+        var _a, _b;
+        f[DEFAULT_DATA_INDEX] = index;
+        const name = null === (_a = f.properties) || void 0 === _a ? void 0 : _a[options.nameProperty], mappedName = null === (_b = options.nameMap) || void 0 === _b ? void 0 : _b[`${name}`];
+        f[DEFAULT_MAP_LOOK_UP_KEY] = mappedName || name;
+    })), features;
+};
 //# sourceMappingURL=map.js.map

package/esm/data/transforms/map.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AASlF,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAmB,EAAE,GAAY,EAAE,EAAE;IACvD,IAAI,IAAI,CAAC,QAAQ,EAAE;QACjB,IAAI,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAM,EAAE,KAAa,EAAE,EAAE;;YAC9C,CAAC,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;YAC9B,MAAM,IAAI,GAAG,MAAA,CAAC,CAAC,UAAU,0CAAG,GAAG,CAAC,YAAY,CAAC,CAAC;YAC9C,IAAI,GAAG,CAAC,OAAO,IAAI,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;gBACpC,CAAC,CAAC,uBAAuB,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAChD;iBAAM;gBACL,CAAC,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC;aACnC;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC,CAAC","file":"map.js","sourcesContent":["import { DEFAULT_DATA_INDEX, DEFAULT_MAP_LOOK_UP_KEY } from '../../constant/data';\nimport { PREFIX } from '../../constant/base';\nimport type { GeoSourceType } from '../../typings/geo';\n\nexport interface IMapOpt {\n  nameMap: Record<string, string>;\n  nameProperty: string;\n}\n\nexport const map = (data: GeoSourceType, opt: IMapOpt) => {\n  if (data.features) {\n    data.features.forEach((f: any, index: number) => {\n      f[DEFAULT_DATA_INDEX] = index;\n      const name = f.properties?.[opt.nameProperty];\n      if (opt.nameMap && opt.nameMap[name]) {\n        f[DEFAULT_MAP_LOOK_UP_KEY] = opt.nameMap[name];\n      } else {\n        f[DEFAULT_MAP_LOOK_UP_KEY] = name;\n      }\n    });\n  }\n  return data.features;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/map.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,kBAAkB,EAAE,uBAAuB,EAAE,MAAM,qBAAqB,CAAC;AAElF,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAa9C,MAAM,CAAC,MAAM,GAAG,GAAG,CAAC,IAAmB,EAAE,GAAc,EAAE,EAAE;IACzD,MAAM,OAAO,GAAG,UAAU,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC,GAAG,CAAC;IAC9C,MAAM,QAAQ,GAAI,IAAoC,CAAC,QAAQ,CAAC;IAChE,IAAI,QAAQ,EAAE;QACZ,QAAQ,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,KAAa,EAAE,EAAE;;YACpC,CAAC,CAAC,kBAAkB,CAAC,GAAG,KAAK,CAAC;YAC9B,MAAM,IAAI,GAAG,MAAA,CAAC,CAAC,UAAU,0CAAG,OAAO,CAAC,YAAY,CAAC,CAAC;YAClD,MAAM,UAAU,GAAG,MAAA,OAAO,CAAC,OAAO,0CAAG,GAAG,IAAI,EAAE,CAAC,CAAC;YAChD,IAAI,UAAU,EAAE;gBACd,CAAC,CAAC,uBAAuB,CAAC,GAAG,UAAU,CAAC;aACzC;iBAAM;gBACL,CAAC,CAAC,uBAAuB,CAAC,GAAG,IAAI,CAAC;aACnC;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC","file":"map.js","sourcesContent":["import { DEFAULT_DATA_INDEX, DEFAULT_MAP_LOOK_UP_KEY } from '../../constant/data';\nimport type { GeoSourceType } from '../../typings/geo';\nimport { isFunction } from '@visactor/vutils';\n\nexport interface IMapOpt {\n  nameMap: Record<string, unknown>;\n  nameProperty: string;\n}\n\ntype MapFeature = {\n  properties?: Record<string, unknown>;\n  [key: string]: unknown;\n};\ntype MapOption = IMapOpt | (() => IMapOpt);\n\nexport const map = (data: GeoSourceType, opt: MapOption) => {\n  const options = isFunction(opt) ? opt() : opt;\n  const features = (data as { features?: MapFeature[] }).features;\n  if (features) {\n    features.forEach((f, index: number) => {\n      f[DEFAULT_DATA_INDEX] = index;\n      const name = f.properties?.[options.nameProperty];\n      const mappedName = options.nameMap?.[`${name}`];\n      if (mappedName) {\n        f[DEFAULT_MAP_LOOK_UP_KEY] = mappedName;\n      } else {\n        f[DEFAULT_MAP_LOOK_UP_KEY] = name;\n      }\n    });\n  }\n  return features;\n};\n"]}

package/esm/data/transforms/sankey.d.ts

@@ -1,4 +1,4 @@
-import type { SankeyOptions, SankeyData } from '@visactor/vlayouts';
+import { type SankeyOptions, type SankeyData } from '@visactor/vlayouts';
 export interface ISankeyOpt extends SankeyOptions {
     targetField: string;
     sourceField: string;
@@ -10,10 +10,18 @@ export interface ISankeyOpt extends SankeyOptions {
         y1: number;
     };
 }
-export declare const collectHierarchyField: (set: Set<any>, data: any[], field: string) => void;
-export declare const sankeyFormat: (data: any[]) => SankeyData[];
-export declare const sankeyLayout: (data: SankeyData[], op: ISankeyOpt) => {
+type SankeyLayoutOption = ISankeyOpt | (() => ISankeyOpt);
+type SankeyFormatDatum = Record<string, unknown> & {
+    id?: 'links' | 'nodes';
+    values?: unknown;
+    latestData?: SankeyData[];
+    children?: SankeyFormatDatum[];
+};
+export declare const collectHierarchyField: <T>(set: Set<T>, data: SankeyFormatDatum[], field: string) => void;
+export declare const sankeyFormat: (data: SankeyFormatDatum[]) => SankeyData[];
+export declare const sankeyLayout: (data: SankeyData[], op: SankeyLayoutOption) => {
     nodes: import("@visactor/vlayouts").SankeyNodeElement[];
     links: import("@visactor/vlayouts").SankeyLinkElement[];
     columns: import("@visactor/vlayouts").SankeyNodeElement[][];
 }[];
+export {};