@visactor/vseed 0.2.8 → 0.3.0

package/dist/esm/pipeline/advanced/chart/pipes/measures/buildMeasures.js

@@ -1,55 +1,24 @@
-import { isMeasureTreeWithChildren, isMeasureTreeWithParentId, normalizeMeasureTree } from "./utils.js";
-import { isPivotChart } from "../../../../utils/index.js";
 import { DEFAULT_PARENT_ID } from "../../../../utils/constant.js";
-import { isValid } from "@visactor/vutils";
-const buildMeasures = (advancedVSeed)=>{
-    if (isMeasureTreeWithChildren(advancedVSeed.measures)) {
-        advancedVSeed.measures = normalizeMeasureTree(advancedVSeed.measures);
-        return advancedVSeed;
-    }
-    if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
-        advancedVSeed.measures = generateMeasuresByParentId(advancedVSeed.measures);
-        return advancedVSeed;
-    }
-    if (isPivotChart(advancedVSeed)) advancedVSeed.measures = basicMeasuresToMeasureTree(advancedVSeed.measures);
-    return advancedVSeed;
-};
-const generateMeasuresByParentId = (measures)=>{
-    const measureTree = [];
-    measures.forEach((measure)=>{
-        const parent = measureTree.find((item)=>item.id === measure.parentId);
-        if (parent && 'children' in parent) {
-            parent.children = parent.children || [];
-            if (parent.children.length > 0) parent.alias += `-${measure.alias ?? measure.id}`;
-            parent.children.push(measure);
-        } else if (isValid(measure.parentId)) measureTree.push({
-            id: measure.parentId,
-            alias: measure.alias ?? measure.id,
-            children: [
-                measure
-            ]
-        });
-        else measureTree.push({
-            id: DEFAULT_PARENT_ID,
-            alias: measure.alias ?? measure.id,
-            children: [
-                measure
-            ]
-        });
-    });
-    return measureTree;
-};
-const basicMeasuresToMeasureTree = (measures)=>{
-    const id = measures.map((item)=>item.id).join('-');
-    const alias = measures.map((item)=>item.alias || item.id).join('-');
-    return [
-        {
-            id,
-            alias,
-            children: measures
+import { ensureParentIdInitialized, isCommonMeasureEncoding } from "./utils.js";
+const buildMeasures = (encodingKeys)=>(advancedVSeed)=>{
+        const { measures = [] } = advancedVSeed;
+        const measuresByView = {};
+        const parentIds = [];
+        for(let index = 0; index < measures.length; index++){
+            const item = measures[index];
+            const encoding = item.encoding;
+            const parentId = item.parentId || DEFAULT_PARENT_ID;
+            const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding);
+            ensureParentIdInitialized(parentId, measuresByView, parentIds);
+            if (encodingKeys.includes(encoding)) measuresByView[parentId].push(item);
+            else if (!isOtherEncoding) {
+                item.encoding = encodingKeys[0];
+                measuresByView[parentId].push(item);
+            }
         }
-    ];
-};
+        advancedVSeed.reshapeMeasures = parentIds.map((pid)=>measuresByView[pid]).filter((m)=>m.length > 0);
+        return advancedVSeed;
+    };
 export { buildMeasures };
 
 //# sourceMappingURL=buildMeasures.js.map

package/dist/esm/pipeline/advanced/chart/pipes/measures/buildMeasures.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/advanced/chart/pipes/measures/buildMeasures.js","sources":["webpack://@visactor/vseed/./src/pipeline/advanced/chart/pipes/measures/buildMeasures.ts"],"sourcesContent":["import type { AdvancedPipe, MeasureGroup, Measures, MeasureTree, VSeed } from 'src/types'\nimport { isMeasureTreeWithChildren, isMeasureTreeWithParentId, normalizeMeasureTree } from './utils'\nimport { isPivotChart } from 'src/pipeline/utils'\nimport { DEFAULT_PARENT_ID } from 'src/pipeline/utils/constant'\nimport { isValid } from '@visactor/vutils'\n\nexport const buildMeasures: AdvancedPipe = (advancedVSeed) => {\n  // 带Children的指标树, 不进行任何处理\n  if (isMeasureTreeWithChildren(advancedVSeed.measures)) {\n    advancedVSeed.measures = normalizeMeasureTree(advancedVSeed.measures as MeasureTree)\n    return advancedVSeed\n  }\n  // 带parentId的指标树, 转换为带children的指标树\n  if (isMeasureTreeWithParentId(advancedVSeed.measures)) {\n    advancedVSeed.measures = generateMeasuresByParentId(advancedVSeed.measures as Measures)\n    return advancedVSeed\n  }\n\n  /**\n   * 透视图表, 自动生成指标树\n   */\n  if (isPivotChart(advancedVSeed as VSeed)) {\n    advancedVSeed.measures = basicMeasuresToMeasureTree(advancedVSeed.measures as Measures)\n  }\n\n  return advancedVSeed\n}\n\nconst generateMeasuresByParentId = (measures: Measures): MeasureTree => {\n  const measureTree: MeasureGroup[] = []\n\n  measures.forEach((measure) => {\n    const parent = measureTree.find((item) => item.id === measure.parentId)\n    if (parent && 'children' in parent) {\n      parent.children = parent.children || []\n\n      if (parent.children.length > 0) {\n        parent.alias += `-${measure.alias ?? measure.id}`\n      }\n\n      parent.children.push(measure)\n    } else if (isValid(measure.parentId)) {\n      measureTree.push({\n        id: measure.parentId,\n        alias: measure.alias ?? measure.id,\n        children: [measure],\n      })\n    } else {\n      measureTree.push({\n        id: DEFAULT_PARENT_ID,\n        alias: measure.alias ?? measure.id, // 当分组只有单个指标的时候，分组alias 设置为该指标的别名或者id\n        children: [measure],\n      })\n    }\n  })\n\n  return measureTree\n}\n\nconst basicMeasuresToMeasureTree = (measures: Measures): MeasureTree => {\n  const id = measures.map((item) => item.id).join('-')\n  const alias = measures.map((item) => item.alias || item.id).join('-')\n  return [\n    {\n      id,\n      alias,\n      children: measures,\n    },\n  ]\n}\n"],"names":["buildMeasures","advancedVSeed","isMeasureTreeWithChildren","normalizeMeasureTree","isMeasureTreeWithParentId","generateMeasuresByParentId","isPivotChart","basicMeasuresToMeasureTree","measures","measureTree","measure","parent","item","isValid","DEFAULT_PARENT_ID","id","alias"],"mappings":";;;;AAMO,MAAMA,gBAA8B,CAACC;IAE1C,IAAIC,0BAA0BD,cAAc,QAAQ,GAAG;QACrDA,cAAc,QAAQ,GAAGE,qBAAqBF,cAAc,QAAQ;QACpE,OAAOA;IACT;IAEA,IAAIG,0BAA0BH,cAAc,QAAQ,GAAG;QACrDA,cAAc,QAAQ,GAAGI,2BAA2BJ,cAAc,QAAQ;QAC1E,OAAOA;IACT;IAKA,IAAIK,aAAaL,gBACfA,cAAc,QAAQ,GAAGM,2BAA2BN,cAAc,QAAQ;IAG5E,OAAOA;AACT;AAEA,MAAMI,6BAA6B,CAACG;IAClC,MAAMC,cAA8B,EAAE;IAEtCD,SAAS,OAAO,CAAC,CAACE;QAChB,MAAMC,SAASF,YAAY,IAAI,CAAC,CAACG,OAASA,KAAK,EAAE,KAAKF,QAAQ,QAAQ;QACtE,IAAIC,UAAU,cAAcA,QAAQ;YAClCA,OAAO,QAAQ,GAAGA,OAAO,QAAQ,IAAI,EAAE;YAEvC,IAAIA,OAAO,QAAQ,CAAC,MAAM,GAAG,GAC3BA,OAAO,KAAK,IAAI,CAAC,CAAC,EAAED,QAAQ,KAAK,IAAIA,QAAQ,EAAE,EAAE;YAGnDC,OAAO,QAAQ,CAAC,IAAI,CAACD;QACvB,OAAO,IAAIG,QAAQH,QAAQ,QAAQ,GACjCD,YAAY,IAAI,CAAC;YACf,IAAIC,QAAQ,QAAQ;YACpB,OAAOA,QAAQ,KAAK,IAAIA,QAAQ,EAAE;YAClC,UAAU;gBAACA;aAAQ;QACrB;aAEAD,YAAY,IAAI,CAAC;YACf,IAAIK;YACJ,OAAOJ,QAAQ,KAAK,IAAIA,QAAQ,EAAE;YAClC,UAAU;gBAACA;aAAQ;QACrB;IAEJ;IAEA,OAAOD;AACT;AAEA,MAAMF,6BAA6B,CAACC;IAClC,MAAMO,KAAKP,SAAS,GAAG,CAAC,CAACI,OAASA,KAAK,EAAE,EAAE,IAAI,CAAC;IAChD,MAAMI,QAAQR,SAAS,GAAG,CAAC,CAACI,OAASA,KAAK,KAAK,IAAIA,KAAK,EAAE,EAAE,IAAI,CAAC;IACjE,OAAO;QACL;YACEG;YACAC;YACA,UAAUR;QACZ;KACD;AACH"}
+{"version":3,"file":"pipeline/advanced/chart/pipes/measures/buildMeasures.js","sources":["webpack://@visactor/vseed/./src/pipeline/advanced/chart/pipes/measures/buildMeasures.ts"],"sourcesContent":["import type { AdvancedPipe, MeasureEncoding, Measures } from 'src/types'\n\nimport { DEFAULT_PARENT_ID } from 'src/pipeline/utils/constant'\nimport { ensureParentIdInitialized, isCommonMeasureEncoding } from './utils'\n\nexport const buildMeasures = (encodingKeys: string[]): AdvancedPipe => {\n  return (advancedVSeed) => {\n    const { measures = [] } = advancedVSeed\n    const measuresByView = {} as { [key: string]: Measures }\n    const parentIds: string[] = []\n\n    for (let index = 0; index < measures.length; index++) {\n      const item = measures[index]\n      const encoding = item.encoding\n      const parentId = item.parentId || DEFAULT_PARENT_ID\n\n      const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding as MeasureEncoding)\n\n      ensureParentIdInitialized(parentId, measuresByView, parentIds)\n\n      if (encodingKeys.includes(encoding as string)) {\n        measuresByView[parentId].push(item)\n      } else if (!isOtherEncoding) {\n        item.encoding = encodingKeys[0] as MeasureEncoding\n        measuresByView[parentId].push(item)\n      }\n    }\n\n    advancedVSeed.reshapeMeasures = parentIds.map((pid) => measuresByView[pid]).filter((m) => m.length > 0)\n\n    return advancedVSeed\n  }\n}\n"],"names":["buildMeasures","encodingKeys","advancedVSeed","measures","measuresByView","parentIds","index","item","encoding","parentId","DEFAULT_PARENT_ID","isOtherEncoding","isCommonMeasureEncoding","ensureParentIdInitialized","pid","m"],"mappings":";;AAKO,MAAMA,gBAAgB,CAACC,eACrB,CAACC;QACN,MAAM,EAAEC,WAAW,EAAE,EAAE,GAAGD;QAC1B,MAAME,iBAAiB,CAAC;QACxB,MAAMC,YAAsB,EAAE;QAE9B,IAAK,IAAIC,QAAQ,GAAGA,QAAQH,SAAS,MAAM,EAAEG,QAAS;YACpD,MAAMC,OAAOJ,QAAQ,CAACG,MAAM;YAC5B,MAAME,WAAWD,KAAK,QAAQ;YAC9B,MAAME,WAAWF,KAAK,QAAQ,IAAIG;YAElC,MAAMC,kBAAkBJ,KAAK,QAAQ,IAAIK,wBAAwBJ;YAEjEK,0BAA0BJ,UAAUL,gBAAgBC;YAEpD,IAAIJ,aAAa,QAAQ,CAACO,WACxBJ,cAAc,CAACK,SAAS,CAAC,IAAI,CAACF;iBACzB,IAAI,CAACI,iBAAiB;gBAC3BJ,KAAK,QAAQ,GAAGN,YAAY,CAAC,EAAE;gBAC/BG,cAAc,CAACK,SAAS,CAAC,IAAI,CAACF;YAChC;QACF;QAEAL,cAAc,eAAe,GAAGG,UAAU,GAAG,CAAC,CAACS,MAAQV,cAAc,CAACU,IAAI,EAAE,MAAM,CAAC,CAACC,IAAMA,EAAE,MAAM,GAAG;QAErG,OAAOb;IACT"}

