@visactor/vseed 0.2.9 → 0.3.0

package/dist/esm/pipeline/spec/chart/pipes/axes/title/defaultTitleText.d.ts

@@ -1,2 +1,2 @@
-import type { Dimensions, MeasureTree } from '../../../../../../types';
-export declare const defaultTitleText: (measures: MeasureTree, dimensions: Dimensions, idList?: string[]) => string;
+import type { Dimensions, Measure } from '../../../../../../types';
+export declare const defaultTitleText: (measures: Measure[], dimensions: Dimensions, idList?: string[]) => string;

package/dist/esm/pipeline/spec/chart/pipes/axes/title/defaultTitleText.js

@@ -1,14 +1,10 @@
-import { findAllMeasures } from "../../../../../utils/index.js";
-const defaultTitleText = (measures, dimensions, idList = [])=>{
-    const allMeasures = findAllMeasures(measures);
-    return idList.map((id)=>{
+const defaultTitleText = (measures, dimensions, idList = [])=>idList.map((id)=>{
         const alias = [
-            ...allMeasures,
+            ...measures,
             ...dimensions
         ].find((f)=>f.id === id)?.alias || '';
         return alias;
     }).join(' & ');
-};
 export { defaultTitleText };
 
 //# sourceMappingURL=defaultTitleText.js.map

package/dist/esm/pipeline/spec/chart/pipes/axes/title/defaultTitleText.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/axes/title/defaultTitleText.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/title/defaultTitleText.ts"],"sourcesContent":["import { findAllMeasures } from 'src/pipeline/utils'\nimport type { Dimensions, MeasureTree } from 'src/types'\n\nexport const defaultTitleText = (measures: MeasureTree, dimensions: Dimensions, idList: string[] = []) => {\n  const allMeasures = findAllMeasures(measures)\n  return idList\n    .map((id) => {\n      const alias = [...allMeasures, ...dimensions].find((f) => f.id === id)?.alias || ''\n      return alias\n    })\n    .join(' & ')\n}\n"],"names":["defaultTitleText","measures","dimensions","idList","allMeasures","findAllMeasures","id","alias","f"],"mappings":";AAGO,MAAMA,mBAAmB,CAACC,UAAuBC,YAAwBC,SAAmB,EAAE;IACnG,MAAMC,cAAcC,gBAAgBJ;IACpC,OAAOE,OACJ,GAAG,CAAC,CAACG;QACJ,MAAMC,QAAQ;eAAIH;eAAgBF;SAAW,CAAC,IAAI,CAAC,CAACM,IAAMA,EAAE,EAAE,KAAKF,KAAK,SAAS;QACjF,OAAOC;IACT,GACC,IAAI,CAAC;AACV"}
+{"version":3,"file":"pipeline/spec/chart/pipes/axes/title/defaultTitleText.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/title/defaultTitleText.ts"],"sourcesContent":["import type { Dimensions, Measure } from 'src/types'\n\nexport const defaultTitleText = (measures: Measure[], dimensions: Dimensions, idList: string[] = []) => {\n  return idList\n    .map((id) => {\n      const alias = [...measures, ...dimensions].find((f) => f.id === id)?.alias || ''\n      return alias\n    })\n    .join(' & ')\n}\n"],"names":["defaultTitleText","measures","dimensions","idList","id","alias","f"],"mappings":"AAEO,MAAMA,mBAAmB,CAACC,UAAqBC,YAAwBC,SAAmB,EAAE,GAC1FA,OACJ,GAAG,CAAC,CAACC;QACJ,MAAMC,QAAQ;eAAIJ;eAAaC;SAAW,CAAC,IAAI,CAAC,CAACI,IAAMA,EAAE,EAAE,KAAKF,KAAK,SAAS;QAC9E,OAAOC;IACT,GACC,IAAI,CAAC"}

package/dist/esm/pipeline/spec/chart/pipes/axes/xBand.js

@@ -8,7 +8,7 @@ const xBand = (spec, context)=>{
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
-    const { measures, dimensions, encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed;
+    const { measures = [], dimensions = [], encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed;
     const config = advancedVSeed.config?.[chartType]?.xAxis ?? {};
     if (!result.axes) result.axes = [];
     const { labelAutoLimitLength = 80 } = config;

package/dist/esm/pipeline/spec/chart/pipes/axes/xBand.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/axes/xBand.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/xBand.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport type { VChartSpecPipe, XBandAxis } from 'src/types'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { MeasureId } from 'src/dataReshape'\nimport { isArray, isNull } from '@visactor/vutils'\nimport { bandAxisStyle } from './bandAxisStyle'\n\nexport const xBand: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { measures, dimensions, encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed\n  const config = (advancedVSeed.config?.[chartType as 'column']?.xAxis ?? {}) as XBandAxis\n\n  if (!result.axes) {\n    result.axes = []\n  }\n\n  const { labelAutoLimitLength = 80 } = config\n\n  const onlyMeasureId = (encoding.x || []).filter((v) => v !== MeasureId).length === 0\n  const bandAxis = bandAxisStyle(config)\n\n  bandAxis.orient = 'bottom'\n  bandAxis.maxHeight = labelAutoLimitLength + 60\n  bandAxis.paddingInner = [0.15, 0.1]\n  bandAxis.paddingOuter = [0.075, 0.1]\n\n  if (isNull(bandAxis.title?.text)) {\n    bandAxis.title.text = defaultTitleText(measures, dimensions, encoding.x as string[])\n  }\n\n  if (onlyMeasureId && bandAxis.label) {\n    const allDatasetReshapeInfo = pivotAllDatasetReshapeInfo || datasetReshapeInfo\n    const colorIdMap = allDatasetReshapeInfo.reduce<Record<string, { id: string; alias: string }>>((prev, cur) => {\n      return { ...prev, ...cur.unfoldInfo.colorIdMap }\n    }, {})\n\n    bandAxis.label.formatMethod = (text: string | string[]) => {\n      return isArray(text) ? text : (colorIdMap[String(text)]?.alias ?? text)\n    }\n  }\n\n  result.axes = [...result.axes, bandAxis] as ISpec['axes']\n  return result\n}\n"],"names":["xBand","spec","context","result","advancedVSeed","vseed","chartType","measures","dimensions","encoding","datasetReshapeInfo","pivotAllDatasetReshapeInfo","config","labelAutoLimitLength","onlyMeasureId","v","MeasureId","bandAxis","bandAxisStyle","isNull","defaultTitleText","allDatasetReshapeInfo","colorIdMap","prev","cur","text","isArray","String"],"mappings":";;;;AAOO,MAAMA,QAAwB,CAACC,MAAMC;IAC1C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,QAAQ,EAAEC,UAAU,EAAEC,QAAQ,EAAEC,kBAAkB,EAAEC,0BAA0B,EAAE,GAAGP;IAC3F,MAAMQ,SAAUR,cAAc,MAAM,EAAE,CAACE,UAAsB,EAAE,SAAS,CAAC;IAEzE,IAAI,CAACH,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAGlB,MAAM,EAAEU,uBAAuB,EAAE,EAAE,GAAGD;IAEtC,MAAME,gBAAiBL,AAA4D,MAA5DA,AAAAA,CAAAA,SAAS,CAAC,IAAI,EAAC,EAAG,MAAM,CAAC,CAACM,IAAMA,MAAMC,WAAW,MAAM;IAC9E,MAAMC,WAAWC,cAAcN;IAE/BK,SAAS,MAAM,GAAG;IAClBA,SAAS,SAAS,GAAGJ,uBAAuB;IAC5CI,SAAS,YAAY,GAAG;QAAC;QAAM;KAAI;IACnCA,SAAS,YAAY,GAAG;QAAC;QAAO;KAAI;IAEpC,IAAIE,OAAOF,SAAS,KAAK,EAAE,OACzBA,SAAS,KAAK,CAAC,IAAI,GAAGG,iBAAiBb,UAAUC,YAAYC,SAAS,CAAC;IAGzE,IAAIK,iBAAiBG,SAAS,KAAK,EAAE;QACnC,MAAMI,wBAAwBV,8BAA8BD;QAC5D,MAAMY,aAAaD,sBAAsB,MAAM,CAAgD,CAACE,MAAMC,MAC7F;gBAAE,GAAGD,IAAI;gBAAE,GAAGC,IAAI,UAAU,CAAC,UAAU;YAAC,IAC9C,CAAC;QAEJP,SAAS,KAAK,CAAC,YAAY,GAAG,CAACQ,OACtBC,QAAQD,QAAQA,OAAQH,UAAU,CAACK,OAAOF,MAAM,EAAE,SAASA;IAEtE;IAEAtB,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEc;KAAS;IACxC,OAAOd;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/axes/xBand.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/xBand.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport type { VChartSpecPipe, XBandAxis } from 'src/types'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { MeasureId } from 'src/dataReshape'\nimport { isArray, isNull } from '@visactor/vutils'\nimport { bandAxisStyle } from './bandAxisStyle'\n\nexport const xBand: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { measures = [], dimensions = [], encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed\n  const config = (advancedVSeed.config?.[chartType as 'column']?.xAxis ?? {}) as XBandAxis\n\n  if (!result.axes) {\n    result.axes = []\n  }\n\n  const { labelAutoLimitLength = 80 } = config\n\n  const onlyMeasureId = (encoding.x || []).filter((v) => v !== MeasureId).length === 0\n  const bandAxis = bandAxisStyle(config)\n\n  bandAxis.orient = 'bottom'\n  bandAxis.maxHeight = labelAutoLimitLength + 60\n  bandAxis.paddingInner = [0.15, 0.1]\n  bandAxis.paddingOuter = [0.075, 0.1]\n\n  if (isNull(bandAxis.title?.text)) {\n    bandAxis.title!.text = defaultTitleText(measures, dimensions, encoding.x as string[])\n  }\n\n  if (onlyMeasureId && bandAxis.label) {\n    const allDatasetReshapeInfo = pivotAllDatasetReshapeInfo || datasetReshapeInfo\n    const colorIdMap = allDatasetReshapeInfo.reduce<Record<string, { id: string; alias: string }>>((prev, cur) => {\n      return { ...prev, ...cur.unfoldInfo.colorIdMap }\n    }, {})\n\n    bandAxis.label.formatMethod = (text: string | string[]) => {\n      return isArray(text) ? text : (colorIdMap[String(text)]?.alias ?? text)\n    }\n  }\n\n  result.axes = [...result.axes, bandAxis] as ISpec['axes']\n  return result\n}\n"],"names":["xBand","spec","context","result","advancedVSeed","vseed","chartType","measures","dimensions","encoding","datasetReshapeInfo","pivotAllDatasetReshapeInfo","config","labelAutoLimitLength","onlyMeasureId","v","MeasureId","bandAxis","bandAxisStyle","isNull","defaultTitleText","allDatasetReshapeInfo","colorIdMap","prev","cur","text","isArray","String"],"mappings":";;;;AAOO,MAAMA,QAAwB,CAACC,MAAMC;IAC1C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,WAAW,EAAE,EAAEC,aAAa,EAAE,EAAEC,QAAQ,EAAEC,kBAAkB,EAAEC,0BAA0B,EAAE,GAAGP;IACrG,MAAMQ,SAAUR,cAAc,MAAM,EAAE,CAACE,UAAsB,EAAE,SAAS,CAAC;IAEzE,IAAI,CAACH,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAGlB,MAAM,EAAEU,uBAAuB,EAAE,EAAE,GAAGD;IAEtC,MAAME,gBAAiBL,AAA4D,MAA5DA,AAAAA,CAAAA,SAAS,CAAC,IAAI,EAAC,EAAG,MAAM,CAAC,CAACM,IAAMA,MAAMC,WAAW,MAAM;IAC9E,MAAMC,WAAWC,cAAcN;IAE/BK,SAAS,MAAM,GAAG;IAClBA,SAAS,SAAS,GAAGJ,uBAAuB;IAC5CI,SAAS,YAAY,GAAG;QAAC;QAAM;KAAI;IACnCA,SAAS,YAAY,GAAG;QAAC;QAAO;KAAI;IAEpC,IAAIE,OAAOF,SAAS,KAAK,EAAE,OACzBA,SAAS,KAAK,CAAE,IAAI,GAAGG,iBAAiBb,UAAUC,YAAYC,SAAS,CAAC;IAG1E,IAAIK,iBAAiBG,SAAS,KAAK,EAAE;QACnC,MAAMI,wBAAwBV,8BAA8BD;QAC5D,MAAMY,aAAaD,sBAAsB,MAAM,CAAgD,CAACE,MAAMC,MAC7F;gBAAE,GAAGD,IAAI;gBAAE,GAAGC,IAAI,UAAU,CAAC,UAAU;YAAC,IAC9C,CAAC;QAEJP,SAAS,KAAK,CAAC,YAAY,GAAG,CAACQ,OACtBC,QAAQD,QAAQA,OAAQH,UAAU,CAACK,OAAOF,MAAM,EAAE,SAASA;IAEtE;IAEAtB,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEc;KAAS;IACxC,OAAOd;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/axes/xLinear.js

@@ -7,7 +7,7 @@ const xLinear = (spec, context)=>{
         ...spec
     };
     const { advancedVSeed, vseed } = context;
-    const { encoding, dimensions, measures } = advancedVSeed;
+    const { encoding, dimensions = [], measures = [] } = advancedVSeed;
     const { chartType } = vseed;
     const config = advancedVSeed.config?.[chartType]?.xAxis ?? {};
     if (!result.axes) result.axes = [];

package/dist/esm/pipeline/spec/chart/pipes/axes/xLinear.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/axes/xLinear.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/xLinear.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport type { VChartSpecPipe, XLinearAxis } from 'src/types'\nimport { createNumFormatter, isAreaPercent, isBarPercent, isColumnPercent, isPivotChart } from 'src/pipeline/utils'\nimport { createLinearFormat, createLinearPercentFormat } from './format/linearFormat'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { linearAxisStyle } from './linearAxisStyle'\n\nexport const xLinear: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { encoding, dimensions, measures } = advancedVSeed\n  const { chartType } = vseed\n  const config = (advancedVSeed.config?.[chartType as 'bar']?.xAxis ?? {}) as XLinearAxis\n\n  if (!result.axes) {\n    result.axes = []\n  }\n  const isPivot = isPivotChart(vseed)\n\n  const { autoFormat, numFormat = {} } = config\n\n  const formatter = createNumFormatter(numFormat)\n  const percentFormatter = createNumFormatter({\n    type: 'percent',\n  })\n\n  const formatMethod = (value: string) => {\n    if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) {\n      return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter)\n    }\n    return createLinearFormat(value, autoFormat, numFormat, formatter)\n  }\n\n  const titleText = config.title?.titleText || defaultTitleText(measures, dimensions, encoding.x as string[])\n\n  const linearAxis = linearAxisStyle({\n    ...config,\n    orient: 'bottom',\n    formatMethod,\n    titleText,\n    isPivot,\n  })\n\n  result.axes = [...result.axes, linearAxis] as ISpec['axes']\n\n  return result\n}\n"],"names":["xLinear","spec","context","result","advancedVSeed","vseed","encoding","dimensions","measures","chartType","config","isPivot","isPivotChart","autoFormat","numFormat","formatter","createNumFormatter","percentFormatter","formatMethod","value","isBarPercent","isColumnPercent","isAreaPercent","createLinearPercentFormat","createLinearFormat","titleText","defaultTitleText","linearAxis","linearAxisStyle"],"mappings":";;;;AAOO,MAAMA,UAA0B,CAACC,MAAMC;IAC5C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,QAAQ,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGJ;IAC3C,MAAM,EAAEK,SAAS,EAAE,GAAGJ;IACtB,MAAMK,SAAUN,cAAc,MAAM,EAAE,CAACK,UAAmB,EAAE,SAAS,CAAC;IAEtE,IAAI,CAACN,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAElB,MAAMQ,UAAUC,aAAaP;IAE7B,MAAM,EAAEQ,UAAU,EAAEC,YAAY,CAAC,CAAC,EAAE,GAAGJ;IAEvC,MAAMK,YAAYC,mBAAmBF;IACrC,MAAMG,mBAAmBD,mBAAmB;QAC1C,MAAM;IACR;IAEA,MAAME,eAAe,CAACC;QACpB,IAAIC,aAAaf,UAAUgB,gBAAgBhB,UAAUiB,cAAcjB,QACjE,OAAOkB,0BAA0BJ,OAAON,YAAYC,WAAWC,WAAWE;QAE5E,OAAOO,mBAAmBL,OAAON,YAAYC,WAAWC;IAC1D;IAEA,MAAMU,YAAYf,OAAO,KAAK,EAAE,aAAagB,iBAAiBlB,UAAUD,YAAYD,SAAS,CAAC;IAE9F,MAAMqB,aAAaC,gBAAgB;QACjC,GAAGlB,MAAM;QACT,QAAQ;QACRQ;QACAO;QACAd;IACF;IAEAR,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEwB;KAAW;IAE1C,OAAOxB;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/axes/xLinear.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/xLinear.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport type { VChartSpecPipe, XLinearAxis } from 'src/types'\nimport { createNumFormatter, isAreaPercent, isBarPercent, isColumnPercent, isPivotChart } from 'src/pipeline/utils'\nimport { createLinearFormat, createLinearPercentFormat } from './format/linearFormat'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { linearAxisStyle } from './linearAxisStyle'\n\nexport const xLinear: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { encoding, dimensions = [], measures = [] } = advancedVSeed\n  const { chartType } = vseed\n  const config = (advancedVSeed.config?.[chartType as 'bar']?.xAxis ?? {}) as XLinearAxis\n\n  if (!result.axes) {\n    result.axes = []\n  }\n  const isPivot = isPivotChart(vseed)\n\n  const { autoFormat, numFormat = {} } = config\n\n  const formatter = createNumFormatter(numFormat)\n  const percentFormatter = createNumFormatter({\n    type: 'percent',\n  })\n\n  const formatMethod = (value: string) => {\n    if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) {\n      return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter)\n    }\n    return createLinearFormat(value, autoFormat, numFormat, formatter)\n  }\n\n  const titleText = config.title?.titleText || defaultTitleText(measures, dimensions, encoding.x as string[])\n\n  const linearAxis = linearAxisStyle({\n    ...config,\n    orient: 'bottom',\n    formatMethod,\n    titleText,\n    isPivot,\n  })\n\n  result.axes = [...result.axes, linearAxis] as ISpec['axes']\n\n  return result\n}\n"],"names":["xLinear","spec","context","result","advancedVSeed","vseed","encoding","dimensions","measures","chartType","config","isPivot","isPivotChart","autoFormat","numFormat","formatter","createNumFormatter","percentFormatter","formatMethod","value","isBarPercent","isColumnPercent","isAreaPercent","createLinearPercentFormat","createLinearFormat","titleText","defaultTitleText","linearAxis","linearAxisStyle"],"mappings":";;;;AAOO,MAAMA,UAA0B,CAACC,MAAMC;IAC5C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,QAAQ,EAAEC,aAAa,EAAE,EAAEC,WAAW,EAAE,EAAE,GAAGJ;IACrD,MAAM,EAAEK,SAAS,EAAE,GAAGJ;IACtB,MAAMK,SAAUN,cAAc,MAAM,EAAE,CAACK,UAAmB,EAAE,SAAS,CAAC;IAEtE,IAAI,CAACN,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAElB,MAAMQ,UAAUC,aAAaP;IAE7B,MAAM,EAAEQ,UAAU,EAAEC,YAAY,CAAC,CAAC,EAAE,GAAGJ;IAEvC,MAAMK,YAAYC,mBAAmBF;IACrC,MAAMG,mBAAmBD,mBAAmB;QAC1C,MAAM;IACR;IAEA,MAAME,eAAe,CAACC;QACpB,IAAIC,aAAaf,UAAUgB,gBAAgBhB,UAAUiB,cAAcjB,QACjE,OAAOkB,0BAA0BJ,OAAON,YAAYC,WAAWC,WAAWE;QAE5E,OAAOO,mBAAmBL,OAAON,YAAYC,WAAWC;IAC1D;IAEA,MAAMU,YAAYf,OAAO,KAAK,EAAE,aAAagB,iBAAiBlB,UAAUD,YAAYD,SAAS,CAAC;IAE9F,MAAMqB,aAAaC,gBAAgB;QACjC,GAAGlB,MAAM;QACT,QAAQ;QACRQ;QACAO;QACAd;IACF;IAEAR,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEwB;KAAW;IAE1C,OAAOxB;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/axes/yBand.js

