@visactor/vchart 2.1.0-alpha.4 → 2.1.0-alpha.6

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 {};

package/esm/data/transforms/sankey.js

@@ -1,6 +1,6 @@
 import { SankeyLayout } from "@visactor/vlayouts";
 
-import { isArray, isNil } from "@visactor/vutils";
+import { isArray, isFunction, isNil } from "@visactor/vutils";
 
 export const collectHierarchyField = (set, data, field) => {
     data.forEach((obj => {
@@ -24,19 +24,24 @@ export const sankeyFormat = data => {
 };
 
 export const sankeyLayout = (data, op) => {
-    if (!data || !(null == op ? void 0 : op.view) || !data.length) return [];
-    const view = op.view();
+    const options = isFunction(op) ? op() : op;
+    if (!data || !(null == options ? void 0 : options.view) || !data.length) return [];
+    const view = options.view();
     if (view.x1 - view.x0 == 0 || view.y1 - view.y0 == 0 || view.x1 - view.x0 == -1 / 0 || view.x1 - view.x0 == 1 / 0 || view.y1 - view.y0 == -1 / 0 || view.y1 - view.y0 == 1 / 0) return [];
-    const originalData = data[0];
-    if (("source" !== op.sourceField || "target" !== op.targetField || "value" !== op.valueField) && originalData.links) {
-        const updatedData = [];
-        originalData.links.forEach((datum => {
-            const updatedDatum = {};
-            for (const key in datum) key === op.sourceField ? updatedDatum.source = datum[op.sourceField] : key === op.targetField ? updatedDatum.target = datum[op.targetField] : key === op.valueField ? updatedDatum.value = datum[op.valueField] : updatedDatum[key] = datum[key];
-            updatedData.push(updatedDatum);
-        })), originalData.links = updatedData;
-    }
-    const layout = new SankeyLayout(op), result = [];
-    return result.push(layout.layout(originalData, view)), result;
+    const originalData = data[0], layoutData = normalizeSankeyData(originalData, options), layout = new SankeyLayout(options), result = [];
+    return result.push(layout.layout(layoutData, view)), result;
+};
+
+const normalizeSankeyData = (data, options) => {
+    if ("source" === options.sourceField && "target" === options.targetField && "value" === options.valueField) return data;
+    const links = data.links;
+    return links ? Object.assign(Object.assign({}, data), {
+        links: links.map((link => {
+            const updatedLink = {};
+            return Object.keys(link).forEach((key => {
+                key === options.sourceField ? updatedLink.source = link[options.sourceField] : key === options.targetField ? updatedLink.target = link[options.targetField] : key === options.valueField ? updatedLink.value = link[options.valueField] : updatedLink[key] = link[key];
+            })), updatedLink;
+        }))
+    }) : data;
 };
 //# sourceMappingURL=sankey.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/sankey.ts"],"names":[],"mappings":"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","file":"sankey.js","sourcesContent":["import type { SankeyOptions, SankeyData } from '@visactor/vlayouts';\nimport { SankeyLayout } from '@visactor/vlayouts';\nimport { isArray, isNil } from '@visactor/vutils';\n\nexport interface ISankeyOpt extends SankeyOptions {\n  targetField: string;\n  sourceField: string;\n  valueField: string;\n  view: () => { x0: number; x1: number; y0: number; y1: number };\n}\n\nexport const collectHierarchyField = (set: Set<any>, data: any[], field: string) => {\n  data.forEach((obj: any) => {\n    if (!isNil(obj[field])) {\n      set.add(obj[field]);\n    }\n\n    if (obj.children && obj.children.length > 0) {\n      collectHierarchyField(set, obj.children, field); // 递归处理子节点\n    }\n  });\n};\n\nexport const sankeyFormat = (data: any[]): SankeyData[] => {\n  if (!data || !isArray(data)) {\n    return [] as SankeyData[];\n  }\n\n  if (data.length > 1) {\n    /**\n     * data structure for Fengshen:\n     * [{id:’nodes’, values:[xxx]},{id:’links’, values:[xxx]}]\n     */\n    const updateData: SankeyData = {\n      links: [],\n      nodes: []\n    };\n    data.forEach((datum: any) => {\n      if (datum.id === 'links' || datum.id === 'nodes') {\n        updateData[datum.id] = datum.values;\n      }\n    });\n    return [updateData];\n  }\n  /**\n   * data structure:\n   * [{nodes: [xxx], links: [xxx]}]\n   */\n  if (data[0]?.latestData) {\n    return data[0].latestData;\n  }\n  return data;\n};\n\nexport const sankeyLayout = (data: SankeyData[], op: ISankeyOpt) => {\n  if (!data || !op?.view || !data.length) {\n    return [];\n  }\n\n  const view = op.view();\n\n  if (\n    view.x1 - view.x0 === 0 ||\n    view.y1 - view.y0 === 0 ||\n    view.x1 - view.x0 === -Infinity ||\n    view.x1 - view.x0 === Infinity ||\n    view.y1 - view.y0 === -Infinity ||\n    view.y1 - view.y0 === Infinity\n  ) {\n    return [];\n  }\n\n  const originalData = data[0];\n\n  if (op.sourceField !== 'source' || op.targetField !== 'target' || op.valueField !== 'value') {\n    if ((originalData as any).links) {\n      const updatedData: {}[] = [];\n\n      (originalData as any).links.forEach((datum: any) => {\n        const updatedDatum: any = {};\n        for (const key in datum) {\n          if (key === op.sourceField) {\n            updatedDatum.source = datum[op.sourceField];\n          } else if (key === op.targetField) {\n            updatedDatum.target = datum[op.targetField];\n          } else if (key === op.valueField) {\n            updatedDatum.value = datum[op.valueField];\n          } else {\n            updatedDatum[key] = datum[key];\n          }\n        }\n        updatedData.push(updatedDatum);\n      });\n      (originalData as any).links = updatedData;\n    }\n  }\n\n  const layout = new SankeyLayout(op);\n\n  const result = [];\n\n  result.push(layout.layout(originalData, view));\n\n  return result;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/sankey.ts"],"names":[],"mappings":"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","file":"sankey.js","sourcesContent":["import { SankeyLayout, type SankeyOptions, type SankeyData } from '@visactor/vlayouts';\nimport { isArray, isFunction, isNil } from '@visactor/vutils';\n\nexport interface ISankeyOpt extends SankeyOptions {\n  targetField: string;\n  sourceField: string;\n  valueField: string;\n  view: () => { x0: number; x1: number; y0: number; y1: number };\n}\n\ntype SankeyLayoutOption = ISankeyOpt | (() => ISankeyOpt);\ntype SankeyFormatDatum = Record<string, unknown> & {\n  id?: 'links' | 'nodes';\n  values?: unknown;\n  latestData?: SankeyData[];\n  children?: SankeyFormatDatum[];\n};\n\nexport const collectHierarchyField = <T>(set: Set<T>, data: SankeyFormatDatum[], field: string) => {\n  data.forEach(obj => {\n    if (!isNil(obj[field])) {\n      set.add(obj[field] as T);\n    }\n\n    if (obj.children && obj.children.length > 0) {\n      collectHierarchyField(set, obj.children, field); // 递归处理子节点\n    }\n  });\n};\n\nexport const sankeyFormat = (data: SankeyFormatDatum[]): SankeyData[] => {\n  if (!data || !isArray(data)) {\n    return [] as SankeyData[];\n  }\n\n  if (data.length > 1) {\n    /**\n     * data structure for Fengshen:\n     * [{id:’nodes’, values:[xxx]},{id:’links’, values:[xxx]}]\n     */\n    const updateData: SankeyData = {\n      links: [],\n      nodes: []\n    };\n    data.forEach(datum => {\n      if (datum.id === 'links' || datum.id === 'nodes') {\n        (updateData as Record<string, unknown>)[datum.id] = datum.values;\n      }\n    });\n    return [updateData];\n  }\n  /**\n   * data structure:\n   * [{nodes: [xxx], links: [xxx]}]\n   */\n  if (data[0]?.latestData) {\n    return data[0].latestData;\n  }\n  return data as unknown as SankeyData[];\n};\n\nexport const sankeyLayout = (data: SankeyData[], op: SankeyLayoutOption) => {\n  const options = isFunction(op) ? op() : op;\n  if (!data || !options?.view || !data.length) {\n    return [];\n  }\n\n  const view = options.view();\n\n  if (\n    view.x1 - view.x0 === 0 ||\n    view.y1 - view.y0 === 0 ||\n    view.x1 - view.x0 === -Infinity ||\n    view.x1 - view.x0 === Infinity ||\n    view.y1 - view.y0 === -Infinity ||\n    view.y1 - view.y0 === Infinity\n  ) {\n    return [];\n  }\n\n  const originalData = data[0];\n  const layoutData = normalizeSankeyData(originalData, options);\n\n  const layout = new SankeyLayout(options);\n\n  const result = [];\n\n  result.push(layout.layout(layoutData, view));\n\n  return result;\n};\n\nconst normalizeSankeyData = (data: SankeyData, options: ISankeyOpt): SankeyData => {\n  if (\n    options.sourceField === 'source' &&\n    options.targetField === 'target' &&\n    options.valueField === 'value'\n  ) {\n    return data;\n  }\n\n  const links = (data as { links?: Array<Record<string, unknown>> }).links;\n  if (!links) {\n    return data;\n  }\n\n  return {\n    ...data,\n    links: links.map(link => {\n      const updatedLink: Record<string, unknown> = {};\n      Object.keys(link).forEach(key => {\n        if (key === options.sourceField) {\n          updatedLink.source = link[options.sourceField];\n        } else if (key === options.targetField) {\n          updatedLink.target = link[options.targetField];\n        } else if (key === options.valueField) {\n          updatedLink.value = link[options.valueField];\n        } else {\n          updatedLink[key] = link[key];\n        }\n      });\n      return updatedLink;\n    })\n  } as unknown as SankeyData;\n};\n"]}

package/esm/data/transforms/stack-split.d.ts

@@ -3,4 +3,5 @@ import type { DataView } from '@visactor/vdataset';
 export interface IStackOption {
     fields: string[];
 }
-export declare const stackSplit: (data: Array<DataView>, op: IStackOption) => ISeriesStackDataNode;
+export type StackOption = IStackOption | (() => IStackOption);
+export declare const stackSplit: (data: Array<DataView>, op: StackOption) => ISeriesStackDataNode;

package/esm/data/transforms/stack-split.js

@@ -1,9 +1,9 @@
-import { isNil } from "@visactor/vutils";
+import { isFunction, isNil } from "@visactor/vutils";
 
 export const stackSplit = (data, op) => {
     const result = {
         nodes: {}
-    }, {fields: fields} = op;
+    }, {fields: fields} = isFunction(op) ? op() : op;
     if (!(null == fields ? void 0 : fields.length)) return result;
     const lastFieldIndex = fields.length - 1;
     let nextNode, leaf, temp = result;

package/esm/data/transforms/stack-split.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/stack-split.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAQzC,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAqB,EAAE,EAAgB,EAAE,EAAE;IACpE,MAAM,MAAM,GAAqB;QAC/B,KAAK,EAAE,EAAE;KACV,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC;IACtB,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,EAAE;QACnB,OAAO,MAAM,CAAC;KACf;IACD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,GAAyB,MAAM,CAAC;IACxC,IAAI,QAA8B,CAAC;IACnC,IAAI,IAA0B,CAAC;IAC/B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAChB,EAAE,CAAC,UAAU;YACX,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAQ,EAAE,EAAE;gBACjC,IAAI,GAAG,MAAM,CAAC;gBACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACtC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;oBACpB,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAChB,IAAI,KAAK,CAAC,EAAE,CAAC,EAAE;wBACb,MAAM;qBACP;oBACD,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;oBACpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;wBACnB,IAAI,CAAC,KAAK,cAAc,EAAE;4BACxB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;yBACjC;6BAAM;4BACL,QAAQ,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;4BACzB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;yBAC3B;qBACF;oBACD,IAAI,CAAC,KAAK,cAAc,EAAE;wBACxB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAyB,CAAC;wBAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;qBACrB;yBAAM;wBACL,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAyB,CAAC;qBAC/C;iBACF;YACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC","file":"stack-split.js","sourcesContent":["import type { ISeriesStackData, ISeriesStackDataLeaf, ISeriesStackDataNode } from '../../series/interface';\nimport { isNil } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { Datum } from '../../typings';\n\nexport interface IStackOption {\n  fields: string[];\n}\n\nexport const stackSplit = (data: Array<DataView>, op: IStackOption) => {\n  const result: ISeriesStackData = {\n    nodes: {}\n  };\n  const { fields } = op;\n  if (!fields?.length) {\n    return result;\n  }\n  const lastFieldIndex = fields.length - 1;\n  let temp: ISeriesStackDataNode = result;\n  let nextNode: ISeriesStackDataNode;\n  let leaf: ISeriesStackDataLeaf;\n  data.forEach(dv => {\n    dv.latestData &&\n      dv.latestData.forEach((d: Datum) => {\n        temp = result;\n        for (let i = 0; i < fields.length; i++) {\n          const f = fields[i];\n          const fV = d[f];\n          if (isNil(fV)) {\n            break;\n          }\n          temp.groupField = f;\n          if (!temp.nodes[fV]) {\n            if (i === lastFieldIndex) {\n              temp.nodes[fV] = { values: [] };\n            } else {\n              nextNode = { nodes: {} };\n              temp.nodes[fV] = nextNode;\n            }\n          }\n          if (i === lastFieldIndex) {\n            leaf = temp.nodes[fV] as ISeriesStackDataLeaf;\n            leaf.values.push(d);\n          } else {\n            temp = temp.nodes[fV] as ISeriesStackDataNode;\n          }\n        }\n      });\n  });\n  return result;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/stack-split.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,KAAK,EAAE,MAAM,kBAAkB,CAAC;AAUrD,MAAM,CAAC,MAAM,UAAU,GAAG,CAAC,IAAqB,EAAE,EAAe,EAAE,EAAE;IACnE,MAAM,MAAM,GAAqB;QAC/B,KAAK,EAAE,EAAE;KACV,CAAC;IACF,MAAM,EAAE,MAAM,EAAE,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC9C,IAAI,CAAC,CAAA,MAAM,aAAN,MAAM,uBAAN,MAAM,CAAE,MAAM,CAAA,EAAE;QACnB,OAAO,MAAM,CAAC;KACf;IACD,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;IACzC,IAAI,IAAI,GAAyB,MAAM,CAAC;IACxC,IAAI,QAA8B,CAAC;IACnC,IAAI,IAA0B,CAAC;IAC/B,IAAI,CAAC,OAAO,CAAC,EAAE,CAAC,EAAE;QAChB,EAAE,CAAC,UAAU;YACX,EAAE,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,CAAQ,EAAE,EAAE;gBACjC,IAAI,GAAG,MAAM,CAAC;gBACd,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,MAAM,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;oBACtC,MAAM,CAAC,GAAG,MAAM,CAAC,CAAC,CAAC,CAAC;oBACpB,MAAM,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;oBAChB,IAAI,KAAK,CAAC,EAAE,CAAC,EAAE;wBACb,MAAM;qBACP;oBACD,IAAI,CAAC,UAAU,GAAG,CAAC,CAAC;oBACpB,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,EAAE;wBACnB,IAAI,CAAC,KAAK,cAAc,EAAE;4BACxB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC;yBACjC;6BAAM;4BACL,QAAQ,GAAG,EAAE,KAAK,EAAE,EAAE,EAAE,CAAC;4BACzB,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC;yBAC3B;qBACF;oBACD,IAAI,CAAC,KAAK,cAAc,EAAE;wBACxB,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAyB,CAAC;wBAC9C,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;qBACrB;yBAAM;wBACL,IAAI,GAAG,IAAI,CAAC,KAAK,CAAC,EAAE,CAAyB,CAAC;qBAC/C;iBACF;YACH,CAAC,CAAC,CAAC;IACP,CAAC,CAAC,CAAC;IACH,OAAO,MAAM,CAAC;AAChB,CAAC,CAAC","file":"stack-split.js","sourcesContent":["import type { ISeriesStackData, ISeriesStackDataLeaf, ISeriesStackDataNode } from '../../series/interface';\nimport { isFunction, isNil } from '@visactor/vutils';\nimport type { DataView } from '@visactor/vdataset';\nimport type { Datum } from '../../typings';\n\nexport interface IStackOption {\n  fields: string[];\n}\n\nexport type StackOption = IStackOption | (() => IStackOption);\n\nexport const stackSplit = (data: Array<DataView>, op: StackOption) => {\n  const result: ISeriesStackData = {\n    nodes: {}\n  };\n  const { fields } = isFunction(op) ? op() : op;\n  if (!fields?.length) {\n    return result;\n  }\n  const lastFieldIndex = fields.length - 1;\n  let temp: ISeriesStackDataNode = result;\n  let nextNode: ISeriesStackDataNode;\n  let leaf: ISeriesStackDataLeaf;\n  data.forEach(dv => {\n    dv.latestData &&\n      dv.latestData.forEach((d: Datum) => {\n        temp = result;\n        for (let i = 0; i < fields.length; i++) {\n          const f = fields[i];\n          const fV = d[f];\n          if (isNil(fV)) {\n            break;\n          }\n          temp.groupField = f;\n          if (!temp.nodes[fV]) {\n            if (i === lastFieldIndex) {\n              temp.nodes[fV] = { values: [] };\n            } else {\n              nextNode = { nodes: {} };\n              temp.nodes[fV] = nextNode;\n            }\n          }\n          if (i === lastFieldIndex) {\n            leaf = temp.nodes[fV] as ISeriesStackDataLeaf;\n            leaf.values.push(d);\n          } else {\n            temp = temp.nodes[fV] as ISeriesStackDataNode;\n          }\n        }\n      });\n  });\n  return result;\n};\n"]}

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

@@ -1,5 +1,5 @@
-import type { TreemapNodeElement, TreemapOptions } from '@visactor/vlayouts';
-export declare const treemapLayout: (data: Array<any>, op: TreemapOptions & {
+import { type TreemapNodeElement, type TreemapOptions } from '@visactor/vlayouts';
+interface ITreemapLayoutOptions extends TreemapOptions {
     getViewBox: () => {
         x0: number;
         x1: number;
@@ -7,4 +7,6 @@ export declare const treemapLayout: (data: Array<any>, op: TreemapOptions & {
         y1: number;
     };
     nameField: string;
-}) => TreemapNodeElement[];
+}
+export declare const treemapLayout: (data: Array<Record<string, unknown>>, op: ITreemapLayoutOptions | (() => ITreemapLayoutOptions)) => TreemapNodeElement[];
+export {};

package/esm/data/transforms/treemap.js

@@ -1,15 +1,18 @@
 import { flattenNodes, TreemapLayout } from "@visactor/vlayouts";
 
+import { isFunction } from "@visactor/vutils";
+
 import { DEFAULT_HIERARCHY_ROOT } from "../../constant/hierarchy";
 
 export const treemapLayout = (data, op) => {
-    if (op.getViewBox()) {
-        const res = new TreemapLayout(op).layout(data, op.getViewBox()), nodes = [];
+    const options = isFunction(op) ? op() : op, viewBox = options.getViewBox();
+    if (viewBox) {
+        const res = new TreemapLayout(options).layout(data, viewBox), nodes = [];
         return flattenNodes(res, nodes, {
-            maxDepth: null == op ? void 0 : op.maxDepth
-        }), nodes.forEach(((datum, i) => {
+            maxDepth: null == options ? void 0 : options.maxDepth
+        }), nodes.forEach((datum => {
             datum && [ DEFAULT_HIERARCHY_ROOT, "name" ].forEach((key => {
-                datum[key] = datum.datum[datum.depth][op.nameField];
+                datum[key] = datum.datum[datum.depth][options.nameField];
             }));
         })), nodes;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/treemap.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACjE,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAElE,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,IAAgB,EAChB,EAQC,EACD,EAAE;IACF,MAAM,OAAO,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC;IAEhC,IAAI,OAAO,EAAE;QACX,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,EAAE,CAAC,CAAC;QACrC,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,EAAE,CAAC,UAAU,EAAE,CAAC,CAAC;QAEjD,MAAM,KAAK,GAAyB,EAAE,CAAC;QACvC,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,EAAE,aAAF,EAAE,uBAAF,EAAE,CAAE,QAAQ,EAAE,CAAC,CAAC;QAErD,KAAK,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,CAAC,EAAE,EAAE;YACzB,IAAI,KAAK,EAAE;gBACT,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBAC5C,KAAa,CAAC,GAAG,CAAC,GAAI,KAAa,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,EAAE,CAAC,SAAS,CAAC,CAAC;gBACxE,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;KACd;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC","file":"treemap.js","sourcesContent":["import type { TreemapNodeElement, TreemapOptions } from '@visactor/vlayouts';\nimport { flattenNodes, TreemapLayout } from '@visactor/vlayouts';\nimport { DEFAULT_HIERARCHY_ROOT } from '../../constant/hierarchy';\n\nexport const treemapLayout = (\n  data: Array<any>,\n  op: TreemapOptions & {\n    getViewBox: () => {\n      x0: number;\n      x1: number;\n      y0: number;\n      y1: number;\n    };\n    nameField: string;\n  }\n) => {\n  const viewBox = op.getViewBox();\n\n  if (viewBox) {\n    const layout = new TreemapLayout(op);\n    const res = layout.layout(data, op.getViewBox());\n\n    const nodes: TreemapNodeElement[] = [];\n    flattenNodes(res, nodes, { maxDepth: op?.maxDepth });\n\n    nodes.forEach((datum, i) => {\n      if (datum) {\n        [DEFAULT_HIERARCHY_ROOT, 'name'].forEach(key => {\n          (datum as any)[key] = (datum as any).datum[datum.depth][op.nameField];\n        });\n      }\n    });\n\n    return nodes;\n  }\n\n  return [];\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/treemap.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,YAAY,EAAE,aAAa,EAAgD,MAAM,oBAAoB,CAAC;AAC/G,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,sBAAsB,EAAE,MAAM,0BAA0B,CAAC;AAYlE,MAAM,CAAC,MAAM,aAAa,GAAG,CAC3B,IAAoC,EACpC,EAAyD,EACzD,EAAE;IACF,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAErC,IAAI,OAAO,EAAE;QACX,MAAM,MAAM,GAAG,IAAI,aAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,KAAK,GAAyB,EAAE,CAAC;QACvC,YAAY,CAAC,GAAG,EAAE,KAAK,EAAE,EAAE,QAAQ,EAAE,OAAO,aAAP,OAAO,uBAAP,OAAO,CAAE,QAAQ,EAAE,CAAC,CAAC;QAE1D,KAAK,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE;YACpB,IAAI,KAAK,EAAE;gBACT,CAAC,sBAAsB,EAAE,MAAM,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;oBAC5C,KAA4C,CAAC,GAAG,CAAC,GAAG,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;gBACnG,CAAC,CAAC,CAAC;aACJ;QACH,CAAC,CAAC,CAAC;QAEH,OAAO,KAAK,CAAC;KACd;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC","file":"treemap.js","sourcesContent":["import { flattenNodes, TreemapLayout, type TreemapNodeElement, type TreemapOptions } from '@visactor/vlayouts';\nimport { isFunction } from '@visactor/vutils';\nimport { DEFAULT_HIERARCHY_ROOT } from '../../constant/hierarchy';\n\ninterface ITreemapLayoutOptions extends TreemapOptions {\n  getViewBox: () => {\n    x0: number;\n    x1: number;\n    y0: number;\n    y1: number;\n  };\n  nameField: string;\n}\n\nexport const treemapLayout = (\n  data: Array<Record<string, unknown>>,\n  op: ITreemapLayoutOptions | (() => ITreemapLayoutOptions)\n) => {\n  const options = isFunction(op) ? op() : op;\n  const viewBox = options.getViewBox();\n\n  if (viewBox) {\n    const layout = new TreemapLayout(options);\n    const res = layout.layout(data, viewBox);\n\n    const nodes: TreemapNodeElement[] = [];\n    flattenNodes(res, nodes, { maxDepth: options?.maxDepth });\n\n    nodes.forEach(datum => {\n      if (datum) {\n        [DEFAULT_HIERARCHY_ROOT, 'name'].forEach(key => {\n          (datum as unknown as Record<string, unknown>)[key] = datum.datum[datum.depth][options.nameField];\n        });\n      }\n    });\n\n    return nodes;\n  }\n\n  return [];\n};\n"]}

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

@@ -1,4 +1,4 @@
-export declare const vennLayout: (data: Array<any>, op: {
+interface IVennLayoutOptions {
     setField: string;
     valueField: string;
     getViewBox: () => {
@@ -7,4 +7,6 @@ export declare const vennLayout: (data: Array<any>, op: {
         y0: number;
         y1: number;
     };
-}) => (import("@visactor/vlayouts").IVennCircleDatum<any> | import("@visactor/vlayouts").IVennOverlapDatum<any>)[];
+}
+export declare const vennLayout: (data: Array<Record<string, unknown>>, op: IVennLayoutOptions | (() => IVennLayoutOptions)) => (import("@visactor/vlayouts").IVennCircleDatum<any> | import("@visactor/vlayouts").IVennOverlapDatum<any>)[];
+export {};

package/esm/data/transforms/venn.js

@@ -1,10 +1,12 @@
 import { vennTransform } from "@visactor/vlayouts";
 
+import { isFunction } from "@visactor/vutils";
+
 export const vennLayout = (data, op) => {
-    const viewBox = op.getViewBox();
+    const options = isFunction(op) ? op() : op, viewBox = options.getViewBox();
     return viewBox && (null == data ? void 0 : data.length) ? vennTransform(Object.assign({
-        setField: op.setField,
-        valueField: op.valueField
+        setField: options.setField,
+        valueField: options.valueField
     }, viewBox), data) : [];
 };
 //# sourceMappingURL=venn.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/venn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,IAAgB,EAChB,EASC,EACD,EAAE;IACF,MAAM,OAAO,GAAG,EAAE,CAAC,UAAU,EAAE,CAAC;IAEhC,IAAI,OAAO,KAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA,EAAE;QAC3B,OAAO,aAAa,iBAEhB,QAAQ,EAAE,EAAE,CAAC,QAAQ,EACrB,UAAU,EAAE,EAAE,CAAC,UAAU,IACtB,OAAO,GAEZ,IAAI,CACL,CAAC;KACH;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC","file":"venn.js","sourcesContent":["import { vennTransform } from '@visactor/vlayouts';\n\nexport const vennLayout = (\n  data: Array<any>,\n  op: {\n    setField: string;\n    valueField: string;\n    getViewBox: () => {\n      x0: number;\n      x1: number;\n      y0: number;\n      y1: number;\n    };\n  }\n) => {\n  const viewBox = op.getViewBox();\n\n  if (viewBox && data?.length) {\n    return vennTransform(\n      {\n        setField: op.setField,\n        valueField: op.valueField,\n        ...viewBox\n      },\n      data\n    );\n  }\n\n  return [];\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/venn.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAa9C,MAAM,CAAC,MAAM,UAAU,GAAG,CACxB,IAAoC,EACpC,EAAmD,EACnD,EAAE;IACF,MAAM,OAAO,GAAG,UAAU,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,CAAC;IAC3C,MAAM,OAAO,GAAG,OAAO,CAAC,UAAU,EAAE,CAAC;IAErC,IAAI,OAAO,KAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,MAAM,CAAA,EAAE;QAC3B,OAAO,aAAa,iBAEhB,QAAQ,EAAE,OAAO,CAAC,QAAQ,EAC1B,UAAU,EAAE,OAAO,CAAC,UAAU,IAC3B,OAAO,GAEZ,IAAI,CACL,CAAC;KACH;IAED,OAAO,EAAE,CAAC;AACZ,CAAC,CAAC","file":"venn.js","sourcesContent":["import { vennTransform } from '@visactor/vlayouts';\nimport { isFunction } from '@visactor/vutils';\n\ninterface IVennLayoutOptions {\n  setField: string;\n  valueField: string;\n  getViewBox: () => {\n    x0: number;\n    x1: number;\n    y0: number;\n    y1: number;\n  };\n}\n\nexport const vennLayout = (\n  data: Array<Record<string, unknown>>,\n  op: IVennLayoutOptions | (() => IVennLayoutOptions)\n) => {\n  const options = isFunction(op) ? op() : op;\n  const viewBox = options.getViewBox();\n\n  if (viewBox && data?.length) {\n    return vennTransform(\n      {\n        setField: options.setField,\n        valueField: options.valueField,\n        ...viewBox\n      },\n      data\n    );\n  }\n\n  return [];\n};\n"]}

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

@@ -17,7 +17,8 @@ export interface IWaterfallOpt {
     stackInverse: boolean;
     groupData: () => DataView;
 }
-export declare const waterfall: (lastData: Array<Datum>, op: IWaterfallOpt) => Datum[];
+export type WaterfallOption = IWaterfallOpt | (() => IWaterfallOpt);
+export declare const waterfall: (lastData: Array<Datum>, op: WaterfallOption) => Datum[];
 export interface IWaterfallFillEndOpt {
     indexField: string;
     valueField: string;
@@ -25,4 +26,5 @@ export interface IWaterfallFillEndOpt {
     total: IWaterfallSeriesSpec['total'];
     calculationMode: IWaterfallSeriesSpec['calculationMode'];
 }
-export declare const waterfallFillTotal: (data: Array<Datum>, op: IWaterfallFillEndOpt) => Datum[];
+export type WaterfallFillEndOption = IWaterfallFillEndOpt | (() => IWaterfallFillEndOpt);
+export declare const waterfallFillTotal: (data: Array<Datum>, op: WaterfallFillEndOption) => Datum[];

package/esm/data/transforms/waterfall.js

@@ -1,4 +1,4 @@
-import { isNil, precisionAdd, precisionSub } from "@visactor/vutils";
+import { isFunction, isNil, precisionAdd, precisionSub } from "@visactor/vutils";
 
 import { WaterfallDefaultSeriesField } from "../../constant/waterfall";
 
@@ -8,7 +8,7 @@ import { STACK_FIELD_TOTAL_TOP } from "../../constant/data";
 
 export const waterfall = (lastData, op) => {
     if (!lastData || 0 === lastData.length) return lastData;
-    const {indexField: indexField, total: totalSpec, groupData: groupData, calculationMode: calculationMode} = op, totalData = [], {dimensionValues: dimensionValues, dimensionData: dimensionData} = groupData().latestData;
+    const options = isFunction(op) ? op() : op, {indexField: indexField, total: totalSpec, groupData: groupData, calculationMode: calculationMode} = options, totalData = [], {dimensionValues: dimensionValues, dimensionData: dimensionData} = groupData().latestData;
     let indexValues = Array.from(dimensionValues[indexField]);
     "decrease" === calculationMode && (indexValues = indexValues.reverse());
     let temp = {
@@ -28,7 +28,7 @@ export const waterfall = (lastData, op) => {
             isTotal: !1,
             positive: temp.end,
             negative: temp.end
-        }, indexData = !0 === op.stackInverse ? dimensionData[key].reverse() : dimensionData[key];
+        }, indexData = !0 === options.stackInverse ? dimensionData[key].reverse() : dimensionData[key];
         if (null == indexData || indexData.forEach(((d, i) => {
             i === indexData.length - 1 ? d[STACK_FIELD_TOTAL_TOP] = !0 : delete d[STACK_FIELD_TOTAL_TOP];
         })), indexData.length > 1) {
@@ -40,10 +40,10 @@ export const waterfall = (lastData, op) => {
                 } else if (index === indexValues.length - 1) return !0;
                 return !1;
             };
-            if (indexData.some((d => isTotalCheck(d)))) return temp = computeTotalWithMultipleData(indexData, key, total, totalData, temp, indexValues, index, op, isTotalCheck), 
+            if (indexData.some((d => isTotalCheck(d)))) return temp = computeTotalWithMultipleData(indexData, key, total, totalData, temp, indexValues, index, options, isTotalCheck), 
             void totalData.push(total);
         }
-        temp = computeNormalData(indexData, key, total, totalData, temp, indexValues, index, op), 
+        temp = computeNormalData(indexData, key, total, totalData, temp, indexValues, index, options), 
         totalData.push(total);
     })), totalData;
 };
@@ -156,11 +156,10 @@ function getTotalInField(d, total, totalSpec) {
 
 export const waterfallFillTotal = (data, op) => {
     if (!data) return data;
-    const {indexField: indexField, valueField: valueField, total: total, seriesField: seriesField, calculationMode: calculationMode} = op, totalData = {
+    const {indexField: indexField, valueField: valueField, total: total, seriesField: seriesField, calculationMode: calculationMode} = isFunction(op) ? op() : op, totalData = {
         [indexField]: (null == total ? void 0 : total.text) || "total",
         [valueField]: data.reduce(((pre, cur) => precisionAdd(pre, +cur[valueField])), 0)
     };
-    return seriesField && (totalData[seriesField] = "total"), "decrease" === calculationMode ? data.unshift(totalData) : data.push(totalData), 
-    data;
+    return seriesField && (totalData[seriesField] = "total"), "decrease" === calculationMode ? [ totalData, ...data ] : [ ...data, totalData ];
 };
 //# sourceMappingURL=waterfall.js.map

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/waterfall.ts"],"names":[],"mappings":"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","file":"waterfall.js","sourcesContent":["import { isNil, precisionAdd, precisionSub } from '@visactor/vutils';\n\nimport type { DataView } from '@visactor/vdataset';\nimport type {\n  IWaterfallSeriesSpec,\n  IWaterfallTotalCustom,\n  IWaterfallTotalField\n} from '../../series/waterfall/interface';\nimport type { Datum } from '../../typings';\nimport { WaterfallDefaultSeriesField } from '../../constant/waterfall';\nimport { warn } from '../../util/debug';\nimport { STACK_FIELD_TOTAL_TOP } from '../../constant/data';\n\ntype TotalInfo = {\n  start: number;\n  end: number;\n  lastIndex: string;\n  lastEnd: number;\n  index: string;\n  isTotal: boolean;\n  positive: number;\n  negative: number;\n};\n\nexport interface IWaterfallOpt {\n  indexField: string;\n  valueField: string;\n  seriesField?: string;\n  startAs: string;\n  endAs: string;\n  total: IWaterfallSeriesSpec['total'];\n  calculationMode: 'increase' | 'decrease';\n\n  seriesFieldName: {\n    total: string;\n    increase: string;\n    decrease: string;\n  };\n  stackInverse: boolean;\n  groupData: () => DataView;\n}\n\nexport const waterfall = (lastData: Array<Datum>, op: IWaterfallOpt) => {\n  if (!lastData || lastData.length === 0) {\n    return lastData;\n  }\n  const { indexField, total: totalSpec, groupData, calculationMode } = op;\n  const totalData: {\n    start: number;\n    end: number;\n    lastIndex: string;\n    lastEnd: number;\n    index: string;\n    isTotal: boolean;\n    positive: number;\n    negative: number;\n  }[] = [];\n  const { dimensionValues, dimensionData } = groupData().latestData as {\n    dimensionValues: { [key in string]: Set<string> };\n    dimensionData: { [key in string]: Datum[] };\n  };\n  let indexValues = Array.from(dimensionValues[indexField]);\n  if (calculationMode === 'decrease') {\n    indexValues = indexValues.reverse();\n  }\n  // 上一次的计算结果\n  let temp: { start: number; end: number; lastIndex: string; positive: number; negative: number } = {\n    start: 0,\n    end: 0,\n    positive: 0,\n    negative: 0,\n    lastIndex: null\n  };\n  indexValues.forEach((key, index) => {\n    const total = {\n      start: temp.end,\n      end: temp.end,\n      lastIndex: temp.lastIndex,\n      lastEnd: temp.end,\n      index: key,\n      isTotal: false,\n      positive: temp.end,\n      negative: temp.end\n    };\n\n    const indexData = op.stackInverse === true ? dimensionData[key].reverse() : dimensionData[key];\n    indexData?.forEach((d, i) => {\n      if (i === indexData.length - 1) {\n        d[STACK_FIELD_TOTAL_TOP] = true;\n      } else {\n        delete d[STACK_FIELD_TOTAL_TOP];\n      }\n    });\n    // 1.9.5 新增能力\n    // 当前 key 对应的数据中有一个总计数据，并且还有其他的分组数据时。总计的计算逻辑需要将总计值拆分\n    if (indexData.length > 1) {\n      const isTotalCheck = (d: Datum) => {\n        if (!totalSpec || totalSpec.type === 'end') {\n          if (index === indexValues.length - 1) {\n            return true;\n          }\n        } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n          const tag = d[totalSpec.tagField];\n          return !!tag;\n        }\n        return false;\n      };\n      const isTotalTag = indexData.some(d => isTotalCheck(d));\n      if (isTotalTag) {\n        temp = computeTotalWithMultipleData(\n          indexData,\n          key,\n          total,\n          totalData,\n          temp,\n          indexValues,\n          index,\n          op,\n          isTotalCheck\n        );\n        totalData.push(total);\n        return;\n      }\n    }\n    temp = computeNormalData(indexData, key, total, totalData, temp, indexValues, index, op);\n    totalData.push(total);\n  });\n  return totalData;\n};\n\nfunction computeTotalWithMultipleData(\n  indexData: Datum[],\n  key: string,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string; positive: number; negative: number },\n  indexValues: string[],\n  index: number,\n  op: IWaterfallOpt,\n  isTotalCheck: (d: Datum) => boolean\n) {\n  total.isTotal = true;\n  const { valueField, startAs, endAs, total: totalSpec } = op;\n  // 先将数据分为总计数据与常规数据\n  const _normalTemp: Datum[] = [];\n  const _totalTemp: Datum[] = [];\n  // 将总计数据与常规数据进行分离\n  indexData.forEach((d, index) => {\n    if (isTotalCheck(d)) {\n      // 总计数据后续要重新按照顺序计算 start end 信息，所以需要记录下当前的 index\n      _totalTemp.push({ ...d, [`_vchart_waterfall_waterfall_temp`]: index });\n    } else {\n      _normalTemp.push(d);\n    }\n  });\n  // 1. 不可能全都不是总计数据\n  // 2. 如果全都是总计数据，让它们都是同一个值\n  if (_totalTemp.length === indexData.length) {\n    const result = computeNormalData([indexData[0]], key, total, totalData, temp, indexValues, index, op);\n    _totalTemp.forEach(d => {\n      d[startAs] = indexData[0][startAs];\n      d[endAs] = indexData[0][endAs];\n      d[valueField] = indexData[0][valueField];\n    });\n    return result;\n  }\n\n  // 3. 其他常规情况\n  // 先获取当前的起始值/结束值应当是多少\n  // 按照第一个总计数据的配置来决定\n  const totalConfigData = _totalTemp[0];\n  // 获取配置中的总计结果\n  // eslint-disable-next-line prefer-const\n  let { start, end } = getTotalStartEnd(totalConfigData, total, totalData, temp, totalSpec);\n  total.start = start;\n  total.end = end;\n  let positive = start;\n  let navigate = start;\n  // 当前剩余的总计值\n  let valueTemp = end - start;\n  const tempTotalValue = _normalTemp.reduce((pre, cur) => precisionSub(pre, +cur[valueField]), valueTemp);\n  // 模拟一组临时总计数据，用来堆叠\n  _totalTemp.forEach(d => {\n    const tempTotalData = {\n      [startAs]: start,\n      [endAs]: end,\n      [valueField]: tempTotalValue\n    };\n    // 将临时总计插入 `_vchart_waterfall_waterfall_temp_${index}` 中\n    _normalTemp.splice(d._vchart_waterfall_waterfall_temp, 0, tempTotalData);\n  });\n  // 将全部数据进行堆叠\n  _normalTemp.forEach(d => {\n    const value = +d[valueField];\n    if (value >= 0) {\n      d[startAs] = +positive;\n      positive = precisionAdd(positive, value);\n    } else {\n      d[startAs] = +navigate;\n      navigate = precisionAdd(navigate, value);\n    }\n    d[endAs] = precisionAdd(d[startAs], value);\n    start = precisionAdd(start, value);\n    valueTemp = precisionSub(valueTemp, value);\n  });\n  // 设置数据中的总计数据\n  _totalTemp.forEach(_d => {\n    const index = _d._vchart_waterfall_waterfall_temp;\n    // 数据的堆积计算结果\n    _d = _normalTemp[index];\n    // 原始数据\n    const d = indexData[index];\n    d[startAs] = _d[startAs];\n    d[endAs] = _d[endAs];\n    d[valueField] = _d[valueField];\n  });\n  return { ...total, lastIndex: key };\n}\n\nfunction computeNormalData(\n  indexData: Datum[],\n  key: string,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string; positive: number; negative: number },\n  indexValues: string[],\n  index: number,\n  op: IWaterfallOpt\n) {\n  const { valueField, startAs, endAs, total: totalSpec, seriesField, seriesFieldName } = op;\n  indexData.forEach(d => {\n    let isTotalTag = false;\n    if (!totalSpec || totalSpec.type === 'end') {\n      if (index === indexValues.length - 1) {\n        total.start = 0;\n        d[startAs] = total.start;\n        d[endAs] = total.end;\n        isTotalTag = true;\n      }\n    } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n      const tag = d[totalSpec.tagField];\n      if (tag) {\n        isTotalTag = true;\n        const { start, end } = getTotalStartEnd(d, total, totalData, temp, totalSpec);\n        d[startAs] = start;\n        d[endAs] = end;\n        d[valueField] = end - start;\n        total.start = start;\n        total.end = end;\n      }\n    }\n    if (!isTotalTag) {\n      const value = +d[valueField];\n      // 区分正负值\n      if (value >= 0) {\n        d[startAs] = +total.positive;\n        total.positive = precisionAdd(total.positive, value);\n      } else {\n        d[startAs] = +total.negative;\n        total.negative = precisionAdd(total.negative, value);\n      }\n      d[endAs] = precisionAdd(d[startAs], value);\n      total.end = precisionAdd(total.end, value);\n    }\n    total.isTotal = isTotalTag;\n\n    if (isNil(seriesField) || seriesField === WaterfallDefaultSeriesField) {\n      if (isTotalTag) {\n        d[WaterfallDefaultSeriesField] = seriesFieldName.total;\n      } else {\n        d[WaterfallDefaultSeriesField] = +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease;\n      }\n    }\n  });\n  return { ...total, lastIndex: key };\n}\n\nfunction getTotalStartEnd(\n  d: Datum,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string; positive: number; negative: number },\n  totalSpec: IWaterfallOpt['total']\n) {\n  if (!totalSpec || totalSpec.type === 'end') {\n    return getTotalInEndType(total);\n  } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n    if (totalSpec.type === 'custom') {\n      return getTotalInCustomType(d, temp, totalSpec);\n    }\n    // 如果有设置count， valueField 和 startField 无效\n    if (totalSpec.collectCountField && !isNil(d[totalSpec.collectCountField])) {\n      return getTotalInCollectField(d, totalData, total, totalSpec);\n    }\n    return getTotalInField(d, total, totalSpec);\n  }\n  return { start: 0, end: 0 };\n}\n\nfunction getTotalInEndType(total: TotalInfo) {\n  return { start: 0, end: total.end };\n}\n\nfunction getTotalInCustomType(\n  d: Datum,\n  temp: { start: number; end: number; lastIndex: string; positive: number; negative: number },\n  totalSpec: IWaterfallOpt['total']\n) {\n  return (<IWaterfallTotalCustom>totalSpec).product(d, temp);\n}\n\nfunction getTotalInCollectField(d: Datum, totalData: TotalInfo[], total: TotalInfo, totalSpec: IWaterfallTotalField) {\n  let start = 0;\n  let end = total.end;\n  const startIndex = totalData.length - +d[totalSpec.collectCountField];\n  const endIndex = totalData.length - 1;\n  if (startIndex < 0) {\n    warn('total.collectCountField error');\n  } else {\n    start = totalData[startIndex].start;\n  }\n  if (endIndex < 0) {\n    warn('total.collectCountField error');\n  } else {\n    end = totalData[endIndex].end;\n  }\n  return { start, end };\n}\n\nfunction getTotalInField(d: Datum, total: TotalInfo, totalSpec: IWaterfallTotalField) {\n  let start = 0;\n  let end = total.end;\n  if (totalSpec.startField && !isNil(d[totalSpec.startField])) {\n    start = +d[totalSpec.startField];\n  }\n  if (totalSpec.valueField && !isNil(d[totalSpec.valueField])) {\n    end = precisionAdd(start, +d[totalSpec.valueField]);\n  }\n  return { start, end };\n}\n\nexport interface IWaterfallFillEndOpt {\n  indexField: string;\n  valueField: string;\n  seriesField?: string;\n  total: IWaterfallSeriesSpec['total'];\n  calculationMode: IWaterfallSeriesSpec['calculationMode'];\n}\n\nexport const waterfallFillTotal = (data: Array<Datum>, op: IWaterfallFillEndOpt) => {\n  if (!data) {\n    return data;\n  }\n  const { indexField, valueField, total, seriesField, calculationMode } = op;\n  const totalData = {\n    [indexField]: total?.text || 'total',\n    [valueField]: data.reduce((pre, cur) => precisionAdd(pre, +cur[valueField]), 0)\n  };\n  if (seriesField) {\n    totalData[seriesField] = 'total';\n  }\n  if (calculationMode === 'decrease') {\n    data.unshift(totalData);\n  } else {\n    data.push(totalData);\n  }\n  return data;\n};\n"]}
+{"version":3,"sources":["../src/data/transforms/waterfall.ts"],"names":[],"mappings":"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","file":"waterfall.js","sourcesContent":["import { isFunction, isNil, precisionAdd, precisionSub } from '@visactor/vutils';\n\nimport type { DataView } from '@visactor/vdataset';\nimport type {\n  IWaterfallSeriesSpec,\n  IWaterfallTotalCustom,\n  IWaterfallTotalField\n} from '../../series/waterfall/interface';\nimport type { Datum } from '../../typings';\nimport { WaterfallDefaultSeriesField } from '../../constant/waterfall';\nimport { warn } from '../../util/debug';\nimport { STACK_FIELD_TOTAL_TOP } from '../../constant/data';\n\ntype TotalInfo = {\n  start: number;\n  end: number;\n  lastIndex: string;\n  lastEnd: number;\n  index: string;\n  isTotal: boolean;\n  positive: number;\n  negative: number;\n};\n\nexport interface IWaterfallOpt {\n  indexField: string;\n  valueField: string;\n  seriesField?: string;\n  startAs: string;\n  endAs: string;\n  total: IWaterfallSeriesSpec['total'];\n  calculationMode: 'increase' | 'decrease';\n\n  seriesFieldName: {\n    total: string;\n    increase: string;\n    decrease: string;\n  };\n  stackInverse: boolean;\n  groupData: () => DataView;\n}\n\nexport type WaterfallOption = IWaterfallOpt | (() => IWaterfallOpt);\n\nexport const waterfall = (lastData: Array<Datum>, op: WaterfallOption) => {\n  if (!lastData || lastData.length === 0) {\n    return lastData;\n  }\n  const options = isFunction(op) ? op() : op;\n  const { indexField, total: totalSpec, groupData, calculationMode } = options;\n  const totalData: {\n    start: number;\n    end: number;\n    lastIndex: string;\n    lastEnd: number;\n    index: string;\n    isTotal: boolean;\n    positive: number;\n    negative: number;\n  }[] = [];\n  const { dimensionValues, dimensionData } = groupData().latestData as {\n    dimensionValues: { [key in string]: Set<string> };\n    dimensionData: { [key in string]: Datum[] };\n  };\n  let indexValues = Array.from(dimensionValues[indexField]);\n  if (calculationMode === 'decrease') {\n    indexValues = indexValues.reverse();\n  }\n  // 上一次的计算结果\n  let temp: { start: number; end: number; lastIndex: string; positive: number; negative: number } = {\n    start: 0,\n    end: 0,\n    positive: 0,\n    negative: 0,\n    lastIndex: null\n  };\n  indexValues.forEach((key, index) => {\n    const total = {\n      start: temp.end,\n      end: temp.end,\n      lastIndex: temp.lastIndex,\n      lastEnd: temp.end,\n      index: key,\n      isTotal: false,\n      positive: temp.end,\n      negative: temp.end\n    };\n\n    const indexData = options.stackInverse === true ? dimensionData[key].reverse() : dimensionData[key];\n    indexData?.forEach((d, i) => {\n      if (i === indexData.length - 1) {\n        d[STACK_FIELD_TOTAL_TOP] = true;\n      } else {\n        delete d[STACK_FIELD_TOTAL_TOP];\n      }\n    });\n    // 1.9.5 新增能力\n    // 当前 key 对应的数据中有一个总计数据，并且还有其他的分组数据时。总计的计算逻辑需要将总计值拆分\n    if (indexData.length > 1) {\n      const isTotalCheck = (d: Datum) => {\n        if (!totalSpec || totalSpec.type === 'end') {\n          if (index === indexValues.length - 1) {\n            return true;\n          }\n        } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n          const tag = d[totalSpec.tagField];\n          return !!tag;\n        }\n        return false;\n      };\n      const isTotalTag = indexData.some(d => isTotalCheck(d));\n      if (isTotalTag) {\n        temp = computeTotalWithMultipleData(\n          indexData,\n          key,\n          total,\n          totalData,\n          temp,\n          indexValues,\n          index,\n          options,\n          isTotalCheck\n        );\n        totalData.push(total);\n        return;\n      }\n    }\n    temp = computeNormalData(indexData, key, total, totalData, temp, indexValues, index, options);\n    totalData.push(total);\n  });\n  return totalData;\n};\n\nfunction computeTotalWithMultipleData(\n  indexData: Datum[],\n  key: string,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string; positive: number; negative: number },\n  indexValues: string[],\n  index: number,\n  op: IWaterfallOpt,\n  isTotalCheck: (d: Datum) => boolean\n) {\n  total.isTotal = true;\n  const { valueField, startAs, endAs, total: totalSpec } = op;\n  // 先将数据分为总计数据与常规数据\n  const _normalTemp: Datum[] = [];\n  const _totalTemp: Datum[] = [];\n  // 将总计数据与常规数据进行分离\n  indexData.forEach((d, index) => {\n    if (isTotalCheck(d)) {\n      // 总计数据后续要重新按照顺序计算 start end 信息，所以需要记录下当前的 index\n      _totalTemp.push({ ...d, [`_vchart_waterfall_waterfall_temp`]: index });\n    } else {\n      _normalTemp.push(d);\n    }\n  });\n  // 1. 不可能全都不是总计数据\n  // 2. 如果全都是总计数据，让它们都是同一个值\n  if (_totalTemp.length === indexData.length) {\n    const result = computeNormalData([indexData[0]], key, total, totalData, temp, indexValues, index, op);\n    _totalTemp.forEach(d => {\n      d[startAs] = indexData[0][startAs];\n      d[endAs] = indexData[0][endAs];\n      d[valueField] = indexData[0][valueField];\n    });\n    return result;\n  }\n\n  // 3. 其他常规情况\n  // 先获取当前的起始值/结束值应当是多少\n  // 按照第一个总计数据的配置来决定\n  const totalConfigData = _totalTemp[0];\n  // 获取配置中的总计结果\n  // eslint-disable-next-line prefer-const\n  let { start, end } = getTotalStartEnd(totalConfigData, total, totalData, temp, totalSpec);\n  total.start = start;\n  total.end = end;\n  let positive = start;\n  let navigate = start;\n  // 当前剩余的总计值\n  let valueTemp = end - start;\n  const tempTotalValue = _normalTemp.reduce((pre, cur) => precisionSub(pre, +cur[valueField]), valueTemp);\n  // 模拟一组临时总计数据，用来堆叠\n  _totalTemp.forEach(d => {\n    const tempTotalData = {\n      [startAs]: start,\n      [endAs]: end,\n      [valueField]: tempTotalValue\n    };\n    // 将临时总计插入 `_vchart_waterfall_waterfall_temp_${index}` 中\n    _normalTemp.splice(d._vchart_waterfall_waterfall_temp, 0, tempTotalData);\n  });\n  // 将全部数据进行堆叠\n  _normalTemp.forEach(d => {\n    const value = +d[valueField];\n    if (value >= 0) {\n      d[startAs] = +positive;\n      positive = precisionAdd(positive, value);\n    } else {\n      d[startAs] = +navigate;\n      navigate = precisionAdd(navigate, value);\n    }\n    d[endAs] = precisionAdd(d[startAs], value);\n    start = precisionAdd(start, value);\n    valueTemp = precisionSub(valueTemp, value);\n  });\n  // 设置数据中的总计数据\n  _totalTemp.forEach(_d => {\n    const index = _d._vchart_waterfall_waterfall_temp;\n    // 数据的堆积计算结果\n    _d = _normalTemp[index];\n    // 原始数据\n    const d = indexData[index];\n    d[startAs] = _d[startAs];\n    d[endAs] = _d[endAs];\n    d[valueField] = _d[valueField];\n  });\n  return { ...total, lastIndex: key };\n}\n\nfunction computeNormalData(\n  indexData: Datum[],\n  key: string,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string; positive: number; negative: number },\n  indexValues: string[],\n  index: number,\n  op: IWaterfallOpt\n) {\n  const { valueField, startAs, endAs, total: totalSpec, seriesField, seriesFieldName } = op;\n  indexData.forEach(d => {\n    let isTotalTag = false;\n    if (!totalSpec || totalSpec.type === 'end') {\n      if (index === indexValues.length - 1) {\n        total.start = 0;\n        d[startAs] = total.start;\n        d[endAs] = total.end;\n        isTotalTag = true;\n      }\n    } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n      const tag = d[totalSpec.tagField];\n      if (tag) {\n        isTotalTag = true;\n        const { start, end } = getTotalStartEnd(d, total, totalData, temp, totalSpec);\n        d[startAs] = start;\n        d[endAs] = end;\n        d[valueField] = end - start;\n        total.start = start;\n        total.end = end;\n      }\n    }\n    if (!isTotalTag) {\n      const value = +d[valueField];\n      // 区分正负值\n      if (value >= 0) {\n        d[startAs] = +total.positive;\n        total.positive = precisionAdd(total.positive, value);\n      } else {\n        d[startAs] = +total.negative;\n        total.negative = precisionAdd(total.negative, value);\n      }\n      d[endAs] = precisionAdd(d[startAs], value);\n      total.end = precisionAdd(total.end, value);\n    }\n    total.isTotal = isTotalTag;\n\n    if (isNil(seriesField) || seriesField === WaterfallDefaultSeriesField) {\n      if (isTotalTag) {\n        d[WaterfallDefaultSeriesField] = seriesFieldName.total;\n      } else {\n        d[WaterfallDefaultSeriesField] = +d[valueField] >= 0 ? seriesFieldName.increase : seriesFieldName.decrease;\n      }\n    }\n  });\n  return { ...total, lastIndex: key };\n}\n\nfunction getTotalStartEnd(\n  d: Datum,\n  total: TotalInfo,\n  totalData: TotalInfo[],\n  temp: { start: number; end: number; lastIndex: string; positive: number; negative: number },\n  totalSpec: IWaterfallOpt['total']\n) {\n  if (!totalSpec || totalSpec.type === 'end') {\n    return getTotalInEndType(total);\n  } else if (totalSpec.type === 'field' || totalSpec.type === 'custom') {\n    if (totalSpec.type === 'custom') {\n      return getTotalInCustomType(d, temp, totalSpec);\n    }\n    // 如果有设置count， valueField 和 startField 无效\n    if (totalSpec.collectCountField && !isNil(d[totalSpec.collectCountField])) {\n      return getTotalInCollectField(d, totalData, total, totalSpec);\n    }\n    return getTotalInField(d, total, totalSpec);\n  }\n  return { start: 0, end: 0 };\n}\n\nfunction getTotalInEndType(total: TotalInfo) {\n  return { start: 0, end: total.end };\n}\n\nfunction getTotalInCustomType(\n  d: Datum,\n  temp: { start: number; end: number; lastIndex: string; positive: number; negative: number },\n  totalSpec: IWaterfallOpt['total']\n) {\n  return (<IWaterfallTotalCustom>totalSpec).product(d, temp);\n}\n\nfunction getTotalInCollectField(d: Datum, totalData: TotalInfo[], total: TotalInfo, totalSpec: IWaterfallTotalField) {\n  let start = 0;\n  let end = total.end;\n  const startIndex = totalData.length - +d[totalSpec.collectCountField];\n  const endIndex = totalData.length - 1;\n  if (startIndex < 0) {\n    warn('total.collectCountField error');\n  } else {\n    start = totalData[startIndex].start;\n  }\n  if (endIndex < 0) {\n    warn('total.collectCountField error');\n  } else {\n    end = totalData[endIndex].end;\n  }\n  return { start, end };\n}\n\nfunction getTotalInField(d: Datum, total: TotalInfo, totalSpec: IWaterfallTotalField) {\n  let start = 0;\n  let end = total.end;\n  if (totalSpec.startField && !isNil(d[totalSpec.startField])) {\n    start = +d[totalSpec.startField];\n  }\n  if (totalSpec.valueField && !isNil(d[totalSpec.valueField])) {\n    end = precisionAdd(start, +d[totalSpec.valueField]);\n  }\n  return { start, end };\n}\n\nexport interface IWaterfallFillEndOpt {\n  indexField: string;\n  valueField: string;\n  seriesField?: string;\n  total: IWaterfallSeriesSpec['total'];\n  calculationMode: IWaterfallSeriesSpec['calculationMode'];\n}\n\nexport type WaterfallFillEndOption = IWaterfallFillEndOpt | (() => IWaterfallFillEndOpt);\n\nexport const waterfallFillTotal = (data: Array<Datum>, op: WaterfallFillEndOption) => {\n  if (!data) {\n    return data;\n  }\n  const { indexField, valueField, total, seriesField, calculationMode } = isFunction(op) ? op() : op;\n  const totalData = {\n    [indexField]: total?.text || 'total',\n    [valueField]: data.reduce((pre, cur) => precisionAdd(pre, +cur[valueField]), 0)\n  };\n  if (seriesField) {\n    totalData[seriesField] = 'total';\n  }\n  if (calculationMode === 'decrease') {\n    return [totalData, ...data];\n  }\n  return [...data, totalData];\n};\n"]}

package/esm/series/base/base-series.js

@@ -316,9 +316,9 @@ export class BaseSeries extends BaseModel {
             type: "dataview"
         }), this._viewStackData.transform({
             type: "stackSplit",
-            options: {
+            options: () => ({
                 fields: this.getStackGroupFields()
-            }
+            })
         }, !1);
     }
     _noAnimationDataKey(datum, index) {