Bump to typescript 5

mauriciopoppe · mauriciopoppe · commit 2b3c751422a6 · 2025-07-02T16:56:08.000-04:00
diff --git a/babel.config.cjs b/babel.config.cjs
@@ -1,3 +1,3 @@
 module.exports = {
-  presets: ['@babel/preset-env', '@babel/preset-typescript', '@babel/preset-react']
+  presets: ['@babel/preset-env', '@babel/preset-typescript']
 }
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -77,6 +77,7 @@
     "@jest/globals": "^29.7.0",
     "@types/d3": "^7.4.0",
     "@types/events": "^3.0.0",
+    "@types/node": "^18.19.115",
     "@typescript-eslint/eslint-plugin": "^5.37.0",
     "@typescript-eslint/parser": "^5.37.0",
     "babel-eslint": "^10.1.0",
@@ -85,7 +86,6 @@
     "core-js": "^3.25.2",
     "dox": "^1.0.0",
     "eslint": "^8.23.1",
-    "eslint-config-react-app": "^7.0.1",
     "eslint-config-standard": "^17.0.0",
     "eslint-plugin-flowtype": "^8.0.3",
     "eslint-plugin-import": "^2.26.0",
@@ -114,8 +114,8 @@
     "ts-jest-resolver": "^2.0.1",
     "ts-loader": "^9.3.1",
     "tsx": "^4.6.2",
-    "typedoc": "^0.23.15",
-    "typescript": "^4.8.3",
+    "typedoc": "^0.28.7",
+    "typescript": "^5.8.3",
     "web-worker": "^1.5.0",
     "webpack": "^5.86.0",
     "webpack-cli": "^5.1.4",
diff --git a/src/chart.ts b/src/chart.ts
@@ -1,13 +1,13 @@
-import { line as d3Line, Line } from 'd3-shape'
+import { line as d3Line, type Line } from 'd3-shape'
 import { format as d3Format } from 'd3-format'
 import { scaleLinear as d3ScaleLinear, scaleLog as d3ScaleLog } from 'd3-scale'
-import { axisLeft as d3AxisLeft, axisBottom as d3AxisBottom, Axis } from 'd3-axis'
+import { axisLeft as d3AxisLeft, axisBottom as d3AxisBottom, type Axis } from 'd3-axis'
 import { zoom as d3Zoom } from 'd3-zoom'
 import { select as d3Select, pointer as d3Pointer } from 'd3-selection'
 import { interpolateRound as d3InterpolateRound } from 'd3-interpolate'
 import EventEmitter from 'events'
 
-import { FunctionPlotDatum, FunctionPlotOptions, FunctionPlotScale, FunctionPlotOptionsAxis } from './types.js'
+import type { FunctionPlotDatum, FunctionPlotOptions, FunctionPlotScale, FunctionPlotOptionsAxis } from './types.js'
 import { IntervalWorkerPool } from './samplers/interval_worker_pool.js'
 
 import { Mark } from './graph-types/mark.js'
diff --git a/src/datum-defaults.test.ts b/src/datum-defaults.test.ts
@@ -1,5 +1,5 @@
 import { describe, expect, it } from '@jest/globals'
