@milaboratories/graph-maker 1.1.168 → 1.1.169

package/dist/node_modules/@milaboratories/miplots4/dist/heatmap/utils/calculateCaptionTails.js.map

@@ -1 +1 @@
-{"version":3,"file":"calculateCaptionTails.js","sources":["../../../../../../../node_modules/@milaboratories/miplots4/src/heatmap/utils/calculateCaptionTails.ts"],"sourcesContent":["import type { TextMeasurer } from '../../utils/TextMeasurer/TextMeasurer';\nimport type { ChartsScales, LabelAngles } from '../components/types';\nimport { MIN_STEP_FOR_VISIBLE_LABELS } from '../constants';\nimport type { GroupedCellsData } from '../getCells';\nimport type { HeatmapSettingsImpl } from '../HeatmapSettingsImpl';\n\nconst COS_PI_4 = Math.cos(Math.PI / 4);\nfunction getTailByFacetKey (\n    facetKey: string,\n    groupKeys: string[],\n    groupLabels: Record<string, string>,\n    valueLabels: Record<string, string>,\n    getKeysInGroup: (facetKey:string, groupKey:string) => string[],\n    steps: Record<string, number>,\n    scale: (v:string) => number,\n    groupTitleInclined: boolean,\n    labelTitleInclined: boolean,\n    textMeasurer: TextMeasurer\n): number {\n    const step = steps[facetKey];\n    const labelsVisible = step > MIN_STEP_FOR_VISIBLE_LABELS;\n\n    let maxTail = 0;\n    groupKeys.forEach((groupKey) => {\n        const keysInGroup = getKeysInGroup(facetKey, groupKey);\n        if (keysInGroup.length === 0) {\n            return 0;\n        }\n        const groupHalfWidth = (keysInGroup.length * step) / 2;\n        const groupTail = groupTitleInclined\n            ? textMeasurer.getTextWidth(groupLabels[groupKey] ?? groupKey) * COS_PI_4 - groupHalfWidth - scale(keysInGroup[0])\n            : 0;\n        const labelTail = labelTitleInclined && labelsVisible\n            ? keysInGroup.reduce((res, key) => {\n                const label = valueLabels[key];\n                return Math.max(res, textMeasurer.getTextWidth(label) * COS_PI_4 - step / 2 - scale(key));\n            }, 0)\n            : 0;\n        maxTail = Math.max(maxTail, groupTail, labelTail);\n    });\n    return maxTail;\n}\n\nexport function calculateCaptionTails(\n    labelAngles: LabelAngles,\n    facetSettings: HeatmapSettingsImpl['facetSettings'],\n    scales: ChartsScales,\n    steps: {\n        x: Record<string, number>;\n        y: Record<string, number>;\n    },\n    groupedCells: GroupedCellsData,\n    textMeasurer: TextMeasurer\n): {xCaptionTail: number; yCaptionTail: number} {\n    const {facetKeys, xGroupKeys, yGroupKeys, xKeysByGroups, yKeysByGroups, xLabels, yLabels, xGroupLabels, yGroupLabels} = groupedCells.meta;\n    let xCaptionTail = 0;\n    let yCaptionTail = 0;\n    // tails from 45deg inclined captions of groups titles/cells labels, that take place on adjacent padding\n    const xGroupTitleInclined = labelAngles.xGroupLabels === 45;\n    const xLabelsInclined = labelAngles.xAxisLabels === 45;\n    if (xGroupTitleInclined || xLabelsInclined) {\n        if (!facetSettings.sharedX) {\n            facetKeys.forEach(facetKey => {\n                xCaptionTail = Math.max(\n                    getTailByFacetKey(\n                        facetKey,\n                        xGroupKeys,\n                        xGroupLabels,\n                        xLabels,\n                        (facetKey:string, groupKey:string) => groupedCells.facets[facetKey].xKeysByGroups[groupKey],\n                        steps.x,\n                        scales.x[facetKey],\n                        xGroupTitleInclined,\n                        xLabelsInclined,\n                        textMeasurer\n                    ),\n                    xCaptionTail\n                );\n            });\n        } else {\n            const facetKey = facetKeys[0]; // there is no difference between facets in this case\n            xCaptionTail = Math.max(\n                getTailByFacetKey(\n                    facetKey,\n                    xGroupKeys,\n                    xGroupLabels,\n                    xLabels,\n                    (facetKey:string, groupKey:string) => xKeysByGroups[groupKey],\n                    steps.x,\n                    scales.x[facetKey],\n                    xGroupTitleInclined,\n                    xLabelsInclined,\n                    textMeasurer\n                ),\n                xCaptionTail\n            );\n        }\n    }\n    const yGroupTitleInclined = labelAngles.yGroupLabels === 45;\n    const yLabelsInclined = labelAngles.yAxisLabels === 45;\n    if (yGroupTitleInclined || yLabelsInclined) {\n        if (!facetSettings.sharedY) {\n            facetKeys.forEach(facetKey => {\n                yCaptionTail = Math.max(\n                    getTailByFacetKey(\n                        facetKey,\n                        yGroupKeys,\n                        yGroupLabels,\n                        yLabels,\n                        (facetKey:string, groupKey:string) => groupedCells.facets[facetKey].yKeysByGroups[groupKey],\n                        steps.y,\n                        scales.y[facetKey],\n                        yGroupTitleInclined,\n                        yLabelsInclined,\n                        textMeasurer\n                    ),\n                    yCaptionTail\n                );\n            });\n        } else {\n            const facetKey = facetKeys[0]; // there is no difference between facets in this case\n            yCaptionTail = Math.max(\n                getTailByFacetKey(\n                    facetKey,\n                    yGroupKeys,\n                    yGroupLabels,\n                    yLabels,\n                    (facetKey:string, groupKey:string) => yKeysByGroups[groupKey],\n                    steps.y,\n                    scales.y[facetKey],\n                    yGroupTitleInclined,\n                    yLabelsInclined,\n                    textMeasurer\n                ),\n                yCaptionTail\n            );\n        }\n    }\n    return {xCaptionTail, yCaptionTail};\n}\n"],"names":["COS_PI_4","getTailByFacetKey","facetKey","groupKeys","groupLabels","valueLabels","getKeysInGroup","steps","scale","groupTitleInclined","labelTitleInclined","textMeasurer","step","labelsVisible","MIN_STEP_FOR_VISIBLE_LABELS","maxTail","groupKey","keysInGroup","groupHalfWidth","groupTail","labelTail","res","key","label","calculateCaptionTails","labelAngles","facetSettings","scales","groupedCells","facetKeys","xGroupKeys","yGroupKeys","xKeysByGroups","yKeysByGroups","xLabels","yLabels","xGroupLabels","yGroupLabels","xCaptionTail","yCaptionTail","xGroupTitleInclined","xLabelsInclined","yGroupTitleInclined","yLabelsInclined"],"mappings":"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","x_google_ignoreList":[0]}
+{"version":3,"file":"calculateCaptionTails.js","sources":["../../../../../../../node_modules/@milaboratories/miplots4/src/heatmap/utils/calculateCaptionTails.ts"],"sourcesContent":["import type { TextMeasurer } from '../../utils/TextMeasurer/TextMeasurer';\nimport type { ChartsScales, LabelAngles } from '../components/types';\nimport { MIN_STEP_FOR_VISIBLE_LABELS } from '../constants';\nimport type { GroupedCellsHeatmap } from '../getCells';\nimport type { HeatmapSettingsImpl } from '../HeatmapSettingsImpl';\n\nconst COS_PI_4 = Math.cos(Math.PI / 4);\nfunction getTailByFacetKey (\n    facetKey: string,\n    groupKeys: string[],\n    groupLabels: Record<string, string>,\n    valueLabels: Record<string, string>,\n    getKeysInGroup: (facetKey:string, groupKey:string) => string[],\n    steps: Record<string, number>,\n    scale: (v:string) => number,\n    groupTitleInclined: boolean,\n    labelTitleInclined: boolean,\n    textMeasurer: TextMeasurer\n): number {\n    const step = steps[facetKey];\n    const labelsVisible = step > MIN_STEP_FOR_VISIBLE_LABELS;\n\n    let maxTail = 0;\n    groupKeys.forEach((groupKey) => {\n        const keysInGroup = getKeysInGroup(facetKey, groupKey);\n        if (keysInGroup.length === 0) {\n            return 0;\n        }\n        const groupHalfWidth = (keysInGroup.length * step) / 2;\n        const groupTail = groupTitleInclined\n            ? textMeasurer.getTextWidth(groupLabels[groupKey] ?? groupKey) * COS_PI_4 - groupHalfWidth - scale(keysInGroup[0])\n            : 0;\n        const labelTail = labelTitleInclined && labelsVisible\n            ? keysInGroup.reduce((res, key) => {\n                const label = valueLabels[key];\n                return Math.max(res, textMeasurer.getTextWidth(label) * COS_PI_4 - step / 2 - scale(key));\n            }, 0)\n            : 0;\n        maxTail = Math.max(maxTail, groupTail, labelTail);\n    });\n    return maxTail;\n}\n\nexport function calculateCaptionTails(\n    labelAngles: LabelAngles,\n    facetSettings: HeatmapSettingsImpl['facetSettings'],\n    scales: ChartsScales,\n    steps: {\n        x: Record<string, number>;\n        y: Record<string, number>;\n    },\n    groupedCells: GroupedCellsHeatmap,\n    textMeasurer: TextMeasurer\n): {xCaptionTail: number; yCaptionTail: number} {\n    const {facetKeys, xGroupKeys, yGroupKeys, xKeysByGroups, yKeysByGroups, xLabels, yLabels, xGroupLabels, yGroupLabels} = groupedCells.meta;\n    let xCaptionTail = 0;\n    let yCaptionTail = 0;\n    // tails from 45deg inclined captions of groups titles/cells labels, that take place on adjacent padding\n    const xGroupTitleInclined = labelAngles.xGroupLabels === 45;\n    const xLabelsInclined = labelAngles.xAxisLabels === 45;\n    if (xGroupTitleInclined || xLabelsInclined) {\n        if (!facetSettings.sharedX) {\n            facetKeys.forEach(facetKey => {\n                xCaptionTail = Math.max(\n                    getTailByFacetKey(\n                        facetKey,\n                        xGroupKeys,\n                        xGroupLabels,\n                        xLabels,\n                        (facetKey:string, groupKey:string) => groupedCells.facets[facetKey].xKeysByGroups[groupKey],\n                        steps.x,\n                        scales.x[facetKey],\n                        xGroupTitleInclined,\n                        xLabelsInclined,\n                        textMeasurer\n                    ),\n                    xCaptionTail\n                );\n            });\n        } else {\n            const facetKey = facetKeys[0]; // there is no difference between facets in this case\n            xCaptionTail = Math.max(\n                getTailByFacetKey(\n                    facetKey,\n                    xGroupKeys,\n                    xGroupLabels,\n                    xLabels,\n                    (facetKey:string, groupKey:string) => xKeysByGroups[groupKey],\n                    steps.x,\n                    scales.x[facetKey],\n                    xGroupTitleInclined,\n                    xLabelsInclined,\n                    textMeasurer\n                ),\n                xCaptionTail\n            );\n        }\n    }\n    const yGroupTitleInclined = labelAngles.yGroupLabels === 45;\n    const yLabelsInclined = labelAngles.yAxisLabels === 45;\n    if (yGroupTitleInclined || yLabelsInclined) {\n        if (!facetSettings.sharedY) {\n            facetKeys.forEach(facetKey => {\n                yCaptionTail = Math.max(\n                    getTailByFacetKey(\n                        facetKey,\n                        yGroupKeys,\n                        yGroupLabels,\n                        yLabels,\n                        (facetKey:string, groupKey:string) => groupedCells.facets[facetKey].yKeysByGroups[groupKey],\n                        steps.y,\n                        scales.y[facetKey],\n                        yGroupTitleInclined,\n                        yLabelsInclined,\n                        textMeasurer\n                    ),\n                    yCaptionTail\n                );\n            });\n        } else {\n            const facetKey = facetKeys[0]; // there is no difference between facets in this case\n            yCaptionTail = Math.max(\n                getTailByFacetKey(\n                    facetKey,\n                    yGroupKeys,\n                    yGroupLabels,\n                    yLabels,\n                    (facetKey:string, groupKey:string) => yKeysByGroups[groupKey],\n                    steps.y,\n                    scales.y[facetKey],\n                    yGroupTitleInclined,\n                    yLabelsInclined,\n                    textMeasurer\n                ),\n                yCaptionTail\n            );\n        }\n    }\n    return {xCaptionTail, yCaptionTail};\n}\n"],"names":["COS_PI_4","getTailByFacetKey","facetKey","groupKeys","groupLabels","valueLabels","getKeysInGroup","steps","scale","groupTitleInclined","labelTitleInclined","textMeasurer","step","labelsVisible","MIN_STEP_FOR_VISIBLE_LABELS","maxTail","groupKey","keysInGroup","groupHalfWidth","groupTail","labelTail","res","key","label","calculateCaptionTails","labelAngles","facetSettings","scales","groupedCells","facetKeys","xGroupKeys","yGroupKeys","xKeysByGroups","yKeysByGroups","xLabels","yLabels","xGroupLabels","yGroupLabels","xCaptionTail","yCaptionTail","xGroupTitleInclined","xLabelsInclined","yGroupTitleInclined","yLabelsInclined"],"mappings":";AAMA,MAAMA,IAAW,KAAK,IAAI,KAAK,KAAK,CAAC;AACrC,SAASC,EACLC,GACAC,GACAC,GACAC,GACAC,GACAC,GACAC,GACAC,GACAC,GACAC,GACM;AACN,QAAMC,IAAOL,EAAML,CAAQ,GACrBW,IAAgBD,IAAOE;AAE7B,MAAIC,IAAU;AACd,SAAAZ,EAAU,QAAQ,CAACa,MAAa;AAC5B,UAAMC,IAAcX,EAAeJ,GAAUc,CAAQ;AACrD,QAAIC,EAAY,WAAW;AACvB,aAAO;AAEX,UAAMC,IAAkBD,EAAY,SAASL,IAAQ,GAC/CO,IAAYV,IACZE,EAAa,aAAaP,EAAYY,CAAQ,KAAKA,CAAQ,IAAIhB,IAAWkB,IAAiBV,EAAMS,EAAY,CAAC,CAAC,IAC/G,GACAG,IAAYV,KAAsBG,IAClCI,EAAY,OAAO,CAACI,GAAKC,MAAQ;AAC/B,YAAMC,IAAQlB,EAAYiB,CAAG;AAC7B,aAAO,KAAK,IAAID,GAAKV,EAAa,aAAaY,CAAK,IAAIvB,IAAWY,IAAO,IAAIJ,EAAMc,CAAG,CAAC;AAAA,IAC5F,GAAG,CAAC,IACF;AACNP,IAAAA,IAAU,KAAK,IAAIA,GAASI,GAAWC,CAAS;AAAA,EACpD,CAAC,GACML;AACX;AAEO,SAASS,EACZC,GACAC,GACAC,GACApB,GAIAqB,GACAjB,GAC4C;AAC5C,QAAM,EAAC,WAAAkB,GAAW,YAAAC,GAAY,YAAAC,GAAY,eAAAC,GAAe,eAAAC,GAAe,SAAAC,GAAS,SAAAC,GAAS,cAAAC,GAAc,cAAAC,MAAgBT,EAAa;AACrI,MAAIU,IAAe,GACfC,IAAe;AAEnB,QAAMC,IAAsBf,EAAY,iBAAiB,IACnDgB,IAAkBhB,EAAY,gBAAgB;AACpD,MAAIe,KAAuBC;AACvB,QAAI,CAACf,EAAc;AACfG,MAAAA,EAAU,QAAQ,CAAA3B,MAAY;AAC1BoC,QAAAA,IAAe,KAAK;AAAA,UAChBrC;AAAAA,YACIC;AAAAA,YACA4B;AAAAA,YACAM;AAAAA,YACAF;AAAAA,YACA,CAAChC,GAAiBc,MAAoBY,EAAa,OAAO1B,CAAQ,EAAE,cAAcc,CAAQ;AAAA,YAC1FT,EAAM;AAAA,YACNoB,EAAO,EAAEzB,CAAQ;AAAA,YACjBsC;AAAAA,YACAC;AAAAA,YACA9B;AAAAA,UAAA;AAAA,UAEJ2B;AAAAA,QAAA;AAAA,MAER,CAAC;AAAA,SACE;AACH,YAAMpC,IAAW2B,EAAU,CAAC;AAC5BS,MAAAA,IAAe,KAAK;AAAA,QAChBrC;AAAAA,UACIC;AAAAA,UACA4B;AAAAA,UACAM;AAAAA,UACAF;AAAAA,UACA,CAAChC,GAAiBc,MAAoBgB,EAAchB,CAAQ;AAAA,UAC5DT,EAAM;AAAA,UACNoB,EAAO,EAAEzB,CAAQ;AAAA,UACjBsC;AAAAA,UACAC;AAAAA,UACA9B;AAAAA,QAAA;AAAA,QAEJ2B;AAAAA,MAAA;AAAA,IAER;AAEJ,QAAMI,IAAsBjB,EAAY,iBAAiB,IACnDkB,IAAkBlB,EAAY,gBAAgB;AACpD,MAAIiB,KAAuBC;AACvB,QAAI,CAACjB,EAAc;AACfG,MAAAA,EAAU,QAAQ,CAAA3B,MAAY;AAC1BqC,QAAAA,IAAe,KAAK;AAAA,UAChBtC;AAAAA,YACIC;AAAAA,YACA6B;AAAAA,YACAM;AAAAA,YACAF;AAAAA,YACA,CAACjC,GAAiBc,MAAoBY,EAAa,OAAO1B,CAAQ,EAAE,cAAcc,CAAQ;AAAA,YAC1FT,EAAM;AAAA,YACNoB,EAAO,EAAEzB,CAAQ;AAAA,YACjBwC;AAAAA,YACAC;AAAAA,YACAhC;AAAAA,UAAA;AAAA,UAEJ4B;AAAAA,QAAA;AAAA,MAER,CAAC;AAAA,SACE;AACH,YAAMrC,IAAW2B,EAAU,CAAC;AAC5BU,MAAAA,IAAe,KAAK;AAAA,QAChBtC;AAAAA,UACIC;AAAAA,UACA6B;AAAAA,UACAM;AAAAA,UACAF;AAAAA,UACA,CAACjC,GAAiBc,MAAoBiB,EAAcjB,CAAQ;AAAA,UAC5DT,EAAM;AAAA,UACNoB,EAAO,EAAEzB,CAAQ;AAAA,UACjBwC;AAAAA,UACAC;AAAAA,UACAhC;AAAAA,QAAA;AAAA,QAEJ4B;AAAAA,MAAA;AAAA,IAER;AAEJ,SAAO,EAAC,cAAAD,GAAc,cAAAC,EAAAA;AAC1B;","x_google_ignoreList":[0]}

