molstar 4.0.1 → 4.2.0

package/lib/servers/volume/config.js

@@ -19,9 +19,9 @@ function addLimitsArgs(parser) {
     parser.add_argument('--maxRequestBlockCount', {
         default: DefaultLimitsConfig.maxRequestBlockCount,
         metavar: 'COUNT',
-        help: `Maximum number of blocks that could be read in 1 query.
-This is somewhat tied to the maxOutputSizeInVoxelCountByPrecisionLevel
-in that the <maximum number of voxel> = maxRequestBlockCount * <block size>^3.
+        help: `Maximum number of blocks that could be read in 1 query.
+This is somewhat tied to the maxOutputSizeInVoxelCountByPrecisionLevel
+in that the <maximum number of voxel> = maxRequestBlockCount * <block size>^3.
 The default block size is 96 which corresponds to 28,311,552 voxels with 32 max blocks.`
     });
     parser.add_argument('--maxFractionalBoxVolume', {
@@ -33,8 +33,8 @@ The default block size is 96 which corresponds to 28,311,552 voxels with 32 max
         nargs: '+',
         default: DefaultLimitsConfig.maxOutputSizeInVoxelCountByPrecisionLevel,
         metavar: 'LEVEL',
-        help: `What is the (approximate) maximum desired size in voxel count by precision level
-Rule of thumb: <response gzipped size> in [<voxel count> / 8, <voxel count> / 4].
+        help: `What is the (approximate) maximum desired size in voxel count by precision level
+Rule of thumb: <response gzipped size> in [<voxel count> / 8, <voxel count> / 4].
 The maximum number of voxels is tied to maxRequestBlockCount.`
     });
 }

package/package.json

