@sis-cc/dotstatsuite-components 22.5.0 → 23.0.0

package/dist/rules/src/factories/choro-series.js

@@ -1,55 +1,66 @@
-import { get, map, head, isUndefined, transform, split, has } from 'lodash';
+import * as R from 'ramda';
 import { getRefAreaDimension } from '@sis-cc/dotstatsuite-sdmxjs';
 import { categoryDisplay, dimensionValueDisplay } from '../dimension-utils.js';
 
 const parseByAreas = (observations, refAreaDimension) => {
-  if (isUndefined(refAreaDimension)) {
+  if (R.isNil(refAreaDimension)) {
     return null;
   }
-  const refAreaDimIndex = get(refAreaDimension, 'index');
-  const refAreaValues = refAreaDimension.values;
+  const { __index, values=[] } = refAreaDimension;
 
-  return transform(
-    observations,
-    (acc, value, key) => {
-      const splitedKey = split(key, ':');
-      const areaValueIndex = get(splitedKey, `[${refAreaDimIndex}]`, null);
-      const areaValue = get(refAreaValues, `[${areaValueIndex}]`, null);
-      const areaId = get(areaValue, 'id', null);
-      if (!has(acc, areaId)) {
-        acc[areaId] = [];
-      }
-      acc[areaId].push({ splitedKey, value, areaValueIndex });
-    },
-    {}
-  );
+  return R.pipe(
+    R.keys,
+    R.reduce((acc, key) => {
+      const value = observations[key];
+      const splitedKey = R.split(':', key);
+      const areaValueIndex = Number(R.nth(__index, splitedKey));
+      const areaValue = isNaN(areaValueIndex)
+        ? null : R.nth(areaValueIndex, values);
+      const areaId = R.prop('id', areaValue || {});
+      return R.over(
+        R.lensProp(areaId),
+        vals => R.append({ splitedKey, value, areaValueIndex }, vals || []),
+        acc
+      ); 
+    }, {})
+  )(observations);
 };
 
-var __choroSeries = ({ observations, dimensions }, dimensionsWithValuesIndexedById, topoMap, display) => {
+var choroSeries = ({ observations, dimensions }, dimensionsWithValuesIndexedById, topoMap, display) => {
   const refAreaDimension = getRefAreaDimension({ dimensions });
   const observationsByAreas = parseByAreas(observations, refAreaDimension);
-  const topology = get(topoMap, 'topology', {});
-  const areaSelection = get(topoMap, 'areaSelection', null);
-  const topoAreas = get(topology, `objects.${areaSelection}`, null);
+  const topology = R.propOr({}, 'topology', topoMap);
+  const areaSelection = R.propOr(null, 'areaSelection', topoMap);
+  const topoAreas = R.pathOr(null, ['objects', areaSelection], topology);
   if (!observationsByAreas || !topoAreas) {
     return null;
   }
-  const topoAreasWithData = map(
-    topoAreas.geometries,
+  const topoAreasWithData = R.map(
     (areaGeometry) => {
-      const areaObservation = head(get(observationsByAreas, get(areaGeometry, 'properties.id', null), []));
-      const areaValueIndex = get(areaObservation, 'areaValueIndex', null);
-      const areaValue = get(refAreaDimension, `values[${areaValueIndex}]`, null);
+      const areaObservation = R.pipe(
+        R.pathOr(null, ['properties', 'id']),
+        id => R.propOr([], id, observationsByAreas),
+        R.head
+      )(areaGeometry);
+      const areaValueIndex = R.propOr(null, 'areaValueIndex', areaObservation);
+      const areaValue = R.pathOr(null, ['values', areaValueIndex], refAreaDimension);
       return {
         ...areaGeometry,
         properties: {
-          ...get(areaGeometry, 'properties', {}),
+          ...R.propOr({}, 'properties', areaGeometry),
           label: dimensionValueDisplay(display)(areaValue),
-          value: head(get(areaObservation, 'value', [])),
-          category: categoryDisplay(get(areaObservation, 'splitedKey', null), dimensions, dimensionsWithValuesIndexedById, refAreaDimension.id, display),
+          value: R.head(R.propOr([], 'value', areaObservation)),
+          category: categoryDisplay(
+            R.propOr([], 'splitedKey', areaObservation),
+            dimensions,
+            dimensionsWithValuesIndexedById,
+            refAreaDimension.id,
+            display
+          ),
         }
       };
-    }
+    },
+    topoAreas.geometries,
   );
   return ({
     objects: {
@@ -64,5 +75,5 @@ var __choroSeries = ({ observations, dimensions }, dimensionsWithValuesIndexedBy
   });
 };
 
-export { __choroSeries as default };
+export { choroSeries as default };
 //# sourceMappingURL=choro-series.js.map

package/dist/rules/src/factories/choro-series.js.map

@@ -1 +1 @@
-{"version":3,"file":"choro-series.js","sources":["../../../../src/rules/src/factories/choro-series.js"],"sourcesContent":["import { get, has, head, isUndefined, map, split, transform } from 'lodash';\nimport { getRefAreaDimension } from '@sis-cc/dotstatsuite-sdmxjs';\nimport { categoryDisplay, dimensionValueDisplay } from '../dimension-utils';\n\nconst parseByAreas = (observations, refAreaDimension) => {\n  if (isUndefined(refAreaDimension)) {\n    return null;\n  }\n  const refAreaDimIndex = get(refAreaDimension, 'index');\n  const refAreaValues = refAreaDimension.values;\n\n  return transform(\n    observations,\n    (acc, value, key) => {\n      const splitedKey = split(key, ':');\n      const areaValueIndex = get(splitedKey, `[${refAreaDimIndex}]`, null);\n      const areaValue = get(refAreaValues, `[${areaValueIndex}]`, null);\n      const areaId = get(areaValue, 'id', null);\n      if (!has(acc, areaId)) {\n        acc[areaId] = [];\n      }\n      acc[areaId].push({ splitedKey, value, areaValueIndex });\n    },\n    {}\n  );\n};\n\nexport default ({ observations, dimensions }, dimensionsWithValuesIndexedById, topoMap, display) => {\n  const refAreaDimension = getRefAreaDimension({ dimensions });\n  const observationsByAreas = parseByAreas(observations, refAreaDimension);\n  const topology = get(topoMap, 'topology', {});\n  const areaSelection = get(topoMap, 'areaSelection', null);\n  const topoAreas = get(topology, `objects.${areaSelection}`, null);\n  if (!observationsByAreas || !topoAreas) {\n    return null;\n  }\n  const topoAreasWithData = map(\n    topoAreas.geometries,\n    (areaGeometry) => {\n      const areaObservation = head(get(observationsByAreas, get(areaGeometry, 'properties.id', null), []));\n      const areaValueIndex = get(areaObservation, 'areaValueIndex', null);\n      const areaValue = get(refAreaDimension, `values[${areaValueIndex}]`, null);\n      return {\n        ...areaGeometry,\n        properties: {\n          ...get(areaGeometry, 'properties', {}),\n          label: dimensionValueDisplay(display)(areaValue),\n          value: head(get(areaObservation, 'value', [])),\n          category: categoryDisplay(get(areaObservation, 'splitedKey', null), dimensions, dimensionsWithValuesIndexedById, refAreaDimension.id, display),\n        }\n      };\n    }\n  );\n  return ({\n    objects: {\n      areas: {\n        type: topoAreas.type,\n        geometries: topoAreasWithData\n      }\n    },\n    arcs: topology.arcs,\n    bbox: topology.bbox,\n    transform: topology.transform\n  });\n}\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"choro-series.js","sources":["../../../../src/rules/src/factories/choro-series.js"],"sourcesContent":["import * as R from 'ramda';\nimport { getRefAreaDimension } from '@sis-cc/dotstatsuite-sdmxjs';\nimport { categoryDisplay, dimensionValueDisplay } from '../dimension-utils';\n\nconst parseByAreas = (observations, refAreaDimension) => {\n  if (R.isNil(refAreaDimension)) {\n    return null;\n  }\n  const { __index, values=[] } = refAreaDimension;\n\n  return R.pipe(\n    R.keys,\n    R.reduce((acc, key) => {\n      const value = observations[key];\n      const splitedKey = R.split(':', key);\n      const areaValueIndex = Number(R.nth(__index, splitedKey));\n      const areaValue = isNaN(areaValueIndex)\n        ? null : R.nth(areaValueIndex, values);\n      const areaId = R.prop('id', areaValue || {});\n      return R.over(\n        R.lensProp(areaId),\n        vals => R.append({ splitedKey, value, areaValueIndex }, vals || []),\n        acc\n      ); \n    }, {})\n  )(observations);\n};\n\nexport default ({ observations, dimensions }, dimensionsWithValuesIndexedById, topoMap, display) => {\n  const refAreaDimension = getRefAreaDimension({ dimensions });\n  const observationsByAreas = parseByAreas(observations, refAreaDimension);\n  const topology = R.propOr({}, 'topology', topoMap);\n  const areaSelection = R.propOr(null, 'areaSelection', topoMap);\n  const topoAreas = R.pathOr(null, ['objects', areaSelection], topology);\n  if (!observationsByAreas || !topoAreas) {\n    return null;\n  }\n  const topoAreasWithData = R.map(\n    (areaGeometry) => {\n      const areaObservation = R.pipe(\n        R.pathOr(null, ['properties', 'id']),\n        id => R.propOr([], id, observationsByAreas),\n        R.head\n      )(areaGeometry);\n      const areaValueIndex = R.propOr(null, 'areaValueIndex', areaObservation);\n      const areaValue = R.pathOr(null, ['values', areaValueIndex], refAreaDimension);\n      return {\n        ...areaGeometry,\n        properties: {\n          ...R.propOr({}, 'properties', areaGeometry),\n          label: dimensionValueDisplay(display)(areaValue),\n          value: R.head(R.propOr([], 'value', areaObservation)),\n          category: categoryDisplay(\n            R.propOr([], 'splitedKey', areaObservation),\n            dimensions,\n            dimensionsWithValuesIndexedById,\n            refAreaDimension.id,\n            display\n          ),\n        }\n      };\n    },\n    topoAreas.geometries,\n  );\n  return ({\n    objects: {\n      areas: {\n        type: topoAreas.type,\n        geometries: topoAreasWithData\n      }\n    },\n    arcs: topology.arcs,\n    bbox: topology.bbox,\n    transform: topology.transform\n  });\n}\n"],"names":[],"mappings":"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"}

package/dist/rules/src/factories/focus.js

@@ -0,0 +1,20 @@
+import focus from './sample-focus.js';
+import focus$2 from './scatter-focus.js';
+import focus$1 from './timeline-focus.js';
+
+var getFocusedSeries = ({ type, series, focusOptions }) => {
+  switch(type) {
+    case 'ScatterChart':
+      return focus$2(series, focusOptions);
+    case 'TimelineChart':
+      return focus$1(series, focusOptions);
+    case 'BarChart': case 'RowChart': case 'StackedBarChart':
+    case 'StackedRowChart': case 'HorizontalSymbolChart': case 'VerticalSymbolChart':
+      return focus(series, focusOptions);
+    default:
+      return series;
+  }
+};
+
+export { getFocusedSeries as default };
+//# sourceMappingURL=focus.js.map

package/dist/rules/src/factories/focus.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"focus.js","sources":["../../../../src/rules/src/factories/focus.js"],"sourcesContent":["import sampleFocus from './sample-focus';\nimport scatterFocus from './scatter-focus';\nimport timelineFocus from './timeline-focus';\n\nexport default ({ type, series, focusOptions }) => {\n  switch(type) {\n    case 'ScatterChart':\n      return scatterFocus(series, focusOptions);\n    case 'TimelineChart':\n      return timelineFocus(series, focusOptions);\n    case 'BarChart': case 'RowChart': case 'StackedBarChart':\n    case 'StackedRowChart': case 'HorizontalSymbolChart': case 'VerticalSymbolChart':\n      return sampleFocus(series, focusOptions);\n    default:\n      return series;\n  }\n};"],"names":["scatterFocus","timelineFocus","sampleFocus"],"mappings":";;;;AAIA,uBAAe,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,YAAY,EAAE,KAAK;AACnD,EAAE,OAAO,IAAI;AACb,IAAI,KAAK,cAAc;AACvB,MAAM,OAAOA,OAAY,CAAC,MAAM,EAAE,YAAY,CAAC;AAC/C,IAAI,KAAK,eAAe;AACxB,MAAM,OAAOC,OAAa,CAAC,MAAM,EAAE,YAAY,CAAC;AAChD,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,UAAU,CAAC,CAAC,KAAK,iBAAiB;AAC5D,IAAI,KAAK,iBAAiB,CAAC,CAAC,KAAK,uBAAuB,CAAC,CAAC,KAAK,qBAAqB;AACpF,MAAM,OAAOC,KAAW,CAAC,MAAM,EAAE,YAAY,CAAC;AAC9C,IAAI;AACJ,MAAM,OAAO,MAAM;AACnB;AACA,CAAC;;;;"}

package/dist/rules/src/factories/getChartSeries.js

@@ -0,0 +1,11 @@
+import getFocusedSeries from './focus.js';
+import getSeries from './series.js';
+
+const getChartSeries = ({ type, data, options, singularity, focusOptions }) => {
+  const chartSeries = getSeries({ type, data, options, singularity });
+  const focusedSeries = getFocusedSeries({ type, series: chartSeries, focusOptions });
+  return focusedSeries;
+};
+
+export { getChartSeries };
+//# sourceMappingURL=getChartSeries.js.map

package/dist/rules/src/factories/getChartSeries.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"getChartSeries.js","sources":["../../../../src/rules/src/factories/getChartSeries.js"],"sourcesContent":["import getFocusedSeries from './focus';\nimport getSeries from './series';\n\nexport const getChartSeries = ({ type, data, options, singularity, focusOptions }) => {\n  const chartSeries = getSeries({ type, data, options, singularity });\n  const focusedSeries = getFocusedSeries({ type, series: chartSeries, focusOptions });\n  return focusedSeries;\n};\n"],"names":[],"mappings":";;;AAGY,MAAC,cAAc,GAAG,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,YAAY,EAAE,KAAK;AACtF,EAAE,MAAM,WAAW,GAAG,SAAS,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,CAAC;AACrE,EAAE,MAAM,aAAa,GAAG,gBAAgB,CAAC,EAAE,IAAI,EAAE,MAAM,EAAE,WAAW,EAAE,YAAY,EAAE,CAAC;AACrF,EAAE,OAAO,aAAa;AACtB;;;;"}

package/dist/rules/src/factories/sample-focus.js

@@ -1,24 +1,20 @@
-import { head, get, map, omit, keys, each, isArray } from 'lodash';
+import * as R from 'ramda';
 
 function focus(series, focusSelections) {
-  const serie = head(series);
-  const datapoints = get(serie, 'datapoints', []);
+  const { highlight = [], baseline = [] } = focusSelections || {};
+  if (R.isEmpty(highlight) && R.isEmpty(baseline)) {
+    return series;
+  }
 
-  const _datapoints = map(datapoints, (datapoint) => {
-    let _datapoint = omit(datapoint, map(keys(focusSelections), focusKey => `${focusKey}Index`));
-    
-    each(focusSelections, (focusSelection, focusKey) => {
-      const _focusKey = `${focusKey}Index`;
-
-      each(isArray(focusSelection) ? focusSelection : [focusSelection], (focus, index) => {
-        if (get(focus, 'value') === _datapoint.key) _datapoint[_focusKey] = index;
-      });
-    });
-
-    return _datapoint;
-  });
-
-  return [{ ...serie, datapoints: _datapoints }];
+  return R.over(
+    R.lensPath([0, 'datapoints']),
+    R.map(dp => ({
+      ...dp,
+      highlightIndex: R.findIndex(R.propEq(dp.key, 'value'), highlight),
+      baselineIndex: R.path([0, 'value'], baseline) === dp.key ? 0 : -1
+    })),
+    series || []
+  );
 }
 
 export { focus as default };

package/dist/rules/src/factories/sample-focus.js.map

@@ -1 +1 @@
-{"version":3,"file":"sample-focus.js","sources":["../../../../src/rules/src/factories/sample-focus.js"],"sourcesContent":["import { map, each, get, omit, isArray, keys, head } from 'lodash';\n\nexport default function focus(series, focusSelections) {\n  const serie = head(series);\n  const datapoints = get(serie, 'datapoints', []);\n\n  const _datapoints = map(datapoints, (datapoint) => {\n    let _datapoint = omit(datapoint, map(keys(focusSelections), focusKey => `${focusKey}Index`));\n    \n    each(focusSelections, (focusSelection, focusKey) => {\n      const _focusKey = `${focusKey}Index`;\n\n      each(isArray(focusSelection) ? focusSelection : [focusSelection], (focus, index) => {\n        if (get(focus, 'value') === _datapoint.key) _datapoint[_focusKey] = index;\n      });\n    });\n\n    return _datapoint;\n  });\n\n  return [{ ...serie, datapoints: _datapoints }];\n}\n"],"names":[],"mappings":";;AAEe,SAAS,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE;AACvD,EAAE,MAAM,KAAK,GAAG,IAAI,CAAC,MAAM,CAAC;AAC5B,EAAE,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC;;AAEjD,EAAE,MAAM,WAAW,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,SAAS,KAAK;AACrD,IAAI,IAAI,UAAU,GAAG,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,IAAI,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC;AAChG;AACA,IAAI,IAAI,CAAC,eAAe,EAAE,CAAC,cAAc,EAAE,QAAQ,KAAK;AACxD,MAAM,MAAM,SAAS,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;;AAE1C,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,GAAG,cAAc,GAAG,CAAC,cAAc,CAAC,EAAE,CAAC,KAAK,EAAE,KAAK,KAAK;AAC1F,QAAQ,IAAI,GAAG,CAAC,KAAK,EAAE,OAAO,CAAC,KAAK,UAAU,CAAC,GAAG,EAAE,UAAU,CAAC,SAAS,CAAC,GAAG,KAAK;AACjF,MAAM,CAAC,CAAC;AACR,IAAI,CAAC,CAAC;;AAEN,IAAI,OAAO,UAAU;AACrB,EAAE,CAAC,CAAC;;AAEJ,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,WAAW,EAAE,CAAC;AAChD;;;;"}
+{"version":3,"file":"sample-focus.js","sources":["../../../../src/rules/src/factories/sample-focus.js"],"sourcesContent":["import * as R from 'ramda';\n\nexport default function focus(series, focusSelections) {\n  const { highlight = [], baseline = [] } = focusSelections || {};\n  if (R.isEmpty(highlight) && R.isEmpty(baseline)) {\n    return series;\n  }\n\n  return R.over(\n    R.lensPath([0, 'datapoints']),\n    R.map(dp => ({\n      ...dp,\n      highlightIndex: R.findIndex(R.propEq(dp.key, 'value'), highlight),\n      baselineIndex: R.path([0, 'value'], baseline) === dp.key ? 0 : -1\n    })),\n    series || []\n  );\n}\n"],"names":[],"mappings":";;AAEe,SAAS,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE;AACvD,EAAE,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,eAAe,IAAI,EAAE;AACjE,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAE;AACnD,IAAI,OAAO,MAAM;AACjB,EAAE;;AAEF,EAAE,OAAO,CAAC,CAAC,IAAI;AACf,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;AACjC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,KAAK;AACjB,MAAM,GAAG,EAAE;AACX,MAAM,cAAc,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,EAAE,CAAC,GAAG,EAAE,OAAO,CAAC,EAAE,SAAS,CAAC;AACvE,MAAM,aAAa,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,OAAO,CAAC,EAAE,QAAQ,CAAC,KAAK,EAAE,CAAC,GAAG,GAAG,CAAC,GAAG;AACrE,KAAK,CAAC,CAAC;AACP,IAAI,MAAM,IAAI;AACd,GAAG;AACH;;;;"}

package/dist/rules/src/factories/sample-series.js

@@ -1,4 +1,4 @@
-import { sortBy, map, head, split, isNil, isEmpty } from 'lodash';
+import * as R from 'ramda';
 import { categoryDisplay } from '../dimension-utils.js';
 import { getFormatedObservation } from '../observation-formater.js';
 
@@ -8,25 +8,25 @@ const getDatapoints = (
   const [categoryKey, valueKey] = keys;
   const sortFunc =  dp => dp[valueKey] * sortDirection;
 
-  return sortBy(
-    map(
-      observations,
-      (observationValue, observationKey) => {
-        const value = head(observationValue);
-        const category = categoryDisplay(split(observationKey, ':'), dimensions, dimensionsWithValuesIndexedById, null, display);
-        const categoryIds = categoryDisplay(split(observationKey, ':'), dimensions, dimensionsWithValuesIndexedById, null, 'code');
-        const formatedValue = getFormatedObservation(observationValue, formaterAttrs);
+  return R.pipe(
+    R.keys,
+    R.map((observationKey) => {
+      const observationValue = R.prop(observationKey, observations);
+      const value = R.head(observationValue);
+      const splitKey = R.split(':', observationKey);
+      const category = categoryDisplay(splitKey, dimensions, dimensionsWithValuesIndexedById, null, display);
+      const categoryIds = categoryDisplay(splitKey, dimensions, dimensionsWithValuesIndexedById, null, 'code');
+      const formatedValue = getFormatedObservation(observationValue, formaterAttrs);
 
-        let key = categoryIds;
-        if (isNil(key) || isEmpty(key)) {
-          key = 'uniq-dp';
-        }
-
-        return { value, category, [valueKey]: value, [categoryKey]: category, key, formatedValue };
+      let key = categoryIds;
+      if (R.isNil(key) || R.isEmpty(key)) {
+        key = 'uniq-dp';
       }
-    ),
-    sortFunc
-  );
+
+      return { value, category, [valueKey]: value, [categoryKey]: category, key, formatedValue };
+    }),
+    R.sortBy(sortFunc)
+  )(observations);
 };
 
 const series = (
@@ -39,7 +39,7 @@ const series = (
   }]
 };
 
-var __sampleSeries = (chartType, { observations, dimensions }, dimensionsWithValuesIndexedById, display, formaterAttrs) => {
+var sampleSeries = (chartType, { observations, dimensions }, dimensionsWithValuesIndexedById, display, formaterAttrs) => {
   switch(chartType) {
     case 'BarChart':
       return series(['x', 'y'], observations, dimensions, dimensionsWithValuesIndexedById, 1, display, formaterAttrs);
@@ -50,5 +50,5 @@ var __sampleSeries = (chartType, { observations, dimensions }, dimensionsWithVal
   }
 };
 
-export { __sampleSeries as default, getDatapoints, series };
+export { sampleSeries as default };
 //# sourceMappingURL=sample-series.js.map

package/dist/rules/src/factories/sample-series.js.map

@@ -1 +1 @@
-{"version":3,"file":"sample-series.js","sources":["../../../../src/rules/src/factories/sample-series.js"],"sourcesContent":["import { map, sortBy, head, isEmpty, isNil, split } from 'lodash';\nimport { categoryDisplay } from '../dimension-utils';\nimport { getFormatedObservation } from '../observation-formater';\n\nexport const getDatapoints = (\n  keys, observations, dimensions, dimensionsWithValuesIndexedById, sortDirection, display, formaterAttrs\n) => {\n  const [categoryKey, valueKey] = keys;\n  const sortFunc =  dp => dp[valueKey] * sortDirection;\n\n  return sortBy(\n    map(\n      observations,\n      (observationValue, observationKey) => {\n        const value = head(observationValue);\n        const category = categoryDisplay(split(observationKey, ':'), dimensions, dimensionsWithValuesIndexedById, null, display);\n        const categoryIds = categoryDisplay(split(observationKey, ':'), dimensions, dimensionsWithValuesIndexedById, null, 'code');\n        const formatedValue = getFormatedObservation(observationValue, formaterAttrs);\n\n        let key = categoryIds;\n        if (isNil(key) || isEmpty(key)) {\n          key = 'uniq-dp';\n        }\n\n        return { value, category, [valueKey]: value, [categoryKey]: category, key, formatedValue };\n      }\n    ),\n    sortFunc\n  );\n};\n\nexport const series = (\n  keys, observations, dimensions, dimensionsWithValuesIndexedById, sortDirection, display, formaterAttrs\n) => {\n  return [{\n    datapoints: getDatapoints(\n      keys, observations, dimensions, dimensionsWithValuesIndexedById, sortDirection, display, formaterAttrs\n    )\n  }]\n};\n\nexport default (chartType, { observations, dimensions }, dimensionsWithValuesIndexedById, display, formaterAttrs) => {\n  switch(chartType) {\n    case 'BarChart':\n      return series(['x', 'y'], observations, dimensions, dimensionsWithValuesIndexedById, 1, display, formaterAttrs);\n    case 'RowChart':\n      return series(['y', 'x'], observations, dimensions, dimensionsWithValuesIndexedById, -1, display, formaterAttrs);\n    default:\n      return [];\n  }\n};\n"],"names":[],"mappings":";;;;AAIY,MAAC,aAAa,GAAG;AAC7B,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,aAAa,EAAE,OAAO,EAAE;AAC3F,KAAK;AACL,EAAE,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,IAAI;AACtC,EAAE,MAAM,QAAQ,IAAI,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,aAAa;;AAEtD,EAAE,OAAO,MAAM;AACf,IAAI,GAAG;AACP,MAAM,YAAY;AAClB,MAAM,CAAC,gBAAgB,EAAE,cAAc,KAAK;AAC5C,QAAQ,MAAM,KAAK,GAAG,IAAI,CAAC,gBAAgB,CAAC;AAC5C,QAAQ,MAAM,QAAQ,GAAG,eAAe,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,+BAA+B,EAAE,IAAI,EAAE,OAAO,CAAC;AAChI,QAAQ,MAAM,WAAW,GAAG,eAAe,CAAC,KAAK,CAAC,cAAc,EAAE,GAAG,CAAC,EAAE,UAAU,EAAE,+BAA+B,EAAE,IAAI,EAAE,MAAM,CAAC;AAClI,QAAQ,MAAM,aAAa,GAAG,sBAAsB,CAAC,gBAAgB,EAAE,aAAa,CAAC;;AAErF,QAAQ,IAAI,GAAG,GAAG,WAAW;AAC7B,QAAQ,IAAI,KAAK,CAAC,GAAG,CAAC,IAAI,OAAO,CAAC,GAAG,CAAC,EAAE;AACxC,UAAU,GAAG,GAAG,SAAS;AACzB,QAAQ;;AAER,QAAQ,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,QAAQ,GAAG,KAAK,EAAE,CAAC,WAAW,GAAG,QAAQ,EAAE,GAAG,EAAE,aAAa,EAAE;AAClG,MAAM;AACN,KAAK;AACL,IAAI;AACJ,GAAG;AACH;;AAEY,MAAC,MAAM,GAAG;AACtB,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,aAAa,EAAE,OAAO,EAAE;AAC3F,KAAK;AACL,EAAE,OAAO,CAAC;AACV,IAAI,UAAU,EAAE,aAAa;AAC7B,MAAM,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,aAAa,EAAE,OAAO,EAAE;AAC/F;AACA,GAAG;AACH;;AAEA,qBAAe,CAAC,SAAS,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,+BAA+B,EAAE,OAAO,EAAE,aAAa,KAAK;AACrH,EAAE,OAAO,SAAS;AAClB,IAAI,KAAK,UAAU;AACnB,MAAM,OAAO,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC;AACrH,IAAI,KAAK,UAAU;AACnB,MAAM,OAAO,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC;AACtH,IAAI;AACJ,MAAM,OAAO,EAAE;AACf;AACA,CAAC;;;;"}
+{"version":3,"file":"sample-series.js","sources":["../../../../src/rules/src/factories/sample-series.js"],"sourcesContent":["import * as R from 'ramda';\nimport { categoryDisplay } from '../dimension-utils';\nimport { getFormatedObservation } from '../observation-formater';\n\nconst getDatapoints = (\n  keys, observations, dimensions, dimensionsWithValuesIndexedById, sortDirection, display, formaterAttrs\n) => {\n  const [categoryKey, valueKey] = keys;\n  const sortFunc =  dp => dp[valueKey] * sortDirection;\n\n  return R.pipe(\n    R.keys,\n    R.map((observationKey) => {\n      const observationValue = R.prop(observationKey, observations);\n      const value = R.head(observationValue);\n      const splitKey = R.split(':', observationKey);\n      const category = categoryDisplay(splitKey, dimensions, dimensionsWithValuesIndexedById, null, display);\n      const categoryIds = categoryDisplay(splitKey, dimensions, dimensionsWithValuesIndexedById, null, 'code');\n      const formatedValue = getFormatedObservation(observationValue, formaterAttrs);\n\n      let key = categoryIds;\n      if (R.isNil(key) || R.isEmpty(key)) {\n        key = 'uniq-dp';\n      }\n\n      return { value, category, [valueKey]: value, [categoryKey]: category, key, formatedValue };\n    }),\n    R.sortBy(sortFunc)\n  )(observations);\n};\n\nconst series = (\n  keys, observations, dimensions, dimensionsWithValuesIndexedById, sortDirection, display, formaterAttrs\n) => {\n  return [{\n    datapoints: getDatapoints(\n      keys, observations, dimensions, dimensionsWithValuesIndexedById, sortDirection, display, formaterAttrs\n    )\n  }]\n};\n\nexport default (chartType, { observations, dimensions }, dimensionsWithValuesIndexedById, display, formaterAttrs) => {\n  switch(chartType) {\n    case 'BarChart':\n      return series(['x', 'y'], observations, dimensions, dimensionsWithValuesIndexedById, 1, display, formaterAttrs);\n    case 'RowChart':\n      return series(['y', 'x'], observations, dimensions, dimensionsWithValuesIndexedById, -1, display, formaterAttrs);\n    default:\n      return [];\n  }\n};\n"],"names":[],"mappings":";;;;AAIA,MAAM,aAAa,GAAG;AACtB,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,aAAa,EAAE,OAAO,EAAE;AAC3F,KAAK;AACL,EAAE,MAAM,CAAC,WAAW,EAAE,QAAQ,CAAC,GAAG,IAAI;AACtC,EAAE,MAAM,QAAQ,IAAI,EAAE,IAAI,EAAE,CAAC,QAAQ,CAAC,GAAG,aAAa;;AAEtD,EAAE,OAAO,CAAC,CAAC,IAAI;AACf,IAAI,CAAC,CAAC,IAAI;AACV,IAAI,CAAC,CAAC,GAAG,CAAC,CAAC,cAAc,KAAK;AAC9B,MAAM,MAAM,gBAAgB,GAAG,CAAC,CAAC,IAAI,CAAC,cAAc,EAAE,YAAY,CAAC;AACnE,MAAM,MAAM,KAAK,GAAG,CAAC,CAAC,IAAI,CAAC,gBAAgB,CAAC;AAC5C,MAAM,MAAM,QAAQ,GAAG,CAAC,CAAC,KAAK,CAAC,GAAG,EAAE,cAAc,CAAC;AACnD,MAAM,MAAM,QAAQ,GAAG,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,+BAA+B,EAAE,IAAI,EAAE,OAAO,CAAC;AAC5G,MAAM,MAAM,WAAW,GAAG,eAAe,CAAC,QAAQ,EAAE,UAAU,EAAE,+BAA+B,EAAE,IAAI,EAAE,MAAM,CAAC;AAC9G,MAAM,MAAM,aAAa,GAAG,sBAAsB,CAAC,gBAAgB,EAAE,aAAa,CAAC;;AAEnF,MAAM,IAAI,GAAG,GAAG,WAAW;AAC3B,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,IAAI,CAAC,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;AAC1C,QAAQ,GAAG,GAAG,SAAS;AACvB,MAAM;;AAEN,MAAM,OAAO,EAAE,KAAK,EAAE,QAAQ,EAAE,CAAC,QAAQ,GAAG,KAAK,EAAE,CAAC,WAAW,GAAG,QAAQ,EAAE,GAAG,EAAE,aAAa,EAAE;AAChG,IAAI,CAAC,CAAC;AACN,IAAI,CAAC,CAAC,MAAM,CAAC,QAAQ;AACrB,GAAG,CAAC,YAAY,CAAC;AACjB,CAAC;;AAED,MAAM,MAAM,GAAG;AACf,EAAE,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,aAAa,EAAE,OAAO,EAAE;AAC3F,KAAK;AACL,EAAE,OAAO,CAAC;AACV,IAAI,UAAU,EAAE,aAAa;AAC7B,MAAM,IAAI,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,aAAa,EAAE,OAAO,EAAE;AAC/F;AACA,GAAG;AACH,CAAC;;AAED,mBAAe,CAAC,SAAS,EAAE,EAAE,YAAY,EAAE,UAAU,EAAE,EAAE,+BAA+B,EAAE,OAAO,EAAE,aAAa,KAAK;AACrH,EAAE,OAAO,SAAS;AAClB,IAAI,KAAK,UAAU;AACnB,MAAM,OAAO,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,CAAC,EAAE,OAAO,EAAE,aAAa,CAAC;AACrH,IAAI,KAAK,UAAU;AACnB,MAAM,OAAO,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,CAAC,EAAE,YAAY,EAAE,UAAU,EAAE,+BAA+B,EAAE,EAAE,EAAE,OAAO,EAAE,aAAa,CAAC;AACtH,IAAI;AACJ,MAAM,OAAO,EAAE;AACf;AACA,CAAC;;;;"}

package/dist/rules/src/factories/scatter-focus.js

@@ -1,41 +1,27 @@
-import { get, reduce, isEmpty, map, omit, keys, each } from 'lodash';
+import * as R from 'ramda';
 
 function focus(series, focusSelections) {
-  // scatter has only 1 serie
-  const serie = get(series, '[0]', {});
-
-  const _focusSelections = reduce(
-    focusSelections,
-    (memo, focusSelection, focusKey) => {
-      if (!isEmpty(focusSelection)) memo[focusKey] = focusSelection;
-      return memo;
-    },
-    {}
+  const { highlight = [], baseline = [] } = focusSelections || {};
+  if (R.isEmpty(highlight && R.isEmpty(baseline))) {
+    return series;
+  }
+
+  return R.over(
+    R.lensPath([0, 'datapoints']),
+    R.map(dp => {
+      const isFocusMatch = f => {
+        const focusedDim = R.path(['options', 'dimensionId'], f);
+        const dpValId = R.path(['dimensionValues', focusedDim, 'id'], dp);
+        return dpValId === R.path(['options', 'dimensionValueId'], f);
+      };
+      return ({
+        ...dp,
+        highlightIndex: R.findIndex(isFocusMatch, highlight),
+        baselineIndex: isFocusMatch(R.head(baseline)) ? 0 : -1
+      })
+    }),
+    series
   );
-
-  if (isEmpty(_focusSelections)) return series;
-
-  const datapoints = get(serie, 'datapoints', []);
-
-  let _datapoints = map(datapoints, (datapoint) => (
-    omit(datapoint, map(keys(focusSelections), focusKey => `${focusKey}Index`))
-  ));
-
-  const __datapoints = map(_datapoints, (datapoint) => {
-    each(_focusSelections, (focusSelection, focusKey) => {
-      const _focusKey = `${focusKey}Index`;
-
-      each(focusSelection, (focus, i) => {
-        const _focus = get(focus, 'options', {});
-        const dimensionValueId = get(datapoint, `dimensionValues.${_focus.dimensionId}.id`);
-        if (dimensionValueId === _focus.dimensionValueId) datapoint[_focusKey] = i;
-      });
-    });
-
-    return datapoint;
-  });
-
-  return [{ ...serie, datapoints: __datapoints }];
 }
 
 export { focus as default };

package/dist/rules/src/factories/scatter-focus.js.map

@@ -1 +1 @@
-{"version":3,"file":"scatter-focus.js","sources":["../../../../src/rules/src/factories/scatter-focus.js"],"sourcesContent":["import { map, each, omit, get, split, reduce, isEmpty, keys } from 'lodash';\n\nexport default function focus(series, focusSelections) {\n  // scatter has only 1 serie\n  const serie = get(series, '[0]', {});\n\n  const _focusSelections = reduce(\n    focusSelections,\n    (memo, focusSelection, focusKey) => {\n      if (!isEmpty(focusSelection)) memo[focusKey] = focusSelection;\n      return memo;\n    },\n    {}\n  );\n\n  if (isEmpty(_focusSelections)) return series;\n\n  const datapoints = get(serie, 'datapoints', []);\n\n  let _datapoints = map(datapoints, (datapoint) => (\n    omit(datapoint, map(keys(focusSelections), focusKey => `${focusKey}Index`))\n  ));\n\n  const __datapoints = map(_datapoints, (datapoint) => {\n    each(_focusSelections, (focusSelection, focusKey) => {\n      const _focusKey = `${focusKey}Index`;\n\n      each(focusSelection, (focus, i) => {\n        const _focus = get(focus, 'options', {});\n        const dimensionValueId = get(datapoint, `dimensionValues.${_focus.dimensionId}.id`);\n        if (dimensionValueId === _focus.dimensionValueId) datapoint[_focusKey] = i;\n      });\n    });\n\n    return datapoint;\n  });\n\n  return [{ ...serie, datapoints: __datapoints }];\n}\n"],"names":[],"mappings":";;AAEe,SAAS,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE;AACvD;AACA,EAAE,MAAM,KAAK,GAAG,GAAG,CAAC,MAAM,EAAE,KAAK,EAAE,EAAE,CAAC;;AAEtC,EAAE,MAAM,gBAAgB,GAAG,MAAM;AACjC,IAAI,eAAe;AACnB,IAAI,CAAC,IAAI,EAAE,cAAc,EAAE,QAAQ,KAAK;AACxC,MAAM,IAAI,CAAC,OAAO,CAAC,cAAc,CAAC,EAAE,IAAI,CAAC,QAAQ,CAAC,GAAG,cAAc;AACnE,MAAM,OAAO,IAAI;AACjB,IAAI,CAAC;AACL,IAAI;AACJ,GAAG;;AAEH,EAAE,IAAI,OAAO,CAAC,gBAAgB,CAAC,EAAE,OAAO,MAAM;;AAE9C,EAAE,MAAM,UAAU,GAAG,GAAG,CAAC,KAAK,EAAE,YAAY,EAAE,EAAE,CAAC;;AAEjD,EAAE,IAAI,WAAW,GAAG,GAAG,CAAC,UAAU,EAAE,CAAC,SAAS;AAC9C,IAAI,IAAI,CAAC,SAAS,EAAE,GAAG,CAAC,IAAI,CAAC,eAAe,CAAC,EAAE,QAAQ,IAAI,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC,CAAC;AAC9E,GAAG,CAAC;;AAEJ,EAAE,MAAM,YAAY,GAAG,GAAG,CAAC,WAAW,EAAE,CAAC,SAAS,KAAK;AACvD,IAAI,IAAI,CAAC,gBAAgB,EAAE,CAAC,cAAc,EAAE,QAAQ,KAAK;AACzD,MAAM,MAAM,SAAS,GAAG,CAAC,EAAE,QAAQ,CAAC,KAAK,CAAC;;AAE1C,MAAM,IAAI,CAAC,cAAc,EAAE,CAAC,KAAK,EAAE,CAAC,KAAK;AACzC,QAAQ,MAAM,MAAM,GAAG,GAAG,CAAC,KAAK,EAAE,SAAS,EAAE,EAAE,CAAC;AAChD,QAAQ,MAAM,gBAAgB,GAAG,GAAG,CAAC,SAAS,EAAE,CAAC,gBAAgB,EAAE,MAAM,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC;AAC3F,QAAQ,IAAI,gBAAgB,KAAK,MAAM,CAAC,gBAAgB,EAAE,SAAS,CAAC,SAAS,CAAC,GAAG,CAAC;AAClF,MAAM,CAAC,CAAC;AACR,IAAI,CAAC,CAAC;;AAEN,IAAI,OAAO,SAAS;AACpB,EAAE,CAAC,CAAC;;AAEJ,EAAE,OAAO,CAAC,EAAE,GAAG,KAAK,EAAE,UAAU,EAAE,YAAY,EAAE,CAAC;AACjD;;;;"}
+{"version":3,"file":"scatter-focus.js","sources":["../../../../src/rules/src/factories/scatter-focus.js"],"sourcesContent":["import * as R from 'ramda';\n\nexport default function focus(series, focusSelections) {\n  const { highlight = [], baseline = [] } = focusSelections || {};\n  if (R.isEmpty(highlight && R.isEmpty(baseline))) {\n    return series;\n  }\n\n  return R.over(\n    R.lensPath([0, 'datapoints']),\n    R.map(dp => {\n      const isFocusMatch = f => {\n        const focusedDim = R.path(['options', 'dimensionId'], f);\n        const dpValId = R.path(['dimensionValues', focusedDim, 'id'], dp);\n        return dpValId === R.path(['options', 'dimensionValueId'], f);\n      }\n      return ({\n        ...dp,\n        highlightIndex: R.findIndex(isFocusMatch, highlight),\n        baselineIndex: isFocusMatch(R.head(baseline)) ? 0 : -1\n      })\n    }),\n    series\n  );\n};\n"],"names":[],"mappings":";;AAEe,SAAS,KAAK,CAAC,MAAM,EAAE,eAAe,EAAE;AACvD,EAAE,MAAM,EAAE,SAAS,GAAG,EAAE,EAAE,QAAQ,GAAG,EAAE,EAAE,GAAG,eAAe,IAAI,EAAE;AACjE,EAAE,IAAI,CAAC,CAAC,OAAO,CAAC,SAAS,IAAI,CAAC,CAAC,OAAO,CAAC,QAAQ,CAAC,CAAC,EAAE;AACnD,IAAI,OAAO,MAAM;AACjB,EAAE;;AAEF,EAAE,OAAO,CAAC,CAAC,IAAI;AACf,IAAI,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,YAAY,CAAC,CAAC;AACjC,IAAI,CAAC,CAAC,GAAG,CAAC,EAAE,IAAI;AAChB,MAAM,MAAM,YAAY,GAAG,CAAC,IAAI;AAChC,QAAQ,MAAM,UAAU,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,aAAa,CAAC,EAAE,CAAC,CAAC;AAChE,QAAQ,MAAM,OAAO,GAAG,CAAC,CAAC,IAAI,CAAC,CAAC,iBAAiB,EAAE,UAAU,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC;AACzE,QAAQ,OAAO,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,kBAAkB,CAAC,EAAE,CAAC,CAAC;AACrE,MAAM;AACN,MAAM,QAAQ;AACd,QAAQ,GAAG,EAAE;AACb,QAAQ,cAAc,EAAE,CAAC,CAAC,SAAS,CAAC,YAAY,EAAE,SAAS,CAAC;AAC5D,QAAQ,aAAa,EAAE,YAAY,CAAC,CAAC,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,GAAG,CAAC,GAAG;AAC5D,OAAO;AACP,IAAI,CAAC,CAAC;AACN,IAAI;AACJ,GAAG;AACH;;;;"}

package/dist/rules/src/factories/scatter-series.js

@@ -35,7 +35,7 @@ function getDimensionValueKey(chartDimension, dimensionValue) {
 }
 function datapoints(observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) {
   const chartDimensionId = R.prop('id', chartDimension);
-  const chartDimensionIndex = R.findIndex(R.propEq('id', chartDimensionId), dimensions);
+  const chartDimensionIndex = R.findIndex(R.propEq(chartDimensionId, 'id'), dimensions);
   const datapoints = R.reduce(
     (acc, k) => {
       const o = R.prop(k, observations);
@@ -72,8 +72,8 @@ function datapoints(observations, dimensions, dimensionsWithValuesIndexedById, c
 }
 const series = (observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) => {
   const values = R.pipe(R.prop(R.prop('id', chartDimension || {})), R.propOr([], 'values'))(dimensionsWithValuesIndexedById);
-  const xValue = R.find(R.propEq('id', R.prop('xId', chartDimension)), values);
-  const yValue = R.find(R.propEq('id', R.prop('yId', chartDimension)), values);
+  const xValue = R.find(R.propEq(R.prop('xId', chartDimension),'id'), values);
+  const yValue = R.find(R.propEq(R.prop('yId', chartDimension), 'id'), values);
   return [{
     dimensionValues: {
       x: { ...xValue, name: dimensionValueDisplay(display)(xValue) },
@@ -83,9 +83,9 @@ const series = (observations, dimensions, dimensionsWithValuesIndexedById, chart
   }]
 };
 
-var __scatterSeries = ({ observations, dimensions }, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) => (
+var scatterSeries = ({ observations, dimensions }, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) => (
   series(observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs)
 );
 
-export { datapoints, __scatterSeries as default, dimensionValueIsValid, getDimensionValueKey, getDimensionValues, series };
+export { scatterSeries as default };
 //# sourceMappingURL=scatter-series.js.map

package/dist/rules/src/factories/scatter-series.js.map

@@ -1 +1 @@
-{"version":3,"file":"scatter-series.js","sources":["../../../../src/rules/src/factories/scatter-series.js"],"sourcesContent":["import * as R from 'ramda';\nimport { dimensionValueDisplay } from '../dimension-utils';\nimport { getFormatedObservation } from '../observation-formater';\n\nexport function dimensionValueIsValid(dimensionValue, chartDimension) {\n  return R.includes(\n    R.prop('id', dimensionValue),\n    R.map(k => R.prop(`${k}Id`, chartDimension), ['x', 'y']),\n  );\n};\n\nexport function getDimensionValues(\n  dimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById, chartDimensionId, display\n) {\n  const dimensionsWithValuesIds = R.keys(dimensionsWithValuesIndexedById);\n  return R.addIndex(R.reduce)(\n    (acc, dvi, i) => {\n      const dimension = R.nth(i, dimensions);\n      const dimensionId = R.prop('id', dimension);\n      const dimensionValue = R.nth(dvi, R.propOr([], 'values', dimension || {}));\n      if (dimensionId !== chartDimensionId && R.includes(dimensionId, dimensionsWithValuesIds)) {\n        return R.assoc(\n          dimensionId,\n          { ...dimensionValue, name: dimensionValueDisplay(display)(dimensionValue) },\n          acc\n        );\n      }\n      return acc;\n    },\n    {},\n    dimensionValuesIndexes,\n  );\n};\n\nexport function getDimensionValueKey(chartDimension, dimensionValue) {\n  return R.prop('xId', chartDimension,) === R.prop('id', dimensionValue) ? 'x' : 'y';\n};\n\nexport function datapoints(observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) {\n  const chartDimensionId = R.prop('id', chartDimension);\n  const chartDimensionIndex = R.findIndex(R.propEq('id', chartDimensionId), dimensions);\n  const datapoints = R.reduce(\n    (acc, k) => {\n      const o = R.prop(k, observations);\n      const oDimensionValuesIndexes = R.split(':', k);\n      const oDimensionValueIndex = oDimensionValuesIndexes[chartDimensionIndex];\n      const _chartDimension = R.nth(chartDimensionIndex, dimensions);\n      const oDimensionValue = R.nth(oDimensionValueIndex, R.propOr([], 'values', _chartDimension || {}));\n      if (dimensionValueIsValid(oDimensionValue, chartDimension)) {\n        const oPartialKey = R.pipe(\n          R.addIndex(R.reject)((_, i) => i === chartDimensionIndex),\n          R.join(':'),\n        )(oDimensionValuesIndexes);\n        \n        if (!R.has(oPartialKey, acc)) {\n          const dimensionValues = getDimensionValues(\n            oDimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById, chartDimensionId, display\n          );\n          acc[oPartialKey] = { dimensionValues };\n        }\n        const dimensionValueKey = getDimensionValueKey(chartDimension, oDimensionValue);\n        acc[oPartialKey][dimensionValueKey] = R.head(o);\n        acc[oPartialKey][`${dimensionValueKey}Format`] = getFormatedObservation(o, formaterAttrs);\n      }\n      return acc;\n    },\n    {},\n    R.keys(observations),\n  );\n  // it is possible to have null observations or incomplete datapoints (just an x or y)\n  return R.pipe(\n    R.filter(dp => ((!R.isNil(dp.x)) && (!R.isNil(dp.y)))),\n    R.values\n  )(datapoints);\n};\n\nexport const series = (observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) => {\n  const values = R.pipe(R.prop(R.prop('id', chartDimension || {})), R.propOr([], 'values'))(dimensionsWithValuesIndexedById);\n  const xValue = R.find(R.propEq('id', R.prop('xId', chartDimension)), values);\n  const yValue = R.find(R.propEq('id', R.prop('yId', chartDimension)), values);\n  return [{\n    dimensionValues: {\n      x: { ...xValue, name: dimensionValueDisplay(display)(xValue) },\n      y: { ...yValue, name: dimensionValueDisplay(display)(yValue) }\n    },\n    datapoints: datapoints(observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs)\n  }]\n};\n\nexport default ({ observations, dimensions }, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) => (\n  series(observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs)\n);\n"],"names":[],"mappings":"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"}
+{"version":3,"file":"scatter-series.js","sources":["../../../../src/rules/src/factories/scatter-series.js"],"sourcesContent":["import * as R from 'ramda';\nimport { dimensionValueDisplay } from '../dimension-utils';\nimport { getFormatedObservation } from '../observation-formater';\n\nfunction dimensionValueIsValid(dimensionValue, chartDimension) {\n  return R.includes(\n    R.prop('id', dimensionValue),\n    R.map(k => R.prop(`${k}Id`, chartDimension), ['x', 'y']),\n  );\n};\n\nfunction getDimensionValues(\n  dimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById, chartDimensionId, display\n) {\n  const dimensionsWithValuesIds = R.keys(dimensionsWithValuesIndexedById);\n  return R.addIndex(R.reduce)(\n    (acc, dvi, i) => {\n      const dimension = R.nth(i, dimensions);\n      const dimensionId = R.prop('id', dimension);\n      const dimensionValue = R.nth(dvi, R.propOr([], 'values', dimension || {}));\n      if (dimensionId !== chartDimensionId && R.includes(dimensionId, dimensionsWithValuesIds)) {\n        return R.assoc(\n          dimensionId,\n          { ...dimensionValue, name: dimensionValueDisplay(display)(dimensionValue) },\n          acc\n        );\n      }\n      return acc;\n    },\n    {},\n    dimensionValuesIndexes,\n  );\n};\n\nfunction getDimensionValueKey(chartDimension, dimensionValue) {\n  return R.prop('xId', chartDimension,) === R.prop('id', dimensionValue) ? 'x' : 'y';\n};\n\nfunction datapoints(observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) {\n  const chartDimensionId = R.prop('id', chartDimension);\n  const chartDimensionIndex = R.findIndex(R.propEq(chartDimensionId, 'id'), dimensions);\n  const datapoints = R.reduce(\n    (acc, k) => {\n      const o = R.prop(k, observations);\n      const oDimensionValuesIndexes = R.split(':', k);\n      const oDimensionValueIndex = oDimensionValuesIndexes[chartDimensionIndex];\n      const _chartDimension = R.nth(chartDimensionIndex, dimensions);\n      const oDimensionValue = R.nth(oDimensionValueIndex, R.propOr([], 'values', _chartDimension || {}));\n      if (dimensionValueIsValid(oDimensionValue, chartDimension)) {\n        const oPartialKey = R.pipe(\n          R.addIndex(R.reject)((_, i) => i === chartDimensionIndex),\n          R.join(':'),\n        )(oDimensionValuesIndexes);\n        \n        if (!R.has(oPartialKey, acc)) {\n          const dimensionValues = getDimensionValues(\n            oDimensionValuesIndexes, dimensions, dimensionsWithValuesIndexedById, chartDimensionId, display\n          );\n          acc[oPartialKey] = { dimensionValues };\n        }\n        const dimensionValueKey = getDimensionValueKey(chartDimension, oDimensionValue);\n        acc[oPartialKey][dimensionValueKey] = R.head(o);\n        acc[oPartialKey][`${dimensionValueKey}Format`] = getFormatedObservation(o, formaterAttrs);\n      }\n      return acc;\n    },\n    {},\n    R.keys(observations),\n  );\n  // it is possible to have null observations or incomplete datapoints (just an x or y)\n  return R.pipe(\n    R.filter(dp => ((!R.isNil(dp.x)) && (!R.isNil(dp.y)))),\n    R.values\n  )(datapoints);\n};\n\nconst series = (observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) => {\n  const values = R.pipe(R.prop(R.prop('id', chartDimension || {})), R.propOr([], 'values'))(dimensionsWithValuesIndexedById);\n  const xValue = R.find(R.propEq(R.prop('xId', chartDimension),'id'), values);\n  const yValue = R.find(R.propEq(R.prop('yId', chartDimension), 'id'), values);\n  return [{\n    dimensionValues: {\n      x: { ...xValue, name: dimensionValueDisplay(display)(xValue) },\n      y: { ...yValue, name: dimensionValueDisplay(display)(yValue) }\n    },\n    datapoints: datapoints(observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs)\n  }]\n};\n\nexport default ({ observations, dimensions }, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs) => (\n  series(observations, dimensions, dimensionsWithValuesIndexedById, chartDimension, display, formaterAttrs)\n);\n"],"names":[],"mappings":"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"}

package/dist/rules/src/factories/series.js

@@ -0,0 +1,48 @@
+import * as R from 'ramda';
+import sampleSeries from './sample-series.js';
+import scatterSeries from './scatter-series.js';
+import timelineSeries from './timeline-series.js';
+import symbolSeries from './symbol-series.js';
+import stackedSeries from './stacked-series.js';
+import choroSeries from './choro-series.js';
+import { getObservationsFormaterAttributes } from '../observation-formater.js';
+
+var getSeries = ({ type, data, options, singularity }) => {
+  const {
+    display,
+    formatterIds,
+    map,
+  } = options;
+
+  const { attributes = [] } = data;
+  const formaterAttributes = getObservationsFormaterAttributes(attributes, formatterIds);
+
+  const indexedDimensions = R.reduce((acc, dim) => {
+    if (dim.header) {
+      return acc;
+    }
+    return R.assoc(dim.id, dim, acc);
+  }, {}, data.dimensions || []);
+
+  switch(type) {
+    case 'BarChart': case 'RowChart':
+      return sampleSeries(type, data, indexedDimensions, display, formaterAttributes);
+    case 'ScatterChart':
+      return scatterSeries(data, indexedDimensions, singularity, display, formaterAttributes);
+    case 'TimelineChart':
+      return timelineSeries(data, indexedDimensions, display, formaterAttributes);
+    case 'HorizontalSymbolChart': case 'VerticalSymbolChart':
+      return symbolSeries(data, type, indexedDimensions, singularity, display, formaterAttributes);
+    case 'StackedBarChart':
+      return stackedSeries(data, indexedDimensions, singularity, display, formaterAttributes, ['y', 'x']);
+    case 'StackedRowChart':
+      return stackedSeries(data, indexedDimensions, singularity, display, formaterAttributes, ['x', 'y']);
+    case 'ChoroplethChart':
+      return choroSeries(data, indexedDimensions, map, display);
+    default:
+      return [];
+  }
+};
+
+export { getSeries as default };
+//# sourceMappingURL=series.js.map

package/dist/rules/src/factories/series.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"series.js","sources":["../../../../src/rules/src/factories/series.js"],"sourcesContent":["import * as R from 'ramda';\nimport sampleSeries from './sample-series';\nimport scatterSeries from './scatter-series';\nimport timelineSeries from './timeline-series';\nimport symbolSeries from './symbol-series';\nimport stackedSeries from './stacked-series';\nimport choroSeries from './choro-series';\nimport { getObservationsFormaterAttributes } from '../observation-formater';\n\nexport default ({ type, data, options, singularity }) => {\n  const {\n    display,\n    formatterIds,\n    map,\n  } = options;\n\n  const { attributes = [] } = data;\n  const formaterAttributes = getObservationsFormaterAttributes(attributes, formatterIds);\n\n  const indexedDimensions = R.reduce((acc, dim) => {\n    if (dim.header) {\n      return acc;\n    }\n    return R.assoc(dim.id, dim, acc);\n  }, {}, data.dimensions || []);\n\n  switch(type) {\n    case 'BarChart': case 'RowChart':\n      return sampleSeries(type, data, indexedDimensions, display, formaterAttributes);\n    case 'ScatterChart':\n      return scatterSeries(data, indexedDimensions, singularity, display, formaterAttributes);\n    case 'TimelineChart':\n      return timelineSeries(data, indexedDimensions, display, formaterAttributes);\n    case 'HorizontalSymbolChart': case 'VerticalSymbolChart':\n      return symbolSeries(data, type, indexedDimensions, singularity, display, formaterAttributes);\n    case 'StackedBarChart':\n      return stackedSeries(data, indexedDimensions, singularity, display, formaterAttributes, ['y', 'x']);\n    case 'StackedRowChart':\n      return stackedSeries(data, indexedDimensions, singularity, display, formaterAttributes, ['x', 'y']);\n    case 'ChoroplethChart':\n      return choroSeries(data, indexedDimensions, map, display);\n    default:\n      return [];\n  }\n};\n"],"names":[],"mappings":";;;;;;;;;AASA,gBAAe,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,WAAW,EAAE,KAAK;AACzD,EAAE,MAAM;AACR,IAAI,OAAO;AACX,IAAI,YAAY;AAChB,IAAI,GAAG;AACP,GAAG,GAAG,OAAO;;AAEb,EAAE,MAAM,EAAE,UAAU,GAAG,EAAE,EAAE,GAAG,IAAI;AAClC,EAAE,MAAM,kBAAkB,GAAG,iCAAiC,CAAC,UAAU,EAAE,YAAY,CAAC;;AAExF,EAAE,MAAM,iBAAiB,GAAG,CAAC,CAAC,MAAM,CAAC,CAAC,GAAG,EAAE,GAAG,KAAK;AACnD,IAAI,IAAI,GAAG,CAAC,MAAM,EAAE;AACpB,MAAM,OAAO,GAAG;AAChB,IAAI;AACJ,IAAI,OAAO,CAAC,CAAC,KAAK,CAAC,GAAG,CAAC,EAAE,EAAE,GAAG,EAAE,GAAG,CAAC;AACpC,EAAE,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,UAAU,IAAI,EAAE,CAAC;;AAE/B,EAAE,OAAO,IAAI;AACb,IAAI,KAAK,UAAU,CAAC,CAAC,KAAK,UAAU;AACpC,MAAM,OAAO,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,kBAAkB,CAAC;AACrF,IAAI,KAAK,cAAc;AACvB,MAAM,OAAO,aAAa,CAAC,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,CAAC;AAC7F,IAAI,KAAK,eAAe;AACxB,MAAM,OAAO,cAAc,CAAC,IAAI,EAAE,iBAAiB,EAAE,OAAO,EAAE,kBAAkB,CAAC;AACjF,IAAI,KAAK,uBAAuB,CAAC,CAAC,KAAK,qBAAqB;AAC5D,MAAM,OAAO,YAAY,CAAC,IAAI,EAAE,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,CAAC;AAClG,IAAI,KAAK,iBAAiB;AAC1B,MAAM,OAAO,aAAa,CAAC,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACzG,IAAI,KAAK,iBAAiB;AAC1B,MAAM,OAAO,aAAa,CAAC,IAAI,EAAE,iBAAiB,EAAE,WAAW,EAAE,OAAO,EAAE,kBAAkB,EAAE,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC;AACzG,IAAI,KAAK,iBAAiB;AAC1B,MAAM,OAAO,WAAW,CAAC,IAAI,EAAE,iBAAiB,EAAE,GAAG,EAAE,OAAO,CAAC;AAC/D,IAAI;AACJ,MAAM,OAAO,EAAE;AACf;AACA,CAAC;;;;"}

package/dist/rules/src/factories/stacked-series.js

@@ -65,12 +65,11 @@ const serie = (
   [stackKey, categoryKey]
 ) => {
   const serieDimensionId = R.propOr(null, 'id', singularity);
-  const serieDimension = R.find(R.propEq('id', serieDimensionId), dimensions);
+  const serieDimension = R.find(R.propEq(serieDimensionId, 'id'), dimensions);
   if (R.isNil(serieDimension)) {
     return { datapoints: [], layerSeries: [] };
   }
   const _flatDatapoints = flatDatapoints(observations, dimensions, dimensionsWithValuesIndexedById, serieDimensionId, display, formaterAttrs, [stackKey, categoryKey]);
-
   const layeredDatapoints = R.groupBy(
     R.prop('layerKey'),
     _flatDatapoints
@@ -145,7 +144,7 @@ const percentSerie = (stackKey) => R.pipe(
       });
     })
   ),
-  R.of
+  res => R.of(Array, res)
 );
 
 const serieSortedByTotal = (stackKey) => R.pipe(
@@ -153,7 +152,7 @@ const serieSortedByTotal = (stackKey) => R.pipe(
     R.lensProp('datapoints'),
     R.sortBy(R.pipe(R.prop(stackKey), R.map(v => v > 0 ? R.negate(v) : 0), R.sum))
   ),
-  R.of
+  res => R.of(Array, res)
 );
 
 const serieSortedByDataOrder = R.pipe(
@@ -161,10 +160,10 @@ const serieSortedByDataOrder = R.pipe(
     R.lensProp('datapoints'),
     R.sortBy(R.prop('index'))
   ),
-  R.of
+  res => R.of(Array, res)
 );
 
-var __stackedSeries = (
+var stackedSeries = (
   { observations, dimensions },
   dimensionsWithValuesIndexedById,
   singularity,
@@ -184,5 +183,5 @@ var __stackedSeries = (
   return serieSortedByTotal(stackKey)(_serie);
 };
 
-export { __stackedSeries as default };
+export { stackedSeries as default };
 //# sourceMappingURL=stacked-series.js.map