@jbrowse/core 2.4.0 → 2.4.1

package/util/color/index.d.ts

@@ -1,5 +1,3 @@
-import { namedColorToHex, isNamedColor } from './cssColorsLevel4';
-export { namedColorToHex, isNamedColor };
 /**
  * Algorithmically pick a contrasting text color that will
  * be visible on top of the given background color. Either
@@ -22,3 +20,4 @@ export declare function contrastingTextColor(color: string): string;
  */
 export declare function emphasize(color: string, coefficient?: number): string;
 export declare function makeContrasting(foreground: string, background?: string, minContrastRatio?: number): string;
+export { isNamedColor, namedColorToHex } from './cssColorsLevel4';

package/util/color/index.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.makeContrasting = exports.emphasize = exports.contrastingTextColor = exports.isNamedColor = exports.namedColorToHex = void 0;
+exports.namedColorToHex = exports.isNamedColor = exports.makeContrasting = exports.emphasize = exports.contrastingTextColor = void 0;
 const styles_1 = require("@mui/material/styles");
 const cssColorsLevel4_1 = require("./cssColorsLevel4");
-Object.defineProperty(exports, "namedColorToHex", { enumerable: true, get: function () { return cssColorsLevel4_1.namedColorToHex; } });
-Object.defineProperty(exports, "isNamedColor", { enumerable: true, get: function () { return cssColorsLevel4_1.isNamedColor; } });
 /**
  * Algorithmically pick a contrasting text color that will
  * be visible on top of the given background color. Either
@@ -67,3 +65,6 @@ function makeContrasting(foreground, background = 'white', minContrastRatio = 3)
     return convertedForeground;
 }
 exports.makeContrasting = makeContrasting;
+var cssColorsLevel4_2 = require("./cssColorsLevel4");
+Object.defineProperty(exports, "isNamedColor", { enumerable: true, get: function () { return cssColorsLevel4_2.isNamedColor; } });
+Object.defineProperty(exports, "namedColorToHex", { enumerable: true, get: function () { return cssColorsLevel4_2.namedColorToHex; } });

package/util/idMaker.js

@@ -7,17 +7,14 @@ const _1 = require("./");
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 function idMaker(args, id = '') {
     const keys = Object.keys(args);
-    for (let i = 0; i < keys.length; i++) {
-        const key = keys[i];
+    for (const key of keys) {
         if (id.length > 5000) {
             break;
         }
-        if (typeof args[key] === 'object' && args[key]) {
-            id += idMaker(args[key], id);
-        }
-        else {
-            id += `${key}-${args[key]};`;
-        }
+        id +=
+            typeof args[key] === 'object' && args[key]
+                ? idMaker(args[key], id)
+                : `${key}-${args[key]};`;
     }
     return (0, _1.hashCode)(id);
 }

package/util/index.d.ts

@@ -1,7 +1,7 @@
 import PluginManager from '../PluginManager';
 import { IAnyStateTreeNode, IStateTreeNode } from 'mobx-state-tree';
 import { IReactionPublic, IReactionOptions } from 'mobx';
-import SimpleFeature, { Feature, SimpleFeatureSerialized, isFeature } from './simpleFeature';
+import { Feature } from './simpleFeature';
 import { AssemblyManager, Region, TypeTestedByPredicate } from './types';
 import { BaseBlock } from './blockTypes';
 export * from './types';
@@ -9,8 +9,6 @@ export * from './aborting';
 export * from './when';
 export * from './range';
 export * from './dedupe';
-export { SimpleFeature, isFeature };
-export type { Feature, SimpleFeatureSerialized };
 export * from './offscreenCanvasPonyfill';
 export * from './offscreenCanvasUtils';
 export declare const inDevelopment: boolean;
@@ -286,7 +284,7 @@ export declare const defaultCodonTable: {
 export declare function generateCodonTable(table: any): {
     [key: string]: string;
 };
-export declare function updateStatus<U>(msg: string, cb: (arg: string) => void, fn: () => U): Promise<U>;
+export declare function updateStatus<U>(msg: string, cb: (arg: string) => void, fn: () => U | Promise<U>): Promise<U>;
 export declare function hashCode(str: string): number;
 export declare function objectHash(obj: Record<string, any>): string;
 interface VirtualOffset {
@@ -324,8 +322,8 @@ export declare function getTickDisplayStr(totalBp: number, bpPerPx: number): str
 export declare function getViewParams(model: IAnyStateTreeNode, exportSVG?: boolean): {
     offsetPx: number;
     offsetPx1: number;
-    start: any;
-    end: any;
+    start: number;
+    end: number;
 };
 export declare function getLayoutId({ sessionId, layoutId, }: {
     sessionId: string;
@@ -337,7 +335,7 @@ export declare function getUriLink(value: {
     baseUri?: string;
 }): string;
 export declare function getStr(obj: unknown): string;
-export declare function measureGridWidth(elements: string[], args?: {
+export declare function measureGridWidth(elements: unknown[], args?: {
     minWidth?: number;
     fontSize?: number;
     maxWidth?: number;
@@ -353,3 +351,4 @@ export declare function max(arr: number[], init?: number): number;
 export declare function min(arr: number[], init?: number): number;
 export declare function sum(arr: number[]): number;
 export declare function avg(arr: number[]): number;
+export { default as SimpleFeature, type Feature, type SimpleFeatureSerialized, isFeature, } from './simpleFeature';

package/util/index.js

@@ -10,18 +10,6 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];
 }));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
-var __importStar = (this && this.__importStar) || function (mod) {
-    if (mod && mod.__esModule) return mod;
-    var result = {};
-    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
-    __setModuleDefault(result, mod);
-    return result;
-};
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
     for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
@@ -29,16 +17,13 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.bytesForRegions = exports.objectHash = exports.hashCode = exports.updateStatus = exports.generateCodonTable = exports.defaultCodonTable = exports.defaultStops = exports.defaultStarts = exports.measureText = exports.rIC = exports.blobToDataURL = exports.complement = exports.reverse = exports.revcom = exports.isElectron = exports.stringify = exports.shorten = exports.minmax = exports.renameRegionsIfNeeded = exports.renameRegionIfNeeded = exports.makeAbortableReaction = exports.findLastIndex = exports.iterMap = exports.bpSpanPx = exports.featureSpanPx = exports.cartesianToPolar = exports.polarToCartesian = exports.degToRad = exports.radToDeg = exports.bpToPx = exports.clamp = exports.compareLocStrings = exports.compareLocs = exports.parseLocString = exports.parseLocStringOneBased = exports.assembleLocStringFast = exports.assembleLocString = exports.getContainingDisplay = exports.getContainingTrack = exports.getContainingView = exports.getSession = exports.findParentThatIs = exports.springAnimate = exports.findParentThat = exports.useDebouncedCallback = exports.useDebounce = exports.inProduction = exports.inDevelopment = exports.isFeature = exports.SimpleFeature = void 0;
-exports.avg = exports.sum = exports.min = exports.max = exports.localStorageSetItem = exports.localStorageGetItem = exports.getEnv = exports.measureGridWidth = exports.getStr = exports.getUriLink = exports.useLocalStorage = exports.getLayoutId = exports.getViewParams = exports.getTickDisplayStr = exports.toLocale = exports.getBpDisplayStr = exports.supportedIndexingAdapters = void 0;
+exports.getBpDisplayStr = exports.supportedIndexingAdapters = exports.bytesForRegions = exports.objectHash = exports.hashCode = exports.updateStatus = exports.generateCodonTable = exports.defaultCodonTable = exports.defaultStops = exports.defaultStarts = exports.measureText = exports.rIC = exports.blobToDataURL = exports.complement = exports.reverse = exports.revcom = exports.isElectron = exports.stringify = exports.shorten = exports.minmax = exports.renameRegionsIfNeeded = exports.renameRegionIfNeeded = exports.makeAbortableReaction = exports.findLastIndex = exports.iterMap = exports.bpSpanPx = exports.featureSpanPx = exports.cartesianToPolar = exports.polarToCartesian = exports.degToRad = exports.radToDeg = exports.bpToPx = exports.clamp = exports.compareLocStrings = exports.compareLocs = exports.parseLocString = exports.parseLocStringOneBased = exports.assembleLocStringFast = exports.assembleLocString = exports.getContainingDisplay = exports.getContainingTrack = exports.getContainingView = exports.getSession = exports.findParentThatIs = exports.springAnimate = exports.findParentThat = exports.useDebouncedCallback = exports.useDebounce = exports.inProduction = exports.inDevelopment = void 0;
+exports.isFeature = exports.SimpleFeature = exports.avg = exports.sum = exports.min = exports.max = exports.localStorageSetItem = exports.localStorageGetItem = exports.getEnv = exports.measureGridWidth = exports.getStr = exports.getUriLink = exports.useLocalStorage = exports.getLayoutId = exports.getViewParams = exports.getTickDisplayStr = exports.toLocale = void 0;
 /* eslint-disable @typescript-eslint/no-explicit-any */
 const react_1 = require("react");
 const is_object_1 = __importDefault(require("is-object"));
 const mobx_state_tree_1 = require("mobx-state-tree");
 const mobx_1 = require("mobx");