@@ -1,193 +1,195 @@
-{
-  "name": "molstar",
-  "version": "4.0.1",
-  "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@^6.0.2\" && 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",
-    "mvs-validate": "lib/commonjs/cli/mvs/mvs-validate.js",
-    "mvs-render": "lib/commonjs/cli/mvs/mvs-render.js",
-    "mvs-print-schema": "lib/commonjs/cli/mvs/mvs-print-schema.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>",
-    "Ke Ma <mark.ma@rcsb.org>",
-    "Jason Pattle <jpattle@exscientia.co.uk>",
-    "David Williams <dwilliams@nobiastx.com>",
-    "Zhenyu Zhang <jump2cn@gmail.com>",
-    "Russell Parker <russell@benchling.com>",
-    "Dominik Tichy <tichydominik451@gmail.com>",
-    "Yana Rose <yana.v.rose@gmail.com>",
-    "Yakov Pechersky <ffxen158@gmail.com>",
-    "Christian Dominguez <christian.99dominguez@gmail.com>"
-  ],
-  "license": "MIT",
-  "devDependencies": {
-    "@types/cors": "^2.8.17",
-    "@types/gl": "^6.0.5",
-    "@types/pngjs": "^6.0.4",
-    "@types/jest": "^29.5.12",
-    "@types/react": "^18.2.52",
-    "@types/react-dom": "^18.2.18",
-    "@typescript-eslint/eslint-plugin": "^6.20.0",
-    "@typescript-eslint/parser": "^6.20.0",
-    "benchmark": "^2.1.4",
-    "concurrently": "^8.2.2",
-    "cpx2": "^7.0.1",
-    "crypto-browserify": "^3.12.0",
-    "css-loader": "^6.10.0",
-    "eslint": "^8.56.0",
-    "extra-watch-webpack-plugin": "^1.0.3",
-    "file-loader": "^6.2.0",
-    "fs-extra": "^11.2.0",
-    "http-server": "^14.1.1",
-    "jest": "^29.7.0",
-    "jpeg-js": "^0.4.4",
-    "mini-css-extract-plugin": "^2.8.0",
-    "path-browserify": "^1.0.1",
-    "raw-loader": "^4.0.2",
-    "react": "^18.2.0",
-    "react-dom": "^18.2.0",
-    "sass": "^1.70.0",
-    "sass-loader": "^14.1.0",
-    "simple-git": "^3.22.0",
-    "stream-browserify": "^3.0.0",
-    "style-loader": "^3.3.4",
-    "ts-jest": "^29.1.2",
-    "typescript": "^5.3.3",
-    "webpack": "^5.90.1",
-    "webpack-cli": "^5.1.4"
-  },
-  "dependencies": {
-    "@types/argparse": "^2.0.14",
-    "@types/benchmark": "^2.1.5",
-    "@types/compression": "1.7.5",
-    "@types/express": "^4.17.21",
-    "@types/node": "^18.19.14",
-    "@types/node-fetch": "^2.6.11",
-    "@types/swagger-ui-dist": "3.30.4",
-    "argparse": "^2.0.1",
-    "body-parser": "^1.20.2",
-    "compression": "^1.7.4",
-    "cors": "^2.8.5",
-    "express": "^4.18.2",
-    "h264-mp4-encoder": "^1.0.12",
-    "immer": "^10.0.3",
-    "immutable": "^4.3.5",
-    "io-ts": "^2.2.21",
-    "node-fetch": "^2.7.0",
-    "react-markdown": "^9.0.1",
-    "rxjs": "^7.8.1",
-    "swagger-ui-dist": "^5.11.2",
-    "tslib": "^2.6.2",
-    "util.promisify": "^1.1.2",
-    "xhr2": "^0.2.1"
-  },
-  "peerDependencies": {
-    "canvas": "^2.11.2",
-    "gl": "^6.0.2",
-    "jpeg-js": "^0.4.4",
-    "pngjs": "^6.0.0",
-    "react": "^18.1.0 || ^17.0.2 || ^16.14.0",
-    "react-dom": "^18.1.0 || ^17.0.2 || ^16.14.0"
-  },
-  "peerDependenciesMeta": {
-    "canvas": {
-      "optional": true
-    },
-    "gl": {
-      "optional": true
-    },
-    "jpeg-js": {
-      "optional": true
-    },
-    "pngjs": {
-      "optional": true
-    }
-  }
-}
+{
+  "name": "molstar",
+  "version": "4.2.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@^6.0.2\" && 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",
+    "mvs-validate": "lib/commonjs/cli/mvs/mvs-validate.js",
+    "mvs-render": "lib/commonjs/cli/mvs/mvs-render.js",
+    "mvs-print-schema": "lib/commonjs/cli/mvs/mvs-print-schema.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>",
+    "Ke Ma <mark.ma@rcsb.org>",
+    "Jason Pattle <jpattle@exscientia.co.uk>",
+    "David Williams <dwilliams@nobiastx.com>",
+    "Zhenyu Zhang <jump2cn@gmail.com>",
+    "Russell Parker <russell@benchling.com>",
+    "Dominik Tichy <tichydominik451@gmail.com>",
+    "Yana Rose <yana.v.rose@gmail.com>",
+    "Yakov Pechersky <ffxen158@gmail.com>",
+    "Christian Dominguez <christian.99dominguez@gmail.com>",
+    "Cai Huiyu <szmun.caihy@gmail.com>",
+    "Ryan DiRisio <rjdiris@gmail.com>"
+  ],
+  "license": "MIT",
+  "devDependencies": {
+    "@types/cors": "^2.8.17",
+    "@types/gl": "^6.0.5",
+    "@types/pngjs": "^6.0.5",
+    "@types/jest": "^29.5.12",
+    "@types/react": "^18.3.1",
+    "@types/react-dom": "^18.3.0",
+    "@typescript-eslint/eslint-plugin": "^7.8.0",
+    "@typescript-eslint/parser": "^7.8.0",
+    "benchmark": "^2.1.4",
+    "concurrently": "^8.2.2",
+    "cpx2": "^7.0.1",
+    "crypto-browserify": "^3.12.0",
+    "css-loader": "^7.1.1",
+    "eslint": "^8.57.0",
+    "extra-watch-webpack-plugin": "^1.0.3",
+    "file-loader": "^6.2.0",
+    "fs-extra": "^11.2.0",
+    "http-server": "^14.1.1",
+    "jest": "^29.7.0",
+    "jpeg-js": "^0.4.4",
+    "mini-css-extract-plugin": "^2.9.0",
+    "path-browserify": "^1.0.1",
+    "raw-loader": "^4.0.2",
+    "react": "^18.3.1",
+    "react-dom": "^18.3.1",
+    "sass": "^1.76.0",
+    "sass-loader": "^14.2.1",
+    "simple-git": "^3.24.0",
+    "stream-browserify": "^3.0.0",
+    "style-loader": "^4.0.0",
+    "ts-jest": "^29.1.2",
+    "typescript": "^5.4.5",
+    "webpack": "^5.91.0",
+    "webpack-cli": "^5.1.4"
+  },
+  "dependencies": {
+    "@types/argparse": "^2.0.16",
+    "@types/benchmark": "^2.1.5",
+    "@types/compression": "1.7.5",
+    "@types/express": "^4.17.21",
+    "@types/node": "^18.19.31",
+    "@types/node-fetch": "^2.6.11",
+    "@types/swagger-ui-dist": "3.30.4",
+    "argparse": "^2.0.1",
+    "body-parser": "^1.20.2",
+    "compression": "^1.7.4",
+    "cors": "^2.8.5",
+    "express": "^4.19.2",
+    "h264-mp4-encoder": "^1.0.12",
+    "immer": "^10.1.1",
+    "immutable": "^4.3.5",
+    "io-ts": "^2.2.21",
+    "node-fetch": "^2.7.0",
+    "react-markdown": "^9.0.1",
+    "rxjs": "^7.8.1",
+    "swagger-ui-dist": "^5.17.2",
+    "tslib": "^2.6.2",
+    "util.promisify": "^1.1.2",
+    "xhr2": "^0.2.1"
+  },
+  "peerDependencies": {
+    "canvas": "^2.11.2",
+    "gl": "^6.0.2",
+    "jpeg-js": "^0.4.4",
+    "pngjs": "^6.0.0",
+    "react": "^18.1.0 || ^17.0.2 || ^16.14.0",
+    "react-dom": "^18.1.0 || ^17.0.2 || ^16.14.0"
+  },
+  "peerDependenciesMeta": {
+    "canvas": {
+      "optional": true
+    },
+    "gl": {
+      "optional": true
+    },
+    "jpeg-js": {
+      "optional": true
+    },
+    "pngjs": {
+      "optional": true
+    }
+  }
+}