ggaction 0.0.3 → 0.0.4

package/src/actions/marks/bar/edit.js

@@ -5,7 +5,7 @@ import {
   validateNonNegativeFinite,
   validateUnitInterval
 } from "../../../core/validation.js";
-import { canMaterializeBar } from "../../../materialization/marks.js";
+import { canMaterializeBar } from "../../../materialization/marks/index.js";
 import { DEFAULT_BAR_STROKE_WIDTH } from "../../../materialization/bars/resolve.js";
 import { resolveEligibleLayer } from "../../../selectors/layers.js";
 import { validateMarkOptions } from "../shared.js";

package/src/actions/marks/line/actions.js

@@ -1,6 +1,6 @@
 import { action } from "../../../core/action.js";
 import { deriveLineSeries } from "../../../grammar/lineSeries.js";
-import { mapContinuousScaleValues, mapOrdinalValues } from "../../../grammar/scales.js";
+import { mapContinuousScaleValues, mapOrdinalValues } from "../../../grammar/scales/index.js";
 import { validateUserId } from "../../../core/identifiers.js";
 import {
   validateNonEmptyString,
@@ -26,8 +26,8 @@ import {
 import { buildPolarLinePathCommands } from "../../../grammar/polarLineCommands.js";
 import { resolvePolarFrame } from "../../../grammar/polar.js";
 import { resolveGraphicBounds } from "../../../layout/canvas.js";
-import { normalizeStrokeDashPattern } from "../../../grammar/scales.js";
-import { canMaterializeLine } from "../../../materialization/marks.js";
+import { normalizeStrokeDashPattern } from "../../../grammar/scales/index.js";
+import { canMaterializeLine } from "../../../materialization/marks/index.js";
 import { resolveMarkGraphicPlacement } from
   "../../../materialization/graphicHierarchy.js";
 import { rematerializeHighlightBaseline } from "../lifecycle.js";

package/src/actions/marks/rect/actions.js

@@ -6,7 +6,7 @@ import {
 } from "../../../materialization/rectConfig.js";
 import {
   canMaterializeRect
-} from "../../../materialization/marks.js";
+} from "../../../materialization/marks/index.js";
 import { resolveRectGraphicItems } from "../../../materialization/rect.js";
 import { findDataset } from "../../../selectors/datasets.js";
 import { findLayer, resolveEligibleLayer } from "../../../selectors/layers.js";

package/src/actions/marks/rule/actions.js

@@ -6,7 +6,7 @@ import {
   mapOrdinalPositionValues,
   mapOrdinalValues,
   normalizeStrokeDashPattern
-} from "../../../grammar/scales.js";
+} from "../../../grammar/scales/index.js";
 import { deriveRuleValues, resolveRuleMode } from "../../../grammar/rules.js";
 import { resolveGraphicBounds } from "../../../layout/canvas.js";
 import { findDataset } from "../../../selectors/datasets.js";

package/src/actions/marks/shared.js

@@ -6,7 +6,7 @@ import { findDataset } from "../../selectors/datasets.js";
 import { findLayer, hasLayer } from "../../selectors/layers.js";
 import { findSemanticScale } from "../../selectors/scales.js";
 import { resolveMarkPositionPolicy } from "../encodings/position/policies/index.js";
