Merge branch 'master' of https://github.com/molstar/molstar into var-fixes

CHANGELOG.md

@@ -11,6 +11,7 @@ Note that since we don't clearly distinguish between a public and private interf
 - Fix entity-id color theme broken for non-IHM models
 - Improve/fix marking of ``InteractionsInterUnitVisual`` (mark when all contact-feature members are given)
 - Add missing "entity-id" and "enity-source" options for carbon coloring to "element-symbol" color theme
+- Fix VolumeServer/query CLI
 
 ## [v3.0.0] - 2022-01-23
 

package.json

@@ -13,7 +13,7 @@
   "scripts": {
     "lint": "eslint .",
     "lint-fix": "eslint . --fix",
-    "test": "npm run lint && jest",
+    "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",
@@ -156,8 +156,5 @@
   "peerDependencies": {
     "react": "^17.0.2",
     "react-dom": "^17.0.2"
-  },
-  "optionalDependencies": {
-    "gl": "^5.0.0"
   }
 }

src/servers/volume/config.ts

@@ -197,13 +197,13 @@ export function configureLocal() {
         description: VOLUME_SERVER_HEADER
     });
     parser.add_argument('--jobs', { help: `Path to a JSON file with job specification.`, required: false });
-    parser.add_argument('--jobsTemplate', { help: 'Print example template for jobs.json and exit.', required: false, nargs: 0 });
+    parser.add_argument('--jobsTemplate', { help: 'Print example template for jobs.json and exit.', required: false, action: 'store_true' });
     addJsonConfigArgs(parser);
     addLimitsArgs(parser);
 
     const config = parser.parse_args() as LimitsConfig & ServerJsonConfig;
 
-    if (config.cfgTemplate !== null) {
+    if (config.cfgTemplate) {
         console.log(JSON.stringify(DefaultLimitsConfig, null, 2));
         process.exit(0);
     }
@@ -216,7 +216,7 @@ export function configureLocal() {
             setLimitsConfig(cfg);
         }
 
-        if (config.printCfg !== null) {
+        if (config.printCfg) {
             console.log(JSON.stringify(LimitsConfig, null, 2));
             process.exit(0);
         }

src/servers/volume/query.ts

@@ -14,7 +14,7 @@ import * as LocalApi from './server/local-api';
 
 const config = configureLocal();
 
-if (config.jobsTemplate !== null) {
+if (config.jobsTemplate) {
     const exampleJobs: LocalApi.JobEntry[] = [{
         source: {
             filename: `g:/test/mdb/xray-1tqn.mdb`,