refactor: reorganize type files

packages/vx-shape/src/index.ts

@@ -45,3 +45,7 @@ export { default as LinkVerticalStep, pathVerticalStep } from './shapes/link/ste
 export { default as LinkRadialStep, pathRadialStep } from './shapes/link/step/LinkRadialStep';
 export { default as Polygon, getPoints, getPoint } from './shapes/Polygon';
 export { default as Circle } from './shapes/Circle';
+
+// Export factory functions
+export * from './types/D3ShapeConfig';
+export * from './util/D3ShapeFactories';

packages/vx-shape/src/shapes/Arc.tsx

@@ -1,8 +1,8 @@
 import React from 'react';
 import cx from 'classnames';
 import { Arc as ArcType } from 'd3-shape';
-import { $TSFIXME, AddSVGProps } from '../types';
-import arc, { ArcPathConfig } from '../factories/arcPath';
+import { $TSFIXME, AddSVGProps, ArcPathConfig } from '../types';
+import { arc } from '../util/D3ShapeFactories';
 
 export type ArcProps<Datum> = {
   /** className applied to path element. */

packages/vx-shape/src/shapes/Area.tsx

@@ -1,8 +1,7 @@
 import React from 'react';
 import cx from 'classnames';
-import { AddSVGProps } from '../types';
-import { BaseAreaProps } from '../types/area';
-import areaPath from '../factories/areaPath';
+import { AddSVGProps, BaseAreaProps } from '../types';
+import { area } from '../util/D3ShapeFactories';
 
 export type AreaProps<Datum> = BaseAreaProps<Datum>;
 
@@ -21,7 +20,7 @@ export default function Area<Datum>({
   innerRef,
   ...restProps
 }: AddSVGProps<AreaProps<Datum>, SVGPathElement>) {
-  const path = areaPath<Datum>({ x, x0, x1, y, y0, y1, defined, curve });
+  const path = area<Datum>({ x, x0, x1, y, y0, y1, defined, curve });
   // eslint-disable-next-line react/jsx-no-useless-fragment
   if (children) return <>{children({ path })}</>;
   return (

packages/vx-shape/src/shapes/AreaClosed.tsx

@@ -1,9 +1,8 @@
 import React from 'react';
 import cx from 'classnames';
+import { PositionScale, AddSVGProps, BaseAreaProps } from '../types';
 import setNumOrAccessor from '../util/setNumberOrNumberAccessor';
-import { PositionScale, AddSVGProps } from '../types';
-import { BaseAreaProps } from '../types/area';
-import area from '../factories/areaPath';
+import { area } from '../util/D3ShapeFactories';
 
 export type AreaClosedProps<Datum> = BaseAreaProps<Datum> & {
   yScale: PositionScale;

packages/vx-shape/src/shapes/AreaStack.tsx

@@ -1,7 +1,7 @@
 import React from 'react';
 import cx from 'classnames';
 import Stack, { StackProps } from './Stack';
-import { StackKey, AddSVGProps } from '../types';
+import { AddSVGProps, StackKey } from '../types';
 
 type PickProps =
   | 'className'

packages/vx-shape/src/shapes/BarGroup.tsx

@@ -3,14 +3,21 @@ import cx from 'classnames';
 import { Group } from '@vx/group';
 import { ScaleInput } from '@vx/scale';
 import Bar from './Bar';
-import { PositionScale, DatumObject, AnyScaleBand, AddSVGProps } from '../types';
-import { BaseBarGroupProps, BarGroup } from '../types/bar';
-import { Accessor } from '../types/accessor';
+import {
+  PositionScale,
+  DatumObject,
+  AnyScaleBand,
+  AddSVGProps,
+  BaseBarGroupProps,
+  BarGroup,
+  GroupKey,
+  Accessor,
+} from '../types';
 import getBandwidth from '../util/getBandwidth';
 
 export type BarGroupProps<
   Datum extends DatumObject,
-  Key extends keyof Datum = keyof Datum,
+  Key extends GroupKey = GroupKey,
   X0Scale extends AnyScaleBand = AnyScaleBand,
   X1Scale extends AnyScaleBand = AnyScaleBand
 > = BaseBarGroupProps<Datum, Key> & {
@@ -68,7 +75,7 @@ export type BarGroupProps<
  */
 export default function BarGroupComponent<
   Datum extends DatumObject,
-  Key extends keyof Datum = keyof Datum,
+  Key extends GroupKey = GroupKey,
   X0Scale extends AnyScaleBand = AnyScaleBand,
   X1Scale extends AnyScaleBand = AnyScaleBand
 >({

packages/vx-shape/src/shapes/BarGroupHorizontal.tsx

@@ -3,14 +3,21 @@ import cx from 'classnames';
 import { Group } from '@vx/group';
 import { ScaleInput } from '@vx/scale';
 import Bar from './Bar';
-import { PositionScale, AnyScaleBand, DatumObject, AddSVGProps } from '../types';
-import { BarGroupHorizontal, BaseBarGroupProps } from '../types/bar';
-import { Accessor } from '../types/accessor';
+import {
+  PositionScale,
+  AnyScaleBand,
+  DatumObject,
+  AddSVGProps,
+  BarGroupHorizontal,
+  BaseBarGroupProps,
+  GroupKey,
+  Accessor,
+} from '../types';
 import getBandwidth from '../util/getBandwidth';
 
 export type BarGroupHorizontalProps<
   Datum extends DatumObject,
-  Key extends keyof Datum = keyof Datum,
+  Key extends GroupKey = GroupKey,
   Y0Scale extends AnyScaleBand = AnyScaleBand,
   Y1Scale extends AnyScaleBand = AnyScaleBand
 > = BaseBarGroupProps<Datum, Key> & {
@@ -32,7 +39,7 @@ export type BarGroupHorizontalProps<
 
 export default function BarGroupHorizontalComponent<
   Datum extends DatumObject,
-  Key extends keyof Datum = keyof Datum,
+  Key extends GroupKey = GroupKey,
   Y0Scale extends AnyScaleBand = AnyScaleBand,
   Y1Scale extends AnyScaleBand = AnyScaleBand
 >({

packages/vx-shape/src/shapes/BarStack.tsx

@@ -1,33 +1,28 @@
 import React from 'react';
 import cx from 'classnames';
-import { Group } from '@vx/group';
 import { stack as d3stack, SeriesPoint } from 'd3-shape';
-
+import { Group } from '@vx/group';
 import { ScaleInput } from '@vx/scale';
+import { PositionScale, AddSVGProps, BarStack, BaseBarStackProps, StackKey } from '../types';
+import { getFirstItem, getSecondItem } from '../util/accessors';
+import getBandwidth from '../util/getBandwidth';
+import setNumOrAccessor from '../util/setNumberOrNumberAccessor';
 import stackOrder from '../util/stackOrder';
 import stackOffset from '../util/stackOffset';
 import Bar from './Bar';
-import { StackKey, $TSFIXME, PositionScale, AddSVGProps } from '../types';
-import setNumOrAccessor from '../util/setNumberOrNumberAccessor';
-import { BarStack, BaseBarStackProps } from '../types/stack';
-import getBandwidth from '../util/getBandwidth';
 
 export type BarStackProps<
   Datum,
-  Key,
+  Key extends StackKey = StackKey,
   XScale extends PositionScale = PositionScale,
   YScale extends PositionScale = PositionScale
-> = BaseBarStackProps<Datum, Key> & {
+> = BaseBarStackProps<Datum, Key, XScale, YScale> & {
   /** Returns the value mapped to the x of a bar. */
   x: (d: Datum) => ScaleInput<XScale>;
   /** Returns the value mapped to the y0 of a bar. */
   y0?: (d: SeriesPoint<Datum>) => ScaleInput<YScale>;
   /** Returns the value mapped to the y1 of a bar. */
   y1?: (d: SeriesPoint<Datum>) => ScaleInput<YScale>;
-  /** @vx/scale or d3-scale that takes an x value and maps it to an x axis position. */
-  xScale: XScale;
-  /** @vx/scale or d3-scale that takes a y value and maps it to an y axis position. */
-  yScale: YScale;
 };
 
 export default function BarStackComponent<
@@ -41,8 +36,8 @@ export default function BarStackComponent<
   top,
   left,
   x,
-  y0 = (d: $TSFIXME) => d?.[0],
-  y1 = (d: $TSFIXME) => d?.[1],
+  y0 = getFirstItem,
+  y1 = getSecondItem,
   xScale,
   yScale,
   color,