-import { getMarkMaterializationStep } from "../../materialization/marks.js";
+import { getMarkMaterializationStep } from "../../materialization/marks/index.js";
 import {
   POLAR_POSITION_CHANNELS,
   CARTESIAN_POSITION_CHANNELS,

package/src/actions/marks/text/actions.js

@@ -4,7 +4,7 @@ import {
   DEFAULT_TEXT_MARK,
   normalizeTextMarkConfig
 } from "../../../grammar/text.js";
-import { canMaterializeText } from "../../../materialization/marks.js";
+import { canMaterializeText } from "../../../materialization/marks/index.js";
 import { resolveTextGraphicItems } from "../../../materialization/text.js";
 import { findLayer, resolveEligibleLayer } from "../../../selectors/layers.js";
 import {

package/src/actions/primitives/semanticValue.js

@@ -22,7 +22,7 @@ import {
   validateSemanticScaleDomain,
   validateSemanticScaleRange,
   validateSemanticScaleType
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 
 function nonEmptyString(value, label) {
   if (typeof value !== "string" || value.length === 0) {

package/src/actions/regression/components.js

@@ -7,7 +7,7 @@ import { resolveEligibleLayer } from "../../selectors/layers.js";
 import {
   REGRESSION_LOWER_FIELD,
   REGRESSION_UPPER_FIELD
-} from "../../grammar/regression.js";
+} from "../../grammar/regression/index.js";
 import { validateAreaCreateOutline } from "../marks/area/index.js";
 
 const BAND_OPTIONS = Object.freeze([

package/src/actions/regression/create.js

@@ -1,6 +1,6 @@
 import { action } from "../../core/action.js";
 import { validateKeys } from "../../core/validation.js";
-import { normalizeRegressionParameters } from "../../grammar/regression.js";
+import { normalizeRegressionParameters } from "../../grammar/regression/index.js";
 import {
   findRegressionPoint,
   inferRegressionGroup,

package/src/actions/regression/edit.js

@@ -7,7 +7,7 @@ import {
   validateNonNegativeFinite,
   validateUnitInterval
 } from "../../core/validation.js";
-import { normalizeRegressionParameters } from "../../grammar/regression.js";
+import { normalizeRegressionParameters } from "../../grammar/regression/index.js";
 import { validateCurveInterpolation } from "../../grammar/curveCommands.js";
 import { hasDataset } from "../../selectors/index.js";
 import { findLayer } from "../../selectors/layers.js";

package/src/actions/scales/consumers/common.js

@@ -0,0 +1,91 @@
+import {
+  readNominalField,
+  readQuantitativeField,
+  readScaleField,
+  readTemporalField
+} from "../../../grammar/scales/index.js";
+import { findDataset } from "../../../selectors/datasets.js";
+import { requireSemanticScale } from "../../../selectors/scales.js";
+import { SCALED_ENCODING_CHANNELS } from "../../../core/vocabulary.js";
+
+export function findScale(program, id) {
+  return requireSemanticScale(program, id);
+}
+
+export function findScaleConsumers(program, id) {
+  const consumers = [];
+  for (const layer of program.semanticSpec.layers) {
+    for (const channel of SCALED_ENCODING_CHANNELS) {
+      const encoding = layer.encoding?.[channel];
+      if (encoding?.scale === id) consumers.push({ layer, channel, encoding });
+    }
+  }
+  return consumers;
+}
+
+export function requireConsumerDataset(program, consumer) {
+  const dataset = findDataset(program, consumer.layer.data);
+  if (dataset === undefined) {
+    throw new Error(
+      `Mark "${consumer.layer.id}" references unknown dataset "${consumer.layer.data}".`
+    );
+  }
+  return dataset;
+}
+
+export function isDirectCategoricalConsumer(consumer) {
+  return ["color", "strokeDash", "xOffset", "yOffset", "shape"].includes(
+    consumer.channel
+  ) && consumer.encoding.fieldType === "nominal";
+}
+
+export function readConsumerFieldValues(
+  program,
+  consumer,
+  dataset,
+  scale = findScale(program, consumer.encoding.scale)
+) {
+  const allowUnknown = Object.hasOwn(scale, "unknown");
+  if (isDirectCategoricalConsumer(consumer)) {
+    return allowUnknown
+      ? readScaleField(
+          dataset.values,
+          consumer.encoding.field,
+          consumer.encoding.fieldType,
+          { allowUnknown: true }
+        )
+      : readNominalField(dataset.values, consumer.encoding.field);
+  }
+  if (consumer.encoding.fieldType === "temporal") {
+    return allowUnknown
+      ? readScaleField(dataset.values, consumer.encoding.field, "temporal", {
+          allowUnknown: true
+        })
+      : readTemporalField(dataset.values, consumer.encoding.field);
+  }
+  if (["nominal", "ordinal"].includes(consumer.encoding.fieldType)) {
+    if (!["ordinal", "band", "point"].includes(scale.type)) {
+      throw new Error(
+        `Scale materialization requires a quantitative encoding on mark "${consumer.layer.id}".`
+      );
+    }
+    return allowUnknown
+      ? readScaleField(
+          dataset.values,
+          consumer.encoding.field,
+          consumer.encoding.fieldType,
+          { allowUnknown: true }
+        )
+      : readNominalField(dataset.values, consumer.encoding.field);
+  }
+  if (consumer.encoding.fieldType !== "quantitative") {
+    throw new Error(
+      `Scale materialization requires a quantitative encoding on mark "${consumer.layer.id}".`
+    );
+  }
+  return allowUnknown
+    ? readScaleField(dataset.values, consumer.encoding.field, "quantitative", {
+        allowUnknown: true
+      })
+    : readQuantitativeField(dataset.values, consumer.encoding.field);
+}

package/src/actions/scales/consumers/families.js

@@ -0,0 +1,47 @@
+import { deriveBarAggregates } from "../../../grammar/bars/aggregate.js";
+import {
+  BAR_GRAINS,
+  resolveBarGrain
+} from "../../../grammar/bars/policy.js";
+import { deriveLineSeries } from "../../../grammar/lineSeries.js";
+import { isAggregate } from "../../../grammar/aggregate.js";
+import {
+  resolveRectConsumerValues
+} from "../../../materialization/rect.js";
+
+export function resolveMarkFamilyConsumerValues(consumer, dataset) {
+  if (consumer.layer.mark?.type === "rect") {
+    return {
+      matched: true,
+      values: resolveRectConsumerValues(
+        consumer.layer,
+        dataset,
+        consumer.channel
+      )
+    };
+  }
+  if (
+    consumer.layer.mark?.type === "line" &&
+    isAggregate(consumer.layer.encoding?.y?.aggregate)
+  ) {
+    const derived = deriveLineSeries(dataset.values, consumer.layer);
+    return {
+      matched: true,
+      values: consumer.channel === "x" ? derived.xValues : derived.yValues
+    };
+  }
+  if (resolveBarGrain(consumer.layer) === BAR_GRAINS.aggregate) {
+    const derived = deriveBarAggregates(dataset.values, consumer.layer);
+    if (consumer.channel === "color") {
+      return {
+        matched: true,
+        values: derived.values.map(value => value.color)
+      };
+    }
+    return {
+      matched: true,
+      values: consumer.channel === "x" ? derived.xValues : derived.yValues
+    };
+  }
+  return { matched: false };
+}

package/src/actions/scales/consumers/index.js

@@ -0,0 +1,41 @@
+import { normalizeRuleDatum } from "../../../grammar/rules.js";
+import {
+  findScale,
+  isDirectCategoricalConsumer,
+  readConsumerFieldValues,
+  requireConsumerDataset
+} from "./common.js";
+import { resolveMarkFamilyConsumerValues } from "./families.js";
+
+export { findScale, findScaleConsumers } from "./common.js";
+export {
+  resolveHistogramCountValues,
+  resolveSeriesLayoutScaleValues
+} from "./seriesLayout.js";
+
+export function resolveConsumerValues(program, consumer) {
+  const dataset = requireConsumerDataset(program, consumer);
+  if (Object.hasOwn(consumer.encoding, "datum")) {
+    return [normalizeRuleDatum(
+      consumer.encoding.datum,
+      consumer.encoding.fieldType,
+      consumer.channel
+    )];
+  }
+  if (
+    consumer.channel === "strokeDash" &&
+    !["line", "rule"].includes(consumer.layer.mark?.type)
+  ) {
+    throw new Error(
+      "strokeDash scale materialization requires a line mark or rule mark."
+    );
+  }
+  const scale = findScale(program, consumer.encoding.scale);
+  if (isDirectCategoricalConsumer(consumer)) {
+    return readConsumerFieldValues(program, consumer, dataset, scale);
+  }
+  const family = resolveMarkFamilyConsumerValues(consumer, dataset);
+  return family.matched
+    ? family.values
+    : readConsumerFieldValues(program, consumer, dataset, scale);
+}

package/src/actions/scales/{consumers.js → consumers/seriesLayout.js}

@@ -1,144 +1,26 @@
-import { deriveBarAggregates } from "../../grammar/bars/aggregate.js";
+import { deriveBarAggregates } from "../../../grammar/bars/aggregate.js";
 import {
   BAR_GRAINS,
   resolveBarChannels,
   resolveBarColorLayout,
   resolveBarGrain
-} from "../../grammar/bars/policy.js";
+} from "../../../grammar/bars/policy.js";
 import {
   countHistogramBins,
   findHistogramBinIndex,
   resolveHistogramBins
-} from "../../grammar/histogram.js";
-import { deriveDensityAreaSeries } from "../../grammar/areaSeries.js";
-import { deriveLineSeries } from "../../grammar/lineSeries.js";
-import { resolveSeriesLayoutDomainValues } from "../../grammar/seriesLayout.js";
+} from "../../../grammar/histogram.js";
+import { deriveDensityAreaSeries } from "../../../grammar/areaSeries.js";
+import {
+  resolveSeriesLayoutDomainValues
+} from "../../../grammar/seriesLayout.js";
 import {
   readNominalField,
   readQuantitativeField,
-  readScaleField,
-  readTemporalField,
   resolveOrdinalDomain
-} from "../../grammar/scales.js";
-import { findDataset } from "../../selectors/datasets.js";
-import { requireSemanticScale } from "../../selectors/scales.js";
-import { isAggregate } from "../../grammar/aggregate.js";
-import { normalizeRuleDatum } from "../../grammar/rules.js";
-import { SCALED_ENCODING_CHANNELS } from "../../core/vocabulary.js";
-import { resolveRectConsumerValues } from "../../materialization/rect.js";
-
-export function findScale(program, id) {
-  return requireSemanticScale(program, id);
-}
-
-export function findScaleConsumers(program, id) {
-  const consumers = [];
-  for (const layer of program.semanticSpec.layers) {
-    for (const channel of SCALED_ENCODING_CHANNELS) {
-      const encoding = layer.encoding?.[channel];
-      if (encoding?.scale === id) consumers.push({ layer, channel, encoding });
-    }
-  }
-  return consumers;
-}
-
-export function resolveConsumerValues(program, consumer) {
-  const dataset = findDataset(program, consumer.layer.data);
-  if (dataset === undefined) {
-    throw new Error(
-      `Mark "${consumer.layer.id}" references unknown dataset "${consumer.layer.data}".`
-    );
-  }
-
-  if (Object.hasOwn(consumer.encoding, "datum")) {
-    return [normalizeRuleDatum(
-      consumer.encoding.datum,
-      consumer.encoding.fieldType,
-      consumer.channel
-    )];
-  }
-
-  if (
-    consumer.channel === "strokeDash" &&
-    !["line", "rule"].includes(consumer.layer.mark?.type)
-  ) {
-    throw new Error("strokeDash scale materialization requires a line mark or rule mark.");
-  }
-  const scale = findScale(program, consumer.encoding.scale);
-  const allowUnknown = Object.hasOwn(scale, "unknown");
-  if (consumer.layer.mark?.type === "rect") {
-    return resolveRectConsumerValues(
-      consumer.layer,
-      dataset,
-      consumer.channel
-    );
-  }
-
-  if (
-    ["color", "strokeDash", "xOffset", "yOffset", "shape"].includes(consumer.channel) &&
-    consumer.encoding.fieldType === "nominal"
-  ) {
-    return allowUnknown
-      ? readScaleField(
-          dataset.values,
-          consumer.encoding.field,
-          consumer.encoding.fieldType,
-          { allowUnknown: true }
-        )
-      : readNominalField(dataset.values, consumer.encoding.field);
-  }
-
-  if (
-    consumer.layer.mark?.type === "line" &&
-    isAggregate(consumer.layer.encoding?.y?.aggregate)
-  ) {
-    const derived = deriveLineSeries(dataset.values, consumer.layer);
-    return consumer.channel === "x" ? derived.xValues : derived.yValues;
-  }
-
-  if (
-    resolveBarGrain(consumer.layer) === BAR_GRAINS.aggregate
-  ) {
-    const derived = deriveBarAggregates(dataset.values, consumer.layer);
-    if (consumer.channel === "color") {
-      return derived.values.map(value => value.color);
-    }
-    return consumer.channel === "x" ? derived.xValues : derived.yValues;
-  }
-
-  if (consumer.encoding.fieldType === "temporal") {
-    return allowUnknown
-      ? readScaleField(dataset.values, consumer.encoding.field, "temporal", {
-          allowUnknown: true
-        })
-      : readTemporalField(dataset.values, consumer.encoding.field);
-  }
-  if (["nominal", "ordinal"].includes(consumer.encoding.fieldType)) {
-    if (!["ordinal", "band", "point"].includes(scale.type)) {
-      throw new Error(
-        `Scale materialization requires a quantitative encoding on mark "${consumer.layer.id}".`
-      );
-    }
-    return allowUnknown
-      ? readScaleField(
-          dataset.values,
-          consumer.encoding.field,
-          consumer.encoding.fieldType,
-          { allowUnknown: true }
-        )
-      : readNominalField(dataset.values, consumer.encoding.field);
-  }
-  if (consumer.encoding.fieldType !== "quantitative") {
-    throw new Error(
-      `Scale materialization requires a quantitative encoding on mark "${consumer.layer.id}".`
-    );
-  }
-  return allowUnknown
-    ? readScaleField(dataset.values, consumer.encoding.field, "quantitative", {
-        allowUnknown: true
-      })
-    : readQuantitativeField(dataset.values, consumer.encoding.field);
-}
+} from "../../../grammar/scales/index.js";
+import { findDataset } from "../../../selectors/datasets.js";
+import { findScale } from "./common.js";
 
 export function resolveHistogramCountValues(program, consumer) {
   const xEncoding = consumer.layer.encoding?.x;
@@ -146,7 +28,6 @@ export function resolveHistogramCountValues(program, consumer) {
     ? undefined
     : findScale(program, xEncoding.scale);
   const dataset = findDataset(program, consumer.layer.data);
-
   if (xEncoding?.bin === undefined || xScale === undefined) {
     throw new Error(
       `Histogram mark "${consumer.layer.id}" requires a binned x scale.`
@@ -157,7 +38,6 @@ export function resolveHistogramCountValues(program, consumer) {
       `Histogram mark "${consumer.layer.id}" requires an existing dataset.`
     );
   }
-
   const xValues = readQuantitativeField(dataset.values, xEncoding.field);
   const bins = resolveHistogramBins({
     values: xValues,
@@ -186,7 +66,6 @@ function resolveHistogramPartitions(program, consumer) {
   if (colorEncoding?.scale === undefined) {
     return countHistogramBins(xValues, bins.boundaries).map(value => [value]);
   }
-
   const colorScale = findScale(program, colorEncoding.scale);
   const colorValues = readNominalField(dataset.values, colorEncoding.field);
   const colorDomain = resolveOrdinalDomain(colorScale.domain, colorValues);
@@ -224,7 +103,6 @@ function resolveAggregatePartitions(program, consumer) {
     ]));
     return categoryDomain.map(value => [byCategory.get(value) ?? 0]);
   }
-
   const colorScale = findScale(program, colorEncoding.scale);
   const colorValues = readNominalField(dataset.values, colorEncoding.field);
   const colorDomain = resolveOrdinalDomain(colorScale.domain, colorValues);

package/src/actions/scales/create.js

@@ -15,7 +15,7 @@ import {
   isContinuousColorScaleType,
   isDiscretizedColorScaleType,
   normalizeScaleDefinition
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 import { findSemanticScale } from "../../selectors/scales.js";
 
 const CREATE_SCALE_OPTIONS = Object.freeze([

package/src/actions/scales/definitions.js

@@ -22,12 +22,12 @@ import {
   validateScalePropertyForType,
   validateScaleTypeForRole,
   isDiscretePositionScaleType
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 import {
   validateRadialRange,
   validateThetaRange
 } from "../../grammar/polar.js";
-import { withScaleUnknown } from "../../grammar/scales.js";
+import { withScaleUnknown } from "../../grammar/scales/index.js";
 import { findSemanticScale } from "../../selectors/scales.js";
 
 const BASE_OPTIONS = Object.freeze(["id", "type", "domain", "range"]);

package/src/actions/scales/edit.js

@@ -21,12 +21,12 @@ import {
   isDiscretePositionScaleType,
   hasOrdinalDomain,
   normalizeScaleDefinition
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 import {
   validateRadialRange,
   validateThetaRange
 } from "../../grammar/polar.js";
-import { getMarkMaterializationStep } from "../../materialization/marks.js";
+import { getMarkMaterializationStep } from "../../materialization/marks/index.js";
 import {
   applyMaterializationPlan
 } from "../../materialization/dependencies.js";
@@ -34,7 +34,7 @@ import {
   findSemanticScale,
   requireSemanticScale
 } from "../../selectors/scales.js";
-import { findScaleConsumers } from "./consumers.js";
+import { findScaleConsumers } from "./consumers/index.js";
 import { normalizePositionScaleChannel } from "../../core/vocabulary.js";
 
 const OPTIONS = Object.freeze([

package/src/actions/scales/materialize.js

@@ -11,7 +11,7 @@ import {
   canDeferScaleConsumerApplication,
   getMarkRematerializationStep,
   getScaleConsumerMaterializationMode
-} from "../../materialization/marks.js";
+} from "../../materialization/marks/index.js";
 import { mapScaleConsumerValues } from
   "../../materialization/scales/map.js";
 import { resolveScaleMaterialization } from
@@ -21,7 +21,7 @@ import {
   findScaleConsumers,
   resolveConsumerValues,
   resolveSeriesLayoutScaleValues
-} from "./consumers.js";
+} from "./consumers/index.js";
 
 const OPTIONS = Object.freeze(["id", "guides", "marks"]);