molstar 3.26.0 → 3.28.0

package/lib/mol-theme/label.js

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2018-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  * @author David Sehnal <david.sehnal@gmail.com>
@@ -21,6 +21,7 @@ export var DefaultLabelOptions = {
     htmlStyling: true,
 };
 export function lociLabel(loci, options) {
+    var _a;
     if (options === void 0) { options = {}; }
     switch (loci.kind) {
         case 'structure-loci':
@@ -61,6 +62,17 @@ export function lociLabel(loci, options) {
                 label.push("".concat(Volume.IsoValue.toString(absVal), " (").concat(Volume.IsoValue.toString(relVal), ")"));
             }
             return label.join(' | ');
+        case 'segment-loci':
+            var segmentLabels = (_a = Volume.Segmentation.get(loci.volume)) === null || _a === void 0 ? void 0 : _a.labels;
+            if (segmentLabels && loci.segments.length === 1) {
+                var label_1 = segmentLabels[loci.segments[0]];
+                if (label_1)
+                    return label_1;
+            }
+            return [
+                "".concat(loci.volume.label || 'Volume'),
+                "".concat(loci.segments.length === 1 ? "Segment ".concat(loci.segments[0]) : "".concat(loci.segments.length, " Segments"))
+            ].join(' | ');
     }
 }
 function countLabel(count, label) {

package/lib/mol-util/param-definition.d.ts

@@ -160,8 +160,11 @@ export declare namespace ParamDefinition {
     }, info?: Info): Interval;
     export interface LineGraph extends Base<Vec2Data[]> {
         type: 'line-graph';
+        getVolume?: () => unknown;
     }
