convert scatter/ and bar/ traces to TypeScript

51 files: 33 scatter, 18 bar — the two factory trace modules.
Total: 164 .ts / 671 .js remaining (20% converted).

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>

Author: ryan-williams

src/traces/bar/arrays_to_calcdata.js src/traces/bar/arrays_to_calcdata.tssrc/traces/bar/arrays_to_calcdata.js renamed to src/traces/bar/arrays_to_calcdata.ts

@@ -1,14 +1,14 @@
 import { mergeArray, mergeArrayCastPositive } from '../../lib/index.js';
 
-export default function arraysToCalcdata(cd, trace) {
+export default function arraysToCalcdata(cd: any[], trace: any): void {
     for(var i = 0; i < cd.length; i++) cd[i].i = i;
 
     mergeArray(trace.text, cd, 'tx');
     mergeArray(trace.hovertext, cd, 'htx');
 
     var marker = trace.marker;
     if(marker) {
-        mergeArray(marker.opacity, cd, 'mo', true);
+        (mergeArray as any)(marker.opacity, cd, 'mo', true);
         mergeArray(marker.color, cd, 'mc');
 
         var markerLine = marker.line;

src/traces/bar/attributes.js src/traces/bar/attributes.tssrc/traces/bar/attributes.js renamed to src/traces/bar/attributes.ts

@@ -25,15 +25,15 @@ var markerLine = extendFlat(
         width: markerLineWidth,
         editType: 'calc'
     },
-    colorScaleAttrs('marker.line')
+    (colorScaleAttrs as any)('marker.line')
 );
 
 var marker = extendFlat(
     {
         line: markerLine,
         editType: 'calc'
     },
-    colorScaleAttrs('marker'),
+    (colorScaleAttrs as any)('marker'),
     {
         opacity: {
             valType: 'number',

src/traces/bar/calc.js src/traces/bar/calc.tssrc/traces/bar/calc.js renamed to src/traces/bar/calc.ts

@@ -6,7 +6,7 @@ import colorscaleCalc from '../../components/colorscale/calc.js';
 import arraysToCalcdata from './arrays_to_calcdata.js';
 import calcSelection from '../scatter/calc_selection.js';
 
-export default function calc(gd, trace) {
+export default function calc(gd: any, trace: any): any[] {
     var xa = Axes.getFromId(gd, trace.xaxis || 'x');
     var ya = Axes.getFromId(gd, trace.yaxis || 'y');
     var size, pos, origPos, pObj, hasPeriod, pLetter;

src/traces/bar/constants.js src/traces/bar/constants.tssrc/traces/bar/constants.js renamed to src/traces/bar/constants.ts

@@ -14,7 +14,7 @@ import Sieve from './sieve.js';
  * now doing this one subplot at a time
  */
 
-function crossTraceCalc(gd, plotinfo) {
+function crossTraceCalc(gd: any, plotinfo: any): void {
     var xa = plotinfo.xaxis;
     var ya = plotinfo.yaxis;
 
@@ -62,7 +62,7 @@ function crossTraceCalc(gd, plotinfo) {
     setGroupPositions(gd, ya, xa, calcTracesHorz, opts);
 }
 
-function setGroupPositions(gd, pa, sa, calcTraces, opts) {
+function setGroupPositions(gd: any, pa: any, sa: any, calcTraces: any[], opts: any): void {
     if(!calcTraces.length) return;
 
     var excluded;
@@ -126,7 +126,7 @@ function setGroupPositions(gd, pa, sa, calcTraces, opts) {
 }
 
 // Set cornerradiusvalue and cornerradiusform in calcTraces[0].t
-function setCornerradius(calcTraces) {
+function setCornerradius(calcTraces: any[]): void {
     var i, calcTrace, fullTrace, t, cr, crValue, crForm;
 
     for(i = 0; i < calcTraces.length; i++) {
@@ -147,7 +147,7 @@ function setCornerradius(calcTraces) {
 }
 
 // Make sure all traces in a stack use the same cornerradius
-function standardizeCornerradius(calcTraces) {
+function standardizeCornerradius(calcTraces: any[]): void {
     if(calcTraces.length < 2) return;
     var i, calcTrace, fullTrace, t;
     var cr, crValue, crForm;
@@ -172,7 +172,7 @@ function standardizeCornerradius(calcTraces) {
     }
 }
 
-function initBase(sa, calcTraces) {
+function initBase(sa: any, calcTraces: any[]): void {
     var i, j;
 
     for(i = 0; i < calcTraces.length; i++) {
@@ -215,7 +215,7 @@ function initBase(sa, calcTraces) {
     }
 }
 
-function setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces, opts) {
+function setGroupPositionsInOverlayMode(gd: any, pa: any, sa: any, calcTraces: any[], opts: any): void {
     // update position axis and set bar offsets and widths
     for(var i = 0; i < calcTraces.length; i++) {
         var calcTrace = calcTraces[i];
@@ -243,7 +243,7 @@ function setGroupPositionsInOverlayMode(gd, pa, sa, calcTraces, opts) {
     }
 }
 
-function setGroupPositionsInGroupMode(gd, pa, sa, calcTraces, opts) {
+function setGroupPositionsInGroupMode(gd: any, pa: any, sa: any, calcTraces: any[], opts: any): void {
     var sieve = new Sieve(calcTraces, {
         posAxis: pa,
         sepNegVal: false,
@@ -266,7 +266,7 @@ function setGroupPositionsInGroupMode(gd, pa, sa, calcTraces, opts) {
     }
 }
 
-function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces, opts) {
+function setGroupPositionsInStackOrRelativeMode(gd: any, pa: any, sa: any, calcTraces: any[], opts: any): void {
     var sieve = new Sieve(calcTraces, {
         posAxis: pa,
         sepNegVal: opts.mode === 'relative',
@@ -310,7 +310,7 @@ function setGroupPositionsInStackOrRelativeMode(gd, pa, sa, calcTraces, opts) {
  *      overlap/stack.
  * Angular axes (for barpolar type) don't support group offsets.
  */
-function setOffsetAndWidth(gd, pa, sieve, opts) {
+function setOffsetAndWidth(gd: any, pa: any, sieve: any, opts: any): void {
     var fullLayout = gd._fullLayout;
     var positions = sieve.positions;
     var distinctPositions = sieve.distinctPositions;
@@ -385,7 +385,7 @@ function setOffsetAndWidth(gd, pa, sieve, opts) {
     }
 }
 
-function applyAttributes(sieve) {
+function applyAttributes(sieve: any): void {
     var calcTraces = sieve.traces;
     var i, j;
 
@@ -463,7 +463,7 @@ function applyAttributes(sieve) {
     }
 }
 
-function setBarCenterAndWidth(pa, sieve) {
+function setBarCenterAndWidth(pa: any, sieve: any): void {
     var calcTraces = sieve.traces;
     var pLetter = getAxisLetter(pa);
 
@@ -492,7 +492,7 @@ function setBarCenterAndWidth(pa, sieve) {
     }
 }
 
-function updatePositionAxis(pa, sieve, allowMinDtick) {
+function updatePositionAxis(pa: any, sieve: any, allowMinDtick?: boolean): void {
     var calcTraces = sieve.traces;
     var minDiff = sieve.minDiff;
     var vpad = minDiff / 2;
@@ -537,7 +537,7 @@ function updatePositionAxis(pa, sieve, allowMinDtick) {
 // store these bar bases and tops in calcdata
 // and make sure the size axis includes zero,
 // along with the bases and tops of each bar.
-function setBaseAndTop(sa, sieve) {
+function setBaseAndTop(sa: any, sieve: any): void {
     var calcTraces = sieve.traces;
     var sLetter = getAxisLetter(sa);
 
@@ -572,7 +572,7 @@ function setBaseAndTop(sa, sieve) {
     }
 }
 
-function stackBars(sa, sieve, opts) {
+function stackBars(sa: any, sieve: any, opts: any): void {
     var sLetter = getAxisLetter(sa);
     var calcTraces = sieve.traces;
     var calcTrace;
@@ -649,7 +649,7 @@ function stackBars(sa, sieve, opts) {
     }
 }
 
-function sieveBars(sieve) {
+function sieveBars(sieve: any): void {
     var calcTraces = sieve.traces;
 
     for(var i = 0; i < calcTraces.length; i++) {
@@ -665,7 +665,7 @@ function sieveBars(sieve) {
     }
 }
 
-function unhideBarsWithinTrace(sieve, pa) {
+function unhideBarsWithinTrace(sieve: any, pa: any): void {
     var calcTraces = sieve.traces;
 
     for(var i = 0; i < calcTraces.length; i++) {
@@ -701,7 +701,7 @@ function unhideBarsWithinTrace(sieve, pa) {
 //
 // normalizeBars requires that either sieveBars or stackBars has been
 // previously invoked.
-function normalizeBars(sa, sieve, opts) {
+function normalizeBars(sa: any, sieve: any, opts: any): void {
     var calcTraces = sieve.traces;
     var sLetter = getAxisLetter(sa);
     var sTop = opts.norm === 'fraction' ? 1 : 100;
@@ -760,7 +760,7 @@ function normalizeBars(sa, sieve, opts) {
 // Add an `_sMin` and `_sMax` value for each bar representing the min and max size value
 // across all bars sharing the same position as that bar. These values are used for rounded
 // bar corners, to carry rounding down to lower bars in the stack as needed.
-function setHelperValuesForRoundedCorners(calcTraces, sMinByPos, sMaxByPos, pa) {
+function setHelperValuesForRoundedCorners(calcTraces: any[], sMinByPos: any, sMaxByPos: any, pa: any): void {
     var pLetter = getAxisLetter(pa);
     // Set `_sMin` and `_sMax` value for each bar
     for(var i = 0; i < calcTraces.length; i++) {
@@ -779,9 +779,9 @@ function setHelperValuesForRoundedCorners(calcTraces, sMinByPos, sMaxByPos, pa)
 // narrower than the space they're in.
 // run once per trace group (subplot & direction) and
 // the same mapping is attached to all calcdata traces
-function collectExtents(calcTraces, pa) {
+function collectExtents(calcTraces: any[], pa: any): void {
     var pLetter = getAxisLetter(pa);
-    var extents = {};
+    var extents: any = {};
     var i, j, cd;
 
     var pMin = Infinity;
@@ -858,7 +858,7 @@ function collectExtents(calcTraces, pa) {
     }
 }
 
-function getAxisLetter(ax) {
+function getAxisLetter(ax: any): string {
     return ax._id.charAt(0);
 }
 

src/traces/bar/cross_trace_calc.js src/traces/bar/cross_trace_calc.tssrc/traces/bar/cross_trace_calc.js renamed to src/traces/bar/cross_trace_calc.ts

@@ -9,8 +9,8 @@ import handleGroupingDefaults from '../scatter/grouping_defaults.js';
 import attributes from './attributes.js';
 
 
-function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
-    function coerce(attr, dflt) {
+function supplyDefaults(traceIn: any, traceOut: any, defaultColor: any, layout: any): void {
+    function coerce(attr: string, dflt?: any) {
         return Lib.coerce(traceIn, traceOut, attributes, attr, dflt);
     }
 
@@ -57,10 +57,10 @@ function supplyDefaults(traceIn, traceOut, defaultColor, layout) {
     coerceSelectionMarkerOpacity(traceOut, coerce);
 }
 
-function crossTraceDefaults(fullData, fullLayout) {
+function crossTraceDefaults(fullData: any[], fullLayout: any): void {
     var traceIn, traceOut;
 
-    function coerce(attr, dflt) {
+    function coerce(attr: string, dflt?: any) {
         return Lib.coerce(traceOut._input, traceOut, attributes, attr, dflt);
     }
 
@@ -88,7 +88,7 @@ function crossTraceDefaults(fullData, fullLayout) {
 //   - a string consisting of a number >= 0 followed by a % sign
 // If the given cornerradius value is a numeric string, it will be converted
 // to a number.
-function validateCornerradius(r) {
+function validateCornerradius(r: any): any {
     if (isNumeric(r)) {
         r = +r;
         if (r >= 0) return r;
@@ -102,7 +102,7 @@ function validateCornerradius(r) {
     return undefined;
 }
 
-function handleText(traceIn, traceOut, layout, coerce, textposition, opts) {
+function handleText(traceIn: any, traceOut: any, layout: any, coerce: any, textposition: any, opts?: any): void {
     opts = opts || {};
     var moduleHasSelected = !(opts.moduleHasSelected === false);
     var moduleHasUnselected = !(opts.moduleHasUnselected === false);

src/traces/bar/defaults.js src/traces/bar/defaults.tssrc/traces/bar/defaults.js renamed to src/traces/bar/defaults.ts

@@ -1,4 +1,4 @@
-export default function eventData(out, pt, trace) {
+export default function eventData(out: any, pt: any, trace: any): any {
     // standard cartesian event data
     out.x = 'xVal' in pt ? pt.xVal : pt.x;
     out.y = 'yVal' in pt ? pt.yVal : pt.y;

src/traces/bar/event_data.js src/traces/bar/event_data.tssrc/traces/bar/event_data.js renamed to src/traces/bar/event_data.ts

@@ -2,7 +2,7 @@ import isNumeric from 'fast-isnumeric';
 import tinycolor from 'tinycolor2';
 import { isArrayOrTypedArray } from '../../lib/index.js';
 
-export var coerceString = function(attributeDefinition, value, defaultValue) {
+export var coerceString = function(attributeDefinition: any, value: any, defaultValue?: any): any {
     if(typeof value === 'string') {
         if(value || !attributeDefinition.noBlank) return value;
     } else if(typeof value === 'number' || value === true) {
@@ -14,7 +14,7 @@ export var coerceString = function(attributeDefinition, value, defaultValue) {
       attributeDefinition.dflt;
 };
 
-export var coerceNumber = function(attributeDefinition, value, defaultValue) {
+export var coerceNumber = function(attributeDefinition: any, value: any, defaultValue?: any): number {
     if(isNumeric(value)) {
         value = +value;
 
@@ -31,15 +31,15 @@ export var coerceNumber = function(attributeDefinition, value, defaultValue) {
       attributeDefinition.dflt;
 };
 
-export var coerceColor = function(attributeDefinition, value, defaultValue) {
+export var coerceColor = function(attributeDefinition: any, value: any, defaultValue?: any): any {
     if(tinycolor(value).isValid()) return value;
 
     return (defaultValue !== undefined) ?
       defaultValue :
       attributeDefinition.dflt;
 };
 
-export var coerceEnumerated = function(attributeDefinition, value, defaultValue) {
+export var coerceEnumerated = function(attributeDefinition: any, value: any, defaultValue?: any): any {
     if(attributeDefinition.coerceNumber) value = +value;
 
     if(attributeDefinition.values.indexOf(value) !== -1) return value;
@@ -49,14 +49,14 @@ export var coerceEnumerated = function(attributeDefinition, value, defaultValue)
       attributeDefinition.dflt;
 };
 
-export var getValue = function(arrayOrScalar, index) {
+export var getValue = function(arrayOrScalar: any, index: number): any {
     var value;
     if(!isArrayOrTypedArray(arrayOrScalar)) value = arrayOrScalar;
     else if(index < arrayOrScalar.length) value = arrayOrScalar[index];
     return value;
 };
 
-export var getLineWidth = function(trace, di) {
+export var getLineWidth = function(trace: any, di: any): number {
     var w =
         (0 < di.mlw) ? di.mlw :
         !isArrayOrTypedArray(trace.marker.line.width) ? trace.marker.line.width :

src/traces/bar/helpers.js src/traces/bar/helpers.tssrc/traces/bar/helpers.js renamed to src/traces/bar/helpers.ts

@@ -8,7 +8,7 @@ const { hoverLabelText } = _axes;
 import _numerical from '../../constants/numerical.js';
 const { BADNUM } = _numerical;
 
-function hoverPoints(pointData, xval, yval, hovermode, opts) {
+function hoverPoints(pointData: any, xval: number, yval: number, hovermode: any, opts?: any): any[] | undefined {
     var barPointData = hoverOnBars(pointData, xval, yval, hovermode, opts);
 
     if(barPointData) {
@@ -23,7 +23,7 @@ function hoverPoints(pointData, xval, yval, hovermode, opts) {
     }
 }
 
-function hoverOnBars(pointData, xval, yval, hovermode, opts) {
+function hoverOnBars(pointData: any, xval: number, yval: number, hovermode: any, opts?: any): any {
     var cd = pointData.cd;
     var trace = cd[0].trace;
     var t = cd[0].t;
@@ -206,7 +206,7 @@ function hoverOnBars(pointData, xval, yval, hovermode, opts) {
     return pointData;
 }
 
-function getTraceColor(trace, di) {
+function getTraceColor(trace: any, di: any): string | undefined {
     var mc = di.mcc || trace.marker.color;
     var mlc = di.mlcc || trace.marker.line.color;
     var mlw = getLineWidth(trace, di);