-import { FunctionPlotDatum } from './types.js'
+import type { FunctionPlotDatum } from './types.js'
 import datumDefaults from '../src/datum-defaults.js'
 
 describe('datumDefaults', () => {
diff --git a/src/datum-defaults.ts b/src/datum-defaults.ts
@@ -1,4 +1,4 @@
-import { FunctionPlotDatum } from './types.js'
+import type { FunctionPlotDatum } from './types.js'
 import { randomId } from './utils.mjs'
 
 export default function datumDefaults(d: FunctionPlotDatum): FunctionPlotDatum {
diff --git a/src/datum-validation.ts b/src/datum-validation.ts
@@ -1,4 +1,4 @@
-import { FunctionPlotDatum } from './types.js'
+import type { FunctionPlotDatum } from './types.js'
 import { assert } from './utils.mjs'
 
 export default function datumValidation(d: FunctionPlotDatum) {
diff --git a/src/evaluate-datum.ts b/src/evaluate-datum.ts
@@ -3,7 +3,7 @@ import { syncSamplerInterval, asyncSamplerInterval } from './samplers/interval.j
 import builtIn from './samplers/builtIn.js'
 
 import { Chart } from './index.js'
-import { FunctionPlotDatum, FunctionPlotScale } from './types.js'
+import type { FunctionPlotDatum, FunctionPlotScale } from './types.js'
 
 /**
  * Computes the endpoints x_lo, x_hi of the range in d.range from which the sampler will take samples.
diff --git a/src/graph-types/annotation.ts b/src/graph-types/annotation.ts
@@ -1,7 +1,7 @@
 import { line as d3Line } from 'd3-shape'
-import { Selection } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 
-import { FunctionPlotOptions } from '../types.js'
+import type { FunctionPlotOptions } from '../types.js'
 import { Mark } from '../graph-types/mark.js'
 
 const line = d3Line()
diff --git a/src/graph-types/index.ts b/src/graph-types/index.ts
@@ -3,6 +3,8 @@ import { Polyline, polyline } from './polyline.js'
 import { Scatter, scatter } from './scatter.js'
 import { Text, text } from './text.js'
 import { Annotation, annotation } from './annotation.js'
-import { Attr, Mark } from './mark.js'
+import { Mark } from './mark.js'
 
-export { Polyline, polyline, Scatter, scatter, Interval, interval, Text, text, Annotation, annotation, Attr, Mark }
+export type { Attr } from './mark.js'
+export { Polyline, Scatter, Interval, Text, Annotation, Mark }
+export { polyline, scatter, interval, text, annotation }
diff --git a/src/graph-types/interval.ts b/src/graph-types/interval.ts
@@ -1,11 +1,11 @@
-import { Selection } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 
 import { asyncIntervalEvaluate, intervalEvaluate } from '../evaluate-datum.js'
 import { infinity, color } from '../utils.mjs'
 
 import { Mark } from './mark.js'
-import { Interval as TInterval, FunctionPlotDatum, FunctionPlotScale } from '../types.js'
-import { IntervalSamplerResult } from '../samplers/types.js'
+import type { Interval as TInterval, FunctionPlotDatum, FunctionPlotScale } from '../types.js'
+import type { IntervalSamplerResult } from '../samplers/types.js'
 
 function clampRange(minWidthHeight: number, vLo: number, vHi: number, gLo: number, gHi: number) {
   // issue 69
diff --git a/src/graph-types/polyline.ts b/src/graph-types/polyline.ts
@@ -1,11 +1,12 @@
-import { select as d3Select, Selection } from 'd3-selection'
+import { select as d3Select } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 import { line as d3Line, area as d3Area, curveLinear as d3CurveLinear } from 'd3-shape'
 
 import { color, infinity, clamp } from '../utils.mjs'
 import { builtInEvaluate } from '../evaluate-datum.js'
 
 import { Mark } from './mark.js'
-import { FunctionPlotDatum } from '../types.js'
+import type { FunctionPlotDatum } from '../types.js'
 
 export class Polyline extends Mark {
   fn?: any
diff --git a/src/graph-types/scatter.ts b/src/graph-types/scatter.ts
@@ -1,11 +1,11 @@
-import { Selection } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 import { hsl as d3Hsl } from 'd3-color'
 
 import { color } from '../utils.mjs'
 import { builtInEvaluate } from '../evaluate-datum.js'
 
 import { Mark } from './mark.js'
-import { FunctionPlotDatum } from '../types.js'
+import type { FunctionPlotDatum } from '../types.js'
 
 export class Scatter extends Mark {
   fn?: any
diff --git a/src/graph-types/text.ts b/src/graph-types/text.ts
@@ -1,10 +1,10 @@
-import { Selection } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 import { hsl as d3Hsl } from 'd3-color'
 
 import { color } from '../utils.mjs'
 
 import { Mark } from './mark.js'
-import { TextFunction } from '../types.js'
+import type { TextFunction } from '../types.js'
 
 export class Text extends Mark {
   location: [number, number]
diff --git a/src/helpers/derivative.ts b/src/helpers/derivative.ts
@@ -1,12 +1,13 @@
-import { select as d3Select, Selection } from 'd3-selection'
+import { select as d3Select } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 
 import { Polyline } from '../graph-types/index.js'
 import { builtIn as builtInEvaluator } from '../samplers/eval.mjs'
 import datumDefaults from '../datum-defaults.js'
 import { infinity } from '../utils.mjs'
 
 import { Chart } from '../index.js'
-import { LinearFunction } from '../types.js'
+import type { LinearFunction } from '../types.js'
 
 export default function derivative(chart: Chart) {
   const derivativeDatum: LinearFunction = datumDefaults({
diff --git a/src/helpers/index.ts b/src/helpers/index.ts
@@ -1,4 +1,5 @@
-import { select as d3Select, Selection } from 'd3-selection'
+import { select as d3Select } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 import derivative from './derivative.js'
 import secant from './secant.js'
 
diff --git a/src/helpers/secant.ts b/src/helpers/secant.ts
@@ -1,12 +1,13 @@
-import { select as d3Select, Selection } from 'd3-selection'
+import { select as d3Select } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 
 import { builtIn as builtInEvaluator } from '../samplers/eval.mjs'
 import datumDefaults from '../datum-defaults.js'
 import { Polyline } from '../graph-types/index.js'
 import { infinity } from '../utils.mjs'
 
 import { Chart } from '../index.js'
-import { FunctionPlotDatumScope, LinearFunction, SecantDatum } from '../types.js'
+import type { FunctionPlotDatumScope, LinearFunction, SecantDatum } from '../types.js'
 
 export default function secant(chart: Chart) {
   const secantDefaults: LinearFunction = datumDefaults({
diff --git a/src/index.ts b/src/index.ts
@@ -1,7 +1,8 @@
 import './polyfills.js'
 
-import { FunctionPlotOptions } from './types.js'
-import { Chart, ChartMeta, ChartMetaMargin, withWebWorkers } from './chart.js'
+import type { FunctionPlotOptions } from './types.js'
+import type { ChartMeta, ChartMetaMargin } from './chart.js'
+import { Chart, withWebWorkers } from './chart.js'
 
 import globals from './globals.mjs'
 import { interval, polyline, scatter, text } from './graph-types/index.js'
@@ -44,7 +45,9 @@ functionPlot.text = text
 
 export * from './types.js'
 export { withWebWorkers }
-export { Chart, ChartMeta, ChartMetaMargin }
+export { Chart }
+export type { ChartMeta, ChartMetaMargin }
+export type { Attr } from './graph-types/index.js'
 export {
   interval as IntervalGraph,
   Interval,
@@ -54,7 +57,6 @@ export {
   Scatter,
   text as TextGraph,
   Text,
-  Mark,
-  Attr
+  Mark
 } from './graph-types/index.js'
 export { builtIn as BuiltInSampler, interval as IntervalSampler, registerSampler } from './samplers/eval.mjs'
diff --git a/src/perf/interval-pipeline.ts b/src/perf/interval-pipeline.ts
@@ -9,7 +9,7 @@ import Worker from 'web-worker'
 
 import globals from '../globals.mjs'
 import { IntervalWorkerPool, BackpressureStrategy } from '../samplers/interval_worker_pool.js'
-import { FunctionPlotDatum, FunctionPlotOptionsAxis } from '../types.js'
+import type { FunctionPlotDatum, FunctionPlotOptionsAxis } from '../types.js'
 import { createPathD } from '../graph-types/interval.js'
 import { asyncSamplerInterval, syncSamplerInterval } from '../samplers/interval.js'
 
diff --git a/src/samplers/builtIn.ts b/src/samplers/builtIn.ts
@@ -1,8 +1,8 @@
 import { linspace, sgn, infinity, clamp, space, isValidNumber } from '../utils.mjs'
 import { builtIn as evaluate } from './eval.mjs'
 
-import { FunctionPlotDatum, FunctionPlotScale, PointFunction, VectorFunction } from '../types.js'
-import { SamplerParams, SamplerFn, BuiltInSamplerResult, BuiltInSamplerResultGroup } from './types.js'
+import type { FunctionPlotDatum, FunctionPlotScale, PointFunction, VectorFunction } from '../types.js'
+import type { SamplerParams, SamplerFn, BuiltInSamplerResult, BuiltInSamplerResultGroup } from './types.js'
 
 type Asymptote = {
   asymptote: boolean
diff --git a/src/samplers/interval.ts b/src/samplers/interval.ts
@@ -4,8 +4,8 @@ import { interval as evaluate } from './eval.mjs'
 import { infinity, space, interval2dTypedArray } from '../utils.mjs'
 import globals from '../globals.mjs'
 
-import { FunctionPlotDatum } from '../types.js'
-import { SamplerParams, IntervalSamplerResult, IntervalSamplerResultGroup, SamplerFn, AsyncSamplerFn } from './types.js'
+import type { FunctionPlotDatum } from '../types.js'
+import type { SamplerParams, IntervalSamplerResult, IntervalSamplerResultGroup, SamplerFn, AsyncSamplerFn } from './types.js'
 
 // disable the use of typed arrays in interval-arithmetic to improve the performance
 ;(intervalArithmeticEval as any).policies.disableRounding()
diff --git a/src/samplers/interval_worker_pool.ts b/src/samplers/interval_worker_pool.ts
@@ -1,4 +1,4 @@
-import { LinearFunction } from '../types.js'
+import type { LinearFunction } from '../types.js'
 
 interface IntervalTask {
   d: LinearFunction
diff --git a/src/samplers/types.ts b/src/samplers/types.ts
@@ -1,4 +1,4 @@
-import { FunctionPlotDatum, FunctionPlotScale, FunctionPlotOptionsAxis } from '../types.js'
+import type { FunctionPlotDatum, FunctionPlotScale, FunctionPlotOptionsAxis } from '../types.js'
 
 export type SamplerParams = {
   d: FunctionPlotDatum
diff --git a/src/tip.ts b/src/tip.ts
@@ -1,10 +1,11 @@
 import { line as d3Line } from 'd3-shape'
-import { select as d3Select, Selection } from 'd3-selection'
+import { select as d3Select } from 'd3-selection'
+import type { Selection } from 'd3-selection'
 
 import { color, clamp, infinity, isValidNumber, getterSetter } from './utils.mjs'
 import globals from './globals.mjs'
 import { builtIn as builtInEvaluator } from './samplers/eval.mjs'
-import { FunctionPlotTip } from './types.js'
+import type { FunctionPlotTip } from './types.js'
 
 export default function mouseTip(config: FunctionPlotTip) {
   config = Object.assign(
diff --git a/src/types.ts b/src/types.ts
@@ -1,4 +1,4 @@
-import { ScaleLinear, ScaleLogarithmic } from 'd3-scale'
+import type { ScaleLinear, ScaleLogarithmic } from 'd3-scale'
 
 export interface Interval {
   lo: number
diff --git a/test/e2e/snippets.ts b/test/e2e/snippets.ts
@@ -1,4 +1,5 @@
-import functionPlot, {
+import functionPlot from '../../src/index.js'
+import type {
   ImplicitFunction,
   LinearFunction,
   ParametricFunction,
diff --git a/tsconfig.json b/tsconfig.json
@@ -14,7 +14,8 @@
       "*": ["node_modules/*"]
     },
     "types": ["node", "jest"],
-    "lib": ["es2022", "dom"]
+    "lib": ["es2022", "dom"],
+    "verbatimModuleSyntax": true
   },
   "include": ["./src/**/*.ts", "./src/**/*.js", "./src/**/*.d.ts", "./test/e2e/snippets.ts"],
   "exclude": ["src/stories/**/*"]

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,3 @@`
`1`	`1`	`module.exports = {`
`2`		`- presets: ['@babel/preset-env', '@babel/preset-typescript', '@babel/preset-react']`
	`2`	`+ presets: ['@babel/preset-env', '@babel/preset-typescript']`
`3`	`3`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-import { FunctionPlotDatum } from './types.js'`
	`1`	`+import type { FunctionPlotDatum } from './types.js'`
`2`	`2`	`import { randomId } from './utils.mjs'`
`3`	`3`
`4`	`4`	`export default function datumDefaults(d: FunctionPlotDatum): FunctionPlotDatum {`