@jbrowse/plugin-hic 3.0.5 → 3.2.0

package/dist/HicAdapter/configSchema.js

@@ -15,5 +15,18 @@ const HicAdapter = (0, configuration_1.ConfigurationSchema)('HicAdapter', {
         defaultValue: 1,
         description: 'Initial resolution multiplier',
     },
-}, { explicitlyTyped: true });
+}, {
+    explicitlyTyped: true,
+    preProcessSnapshot: snap => {
+        return snap.uri
+            ? {
+                ...snap,
+                hicLocation: {
+                    uri: snap.uri,
+                    baseUri: snap.baseUri,
+                },
+            }
+            : snap;
+    },
+});
 exports.default = HicAdapter;

package/dist/HicRenderer/makeImageData.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeImageData = makeImageData;
 const configuration_1 = require("@jbrowse/core/configuration");
 const dataAdapterCache_1 = require("@jbrowse/core/data_adapters/dataAdapterCache");
+const util_1 = require("@jbrowse/core/util");
 const colord_1 = require("@jbrowse/core/util/colord");
 const stopToken_1 = require("@jbrowse/core/util/stopToken");
 const d3_interpolate_1 = require("@mui/x-charts-vendor/d3-interpolate");
@@ -64,8 +65,7 @@ async function makeImageData(ctx, props) {
             ctx.translate(-width, 0);
         }
         ctx.rotate(-Math.PI / 4);
-        let start = performance.now();
-        for (const { bin1, bin2, counts } of features) {
+        (0, util_1.forEachWithStopTokenCheck)(features, stopToken, ({ bin1, bin2, counts }) => {
             ctx.fillStyle = (0, configuration_1.readConfObject)(config, 'color', {
                 count: counts,
                 maxScore,
@@ -74,11 +74,7 @@ async function makeImageData(ctx, props) {
                 useLogScale,
             });
             ctx.fillRect((bin1 - offset) * w, (bin2 - offset) * w, w, w);
-            if (performance.now() - start > 400) {
-                (0, stopToken_1.checkStopToken)(stopToken);
-                start = performance.now();
-            }
-        }
+        });
         ctx.restore();
     }
     return undefined;

package/esm/HicAdapter/configSchema.js

@@ -13,5 +13,18 @@ const HicAdapter = ConfigurationSchema('HicAdapter', {
         defaultValue: 1,
         description: 'Initial resolution multiplier',
     },
-}, { explicitlyTyped: true });
+}, {
+    explicitlyTyped: true,
+    preProcessSnapshot: snap => {
+        return snap.uri
+            ? {
+                ...snap,
+                hicLocation: {
+                    uri: snap.uri,
+                    baseUri: snap.baseUri,
+                },
+            }
+            : snap;
+    },
+});
 export default HicAdapter;

package/esm/HicRenderer/makeImageData.js

@@ -1,5 +1,6 @@
 import { readConfObject } from '@jbrowse/core/configuration';
 import { getAdapter } from '@jbrowse/core/data_adapters/dataAdapterCache';
+import { forEachWithStopTokenCheck } from '@jbrowse/core/util';
 import { colord } from '@jbrowse/core/util/colord';
 import { checkStopToken } from '@jbrowse/core/util/stopToken';
 import { interpolateRgbBasis } from '@mui/x-charts-vendor/d3-interpolate';
@@ -58,8 +59,7 @@ export async function makeImageData(ctx, props) {
             ctx.translate(-width, 0);
         }
         ctx.rotate(-Math.PI / 4);
-        let start = performance.now();
-        for (const { bin1, bin2, counts } of features) {
+        forEachWithStopTokenCheck(features, stopToken, ({ bin1, bin2, counts }) => {
             ctx.fillStyle = readConfObject(config, 'color', {
                 count: counts,
                 maxScore,
@@ -68,11 +68,7 @@ export async function makeImageData(ctx, props) {
                 useLogScale,
             });
             ctx.fillRect((bin1 - offset) * w, (bin2 - offset) * w, w, w);
-            if (performance.now() - start > 400) {
-                checkStopToken(stopToken);
-                start = performance.now();
-            }
-        }
+        });
         ctx.restore();
     }
     return undefined;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jbrowse/plugin-hic",
-  "version": "3.0.5",
+  "version": "3.2.0",
   "description": "JBrowse 2 hic adapters, tracks, etc.",
   "keywords": [
     "jbrowse",
@@ -36,8 +36,8 @@
     "clean": "rimraf dist esm *.tsbuildinfo"
   },
   "dependencies": {
-    "@jbrowse/core": "^3.0.5",
-    "@jbrowse/plugin-linear-genome-view": "^3.0.5",
+    "@jbrowse/core": "^3.2.0",
+    "@jbrowse/plugin-linear-genome-view": "^3.2.0",
     "@mui/material": "^6.0.0",
     "@mui/x-charts-vendor": "^7.12.0",
     "hic-straw": "^2.0.3",
@@ -55,5 +55,5 @@
   "publishConfig": {
     "access": "public"
   },
-  "gitHead": "a03749efe19e51609922272b845a331897346789"
+  "gitHead": "c750e3f56706a490c19ba75abd807fec5e38aebf"
 }