package/dist/node_modules/@milaboratories/miplots4/dist/types/bubble.js

@@ -1,12 +1,12 @@
-import { ColumnNameSchema as t, FrameTypeSchema as a, LegendPositionSchema as i, TitlePositionSchema as e } from "./common.js";
+import { ColumnNameSchema as n, FrameTypeSchema as a, LegendPositionSchema as i, TitlePositionSchema as e } from "./common.js";
 import o from "../node_modules/zod/lib/index.js";
-const n = {
+const t = {
   title: o.optional(o.string()),
   showTicks: o.optional(o.boolean()),
   showTitle: o.optional(o.boolean()),
   showAxisLabels: o.optional(o.boolean()),
   axisLabelsAngle: o.optional(o.union([o.literal(0), o.literal(45), o.literal(90)]))
-}, r = o.object({
+}, p = o.object({
   type: o.literal("bubble"),
   title: o.object({
     name: o.string(),
@@ -33,27 +33,38 @@ const n = {
       nCols: o.optional(o.number())
     })
   ),
-  valueSize: t,
-  valueColor: t,
-  xColumn: t,
-  yColumn: t,
+  valueSize: n,
+  valueColor: n,
+  xColumn: n,
+  yColumn: n,
+  xGroupBy: o.optional(o.array(n)),
+  yGroupBy: o.optional(o.array(n)),
+  keysOrder: o.optional(
+    // x, y, grouping, facet keys in user's order
+    o.record(o.string(), o.array(o.string()))
+  ),
   normalization: o.optional(o.object({
     direction: o.enum(["row", "column"]),
     method: o.enum(["standardScaling", "meanNormalization"]),
     colorRange: o.optional(o.array(o.number())),
     sizeRange: o.optional(o.array(o.number()))
   })),
+  aggregation: o.optional(o.object({
+    x: o.optional(o.boolean()),
+    y: o.optional(o.boolean()),
+    method: o.optional(o.enum(["min", "max", "mean", "median"]))
+  })),
   xAxis: o.optional(o.object({
-    ...n,
+    ...t,
     sorting: o.optional(o.enum(["asc", "desc"])),
     position: o.optional(o.enum(["top", "bottom"]))
   })),
   yAxis: o.optional(o.object({
-    ...n,
+    ...t,
     sorting: o.optional(o.enum(["asc", "desc"])),
     position: o.optional(o.enum(["left", "right"]))
   })),
-  facetBy: o.optional(o.array(t)),
+  facetBy: o.optional(o.array(n)),
   aes: o.optional(o.object({
     colorsList: o.optional(o.array(o.string())),
     minRadius: o.optional(o.number()),
@@ -64,12 +75,12 @@ const n = {
   tooltips: o.optional(
     o.object({
       show: o.optional(o.boolean()),
-      content: o.optional(o.array(t))
+      content: o.optional(o.array(n))
     })
   ),
   NAValueAs: o.optional(o.union([o.number(), o.null()]))
 });
 export {
-  r as BubblesSettingsSchema
+  p as BubblesSettingsSchema
 };
 //# sourceMappingURL=bubble.js.map

package/dist/node_modules/@milaboratories/miplots4/dist/types/bubble.js.map

@@ -1 +1 @@
-{"version":3,"file":"bubble.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/types/bubble.ts"],"sourcesContent":["import {\n    ColumnNameSchema,\n    FrameTypeSchema,\n    LegendPositionSchema,\n    TitlePositionSchema,\n} from './common';\nimport {z} from 'zod';\n\nconst axisCommonSchema = {\n    title: z.optional(z.string()),\n    showTicks: z.optional(z.boolean()),\n    showTitle: z.optional(z.boolean()),\n    showAxisLabels: z.optional(z.boolean()),\n    axisLabelsAngle: z.optional(z.union([z.literal(0), z.literal(45), z.literal(90)])),\n};\n\n//const InheritAesSchema = z.object({type: z.literal('grouping'), value: z.string()}); // link to aes mapped to column\n\nexport const BubblesSettingsSchema = z.object({\n    type: z.literal('bubble'),\n    title: z.object({\n        name: z.string(),\n        show: z.optional(z.boolean()),\n        position: z.optional(TitlePositionSchema),\n    }),\n    size: z.optional(\n        z.object({\n            width: z.optional(z.number()),\n            height: z.optional(z.number()),\n            cellSize: z.optional(z.number())\n        })\n    ),\n    legend: z.optional(\n        z.object({\n            show: z.optional(z.boolean()),\n            position: z.optional(LegendPositionSchema),\n        })\n    ),\n    frame: z.optional(z.object({type: z.optional(FrameTypeSchema)})),\n    facetSettings: z.optional(\n        z.object({\n            nRows: z.optional(z.number()),\n            nCols: z.optional(z.number()),\n        })\n    ),\n    valueSize: ColumnNameSchema,\n    valueColor: ColumnNameSchema,\n    xColumn: ColumnNameSchema,\n    yColumn: ColumnNameSchema,\n    normalization: z.optional(z.object({\n        direction: z.enum(['row', 'column']),\n        method: z.enum(['standardScaling', 'meanNormalization']),\n        colorRange: z.optional(z.array(z.number())),\n        sizeRange: z.optional(z.array(z.number())),\n    })),\n    xAxis: z.optional(z.object({\n        ...axisCommonSchema,\n        sorting: z.optional(z.enum(['asc', 'desc'])),\n        position: z.optional(z.enum(['top', 'bottom'])),\n    })),\n    yAxis: z.optional(z.object({\n        ...axisCommonSchema,\n        sorting: z.optional(z.enum(['asc', 'desc'])),\n        position: z.optional(z.enum(['left', 'right'])),\n    })),\n    facetBy: z.optional(z.array(ColumnNameSchema)),\n    aes: z.optional(z.object({\n        colorsList: z.optional(z.array(z.string())),\n        minRadius: z.optional(z.number()),\n        maxRadius: z.optional(z.number()),\n        cellStrokeColor: z.optional(z.string()),\n        emptyCellColor: z.optional(z.string()),\n    })),\n    tooltips: z.optional(\n        z.object({\n            show: z.optional(z.boolean()),\n            content: z.optional(z.array(ColumnNameSchema)),\n        })\n    ),\n    NAValueAs: z.optional(z.union([z.number(), z.null()])),\n});\n\nexport type BubbleSettings = z.infer<typeof BubblesSettingsSchema>;\n"],"names":["axisCommonSchema","z","BubblesSettingsSchema","TitlePositionSchema","LegendPositionSchema","FrameTypeSchema","ColumnNameSchema"],"mappings":"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","x_google_ignoreList":[0]}
+{"version":3,"file":"bubble.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/types/bubble.ts"],"sourcesContent":["import {\n    ColumnNameSchema,\n    FrameTypeSchema,\n    LegendPositionSchema,\n    TitlePositionSchema,\n} from './common';\nimport { z } from 'zod';\n\nconst axisCommonSchema = {\n    title: z.optional(z.string()),\n    showTicks: z.optional(z.boolean()),\n    showTitle: z.optional(z.boolean()),\n    showAxisLabels: z.optional(z.boolean()),\n    axisLabelsAngle: z.optional(z.union([z.literal(0), z.literal(45), z.literal(90)])),\n};\n\n//const InheritAesSchema = z.object({type: z.literal('grouping'), value: z.string()}); // link to aes mapped to column\n\nexport const BubblesSettingsSchema = z.object({\n    type: z.literal('bubble'),\n    title: z.object({\n        name: z.string(),\n        show: z.optional(z.boolean()),\n        position: z.optional(TitlePositionSchema),\n    }),\n    size: z.optional(\n        z.object({\n            width: z.optional(z.number()),\n            height: z.optional(z.number()),\n            cellSize: z.optional(z.number())\n        })\n    ),\n    legend: z.optional(\n        z.object({\n            show: z.optional(z.boolean()),\n            position: z.optional(LegendPositionSchema),\n        })\n    ),\n    frame: z.optional(z.object({ type: z.optional(FrameTypeSchema) })),\n    facetSettings: z.optional(\n        z.object({\n            nRows: z.optional(z.number()),\n            nCols: z.optional(z.number()),\n        })\n    ),\n    valueSize: ColumnNameSchema,\n    valueColor: ColumnNameSchema,\n    xColumn: ColumnNameSchema,\n    yColumn: ColumnNameSchema,\n    xGroupBy: z.optional(z.array(ColumnNameSchema)),\n    yGroupBy: z.optional(z.array(ColumnNameSchema)),\n    keysOrder: z.optional( // x, y, grouping, facet keys in user's order\n        z.record(z.string(), z.array(z.string()))\n    ),\n    normalization: z.optional(z.object({\n        direction: z.enum(['row', 'column']),\n        method: z.enum(['standardScaling', 'meanNormalization']),\n        colorRange: z.optional(z.array(z.number())),\n        sizeRange: z.optional(z.array(z.number())),\n    })),\n    aggregation: z.optional(z.object({\n        x: z.optional(z.boolean()),\n        y: z.optional(z.boolean()),\n        method: z.optional(z.enum(['min', 'max', 'mean', 'median'])),\n    })),\n    xAxis: z.optional(z.object({\n        ...axisCommonSchema,\n        sorting: z.optional(z.enum(['asc', 'desc'])),\n        position: z.optional(z.enum(['top', 'bottom'])),\n    })),\n    yAxis: z.optional(z.object({\n        ...axisCommonSchema,\n        sorting: z.optional(z.enum(['asc', 'desc'])),\n        position: z.optional(z.enum(['left', 'right'])),\n    })),\n    facetBy: z.optional(z.array(ColumnNameSchema)),\n    aes: z.optional(z.object({\n        colorsList: z.optional(z.array(z.string())),\n        minRadius: z.optional(z.number()),\n        maxRadius: z.optional(z.number()),\n        cellStrokeColor: z.optional(z.string()),\n        emptyCellColor: z.optional(z.string()),\n    })),\n    tooltips: z.optional(\n        z.object({\n            show: z.optional(z.boolean()),\n            content: z.optional(z.array(ColumnNameSchema)),\n        })\n    ),\n    NAValueAs: z.optional(z.union([z.number(), z.null()])),\n});\n\nexport type BubbleSettings = z.infer<typeof BubblesSettingsSchema>;\n"],"names":["axisCommonSchema","z","BubblesSettingsSchema","TitlePositionSchema","LegendPositionSchema","FrameTypeSchema","ColumnNameSchema"],"mappings":"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","x_google_ignoreList":[0]}

package/dist/node_modules/@milaboratories/miplots4/dist/utils/getFacetOrGroupKey.js

@@ -0,0 +1,7 @@
+function r(e) {
+  return e.length ? e.join("_") : "null";
+}
+export {
+  r as getFacetOrGroupKey
+};
+//# sourceMappingURL=getFacetOrGroupKey.js.map

package/dist/node_modules/@milaboratories/miplots4/dist/utils/getFacetOrGroupKey.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getFacetOrGroupKey.js","sources":["../../../../../../node_modules/@milaboratories/miplots4/src/utils/getFacetOrGroupKey.ts"],"sourcesContent":["export function getFacetOrGroupKey(values: unknown[]): string {\n    if (!values.length) {\n        return 'null';\n    }\n    return values.join('_');\n}"],"names":["getFacetOrGroupKey","values"],"mappings":"AAAO,SAASA,EAAmBC,GAA2B;AAC1D,SAAKA,EAAO,SAGLA,EAAO,KAAK,GAAG,IAFX;AAGf;","x_google_ignoreList":[0]}

package/dist/node_modules/@milaboratories/pf-plots/dist/controllers/controllersByChartType/bubble.js

@@ -1,16 +1,18 @@
-import k from "../../_virtual/canonicalize.js";
-import { ControllerBase as M } from "../ControllerBase.js";
-import { ComponentController as w } from "../ComponentController.js";
-import { AxisId as J, columnOrAxisIdFromString as C, isColumnId as c } from "../../spec.js";
-import { createLinkerMap as U, createMultipliesByMap as Z, getFiltersFromStates as $, getAxesSpecsFromSources as H, getLinkerColumnsForSource as T, getColumnOrAxisValueLabelsId as b, getColumnOrAxisLabel as x, getColumnOrAxisSpec as K, getFormat as X } from "../../utils.js";
-var Y = Object.defineProperty, G = (m, e, t) => e in m ? Y(m, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : m[e] = t, j = (m, e, t) => G(m, typeof e != "symbol" ? e + "" : e, t);
+import M from "../../_virtual/canonicalize.js";
+import { ControllerBase as V } from "../ControllerBase.js";
+import { ComponentController as v } from "../ComponentController.js";
+import { AxisId as T, columnOrAxisIdFromString as w, isColumnId as p } from "../../spec.js";
+import { createLinkerMap as J, createMultipliesByMap as U, getFiltersFromStates as Z, getAxesSpecsFromSources as H, getLinkerColumnsForSource as N, getColumnOrAxisValueLabelsId as C, getColumnOrAxisLabel as g, getColumnOrAxisSpec as K, getFormat as X } from "../../utils.js";
+var Y = Object.defineProperty, Q = (m, e, t) => e in m ? Y(m, e, { enumerable: !0, configurable: !0, writable: !0, value: t }) : m[e] = t, j = (m, e, t) => Q(m, typeof e != "symbol" ? e + "" : e, t);
 const te = {
   type: "bubble",
   components: {
     valueSize: { type: "simple", selectorStates: [] },
     valueColor: { type: "simple", selectorStates: [] },
     x: { type: "simple", selectorStates: [] },
+    xGroupBy: { type: "simple", selectorStates: [] },
     y: { type: "simple", selectorStates: [] },
+    yGroupBy: { type: "simple", selectorStates: [] },
     filters: { type: "filter", selectorStates: [] },
     tabBy: { type: "filter", selectorStates: [] },
     facetBy: { type: "simple", selectorStates: [] },
@@ -18,23 +20,23 @@ const te = {
   },
   dividedAxes: {}
 };
-function O(m, e) {
+function P(m, e) {
   if (!e.length)
     return [];
-  const t = e.map((l) => C(l)), y = Object.values(m.columnsData)[0].length, r = [];
-  for (let l = 0; l < y; l++) {
-    const u = t.map((p) => {
-      const d = p.toCanonicalString();
-      return c(p) ? m.columnsData[d][l] : m.axesData[d][l];
+  const t = e.map((s) => w(s)), c = Object.values(m.columnsData)[0].length, n = [];
+  for (let s = 0; s < c; s++) {
+    const i = t.map((S) => {
+      const d = S.toCanonicalString();
+      return p(S) ? m.columnsData[d][s] : m.axesData[d][s];
     }).join(", ");
-    r.push(u);
+    n.push(i);
   }
-  return r;
+  return n;
 }
-class oe extends M {
+class oe extends V {
   constructor() {
     super({
-      valueSize: new w({
+      valueSize: new v({
         componentName: "valueSize",
         allowedTypes: ["Int", "Long", "Double", "Float"],
         strictlyDependsOnParents: !0,
@@ -46,7 +48,7 @@ class oe extends M {
           required: !0
         }
       }),
-      valueColor: new w({
+      valueColor: new v({
         componentName: "valueColor",
         allowedTypes: ["Int", "Long", "Double", "Float"],
         strictlyDependsOnParents: !0,
@@ -58,7 +60,7 @@ class oe extends M {
           required: !0
         }
       }),
-      x: new w({
+      x: new v({
         componentName: "x",
         allowedTypes: ["Int", "String", "Long"],
         strictlyDependsOnParents: !0,
@@ -71,7 +73,29 @@ class oe extends M {
           columnsAllowed: !1
         }
       }),
-      y: new w({
+      xGroupBy: new v({
+        componentName: "xGroupBy",
+        allowedTypes: ["Int", "String", "Long"],
+        strictlyDependsOnParents: !0,
+        parentComponents: ["valueSize", "valueColor"],
+        settings: {
+          dimensionConsumer: !0,
+          multipleSelectors: !0,
+          axesAllowed: !0,
+          columnsAllowed: !0
+        },
+        dependsOn: ["x"],
+        checkSourceBySpec: (e, t) => {
+          const c = /* @__PURE__ */ new Set([
+            ...t.components.x.selectorStates.map((n) => n.selectedSource),
+            ...t.components.xGroupBy.selectorStates.map((n) => n.selectedSource)
+          ]);
+          return "kind" in e && e.kind === "PColumn" ? T.fromAxesSpec(e.axesSpec).every(
+            (n) => c.has(n.toCanonicalString())
+          ) : !0;
+        }
+      }),
+      y: new v({
         componentName: "y",
         allowedTypes: ["Int", "String", "Long"],
         strictlyDependsOnParents: !0,
@@ -84,7 +108,29 @@ class oe extends M {
           columnsAllowed: !1
         }
       }),
-      tooltipContent: new w({
+      yGroupBy: new v({
+        componentName: "yGroupBy",
+        allowedTypes: ["Int", "String", "Long"],
+        strictlyDependsOnParents: !0,
+        parentComponents: ["valueSize", "valueColor"],
+        settings: {
+          dimensionConsumer: !0,
+          multipleSelectors: !0,
+          axesAllowed: !0,
+          columnsAllowed: !0
+        },
+        dependsOn: ["y"],
+        checkSourceBySpec: (e, t) => {
+          const c = /* @__PURE__ */ new Set([
+            ...t.components.x.selectorStates.map((n) => n.selectedSource),
+            ...t.components.xGroupBy.selectorStates.map((n) => n.selectedSource)
+          ]);
+          return "kind" in e && e.kind === "PColumn" ? T.fromAxesSpec(e.axesSpec).every(
+            (n) => c.has(n.toCanonicalString())
+          ) : !0;
+        }
+      }),
+      tooltipContent: new v({
         componentName: "tooltipContent",
         allowedTypes: ["String", "Int", "Long", "Float", "Double"],
         strictlyDependsOnParents: !0,
@@ -95,7 +141,7 @@ class oe extends M {
           multipleSelectors: !0
         }
       }),
-      facetBy: new w({
+      facetBy: new v({
         componentName: "facetBy",
         allowedTypes: ["String", "Int", "Long"],
         strictlyDependsOnParents: !0,
@@ -107,7 +153,7 @@ class oe extends M {
         }
       })
     }, {
-      filters: new w({
+      filters: new v({
         componentName: "filters",
         allowedTypes: ["String", "Int", "Long", "Double", "Long"],
         strictlyDependsOnParents: !0,
@@ -119,7 +165,7 @@ class oe extends M {
           multipleSelectors: !0
         }
       }),
-      tabBy: new w({
+      tabBy: new v({
         componentName: "tabBy",
         allowedTypes: ["String", "Int"],
         strictlyDependsOnParents: !0,
@@ -135,130 +181,154 @@ class oe extends M {
   getMustBeConsumedAxes(e, t) {
     if (!e.components.valueColor.selectorStates.length)
       return /* @__PURE__ */ new Set();
-    const y = e.components.valueColor.selectorStates[0].selectedSource, r = t.get(y);
-    return !r || r.kind !== "column" ? /* @__PURE__ */ new Set() : new Set(r.spec.axesSpec.map((l) => J.fromAxisSpec(l).toCanonicalString()));
+    const c = e.components.valueColor.selectorStates[0].selectedSource, n = t.get(c);
+    return !n || n.kind !== "column" ? /* @__PURE__ */ new Set() : new Set(n.spec.axesSpec.map((s) => T.fromAxisSpec(s).toCanonicalString()));
   }
   async createDataByColumns(e, t) {
-    var y, r;
-    const l = (y = t.components.valueColor.selectorStates[0]) == null ? void 0 : y.selectedSource, u = (r = t.components.valueSize.selectorStates[0]) == null ? void 0 : r.selectedSource;
-    if (!l || !u)
+    var c, n;
+    const s = (c = t.components.valueColor.selectorStates[0]) == null ? void 0 : c.selectedSource, i = (n = t.components.valueSize.selectorStates[0]) == null ? void 0 : n.selectedSource;
+    if (!s || !i)
       throw Error("Value column is not valid");
-    const p = C(l), d = C(u);
-    if (!p || !d || !c(p) && !c(d))
+    const S = w(s), d = w(i);
+    if (!S || !d || !p(S) && !p(d))
       throw Error("Value column is not valid");
-    const n = {
+    const r = {
       type: "columns",
-      id: k(t.components) ?? "",
+      id: M(t.components) ?? "",
       values: {}
-    }, A = await U(e), D = await Z(e), f = [
+    }, B = await J(e), A = await U(e), b = [
       ...t.components.filters.selectorStates,
       ...t.components.tabBy.selectorStates
-    ], P = $(f), B = f.map((o) => C(o.selectedSource)).filter(c), L = [p, d].filter(c), g = L.map((o) => o.toCanonicalString()), h = await H(e, g), a = [
+    ], h = Z(b), O = b.map((a) => w(a.selectedSource)).filter(p), D = [S, d].filter(p), x = D.map((a) => a.toCanonicalString()), L = await H(e, x), G = [
       t.components.facetBy,
       t.components.x,
       t.components.y,
+      t.components.xGroupBy,
+      t.components.yGroupBy,
       t.components.tooltipContent
-    ], S = [], v = [];
-    for (const { selectedSource: o } of f)
-      v.push(...await T(
+    ], f = [], o = [];
+    for (const { selectedSource: a } of b)
+      o.push(...await N(
         e,
+        B,
         A,
-        D,
-        h,
-        o
+        L,
+        a
       ));
-    for (const o of a)
-      for (const { selectedSource: s } of o.selectorStates) {
-        S.push(C(s)), v.push(...await T(
+    for (const a of G)
+      for (const { selectedSource: u } of a.selectorStates) {
+        f.push(w(u)), o.push(...await N(
           e,
+          B,
           A,
-          D,
-          h,
-          s
+          L,
+          u
         ));
-        const F = await b(e, s, g);
-        F && S.push(F);
+        const k = await C(e, u, x);
+        k && f.push(k);
       }
-    const i = await e.pFrameProvider.getTableOuterJoin(
-      [...L, ...v, ...B],
-      S,
-      P,
+    const l = await e.pFrameProvider.getTableOuterJoin(
+      [...D, ...o, ...O],
+      f,
+      h,
       !0
     );
-    S.forEach((o) => {
-      const s = o.toCanonicalString();
-      n.values[s] = c(o) ? i.columnsData[s] : i.axesData[s];
-    }), n.values[l] = c(p) ? i.columnsData[l] : i.axesData[l], n.values[u] = c(d) ? i.columnsData[u] : i.axesData[u];
-    const z = t.components.x.selectorStates.map((o) => o.selectedSource), N = z.join(", "), E = await Promise.all(z.map(
-      async (o) => {
-        var s;
-        return ((s = await b(e, o, g)) == null ? void 0 : s.toCanonicalString()) ?? o;
+    f.forEach((a) => {
+      const u = a.toCanonicalString();
+      r.values[u] = p(a) ? l.columnsData[u] : l.axesData[u];
+    }), r.values[s] = p(S) ? l.columnsData[s] : l.axesData[s], r.values[i] = p(d) ? l.columnsData[i] : l.axesData[i];
+    const y = t.components.x.selectorStates.concat(t.components.xGroupBy.selectorStates).map((a) => a.selectedSource), z = y.join(", "), F = await Promise.all(y.map(
+      async (a) => {
+        var u;
+        return ((u = await C(e, a, x)) == null ? void 0 : u.toCanonicalString()) ?? a;
       }
     ));
-    n.values[N] = O(i, z), n.values.xLabels = O(i, E);
-    const I = t.components.y.selectorStates.map((o) => o.selectedSource), V = I.join(", "), q = await Promise.all(I.map(
-      async (o) => {
-        var s;
-        return ((s = await b(e, o, g)) == null ? void 0 : s.toCanonicalString()) ?? o;
+    r.values[z] = P(l, y), r.values.xLabels = P(l, F);
+    const I = t.components.y.selectorStates.concat(t.components.yGroupBy.selectorStates).map((a) => a.selectedSource), E = I.join(", "), q = await Promise.all(I.map(
+      async (a) => {
+        var u;
+        return ((u = await C(e, a, x)) == null ? void 0 : u.toCanonicalString()) ?? a;
       }
     ));
-    return n.values[V] = O(i, I), n.values.yLabels = O(i, q), { byColumns: n };
+    return r.values[E] = P(l, I), r.values.yLabels = P(l, q), { byColumns: r };
   }
   async createChartSettings(e, t) {
-    var y, r;
-    const l = (y = t.components.valueColor.selectorStates[0]) == null ? void 0 : y.selectedSource, u = (r = t.components.valueSize.selectorStates[0]) == null ? void 0 : r.selectedSource;
-    if (!l || !u)
+    var c, n;
+    const s = (c = t.components.valueColor.selectorStates[0]) == null ? void 0 : c.selectedSource, i = (n = t.components.valueSize.selectorStates[0]) == null ? void 0 : n.selectedSource;
+    if (!s || !i)
       throw Error("Value column is not valid");
-    const p = C(l), d = C(u);
-    if (!c(p) && !c(d))
+    const S = w(s), d = w(i);
+    if (!p(S) && !p(d))
       throw Error("Value column is not valid");
-    const n = [p, d].filter(c).map((a) => a.toCanonicalString()), A = {
+    const r = [S, d].filter(p).map((o) => o.toCanonicalString()), B = {
       type: "column",
-      value: l,
-      label: await x(e, l, [])
-    }, D = {
+      value: s,
+      label: await g(e, s, [])
+    }, A = {
       type: "column",
-      value: u,
-      label: await x(e, u, [])
-    }, f = t.components.x.selectorStates.map(({ selectedSource: a }) => a).join(", "), P = t.components.y.selectorStates.map(({ selectedSource: a }) => a).join(", "), B = await Promise.all(t.components.facetBy.selectorStates.map(async (a) => {
-      var S;
+      value: i,
+      label: await g(e, i, [])
+    }, b = t.components.x.selectorStates.concat(t.components.xGroupBy.selectorStates).map(({ selectedSource: o }) => w(o)).map((o) => o.toCanonicalString()).join(", "), h = t.components.y.selectorStates.concat(t.components.yGroupBy.selectorStates).map(({ selectedSource: o }) => w(o)).map((o) => o.toCanonicalString()).join(", "), O = await Promise.all(
+      t.components.xGroupBy.selectorStates.map(async (o) => {
+        var l;
+        return {
+          type: "column",
+          label: await g(e, o.selectedSource, r),
+          value: o.selectedSource,
+          valueLabels: ((l = await C(e, o.selectedSource, r)) == null ? void 0 : l.toCanonicalString()) ?? o.selectedSource
+        };
+      })
+    ), D = await Promise.all(
+      t.components.yGroupBy.selectorStates.map(async (o) => {
+        var l;
+        return {
+          type: "column",
+          label: await g(e, o.selectedSource, r),
+          value: o.selectedSource,
+          valueLabels: ((l = await C(e, o.selectedSource, r)) == null ? void 0 : l.toCanonicalString()) ?? o.selectedSource
+        };
+      })
+    ), x = await Promise.all(t.components.facetBy.selectorStates.map(async (o) => {
+      var l;
       return {
         type: "column",
-        value: ((S = await b(e, a.selectedSource, n)) == null ? void 0 : S.toCanonicalString()) ?? a.selectedSource
+        value: ((l = await C(e, o.selectedSource, r)) == null ? void 0 : l.toCanonicalString()) ?? o.selectedSource
       };
-    })), L = (await Promise.all(t.components.x.selectorStates.map((a) => x(e, a.selectedSource, n)))).join(", "), g = (await Promise.all(t.components.y.selectorStates.map((a) => x(e, a.selectedSource, n)))).join(", "), h = await Promise.all(
-      t.components.tooltipContent.selectorStates.map(async (a) => {
-        var S;
-        const v = a.selectedSource, i = await K(e, v, n);
+    })), L = (await Promise.all(t.components.x.selectorStates.map((o) => g(e, o.selectedSource, r)))).join(", "), G = (await Promise.all(t.components.y.selectorStates.map((o) => g(e, o.selectedSource, r)))).join(", "), f = await Promise.all(
+      t.components.tooltipContent.selectorStates.map(async (o) => {
+        var l;
+        const y = o.selectedSource, z = await K(e, y, r);
         return {
           type: "column",
-          label: await x(e, v, n) || v,
-          value: v,
-          valueLabels: ((S = await b(e, v, n)) == null ? void 0 : S.toCanonicalString()) ?? v,
-          format: X(i)
+          label: await g(e, y, r) || y,
+          value: y,
+          valueLabels: ((l = await C(e, y, r)) == null ? void 0 : l.toCanonicalString()) ?? y,
+          format: X(z)
         };
       })
     );
     return {
       type: "bubble",
-      valueColor: A,
-      valueSize: D,
+      valueColor: B,
+      valueSize: A,
       xColumn: {
         type: "column",
-        value: f,
+        value: b,
         label: L,
         valueLabels: "xLabels"
       },
       yColumn: {
         type: "column",
-        value: P,
-        label: g,
+        value: h,
+        label: G,
         valueLabels: "yLabels"
       },
-      facetBy: B,
+      facetBy: x,
+      xGroupBy: O,
+      yGroupBy: D,
       tooltips: {
         show: !0,
-        content: h
+        content: f
       }
     };
   }