@@ -8,7 +8,7 @@ const yBand = (spec, context)=>{
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
-    const { measures, dimensions, encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed;
+    const { measures = [], dimensions = [], encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed;
     const config = advancedVSeed.config?.[chartType]?.yAxis ?? {};
     if (!result.axes) result.axes = [];
     const { labelAutoLimitLength = 80 } = config;

package/dist/esm/pipeline/spec/chart/pipes/axes/yBand.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/axes/yBand.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/yBand.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport type { VChartSpecPipe, XBandAxis } from 'src/types'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { MeasureId } from 'src/dataReshape'\nimport { isArray, isNull } from '@visactor/vutils'\nimport { bandAxisStyle } from './bandAxisStyle'\n\nexport const yBand: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { measures, dimensions, encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed\n  const config = (advancedVSeed.config?.[chartType as 'bar']?.yAxis ?? {}) as XBandAxis\n\n  if (!result.axes) {\n    result.axes = []\n  }\n\n  const { labelAutoLimitLength = 80 } = config\n\n  const onlyMeasureId = (encoding.y || []).filter((v) => v !== MeasureId).length === 0\n\n  const bandAxis = bandAxisStyle(config)\n\n  bandAxis.type = 'band'\n  bandAxis.orient = 'left'\n  bandAxis.maxWidth = labelAutoLimitLength + 60\n  if (bandAxis.label) {\n    bandAxis.label.containerAlign = 'right'\n  }\n  bandAxis.paddingInner = [0.15, 0.1]\n  bandAxis.paddingOuter = [0.075, 0.1]\n\n  if (isNull(bandAxis.title?.text)) {\n    bandAxis.title.text = defaultTitleText(measures, dimensions, encoding.y as string[])\n  }\n  if (onlyMeasureId && bandAxis.label) {\n    const allDatasetReshapeInfo = pivotAllDatasetReshapeInfo || datasetReshapeInfo\n    const colorIdMap = allDatasetReshapeInfo.reduce<Record<string, { id: string; alias: string }>>((prev, cur) => {\n      return { ...prev, ...cur.unfoldInfo.colorIdMap }\n    }, {})\n\n    bandAxis.label.formatMethod = (text: string | string[]) => {\n      return isArray(text) ? text : (colorIdMap[String(text)]?.alias ?? text)\n    }\n  }\n\n  result.axes = [...result.axes, bandAxis] as ISpec['axes']\n  return result\n}\n"],"names":["yBand","spec","context","result","advancedVSeed","vseed","chartType","measures","dimensions","encoding","datasetReshapeInfo","pivotAllDatasetReshapeInfo","config","labelAutoLimitLength","onlyMeasureId","v","MeasureId","bandAxis","bandAxisStyle","isNull","defaultTitleText","allDatasetReshapeInfo","colorIdMap","prev","cur","text","isArray","String"],"mappings":";;;;AAOO,MAAMA,QAAwB,CAACC,MAAMC;IAC1C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,QAAQ,EAAEC,UAAU,EAAEC,QAAQ,EAAEC,kBAAkB,EAAEC,0BAA0B,EAAE,GAAGP;IAC3F,MAAMQ,SAAUR,cAAc,MAAM,EAAE,CAACE,UAAmB,EAAE,SAAS,CAAC;IAEtE,IAAI,CAACH,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAGlB,MAAM,EAAEU,uBAAuB,EAAE,EAAE,GAAGD;IAEtC,MAAME,gBAAiBL,AAA4D,MAA5DA,AAAAA,CAAAA,SAAS,CAAC,IAAI,EAAC,EAAG,MAAM,CAAC,CAACM,IAAMA,MAAMC,WAAW,MAAM;IAE9E,MAAMC,WAAWC,cAAcN;IAE/BK,SAAS,IAAI,GAAG;IAChBA,SAAS,MAAM,GAAG;IAClBA,SAAS,QAAQ,GAAGJ,uBAAuB;IAC3C,IAAII,SAAS,KAAK,EAChBA,SAAS,KAAK,CAAC,cAAc,GAAG;IAElCA,SAAS,YAAY,GAAG;QAAC;QAAM;KAAI;IACnCA,SAAS,YAAY,GAAG;QAAC;QAAO;KAAI;IAEpC,IAAIE,OAAOF,SAAS,KAAK,EAAE,OACzBA,SAAS,KAAK,CAAC,IAAI,GAAGG,iBAAiBb,UAAUC,YAAYC,SAAS,CAAC;IAEzE,IAAIK,iBAAiBG,SAAS,KAAK,EAAE;QACnC,MAAMI,wBAAwBV,8BAA8BD;QAC5D,MAAMY,aAAaD,sBAAsB,MAAM,CAAgD,CAACE,MAAMC,MAC7F;gBAAE,GAAGD,IAAI;gBAAE,GAAGC,IAAI,UAAU,CAAC,UAAU;YAAC,IAC9C,CAAC;QAEJP,SAAS,KAAK,CAAC,YAAY,GAAG,CAACQ,OACtBC,QAAQD,QAAQA,OAAQH,UAAU,CAACK,OAAOF,MAAM,EAAE,SAASA;IAEtE;IAEAtB,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEc;KAAS;IACxC,OAAOd;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/axes/yBand.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/yBand.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport type { VChartSpecPipe, XBandAxis } from 'src/types'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { MeasureId } from 'src/dataReshape'\nimport { isArray, isNull } from '@visactor/vutils'\nimport { bandAxisStyle } from './bandAxisStyle'\n\nexport const yBand: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { measures = [], dimensions = [], encoding, datasetReshapeInfo, pivotAllDatasetReshapeInfo } = advancedVSeed\n  const config = (advancedVSeed.config?.[chartType as 'bar']?.yAxis ?? {}) as XBandAxis\n\n  if (!result.axes) {\n    result.axes = []\n  }\n\n  const { labelAutoLimitLength = 80 } = config\n\n  const onlyMeasureId = (encoding.y || []).filter((v) => v !== MeasureId).length === 0\n\n  const bandAxis = bandAxisStyle(config)\n\n  bandAxis.type = 'band'\n  bandAxis.orient = 'left'\n  bandAxis.maxWidth = labelAutoLimitLength + 60\n  if (bandAxis.label) {\n    bandAxis.label.containerAlign = 'right'\n  }\n  bandAxis.paddingInner = [0.15, 0.1]\n  bandAxis.paddingOuter = [0.075, 0.1]\n\n  if (isNull(bandAxis.title?.text)) {\n    bandAxis.title!.text = defaultTitleText(measures, dimensions, encoding.y as string[])\n  }\n  if (onlyMeasureId && bandAxis.label) {\n    const allDatasetReshapeInfo = pivotAllDatasetReshapeInfo || datasetReshapeInfo\n    const colorIdMap = allDatasetReshapeInfo.reduce<Record<string, { id: string; alias: string }>>((prev, cur) => {\n      return { ...prev, ...cur.unfoldInfo.colorIdMap }\n    }, {})\n\n    bandAxis.label.formatMethod = (text: string | string[]) => {\n      return isArray(text) ? text : (colorIdMap[String(text)]?.alias ?? text)\n    }\n  }\n\n  result.axes = [...result.axes, bandAxis] as ISpec['axes']\n  return result\n}\n"],"names":["yBand","spec","context","result","advancedVSeed","vseed","chartType","measures","dimensions","encoding","datasetReshapeInfo","pivotAllDatasetReshapeInfo","config","labelAutoLimitLength","onlyMeasureId","v","MeasureId","bandAxis","bandAxisStyle","isNull","defaultTitleText","allDatasetReshapeInfo","colorIdMap","prev","cur","text","isArray","String"],"mappings":";;;;AAOO,MAAMA,QAAwB,CAACC,MAAMC;IAC1C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,WAAW,EAAE,EAAEC,aAAa,EAAE,EAAEC,QAAQ,EAAEC,kBAAkB,EAAEC,0BAA0B,EAAE,GAAGP;IACrG,MAAMQ,SAAUR,cAAc,MAAM,EAAE,CAACE,UAAmB,EAAE,SAAS,CAAC;IAEtE,IAAI,CAACH,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAGlB,MAAM,EAAEU,uBAAuB,EAAE,EAAE,GAAGD;IAEtC,MAAME,gBAAiBL,AAA4D,MAA5DA,AAAAA,CAAAA,SAAS,CAAC,IAAI,EAAC,EAAG,MAAM,CAAC,CAACM,IAAMA,MAAMC,WAAW,MAAM;IAE9E,MAAMC,WAAWC,cAAcN;IAE/BK,SAAS,IAAI,GAAG;IAChBA,SAAS,MAAM,GAAG;IAClBA,SAAS,QAAQ,GAAGJ,uBAAuB;IAC3C,IAAII,SAAS,KAAK,EAChBA,SAAS,KAAK,CAAC,cAAc,GAAG;IAElCA,SAAS,YAAY,GAAG;QAAC;QAAM;KAAI;IACnCA,SAAS,YAAY,GAAG;QAAC;QAAO;KAAI;IAEpC,IAAIE,OAAOF,SAAS,KAAK,EAAE,OACzBA,SAAS,KAAK,CAAE,IAAI,GAAGG,iBAAiBb,UAAUC,YAAYC,SAAS,CAAC;IAE1E,IAAIK,iBAAiBG,SAAS,KAAK,EAAE;QACnC,MAAMI,wBAAwBV,8BAA8BD;QAC5D,MAAMY,aAAaD,sBAAsB,MAAM,CAAgD,CAACE,MAAMC,MAC7F;gBAAE,GAAGD,IAAI;gBAAE,GAAGC,IAAI,UAAU,CAAC,UAAU;YAAC,IAC9C,CAAC;QAEJP,SAAS,KAAK,CAAC,YAAY,GAAG,CAACQ,OACtBC,QAAQD,QAAQA,OAAQH,UAAU,CAACK,OAAOF,MAAM,EAAE,SAASA;IAEtE;IAEAtB,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEc;KAAS;IACxC,OAAOd;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/axes/yLinear.js

@@ -8,7 +8,7 @@ const yLinear = (spec, context)=>{
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
-    const { measures, dimensions, encoding } = advancedVSeed;
+    const { measures = [], dimensions = [], encoding } = advancedVSeed;
     const config = advancedVSeed.config?.[chartType]?.yAxis ?? {};
     if (!result.axes) result.axes = [];
     const isPivot = isPivotChart(vseed);

package/dist/esm/pipeline/spec/chart/pipes/axes/yLinear.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/axes/yLinear.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/yLinear.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport { createNumFormatter, isAreaPercent, isBarPercent, isColumnPercent, isPivotChart } from 'src/pipeline/utils'\nimport type { VChartSpecPipe, YLinearAxis } from 'src/types'\nimport { createLinearFormat, createLinearPercentFormat } from './format/linearFormat'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { linearAxisStyle } from './linearAxisStyle'\n\nexport const yLinear: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { measures, dimensions, encoding } = advancedVSeed\n  const config = (advancedVSeed.config?.[chartType as 'column']?.yAxis ?? {}) as YLinearAxis\n\n  if (!result.axes) {\n    result.axes = []\n  }\n  const isPivot = isPivotChart(vseed)\n\n  const { autoFormat, numFormat = {} } = config\n\n  const formatter = createNumFormatter(numFormat)\n  const percentFormatter = createNumFormatter({\n    type: 'percent',\n  })\n\n  const formatMethod = (value: string) => {\n    if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) {\n      return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter)\n    }\n    return createLinearFormat(value, autoFormat, numFormat, formatter)\n  }\n\n  const titleText = config.title?.titleText || defaultTitleText(measures, dimensions, encoding.y as string[])\n\n  const linearAxis = linearAxisStyle({\n    ...config,\n    orient: 'left',\n    formatMethod,\n    titleText,\n    isPivot,\n  })\n\n  result.axes = [...result.axes, linearAxis] as ISpec['axes']\n\n  return result\n}\n"],"names":["yLinear","spec","context","result","advancedVSeed","vseed","chartType","measures","dimensions","encoding","config","isPivot","isPivotChart","autoFormat","numFormat","formatter","createNumFormatter","percentFormatter","formatMethod","value","isBarPercent","isColumnPercent","isAreaPercent","createLinearPercentFormat","createLinearFormat","titleText","defaultTitleText","linearAxis","linearAxisStyle"],"mappings":";;;;AAOO,MAAMA,UAA0B,CAACC,MAAMC;IAC5C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,QAAQ,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGL;IAC3C,MAAMM,SAAUN,cAAc,MAAM,EAAE,CAACE,UAAsB,EAAE,SAAS,CAAC;IAEzE,IAAI,CAACH,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAElB,MAAMQ,UAAUC,aAAaP;IAE7B,MAAM,EAAEQ,UAAU,EAAEC,YAAY,CAAC,CAAC,EAAE,GAAGJ;IAEvC,MAAMK,YAAYC,mBAAmBF;IACrC,MAAMG,mBAAmBD,mBAAmB;QAC1C,MAAM;IACR;IAEA,MAAME,eAAe,CAACC;QACpB,IAAIC,aAAaf,UAAUgB,gBAAgBhB,UAAUiB,cAAcjB,QACjE,OAAOkB,0BAA0BJ,OAAON,YAAYC,WAAWC,WAAWE;QAE5E,OAAOO,mBAAmBL,OAAON,YAAYC,WAAWC;IAC1D;IAEA,MAAMU,YAAYf,OAAO,KAAK,EAAE,aAAagB,iBAAiBnB,UAAUC,YAAYC,SAAS,CAAC;IAE9F,MAAMkB,aAAaC,gBAAgB;QACjC,GAAGlB,MAAM;QACT,QAAQ;QACRQ;QACAO;QACAd;IACF;IAEAR,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEwB;KAAW;IAE1C,OAAOxB;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/axes/yLinear.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/yLinear.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport { createNumFormatter, isAreaPercent, isBarPercent, isColumnPercent, isPivotChart } from 'src/pipeline/utils'\nimport type { VChartSpecPipe, YLinearAxis } from 'src/types'\nimport { createLinearFormat, createLinearPercentFormat } from './format/linearFormat'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { linearAxisStyle } from './linearAxisStyle'\n\nexport const yLinear: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { measures = [], dimensions = [], encoding } = advancedVSeed\n  const config = (advancedVSeed.config?.[chartType as 'column']?.yAxis ?? {}) as YLinearAxis\n\n  if (!result.axes) {\n    result.axes = []\n  }\n  const isPivot = isPivotChart(vseed)\n\n  const { autoFormat, numFormat = {} } = config\n\n  const formatter = createNumFormatter(numFormat)\n  const percentFormatter = createNumFormatter({\n    type: 'percent',\n  })\n\n  const formatMethod = (value: string) => {\n    if (isBarPercent(vseed) || isColumnPercent(vseed) || isAreaPercent(vseed)) {\n      return createLinearPercentFormat(value, autoFormat, numFormat, formatter, percentFormatter)\n    }\n    return createLinearFormat(value, autoFormat, numFormat, formatter)\n  }\n\n  const titleText = config.title?.titleText || defaultTitleText(measures, dimensions, encoding.y as string[])\n\n  const linearAxis = linearAxisStyle({\n    ...config,\n    orient: 'left',\n    formatMethod,\n    titleText,\n    isPivot,\n  })\n\n  result.axes = [...result.axes, linearAxis] as ISpec['axes']\n\n  return result\n}\n"],"names":["yLinear","spec","context","result","advancedVSeed","vseed","chartType","measures","dimensions","encoding","config","isPivot","isPivotChart","autoFormat","numFormat","formatter","createNumFormatter","percentFormatter","formatMethod","value","isBarPercent","isColumnPercent","isAreaPercent","createLinearPercentFormat","createLinearFormat","titleText","defaultTitleText","linearAxis","linearAxisStyle"],"mappings":";;;;AAOO,MAAMA,UAA0B,CAACC,MAAMC;IAC5C,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,WAAW,EAAE,EAAEC,aAAa,EAAE,EAAEC,QAAQ,EAAE,GAAGL;IACrD,MAAMM,SAAUN,cAAc,MAAM,EAAE,CAACE,UAAsB,EAAE,SAAS,CAAC;IAEzE,IAAI,CAACH,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAElB,MAAMQ,UAAUC,aAAaP;IAE7B,MAAM,EAAEQ,UAAU,EAAEC,YAAY,CAAC,CAAC,EAAE,GAAGJ;IAEvC,MAAMK,YAAYC,mBAAmBF;IACrC,MAAMG,mBAAmBD,mBAAmB;QAC1C,MAAM;IACR;IAEA,MAAME,eAAe,CAACC;QACpB,IAAIC,aAAaf,UAAUgB,gBAAgBhB,UAAUiB,cAAcjB,QACjE,OAAOkB,0BAA0BJ,OAAON,YAAYC,WAAWC,WAAWE;QAE5E,OAAOO,mBAAmBL,OAAON,YAAYC,WAAWC;IAC1D;IAEA,MAAMU,YAAYf,OAAO,KAAK,EAAE,aAAagB,iBAAiBnB,UAAUC,YAAYC,SAAS,CAAC;IAE9F,MAAMkB,aAAaC,gBAAgB;QACjC,GAAGlB,MAAM;QACT,QAAQ;QACRQ;QACAO;QACAd;IACF;IAEAR,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEwB;KAAW;IAE1C,OAAOxB;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/axes/yLinearPrimary.js

