ggaction 0.0.3 → 0.0.4

package/src/actions/encodings/color/layout.js

@@ -0,0 +1,91 @@
+import {
+  BAR_GRAINS,
+  resolveBarChannels,
+  resolveBarGrain,
+  resolveBarOffsetChannel
+} from "../../../grammar/bars/policy.js";
+import { resolveOffsetScaleDefinition } from "../../scales/definitions.js";
+import { isRangedArea } from "./policy.js";
+
+export function applyColorLayoutCompanion(
+  program,
+  { target, layer, layout, scale, field }
+) {
+  if (layout === undefined || layer.mark.type === "arc") return program;
+  if (
+    layer.mark.type === "bar" &&
+    resolveBarGrain(layer) === BAR_GRAINS.ranged
+  ) {
+    return program;
+  }
+  if (isRangedArea(layer)) return program;
+  const channels = layer.mark.type === "bar"
+    ? resolveBarChannels(layer)
+    : undefined;
+  const measureChannel = channels?.measure ?? "y";
+  const measure = layer.encoding?.[measureChannel];
+  if (measure?.field === undefined || measure.scale === undefined) {
+    throw new Error(`Color layout on mark "${target}" requires a measure encoding.`);
+  }
+  const stack = layout === "fill"
+    ? "normalize"
+    : layout === "overlay" || layout === "group"
+      ? null
+      : "zero";
+  let next = program;
+  if (layout === "group") {
+    const offsetChannel = resolveBarOffsetChannel(layer);
+    const method = offsetChannel === "xOffset" ? "encodeXOffset" : "encodeYOffset";
+    next = next[method]({
+      field,
+      target,
+      scale: {
+        ...(layer.encoding?.[offsetChannel]?.scale === undefined
+          ? {}
+          : { id: layer.encoding[offsetChannel].scale }),
+        domain: scale.domain
+      }
+    });
+  }
+  return next[measureChannel === "x" ? "encodeX" : "encodeY"]({
+    target,
+    field: measure.field,
+    fieldType: measure.fieldType,
+    ...(measure.aggregate === undefined ? {} : { aggregate: measure.aggregate }),
+    stack
+  });
+}
+
+export function preSynchronizeGroupedOffset(
+  program,
+  { target, layer, layout, field, fieldType, scale, requestedScale }
+) {
+  if (
+    layer.mark.type !== "bar" ||
+    layout !== "group" ||
+    layer.encoding?.color?.scale !== scale.id ||
+    !Object.keys(requestedScale).some(key => key !== "id")
+  ) {
+    return program;
+  }
+  const offsetChannel = resolveBarOffsetChannel(layer);
+  const offset = layer.encoding?.[offsetChannel];
+  if (offset?.scale === undefined) return program;
+  const offsetScale = resolveOffsetScaleDefinition(program, {
+    id: offset.scale,
+    domain: scale.domain
+  }, offsetChannel);
+  return program
+    .editSemantic({
+      property: `layer[${target}].encoding.${offsetChannel}.field`,
+      value: field
+    })
+    .editSemantic({
+      property: `layer[${target}].encoding.${offsetChannel}.fieldType`,
+      value: fieldType
+    })
+    .editSemantic({
+      property: `scale[${offsetScale.id}].domain`,
+      value: offsetScale.domain
+    });
+}

package/src/actions/encodings/color/policy.js