-const simpleFeature_1 = __importStar(require("./simpleFeature"));
-exports.SimpleFeature = simpleFeature_1.default;
-Object.defineProperty(exports, "isFeature", { enumerable: true, get: function () { return simpleFeature_1.isFeature; } });
 const types_1 = require("./types");
 const aborting_1 = require("./aborting");
 const types_2 = require("./types");
@@ -278,12 +263,12 @@ function parseLocStringOneBased(locString, isValidRefName) {
     let reversed = false;
     if (locString.endsWith('[rev]')) {
         reversed = true;
-        locString = locString.replace(/\[rev\]$/, '');
+        locString = locString.replace(/\[rev]$/, '');
     }
     // remove any whitespace
     locString = locString.replace(/\s/, '');
     // refNames can have colons, ref https://samtools.github.io/hts-specs/SAMv1.pdf Appendix A
-    const assemblyMatch = locString.match(/(\{(.+)\})?(.+)/);
+    const assemblyMatch = locString.match(/({(.+)})?(.+)/);
     if (!assemblyMatch) {
         throw new Error(`invalid location string: "${locString}"`);
     }
@@ -465,8 +450,8 @@ function bpToPx(bp, { reversed, end = 0, start = 0, }, bpPerPx) {
     return roundToNearestPointOne((reversed ? end - bp : bp - start) / bpPerPx);
 }
 exports.bpToPx = bpToPx;
-const oneEightyOverPi = 180.0 / Math.PI;
-const piOverOneEighty = Math.PI / 180.0;
+const oneEightyOverPi = 180 / Math.PI;
+const piOverOneEighty = Math.PI / 180;
 function radToDeg(radians) {
     return (radians * oneEightyOverPi) % 360;
 }
@@ -505,7 +490,7 @@ function bpSpanPx(leftBp, rightBp, region, bpPerPx) {
 exports.bpSpanPx = bpSpanPx;
 // do an array map of an iterable
 function iterMap(iter, func, sizeHint) {
-    const results = sizeHint ? new Array(sizeHint) : [];
+    const results = Array.from({ length: sizeHint || 0 });
     let counter = 0;
     for (const item of iter) {
         results[counter] = func(item);
@@ -552,7 +537,7 @@ exports.findLastIndex = findLastIndex;
  * @param errorFunction -
  */
 function makeAbortableReaction(self, dataFunction, asyncReactionFunction, 
-// @ts-ignore
+// @ts-expect-error
 reactionOptions, startedFunction, successFunction, errorFunction) {
     let inProgress;
     function handleError(error) {
@@ -585,7 +570,7 @@ reactionOptions, startedFunction, successFunction, errorFunction) {
         startedFunction(thisInProgress);
         try {
             const result = await asyncReactionFunction(data, thisInProgress.signal, self, 
-            // @ts-ignore
+            // @ts-expect-error
             mobxReactionHandle);
             (0, aborting_1.checkAbortSignal)(thisInProgress.signal);
             if ((0, mobx_state_tree_1.isAlive)(self)) {
@@ -610,15 +595,12 @@ function renameRegionIfNeeded(refNameMap, region) {
     if ((0, mobx_state_tree_1.isStateTreeNode)(region) && !(0, mobx_state_tree_1.isAlive)(region)) {
         return region;
     }
-    if (region && refNameMap && refNameMap[region.refName]) {
+    if (region && (refNameMap === null || refNameMap === void 0 ? void 0 : refNameMap[region.refName])) {
         // clone the region so we don't modify it
-        if ((0, mobx_state_tree_1.isStateTreeNode)(region)) {
-            // @ts-ignore
-            region = { ...(0, mobx_state_tree_1.getSnapshot)(region) };
-        }
-        else {
-            region = { ...region };
-        }
+        region = (0, mobx_state_tree_1.isStateTreeNode)(region)
+            ? // @ts-expect-error
+                { ...(0, mobx_state_tree_1.getSnapshot)(region) }
+            : { ...region };
         // modify it directly in the container
         const newRef = refNameMap[region.refName];
         if (newRef) {
@@ -741,11 +723,9 @@ exports.blobToDataURL = blobToDataURL;
 // otherwise listens for prerendered_canvas but reads empty pixels, and doesn't
 // get the contents of the canvas
 exports.rIC = typeof jest === 'undefined'
-    ? // @ts-ignore
-        typeof window !== 'undefined' && window.requestIdleCallback
-            ? // @ts-ignore
-                window.requestIdleCallback
-            : (cb) => setTimeout(() => cb(), 1)
+    ? typeof window !== 'undefined' && window.requestIdleCallback
+        ? window.requestIdleCallback
+        : (cb) => setTimeout(() => cb(), 1)
     : (cb) => cb();
 // prettier-ignore
 const widths = [0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0.2796875, 0.2765625, 0.3546875, 0.5546875, 0.5546875, 0.8890625, 0.665625, 0.190625, 0.3328125, 0.3328125, 0.3890625, 0.5828125, 0.2765625, 0.3328125, 0.2765625, 0.3015625, 0.5546875, 0.5546875, 0.5546875, 0.5546875, 0.5546875, 0.5546875, 0.5546875, 0.5546875, 0.5546875, 0.5546875, 0.2765625, 0.2765625, 0.584375, 0.5828125, 0.584375, 0.5546875, 1.0140625, 0.665625, 0.665625, 0.721875, 0.721875, 0.665625, 0.609375, 0.7765625, 0.721875, 0.2765625, 0.5, 0.665625, 0.5546875, 0.8328125, 0.721875, 0.7765625, 0.665625, 0.7765625, 0.721875, 0.665625, 0.609375, 0.721875, 0.665625, 0.94375, 0.665625, 0.665625, 0.609375, 0.2765625, 0.3546875, 0.2765625, 0.4765625, 0.5546875, 0.3328125, 0.5546875, 0.5546875, 0.5, 0.5546875, 0.5546875, 0.2765625, 0.5546875, 0.5546875, 0.221875, 0.240625, 0.5, 0.221875, 0.8328125, 0.5546875, 0.5546875, 0.5546875, 0.5546875, 0.3328125, 0.5, 0.2765625, 0.5546875, 0.5, 0.721875, 0.5, 0.5, 0.5, 0.3546875, 0.259375, 0.353125, 0.5890625];
@@ -910,10 +890,10 @@ exports.supportedIndexingAdapters = supportedIndexingAdapters;
 function getBpDisplayStr(totalBp) {
     let str;
     if (Math.floor(totalBp / 1000000) > 0) {
-        str = `${parseFloat((totalBp / 1000000).toPrecision(3))}Mbp`;
+        str = `${Number.parseFloat((totalBp / 1000000).toPrecision(3))}Mbp`;
     }
     else if (Math.floor(totalBp / 1000) > 0) {
-        str = `${parseFloat((totalBp / 1000).toPrecision(3))}Kbp`;
+        str = `${Number.parseFloat((totalBp / 1000).toPrecision(3))}Kbp`;
     }
     else {
         str = `${toLocale(Math.floor(totalBp))}bp`;
@@ -926,18 +906,12 @@ function toLocale(n) {
 }
 exports.toLocale = toLocale;
 function getTickDisplayStr(totalBp, bpPerPx) {
-    let str;
-    if (Math.floor(bpPerPx / 1000) > 0) {
-        str = `${toLocale(parseFloat((totalBp / 1000000).toFixed(2)))}M`;
-    }
-    else {
-        str = `${toLocale(Math.floor(totalBp))}`;
-    }
-    return str;
+    return Math.floor(bpPerPx / 1000) > 0
+        ? `${toLocale(Number.parseFloat((totalBp / 1000000).toFixed(2)))}M`
+        : `${toLocale(Math.floor(totalBp))}`;
 }
 exports.getTickDisplayStr = getTickDisplayStr;
 function getViewParams(model, exportSVG) {
-    // @ts-ignore
     const { dynamicBlocks, staticBlocks, offsetPx } = getContainingView(model);
     const b = (dynamicBlocks === null || dynamicBlocks === void 0 ? void 0 : dynamicBlocks.contentBlocks[0]) || {};
     const staticblock = (staticBlocks === null || staticBlocks === void 0 ? void 0 : staticBlocks.contentBlocks[0]) || {};
@@ -1062,3 +1036,6 @@ function avg(arr) {
     return sum(arr) / arr.length;
 }
 exports.avg = avg;
+var simpleFeature_1 = require("./simpleFeature");
+Object.defineProperty(exports, "SimpleFeature", { enumerable: true, get: function () { return __importDefault(simpleFeature_1).default; } });
+Object.defineProperty(exports, "isFeature", { enumerable: true, get: function () { return simpleFeature_1.isFeature; } });

package/util/io/RemoteFileWithRangeCache.js

@@ -50,8 +50,8 @@ class RemoteFileWithRangeCache extends generic_filehandle_1.RemoteFile {
             const rangeParse = /bytes=(\d+)-(\d+)/.exec(range);
             if (rangeParse) {
                 const [, start, end] = rangeParse;
-                const s = parseInt(start, 10);
-                const e = parseInt(end, 10);
+                const s = Number.parseInt(start, 10);
+                const e = Number.parseInt(end, 10);
                 const response = (await globalRangeCache.getRange(url, s, e - s + 1, {
                     signal: init && init.signal,
                 }));

package/util/io/index.d.ts

@@ -1,7 +1,6 @@
 import { GenericFilehandle, Fetcher } from 'generic-filehandle';
-import { RemoteFileWithRangeCache } from './RemoteFileWithRangeCache';
 import { FileLocation } from '../types';
 import PluginManager from '../../PluginManager';
-export { RemoteFileWithRangeCache };
 export declare function openLocation(location: FileLocation, pluginManager?: PluginManager): GenericFilehandle;
 export declare function getFetcher(location: FileLocation, pluginManager?: PluginManager): Fetcher;
+export { RemoteFileWithRangeCache } from './RemoteFileWithRangeCache';

package/util/io/index.js

@@ -3,12 +3,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getFetcher = exports.openLocation = exports.RemoteFileWithRangeCache = void 0;
+exports.RemoteFileWithRangeCache = exports.getFetcher = exports.openLocation = void 0;
 const generic_filehandle_1 = require("generic-filehandle");
 const detect_node_1 = __importDefault(require("detect-node"));
 // locals
 const RemoteFileWithRangeCache_1 = require("./RemoteFileWithRangeCache");
-Object.defineProperty(exports, "RemoteFileWithRangeCache", { enumerable: true, get: function () { return RemoteFileWithRangeCache_1.RemoteFileWithRangeCache; } });
 const types_1 = require("../types");
 const tracks_1 = require("../tracks");
 const __1 = require("../");
@@ -105,10 +104,11 @@ function getInternetAccount(location, pluginManager) {
 async function checkAuthNeededFetch(url, opts) {
     var _a;
     const response = await fetch(url, opts);
-    if (response.status === 401) {
-        if ((_a = response.headers.get('WWW-Authenticate')) === null || _a === void 0 ? void 0 : _a.includes('Basic')) {
-            throw new types_1.AuthNeededError('Accessing HTTPBasic resource without authentication', url.toString());
-        }
+    if (response.status === 401 &&
+        ((_a = response.headers.get('WWW-Authenticate')) === null || _a === void 0 ? void 0 : _a.includes('Basic'))) {
+        throw new types_1.AuthNeededError('Accessing HTTPBasic resource without authentication', url.toString());
     }
     return response;
 }
+var RemoteFileWithRangeCache_2 = require("./RemoteFileWithRangeCache");
+Object.defineProperty(exports, "RemoteFileWithRangeCache", { enumerable: true, get: function () { return RemoteFileWithRangeCache_2.RemoteFileWithRangeCache; } });

package/util/jexl.js

@@ -45,7 +45,9 @@ function default_1( /* config?: any*/) {
     j.addFunction('replaceAll', (s, match, sub) => s.replaceAll(match, sub));
     j.addFunction('slice', (s, start, end) => s.slice(start, end));
     j.addFunction('startsWith', (s, search, pos) => s.startsWith(search, pos));
-    j.addFunction('substring', (s, start, end) => s.substring(start, end));
+    j.addFunction('substring', (s, start, end) => 
+    // eslint-disable-next-line unicorn/prefer-string-slice
+    s.substring(start, end));
     j.addFunction('toLowerCase', (s) => s.toLowerCase());
     j.addFunction('toUpperCase', (s) => s.toUpperCase());
     j.addFunction('trim', (s) => s.trim());

package/util/layouts/GranularRectLayout.js

@@ -64,7 +64,7 @@ class LayoutRow {
             offset: left - rectWidth,
             min: left,
             max: right,
-            bits: new Array(3 * rectWidth),
+            bits: Array.from({ length: 3 * rectWidth }),
         };
     }
     addRect(rect, data) {
@@ -85,7 +85,10 @@ class LayoutRow {
                 this.rowState = this.initialize(left, right);
             }
             else if (additionalLength > 0) {
-                this.rowState.bits = this.rowState.bits.concat(new Array(additionalLength));
+                this.rowState.bits = [
+                    ...this.rowState.bits,
+                    ...Array.from({ length: additionalLength }),
+                ];
             }
         }
         // expand leftward if necessary
@@ -97,7 +100,10 @@ class LayoutRow {
                 this.rowState = this.initialize(left, right);
             }
             else {
-                this.rowState.bits = new Array(additionalLength).concat(this.rowState.bits);
+                this.rowState.bits = [
+                    ...Array.from({ length: additionalLength }),
+                    ...this.rowState.bits,
+                ];
                 this.rowState.offset -= additionalLength;
             }
         }
@@ -370,7 +376,7 @@ class GranularRectLayout {
         return this.getTotalHeight();
     }
     getRectangles() {
-        return new Map(Array.from(this.rectangles.entries()).map(([id, rect]) => {
+        return new Map([...this.rectangles.entries()].map(([id, rect]) => {
             const { l, r, originalHeight, top } = rect;
             const t = (top || 0) * this.pitchY;
             const b = t + originalHeight;

package/util/layouts/MultiLayout.js

@@ -13,7 +13,7 @@ class MultiLayout {
     }
     getDataByID(id) {
         for (const layout of this.subLayouts.values()) {
-            // @ts-ignore
+            // @ts-expect-error
             const r = layout.getDataByID(id);
             if (r) {
                 return r;

package/util/layouts/SceneGraph.js

@@ -32,13 +32,9 @@ class SceneGraph {
     addChild(nameOrSceneGraph, left, top, width, height, 
     // eslint-disable-next-line @typescript-eslint/no-explicit-any
     data) {
-        let child;
-        if (nameOrSceneGraph instanceof SceneGraph) {
-            child = nameOrSceneGraph;
-        }
-        else {
-            child = new SceneGraph(nameOrSceneGraph, left, top, width, height, data);
-        }
+        const child = nameOrSceneGraph instanceof SceneGraph
+            ? nameOrSceneGraph
+            : new SceneGraph(nameOrSceneGraph, left, top, width, height, data);
         if (!(child instanceof SceneGraph)) {
             throw new TypeError('argument to addChild must be an array or a SceneGraph');
         }

package/util/offscreenCanvasPonyfill.js

@@ -33,19 +33,20 @@ if (weHave.realOffscreenCanvas) {
 else if (weHave.node) {
     // use node-canvas if we are running in node (i.e. automated tests)
     exports.createCanvas = (...args) => {
-        // @ts-ignore
+        // @ts-expect-error
         // eslint-disable-next-line no-undef
         return nodeCreateCanvas(...args);
     };
     exports.createImageBitmap = async (canvas, ...otherargs) => {
-        if (otherargs.length) {
+        if (otherargs.length > 0) {
             throw new Error('only one-argument uses of createImageBitmap are supported by the node offscreencanvas ponyfill');
         }
         const dataUri = canvas.toDataURL();
-        // @ts-ignore
+        // @ts-expect-error
         // eslint-disable-next-line no-undef
         const img = new nodeImage();
         return new Promise((resolve, reject) => {
+            // need onload for jest
             img.onload = () => resolve(img);
             img.onerror = reject;
             img.src = dataUri;

package/util/offscreenCanvasUtils.js

@@ -79,6 +79,7 @@ async function renderToAbstractCanvas(width, height, opts, cb) {
 exports.renderToAbstractCanvas = renderToAbstractCanvas;
 async function getSerializedSvg(results) {
     const { width, height, canvasRecordedData } = results;
+    // @ts-ignore needs to be ignore not expect error, produces error in build step
     const C2S = await Promise.resolve().then(() => __importStar(require('canvas2svg')));
     const ctx = new C2S.default(width, height);
     const seq = new canvas_sequencer_1.CanvasSequence(canvasRecordedData);

package/util/tracks.d.ts

@@ -75,4 +75,4 @@ export declare function generateUnknownTrackConf(trackName: string, trackUrl: st
 };
 export declare function getTrackName(conf: AnyConfigurationModel, session: {
     assemblies: AnyConfigurationModel[];
-}): any;
+}): string;

package/util/tracks.js

@@ -141,7 +141,6 @@ function guessAdapter(file, index, adapterHint, model) {
 exports.guessAdapter = guessAdapter;
 function guessTrackType(adapterType, model) {
     if (model) {
-        // @ts-ignore
         const session = (0, index_1.getSession)(model);
         const trackTypeGuesser = (0, index_1.getEnv)(session).pluginManager.evaluateExtensionPoint('Core-guessTrackTypeForLocation', (_adapterName) => {
             return undefined;

package/util/types/index.d.ts

@@ -22,7 +22,6 @@ export interface SnackAction {
     onClick: () => void;
 }
 export type AssemblyManager = Instance<ReturnType<typeof assemblyManager>>;
-export type { TextSearchManager };
 export interface BasePlugin {
     version?: string;
     name: string;
@@ -230,3 +229,4 @@ export type PreBlobLocation = {
     blob: File;
 };
 export type PreFileLocation = PreUriLocation | PreLocalPathLocation | PreBlobLocation;
+export { type default as TextSearchManager } from '../../TextSearch/TextSearchManager';

package/util/types/index.js

@@ -37,7 +37,7 @@ function isSessionModelWithConfigEditing(thing) {
 exports.isSessionModelWithConfigEditing = isSessionModelWithConfigEditing;
 function isSessionWithAddTracks(thing) {
     return (
-    // @ts-ignore
+    // @ts-expect-error
     isSessionModel(thing) && 'addTrackConf' in thing && !thing.disableAddTracks);
 }
 exports.isSessionWithAddTracks = isSessionWithAddTracks;
@@ -71,7 +71,7 @@ function isTrackModel(thing) {
     return (typeof thing === 'object' &&
         thing !== null &&
         'configuration' in thing &&
-        // @ts-ignore
+        // @ts-expect-error
         thing.configuration.trackId);
 }
 exports.isTrackModel = isTrackModel;
@@ -79,7 +79,7 @@ function isDisplayModel(thing) {
     return (typeof thing === 'object' &&
         thing !== null &&
         'configuration' in thing &&
-        // @ts-ignore
+        // @ts-expect-error
         thing.configuration.displayId);
 }
 exports.isDisplayModel = isDisplayModel;

package/util/types/mst.js

@@ -70,16 +70,16 @@ exports.UriLocation = mobx_state_tree_1.types.snapshotProcessor(exports.UriLocat
     },
 });
 exports.FileLocation = mobx_state_tree_1.types.snapshotProcessor(mobx_state_tree_1.types.union(exports.LocalPathLocation, exports.UriLocation, exports.BlobLocation), {
-    // @ts-ignore
+    // @ts-expect-error
     preProcessor(snap) {
         if (!snap) {
             return undefined;
         }
-        // @ts-ignore
+        // @ts-expect-error
         // xref https://github.com/mobxjs/mobx-state-tree/issues/1524 for Omit
         const { locationType, ...rest } = snap;
         if (!locationType) {
-            // @ts-ignore
+            // @ts-expect-error
             const { uri, localPath, blob } = rest;
             let locationType = '';
             if (uri !== undefined) {