Upgrade to TypeScript 5.7 (#14167)

* Upgrade to TypeScript 5.7 * Update ndarray() to use ArrayBufferLike
bokeh · Nov 25, 2024 · c829640 · c829640
1 parent eb6eb51
commit c829640
Show file tree

Hide file tree

Showing 6 changed files with 30 additions and 20 deletions.
diff --git a/bokehjs/make/package.json b/bokehjs/make/package.json
@@ -24,7 +24,7 @@
     "semver": "^7.6.2",
     "ts-node": "^10.9.2",
     "tsconfig-paths": "^4.2.0",
-    "typescript": "~5.6.2",
+    "typescript": "~5.7.2",
     "typescript-eslint": "^7.16.0",
     "which": "^3.0.1",
     "yargs": "^17.7.2"

diff --git a/bokehjs/package-lock.json b/bokehjs/package-lock.json
diff --git a/bokehjs/package.json b/bokehjs/package.json
@@ -55,7 +55,7 @@
     "regl": "^2.1.0",
     "sprintf-js": "^1.1.3",
     "timezone": "^1.0.23",
-    "tslib": "^2.7.0",
+    "tslib": "^2.8.1",
     "underscore.template": "^0.1.7"
   }
 }
diff --git a/bokehjs/src/compiler/package.json b/bokehjs/src/compiler/package.json
@@ -21,7 +21,7 @@
     "css": "^3.0.0",
     "less": "^4.2.0",
     "terser": "^5.31.2",
-    "typescript": "~5.6.2",
+    "typescript": "~5.7.2",
     "yargs": "^17.7.2"
   }
 }
diff --git a/bokehjs/src/lib/core/util/ndarray.ts b/bokehjs/src/lib/core/util/ndarray.ts
@@ -1,5 +1,5 @@
 import type {NDDataType, Arrayable} from "../types"
-import {isObject, isNumber} from "./types"
+import {isObject, isNumber, is_ArrayBufferLike} from "./types"
 import {BYTE_ORDER} from "./platform"
 import type {Equatable, Comparator} from "./eq"
 import {equals} from "./eq"
@@ -30,7 +30,7 @@ export interface NDArrayType<T, U=T> extends Arrayable<U>, Equatable, Cloneable,
   [i: number]: U
 }
 
-type Init<T> = number | ArrayBuffer | ArrayLike<T>
+type Init<T> = number | ArrayBufferLike | ArrayLike<T>
 
 export class BoolNDArray extends Uint8Array implements NDArrayType<boolean, number> {
   readonly [__ndarray__] = true
@@ -308,7 +308,7 @@ export class ObjectNDArray<T=unknown> extends Array<T> implements NDArrayType<T>
   }
 
   constructor(init_: Init<T>, shape?: number[]) {
-    const init = init_ instanceof ArrayBuffer ? new Float64Array(init_) : init_
+    const init = is_ArrayBufferLike(init_) ? new Float64Array(init_) : init_
     const size = isNumber(init) ? init : init.length
 
     super(size)
@@ -376,11 +376,11 @@ export type Float32Array2d = Float32NDArray & Array2d
 export type Float64Array2d = Float64NDArray & Array2d
 export type FloatArray2d   = Float32Array2d | Float64Array2d
 
-export function ndarray<S extends number[]>(init: number | ArrayBuffer | ArrayLike<unknown>, options?: {shape?: S}): NDArrayTypes["object"]["ndarray"] & ArrayNd<S>
-export function ndarray<K extends NDDataType, S extends number[]>(init: number | ArrayBuffer | ArrayLike<number>, options?: {dtype: K, shape?: S}): NDArrayTypes[K]["ndarray"] & ArrayNd<S>
+export function ndarray<S extends number[]>(init: number | ArrayBufferLike | ArrayLike<unknown>, options?: {shape?: S}): NDArrayTypes["object"]["ndarray"] & ArrayNd<S>
+export function ndarray<K extends NDDataType, S extends number[]>(init: number | ArrayBufferLike | ArrayLike<number>, options?: {dtype: K, shape?: S}): NDArrayTypes[K]["ndarray"] & ArrayNd<S>
 export function ndarray<S extends number[]>(init: ArrayLike<unknown>, options?: {dtype: "object", shape?: S}): NDArrayTypes["object"]["ndarray"] & ArrayNd<S>
 
-export function ndarray(init: number | ArrayBuffer | ArrayLike<unknown>, {dtype, shape}: {dtype?: NDDataType, shape?: number[]} = {}): NDArray {
+export function ndarray(init: number | ArrayBufferLike | ArrayLike<unknown>, {dtype, shape}: {dtype?: NDDataType, shape?: number[]} = {}): NDArray {
   if (dtype == null) {
     dtype = (() => {
       switch (true) {
@@ -391,9 +391,14 @@ export function ndarray(init: number | ArrayBuffer | ArrayLike<unknown>, {dtype,
         case init instanceof Uint32Array:  return "uint32"
         case init instanceof Int32Array:   return "int32"
         case init instanceof Float32Array: return "float32"
-        case init instanceof ArrayBuffer:
         case init instanceof Float64Array: return "float64"
-        default:                           return "object"
+        default: {
+          if (is_ArrayBufferLike(init)) {
+            return "float64"
+          } else {
+            return "object"
+          }
+        }
       }
     })()
   }

diff --git a/bokehjs/src/lib/core/util/types.ts b/bokehjs/src/lib/core/util/types.ts
@@ -109,3 +109,8 @@ export function isIterable(obj: unknown): obj is Iterable<unknown> {
 export function isArrayable(obj: unknown): obj is Arrayable<unknown> {
   return isIterable(obj) && "length" in obj
 }
+
+export function is_ArrayBufferLike(obj: unknown): obj is ArrayBufferLike {
+  // SharedArrayBuffer is only available in cross origin isolated environments, otherwise it's undefined
+  return obj instanceof ArrayBuffer || (typeof SharedArrayBuffer !== "undefined" && obj instanceof SharedArrayBuffer)
+}