@@ -1,33 +1,36 @@
-import { createNumFormatter } from "../../../../utils/index.js";
-import { isEmpty, isNullish } from "remeda";
+import { createNumFormatter, flatReshapeMeasures } from "../../../../utils/index.js";
 import { createLinearFormat } from "./format/linearFormat.js";
-import { defaultTitleText } from "./title/defaultTitleText.js";
 import { linearAxisStyle } from "./linearAxisStyle.js";
+import { FoldPrimaryMeasureValue } from "../../../../../dataReshape/index.js";
 const yLinearPrimary = (spec, context)=>{
     const result = {
         ...spec
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
-    const { datasetReshapeInfo, encoding, measures, dimensions } = advancedVSeed;
+    const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed;
     const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0];
     const primaryYAxis = advancedVSeed.config?.[chartType]?.primaryYAxis;
     const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis;
     const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
     const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-    if (isNullish(foldInfoList?.[0])) return result;
-    const isEmptySecondary = isEmpty(foldInfoList?.[0].foldMap);
+    if (!foldInfoList) return result;
+    const primaryFoldInfoList = foldInfoList.filter((f)=>f.measureValue.startsWith(FoldPrimaryMeasureValue));
+    const isEmpty = !primaryFoldInfoList.length || primaryFoldInfoList.every((foldInfo)=>!Object.keys(foldInfo.foldMap).length);
     const id = `${reshapeInfoId}-primary-axis`;
-    const seriesIds = [
-        `${reshapeInfoId}-primary-series`,
-        `${reshapeInfoId}-secondary-series`
-    ];
-    const seriesId = alignTicksConfig ? seriesIds : seriesIds[0];
+    const seriesId = alignTicksConfig ? spec.series.map((s)=>s.id) : spec.series.filter((s)=>s.yField.startsWith(FoldPrimaryMeasureValue)).map((s)=>s.id);
     if (!result.axes) result.axes = [];
     const { autoFormat, numFormat = {} } = yAxisConfig ?? {};
     const formatter = createNumFormatter(numFormat);
     const formatMethod = (value)=>createLinearFormat(value, autoFormat, numFormat, formatter);
-    const titleText = yAxisConfig?.title?.titleText || defaultTitleText(measures, dimensions, encoding.y);
+    const measures = flatReshapeMeasures(reshapeMeasures);
+    const measureIds = primaryFoldInfoList.reduce((res, foldInfo)=>{
+        Object.keys(foldInfo.foldMap).forEach((k)=>{
+            if (!res.includes(k)) res.push(k);
+        });
+        return res;
+    }, []);
+    const titleText = yAxisConfig?.title?.titleText || measures.filter((m)=>'primaryYAxis' === m.encoding && measureIds.includes(m.id)).map((m)=>m.alias ?? m.id).join(' & ');
     const linearAxis = {
         ...linearAxisStyle({
             ...yAxisConfig,
@@ -37,7 +40,7 @@ const yLinearPrimary = (spec, context)=>{
             id,
             seriesId
         }),
-        visible: isEmptySecondary ? false : yAxisConfig?.visible ?? true
+        visible: isEmpty ? false : yAxisConfig?.visible ?? true
     };
     result.axes = [
         ...result.axes,

package/dist/esm/pipeline/spec/chart/pipes/axes/yLinearPrimary.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/axes/yLinearPrimary.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/yLinearPrimary.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport { createNumFormatter } from '../../../../utils'\nimport type { VChartSpecPipe, YLinearAxis } from 'src/types'\nimport { isEmpty, isNullish } from 'remeda'\nimport { createLinearFormat } from './format/linearFormat'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { linearAxisStyle } from './linearAxisStyle'\n\nexport const yLinearPrimary: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { datasetReshapeInfo, encoding, measures, dimensions } = advancedVSeed\n  const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0]\n  // TODO: default config missing\n  const primaryYAxis = advancedVSeed.config?.[chartType as 'dualAxis']?.primaryYAxis as YLinearAxis | YLinearAxis[]\n  const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis\n  const alignTicks = advancedVSeed.config?.[chartType as 'dualAxis']?.alignTicks as boolean | boolean[]\n  const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks\n\n  if (isNullish(foldInfoList?.[0])) {\n    return result\n  }\n\n  const isEmptySecondary = isEmpty(foldInfoList?.[0].foldMap)\n\n  const id = `${reshapeInfoId}-primary-axis`\n  const seriesIds = [`${reshapeInfoId}-primary-series`, `${reshapeInfoId}-secondary-series`]\n  const seriesId = alignTicksConfig ? seriesIds : seriesIds[0]\n\n  if (!result.axes) {\n    result.axes = []\n  }\n\n  const { autoFormat, numFormat = {} } = yAxisConfig ?? {}\n\n  const formatter = createNumFormatter(numFormat)\n\n  const formatMethod = (value: string) => {\n    return createLinearFormat(value, autoFormat, numFormat, formatter)\n  }\n\n  const titleText = yAxisConfig?.title?.titleText || defaultTitleText(measures, dimensions, encoding.y as string[])\n\n  const linearAxis = {\n    ...linearAxisStyle({\n      ...yAxisConfig,\n      orient: 'left',\n      formatMethod,\n      titleText,\n      id,\n      seriesId,\n    }),\n    visible: isEmptySecondary ? false : (yAxisConfig?.visible ?? true),\n  }\n\n  result.axes = [...result.axes, linearAxis] as ISpec['axes']\n\n  return result\n}\n"],"names":["yLinearPrimary","spec","context","result","advancedVSeed","vseed","chartType","datasetReshapeInfo","encoding","measures","dimensions","index","reshapeInfoId","foldInfoList","primaryYAxis","yAxisConfig","Array","alignTicks","alignTicksConfig","isNullish","isEmptySecondary","isEmpty","id","seriesIds","seriesId","autoFormat","numFormat","formatter","createNumFormatter","formatMethod","value","createLinearFormat","titleText","defaultTitleText","linearAxis","linearAxisStyle"],"mappings":";;;;;AAQO,MAAMA,iBAAiC,CAACC,MAAMC;IACnD,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,kBAAkB,EAAEC,QAAQ,EAAEC,QAAQ,EAAEC,UAAU,EAAE,GAAGN;IAC/D,MAAM,EAAEO,KAAK,EAAE,IAAIC,aAAa,EAAEC,YAAY,EAAE,GAAGN,kBAAkB,CAAC,EAAE;IAExE,MAAMO,eAAeV,cAAc,MAAM,EAAE,CAACE,UAAwB,EAAE;IACtE,MAAMS,cAAcC,MAAM,OAAO,CAACF,gBAAgBA,YAAY,CAACH,MAAM,IAAIG,YAAY,CAAC,EAAE,GAAGA;IAC3F,MAAMG,aAAab,cAAc,MAAM,EAAE,CAACE,UAAwB,EAAE;IACpE,MAAMY,mBAAmBF,MAAM,OAAO,CAACC,cAAcA,UAAU,CAACN,MAAM,IAAIM,UAAU,CAAC,EAAE,GAAGA;IAE1F,IAAIE,UAAUN,cAAc,CAAC,EAAE,GAC7B,OAAOV;IAGT,MAAMiB,mBAAmBC,QAAQR,cAAc,CAAC,EAAE,CAAC;IAEnD,MAAMS,KAAK,GAAGV,cAAc,aAAa,CAAC;IAC1C,MAAMW,YAAY;QAAC,GAAGX,cAAc,eAAe,CAAC;QAAE,GAAGA,cAAc,iBAAiB,CAAC;KAAC;IAC1F,MAAMY,WAAWN,mBAAmBK,YAAYA,SAAS,CAAC,EAAE;IAE5D,IAAI,CAACpB,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAGlB,MAAM,EAAEsB,UAAU,EAAEC,YAAY,CAAC,CAAC,EAAE,GAAGX,eAAe,CAAC;IAEvD,MAAMY,YAAYC,mBAAmBF;IAErC,MAAMG,eAAe,CAACC,QACbC,mBAAmBD,OAAOL,YAAYC,WAAWC;IAG1D,MAAMK,YAAYjB,aAAa,OAAO,aAAakB,iBAAiBxB,UAAUC,YAAYF,SAAS,CAAC;IAEpG,MAAM0B,aAAa;QACjB,GAAGC,gBAAgB;YACjB,GAAGpB,WAAW;YACd,QAAQ;YACRc;YACAG;YACAV;YACAE;QACF,EAAE;QACF,SAASJ,mBAAmB,QAASL,aAAa,WAAW;IAC/D;IAEAZ,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAE+B;KAAW;IAE1C,OAAO/B;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/axes/yLinearPrimary.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/yLinearPrimary.ts"],"sourcesContent":["import type { ILineSeriesSpec, ISpec } from '@visactor/vchart'\nimport { createNumFormatter, flatReshapeMeasures } from '../../../../utils'\nimport type { VChartSpecPipe, YLinearAxis } from 'src/types'\nimport { createLinearFormat } from './format/linearFormat'\nimport { linearAxisStyle } from './linearAxisStyle'\nimport { FoldPrimaryMeasureValue } from 'src/dataReshape'\n\nexport const yLinearPrimary: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed\n  const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0]\n  // TODO: default config missing\n  const primaryYAxis = advancedVSeed.config?.[chartType as 'dualAxis']?.primaryYAxis as YLinearAxis | YLinearAxis[]\n  const yAxisConfig = Array.isArray(primaryYAxis) ? primaryYAxis[index] || primaryYAxis[0] : primaryYAxis\n  const alignTicks = advancedVSeed.config?.[chartType as 'dualAxis']?.alignTicks as boolean | boolean[]\n  const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks\n\n  if (!foldInfoList) {\n    return result\n  }\n  const primaryFoldInfoList = foldInfoList!.filter((f) => f.measureValue.startsWith(FoldPrimaryMeasureValue))\n\n  const isEmpty =\n    !primaryFoldInfoList.length || primaryFoldInfoList.every((foldInfo) => !Object.keys(foldInfo.foldMap).length)\n\n  const id = `${reshapeInfoId}-primary-axis`\n\n  const seriesId = alignTicksConfig\n    ? spec.series!.map((s) => (s as any).id)\n    : spec\n        .series!.filter((s) => ((s as ILineSeriesSpec).yField as string).startsWith(FoldPrimaryMeasureValue))\n        .map((s) => (s as any).id)\n\n  if (!result.axes) {\n    result.axes = []\n  }\n\n  const { autoFormat, numFormat = {} } = yAxisConfig ?? {}\n\n  const formatter = createNumFormatter(numFormat)\n\n  const formatMethod = (value: string) => {\n    return createLinearFormat(value, autoFormat, numFormat, formatter)\n  }\n\n  const measures = flatReshapeMeasures(reshapeMeasures)\n  const measureIds = primaryFoldInfoList.reduce((res: string[], foldInfo) => {\n    Object.keys(foldInfo.foldMap).forEach((k) => {\n      if (!res.includes(k)) {\n        res.push(k)\n      }\n    })\n    return res\n  }, [])\n  const titleText =\n    yAxisConfig?.title?.titleText ||\n    measures\n      .filter((m) => m.encoding === 'primaryYAxis' && measureIds.includes(m.id))\n      .map((m) => m.alias ?? m.id)\n      .join(' & ')\n\n  const linearAxis = {\n    ...linearAxisStyle({\n      ...yAxisConfig,\n      orient: 'left',\n      formatMethod,\n      titleText,\n      id,\n      seriesId,\n    }),\n    visible: isEmpty ? false : (yAxisConfig?.visible ?? true),\n  }\n\n  result.axes = [...result.axes, linearAxis] as ISpec['axes']\n\n  return result\n}\n"],"names":["yLinearPrimary","spec","context","result","advancedVSeed","vseed","chartType","datasetReshapeInfo","reshapeMeasures","index","reshapeInfoId","foldInfoList","primaryYAxis","yAxisConfig","Array","alignTicks","alignTicksConfig","primaryFoldInfoList","f","FoldPrimaryMeasureValue","isEmpty","foldInfo","Object","id","seriesId","s","autoFormat","numFormat","formatter","createNumFormatter","formatMethod","value","createLinearFormat","measures","flatReshapeMeasures","measureIds","res","k","titleText","m","linearAxis","linearAxisStyle"],"mappings":";;;;AAOO,MAAMA,iBAAiC,CAACC,MAAMC;IACnD,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,kBAAkB,EAAEC,kBAAkB,EAAE,EAAE,GAAGJ;IACrD,MAAM,EAAEK,KAAK,EAAE,IAAIC,aAAa,EAAEC,YAAY,EAAE,GAAGJ,kBAAkB,CAAC,EAAE;IAExE,MAAMK,eAAeR,cAAc,MAAM,EAAE,CAACE,UAAwB,EAAE;IACtE,MAAMO,cAAcC,MAAM,OAAO,CAACF,gBAAgBA,YAAY,CAACH,MAAM,IAAIG,YAAY,CAAC,EAAE,GAAGA;IAC3F,MAAMG,aAAaX,cAAc,MAAM,EAAE,CAACE,UAAwB,EAAE;IACpE,MAAMU,mBAAmBF,MAAM,OAAO,CAACC,cAAcA,UAAU,CAACN,MAAM,IAAIM,UAAU,CAAC,EAAE,GAAGA;IAE1F,IAAI,CAACJ,cACH,OAAOR;IAET,MAAMc,sBAAsBN,aAAc,MAAM,CAAC,CAACO,IAAMA,EAAE,YAAY,CAAC,UAAU,CAACC;IAElF,MAAMC,UACJ,CAACH,oBAAoB,MAAM,IAAIA,oBAAoB,KAAK,CAAC,CAACI,WAAa,CAACC,OAAO,IAAI,CAACD,SAAS,OAAO,EAAE,MAAM;IAE9G,MAAME,KAAK,GAAGb,cAAc,aAAa,CAAC;IAE1C,MAAMc,WAAWR,mBACbf,KAAK,MAAM,CAAE,GAAG,CAAC,CAACwB,IAAOA,EAAU,EAAE,IACrCxB,KACG,MAAM,CAAE,MAAM,CAAC,CAACwB,IAAQA,EAAsB,MAAM,CAAY,UAAU,CAACN,0BAC3E,GAAG,CAAC,CAACM,IAAOA,EAAU,EAAE;IAE/B,IAAI,CAACtB,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAGlB,MAAM,EAAEuB,UAAU,EAAEC,YAAY,CAAC,CAAC,EAAE,GAAGd,eAAe,CAAC;IAEvD,MAAMe,YAAYC,mBAAmBF;IAErC,MAAMG,eAAe,CAACC,QACbC,mBAAmBD,OAAOL,YAAYC,WAAWC;IAG1D,MAAMK,WAAWC,oBAAoB1B;IACrC,MAAM2B,aAAalB,oBAAoB,MAAM,CAAC,CAACmB,KAAef;QAC5DC,OAAO,IAAI,CAACD,SAAS,OAAO,EAAE,OAAO,CAAC,CAACgB;YACrC,IAAI,CAACD,IAAI,QAAQ,CAACC,IAChBD,IAAI,IAAI,CAACC;QAEb;QACA,OAAOD;IACT,GAAG,EAAE;IACL,MAAME,YACJzB,aAAa,OAAO,aACpBoB,SACG,MAAM,CAAC,CAACM,IAAMA,AAAe,mBAAfA,EAAE,QAAQ,IAAuBJ,WAAW,QAAQ,CAACI,EAAE,EAAE,GACvE,GAAG,CAAC,CAACA,IAAMA,EAAE,KAAK,IAAIA,EAAE,EAAE,EAC1B,IAAI,CAAC;IAEV,MAAMC,aAAa;QACjB,GAAGC,gBAAgB;YACjB,GAAG5B,WAAW;YACd,QAAQ;YACRiB;YACAQ;YACAf;YACAC;QACF,EAAE;QACF,SAASJ,UAAU,QAASP,aAAa,WAAW;IACtD;IAEAV,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEqC;KAAW;IAE1C,OAAOrC;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/axes/yLinearSecondary.js

@@ -1,38 +1,35 @@
-import { createNumFormatter } from "../../../../utils/index.js";
-import { isEmpty, isNullish } from "remeda";
+import { createNumFormatter, flatReshapeMeasures } from "../../../../utils/index.js";
 import { createLinearFormat } from "./format/linearFormat.js";
-import { defaultTitleText } from "./title/defaultTitleText.js";
 import { linearAxisStyle } from "./linearAxisStyle.js";
+import { FoldSecondaryMeasureValue } from "../../../../../dataReshape/index.js";
 const yLinearSecondary = (spec, context)=>{
     const result = {
         ...spec
     };
     const { advancedVSeed, vseed } = context;
     const { chartType } = vseed;
-    const { datasetReshapeInfo, measures, dimensions, encoding } = advancedVSeed;
+    const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed;
     const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0];
     const secondaryYAxis = advancedVSeed.config?.[chartType]?.secondaryYAxis;
     const yAxisConfig = Array.isArray(secondaryYAxis) ? secondaryYAxis[index] || secondaryYAxis[0] : secondaryYAxis;
     const alignTicks = advancedVSeed.config?.[chartType]?.alignTicks;
     const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks;
-    if (isNullish(foldInfoList?.[1])) return result;
-    const isEmptySecondary = isEmpty(foldInfoList?.[1].foldMap);
-    const onlySecondary = isEmpty(foldInfoList?.[0].foldMap) && !isEmptySecondary;
+    if (!foldInfoList) return result;
+    const secondaryFoldInfoList = foldInfoList.filter((f)=>f.measureValue.startsWith(FoldSecondaryMeasureValue));
+    const isEmptySecondary = !secondaryFoldInfoList.length || secondaryFoldInfoList.every((foldInfo)=>!Object.keys(foldInfo.foldMap).length);
+    const onlySecondary = !isEmptySecondary && foldInfoList.length && foldInfoList.every((f)=>f.measureValue.startsWith(FoldSecondaryMeasureValue) || 0 === Object.keys(f.foldMap).length);
     const sync = {
         axisId: `${reshapeInfoId}-primary-axis`,
         zeroAlign: true
     };
     const id = `${reshapeInfoId}-secondary-axis`;
-    const seriesIds = [
-        `${reshapeInfoId}-primary-series`,
-        `${reshapeInfoId}-secondary-series`
-    ];
-    const seriesId = alignTicksConfig ? seriesIds : seriesIds[1];
+    const seriesId = alignTicksConfig ? spec.series.map((s)=>s.id) : spec.series.filter((s)=>s.yField.startsWith(FoldSecondaryMeasureValue)).map((s)=>s.id);
     if (!result.axes) result.axes = [];
     const { autoFormat, numFormat = {} } = yAxisConfig ?? {};
     const formatter = createNumFormatter(numFormat);
     const formatMethod = (value)=>createLinearFormat(value, autoFormat, numFormat, formatter);
-    const titleText = yAxisConfig?.title?.titleText || defaultTitleText(measures, dimensions, encoding.y);
+    const measures = flatReshapeMeasures(reshapeMeasures);
+    const titleText = yAxisConfig?.title?.titleText || measures.filter((m)=>'secondaryYAxis' === m.encoding).map((m)=>m.alias ?? m.id).join(' & ');
     const baseStyle = linearAxisStyle({
         ...yAxisConfig,
         orient: 'right',

package/dist/esm/pipeline/spec/chart/pipes/axes/yLinearSecondary.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/axes/yLinearSecondary.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/yLinearSecondary.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport { createNumFormatter } from '../../../../utils'\nimport type { VChartSpecPipe, YLinearAxis } from 'src/types'\nimport { isEmpty, isNullish } from 'remeda'\nimport { createLinearFormat } from './format/linearFormat'\nimport { defaultTitleText } from './title/defaultTitleText'\nimport { linearAxisStyle } from './linearAxisStyle'\n\nexport const yLinearSecondary: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { datasetReshapeInfo, measures, dimensions, encoding } = advancedVSeed\n  const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0]\n  // TODO: default config missing\n  const secondaryYAxis = advancedVSeed.config?.[chartType as 'dualAxis']?.secondaryYAxis as YLinearAxis | YLinearAxis[]\n  const yAxisConfig = Array.isArray(secondaryYAxis) ? secondaryYAxis[index] || secondaryYAxis[0] : secondaryYAxis\n  const alignTicks = advancedVSeed.config?.[chartType as 'dualAxis']?.alignTicks as boolean | boolean[]\n  const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks\n\n  if (isNullish(foldInfoList?.[1])) {\n    return result\n  }\n\n  const isEmptySecondary = isEmpty(foldInfoList?.[1].foldMap)\n  const onlySecondary = isEmpty(foldInfoList?.[0].foldMap) && !isEmptySecondary\n\n  const sync = {\n    axisId: `${reshapeInfoId}-primary-axis`,\n    zeroAlign: true,\n  }\n\n  const id = `${reshapeInfoId}-secondary-axis`\n  const seriesIds = [`${reshapeInfoId}-primary-series`, `${reshapeInfoId}-secondary-series`]\n  const seriesId = alignTicksConfig ? seriesIds : seriesIds[1]\n  if (!result.axes) {\n    result.axes = []\n  }\n\n  const { autoFormat, numFormat = {} } = yAxisConfig ?? {}\n\n  const formatter = createNumFormatter(numFormat)\n\n  const formatMethod = (value: string) => {\n    return createLinearFormat(value, autoFormat, numFormat, formatter)\n  }\n\n  const titleText = yAxisConfig?.title?.titleText || defaultTitleText(measures, dimensions, encoding.y as string[])\n\n  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n  const baseStyle = linearAxisStyle({\n    ...yAxisConfig,\n    orient: 'right',\n    formatMethod,\n    titleText,\n    id,\n    seriesId,\n    sync,\n  })\n\n  // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n  const linearAxis = {\n    ...baseStyle,\n    visible: isEmptySecondary ? false : (yAxisConfig?.visible ?? true),\n    // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment\n    grid: {\n      // eslint-disable-next-line @typescript-eslint/no-unsafe-member-access\n      ...baseStyle.grid,\n      visible: onlySecondary ? true : yAxisConfig?.grid?.visible,\n    },\n  }\n\n  result.axes = [...result.axes, linearAxis] as ISpec['axes']\n\n  return result\n}\n"],"names":["yLinearSecondary","spec","context","result","advancedVSeed","vseed","chartType","datasetReshapeInfo","measures","dimensions","encoding","index","reshapeInfoId","foldInfoList","secondaryYAxis","yAxisConfig","Array","alignTicks","alignTicksConfig","isNullish","isEmptySecondary","isEmpty","onlySecondary","sync","id","seriesIds","seriesId","autoFormat","numFormat","formatter","createNumFormatter","formatMethod","value","createLinearFormat","titleText","defaultTitleText","baseStyle","linearAxisStyle","linearAxis"],"mappings":";;;;;AAQO,MAAMA,mBAAmC,CAACC,MAAMC;IACrD,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,kBAAkB,EAAEC,QAAQ,EAAEC,UAAU,EAAEC,QAAQ,EAAE,GAAGN;IAC/D,MAAM,EAAEO,KAAK,EAAE,IAAIC,aAAa,EAAEC,YAAY,EAAE,GAAGN,kBAAkB,CAAC,EAAE;IAExE,MAAMO,iBAAiBV,cAAc,MAAM,EAAE,CAACE,UAAwB,EAAE;IACxE,MAAMS,cAAcC,MAAM,OAAO,CAACF,kBAAkBA,cAAc,CAACH,MAAM,IAAIG,cAAc,CAAC,EAAE,GAAGA;IACjG,MAAMG,aAAab,cAAc,MAAM,EAAE,CAACE,UAAwB,EAAE;IACpE,MAAMY,mBAAmBF,MAAM,OAAO,CAACC,cAAcA,UAAU,CAACN,MAAM,IAAIM,UAAU,CAAC,EAAE,GAAGA;IAE1F,IAAIE,UAAUN,cAAc,CAAC,EAAE,GAC7B,OAAOV;IAGT,MAAMiB,mBAAmBC,QAAQR,cAAc,CAAC,EAAE,CAAC;IACnD,MAAMS,gBAAgBD,QAAQR,cAAc,CAAC,EAAE,CAAC,YAAY,CAACO;IAE7D,MAAMG,OAAO;QACX,QAAQ,GAAGX,cAAc,aAAa,CAAC;QACvC,WAAW;IACb;IAEA,MAAMY,KAAK,GAAGZ,cAAc,eAAe,CAAC;IAC5C,MAAMa,YAAY;QAAC,GAAGb,cAAc,eAAe,CAAC;QAAE,GAAGA,cAAc,iBAAiB,CAAC;KAAC;IAC1F,MAAMc,WAAWR,mBAAmBO,YAAYA,SAAS,CAAC,EAAE;IAC5D,IAAI,CAACtB,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAGlB,MAAM,EAAEwB,UAAU,EAAEC,YAAY,CAAC,CAAC,EAAE,GAAGb,eAAe,CAAC;IAEvD,MAAMc,YAAYC,mBAAmBF;IAErC,MAAMG,eAAe,CAACC,QACbC,mBAAmBD,OAAOL,YAAYC,WAAWC;IAG1D,MAAMK,YAAYnB,aAAa,OAAO,aAAaoB,iBAAiB3B,UAAUC,YAAYC,SAAS,CAAC;IAGpG,MAAM0B,YAAYC,gBAAgB;QAChC,GAAGtB,WAAW;QACd,QAAQ;QACRgB;QACAG;QACAV;QACAE;QACAH;IACF;IAGA,MAAMe,aAAa;QACjB,GAAGF,SAAS;QACZ,SAAShB,mBAAmB,QAASL,aAAa,WAAW;QAE7D,MAAM;YAEJ,GAAGqB,UAAU,IAAI;YACjB,SAASd,gBAAgB,OAAOP,aAAa,MAAM;QACrD;IACF;IAEAZ,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEmC;KAAW;IAE1C,OAAOnC;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/axes/yLinearSecondary.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/axes/yLinearSecondary.ts"],"sourcesContent":["import type { ILineSeriesSpec, ISpec } from '@visactor/vchart'\nimport { createNumFormatter, flatReshapeMeasures } from '../../../../utils'\nimport type { VChartSpecPipe, YLinearAxis } from 'src/types'\nimport { createLinearFormat } from './format/linearFormat'\nimport { linearAxisStyle } from './linearAxisStyle'\nimport { FoldSecondaryMeasureValue } from 'src/dataReshape'\n\nexport const yLinearSecondary: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as ISpec\n  const { advancedVSeed, vseed } = context\n  const { chartType } = vseed\n  const { datasetReshapeInfo, reshapeMeasures = [] } = advancedVSeed\n  const { index, id: reshapeInfoId, foldInfoList } = datasetReshapeInfo[0]\n  // TODO: default config missing\n  const secondaryYAxis = advancedVSeed.config?.[chartType as 'dualAxis']?.secondaryYAxis as YLinearAxis | YLinearAxis[]\n  const yAxisConfig = Array.isArray(secondaryYAxis) ? secondaryYAxis[index] || secondaryYAxis[0] : secondaryYAxis\n  const alignTicks = advancedVSeed.config?.[chartType as 'dualAxis']?.alignTicks as boolean | boolean[]\n  const alignTicksConfig = Array.isArray(alignTicks) ? alignTicks[index] || alignTicks[0] : alignTicks\n\n  if (!foldInfoList) {\n    return result\n  }\n\n  const secondaryFoldInfoList = foldInfoList!.filter((f) => f.measureValue.startsWith(FoldSecondaryMeasureValue))\n\n  const isEmptySecondary =\n    !secondaryFoldInfoList.length || secondaryFoldInfoList.every((foldInfo) => !Object.keys(foldInfo.foldMap).length)\n  const onlySecondary =\n    !isEmptySecondary &&\n    foldInfoList.length &&\n    foldInfoList!.every(\n      (f) => f.measureValue.startsWith(FoldSecondaryMeasureValue) || Object.keys(f.foldMap).length === 0,\n    )\n\n  const sync = {\n    axisId: `${reshapeInfoId}-primary-axis`,\n    zeroAlign: true,\n  }\n\n  const id = `${reshapeInfoId}-secondary-axis`\n  const seriesId = alignTicksConfig\n    ? spec.series!.map((s) => (s as any).id)\n    : spec\n        .series!.filter((s) => ((s as ILineSeriesSpec).yField as string).startsWith(FoldSecondaryMeasureValue))\n        .map((s) => (s as any).id)\n  if (!result.axes) {\n    result.axes = []\n  }\n\n  const { autoFormat, numFormat = {} } = yAxisConfig ?? {}\n\n  const formatter = createNumFormatter(numFormat)\n\n  const formatMethod = (value: string) => {\n    return createLinearFormat(value, autoFormat, numFormat, formatter)\n  }\n  const measures = flatReshapeMeasures(reshapeMeasures)\n  const titleText =\n    yAxisConfig?.title?.titleText ||\n    measures\n      .filter((m) => m.encoding === 'secondaryYAxis')\n      .map((m) => m.alias ?? m.id)\n      .join(' & ')\n\n  const baseStyle = linearAxisStyle({\n    ...yAxisConfig,\n    orient: 'right',\n    formatMethod,\n    titleText,\n    id,\n    seriesId,\n    sync,\n  })\n\n  const linearAxis = {\n    ...baseStyle,\n    visible: isEmptySecondary ? false : (yAxisConfig?.visible ?? true),\n\n    grid: {\n      ...baseStyle.grid,\n      visible: onlySecondary ? true : yAxisConfig?.grid?.visible,\n    },\n  }\n\n  result.axes = [...result.axes, linearAxis] as ISpec['axes']\n\n  return result\n}\n"],"names":["yLinearSecondary","spec","context","result","advancedVSeed","vseed","chartType","datasetReshapeInfo","reshapeMeasures","index","reshapeInfoId","foldInfoList","secondaryYAxis","yAxisConfig","Array","alignTicks","alignTicksConfig","secondaryFoldInfoList","f","FoldSecondaryMeasureValue","isEmptySecondary","foldInfo","Object","onlySecondary","sync","id","seriesId","s","autoFormat","numFormat","formatter","createNumFormatter","formatMethod","value","createLinearFormat","measures","flatReshapeMeasures","titleText","m","baseStyle","linearAxisStyle","linearAxis"],"mappings":";;;;AAOO,MAAMA,mBAAmC,CAACC,MAAMC;IACrD,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAEC,KAAK,EAAE,GAAGH;IACjC,MAAM,EAAEI,SAAS,EAAE,GAAGD;IACtB,MAAM,EAAEE,kBAAkB,EAAEC,kBAAkB,EAAE,EAAE,GAAGJ;IACrD,MAAM,EAAEK,KAAK,EAAE,IAAIC,aAAa,EAAEC,YAAY,EAAE,GAAGJ,kBAAkB,CAAC,EAAE;IAExE,MAAMK,iBAAiBR,cAAc,MAAM,EAAE,CAACE,UAAwB,EAAE;IACxE,MAAMO,cAAcC,MAAM,OAAO,CAACF,kBAAkBA,cAAc,CAACH,MAAM,IAAIG,cAAc,CAAC,EAAE,GAAGA;IACjG,MAAMG,aAAaX,cAAc,MAAM,EAAE,CAACE,UAAwB,EAAE;IACpE,MAAMU,mBAAmBF,MAAM,OAAO,CAACC,cAAcA,UAAU,CAACN,MAAM,IAAIM,UAAU,CAAC,EAAE,GAAGA;IAE1F,IAAI,CAACJ,cACH,OAAOR;IAGT,MAAMc,wBAAwBN,aAAc,MAAM,CAAC,CAACO,IAAMA,EAAE,YAAY,CAAC,UAAU,CAACC;IAEpF,MAAMC,mBACJ,CAACH,sBAAsB,MAAM,IAAIA,sBAAsB,KAAK,CAAC,CAACI,WAAa,CAACC,OAAO,IAAI,CAACD,SAAS,OAAO,EAAE,MAAM;IAClH,MAAME,gBACJ,CAACH,oBACDT,aAAa,MAAM,IACnBA,aAAc,KAAK,CACjB,CAACO,IAAMA,EAAE,YAAY,CAAC,UAAU,CAACC,8BAA8BG,AAAkC,MAAlCA,OAAO,IAAI,CAACJ,EAAE,OAAO,EAAE,MAAM;IAGhG,MAAMM,OAAO;QACX,QAAQ,GAAGd,cAAc,aAAa,CAAC;QACvC,WAAW;IACb;IAEA,MAAMe,KAAK,GAAGf,cAAc,eAAe,CAAC;IAC5C,MAAMgB,WAAWV,mBACbf,KAAK,MAAM,CAAE,GAAG,CAAC,CAAC0B,IAAOA,EAAU,EAAE,IACrC1B,KACG,MAAM,CAAE,MAAM,CAAC,CAAC0B,IAAQA,EAAsB,MAAM,CAAY,UAAU,CAACR,4BAC3E,GAAG,CAAC,CAACQ,IAAOA,EAAU,EAAE;IAC/B,IAAI,CAACxB,OAAO,IAAI,EACdA,OAAO,IAAI,GAAG,EAAE;IAGlB,MAAM,EAAEyB,UAAU,EAAEC,YAAY,CAAC,CAAC,EAAE,GAAGhB,eAAe,CAAC;IAEvD,MAAMiB,YAAYC,mBAAmBF;IAErC,MAAMG,eAAe,CAACC,QACbC,mBAAmBD,OAAOL,YAAYC,WAAWC;IAE1D,MAAMK,WAAWC,oBAAoB5B;IACrC,MAAM6B,YACJxB,aAAa,OAAO,aACpBsB,SACG,MAAM,CAAC,CAACG,IAAMA,AAAe,qBAAfA,EAAE,QAAQ,EACxB,GAAG,CAAC,CAACA,IAAMA,EAAE,KAAK,IAAIA,EAAE,EAAE,EAC1B,IAAI,CAAC;IAEV,MAAMC,YAAYC,gBAAgB;QAChC,GAAG3B,WAAW;QACd,QAAQ;QACRmB;QACAK;QACAZ;QACAC;QACAF;IACF;IAEA,MAAMiB,aAAa;QACjB,GAAGF,SAAS;QACZ,SAASnB,mBAAmB,QAASP,aAAa,WAAW;QAE7D,MAAM;YACJ,GAAG0B,UAAU,IAAI;YACjB,SAAShB,gBAAgB,OAAOV,aAAa,MAAM;QACrD;IACF;IAEAV,OAAO,IAAI,GAAG;WAAIA,OAAO,IAAI;QAAEsC;KAAW;IAE1C,OAAOtC;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/color/colorAdapter.js

@@ -1,4 +1,3 @@
-import { findAllMeasures } from "../../../../utils/index.js";
 function colorAdapter(ordinalPipe, linearPipe) {
     return (spec, context)=>{
         const { advancedVSeed, vseed } = context;
@@ -8,8 +7,7 @@ function colorAdapter(ordinalPipe, linearPipe) {
 }
 const isLinearColor = (advancedVSeed, vseed)=>{
     const { encoding } = advancedVSeed;
-    const measures = vseed.measures || advancedVSeed.measures;
-    const measureIdList = findAllMeasures(measures).map((measure)=>measure.id);
+    const measureIdList = (vseed.measures || advancedVSeed.measures).map((measure)=>measure.id);
     const { color } = encoding;
     return color?.length === 1 && measureIdList.includes(color[0]);
 };

package/dist/esm/pipeline/spec/chart/pipes/color/colorAdapter.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/color/colorAdapter.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/color/colorAdapter.ts"],"sourcesContent":["import { findAllMeasures } from 'src/pipeline/utils'\nimport type { AdvancedVSeed, PivotChartSpecPipe, VChartSpecPipe, VSeed, Pipe, SpecPipelineContext } from 'src/types'\n\nexport function colorAdapter(ordinalPipe: PivotChartSpecPipe, linearPipe: PivotChartSpecPipe): PivotChartSpecPipe\nexport function colorAdapter(ordinalPipe: VChartSpecPipe, linearPipe: VChartSpecPipe): VChartSpecPipe\nexport function colorAdapter<TSpec>(\n  ordinalPipe: Pipe<TSpec, SpecPipelineContext>,\n  linearPipe: Pipe<TSpec, SpecPipelineContext>,\n) {\n  return (spec: Partial<TSpec>, context: SpecPipelineContext) => {\n    const { advancedVSeed, vseed } = context\n    if (isLinearColor(advancedVSeed, vseed)) {\n      return linearPipe(spec, context)\n    }\n    return ordinalPipe(spec, context)\n  }\n}\n\nexport const isLinearColor = <T extends AdvancedVSeed, U extends VSeed>(advancedVSeed: T, vseed: U) => {\n  const { encoding } = advancedVSeed\n  const measures = vseed.measures || advancedVSeed.measures\n  const measureIdList = findAllMeasures(measures).map((measure) => measure.id)\n  const { color } = encoding\n  return color?.length === 1 && measureIdList.includes(color[0])\n}\n\nexport const getColorMeasureId = <T extends AdvancedVSeed, U extends VSeed>(\n  advancedVSeed: T,\n  vseed: U,\n): string | undefined => {\n  if (isLinearColor(advancedVSeed, vseed)) {\n    const { encoding } = advancedVSeed\n    const { color } = encoding\n    return color?.[0]\n  }\n  return undefined\n}\n"],"names":["colorAdapter","ordinalPipe","linearPipe","spec","context","advancedVSeed","vseed","isLinearColor","encoding","measures","measureIdList","findAllMeasures","measure","color","getColorMeasureId"],"mappings":";AAKO,SAASA,aACdC,WAA6C,EAC7CC,UAA4C;IAE5C,OAAO,CAACC,MAAsBC;QAC5B,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;QACjC,IAAIG,cAAcF,eAAeC,QAC/B,OAAOJ,WAAWC,MAAMC;QAE1B,OAAOH,YAAYE,MAAMC;IAC3B;AACF;AAEO,MAAMG,gBAAgB,CAA2CF,eAAkBC;IACxF,MAAM,EAAEE,QAAQ,EAAE,GAAGH;IACrB,MAAMI,WAAWH,MAAM,QAAQ,IAAID,cAAc,QAAQ;IACzD,MAAMK,gBAAgBC,gBAAgBF,UAAU,GAAG,CAAC,CAACG,UAAYA,QAAQ,EAAE;IAC3E,MAAM,EAAEC,KAAK,EAAE,GAAGL;IAClB,OAAOK,OAAO,WAAW,KAAKH,cAAc,QAAQ,CAACG,KAAK,CAAC,EAAE;AAC/D;AAEO,MAAMC,oBAAoB,CAC/BT,eACAC;IAEA,IAAIC,cAAcF,eAAeC,QAAQ;QACvC,MAAM,EAAEE,QAAQ,EAAE,GAAGH;QACrB,MAAM,EAAEQ,KAAK,EAAE,GAAGL;QAClB,OAAOK,OAAO,CAAC,EAAE;IACnB;AAEF"}
+{"version":3,"file":"pipeline/spec/chart/pipes/color/colorAdapter.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/color/colorAdapter.ts"],"sourcesContent":["import type { AdvancedVSeed, PivotChartSpecPipe, VChartSpecPipe, VSeed, Pipe, SpecPipelineContext } from 'src/types'\n\nexport function colorAdapter(ordinalPipe: PivotChartSpecPipe, linearPipe: PivotChartSpecPipe): PivotChartSpecPipe\nexport function colorAdapter(ordinalPipe: VChartSpecPipe, linearPipe: VChartSpecPipe): VChartSpecPipe\nexport function colorAdapter<TSpec>(\n  ordinalPipe: Pipe<TSpec, SpecPipelineContext>,\n  linearPipe: Pipe<TSpec, SpecPipelineContext>,\n) {\n  return (spec: Partial<TSpec>, context: SpecPipelineContext) => {\n    const { advancedVSeed, vseed } = context\n    if (isLinearColor(advancedVSeed, vseed)) {\n      return linearPipe(spec, context)\n    }\n    return ordinalPipe(spec, context)\n  }\n}\n\nexport const isLinearColor = <T extends AdvancedVSeed, U extends VSeed>(advancedVSeed: T, vseed: U) => {\n  const { encoding } = advancedVSeed\n  const measureIdList = (vseed.measures || advancedVSeed.measures)!.map((measure) => measure.id)\n  const { color } = encoding\n  return color?.length === 1 && measureIdList.includes(color[0])\n}\n\nexport const getColorMeasureId = <T extends AdvancedVSeed, U extends VSeed>(\n  advancedVSeed: T,\n  vseed: U,\n): string | undefined => {\n  if (isLinearColor(advancedVSeed, vseed)) {\n    const { encoding } = advancedVSeed\n    const { color } = encoding\n    return color?.[0]\n  }\n  return undefined\n}\n"],"names":["colorAdapter","ordinalPipe","linearPipe","spec","context","advancedVSeed","vseed","isLinearColor","encoding","measureIdList","measure","color","getColorMeasureId"],"mappings":"AAIO,SAASA,aACdC,WAA6C,EAC7CC,UAA4C;IAE5C,OAAO,CAACC,MAAsBC;QAC5B,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;QACjC,IAAIG,cAAcF,eAAeC,QAC/B,OAAOJ,WAAWC,MAAMC;QAE1B,OAAOH,YAAYE,MAAMC;IAC3B;AACF;AAEO,MAAMG,gBAAgB,CAA2CF,eAAkBC;IACxF,MAAM,EAAEE,QAAQ,EAAE,GAAGH;IACrB,MAAMI,gBAAiBH,AAAAA,CAAAA,MAAM,QAAQ,IAAID,cAAc,QAAO,EAAI,GAAG,CAAC,CAACK,UAAYA,QAAQ,EAAE;IAC7F,MAAM,EAAEC,KAAK,EAAE,GAAGH;IAClB,OAAOG,OAAO,WAAW,KAAKF,cAAc,QAAQ,CAACE,KAAK,CAAC,EAAE;AAC/D;AAEO,MAAMC,oBAAoB,CAC/BP,eACAC;IAEA,IAAIC,cAAcF,eAAeC,QAAQ;QACvC,MAAM,EAAEE,QAAQ,EAAE,GAAGH;QACrB,MAAM,EAAEM,KAAK,EAAE,GAAGH;QAClB,OAAOG,OAAO,CAAC,EAAE;IACnB;AAEF"}

package/dist/esm/pipeline/spec/chart/pipes/color/linearColorForDualAxis.js

@@ -4,7 +4,7 @@ const linearColorForDualAxis = (spec, context)=>{
     };
     const { advancedVSeed } = context;
     const { datasetReshapeInfo, chartType } = advancedVSeed;
-    const { unfoldInfo, id } = datasetReshapeInfo[0];
+    const { unfoldInfo } = datasetReshapeInfo[0];
     const baseConfig = advancedVSeed.config[chartType];
     if (!baseConfig || !baseConfig.color) return result;
     const { color } = baseConfig;
@@ -12,20 +12,12 @@ const linearColorForDualAxis = (spec, context)=>{
     result.color = {
         type: 'linear',
         range: linearColorScheme || colorScheme || [],
-        domain: [
-            {
-                dataId: `${id}-primary-dataset`,
+        domain: spec.series.map((s)=>({
+                dataId: s.data.id,
                 fields: [
                     unfoldInfo.encodingColor
                 ]
-            },
-            {
-                dataId: `${id}-secondary-dataset`,
-                fields: [
-                    unfoldInfo.encodingColor
-                ]
-            }
-        ]
+            }))
     };
     return result;
 };

package/dist/esm/pipeline/spec/chart/pipes/color/linearColorForDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/color/linearColorForDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/color/linearColorForDualAxis.ts"],"sourcesContent":["import type { IBarChartSpec } from '@visactor/vchart'\nimport type { Color, VChartSpecPipe } from 'src/types'\n\nexport const linearColorForDualAxis: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as IBarChartSpec\n  const { advancedVSeed } = context\n  const { datasetReshapeInfo, chartType } = advancedVSeed\n  const { unfoldInfo, id } = datasetReshapeInfo[0]\n  const baseConfig = advancedVSeed.config[chartType] as { color: Color }\n\n  if (!baseConfig || !baseConfig.color) {\n    return result\n  }\n\n  const { color } = baseConfig\n  const { colorScheme, linearColorScheme } = color\n\n  result.color = {\n    type: 'linear',\n    range: linearColorScheme || colorScheme || [],\n    domain: [\n      {\n        dataId: `${id}-primary-dataset`,\n        fields: [unfoldInfo.encodingColor],\n      },\n      {\n        dataId: `${id}-secondary-dataset`,\n        fields: [unfoldInfo.encodingColor],\n      },\n    ],\n  }\n\n  return result\n}\n"],"names":["linearColorForDualAxis","spec","context","result","advancedVSeed","datasetReshapeInfo","chartType","unfoldInfo","id","baseConfig","color","colorScheme","linearColorScheme"],"mappings":"AAGO,MAAMA,yBAAyC,CAACC,MAAMC;IAC3D,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAE,GAAGF;IAC1B,MAAM,EAAEG,kBAAkB,EAAEC,SAAS,EAAE,GAAGF;IAC1C,MAAM,EAAEG,UAAU,EAAEC,EAAE,EAAE,GAAGH,kBAAkB,CAAC,EAAE;IAChD,MAAMI,aAAaL,cAAc,MAAM,CAACE,UAAU;IAElD,IAAI,CAACG,cAAc,CAACA,WAAW,KAAK,EAClC,OAAON;IAGT,MAAM,EAAEO,KAAK,EAAE,GAAGD;IAClB,MAAM,EAAEE,WAAW,EAAEC,iBAAiB,EAAE,GAAGF;IAE3CP,OAAO,KAAK,GAAG;QACb,MAAM;QACN,OAAOS,qBAAqBD,eAAe,EAAE;QAC7C,QAAQ;YACN;gBACE,QAAQ,GAAGH,GAAG,gBAAgB,CAAC;gBAC/B,QAAQ;oBAACD,WAAW,aAAa;iBAAC;YACpC;YACA;gBACE,QAAQ,GAAGC,GAAG,kBAAkB,CAAC;gBACjC,QAAQ;oBAACD,WAAW,aAAa;iBAAC;YACpC;SACD;IACH;IAEA,OAAOJ;AACT"}
+{"version":3,"file":"pipeline/spec/chart/pipes/color/linearColorForDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/color/linearColorForDualAxis.ts"],"sourcesContent":["import type { IBarChartSpec } from '@visactor/vchart'\nimport type { Color, VChartSpecPipe } from 'src/types'\n\nexport const linearColorForDualAxis: VChartSpecPipe = (spec, context) => {\n  const result = { ...spec } as IBarChartSpec\n  const { advancedVSeed } = context\n  const { datasetReshapeInfo, chartType } = advancedVSeed\n  const { unfoldInfo } = datasetReshapeInfo[0]\n  const baseConfig = advancedVSeed.config[chartType] as { color: Color }\n\n  if (!baseConfig || !baseConfig.color) {\n    return result\n  }\n\n  const { color } = baseConfig\n  const { colorScheme, linearColorScheme } = color\n\n  result.color = {\n    type: 'linear',\n    range: linearColorScheme || colorScheme || [],\n    domain: spec.series!.map((s) => {\n      return {\n        dataId: (s as any).data.id,\n        fields: [unfoldInfo.encodingColor],\n      }\n    }),\n  }\n\n  return result\n}\n"],"names":["linearColorForDualAxis","spec","context","result","advancedVSeed","datasetReshapeInfo","chartType","unfoldInfo","baseConfig","color","colorScheme","linearColorScheme","s"],"mappings":"AAGO,MAAMA,yBAAyC,CAACC,MAAMC;IAC3D,MAAMC,SAAS;QAAE,GAAGF,IAAI;IAAC;IACzB,MAAM,EAAEG,aAAa,EAAE,GAAGF;IAC1B,MAAM,EAAEG,kBAAkB,EAAEC,SAAS,EAAE,GAAGF;IAC1C,MAAM,EAAEG,UAAU,EAAE,GAAGF,kBAAkB,CAAC,EAAE;IAC5C,MAAMG,aAAaJ,cAAc,MAAM,CAACE,UAAU;IAElD,IAAI,CAACE,cAAc,CAACA,WAAW,KAAK,EAClC,OAAOL;IAGT,MAAM,EAAEM,KAAK,EAAE,GAAGD;IAClB,MAAM,EAAEE,WAAW,EAAEC,iBAAiB,EAAE,GAAGF;IAE3CN,OAAO,KAAK,GAAG;QACb,MAAM;QACN,OAAOQ,qBAAqBD,eAAe,EAAE;QAC7C,QAAQT,KAAK,MAAM,CAAE,GAAG,CAAC,CAACW,IACjB;gBACL,QAASA,EAAU,IAAI,CAAC,EAAE;gBAC1B,QAAQ;oBAACL,WAAW,aAAa;iBAAC;YACpC;IAEJ;IAEA,OAAOJ;AACT"}

package/dist/esm/pipeline/spec/chart/pipes/dataset/datasetDualAxis.d.ts

@@ -1,3 +1,2 @@
-import type { VChartSpecPipe } from '../../../../../types';
-export declare const datasetPrimary: VChartSpecPipe;
-export declare const datasetSecondary: VChartSpecPipe;
+import type { DualAxisOptions, VChartSpecPipe } from '../../../../../types';
+export declare const datasetDualAxis: (options: DualAxisOptions) => VChartSpecPipe;

package/dist/esm/pipeline/spec/chart/pipes/dataset/datasetDualAxis.js

@@ -1,84 +1,44 @@
 import { isPivotChart } from "../../../../utils/index.js";
-const datasetPrimary = (spec, context)=>{
-    const { advancedVSeed, vseed } = context;
-    const { analysis, datasetReshapeInfo } = advancedVSeed;
-    const orderMapping = analysis?.orderMapping || {};
-    const { unfoldInfo } = datasetReshapeInfo[0];
-    const x = unfoldInfo.encodingX;
-    const colorId = unfoldInfo.encodingColorId;
-    const id = datasetReshapeInfo[0].id;
-    const fields = {};
-    if (x) {
-        const order = orderMapping[x];
-        if (order) fields[x] = {
-            sortIndex: 0,
-            domain: order,
-            lockStatisticsByDomain: true
-        };
-        else fields[x] = {
-            sortIndex: 0
-        };
-    }
-    if (colorId) {
-        const order = orderMapping[colorId];
-        if (order) fields[colorId] = {
-            sortIndex: 0,
-            domain: order,
-            lockStatisticsByDomain: true
-        };
-        else fields[colorId] = {
-            sortIndex: 0
-        };
-    }
-    return {
-        ...spec,
-        data: {
-            id: `${id}-primary-dataset`,
-            values: isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
-            fields: fields
+const datasetDualAxis = (options)=>(spec, context)=>{
+        const { advancedVSeed, vseed } = context;
+        const { analysis, datasetReshapeInfo } = advancedVSeed;
+        const orderMapping = analysis?.orderMapping || {};
+        const { unfoldInfo } = datasetReshapeInfo[0];
+        const x = unfoldInfo.encodingX;
+        const colorId = unfoldInfo.encodingColorId;
+        const id = datasetReshapeInfo[0].id;
+        const fields = {};
+        if (x) {
+            const order = orderMapping[x];
+            if (order) fields[x] = {
+                sortIndex: 0,
+                domain: order,
+                lockStatisticsByDomain: true
+            };
+            else fields[x] = {
+                sortIndex: 0
+            };
         }
-    };
-};
-const datasetSecondary = (spec, context)=>{
-    const { advancedVSeed, vseed } = context;
-    const { analysis, datasetReshapeInfo } = advancedVSeed;
-    const orderMapping = analysis?.orderMapping || {};
-    const { unfoldInfo } = datasetReshapeInfo[0];
-    const x = unfoldInfo.encodingX;
-    const colorId = unfoldInfo.encodingColorId;
-    const id = datasetReshapeInfo[0].id;
-    const fields = {};
-    if (x) {
-        const order = orderMapping[x];
-        if (order) fields[x] = {
-            sortIndex: 0,
-            domain: order,
-            lockStatisticsByDomain: true
-        };
-        else fields[x] = {
-            sortIndex: 0
-        };
-    }
-    if (colorId) {
-        const order = orderMapping[colorId];
-        if (order) fields[colorId] = {
-            sortIndex: 0,
-            domain: order,
-            lockStatisticsByDomain: true
-        };
-        else fields[colorId] = {
-            sortIndex: 0
-        };
-    }
-    return {
-        ...spec,
-        data: {
-            id: `${id}-secondary-dataset`,
-            values: isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
-            fields: fields
+        if (colorId) {
+            const order = orderMapping[colorId];
+            if (order) fields[colorId] = {
+                sortIndex: 0,
+                domain: order,
+                lockStatisticsByDomain: true
+            };
+            else fields[colorId] = {
+                sortIndex: 0
+            };
         }
+        return {
+            ...spec,
+            data: {
+                id: `${id}-${options.axisType}-${options.chartType}`,
+                values: isPivotChart(vseed) ? void 0 : advancedVSeed.dataset,
+                fields: fields
+            }
+        };
     };
-};
-export { datasetPrimary, datasetSecondary };
+export { datasetDualAxis };
 
 //# sourceMappingURL=datasetDualAxis.js.map

package/dist/esm/pipeline/spec/chart/pipes/dataset/datasetDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/spec/chart/pipes/dataset/datasetDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/dataset/datasetDualAxis.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport { isPivotChart } from 'src/pipeline/utils'\nimport type { VChartSpecPipe } from 'src/types'\n\nexport const datasetPrimary: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { analysis, datasetReshapeInfo } = advancedVSeed\n  const orderMapping = analysis?.orderMapping || {}\n\n  const { unfoldInfo } = datasetReshapeInfo[0]\n  const x = unfoldInfo.encodingX\n  const colorId = unfoldInfo.encodingColorId\n  const id = datasetReshapeInfo[0].id\n\n  const fields: Record<string, object> = {}\n\n  if (x) {\n    const order = orderMapping[x]\n    if (order) {\n      fields[x] = {\n        sortIndex: 0,\n        domain: order,\n        lockStatisticsByDomain: true,\n      }\n    } else {\n      fields[x] = {\n        sortIndex: 0,\n      }\n    }\n  }\n\n  if (colorId) {\n    const order = orderMapping[colorId]\n    if (order) {\n      fields[colorId] = {\n        sortIndex: 0,\n        domain: order,\n        lockStatisticsByDomain: true,\n      }\n    } else {\n      fields[colorId] = {\n        sortIndex: 0,\n      }\n    }\n  }\n\n  return {\n    ...spec,\n    data: {\n      id: `${id}-primary-dataset`,\n      // 透视表不使用 dataValues\n      values: isPivotChart(vseed) ? undefined : advancedVSeed.dataset,\n      fields: fields,\n    },\n  } as ISpec\n}\n\nexport const datasetSecondary: VChartSpecPipe = (spec, context) => {\n  const { advancedVSeed, vseed } = context\n  const { analysis, datasetReshapeInfo } = advancedVSeed\n  const orderMapping = analysis?.orderMapping || {}\n\n  const { unfoldInfo } = datasetReshapeInfo[0]\n  const x = unfoldInfo.encodingX\n  const colorId = unfoldInfo.encodingColorId\n  const id = datasetReshapeInfo[0].id\n\n  const fields: Record<string, object> = {}\n\n  if (x) {\n    const order = orderMapping[x]\n    if (order) {\n      fields[x] = {\n        sortIndex: 0,\n        domain: order,\n        lockStatisticsByDomain: true,\n      }\n    } else {\n      fields[x] = {\n        sortIndex: 0,\n      }\n    }\n  }\n\n  if (colorId) {\n    const order = orderMapping[colorId]\n    if (order) {\n      fields[colorId] = {\n        sortIndex: 0,\n        domain: order,\n        lockStatisticsByDomain: true,\n      }\n    } else {\n      fields[colorId] = {\n        sortIndex: 0,\n      }\n    }\n  }\n\n  return {\n    ...spec,\n    data: {\n      id: `${id}-secondary-dataset`,\n      // 透视表不使用 dataValues\n      values: isPivotChart(vseed) ? undefined : advancedVSeed.dataset,\n      fields: fields,\n    },\n  } as ISpec\n}\n"],"names":["datasetPrimary","spec","context","advancedVSeed","vseed","analysis","datasetReshapeInfo","orderMapping","unfoldInfo","x","colorId","id","fields","order","isPivotChart","undefined","datasetSecondary"],"mappings":";AAIO,MAAMA,iBAAiC,CAACC,MAAMC;IACnD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,QAAQ,EAAEC,kBAAkB,EAAE,GAAGH;IACzC,MAAMI,eAAeF,UAAU,gBAAgB,CAAC;IAEhD,MAAM,EAAEG,UAAU,EAAE,GAAGF,kBAAkB,CAAC,EAAE;IAC5C,MAAMG,IAAID,WAAW,SAAS;IAC9B,MAAME,UAAUF,WAAW,eAAe;IAC1C,MAAMG,KAAKL,kBAAkB,CAAC,EAAE,CAAC,EAAE;IAEnC,MAAMM,SAAiC,CAAC;IAExC,IAAIH,GAAG;QACL,MAAMI,QAAQN,YAAY,CAACE,EAAE;QAC7B,IAAII,OACFD,MAAM,CAACH,EAAE,GAAG;YACV,WAAW;YACX,QAAQI;YACR,wBAAwB;QAC1B;aAEAD,MAAM,CAACH,EAAE,GAAG;YACV,WAAW;QACb;IAEJ;IAEA,IAAIC,SAAS;QACX,MAAMG,QAAQN,YAAY,CAACG,QAAQ;QACnC,IAAIG,OACFD,MAAM,CAACF,QAAQ,GAAG;YAChB,WAAW;YACX,QAAQG;YACR,wBAAwB;QAC1B;aAEAD,MAAM,CAACF,QAAQ,GAAG;YAChB,WAAW;QACb;IAEJ;IAEA,OAAO;QACL,GAAGT,IAAI;QACP,MAAM;YACJ,IAAI,GAAGU,GAAG,gBAAgB,CAAC;YAE3B,QAAQG,aAAaV,SAASW,SAAYZ,cAAc,OAAO;YAC/D,QAAQS;QACV;IACF;AACF;AAEO,MAAMI,mBAAmC,CAACf,MAAMC;IACrD,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;IACjC,MAAM,EAAEG,QAAQ,EAAEC,kBAAkB,EAAE,GAAGH;IACzC,MAAMI,eAAeF,UAAU,gBAAgB,CAAC;IAEhD,MAAM,EAAEG,UAAU,EAAE,GAAGF,kBAAkB,CAAC,EAAE;IAC5C,MAAMG,IAAID,WAAW,SAAS;IAC9B,MAAME,UAAUF,WAAW,eAAe;IAC1C,MAAMG,KAAKL,kBAAkB,CAAC,EAAE,CAAC,EAAE;IAEnC,MAAMM,SAAiC,CAAC;IAExC,IAAIH,GAAG;QACL,MAAMI,QAAQN,YAAY,CAACE,EAAE;QAC7B,IAAII,OACFD,MAAM,CAACH,EAAE,GAAG;YACV,WAAW;YACX,QAAQI;YACR,wBAAwB;QAC1B;aAEAD,MAAM,CAACH,EAAE,GAAG;YACV,WAAW;QACb;IAEJ;IAEA,IAAIC,SAAS;QACX,MAAMG,QAAQN,YAAY,CAACG,QAAQ;QACnC,IAAIG,OACFD,MAAM,CAACF,QAAQ,GAAG;YAChB,WAAW;YACX,QAAQG;YACR,wBAAwB;QAC1B;aAEAD,MAAM,CAACF,QAAQ,GAAG;YAChB,WAAW;QACb;IAEJ;IAEA,OAAO;QACL,GAAGT,IAAI;QACP,MAAM;YACJ,IAAI,GAAGU,GAAG,kBAAkB,CAAC;YAE7B,QAAQG,aAAaV,SAASW,SAAYZ,cAAc,OAAO;YAC/D,QAAQS;QACV;IACF;AACF"}
+{"version":3,"file":"pipeline/spec/chart/pipes/dataset/datasetDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/spec/chart/pipes/dataset/datasetDualAxis.ts"],"sourcesContent":["import type { ISpec } from '@visactor/vchart'\nimport { isPivotChart } from 'src/pipeline/utils'\nimport type { DualAxisOptions, VChartSpecPipe } from 'src/types'\n\nexport const datasetDualAxis = (options: DualAxisOptions): VChartSpecPipe => {\n  return (spec, context) => {\n    const { advancedVSeed, vseed } = context\n    const { analysis, datasetReshapeInfo } = advancedVSeed\n    const orderMapping = analysis?.orderMapping || {}\n\n    const { unfoldInfo } = datasetReshapeInfo[0]\n    const x = unfoldInfo.encodingX\n    const colorId = unfoldInfo.encodingColorId\n    const id = datasetReshapeInfo[0].id\n    const fields: Record<string, object> = {}\n\n    if (x) {\n      const order = orderMapping[x]\n      if (order) {\n        fields[x] = {\n          sortIndex: 0,\n          domain: order,\n          lockStatisticsByDomain: true,\n        }\n      } else {\n        fields[x] = {\n          sortIndex: 0,\n        }\n      }\n    }\n    if (colorId) {\n      const order = orderMapping[colorId]\n      if (order) {\n        fields[colorId] = {\n          sortIndex: 0,\n          domain: order,\n          lockStatisticsByDomain: true,\n        }\n      } else {\n        fields[colorId] = {\n          sortIndex: 0,\n        }\n      }\n    }\n\n    return {\n      ...spec,\n      data: {\n        id: `${id}-${options.axisType}-${options.chartType}`,\n        // 透视表不使用 dataValues\n        values: isPivotChart(vseed) ? undefined : advancedVSeed.dataset,\n        fields: fields,\n      },\n    } as ISpec\n  }\n}\n"],"names":["datasetDualAxis","options","spec","context","advancedVSeed","vseed","analysis","datasetReshapeInfo","orderMapping","unfoldInfo","x","colorId","id","fields","order","isPivotChart","undefined"],"mappings":";AAIO,MAAMA,kBAAkB,CAACC,UACvB,CAACC,MAAMC;QACZ,MAAM,EAAEC,aAAa,EAAEC,KAAK,EAAE,GAAGF;QACjC,MAAM,EAAEG,QAAQ,EAAEC,kBAAkB,EAAE,GAAGH;QACzC,MAAMI,eAAeF,UAAU,gBAAgB,CAAC;QAEhD,MAAM,EAAEG,UAAU,EAAE,GAAGF,kBAAkB,CAAC,EAAE;QAC5C,MAAMG,IAAID,WAAW,SAAS;QAC9B,MAAME,UAAUF,WAAW,eAAe;QAC1C,MAAMG,KAAKL,kBAAkB,CAAC,EAAE,CAAC,EAAE;QACnC,MAAMM,SAAiC,CAAC;QAExC,IAAIH,GAAG;YACL,MAAMI,QAAQN,YAAY,CAACE,EAAE;YAC7B,IAAII,OACFD,MAAM,CAACH,EAAE,GAAG;gBACV,WAAW;gBACX,QAAQI;gBACR,wBAAwB;YAC1B;iBAEAD,MAAM,CAACH,EAAE,GAAG;gBACV,WAAW;YACb;QAEJ;QACA,IAAIC,SAAS;YACX,MAAMG,QAAQN,YAAY,CAACG,QAAQ;YACnC,IAAIG,OACFD,MAAM,CAACF,QAAQ,GAAG;gBAChB,WAAW;gBACX,QAAQG;gBACR,wBAAwB;YAC1B;iBAEAD,MAAM,CAACF,QAAQ,GAAG;gBAChB,WAAW;YACb;QAEJ;QAEA,OAAO;YACL,GAAGT,IAAI;YACP,MAAM;gBACJ,IAAI,GAAGU,GAAG,CAAC,EAAEX,QAAQ,QAAQ,CAAC,CAAC,EAAEA,QAAQ,SAAS,EAAE;gBAEpD,QAAQc,aAAaV,SAASW,SAAYZ,cAAc,OAAO;gBAC/D,QAAQS;YACV;QACF;IACF"}

package/dist/esm/pipeline/spec/chart/pipes/dataset/index.d.ts

@@ -2,7 +2,7 @@ export { datasetYX } from './datasetYX';
 export { datasetXY } from './datasetXY';
 export { datasetPivot } from './datasetPivot';
 export { progressive } from './progressive';
-export { datasetPrimary, datasetSecondary } from './datasetDualAxis';
+export { datasetDualAxis } from './datasetDualAxis';
 export { datasetScatter } from './datasetScatter';
 export { datasetHistogram } from './datasetHistogram';
 export { datasetBoxplot } from './datasetBoxplot';

package/dist/esm/pipeline/spec/chart/pipes/dataset/index.js

@@ -2,8 +2,8 @@ import { datasetYX } from "./datasetYX.js";
 import { datasetXY } from "./datasetXY.js";
 import { datasetPivot } from "./datasetPivot.js";
 import { progressive } from "./progressive.js";
-import { datasetPrimary, datasetSecondary } from "./datasetDualAxis.js";
+import { datasetDualAxis } from "./datasetDualAxis.js";
 import { datasetScatter } from "./datasetScatter.js";
 import { datasetHistogram } from "./datasetHistogram.js";
 import { datasetBoxplot } from "./datasetBoxplot.js";
-export { datasetBoxplot, datasetHistogram, datasetPivot, datasetPrimary, datasetScatter, datasetSecondary, datasetXY, datasetYX, progressive };
+export { datasetBoxplot, datasetDualAxis, datasetHistogram, datasetPivot, datasetScatter, datasetXY, datasetYX, progressive };

package/dist/esm/pipeline/spec/chart/pipes/dual/dualChartType.d.ts

@@ -1,3 +1,3 @@
 import type { VChartSpecPipe } from '../../../../../types';
-export declare const dualChartTypePrimary: VChartSpecPipe;
-export declare const dualChartTypeSecondary: VChartSpecPipe;
+import type { DualAxisOptions } from '../../../../../types/properties';
+export declare const dualChartType: (options: DualAxisOptions) => VChartSpecPipe;