@visactor/vchart 2.1.0-alpha.5 → 2.1.0-alpha.7

package/cjs/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/cjs/data/transforms/funnel.js

@@ -4,11 +4,12 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.funnelTransform = exports.funnel = void 0;
 
-const vutils_1 = require("@visactor/vutils"), funnel = (originData, op) => {
-    var _a, _b;
+const vutils_1 = require("@visactor/vutils"), resolveOptionValue = option => (0, 
+vutils_1.isFunction)(option) ? option() : option, funnel = (originData, op) => {
+    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 = (0, 

package/cjs/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":";;;AACA,6CAA6D;AAkC7D,MAAM,kBAAkB,GAAG,CAAI,MAA4B,EAAE,EAAE,CAAC,CAAC,IAAA,mBAAU,EAAC,MAAM,CAAC,CAAC,CAAC,CAAC,MAAM,EAAE,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;AAElG,MAAM,MAAM,GAAG,CAAC,UAA2B,EAAE,EAAc,EAAE,EAAE;;IACpE,MAAM,IAAI,GAAG,UAAU,CAAC,GAAG,CAAC,KAAK,CAAC,EAAE,CAAC,mBAAM,KAAK,EAAG,CAAC,CAAC;IACrD,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IACD,MAAM,EACJ,gBAAgB,EAChB,YAAY,EACZ,aAAa,EACb,YAAY,EACZ,gBAAgB,EAChB,gBAAgB,EAChB,WAAW,EACX,cAAc,EACd,WAAW,GACZ,GAAG,EAAE,CAAC;IACP,MAAM,UAAU,GAAG,kBAAkB,CAAC,EAAE,CAAC,UAAU,CAAC,CAAC;IACrD,MAAM,YAAY,GAAG,MAAA,kBAAkB,CAAC,EAAE,CAAC,YAAY,CAAC,mCAAI,KAAK,CAAC;IAClE,MAAM,MAAM,GAAG,MAAA,kBAAkB,CAAC,EAAE,CAAC,MAAM,CAAC,mCAAI,IAAI,CAAC;IACrD,MAAM,KAAK,GAAG,kBAAkB,CAAC,EAAE,CAAC,KAAK,CAAC,CAAC;IAE3C,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC;IACzG,MAAM,GAAG,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,IAAI,QAAQ,CAAC,EAAE,QAAQ,CAAC,CAAC;IACvG,MAAM,QAAQ,GAAG,CAAC,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,mCAAI,GAAG,EAAE,MAAA,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,GAAG,mCAAI,GAAG,CAAC,CAAC;IAExD,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE;;QACpB,MAAM,YAAY,GAAW,MAAM,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC;QAC9D,MAAM,SAAS,GAAW,MAAM,CAAC,UAAU,CAAC,MAAA,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,0CAAG,UAAU,CAAC,CAAC,CAAC;QACvE,MAAM,SAAS,GAAW,MAAM,CAAC,UAAU,CAAC,MAAA,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,0CAAG,UAAU,CAAC,CAAC,CAAC;QAEvE,MAAM,cAAc,GAClB,CAAC,IAAA,sBAAa,EAAC,SAAS,GAAG,YAAY,CAAC,IAAI,YAAY,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,YAAY,CAAC;QAChG,MAAM,UAAU,GAAG,CAAC,IAAA,sBAAa,EAAC,YAAY,GAAG,SAAS,CAAC,IAAI,SAAS,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,GAAG,SAAS,CAAC;QAE9G,WAAW,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,CAAC;QAC5C,WAAW,IAAI,CAAC,CAAC,CAAC,WAAW,CAAC,GAAG,SAAS,CAAC,CAAC;QAC5C,gBAAgB,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,cAAc,CAAC,CAAC;QAC3D,YAAY,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC;QAC7D,aAAa,IAAI,CAAC,CAAC,CAAC,aAAa,CAAC,GAAG,YAAY,KAAK,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,CAAC,CAAC,CAAC,GAAG,IAAI,CAAC,MAAM,CAAC,CAAC;QAC/F,YAAY,IAAI,CAAC,CAAC,CAAC,YAAY,CAAC,GAAG,YAAY,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC/D,gBAAgB;YACd,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,IAAI,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,YAAY,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAC3G,gBAAgB,IAAI,CAAC,CAAC,CAAC,gBAAgB,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC,SAAS,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC,CAAC;QAClF,cAAc,IAAI,CAAC,CAAC,CAAC,cAAc,CAAC,GAAG,YAAY,CAAC,CAAC;IACvD,CAAC,CAAC,CAAC;IAEH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AA/CW,QAAA,MAAM,UA+CjB;AAMK,MAAM,eAAe,GAAG,CAAC,UAA2B,EAAE,EAAuB,EAAE,EAAE;;IACtF,MAAM,IAAI,GAA+C,MAAA,MAAA,UAAU,CAAC,CAAC,CAAC,0CAAE,UAAU,0CAAE,GAAG,CACrF,CAAC,KAA8B,EAAE,EAAE,CAAC,mBAAM,KAAK,EAAG,CACnD,CAAC;IACF,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,MAAM,KAAK,CAAC,EAAE;QAC9B,OAAO,IAAI,CAAC;KACb;IACD,IAAI,CAAC,KAAK,EAAE,CAAC;IACb,IAAI,CAAC,OAAO,CAAC,CAAC,CAAC,EAAE;QACf,CAAC,CAAC,EAAE,CAAC,kBAAkB,CAAC,GAAG,IAAI,CAAC;IAClC,CAAC,CAAC,CAAC;IACH,OAAO,IAAI,CAAC;AACd,CAAC,CAAC;AAZW,QAAA,eAAe,mBAY1B","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/cjs/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/cjs/data/transforms/lookup.js

@@ -4,23 +4,28 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.lookup = void 0;
 
-const vutils_1 = require("@visactor/vutils"), 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;
+const vutils_1 = require("@visactor/vutils"), resolveOptionValue = option => (0, 
+vutils_1.isFunction)(option) ? option() : option, lookup = (data, opt) => {
+    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, (0, vutils_1.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 ((0, vutils_1.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 ((0, vutils_1.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]] = (0, vutils_1.isValid)(v) ? v : defaultValue;
     };
     return 0 === data.length ? [] : data.map((d => (set(d), d)));

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/lookup.ts"],"names":[],"mappings":";;;AACA,6CAA8D;AAcvD,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,IAAA,mBAAU,EAAC,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,IAAA,cAAK,EAAC,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,IAAA,gBAAO,EAAC,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;AAnDW,QAAA,MAAM,UAmDjB","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/cjs/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/cjs/data/transforms/map.js

@@ -4,12 +4,15 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.map = void 0;
 
-const data_1 = require("../../constant/data"), map = (data, opt) => (data.features && data.features.forEach(((f, index) => {
-    var _a;
-    f[data_1.DEFAULT_DATA_INDEX] = index;
-    const name = null === (_a = f.properties) || void 0 === _a ? void 0 : _a[opt.nameProperty];
-    opt.nameMap && opt.nameMap[name] ? f[data_1.DEFAULT_MAP_LOOK_UP_KEY] = opt.nameMap[name] : f[data_1.DEFAULT_MAP_LOOK_UP_KEY] = name;
-})), data.features);
+const data_1 = require("../../constant/data"), vutils_1 = require("@visactor/vutils"), map = (data, opt) => {
+    const options = (0, vutils_1.isFunction)(opt) ? opt() : opt, features = data.features;
+    return features && features.forEach(((f, index) => {
+        var _a, _b;
+        f[data_1.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[data_1.DEFAULT_MAP_LOOK_UP_KEY] = mappedName || name;
+    })), features;
+};
 
 exports.map = map;
 //# sourceMappingURL=map.js.map

package/cjs/data/transforms/map.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/map.ts"],"names":[],"mappings":";;;AAAA,8CAAkF;AAS3E,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,yBAAkB,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,8BAAuB,CAAC,GAAG,GAAG,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;aAChD;iBAAM;gBACL,CAAC,CAAC,8BAAuB,CAAC,GAAG,IAAI,CAAC;aACnC;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,IAAI,CAAC,QAAQ,CAAC;AACvB,CAAC,CAAC;AAbW,QAAA,GAAG,OAad","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,8CAAkF;AAElF,6CAA8C;AAavC,MAAM,GAAG,GAAG,CAAC,IAAmB,EAAE,GAAc,EAAE,EAAE;IACzD,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,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,yBAAkB,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,8BAAuB,CAAC,GAAG,UAAU,CAAC;aACzC;iBAAM;gBACL,CAAC,CAAC,8BAAuB,CAAC,GAAG,IAAI,CAAC;aACnC;QACH,CAAC,CAAC,CAAC;KACJ;IACD,OAAO,QAAQ,CAAC;AAClB,CAAC,CAAC;AAhBW,QAAA,GAAG,OAgBd","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/cjs/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/cjs/data/transforms/sankey.js

@@ -31,21 +31,26 @@ const sankeyFormat = data => {
 exports.sankeyFormat = sankeyFormat;
 
 const sankeyLayout = (data, op) => {
-    if (!data || !(null == op ? void 0 : op.view) || !data.length) return [];
-    const view = op.view();
+    const options = (0, vutils_1.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 vlayouts_1.SankeyLayout(op), result = [];
-    return result.push(layout.layout(originalData, view)), result;
+    const originalData = data[0], layoutData = normalizeSankeyData(originalData, options), layout = new vlayouts_1.SankeyLayout(options), result = [];
+    return result.push(layout.layout(layoutData, view)), result;
 };
 
 exports.sankeyLayout = sankeyLayout;
+
+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/cjs/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/cjs/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/cjs/data/transforms/stack-split.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 const vutils_1 = require("@visactor/vutils"), stackSplit = (data, op) => {
     const result = {
         nodes: {}
-    }, {fields: fields} = op;
+    }, {fields: fields} = (0, vutils_1.isFunction)(op) ? op() : op;
     if (!(null == fields ? void 0 : fields.length)) return result;
     const lastFieldIndex = fields.length - 1;
     let nextNode, leaf, temp = result;

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/stack-split.ts"],"names":[],"mappings":";;;AACA,6CAAyC;AAQlC,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,IAAA,cAAK,EAAC,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;AAzCW,QAAA,UAAU,cAyCrB","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,6CAAqD;AAU9C,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,IAAA,mBAAU,EAAC,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,IAAA,cAAK,EAAC,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;AAzCW,QAAA,UAAU,cAyCrB","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/cjs/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/cjs/data/transforms/treemap.js

@@ -4,14 +4,15 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.treemapLayout = void 0;
 
-const vlayouts_1 = require("@visactor/vlayouts"), hierarchy_1 = require("../../constant/hierarchy"), treemapLayout = (data, op) => {
-    if (op.getViewBox()) {
-        const res = new vlayouts_1.TreemapLayout(op).layout(data, op.getViewBox()), nodes = [];
+const vlayouts_1 = require("@visactor/vlayouts"), vutils_1 = require("@visactor/vutils"), hierarchy_1 = require("../../constant/hierarchy"), treemapLayout = (data, op) => {
+    const options = (0, vutils_1.isFunction)(op) ? op() : op, viewBox = options.getViewBox();
+    if (viewBox) {
+        const res = new vlayouts_1.TreemapLayout(options).layout(data, viewBox), nodes = [];
         return (0, vlayouts_1.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 && [ hierarchy_1.DEFAULT_HIERARCHY_ROOT, "name" ].forEach((key => {
-                datum[key] = datum.datum[datum.depth][op.nameField];
+                datum[key] = datum.datum[datum.depth][options.nameField];
             }));
         })), nodes;
     }

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/treemap.ts"],"names":[],"mappings":";;;AACA,iDAAiE;AACjE,wDAAkE;AAE3D,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,wBAAa,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,IAAA,uBAAY,EAAC,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,kCAAsB,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;AAjCW,QAAA,aAAa,iBAiCxB","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,iDAA+G;AAC/G,6CAA8C;AAC9C,wDAAkE;AAY3D,MAAM,aAAa,GAAG,CAC3B,IAAoC,EACpC,EAAyD,EACzD,EAAE;IACF,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,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,wBAAa,CAAC,OAAO,CAAC,CAAC;QAC1C,MAAM,GAAG,GAAG,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;QAEzC,MAAM,KAAK,GAAyB,EAAE,CAAC;QACvC,IAAA,uBAAY,EAAC,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,kCAAsB,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;AA1BW,QAAA,aAAa,iBA0BxB","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/cjs/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/cjs/data/transforms/venn.js

@@ -4,11 +4,11 @@ Object.defineProperty(exports, "__esModule", {
     value: !0
 }), exports.vennLayout = void 0;
 
-const vlayouts_1 = require("@visactor/vlayouts"), vennLayout = (data, op) => {
-    const viewBox = op.getViewBox();
+const vlayouts_1 = require("@visactor/vlayouts"), vutils_1 = require("@visactor/vutils"), vennLayout = (data, op) => {
+    const options = (0, vutils_1.isFunction)(op) ? op() : op, viewBox = options.getViewBox();
     return viewBox && (null == data ? void 0 : data.length) ? (0, vlayouts_1.vennTransform)(Object.assign({
-        setField: op.setField,
-        valueField: op.valueField
+        setField: options.setField,
+        valueField: options.valueField
     }, viewBox), data) : [];
 };
 

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

@@ -1 +1 @@
-{"version":3,"sources":["../src/data/transforms/venn.ts"],"names":[],"mappings":";;;AAAA,iDAAmD;AAE5C,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,IAAA,wBAAa,kBAEhB,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;AA3BW,QAAA,UAAU,cA2BrB","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,iDAAmD;AACnD,6CAA8C;AAavC,MAAM,UAAU,GAAG,CACxB,IAAoC,EACpC,EAAmD,EACnD,EAAE;IACF,MAAM,OAAO,GAAG,IAAA,mBAAU,EAAC,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,IAAA,wBAAa,kBAEhB,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;AAnBW,QAAA,UAAU,cAmBrB","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/cjs/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/cjs/data/transforms/waterfall.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 
 const vutils_1 = require("@visactor/vutils"), waterfall_1 = require("../../constant/waterfall"), debug_1 = require("../../util/debug"), data_1 = require("../../constant/data"), 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 = (0, vutils_1.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 = {
@@ -26,7 +26,7 @@ const vutils_1 = require("@visactor/vutils"), waterfall_1 = require("../../const
             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[data_1.STACK_FIELD_TOTAL_TOP] = !0 : delete d[data_1.STACK_FIELD_TOTAL_TOP];
         })), indexData.length > 1) {
@@ -38,10 +38,10 @@ const vutils_1 = require("@visactor/vutils"), waterfall_1 = require("../../const
                 } 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;
 };
@@ -157,12 +157,12 @@ exports.waterfall = waterfall;
 
 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} = (0, 
+    vutils_1.isFunction)(op) ? op() : op, totalData = {
         [indexField]: (null == total ? void 0 : total.text) || "total",
         [valueField]: data.reduce(((pre, cur) => (0, vutils_1.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 ];
 };
 
 exports.waterfallFillTotal = waterfallFillTotal;