type

Author: Fil

src/mark.d.ts

@@ -2,7 +2,7 @@ import type {ChannelDomainSort, Channels, ChannelValue, ChannelValues, ChannelVa
 import type {Context} from "./context.js";
 import type {Dimensions} from "./dimensions.js";
 import type {plot} from "./plot.js";
-import type {ScaleFunctions} from "./scales.js";
+import type {InstanciatedScales} from "./scales.js";
 import type {InitializerFunction, SortOrder, TransformFunction} from "./transforms/basic.js";
 
 /**
@@ -40,8 +40,8 @@ export type Data = Iterable<any> | ArrayLike<any>;
 export type RenderFunction = (
   /** The mark’s (filtered and transformed) index. */
   index: number[],
-  /** The plot’s scale functions. */
-  scales: ScaleFunctions,
+  /** The plot’s instanciated scales. */
+  scales: InstanciatedScales,
   /** The mark’s (possibly scaled and transformed) channel values. */
   values: ChannelValues,
   /** The plot’s dimensions. */
@@ -459,5 +459,5 @@ export class RenderableMark extends Mark {
 /** A compound Mark, comprising other marks. */
 export type CompoundMark = Markish[] & Pick<Mark, "plot">;
 
-/** Given an array of marks, returns a compound mark; supports *mark.plot shorthand. */
+/** Given an array of marks, returns a compound mark; supports *mark*.plot shorthand. */
 export function marks(...marks: Markish[]): CompoundMark;

src/scales.d.ts

@@ -160,10 +160,9 @@ export type ColorScheme = ColorSchemeCase | (Lowercase<ColorSchemeCase> & Record
 export type ScaleName = "x" | "y" | "fx" | "fy" | "r" | "color" | "opacity" | "symbol" | "length";
 
 /**
- * The instantiated scales’ apply functions; passed to marks and initializers
- * for rendering.
+ * The instantiated scales; passed to marks and initializers for rendering.
  */
-export type ScaleFunctions = {[key in ScaleName]?: (value: any) => any};
+export type InstanciatedScales = {[key in ScaleName]?: Scale};
 
 /**
  * The supported scale types. For quantitative data, one of:

src/transforms/basic.d.ts

@@ -1,7 +1,7 @@
 import type {ChannelName, Channels, ChannelValue} from "../channel.js";
 import type {Context} from "../context.js";
 import type {Dimensions} from "../dimensions.js";
-import type {ScaleFunctions} from "../scales.js";
+import type {InstanciatedScales} from "../scales.js";
 
 /**
  * A mark transform function is passed the mark’s *data* and a nested index into
@@ -40,7 +40,7 @@ export type InitializerFunction = (
   data: any[],
   facets: number[][],
   channels: Channels,
-  scales: ScaleFunctions,
+  scales: InstanciatedScales,
   dimensions: Dimensions,
   context: Context
 ) => {