package/dist/esm/pipeline/advanced/chart/pipes/measures/buildMeasuresForDualAxis.js

@@ -1,126 +1,33 @@
-import { isMeasureTreeWithChildren, isMeasureTreeWithParentId } from "./utils.js";
-import { clone } from "remeda";
 import { DEFAULT_PARENT_ID } from "../../../../utils/constant.js";
-const buildMeasuresForDualAxis = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    if (isMeasureTreeWithChildren(advancedVSeed.measures)) return advancedVSeed;
-    if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
-        advancedVSeed.measures = generateMeasuresByParentId(advancedVSeed.measures);
-        return advancedVSeed;
-    }
-    if (vseed.dualMeasures) {
-        advancedVSeed.measures = dualMeasuresToMeasureTree(clone(vseed.dualMeasures));
-        return advancedVSeed;
-    }
-    const { dualMeasures, encodedMeasures } = basicMeasuresToDualMeasures(advancedVSeed.measures || []);
-    advancedVSeed.measures = dualMeasuresToMeasureTree(dualMeasures);
-    if (encodedMeasures.length) encodedMeasures.forEach((m)=>{
-        advancedVSeed.measures.push(m);
-    });
-    return advancedVSeed;
-};
-const basicMeasuresToDualMeasures = (basicMeasures)=>{
-    const primaryMeasures = [];
-    const secondaryMeasures = [];
-    const encodedMeasures = [];
-    for(let index = 0; index < basicMeasures.length; index++){
-        const item = basicMeasures[index];
+import { ensureParentIdInitialized, isCommonMeasureEncoding } from "./utils.js";
+import { DEFAULT_DUAL_CHART_TYPE, isDualAxisChartType } from "../../../../utils/chatType.js";
+const buildMeasuresForDualAxis = (advancedVSeed)=>{
+    const { measures = [] } = advancedVSeed;
+    const measuresByView = {};
+    const parentIds = [];
+    for(let index = 0; index < measures.length; index++){
+        const item = measures[index];
         const encoding = item.encoding;
+        const parentId = item.parentId || DEFAULT_PARENT_ID;
         const isPrimaryYAxis = 'primaryYAxis' === encoding;
         const isSecondaryYAxis = 'secondaryYAxis' === encoding;
-        const isOtherEncoding = item.encoding && [
-            'color',
-            'label',
-            'tooltip',
-            'detail'
-        ].includes(item.encoding);
-        if (isPrimaryYAxis) primaryMeasures.push(item);
-        else if (isSecondaryYAxis) secondaryMeasures.push(item);
-        else if (isOtherEncoding) encodedMeasures.push(item);
-        else if (0 === index) primaryMeasures.push(item);
-        else secondaryMeasures.push(item);
-    }
-    return {
-        dualMeasures: [
-            {
-                id: 'dualMeasures',
-                primaryMeasures,
-                secondaryMeasures
-            }
-        ],
-        encodedMeasures
-    };
-};
-const dualMeasuresToMeasureTree = (dualMeasures)=>{
-    const measureTree = dualMeasures.map((item, index)=>{
-        const { id, primaryMeasures, secondaryMeasures } = item;
-        const groupChildren = [];
-        let groupId = `${id}-`;
-        if (primaryMeasures) {
-            const arrPrimaryMeasures = Array.isArray(primaryMeasures) ? primaryMeasures : [
-                primaryMeasures
-            ];
-            const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
-            groupId += alias;
-            groupChildren.push({
-                id: `${index}-primary`,
-                alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
-                children: arrPrimaryMeasures
-            });
-        }
-        if (secondaryMeasures) {
-            const arrSecondaryMeasures = Array.isArray(secondaryMeasures) ? secondaryMeasures : [
-                secondaryMeasures
-            ];
-            const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
-            groupId += alias;
-            groupChildren.push({
-                id: `${index}-secondary`,
-                alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
-                children: arrSecondaryMeasures
-            });
+        const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding);
+        ensureParentIdInitialized(parentId, measuresByView, parentIds);
+        if (isPrimaryYAxis) {
+            measuresByView[parentId].push(item);
+            if (!isDualAxisChartType(item.chartType)) item.chartType = DEFAULT_DUAL_CHART_TYPE.primary;
+        } else if (isSecondaryYAxis) {
+            measuresByView[parentId].push(item);
+            if (!isDualAxisChartType(item.chartType)) item.chartType = DEFAULT_DUAL_CHART_TYPE.secondary;
+        } else if (!isOtherEncoding) {
+            const primaryCount = measuresByView[parentId].filter((m)=>'primaryYAxis' === m.encoding).length;
+            item.encoding = 0 === primaryCount ? 'primaryYAxis' : 'secondaryYAxis';
+            if (!isDualAxisChartType(item.chartType)) item.chartType = 'primaryYAxis' === item.encoding ? DEFAULT_DUAL_CHART_TYPE.primary : DEFAULT_DUAL_CHART_TYPE.secondary;
+            measuresByView[parentId].push(item);
         }
-        return {
-            id: groupId,
-            alias: groupId,
-            children: groupChildren
-        };
-    });
-    if (1 === dualMeasures.length) return measureTree[0].children || [];
-    return measureTree;
-};
-const generateMeasuresByParentId = (measures)=>{
-    const dualMeasures = [];
-    const encodedMeasures = [];
-    measures.forEach((item)=>{
-        const id = item.parentId || DEFAULT_PARENT_ID;
-        if (!dualMeasures.find((d)=>d.id === id)) dualMeasures.push({
-            id,
-            primaryMeasures: [],
-            secondaryMeasures: []
-        });
-        const dualChart = dualMeasures.find((d)=>d.id === id);
-        if (!dualChart || !Array.isArray(dualChart.primaryMeasures) || !Array.isArray(dualChart.secondaryMeasures)) return;
-        const encoding = item.encoding;
-        const isPrimaryYAxis = 'primaryYAxis' === encoding;
-        const isSecondaryYAxis = 'secondaryYAxis' === encoding;
-        const isOtherEncoding = item.encoding && [
-            'color',
-            'label',
-            'tooltip',
-            'detail'
-        ].includes(item.encoding);
-        if (isPrimaryYAxis) dualChart.primaryMeasures.push(item);
-        else if (isSecondaryYAxis) dualChart.secondaryMeasures.push(item);
-        else if (isOtherEncoding) encodedMeasures.push(item);
-        else if (0 === dualChart.primaryMeasures.length) dualChart.primaryMeasures.push(item);
-        else dualChart.secondaryMeasures.push(item);
-    });
-    const res = dualMeasuresToMeasureTree(dualMeasures);
-    if (encodedMeasures.length) encodedMeasures.forEach((m)=>{
-        res.push(m);
-    });
-    return res;
+    }
+    advancedVSeed.reshapeMeasures = parentIds.map((pid)=>measuresByView[pid]).filter((m)=>m.length > 0);
+    return advancedVSeed;
 };
 export { buildMeasuresForDualAxis };
 

package/dist/esm/pipeline/advanced/chart/pipes/measures/buildMeasuresForDualAxis.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/advanced/chart/pipes/measures/buildMeasuresForDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/advanced/chart/pipes/measures/buildMeasuresForDualAxis.ts"],"sourcesContent":["import type { AdvancedPipe, DualAxis, DualMeasures, MeasureGroup, Measures, MeasureTree } from 'src/types'\nimport { isMeasureTreeWithParentId, isMeasureTreeWithChildren } from './utils'\nimport { clone } from 'remeda'\nimport { DEFAULT_PARENT_ID } from 'src/pipeline/utils/constant'\n\nexport const buildMeasuresForDualAxis: AdvancedPipe = (advancedVSeed, context) => {\n  const { vseed } = context as {\n    vseed: DualAxis\n  }\n\n  // 带Children的指标树, 不进行任何处理\n  if (isMeasureTreeWithChildren(advancedVSeed.measures)) {\n    return advancedVSeed\n  }\n  // 带parentId的指标树, 转换为带children的指标树\n  if (isMeasureTreeWithParentId(advancedVSeed.measures)) {\n    advancedVSeed.measures = generateMeasuresByParentId(advancedVSeed.measures as Measures)\n    return advancedVSeed\n  }\n\n  if (vseed.dualMeasures) {\n    advancedVSeed.measures = dualMeasuresToMeasureTree(clone(vseed.dualMeasures))\n\n    return advancedVSeed\n  }\n\n  const { dualMeasures, encodedMeasures } = basicMeasuresToDualMeasures(advancedVSeed.measures || [])\n  advancedVSeed.measures = dualMeasuresToMeasureTree(dualMeasures)\n\n  if (encodedMeasures.length) {\n    encodedMeasures.forEach((m) => {\n      advancedVSeed.measures!.push(m)\n    })\n  }\n\n  return advancedVSeed\n}\n\nconst basicMeasuresToDualMeasures = (basicMeasures: Measures) => {\n  const primaryMeasures: Measures = []\n  const secondaryMeasures: Measures = []\n  const encodedMeasures: Measures = []\n\n  for (let index = 0; index < basicMeasures.length; index++) {\n    const item = basicMeasures[index]\n    const encoding = item.encoding\n    const isPrimaryYAxis = encoding === 'primaryYAxis'\n    const isSecondaryYAxis = encoding === 'secondaryYAxis'\n    const isOtherEncoding = item.encoding && ['color', 'label', 'tooltip', 'detail'].includes(item.encoding)\n\n    if (isPrimaryYAxis) {\n      primaryMeasures.push(item)\n    } else if (isSecondaryYAxis) {\n      secondaryMeasures.push(item)\n    } else if (!isOtherEncoding) {\n      if (index === 0) {\n        primaryMeasures.push(item)\n      } else {\n        secondaryMeasures.push(item)\n      }\n    } else {\n      encodedMeasures.push(item)\n    }\n  }\n\n  return {\n    dualMeasures: [{ id: 'dualMeasures', primaryMeasures, secondaryMeasures }],\n    encodedMeasures,\n  }\n}\n\nconst dualMeasuresToMeasureTree = (dualMeasures: DualMeasures): MeasureTree => {\n  const measureTree = dualMeasures.map((item, index): MeasureGroup => {\n    const { id, primaryMeasures, secondaryMeasures } = item\n    const groupChildren: MeasureGroup[] = []\n\n    let groupId: string = `${id}-`\n    if (primaryMeasures) {\n      const arrPrimaryMeasures = Array.isArray(primaryMeasures) ? primaryMeasures : [primaryMeasures]\n      const alias = arrPrimaryMeasures.map((item) => item.alias || item.id).toString()\n      groupId += alias\n      groupChildren.push({\n        id: `${index}-primary`,\n        alias: arrPrimaryMeasures.map((item) => item.alias || item.id).toString(),\n        children: arrPrimaryMeasures,\n      })\n    }\n    if (secondaryMeasures) {\n      const arrSecondaryMeasures = Array.isArray(secondaryMeasures) ? secondaryMeasures : [secondaryMeasures]\n      const alias = arrSecondaryMeasures.map((item) => item.alias || item.id).toString()\n      groupId += alias\n      groupChildren.push({\n        id: `${index}-secondary`,\n        alias: arrSecondaryMeasures.map((item) => item.alias || item.id).toString(),\n        children: arrSecondaryMeasures,\n      })\n    }\n\n    return {\n      id: groupId,\n      alias: groupId,\n      children: groupChildren,\n    }\n  })\n\n  // 只有1个双轴图, 仅返回2层, vchart 绘制双轴图\n  if (dualMeasures.length === 1) {\n    return measureTree[0].children || []\n  }\n\n  // 有多个双轴图, 返回3层, pivot chart 绘制组合双轴图\n  return measureTree\n}\n\nconst generateMeasuresByParentId = (measures: Measures) => {\n  const dualMeasures: DualMeasures = []\n  const encodedMeasures: Measures = []\n\n  measures.forEach((item) => {\n    const id = item.parentId || DEFAULT_PARENT_ID\n    if (!dualMeasures.find((d) => d.id === id)) {\n      dualMeasures.push({\n        id,\n        primaryMeasures: [],\n        secondaryMeasures: [],\n      })\n    }\n\n    const dualChart = dualMeasures.find((d) => d.id === id)\n    if (!dualChart || !Array.isArray(dualChart.primaryMeasures) || !Array.isArray(dualChart.secondaryMeasures)) {\n      return\n    }\n\n    const encoding = item.encoding\n    const isPrimaryYAxis = encoding === 'primaryYAxis'\n    const isSecondaryYAxis = encoding === 'secondaryYAxis'\n    const isOtherEncoding = item.encoding && ['color', 'label', 'tooltip', 'detail'].includes(item.encoding)\n\n    if (isPrimaryYAxis) {\n      dualChart.primaryMeasures.push(item)\n    } else if (isSecondaryYAxis) {\n      dualChart.secondaryMeasures.push(item)\n    } else if (!isOtherEncoding) {\n      if (dualChart.primaryMeasures.length === 0) {\n        dualChart.primaryMeasures.push(item)\n      } else {\n        dualChart.secondaryMeasures.push(item)\n      }\n    } else {\n      encodedMeasures.push(item)\n    }\n  })\n\n  const res = dualMeasuresToMeasureTree(dualMeasures)\n\n  if (encodedMeasures.length) {\n    encodedMeasures.forEach((m) => {\n      res.push(m)\n    })\n  }\n\n  return res\n}\n"],"names":["buildMeasuresForDualAxis","advancedVSeed","context","vseed","isMeasureTreeWithChildren","isMeasureTreeWithParentId","generateMeasuresByParentId","dualMeasuresToMeasureTree","clone","dualMeasures","encodedMeasures","basicMeasuresToDualMeasures","m","basicMeasures","primaryMeasures","secondaryMeasures","index","item","encoding","isPrimaryYAxis","isSecondaryYAxis","isOtherEncoding","measureTree","id","groupChildren","groupId","arrPrimaryMeasures","Array","alias","arrSecondaryMeasures","measures","DEFAULT_PARENT_ID","d","dualChart","res"],"mappings":"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"}
+{"version":3,"file":"pipeline/advanced/chart/pipes/measures/buildMeasuresForDualAxis.js","sources":["webpack://@visactor/vseed/./src/pipeline/advanced/chart/pipes/measures/buildMeasuresForDualAxis.ts"],"sourcesContent":["import type { AdvancedPipe, DualAxisMeasure, MeasureEncoding, Measures } from 'src/types'\nimport { DEFAULT_PARENT_ID } from 'src/pipeline/utils/constant'\nimport { ensureParentIdInitialized, isCommonMeasureEncoding } from './utils'\nimport { DEFAULT_DUAL_CHART_TYPE, isDualAxisChartType } from 'src/pipeline/utils/chatType'\n\nexport const buildMeasuresForDualAxis: AdvancedPipe = (advancedVSeed) => {\n  const { measures = [] } = advancedVSeed\n  const measuresByView = {} as { [key: string]: Measures }\n  const parentIds: string[] = []\n\n  for (let index = 0; index < measures.length; index++) {\n    const item = measures[index]\n    const encoding = item.encoding\n    const parentId = item.parentId || DEFAULT_PARENT_ID\n    const isPrimaryYAxis = encoding === 'primaryYAxis'\n    const isSecondaryYAxis = encoding === 'secondaryYAxis'\n    const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding as MeasureEncoding)\n\n    ensureParentIdInitialized(parentId, measuresByView, parentIds)\n\n    if (isPrimaryYAxis) {\n      measuresByView[parentId].push(item)\n\n      if (!isDualAxisChartType((item as DualAxisMeasure).chartType)) {\n        ;(item as any).chartType = DEFAULT_DUAL_CHART_TYPE.primary\n      }\n    } else if (isSecondaryYAxis) {\n      measuresByView[parentId].push(item)\n\n      if (!isDualAxisChartType((item as DualAxisMeasure).chartType)) {\n        ;(item as any).chartType = DEFAULT_DUAL_CHART_TYPE.secondary\n      }\n    } else if (!isOtherEncoding) {\n      const primaryCount = measuresByView[parentId].filter((m) => m.encoding === 'primaryYAxis').length\n      item.encoding = primaryCount === 0 ? 'primaryYAxis' : 'secondaryYAxis'\n\n      if (!isDualAxisChartType((item as DualAxisMeasure).chartType)) {\n        ;(item as any).chartType =\n          item.encoding === 'primaryYAxis' ? DEFAULT_DUAL_CHART_TYPE.primary : DEFAULT_DUAL_CHART_TYPE.secondary\n      }\n\n      measuresByView[parentId].push(item)\n    }\n  }\n\n  advancedVSeed.reshapeMeasures = parentIds.map((pid) => measuresByView[pid]).filter((m) => m.length > 0)\n\n  return advancedVSeed\n}\n"],"names":["buildMeasuresForDualAxis","advancedVSeed","measures","measuresByView","parentIds","index","item","encoding","parentId","DEFAULT_PARENT_ID","isPrimaryYAxis","isSecondaryYAxis","isOtherEncoding","isCommonMeasureEncoding","ensureParentIdInitialized","isDualAxisChartType","DEFAULT_DUAL_CHART_TYPE","primaryCount","m","pid"],"mappings":";;;AAKO,MAAMA,2BAAyC,CAACC;IACrD,MAAM,EAAEC,WAAW,EAAE,EAAE,GAAGD;IAC1B,MAAME,iBAAiB,CAAC;IACxB,MAAMC,YAAsB,EAAE;IAE9B,IAAK,IAAIC,QAAQ,GAAGA,QAAQH,SAAS,MAAM,EAAEG,QAAS;QACpD,MAAMC,OAAOJ,QAAQ,CAACG,MAAM;QAC5B,MAAME,WAAWD,KAAK,QAAQ;QAC9B,MAAME,WAAWF,KAAK,QAAQ,IAAIG;QAClC,MAAMC,iBAAiBH,AAAa,mBAAbA;QACvB,MAAMI,mBAAmBJ,AAAa,qBAAbA;QACzB,MAAMK,kBAAkBN,KAAK,QAAQ,IAAIO,wBAAwBN;QAEjEO,0BAA0BN,UAAUL,gBAAgBC;QAEpD,IAAIM,gBAAgB;YAClBP,cAAc,CAACK,SAAS,CAAC,IAAI,CAACF;YAE9B,IAAI,CAACS,oBAAqBT,KAAyB,SAAS,GACxDA,KAAa,SAAS,GAAGU,wBAAwB,OAAO;QAE9D,OAAO,IAAIL,kBAAkB;YAC3BR,cAAc,CAACK,SAAS,CAAC,IAAI,CAACF;YAE9B,IAAI,CAACS,oBAAqBT,KAAyB,SAAS,GACxDA,KAAa,SAAS,GAAGU,wBAAwB,SAAS;QAEhE,OAAO,IAAI,CAACJ,iBAAiB;YAC3B,MAAMK,eAAed,cAAc,CAACK,SAAS,CAAC,MAAM,CAAC,CAACU,IAAMA,AAAe,mBAAfA,EAAE,QAAQ,EAAqB,MAAM;YACjGZ,KAAK,QAAQ,GAAGW,AAAiB,MAAjBA,eAAqB,iBAAiB;YAEtD,IAAI,CAACF,oBAAqBT,KAAyB,SAAS,GACxDA,KAAa,SAAS,GACtBA,AAAkB,mBAAlBA,KAAK,QAAQ,GAAsBU,wBAAwB,OAAO,GAAGA,wBAAwB,SAAS;YAG1Gb,cAAc,CAACK,SAAS,CAAC,IAAI,CAACF;QAChC;IACF;IAEAL,cAAc,eAAe,GAAGG,UAAU,GAAG,CAAC,CAACe,MAAQhB,cAAc,CAACgB,IAAI,EAAE,MAAM,CAAC,CAACD,IAAMA,EAAE,MAAM,GAAG;IAErG,OAAOjB;AACT"}

package/dist/esm/pipeline/advanced/chart/pipes/measures/buildMeasuresForScatter.js

@@ -1,126 +1,41 @@
-import { isMeasureTreeWithChildren, isMeasureTreeWithParentId } from "./utils.js";
 import { clone } from "remeda";
 import { DEFAULT_PARENT_ID } from "../../../../utils/constant.js";
-const buildMeasuresForScatter = (advancedVSeed, context)=>{
-    const { vseed } = context;
-    if (isMeasureTreeWithChildren(advancedVSeed.measures)) return advancedVSeed;
-    if (isMeasureTreeWithParentId(advancedVSeed.measures)) {
-        advancedVSeed.measures = generateMeasuresByParentId(advancedVSeed.measures);
-        return advancedVSeed;
-    }
-    if (vseed.scatterMeasures) {
-        advancedVSeed.measures = scatterMeasuresToMeasureTree(clone(vseed.scatterMeasures));
-        return advancedVSeed;
-    }
-    const { scatterMeasures, encodedMeasures } = basicMeasuresToScatterMeasures(advancedVSeed.measures || []);
-    advancedVSeed.measures = scatterMeasuresToMeasureTree(scatterMeasures);
-    if (encodedMeasures.length) encodedMeasures.forEach((m)=>{
-        advancedVSeed.measures.push(m);
-    });
-    return advancedVSeed;
-};
-const basicMeasuresToScatterMeasures = (basicMeasures)=>{
-    const yMeasures = [];
-    const xMeasures = [];
-    const encodedMeasures = [];
-    for(let index = 0; index < basicMeasures.length; index++){
-        const item = basicMeasures[index];
+import { ensureParentIdInitialized, isCommonMeasureEncoding } from "./utils.js";
+const buildMeasuresForScatter = (advancedVSeed)=>{
+    const { measures = [] } = advancedVSeed;
+    const measuresByView = {};
+    const parentIds = [];
+    for(let index = 0; index < measures.length; index++){
+        const item = measures[index];
         const encoding = item.encoding;
+        const parentId = item.parentId || DEFAULT_PARENT_ID;
         const isYAxis = 'yAxis' === encoding;
         const isXAxis = 'xAxis' === encoding;
-        const isOther = encoding && [
-            'color',
-            'label',
-            'tooltip',
-            'detail'
-        ].includes(encoding);
-        if (isYAxis) yMeasures.push(item);
-        else if (isXAxis) xMeasures.push(item);
-        else if (isOther) encodedMeasures.push(item);
-        else if (0 !== index) yMeasures.push(item);
-        else xMeasures.push(item);
-    }
-    if (0 === yMeasures.length && xMeasures.length > 0) yMeasures.push(xMeasures[0]);
-    return {
-        scatterMeasures: [
-            {
-                id: 'scatterMeasures',
-                xMeasures,
-                yMeasures
-            }
-        ],
-        encodedMeasures
-    };
-};
-const scatterMeasuresToMeasureTree = (scatterMeasures)=>{
-    const measureTree = scatterMeasures.map((item, index)=>{
-        const { id, xMeasures, yMeasures } = item;
-        const groupChildren = [];
-        let groupId = `${id}-`;
-        if (xMeasures) {
-            const arrPrimaryMeasures = Array.isArray(xMeasures) ? xMeasures : [
-                xMeasures
-            ];
-            const alias = arrPrimaryMeasures.map((item)=>item.alias || item.id).toString();
-            groupId += alias;
-            groupChildren.push({
-                id: `${index}-x`,
-                alias: arrPrimaryMeasures.map((item)=>item.alias || item.id).toString(),
-                children: arrPrimaryMeasures
-            });
+        const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding);
+        ensureParentIdInitialized(parentId, measuresByView, parentIds);
+        if (isYAxis) measuresByView[parentId].push(item);
+        else if (isXAxis) measuresByView[parentId].push(item);
+        else if (!isOtherEncoding && 'size' !== encoding) {
+            const xCount = measuresByView[parentId].filter((m)=>'xAxis' === m.encoding).length;
+            item.encoding = 0 === xCount ? 'xAxis' : 'yAxis';
+            measuresByView[parentId].push(item);
         }
-        if (yMeasures) {
-            const arrSecondaryMeasures = Array.isArray(yMeasures) ? yMeasures : [
-                yMeasures
+    }
+    advancedVSeed.reshapeMeasures = parentIds.map((pid)=>{
+        const basicMeasures = measuresByView[pid];
+        const xCount = basicMeasures.filter((m)=>'xAxis' === m.encoding).length;
+        const yCount = basicMeasures.filter((m)=>'yAxis' === m.encoding).length;
+        if (0 === yCount && xCount > 0) {
+            const cloneMeasure = clone(basicMeasures[0]);
+            cloneMeasure.encoding = 'yAxis';
+            return [
+                ...basicMeasures,
+                cloneMeasure
             ];
-            const alias = arrSecondaryMeasures.map((item)=>item.alias || item.id).toString();
-            groupId += alias;
-            groupChildren.push({
-                id: `${index}-y`,
-                alias: arrSecondaryMeasures.map((item)=>item.alias || item.id).toString(),
-                children: arrSecondaryMeasures
-            });
         }
-        return {
-            id: groupId,
-            alias: groupId,
-            children: groupChildren
-        };
-    });
-    if (1 === scatterMeasures.length) return measureTree[0].children || [];
-    return measureTree;
-};
-const generateMeasuresByParentId = (measures)=>{
-    const scatterMeasures = [];
-    const encodedMeasures = [];
-    measures.forEach((item)=>{
-        const id = item.parentId || DEFAULT_PARENT_ID;
-        if (!scatterMeasures.find((d)=>d.id === id)) scatterMeasures.push({
-            id,
-            yMeasures: [],
-            xMeasures: []
-        });
-        const scatterChart = scatterMeasures.find((d)=>d.id === id);
-        if (!scatterChart || !Array.isArray(scatterChart.yMeasures) || !Array.isArray(scatterChart.xMeasures)) return;
-        const isYAxis = 'yAxis' === item.encoding;
-        const isXAxis = 'xAxis' === item.encoding;
-        const isOther = item.encoding && [
-            'color',
-            'label',
-            'tooltip',
-            'detail'
-        ].includes(item.encoding);
-        if (isYAxis) scatterChart.yMeasures.push(item);
-        else if (isXAxis) scatterChart.xMeasures.push(item);
-        else if (isOther) encodedMeasures.push(item);
-        else if (0 !== scatterChart.yMeasures.length) scatterChart.yMeasures.push(item);
-        else scatterChart.xMeasures.push(item);
-    });
-    const res = scatterMeasuresToMeasureTree(scatterMeasures);
-    if (encodedMeasures.length) encodedMeasures.forEach((m)=>{
-        res.push(m);
-    });
-    return res;
+        return basicMeasures;
+    }).filter((m)=>m.length > 0);
+    return advancedVSeed;
 };
 export { buildMeasuresForScatter };
 

package/dist/esm/pipeline/advanced/chart/pipes/measures/buildMeasuresForScatter.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/advanced/chart/pipes/measures/buildMeasuresForScatter.js","sources":["webpack://@visactor/vseed/./src/pipeline/advanced/chart/pipes/measures/buildMeasuresForScatter.ts"],"sourcesContent":["import type { AdvancedPipe, MeasureGroup, Measures, MeasureTree, Scatter, ScatterMeasures } from 'src/types'\nimport { isMeasureTreeWithParentId, isMeasureTreeWithChildren } from './utils'\nimport { clone } from 'remeda'\nimport { DEFAULT_PARENT_ID } from 'src/pipeline/utils/constant'\n\nexport const buildMeasuresForScatter: AdvancedPipe = (advancedVSeed, context) => {\n  const { vseed } = context as {\n    vseed: Scatter\n  }\n\n  // 带Children的指标树, 不进行任何处理\n  if (isMeasureTreeWithChildren(advancedVSeed.measures)) {\n    return advancedVSeed\n  }\n  // 带parentId的指标树, 转换为带children的指标树\n  if (isMeasureTreeWithParentId(advancedVSeed.measures)) {\n    advancedVSeed.measures = generateMeasuresByParentId(advancedVSeed.measures as Measures)\n    return advancedVSeed\n  }\n\n  /**\n   * 既不是带Children的指标树, 也不是带parentId的指标树, 则自动生成指标\n   */\n\n  if (vseed.scatterMeasures) {\n    advancedVSeed.measures = scatterMeasuresToMeasureTree(clone(vseed.scatterMeasures))\n\n    return advancedVSeed\n  }\n\n  const { scatterMeasures, encodedMeasures } = basicMeasuresToScatterMeasures(advancedVSeed.measures || [])\n  advancedVSeed.measures = scatterMeasuresToMeasureTree(scatterMeasures)\n\n  if (encodedMeasures.length) {\n    encodedMeasures.forEach((m) => {\n      advancedVSeed.measures!.push(m)\n    })\n  }\n\n  return advancedVSeed\n}\n\nconst basicMeasuresToScatterMeasures = (basicMeasures: Measures) => {\n  const yMeasures: Measures = []\n  const xMeasures: Measures = []\n  const encodedMeasures: Measures = []\n\n  for (let index = 0; index < basicMeasures.length; index++) {\n    const item = basicMeasures[index]\n    const encoding = item.encoding\n    const isYAxis = encoding === 'yAxis'\n    const isXAxis = encoding === 'xAxis'\n    const isOther = encoding && ['color', 'label', 'tooltip', 'detail'].includes(encoding)\n\n    if (isYAxis) {\n      yMeasures.push(item)\n    } else if (isXAxis) {\n      xMeasures.push(item)\n    } else if (!isOther) {\n      if (index !== 0) {\n        yMeasures.push(item)\n      } else {\n        xMeasures.push(item)\n      }\n    } else {\n      encodedMeasures.push(item)\n    }\n  }\n\n  if (yMeasures.length === 0 && xMeasures.length > 0) {\n    yMeasures.push(xMeasures[0])\n  }\n\n  return {\n    scatterMeasures: [{ id: 'scatterMeasures', xMeasures, yMeasures }],\n    encodedMeasures,\n  }\n}\n\nconst scatterMeasuresToMeasureTree = (scatterMeasures: ScatterMeasures): MeasureTree => {\n  const measureTree = scatterMeasures.map((item, index): MeasureGroup => {\n    const { id, xMeasures, yMeasures } = item\n    const groupChildren: MeasureGroup[] = []\n\n    let groupId: string = `${id}-`\n    if (xMeasures) {\n      const arrPrimaryMeasures = Array.isArray(xMeasures) ? xMeasures : [xMeasures]\n      const alias = arrPrimaryMeasures.map((item) => item.alias || item.id).toString()\n      groupId += alias\n      groupChildren.push({\n        id: `${index}-x`,\n        alias: arrPrimaryMeasures.map((item) => item.alias || item.id).toString(),\n        children: arrPrimaryMeasures,\n      })\n    }\n    if (yMeasures) {\n      const arrSecondaryMeasures = Array.isArray(yMeasures) ? yMeasures : [yMeasures]\n      const alias = arrSecondaryMeasures.map((item) => item.alias || item.id).toString()\n      groupId += alias\n      groupChildren.push({\n        id: `${index}-y`,\n        alias: arrSecondaryMeasures.map((item) => item.alias || item.id).toString(),\n        children: arrSecondaryMeasures,\n      })\n    }\n\n    return {\n      id: groupId,\n      alias: groupId,\n      children: groupChildren,\n    }\n  })\n\n  // 只有1个散点图, 仅返回2层, vchart 绘制散点图\n  if (scatterMeasures.length === 1) {\n    return measureTree[0].children || []\n  }\n\n  // 有多个散点图, 返回3层, pivot chart 绘制组合散点图\n  return measureTree\n}\n\nconst generateMeasuresByParentId = (measures: Measures) => {\n  const scatterMeasures: ScatterMeasures = []\n  const encodedMeasures: Measures = []\n\n  measures.forEach((item) => {\n    const id = item.parentId || DEFAULT_PARENT_ID\n\n    if (!scatterMeasures.find((d) => d.id === id)) {\n      scatterMeasures.push({\n        id,\n        yMeasures: [],\n        xMeasures: [],\n      })\n    }\n    const scatterChart = scatterMeasures.find((d) => d.id === id)\n    if (!scatterChart || !Array.isArray(scatterChart.yMeasures) || !Array.isArray(scatterChart.xMeasures)) {\n      return\n    }\n\n    const isYAxis = item.encoding === 'yAxis'\n    const isXAxis = item.encoding === 'xAxis'\n    const isOther = item.encoding && ['color', 'label', 'tooltip', 'detail'].includes(item.encoding)\n\n    if (isYAxis) {\n      scatterChart.yMeasures.push(item)\n    } else if (isXAxis) {\n      scatterChart.xMeasures.push(item)\n    } else if (!isOther) {\n      if (scatterChart.yMeasures.length !== 0) {\n        scatterChart.yMeasures.push(item)\n      } else {\n        scatterChart.xMeasures.push(item)\n      }\n    } else {\n      encodedMeasures.push(item)\n    }\n  })\n\n  const res = scatterMeasuresToMeasureTree(scatterMeasures)\n\n  if (encodedMeasures.length) {\n    encodedMeasures.forEach((m) => {\n      res.push(m)\n    })\n  }\n\n  return res\n}\n"],"names":["buildMeasuresForScatter","advancedVSeed","context","vseed","isMeasureTreeWithChildren","isMeasureTreeWithParentId","generateMeasuresByParentId","scatterMeasuresToMeasureTree","clone","scatterMeasures","encodedMeasures","basicMeasuresToScatterMeasures","m","basicMeasures","yMeasures","xMeasures","index","item","encoding","isYAxis","isXAxis","isOther","measureTree","id","groupChildren","groupId","arrPrimaryMeasures","Array","alias","arrSecondaryMeasures","measures","DEFAULT_PARENT_ID","d","scatterChart","res"],"mappings":"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"}
+{"version":3,"file":"pipeline/advanced/chart/pipes/measures/buildMeasuresForScatter.js","sources":["webpack://@visactor/vseed/./src/pipeline/advanced/chart/pipes/measures/buildMeasuresForScatter.ts"],"sourcesContent":["import type { AdvancedPipe, MeasureEncoding, Measures } from 'src/types'\nimport { clone } from 'remeda'\nimport { DEFAULT_PARENT_ID } from 'src/pipeline/utils/constant'\nimport { ensureParentIdInitialized, isCommonMeasureEncoding } from './utils'\n\nexport const buildMeasuresForScatter: AdvancedPipe = (advancedVSeed) => {\n  const { measures = [] } = advancedVSeed\n  const measuresByView = {} as { [key: string]: Measures }\n  const parentIds: string[] = []\n\n  for (let index = 0; index < measures.length; index++) {\n    const item = measures[index]\n    const encoding = item.encoding\n    const parentId = item.parentId || DEFAULT_PARENT_ID\n    const isYAxis = encoding === 'yAxis'\n    const isXAxis = encoding === 'xAxis'\n    const isOtherEncoding = item.encoding && isCommonMeasureEncoding(encoding as MeasureEncoding)\n\n    ensureParentIdInitialized(parentId, measuresByView, parentIds)\n\n    if (isYAxis) {\n      measuresByView[parentId].push(item)\n    } else if (isXAxis) {\n      measuresByView[parentId].push(item)\n    } else if (!isOtherEncoding && encoding !== 'size') {\n      const xCount = measuresByView[parentId].filter((m) => m.encoding === 'xAxis').length\n      item.encoding = xCount === 0 ? 'xAxis' : 'yAxis'\n      measuresByView[parentId].push(item)\n    }\n  }\n\n  advancedVSeed.reshapeMeasures = parentIds\n    .map((pid) => {\n      const basicMeasures = measuresByView[pid]\n      const xCount = basicMeasures.filter((m) => m.encoding === 'xAxis').length\n      const yCount = basicMeasures.filter((m) => m.encoding === 'yAxis').length\n\n      if (yCount === 0 && xCount > 0) {\n        const cloneMeasure = clone(basicMeasures[0])\n        cloneMeasure.encoding = 'yAxis'\n\n        return [...basicMeasures, cloneMeasure]\n      }\n\n      return basicMeasures\n    })\n    .filter((m) => m.length > 0)\n\n  return advancedVSeed\n}\n"],"names":["buildMeasuresForScatter","advancedVSeed","measures","measuresByView","parentIds","index","item","encoding","parentId","DEFAULT_PARENT_ID","isYAxis","isXAxis","isOtherEncoding","isCommonMeasureEncoding","ensureParentIdInitialized","xCount","m","pid","basicMeasures","yCount","cloneMeasure","clone"],"mappings":";;;AAKO,MAAMA,0BAAwC,CAACC;IACpD,MAAM,EAAEC,WAAW,EAAE,EAAE,GAAGD;IAC1B,MAAME,iBAAiB,CAAC;IACxB,MAAMC,YAAsB,EAAE;IAE9B,IAAK,IAAIC,QAAQ,GAAGA,QAAQH,SAAS,MAAM,EAAEG,QAAS;QACpD,MAAMC,OAAOJ,QAAQ,CAACG,MAAM;QAC5B,MAAME,WAAWD,KAAK,QAAQ;QAC9B,MAAME,WAAWF,KAAK,QAAQ,IAAIG;QAClC,MAAMC,UAAUH,AAAa,YAAbA;QAChB,MAAMI,UAAUJ,AAAa,YAAbA;QAChB,MAAMK,kBAAkBN,KAAK,QAAQ,IAAIO,wBAAwBN;QAEjEO,0BAA0BN,UAAUL,gBAAgBC;QAEpD,IAAIM,SACFP,cAAc,CAACK,SAAS,CAAC,IAAI,CAACF;aACzB,IAAIK,SACTR,cAAc,CAACK,SAAS,CAAC,IAAI,CAACF;aACzB,IAAI,CAACM,mBAAmBL,AAAa,WAAbA,UAAqB;YAClD,MAAMQ,SAASZ,cAAc,CAACK,SAAS,CAAC,MAAM,CAAC,CAACQ,IAAMA,AAAe,YAAfA,EAAE,QAAQ,EAAc,MAAM;YACpFV,KAAK,QAAQ,GAAGS,AAAW,MAAXA,SAAe,UAAU;YACzCZ,cAAc,CAACK,SAAS,CAAC,IAAI,CAACF;QAChC;IACF;IAEAL,cAAc,eAAe,GAAGG,UAC7B,GAAG,CAAC,CAACa;QACJ,MAAMC,gBAAgBf,cAAc,CAACc,IAAI;QACzC,MAAMF,SAASG,cAAc,MAAM,CAAC,CAACF,IAAMA,AAAe,YAAfA,EAAE,QAAQ,EAAc,MAAM;QACzE,MAAMG,SAASD,cAAc,MAAM,CAAC,CAACF,IAAMA,AAAe,YAAfA,EAAE,QAAQ,EAAc,MAAM;QAEzE,IAAIG,AAAW,MAAXA,UAAgBJ,SAAS,GAAG;YAC9B,MAAMK,eAAeC,MAAMH,aAAa,CAAC,EAAE;YAC3CE,aAAa,QAAQ,GAAG;YAExB,OAAO;mBAAIF;gBAAeE;aAAa;QACzC;QAEA,OAAOF;IACT,GACC,MAAM,CAAC,CAACF,IAAMA,EAAE,MAAM,GAAG;IAE5B,OAAOf;AACT"}

package/dist/esm/pipeline/advanced/chart/pipes/measures/index.d.ts

@@ -2,4 +2,3 @@ export * from './utils';
 export { buildMeasuresForDualAxis } from './buildMeasuresForDualAxis';
 export { buildMeasures } from './buildMeasures';
 export { buildMeasuresForScatter } from './buildMeasuresForScatter';
-export { pickMeasuresForReshape } from './pickMeasuresForReshape';

package/dist/esm/pipeline/advanced/chart/pipes/measures/index.js

@@ -1,6 +1,5 @@
 import { buildMeasuresForDualAxis } from "./buildMeasuresForDualAxis.js";
 import { buildMeasures } from "./buildMeasures.js";
 import { buildMeasuresForScatter } from "./buildMeasuresForScatter.js";
-import { pickMeasuresForReshape } from "./pickMeasuresForReshape.js";
 export * from "./utils.js";
-export { buildMeasures, buildMeasuresForDualAxis, buildMeasuresForScatter, pickMeasuresForReshape };
+export { buildMeasures, buildMeasuresForDualAxis, buildMeasuresForScatter };

package/dist/esm/pipeline/advanced/chart/pipes/measures/utils.d.ts

@@ -1,4 +1,4 @@
-import type { MeasureGroup, MeasureTree } from '../../../../../types';
+import type { MeasureEncoding, MeasureGroup, MeasureTree } from '../../../../../types';
 /**
  * @description 检查是否为指标树, 指标树深度大于1. 如果存在一个指标为组, 即有children配置, 则认为是指标树.
  * @param vseed vseed
@@ -17,3 +17,14 @@ export declare const isMeasureTreeWithParentId: <T extends MeasureTree>(measures
  * @returns
  */
 export declare const normalizeMeasureTree: (measures: MeasureTree) => MeasureGroup[];
+export declare const isCommonMeasureEncoding: (encoding: MeasureEncoding) => boolean;
+/**
+ * @description Ensures that the measuresByView object has an initialized array for the given parentId.
+ * If the parentId doesn't exist in measuresByView, it initializes an empty array and tracks the parentId.
+ * @param parentId The parent ID to ensure initialization for
+ * @param measuresByView The object mapping parent IDs to measures arrays
+ * @param parentIds The array tracking all parent IDs that have been initialized
+ */
+export declare const ensureParentIdInitialized: <T>(parentId: string, measuresByView: {
+    [key: string]: T[];
+}, parentIds: string[]) => void;

package/dist/esm/pipeline/advanced/chart/pipes/measures/utils.js

@@ -37,6 +37,17 @@ const normalizeMeasureTree = (measures)=>{
     }
     return measureGroups;
 };
-export { isMeasureTreeWithChildren, isMeasureTreeWithParentId, normalizeMeasureTree };
+const isCommonMeasureEncoding = (encoding)=>[
+        'color',
+        'label',
+        'tooltip'
+    ].includes(encoding);
+const ensureParentIdInitialized = (parentId, measuresByView, parentIds)=>{
+    if (!measuresByView[parentId]) {
+        measuresByView[parentId] = [];
+        parentIds.push(parentId);
+    }
+};
+export { ensureParentIdInitialized, isCommonMeasureEncoding, isMeasureTreeWithChildren, isMeasureTreeWithParentId, normalizeMeasureTree };
 
 //# sourceMappingURL=utils.js.map

package/dist/esm/pipeline/advanced/chart/pipes/measures/utils.js.map

@@ -1 +1 @@
-{"version":3,"file":"pipeline/advanced/chart/pipes/measures/utils.js","sources":["webpack://@visactor/vseed/./src/pipeline/advanced/chart/pipes/measures/utils.ts"],"sourcesContent":["import type { MeasureGroup, MeasureTree } from 'src/types'\n\n/**\n * @description 检查是否为指标树, 指标树深度大于1. 如果存在一个指标为组, 即有children配置, 则认为是指标树.\n * @param vseed vseed\n * @returns\n */\nexport const isMeasureTreeWithChildren = <T extends MeasureTree>(measures?: T) => {\n  if (!measures) {\n    return false\n  }\n\n  return measures.some((measure) => 'children' in measure)\n}\n\n/**\n * @description 检查是否为指标树, 指标树存在parentId. 如果存在一个指标有parentId, 则认为是指标树.\n * @param vseed vseed\n * @returns\n */\nexport const isMeasureTreeWithParentId = <T extends MeasureTree>(measures?: T) => {\n  if (!measures) {\n    return false\n  }\n\n  return measures.some((measure) => 'parentId' in measure)\n}\n\n/**\n * @description 保证指标树中的每一组都有children, 没有children的指标, 会被放到一个默认的指标组中.\n * @param measures 指标树\n * @returns\n */\nexport const normalizeMeasureTree = (measures: MeasureTree) => {\n  const createEmptyMeasureGroup = (): MeasureGroup => {\n    return {\n      id: 'group',\n      alias: '',\n      children: [],\n    }\n  }\n\n  let currentGroup: MeasureGroup = createEmptyMeasureGroup()\n  const measureGroups: MeasureGroup[] = []\n  for (const measure of measures) {\n    if ('children' in measure) {\n      // 当前指标组之前的所有独立指标成组\n      if (currentGroup.children?.length) {\n        currentGroup.id = [currentGroup.id, ...currentGroup.children.map((item) => item.id)].join('-')\n        currentGroup.alias = currentGroup.children.map((item) => item.alias).join('-')\n        measureGroups.push(currentGroup)\n        currentGroup = createEmptyMeasureGroup()\n      }\n      // 当前是指标组\n      measureGroups.push(measure)\n    } else {\n      currentGroup.children?.push(measure)\n    }\n  }\n\n  // 最后一组\n  if (currentGroup.children?.length) {\n    currentGroup.id = [currentGroup.id, ...currentGroup.children.map((item) => item.id)].join('-')\n    currentGroup.alias = currentGroup.children.map((item) => item.alias).join('-')\n    measureGroups.push(currentGroup)\n    currentGroup = createEmptyMeasureGroup()\n  }\n\n  return measureGroups\n}\n"],"names":["isMeasureTreeWithChildren","measures","measure","isMeasureTreeWithParentId","normalizeMeasureTree","createEmptyMeasureGroup","currentGroup","measureGroups","item"],"mappings":"AAOO,MAAMA,4BAA4B,CAAwBC;IAC/D,IAAI,CAACA,UACH,OAAO;IAGT,OAAOA,SAAS,IAAI,CAAC,CAACC,UAAY,cAAcA;AAClD;AAOO,MAAMC,4BAA4B,CAAwBF;IAC/D,IAAI,CAACA,UACH,OAAO;IAGT,OAAOA,SAAS,IAAI,CAAC,CAACC,UAAY,cAAcA;AAClD;AAOO,MAAME,uBAAuB,CAACH;IACnC,MAAMI,0BAA0B,IACvB;YACL,IAAI;YACJ,OAAO;YACP,UAAU,EAAE;QACd;IAGF,IAAIC,eAA6BD;IACjC,MAAME,gBAAgC,EAAE;IACxC,KAAK,MAAML,WAAWD,SACpB,IAAI,cAAcC,SAAS;QAEzB,IAAII,aAAa,QAAQ,EAAE,QAAQ;YACjCA,aAAa,EAAE,GAAG;gBAACA,aAAa,EAAE;mBAAKA,aAAa,QAAQ,CAAC,GAAG,CAAC,CAACE,OAASA,KAAK,EAAE;aAAE,CAAC,IAAI,CAAC;YAC1FF,aAAa,KAAK,GAAGA,aAAa,QAAQ,CAAC,GAAG,CAAC,CAACE,OAASA,KAAK,KAAK,EAAE,IAAI,CAAC;YAC1ED,cAAc,IAAI,CAACD;YACnBA,eAAeD;QACjB;QAEAE,cAAc,IAAI,CAACL;IACrB,OACEI,aAAa,QAAQ,EAAE,KAAKJ;IAKhC,IAAII,aAAa,QAAQ,EAAE,QAAQ;QACjCA,aAAa,EAAE,GAAG;YAACA,aAAa,EAAE;eAAKA,aAAa,QAAQ,CAAC,GAAG,CAAC,CAACE,OAASA,KAAK,EAAE;SAAE,CAAC,IAAI,CAAC;QAC1FF,aAAa,KAAK,GAAGA,aAAa,QAAQ,CAAC,GAAG,CAAC,CAACE,OAASA,KAAK,KAAK,EAAE,IAAI,CAAC;QAC1ED,cAAc,IAAI,CAACD;QACnBA,eAAeD;IACjB;IAEA,OAAOE;AACT"}
+{"version":3,"file":"pipeline/advanced/chart/pipes/measures/utils.js","sources":["webpack://@visactor/vseed/./src/pipeline/advanced/chart/pipes/measures/utils.ts"],"sourcesContent":["import type { MeasureEncoding, MeasureGroup, MeasureTree } from 'src/types'\n\n/**\n * @description 检查是否为指标树, 指标树深度大于1. 如果存在一个指标为组, 即有children配置, 则认为是指标树.\n * @param vseed vseed\n * @returns\n */\nexport const isMeasureTreeWithChildren = <T extends MeasureTree>(measures?: T) => {\n  if (!measures) {\n    return false\n  }\n\n  return measures.some((measure) => 'children' in measure)\n}\n\n/**\n * @description 检查是否为指标树, 指标树存在parentId. 如果存在一个指标有parentId, 则认为是指标树.\n * @param vseed vseed\n * @returns\n */\nexport const isMeasureTreeWithParentId = <T extends MeasureTree>(measures?: T) => {\n  if (!measures) {\n    return false\n  }\n\n  return measures.some((measure) => 'parentId' in measure)\n}\n\n/**\n * @description 保证指标树中的每一组都有children, 没有children的指标, 会被放到一个默认的指标组中.\n * @param measures 指标树\n * @returns\n */\nexport const normalizeMeasureTree = (measures: MeasureTree) => {\n  const createEmptyMeasureGroup = (): MeasureGroup => {\n    return {\n      id: 'group',\n      alias: '',\n      children: [],\n    }\n  }\n\n  let currentGroup: MeasureGroup = createEmptyMeasureGroup()\n  const measureGroups: MeasureGroup[] = []\n  for (const measure of measures) {\n    if ('children' in measure) {\n      // 当前指标组之前的所有独立指标成组\n      if (currentGroup.children?.length) {\n        currentGroup.id = [currentGroup.id, ...currentGroup.children.map((item) => item.id)].join('-')\n        currentGroup.alias = currentGroup.children.map((item) => item.alias).join('-')\n        measureGroups.push(currentGroup)\n        currentGroup = createEmptyMeasureGroup()\n      }\n      // 当前是指标组\n      measureGroups.push(measure)\n    } else {\n      currentGroup.children?.push(measure)\n    }\n  }\n\n  // 最后一组\n  if (currentGroup.children?.length) {\n    currentGroup.id = [currentGroup.id, ...currentGroup.children.map((item) => item.id)].join('-')\n    currentGroup.alias = currentGroup.children.map((item) => item.alias).join('-')\n    measureGroups.push(currentGroup)\n    currentGroup = createEmptyMeasureGroup()\n  }\n\n  return measureGroups\n}\n\nexport const isCommonMeasureEncoding = (encoding: MeasureEncoding) => {\n  return ['color', 'label', 'tooltip'].includes(encoding)\n}\n\n/**\n * @description Ensures that the measuresByView object has an initialized array for the given parentId.\n * If the parentId doesn't exist in measuresByView, it initializes an empty array and tracks the parentId.\n * @param parentId The parent ID to ensure initialization for\n * @param measuresByView The object mapping parent IDs to measures arrays\n * @param parentIds The array tracking all parent IDs that have been initialized\n */\nexport const ensureParentIdInitialized = <T>(\n  parentId: string,\n  measuresByView: { [key: string]: T[] },\n  parentIds: string[],\n) => {\n  if (!measuresByView[parentId]) {\n    measuresByView[parentId] = []\n    parentIds.push(parentId)\n  }\n}\n"],"names":["isMeasureTreeWithChildren","measures","measure","isMeasureTreeWithParentId","normalizeMeasureTree","createEmptyMeasureGroup","currentGroup","measureGroups","item","isCommonMeasureEncoding","encoding","ensureParentIdInitialized","parentId","measuresByView","parentIds"],"mappings":"AAOO,MAAMA,4BAA4B,CAAwBC;IAC/D,IAAI,CAACA,UACH,OAAO;IAGT,OAAOA,SAAS,IAAI,CAAC,CAACC,UAAY,cAAcA;AAClD;AAOO,MAAMC,4BAA4B,CAAwBF;IAC/D,IAAI,CAACA,UACH,OAAO;IAGT,OAAOA,SAAS,IAAI,CAAC,CAACC,UAAY,cAAcA;AAClD;AAOO,MAAME,uBAAuB,CAACH;IACnC,MAAMI,0BAA0B,IACvB;YACL,IAAI;YACJ,OAAO;YACP,UAAU,EAAE;QACd;IAGF,IAAIC,eAA6BD;IACjC,MAAME,gBAAgC,EAAE;IACxC,KAAK,MAAML,WAAWD,SACpB,IAAI,cAAcC,SAAS;QAEzB,IAAII,aAAa,QAAQ,EAAE,QAAQ;YACjCA,aAAa,EAAE,GAAG;gBAACA,aAAa,EAAE;mBAAKA,aAAa,QAAQ,CAAC,GAAG,CAAC,CAACE,OAASA,KAAK,EAAE;aAAE,CAAC,IAAI,CAAC;YAC1FF,aAAa,KAAK,GAAGA,aAAa,QAAQ,CAAC,GAAG,CAAC,CAACE,OAASA,KAAK,KAAK,EAAE,IAAI,CAAC;YAC1ED,cAAc,IAAI,CAACD;YACnBA,eAAeD;QACjB;QAEAE,cAAc,IAAI,CAACL;IACrB,OACEI,aAAa,QAAQ,EAAE,KAAKJ;IAKhC,IAAII,aAAa,QAAQ,EAAE,QAAQ;QACjCA,aAAa,EAAE,GAAG;YAACA,aAAa,EAAE;eAAKA,aAAa,QAAQ,CAAC,GAAG,CAAC,CAACE,OAASA,KAAK,EAAE;SAAE,CAAC,IAAI,CAAC;QAC1FF,aAAa,KAAK,GAAGA,aAAa,QAAQ,CAAC,GAAG,CAAC,CAACE,OAASA,KAAK,KAAK,EAAE,IAAI,CAAC;QAC1ED,cAAc,IAAI,CAACD;QACnBA,eAAeD;IACjB;IAEA,OAAOE;AACT;AAEO,MAAME,0BAA0B,CAACC,WAC/B;QAAC;QAAS;QAAS;KAAU,CAAC,QAAQ,CAACA;AAUzC,MAAMC,4BAA4B,CACvCC,UACAC,gBACAC;IAEA,IAAI,CAACD,cAAc,CAACD,SAAS,EAAE;QAC7BC,cAAc,CAACD,SAAS,GAAG,EAAE;QAC7BE,UAAU,IAAI,CAACF;IACjB;AACF"}