@@ -0,0 +1,88 @@
+import {
+  BAR_GRAINS,
+  inferBarColorLayout
+} from "../../../grammar/bars/policy.js";
+import { validateColorLayout } from "../../../grammar/seriesLayout.js";
+
+export const COLOR_ENCODING_OPTIONS = Object.freeze([
+  "field", "target", "fieldType", "scale", "palette", "layout", "aggregate"
+]);
+
+export function resolveColorScaleOptions(args) {
+  const options = args.scale ?? {};
+  if (args.palette === undefined) return options;
+  if (options.palette !== undefined || options.range !== undefined) {
+    throw new Error(
+      "encodeColor palette cannot be combined with scale.palette or scale.range."
+    );
+  }
+  return { ...options, palette: args.palette };
+}
+
+export function assertNoConstantColor(program, layer) {
+  const config = program.markConfigs[layer.id];
+  const hasConstant = {
+    point: config?.fill !== undefined,
+    line: config?.stroke !== undefined,
+    bar: config?.barAppearance?.fill !== undefined,
+    arc: config?.fill !== undefined,
+    rect: config?.fillExplicit === true
+  }[layer.mark.type] ?? false;
+  if (hasConstant) {
+    throw new Error(
+      `encodeColor cannot replace constant appearance on ${layer.mark.type} mark "${layer.id}".`
+    );
+  }
+}
+
+export function isRangedArea(layer) {
+  return layer.mark.type === "area" && (
+    layer.encoding?.x2 !== undefined ||
+    layer.encoding?.y2 !== undefined
+  );
+}
+
+export function resolveColorLayout(layer, requested, barGrain) {
+  const existing = layer.encoding?.color === undefined
+    ? undefined
+    : layer.encoding.color.layout ?? (
+        layer.mark.type === "bar"
+          ? inferBarColorLayout(layer)
+          : layer.mark.type === "area"
+            ? "overlay"
+            : undefined
+      );
+  if (requested !== undefined) validateColorLayout(requested);
+  if (existing !== undefined && requested !== undefined && requested !== existing) {
+    throw new Error(
+      `Color layout transition from "${existing}" to "${requested}" is not supported.`
+    );
+  }
+  const layout = requested ?? existing ?? (
+    layer.mark.type === "bar"
+      ? barGrain === BAR_GRAINS.histogram
+        ? "stack"
+        : barGrain === BAR_GRAINS.ranged ? "overlay" : "group"
+      : layer.mark.type === "area"
+        ? "overlay"
+        : undefined
+  );
+
+  if (["point", "line", "rect"].includes(layer.mark.type) && layout !== undefined) {
+    throw new Error(`Color layout is not supported for ${layer.mark.type} marks.`);
+  }
+  if (layer.mark.type === "area" && layout === "group") {
+    throw new Error('Area color layout does not support "group".');
+  }
+  if (
+    layer.mark.type === "arc" &&
+    layout !== undefined &&
+    layout !== "overlay"
+  ) {
+    throw new Error('Arc color layout currently supports only "overlay".');
+  }
+  if (isRangedArea(layer) && layout !== "overlay") {
+    throw new Error('Ranged area color encoding supports only "overlay" layout.');
+  }
+  return layout;
+}

package/src/actions/encodings/index.js

@@ -1,10 +1,10 @@
 import { registerAppearanceEncodingAction } from "./appearance.js";
 import { registerBarWidthEncodingAction } from "./barWidth.js";
-import { registerColorEncodingAction } from "./color.js";
+import { registerColorEncodingAction } from "./color/index.js";
 import { registerDensityEncodingAction } from "./density.js";
 import { registerHistogramEncodingAction } from "./histogram.js";
 import { registerOffsetEncodingAction } from "./offset.js";
-import { registerPositionEncodingActions } from "./position.js";
+import { registerPositionEncodingActions } from "./position/index.js";
 import { registerRangedEncodingActions } from "./ranged.js";
 import { registerStrokeDashEncodingActions } from "./strokeDash.js";
 import { registerRuleAppearanceEncodingActions } from "./ruleAppearance.js";

package/src/actions/encodings/offset.js

