Consistently re-use <Field> rather than <string|RepeatRef>

scripts/rename-schema.sh

@@ -1,7 +1,7 @@
 #!/usr/bin/env bash
 
-perl -pi -e s,'<\(string\|RepeatRef\)>','',g build/vega-lite-schema.json
-perl -pi -e s,'<\(string\|RepeatRef\)\,','<',g build/vega-lite-schema.json
+perl -pi -e s,'<Field>','',g build/vega-lite-schema.json
+perl -pi -e s,'<Field\,','<',g build/vega-lite-schema.json
 perl -pi -e s,'<StandardType>','',g build/vega-lite-schema.json
 
 perl -pi -e s,'FacetedCompositeUnitSpec','FacetedUnitSpec',g build/vega-lite-schema.json

src/encoding.ts

@@ -26,7 +26,6 @@ import {
   NumericValueDefWithCondition,
   OrderFieldDef,
   PositionFieldDef,
-  RepeatRef,
   SecondaryFieldDef,
   ShapeFieldDefWithCondition,
   ShapeValueDefWithCondition,
@@ -266,7 +265,7 @@ export function isAggregate(encoding: EncodingWithFacet<Field>) {
     return false;
   });
 }
-export function extractTransformsFromEncoding(oldEncoding: Encoding<string | RepeatRef>, config: Config) {
+export function extractTransformsFromEncoding(oldEncoding: Encoding<Field>, config: Config) {
   const groupby: string[] = [];
   const bins: BinTransform[] = [];
   const timeUnits: TimeUnitTransform[] = [];

src/fielddef.ts

@@ -434,9 +434,7 @@ export function isTypedFieldDef<F extends Field>(channelDef: ChannelDef<FieldDef
   return !!channelDef && ((!!channelDef['field'] && !!channelDef['type']) || channelDef['aggregate'] === 'count');
 }
 
-export function isStringFieldDef(
-  channelDef: ChannelDef<FieldDef<string | RepeatRef>>
-): channelDef is TypedFieldDef<string> {
+export function isStringFieldDef(channelDef: ChannelDef<FieldDef<Field>>): channelDef is TypedFieldDef<string> {
   return isFieldDef(channelDef) && isString(channelDef.field);
 }
 

src/normalize.ts

@@ -3,7 +3,7 @@ import {COLUMN, ROW} from './channel';
 import * as compositeMark from './compositemark';
 import {Config} from './config';
 import {channelHasField, Encoding} from './encoding';
-import {Field, RepeatRef} from './fielddef';
+import {Field} from './fielddef';
 import * as log from './log';
 import {
   AnyMark,
@@ -131,7 +131,7 @@ function mergeProjection(opt: {parentProjection: Projection; projection: Project
 function normalizeLayer(
   spec: ExtendedLayerSpec,
   config: Config,
-  parentEncoding?: Encoding<string | RepeatRef>,
+  parentEncoding?: Encoding<Field>,
   parentProjection?: Projection
 ): NormalizedLayerSpec {
   const {layer, encoding, projection, ...rest} = spec;
@@ -256,7 +256,7 @@ function getLineOverlay(markDef: MarkDef, markConfig: AreaConfig): MarkConfig {
 function normalizeNonFacetUnit(
   spec: GenericUnitSpec<Encoding<Field>, AnyMark>,
   config: Config,
-  parentEncoding?: Encoding<string | RepeatRef>,
+  parentEncoding?: Encoding<Field>,
   parentProjection?: Projection
 ): NormalizedUnitSpec | NormalizedLayerSpec {
   const {encoding, projection} = spec;

src/spec/facet.ts

@@ -1,4 +1,4 @@
-import {ChannelDef, Field, FieldDef, RepeatRef, TypedFieldDef} from '../fielddef';
+import {ChannelDef, Field, FieldDef, TypedFieldDef} from '../fielddef';
 import {Header} from '../header';
 import {Resolve} from '../resolve';
 import {EncodingSortField, SortArray, SortOrder} from '../sort';
@@ -58,7 +58,7 @@ export interface GenericFacetSpec<U extends GenericUnitSpec<any, any>, L extends
   /**
    * An object that describes mappings between `row` and `column` channels and their field definitions.
    */
-  facet: FacetMapping<string | RepeatRef>;
+  facet: FacetMapping<Field>;
 
   /**
    * A specification of the view that gets faceted.

src/spec/layer.ts

@@ -1,5 +1,5 @@
 import {Encoding} from '../encoding';
-import {RepeatRef} from '../fielddef';
+import {Field} from '../fielddef';
 import {Projection} from '../projection';
 import {Resolve} from '../resolve';
 import {BaseSpec, LayerUnitMixins} from './base';
@@ -29,7 +29,7 @@ export interface ExtendedLayerSpec extends GenericLayerSpec<CompositeUnitSpec> {
   /**
    * A shared key-value mapping between encoding channels and definition of fields in the underlying layers.
    */
-  encoding?: Encoding<string | RepeatRef>;
+  encoding?: Encoding<Field>;
 
   /**
    * An object defining properties of the geographic projection shared by underlying layers.

src/spec/unit.ts

@@ -1,5 +1,5 @@
 import {Encoding, EncodingWithFacet} from '../encoding';
-import {RepeatRef} from '../fielddef';
+import {Field} from '../fielddef';
 import {AnyMark, Mark, MarkDef} from '../mark';
 import {Projection} from '../projection';
 import {SelectionDef} from '../selection';
@@ -39,17 +39,17 @@ export interface GenericUnitSpec<E extends Encoding<any>, M> extends BaseSpec, L
 /**
  * A unit specification without any shortcut/expansion syntax.
  */
-export type NormalizedUnitSpec = GenericUnitSpec<Encoding<string | RepeatRef>, Mark | MarkDef>;
+export type NormalizedUnitSpec = GenericUnitSpec<Encoding<Field>, Mark | MarkDef>;
 
 /**
  * Unit spec that can have a composite mark.
  */
-export type CompositeUnitSpec = GenericUnitSpec<Encoding<string | RepeatRef>, AnyMark>;
+export type CompositeUnitSpec = GenericUnitSpec<Encoding<Field>, AnyMark>;
 
 /**
  * Unit spec that can have a composite mark and row or column channels.
  */
-export type FacetedCompositeUnitSpec = GenericUnitSpec<EncodingWithFacet<string | RepeatRef>, AnyMark>;
+export type FacetedCompositeUnitSpec = GenericUnitSpec<EncodingWithFacet<Field>, AnyMark>;
 
 export function isUnitSpec(spec: BaseSpec): spec is FacetedCompositeUnitSpec | NormalizedUnitSpec {
   return !!spec['mark'];