-    export function LineGraph(defaultValue: Vec2Data[], info?: Info): LineGraph;
+    export function LineGraph(defaultValue: Vec2Data[], info?: Info & {
+        getVolume?: (binCount?: number) => unknown;
+    }): LineGraph;
     export interface Group<T> extends Base<T> {
         type: 'group';
         params: Params;

package/lib/mol-util/param-definition.js

@@ -142,7 +142,10 @@ export var ParamDefinition;
     }
     ParamDefinition.Interval = Interval;
     function LineGraph(defaultValue, info) {
-        return setInfo({ type: 'line-graph', defaultValue: defaultValue }, info);
+        var ret = setInfo({ type: 'line-graph', defaultValue: defaultValue }, info);
+        if (info === null || info === void 0 ? void 0 : info.getVolume)
+            ret.getVolume = info.getVolume;
+        return ret;
     }
     ParamDefinition.LineGraph = LineGraph;
     function Group(params, info) {
@@ -204,7 +207,7 @@ export var ParamDefinition;
     }
     ParamDefinition.DataRef = DataRef;
     function Converted(fromValue, toValue, converted) {
-        return { type: 'converted', defaultValue: toValue(converted.defaultValue), converted: converted, fromValue: fromValue, toValue: toValue };
+        return setInfo({ type: 'converted', defaultValue: toValue(converted.defaultValue), converted: converted, fromValue: fromValue, toValue: toValue }, converted);
     }
     ParamDefinition.Converted = Converted;
     function Conditioned(defaultValue, conditionParams, conditionForValue, conditionedValue, info) {

package/package.json

@@ -1,168 +1,169 @@
-{
-  "name": "molstar",
-  "version": "3.26.0",
-  "description": "A comprehensive macromolecular library.",
-  "homepage": "https://github.com/molstar/molstar#readme",
-  "repository": {
-    "type": "git",
-    "url": "https://github.com/molstar/molstar.git"
-  },
-  "bugs": {
-    "url": "https://github.com/molstar/molstar/issues"
-  },
-  "scripts": {
-    "lint": "eslint .",
-    "lint-fix": "eslint . --fix",
-    "test": "npm install --no-save \"gl@^5.0.0\" && npm run lint && jest",
-    "jest": "jest",
-    "build": "npm run build-tsc && npm run build-extra && npm run build-webpack",
-    "clean": "node ./scripts/clean.js",
-    "rebuild": "npm run clean && npm run build",
-    "build-viewer": "npm run build-tsc && npm run build-extra && npm run build-webpack-viewer",
-    "build-tsc": "concurrently \"tsc --incremental\" \"tsc --build tsconfig.commonjs.json --incremental\"",
-    "build-extra": "cpx \"src/**/*.{scss,html,ico,jpg}\" lib/",
-    "build-webpack": "webpack --mode production --config ./webpack.config.production.js",
-    "build-webpack-viewer": "webpack --mode production --config ./webpack.config.viewer.js",
-    "watch": "concurrently -c \"green,green,gray,gray\" --names \"tsc,srv,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-servers\" \"npm:watch-extra\" \"npm:watch-webpack\"",
-    "watch-viewer": "concurrently -c \"green,gray,gray\" --names \"tsc,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack-viewer\"",
-    "watch-viewer-debug": "concurrently -c \"green,gray,gray\" --names \"tsc,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack-viewer-debug\"",
-    "watch-tsc": "tsc --watch --incremental",
-    "watch-servers": "tsc --build tsconfig.commonjs.json --watch --incremental",
-    "watch-extra": "cpx \"src/**/*.{scss,html,ico,jpg}\" lib/ --watch",
-    "watch-webpack": "webpack -w --mode development --stats minimal",
-    "watch-webpack-viewer": "webpack -w --mode development --stats minimal --config ./webpack.config.viewer.js",
-    "watch-webpack-viewer-debug": "webpack -w --mode development --stats minimal --config ./webpack.config.viewer.debug.js",
-    "serve": "http-server -p 1338 -g",
-    "model-server": "node lib/commonjs/servers/model/server.js",
-    "model-server-watch": "nodemon --watch lib lib/commonjs/servers/model/server.js",
-    "volume-server-test": "node lib/commonjs/servers/volume/server.js --idMap em 'test/${id}.mdb' --defaultPort 1336",
-    "plugin-state": "node lib/commonjs/servers/plugin-state/index.js --working-folder ./build/state --port 1339",
-    "preversion": "npm run test",
-    "version": "npm run rebuild && cpx .npmignore lib/",
-    "postversion": "git push && git push --tags"
-  },
-  "files": [
-    "lib/",
-    "build/viewer/"
-  ],
-  "bin": {
-    "cif2bcif": "lib/commonjs/cli/cif2bcif/index.js",
-    "cifschema": "lib/commonjs/cli/cifschema/index.js",
-    "model-server": "lib/commonjs/servers/model/server.js",
-    "model-server-query": "lib/commonjs/servers/model/query.js",
-    "model-server-preprocess": "lib/commonjs/servers/model/preprocess.js",
-    "volume-server": "lib/commonjs/servers/volume/server.js",
-    "volume-server-query": "lib/commonjs/servers/volume/query.js",
-    "volume-server-pack": "lib/commonjs/servers/volume/pack.js"
-  },
-  "nodemonConfig": {
-    "ignoreRoot": [
-      "./node_modules",
-      ".git"
-    ],
-    "ignore": [],
-    "delay": "2500"
-  },
-  "jest": {
-    "moduleFileExtensions": [
-      "ts",
-      "js"
-    ],
-    "transform": {
-      "\\.ts$": "ts-jest"
-    },
-    "moduleDirectories": [
-      "node_modules",
-      "lib"
-    ],
-    "testEnvironmentOptions": {
-      "url": "http://localhost/"
-    },
-    "testRegex": "\\.spec\\.ts$"
-  },
-  "author": "Mol* Contributors",
-  "contributors": [
-    "Alexander Rose <alexander.rose@weirdbyte.de>",
-    "David Sehnal <david.sehnal@gmail.com>",
-    "Sebastian Bittrich <sebastian.bittrich@rcsb.org>",
-    "Áron Samuel Kovács <aron.kovacs@mail.muni.cz>",
-    "Ludovic Autin <autin@scripps.edu>",
-    "Michal Malý <michal.maly@ibt.cas.cz>",
-    "Jiří Černý <jiri.cerny@ibt.cas.cz>",
-    "Panagiotis Tourlas <panagiot_tourlov@hotmail.com>",
-    "Adam Midlik <midlik@gmail.com>",
-    "Koya Sakuma <koya.sakuma.work@gmail.com>",
-    "Gianluca Tomasello <giagitom@gmail.com>",
-    "Jason Pattle <jpattle@exscientia.co.uk>"
-  ],
-  "license": "MIT",
-  "devDependencies": {
-    "@graphql-codegen/add": "^3.2.1",
-    "@graphql-codegen/cli": "^2.15.0",
-    "@graphql-codegen/time": "^3.2.1",
-    "@graphql-codegen/typescript": "^2.8.3",
-    "@graphql-codegen/typescript-graphql-files-modules": "^2.2.1",
-    "@graphql-codegen/typescript-graphql-request": "^4.5.8",
-    "@graphql-codegen/typescript-operations": "^2.5.8",
-    "@types/cors": "^2.8.12",
-    "@types/gl": "^6.0.2",
-    "@types/jest": "^29.2.3",
-    "@types/react": "^18.0.26",
-    "@types/react-dom": "^18.0.9",
-    "@typescript-eslint/eslint-plugin": "^5.45.0",
-    "@typescript-eslint/parser": "^5.45.0",
-    "benchmark": "^2.1.4",
-    "concurrently": "^7.6.0",
-    "cpx2": "^4.2.0",
-    "crypto-browserify": "^3.12.0",
-    "css-loader": "^6.7.2",
-    "eslint": "^8.29.0",
-    "extra-watch-webpack-plugin": "^1.0.3",
-    "file-loader": "^6.2.0",
-    "fs-extra": "^11.1.0",
-    "graphql": "^16.6.0",
-    "http-server": "^14.1.1",
-    "jest": "^29.3.1",
-    "mini-css-extract-plugin": "^2.7.1",
-    "path-browserify": "^1.0.1",
-    "raw-loader": "^4.0.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "sass": "^1.56.1",
-    "sass-loader": "^13.2.0",
-    "simple-git": "^3.15.1",
-    "stream-browserify": "^3.0.0",
-    "style-loader": "^3.3.1",
-    "ts-jest": "^29.0.3",
-    "typescript": "^4.9.3",
-    "webpack": "^5.75.0",
-    "webpack-cli": "^5.0.0"
-  },
-  "dependencies": {
-    "@types/argparse": "^2.0.10",
-    "@types/benchmark": "^2.1.2",
-    "@types/compression": "1.7.2",
-    "@types/express": "^4.17.14",
-    "@types/node": "^16.18.4",
-    "@types/node-fetch": "^2.6.2",
-    "@types/swagger-ui-dist": "3.30.1",
-    "argparse": "^2.0.1",
-    "body-parser": "^1.20.1",
-    "compression": "^1.7.4",
-    "cors": "^2.8.5",
-    "express": "^4.18.2",
-    "h264-mp4-encoder": "^1.0.12",
-    "immer": "^9.0.16",
-    "immutable": "^4.1.0",
-    "node-fetch": "^2.6.7",
-    "rxjs": "^7.6.0",
-    "swagger-ui-dist": "^4.15.5",
-    "tslib": "^2.4.1",
-    "util.promisify": "^1.1.1",
-    "xhr2": "^0.2.1"
-  },
-  "peerDependencies": {
-    "react": "^18.1.0 || ^17.0.2 || ^16.14.0",
-    "react-dom": "^18.1.0 || ^17.0.2 || ^16.14.0"
-  }
-}
+{
+  "name": "molstar",
+  "version": "3.28.0",
+  "description": "A comprehensive macromolecular library.",
+  "homepage": "https://github.com/molstar/molstar#readme",
+  "repository": {
+    "type": "git",
+    "url": "https://github.com/molstar/molstar.git"
+  },
+  "bugs": {
+    "url": "https://github.com/molstar/molstar/issues"
+  },
+  "scripts": {
+    "lint": "eslint .",
+    "lint-fix": "eslint . --fix",
+    "test": "npm install --no-save \"gl@^5.0.0\" && npm run lint && jest",
+    "jest": "jest",
+    "build": "npm run build-tsc && npm run build-extra && npm run build-webpack",
+    "clean": "node ./scripts/clean.js",
+    "rebuild": "npm run clean && npm run build",
+    "build-viewer": "npm run build-tsc && npm run build-extra && npm run build-webpack-viewer",
+    "build-tsc": "concurrently \"tsc --incremental\" \"tsc --build tsconfig.commonjs.json --incremental\"",
+    "build-extra": "cpx \"src/**/*.{scss,html,ico,jpg}\" lib/",
+    "build-webpack": "webpack --mode production --config ./webpack.config.production.js",
+    "build-webpack-viewer": "webpack --mode production --config ./webpack.config.viewer.js",
+    "watch": "concurrently -c \"green,green,gray,gray\" --names \"tsc,srv,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-servers\" \"npm:watch-extra\" \"npm:watch-webpack\"",
+    "watch-viewer": "concurrently -c \"green,gray,gray\" --names \"tsc,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack-viewer\"",
+    "watch-viewer-debug": "concurrently -c \"green,gray,gray\" --names \"tsc,ext,wpc\" --kill-others \"npm:watch-tsc\" \"npm:watch-extra\" \"npm:watch-webpack-viewer-debug\"",
+    "watch-tsc": "tsc --watch --incremental",
+    "watch-servers": "tsc --build tsconfig.commonjs.json --watch --incremental",
+    "watch-extra": "cpx \"src/**/*.{scss,html,ico,jpg}\" lib/ --watch",
+    "watch-webpack": "webpack -w --mode development --stats minimal",
+    "watch-webpack-viewer": "webpack -w --mode development --stats minimal --config ./webpack.config.viewer.js",
+    "watch-webpack-viewer-debug": "webpack -w --mode development --stats minimal --config ./webpack.config.viewer.debug.js",
+    "serve": "http-server -p 1338 -g",
+    "model-server": "node lib/commonjs/servers/model/server.js",
+    "model-server-watch": "nodemon --watch lib lib/commonjs/servers/model/server.js",
+    "volume-server-test": "node lib/commonjs/servers/volume/server.js --idMap em 'test/${id}.mdb' --defaultPort 1336",
+    "plugin-state": "node lib/commonjs/servers/plugin-state/index.js --working-folder ./build/state --port 1339",
+    "preversion": "npm run test",
+    "version": "npm run rebuild && cpx .npmignore lib/",
+    "postversion": "git push && git push --tags"
+  },
+  "files": [
+    "lib/",
+    "build/viewer/"
+  ],
+  "bin": {
+    "cif2bcif": "lib/commonjs/cli/cif2bcif/index.js",
+    "cifschema": "lib/commonjs/cli/cifschema/index.js",
+    "model-server": "lib/commonjs/servers/model/server.js",
+    "model-server-query": "lib/commonjs/servers/model/query.js",
+    "model-server-preprocess": "lib/commonjs/servers/model/preprocess.js",
+    "volume-server": "lib/commonjs/servers/volume/server.js",
+    "volume-server-query": "lib/commonjs/servers/volume/query.js",
+    "volume-server-pack": "lib/commonjs/servers/volume/pack.js"
+  },
+  "nodemonConfig": {
+    "ignoreRoot": [
+      "./node_modules",
+      ".git"
+    ],
+    "ignore": [],
+    "delay": "2500"
+  },
+  "jest": {
+    "moduleFileExtensions": [
+      "ts",
+      "js"
+    ],
+    "transform": {
+      "\\.ts$": "ts-jest"
+    },
+    "moduleDirectories": [
+      "node_modules",
+      "lib"
+    ],
+    "testEnvironmentOptions": {
+      "url": "http://localhost/"
+    },
+    "testRegex": "\\.spec\\.ts$"
+  },
+  "author": "Mol* Contributors",
+  "contributors": [
+    "Alexander Rose <alexander.rose@weirdbyte.de>",
+    "David Sehnal <david.sehnal@gmail.com>",
+    "Sebastian Bittrich <sebastian.bittrich@rcsb.org>",
+    "Áron Samuel Kovács <aron.kovacs@mail.muni.cz>",
+    "Ludovic Autin <autin@scripps.edu>",
+    "Michal Malý <michal.maly@ibt.cas.cz>",
+    "Jiří Černý <jiri.cerny@ibt.cas.cz>",
+    "Panagiotis Tourlas <panagiot_tourlov@hotmail.com>",
+    "Adam Midlik <midlik@gmail.com>",
+    "Koya Sakuma <koya.sakuma.work@gmail.com>",
+    "Gianluca Tomasello <giagitom@gmail.com>",
+    "Jason Pattle <jpattle@exscientia.co.uk>",
+    "David Williams <dwilliams@nobiastx.com>"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "@graphql-codegen/add": "^3.2.3",
+    "@graphql-codegen/cli": "^2.16.1",
+    "@graphql-codegen/time": "^3.2.3",
+    "@graphql-codegen/typescript": "^2.8.5",
+    "@graphql-codegen/typescript-graphql-files-modules": "^2.2.1",
+    "@graphql-codegen/typescript-graphql-request": "^4.5.8",
+    "@graphql-codegen/typescript-operations": "^2.5.10",
+    "@types/cors": "^2.8.13",
+    "@types/gl": "^6.0.2",
+    "@types/jest": "^29.2.4",
+    "@types/react": "^18.0.26",
+    "@types/react-dom": "^18.0.9",
+    "@typescript-eslint/eslint-plugin": "^5.47.0",
+    "@typescript-eslint/parser": "^5.47.0",
+    "benchmark": "^2.1.4",
+    "concurrently": "^7.6.0",
+    "cpx2": "^4.2.0",
+    "crypto-browserify": "^3.12.0",
+    "css-loader": "^6.7.3",
+    "eslint": "^8.30.0",
+    "extra-watch-webpack-plugin": "^1.0.3",
+    "file-loader": "^6.2.0",
+    "fs-extra": "^11.1.0",
+    "graphql": "^16.6.0",
+    "http-server": "^14.1.1",
+    "jest": "^29.3.1",
+    "mini-css-extract-plugin": "^2.7.2",
+    "path-browserify": "^1.0.1",
+    "raw-loader": "^4.0.2",
+    "react": "^18.2.0",
+    "react-dom": "^18.2.0",
+    "sass": "^1.57.0",
+    "sass-loader": "^13.2.0",
+    "simple-git": "^3.15.1",
+    "stream-browserify": "^3.0.0",
+    "style-loader": "^3.3.1",
+    "ts-jest": "^29.0.3",
+    "typescript": "^4.9.4",
+    "webpack": "^5.75.0",
+    "webpack-cli": "^5.0.1"
+  },
+  "dependencies": {
+    "@types/argparse": "^2.0.10",
+    "@types/benchmark": "^2.1.2",
+    "@types/compression": "1.7.2",
+    "@types/express": "^4.17.15",
+    "@types/node": "^16.18.10",
+    "@types/node-fetch": "^2.6.2",
+    "@types/swagger-ui-dist": "3.30.1",
+    "argparse": "^2.0.1",
+    "body-parser": "^1.20.1",
+    "compression": "^1.7.4",
+    "cors": "^2.8.5",
+    "express": "^4.18.2",
+    "h264-mp4-encoder": "^1.0.12",
+    "immer": "^9.0.16",
+    "immutable": "^4.1.0",
+    "node-fetch": "^2.6.7",
+    "rxjs": "^7.8.0",
+    "swagger-ui-dist": "^4.15.5",
+    "tslib": "^2.4.1",
+    "util.promisify": "^1.1.1",
+    "xhr2": "^0.2.1"
+  },
+  "peerDependencies": {
+    "react": "^18.1.0 || ^17.0.2 || ^16.14.0",
+    "react-dom": "^18.1.0 || ^17.0.2 || ^16.14.0"
+  }
+}