@@ -2,7 +2,7 @@ import { action } from "../../core/action.js";
 import {
   readNominalField,
   validateCategoricalFieldType
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 import { resolveOffsetScaleDefinition } from "../scales/definitions.js";
 import {
   applyEncodingScale,

package/src/actions/encodings/{position.js → position/index.js}

@@ -1,14 +1,14 @@
-import { action } from "../../core/action.js";
+import { action } from "../../../core/action.js";
 import {
   getPositionEncodingMaterializationSteps
-} from "../../materialization/marks.js";
-import { resolvePositionEncoding } from "./position/resolve.js";
-import { findLayer } from "../../selectors/layers.js";
-import { applyPositionSemantics } from "./position/apply.js";
+} from "../../../materialization/marks/index.js";
+import { resolvePositionEncoding } from "./resolve.js";
+import { findLayer } from "../../../selectors/layers.js";
+import { applyPositionSemantics } from "./apply.js";
 import {
   applyEncodingScale,
   rebindPositionGuides
-} from "./shared.js";
+} from "../shared.js";
 
 function encodePosition(program, channel, args, operation) {
   const {

package/src/actions/encodings/position/resolve.js

@@ -7,7 +7,7 @@ import {
   readTemporalField,
   validateFieldType,
   validatePositionChannel
-} from "../../../grammar/scales.js";
+} from "../../../grammar/scales/index.js";
 import { resolvePositionScaleDefinition } from "../../scales/definitions.js";
 import { findCoordinate } from "../../../selectors/coordinates.js";
 import {

package/src/actions/encodings/ranged.js

@@ -7,12 +7,12 @@ import {
   readScaleField,
   readTemporalField,
   validateSemanticFieldType
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 import { normalizeRuleDatum } from "../../grammar/rules.js";
 import {
   canMaterializeArea,
   canMaterializeLine
-} from "../../materialization/marks.js";
+} from "../../materialization/marks/index.js";
 import { findLayer } from "../../selectors/layers.js";
 import {
   resolveTarget,

package/src/actions/encodings/strokeDash.js

@@ -3,7 +3,7 @@ import {
   normalizeStrokeDashPattern,
   readNominalField,
   validateNominalFieldType
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 import { resolveStrokeDashScaleDefinition } from "../scales/definitions.js";
 import { applyMaterializationPlan } from "../../materialization/dependencies.js";
 import { planEncodingRematerialization } from "../../materialization/encodings.js";

package/src/actions/encodings/text.js

@@ -1,6 +1,6 @@
 import { action } from "../../core/action.js";
 import { formatTextValue, validateTextFormat } from "../../grammar/text.js";
-import { canMaterializeText } from "../../materialization/marks.js";
+import { canMaterializeText } from "../../materialization/marks/index.js";
 import { findLayer } from "../../selectors/layers.js";
 import { resolveTarget, validateOptions } from "./shared.js";
 

package/src/actions/errorBands/options.js

@@ -6,7 +6,7 @@ import {
   validateUnitInterval
 } from "../../core/validation.js";
 import { validateCurveInterpolation } from "../../grammar/curveCommands.js";
-import { normalizeStrokeDashPattern } from "../../grammar/scales.js";
+import { normalizeStrokeDashPattern } from "../../grammar/scales/index.js";
 
 export const ERROR_BAND_BOUNDARY_OPTIONS = Object.freeze([
   "stroke", "strokeWidth", "strokeDash", "opacity", "curve"

package/src/actions/errorBars/options.js

@@ -5,7 +5,7 @@ import {
 import {
   normalizeStrokeDashPattern,
   validateOpacityValue
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 import {
   validateRuleStroke,
   validateRuleStrokeWidth

package/src/actions/facets/actions.js

@@ -6,7 +6,7 @@ import {
   validateOptionObject,
   validatePositiveFinite
 } from "../../core/validation.js";
-import { resolveFacetDefinition } from "../../grammar/facets.js";
+import { resolveFacetDefinition } from "../../grammar/facets/index.js";
 import { normalizeFacetScalePolicies } from
   "../../grammar/facets/scales.js";
 import { resolveFacetLayout } from "../../layout/facets.js";

package/src/actions/facets/derive.js

@@ -1,13 +1,13 @@
 import { freezeOwned } from "../../core/immutable.js";
 import { resolveHistogramBins } from "../../grammar/histogram.js";
-import { readQuantitativeField } from "../../grammar/scales.js";
+import { readQuantitativeField } from "../../grammar/scales/index.js";
 import { BAR_GRAINS, resolveBarGrain } from "../../grammar/bars/policy.js";
 import { resolveFacetScaleDomains } from "../../grammar/facets/scales.js";
 import {
   applyMaterializationPlan,
   planScaleGuideRematerialization
 } from "../../materialization/dependencies.js";
-import { getMarkMaterializationStep } from "../../materialization/marks.js";
+import { getMarkMaterializationStep } from "../../materialization/marks/index.js";
 import { buildMaterializationPlan } from "../../materialization/planner.js";
 import { requireDataset } from "../../selectors/datasets.js";
 import { requireLayer } from "../../selectors/layers.js";

package/src/actions/facets/guides.js

@@ -1,7 +1,7 @@
 import { action } from "../../core/action.js";
 import { validateKeys } from "../../core/validation.js";
 import { applyFacetGuideComposition } from
-  "../../materialization/facetGuides.js";
+  "../../materialization/facetGuides/index.js";
 
 export const composeFacetGuides = action(
   {

package/src/actions/guides/axes/labels.js

@@ -13,7 +13,7 @@ import {
   mapContinuousScaleValues,
   formatTransformedTick,
   mapOrdinalPositionValues
-} from "../../../grammar/scales.js";
+} from "../../../grammar/scales/index.js";
 import { formatTimeTick, formatTimeTicks } from "../../../grammar/ticks.js";
 import { valuesFromTickConfig } from "../tickValues.js";
 import { DEFAULT_COLORS, DEFAULT_FONT_FAMILY } from

package/src/actions/guides/axes/ticks.js

@@ -10,7 +10,7 @@ import {
   isTransformedScaleType,
   mapContinuousScaleValues,
   mapOrdinalPositionValues
-} from "../../../grammar/scales.js";
+} from "../../../grammar/scales/index.js";
 import {
   DEFAULT_TICK_COUNT,
   inferHistogramBoundaries,

package/src/actions/guides/axes/titles.js

@@ -11,7 +11,7 @@ import {
   isTransformedScaleType,
   mapContinuousScaleValues,
   mapOrdinalPositionValues
-} from "../../../grammar/scales.js";
+} from "../../../grammar/scales/index.js";
 import { DEFAULT_COLORS, DEFAULT_FONT_FAMILY } from
   "../../../theme/defaults.js";
 import { findDataset } from "../../../selectors/datasets.js";

package/src/actions/guides/grids/resolve.js

@@ -7,7 +7,7 @@ import {
 import {
   isTransformedScaleType,
   mapContinuousScaleValues
-} from "../../../grammar/scales.js";
+} from "../../../grammar/scales/index.js";
 import { resolveGraphicBounds } from "../../../layout/canvas.js";
 import { resolveGridLineGeometry } from "../../../layout/grid.js";
 import { DEFAULT_COLORS } from "../../../theme/defaults.js";

package/src/actions/guides/legends/categorical/layout.js

@@ -1,6 +1,6 @@
 import { isPlainObject } from "../../../../core/immutable.js";
 import { noOptions } from "../../../../core/validation.js";
-import { mapOrdinalValues } from "../../../../grammar/scales.js";
+import { mapOrdinalValues } from "../../../../grammar/scales/index.js";
 import { resolveGraphicBounds } from "../../../../layout/canvas.js";
 import { unionConcreteGraphicBounds } from "../../../../grammar/schemas/graphicBounds.js";
 import { DEFAULT_COLORS } from "../../../../theme/defaults.js";
@@ -382,7 +382,9 @@ export function resolveLayout(program, config) {
   const count = config.domain.length;
   const width = symbolWidth(config);
   if (config.position === "right") {
-    const symbolX = Array(count).fill(bounds.x + bounds.width + 30);
+    const symbolX = Array(count).fill(
+      bounds.x + bounds.width + config.offset
+    );
     const itemY = Array.from(
       { length: count },
       (_, index) => bounds.y + 52 + index * config.itemGap

package/src/actions/guides/legends/continuous/interval.js

@@ -4,7 +4,7 @@ import {
   validateKeys,
   validateOptionObject
 } from "../../../../core/validation.js";
-import { formatDiscretizedIntervals } from "../../../../grammar/scales.js";
+import { formatDiscretizedIntervals } from "../../../../grammar/scales/index.js";
 import { DEFAULT_COLORS, DEFAULT_FONT_FAMILY } from
   "../../../../theme/defaults.js";
 import {

package/src/actions/guides/legends/continuous/opacity.js

@@ -1,7 +1,7 @@
 import { action } from "../../../../core/action.js";
 import { isPlainObject } from "../../../../core/immutable.js";
 import { validateKeys } from "../../../../core/validation.js";
-import { mapLinearValues } from "../../../../grammar/scales.js";
+import { mapLinearValues } from "../../../../grammar/scales/index.js";
 import { DEFAULT_COLORS } from "../../../../theme/defaults.js";
 import {
   assertLegendInsideCanvas,

package/src/actions/guides/legends/edit.js

@@ -1,5 +1,4 @@
 import { action } from "../../../core/action.js";
-import { validateUserId } from "../../../core/identifiers.js";
 import { validateOptionObject } from "../../../core/validation.js";
 import { normalizeOptions } from "./categorical/options.js";
 import { symbolGraphic } from "./categorical/layout.js";
@@ -12,6 +11,7 @@ import { normalizeIntervalLegend } from "./continuous/interval.js";
 import { findLayer } from "../../../selectors/layers.js";
 import { resolveLegendGraphicPlacement } from
   "../../../materialization/graphicHierarchy.js";
+import { resolveLegendTarget } from "./target.js";
 
 const OPTIONS = Object.freeze([
   "target", "position", "align", "direction", "columns", "offset",
@@ -31,24 +31,6 @@ function mergeBorder(previous, patch) {
   return previous === false ? patch : { ...previous, ...patch };
 }
 
-function resolveTarget(program, requested) {
-  const configs = program.guideConfigs.legend ?? {};
-  const targets = [...new Set(Object.values(configs)
-    .map(config => config?.target)
-    .filter(Boolean))];
-  if (requested !== undefined) {
-    const target = validateUserId(requested, "Legend target id");
-    if (!targets.includes(target)) {
-      throw new Error(`Unknown legend target "${target}".`);
-    }
-    return target;
-  }
-  if (targets.length !== 1) {
-    throw new Error("editLegend requires target when the legend is ambiguous.");
-  }
-  return targets[0];
-}
-
 function reconcileGraphic(program, id, shouldExist, definition) {
   const exists = program.graphicSpec.objects[id] !== undefined;
   if (exists && !shouldExist) return program.editGraphics({ target: id, remove: true });
@@ -285,7 +267,7 @@ export const editLegend = action(
     )) {
       throw new TypeError('editLegend title must be a non-empty string, "auto", or false.');
     }
-    const target = resolveTarget(this, args.target);
+    const target = resolveLegendTarget(this, args.target, "editLegend");
     const configs = this.guideConfigs.legend ?? {};
     const categoricalKind = ["series", "color"].find(
       kind => configs[kind]?.target === target

package/src/actions/guides/legends/remove.js

@@ -1,29 +1,11 @@
 import { action } from "../../../core/action.js";
-import { validateUserId } from "../../../core/identifiers.js";
 import { validateKeys } from "../../../core/validation.js";
 import { legendGraphicIds } from
   "../../../materialization/guides/resources.js";
+import { resolveLegendTarget } from "./target.js";
 
 const OPTIONS = Object.freeze(["target"]);
 
-function resolveTarget(program, requested) {
-  const targets = [...new Set(Object.values(program.guideConfigs.legend ?? {})
-    .map(config => config?.target)
-    .filter(Boolean))];
-  if (requested !== undefined) {
-    const target = validateUserId(requested, "Legend target id");
-    if (!targets.includes(target)) {
-      throw new Error(`Unknown legend target "${target}".`);
-    }
-    return target;
-  }
-  if (targets.length === 0) throw new Error("removeLegend requires an existing legend.");
-  if (targets.length > 1) {
-    throw new Error("removeLegend requires target when the legend is ambiguous.");
-  }
-  return targets[0];
-}
-
 const SEMANTIC_KIND = Object.freeze({
   series: "series",
   color: "color",
@@ -37,7 +19,7 @@ export const removeLegend = action(
   { op: "removeLegend", description: "Remove every legend block owned by one mark." },
   function (args = {}) {
     validateKeys(args, OPTIONS, "removeLegend");
-    const target = resolveTarget(this, args.target);
+    const target = resolveLegendTarget(this, args.target, "removeLegend");
     const kinds = Object.entries(this.guideConfigs.legend ?? {})
       .filter(([, config]) => config?.target === target)
       .map(([kind]) => kind);

package/src/actions/guides/legends/size.js

@@ -1,6 +1,6 @@
 import { action } from "../../../core/action.js";
 import { validateKeys } from "../../../core/validation.js";
-import { mapLinearValues } from "../../../grammar/scales.js";
+import { mapLinearValues } from "../../../grammar/scales/index.js";
 import { resolveGraphicBounds } from "../../../layout/canvas.js";
 import { DEFAULT_COLORS, DEFAULT_FONT_FAMILY } from
   "../../../theme/defaults.js";

package/src/actions/guides/legends/target.js

@@ -0,0 +1,25 @@
+import { validateUserId } from "../../../core/identifiers.js";
+
+export function legendTargets(program) {
+  return [...new Set(Object.values(program.guideConfigs.legend ?? {})
+    .map(config => config?.target)
+    .filter(Boolean))];
+}
+
+export function resolveLegendTarget(program, requested, operation) {
+  const targets = legendTargets(program);
+  if (requested !== undefined) {
+    const target = validateUserId(requested, "Legend target id");
+    if (!targets.includes(target)) {
+      throw new Error(`Unknown legend target "${target}".`);
+    }
+    return target;
+  }
+  if (operation === "removeLegend" && targets.length === 0) {
+    throw new Error("removeLegend requires an existing legend.");
+  }
+  if (targets.length !== 1) {
+    throw new Error(`${operation} requires target when the legend is ambiguous.`);
+  }
+  return targets[0];
+}

package/src/actions/guides/polar/{axes.js → axes/index.js}

@@ -3,31 +3,31 @@ import {
   createThetaAxis,
   editRadialAxis,
   editThetaAxis
-} from "./axes/facade.js";
+} from "./facade.js";
 import {
   createRadialAxisLabels,
   createThetaAxisLabels,
   editRadialAxisLabels,
   editThetaAxisLabels
-} from "./axes/labels.js";
+} from "./labels.js";
 import {
   createRadialAxisLine,
   createThetaAxisLine,
   editRadialAxisLine,
   editThetaAxisLine
-} from "./axes/lines.js";
+} from "./lines.js";
 import {
   createRadialAxisTicks,
   createThetaAxisTicks,
   editRadialAxisTicks,
   editThetaAxisTicks
-} from "./axes/ticks.js";
+} from "./ticks.js";
 import {
   createRadialAxisTitle,
   createThetaAxisTitle,
   editRadialAxisTitle,
   editThetaAxisTitle
-} from "./axes/titles.js";
+} from "./titles.js";
 
 export function registerPolarAxisActions(ProgramClass) {
   Object.assign(ProgramClass.prototype, {

package/src/actions/guides/polar/index.js

@@ -1,2 +1,2 @@
 export { registerPolarGridActions } from "./grids.js";
-export { registerPolarAxisActions } from "./axes.js";
+export { registerPolarAxisActions } from "./axes/index.js";

package/src/actions/guides/polar/resolve.js

@@ -10,7 +10,7 @@ import {
   isTransformedScaleType,
   mapContinuousScaleValues,
   mapOrdinalPositionValues
-} from "../../../grammar/scales.js";
+} from "../../../grammar/scales/index.js";
 import { formatTimeTick, formatTimeTicks } from "../../../grammar/ticks.js";
 import { resolveGraphicBounds } from "../../../layout/canvas.js";
 import { findCoordinate } from "../../../selectors/coordinates.js";

package/src/actions/guides/tickValues.js

@@ -3,7 +3,7 @@ import {
   isTransformedScaleType,
   readQuantitativeField,
   transformedTicks
-} from "../../grammar/scales.js";
+} from "../../grammar/scales/index.js";
 import { niceTicks, timeTicks } from "../../grammar/ticks.js";
 import { findDataset } from "../../selectors/datasets.js";
 import { findSemanticScale } from "../../selectors/scales.js";

package/src/actions/intervals/resolve.js

@@ -3,7 +3,7 @@ import {
   resolveOptionalUserId,
   validateUserId
 } from "../../core/identifiers.js";
-import { readQuantitativeField } from "../../grammar/scales.js";
+import { readQuantitativeField } from "../../grammar/scales/index.js";
 import { findDataset } from "../../selectors/datasets.js";
 import { hasLayer, resolveEligibleLayer } from "../../selectors/layers.js";
 import { findSemanticScale } from "../../selectors/scales.js";

package/src/actions/marks/arc/actions.js

@@ -8,9 +8,9 @@ import {
 import { deriveArcSectors } from "../../../grammar/arcs.js";
 import { buildAnnularSectorCommands } from "../../../grammar/polarPaths.js";
 import { resolvePolarFrame } from "../../../grammar/polar.js";
-import { mapOrdinalValues } from "../../../grammar/scales.js";
+import { mapOrdinalValues } from "../../../grammar/scales/index.js";
 import { resolveGraphicBounds } from "../../../layout/canvas.js";
-import { canMaterializeArc } from "../../../materialization/marks.js";
+import { canMaterializeArc } from "../../../materialization/marks/index.js";
 import { findDataset } from "../../../selectors/datasets.js";
 import { findLayer, resolveEligibleLayer } from "../../../selectors/layers.js";
 import { DEFAULT_COLORS } from "../../../theme/defaults.js";

package/src/actions/marks/area/actions.js

@@ -10,7 +10,7 @@ import {
   deriveDensityAreaSeries,
   layoutDensityAreaSeries
 } from "../../../grammar/areaSeries.js";
-import { mapContinuousScaleValues, mapOrdinalValues } from "../../../grammar/scales.js";
+import { mapContinuousScaleValues, mapOrdinalValues } from "../../../grammar/scales/index.js";
 import {
   assertMarkAvailable,
   applyLayeredMarkInheritance,
@@ -29,7 +29,7 @@ import {
 } from "../../../grammar/curveCommands.js";
 import { buildLinearPathCommands } from "../../../grammar/pathCommands.js";
 import { resolveEligibleLayer } from "../../../selectors/layers.js";
-import { canMaterializeArea } from "../../../materialization/marks.js";
+import { canMaterializeArea } from "../../../materialization/marks/index.js";
 import { findUpstreamTransform } from "../../../materialization/dataProvenance.js";
 import { resolveMarkGraphicPlacement } from
   "../../../materialization/graphicHierarchy.js";