molstar 3.3.1 → 3.4.0

package/lib/commonjs/mol-util/file-info.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2018 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>
  */
@@ -9,11 +9,8 @@ exports.getFileInfo = void 0;
 // TODO only support compressed files for which uncompression support is available???
 // TODO store globally with decompression plugins?
 var compressedExtList = ['gz', 'zip'];
-// TODO store globally with parser plugins?
-var binaryExtList = ['bcif', 'ccp4', 'dcd'];
 function getFileInfo(file) {
     var path;
-    var compressed;
     var protocol = '';
     if (file instanceof File) {
         path = file.name;
@@ -38,16 +35,11 @@ function getFileInfo(file) {
     }
     var dir = path.substring(0, path.lastIndexOf('/') + 1);
     if (compressedExtList.includes(ext)) {
-        compressed = ext;
         var n = path.length - ext.length - 1;
         ext = (path.substr(0, n).split('.').pop() || '').toLowerCase();
         var m = base.length - ext.length - 1;
         base = base.substr(0, m);
     }
-    else {
-        compressed = false;
-    }
-    var binary = binaryExtList.includes(ext);
-    return { path: path, name: name, ext: ext, base: base, dir: dir, compressed: compressed, binary: binary, protocol: protocol, query: query, src: file };
+    return { path: path, name: name, ext: ext, base: base, dir: dir, protocol: protocol, query: query, src: file };
 }
 exports.getFileInfo = getFileInfo;

package/lib/commonjs/mol-util/graphql-client.js

@@ -11,7 +11,7 @@ exports.GraphQLClient = exports.ClientError = void 0;
 var tslib_1 = require("tslib");
 var assets_1 = require("./assets");
 var ClientError = /** @class */ (function (_super) {
-    (0, tslib_1.__extends)(ClientError, _super);
+    tslib_1.__extends(ClientError, _super);
     function ClientError(response, request) {
         var _this = this;
         var message = "".concat(ClientError.extractMessage(response), ": ").concat(JSON.stringify({ response: response, request: request }));
@@ -36,9 +36,9 @@ var GraphQLClient = /** @class */ (function () {
         this.assetManager = assetManager;
     }
     GraphQLClient.prototype.request = function (ctx, query, variables) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var body, url, result, errorResult;
-            return (0, tslib_1.__generator)(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         body = JSON.stringify({ query: query, variables: variables }, null, 2);
@@ -54,7 +54,7 @@ var GraphQLClient = /** @class */ (function () {
                         }
                         else {
                             errorResult = typeof result.data === 'string' ? { error: result.data } : result.data;
-                            throw new ClientError((0, tslib_1.__assign)({}, errorResult), { query: query, variables: variables });
+                            throw new ClientError(tslib_1.__assign({}, errorResult), { query: query, variables: variables });
                         }
                         return [2 /*return*/];
                 }

package/lib/commonjs/mol-util/index.d.ts

@@ -27,3 +27,4 @@ export declare const assign: (<T>(o: T, ...from: any[]) => T);
 export declare const merge: (<T>(source: T, ...rest: Partial<T>[]) => T);
 export declare function formatTime(d: Date): string;
 export declare function formatProgress(p: Progress): string;
+export declare function formatBytes(count: number): string;

package/lib/commonjs/mol-util/index.js

@@ -6,7 +6,7 @@
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatProgress = exports.formatTime = exports.merge = exports.assign = exports.shallowClone = exports.extend = exports.defaults = exports.shallowEqualArrays = exports.shallowEqualObjects = exports.shallowEqual = exports.deepEqual = exports.arrayEqual = exports.round = exports.noop = exports.Mask = exports.UUID = exports.StringBuilder = exports.BitFlags = void 0;
+exports.formatBytes = exports.formatProgress = exports.formatTime = exports.merge = exports.assign = exports.shallowClone = exports.extend = exports.defaults = exports.shallowEqualArrays = exports.shallowEqualObjects = exports.shallowEqual = exports.deepEqual = exports.arrayEqual = exports.round = exports.noop = exports.Mask = exports.UUID = exports.StringBuilder = exports.BitFlags = void 0;
 var tslib_1 = require("tslib");
 var bit_flags_1 = require("./bit-flags");
 Object.defineProperty(exports, "BitFlags", { enumerable: true, get: function () { return bit_flags_1.BitFlags; } });
@@ -16,7 +16,7 @@ var uuid_1 = require("./uuid");
 Object.defineProperty(exports, "UUID", { enumerable: true, get: function () { return uuid_1.UUID; } });
 var mask_1 = require("./mask");
 Object.defineProperty(exports, "Mask", { enumerable: true, get: function () { return mask_1.Mask; } });
-(0, tslib_1.__exportStar)(require("./value-cell"), exports);
+tslib_1.__exportStar(require("./value-cell"), exports);
 var noop = function () { };
 exports.noop = noop;
 function round(n, d) {
@@ -219,3 +219,9 @@ function formatProgress(p) {
     return "".concat(tp.message, " ").concat(x, "%");
 }
 exports.formatProgress = formatProgress;
+function formatBytes(count) {
+    var units = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+    var i = Math.floor(Math.log(count) / Math.log(1024));
+    return "".concat((count / Math.pow(1024, i)).toFixed(2), " ").concat(units[i]);
+}
+exports.formatBytes = formatBytes;

package/lib/commonjs/mol-util/input/input-observer.js

@@ -128,13 +128,13 @@ var InputObserver;
 (function (InputObserver) {
     function create(props) {
         if (props === void 0) { props = {}; }
-        var _a = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultInputObserverProps), props), noScroll = _a.noScroll, noContextMenu = _a.noContextMenu;
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)({ noScroll: noScroll, noContextMenu: noContextMenu, width: 0, height: 0, pixelRatio: 1 }, createEvents()), { dispose: mol_util_1.noop });
+        var _a = tslib_1.__assign(tslib_1.__assign({}, exports.DefaultInputObserverProps), props), noScroll = _a.noScroll, noContextMenu = _a.noContextMenu;
+        return tslib_1.__assign(tslib_1.__assign({ noScroll: noScroll, noContextMenu: noContextMenu, width: 0, height: 0, pixelRatio: 1 }, createEvents()), { dispose: mol_util_1.noop });
     }
     InputObserver.create = create;
     function fromElement(element, props) {
         if (props === void 0) { props = {}; }
-        var _a = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultInputObserverProps), props), noScroll = _a.noScroll, noMiddleClickScroll = _a.noMiddleClickScroll, noContextMenu = _a.noContextMenu, noPinchZoom = _a.noPinchZoom, noTextSelect = _a.noTextSelect, mask = _a.mask, pixelScale = _a.pixelScale, preventGestures = _a.preventGestures;
+        var _a = tslib_1.__assign(tslib_1.__assign({}, exports.DefaultInputObserverProps), props), noScroll = _a.noScroll, noMiddleClickScroll = _a.noMiddleClickScroll, noContextMenu = _a.noContextMenu, noPinchZoom = _a.noPinchZoom, noTextSelect = _a.noTextSelect, mask = _a.mask, pixelScale = _a.pixelScale, preventGestures = _a.preventGestures;
         var width = element.clientWidth * pixelRatio();
         var height = element.clientHeight * pixelRatio();
         var lastTouchDistance = 0, lastTouchFraction = 0;
@@ -153,7 +153,7 @@ var InputObserver;
             return window.devicePixelRatio * pixelScale;
         }
         function getModifierKeys() {
-            return (0, tslib_1.__assign)({}, modifierKeys);
+            return tslib_1.__assign({}, modifierKeys);
         }
         var dragging = 0 /* Stopped */;
         var disposed = false;
@@ -163,7 +163,7 @@ var InputObserver;
         var events = createEvents();
         var drag = events.drag, interactionEnd = events.interactionEnd, wheel = events.wheel, pinch = events.pinch, gesture = events.gesture, click = events.click, move = events.move, leave = events.leave, enter = events.enter, resize = events.resize, modifiers = events.modifiers, key = events.key;
         attach();
-        return (0, tslib_1.__assign)((0, tslib_1.__assign)({ get noScroll() { return noScroll; },
+        return tslib_1.__assign(tslib_1.__assign({ get noScroll() { return noScroll; },
             set noScroll(value) { noScroll = value; },
             get noContextMenu() { return noContextMenu; },
             set noContextMenu(value) { noContextMenu = value; },
@@ -455,7 +455,7 @@ var InputObserver;
             var normalized = normalizeWheel(ev);
             buttons = button = 4 /* Auxilary */;
             if (normalized.dx || normalized.dy || normalized.dz) {
-                wheel.next((0, tslib_1.__assign)((0, tslib_1.__assign)({ x: x, y: y, pageX: pageX, pageY: pageY }, normalized), { buttons: buttons, button: button, modifiers: getModifierKeys() }));
+                wheel.next(tslib_1.__assign(tslib_1.__assign({ x: x, y: y, pageX: pageX, pageY: pageY }, normalized), { buttons: buttons, button: button, modifiers: getModifierKeys() }));
             }
         }
         function tryPreventGesture(ev) {

package/lib/commonjs/mol-util/make-dir.js

@@ -7,7 +7,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.makeDir = void 0;
 var tslib_1 = require("tslib");
-var fs = (0, tslib_1.__importStar)(require("fs"));
+var fs = tslib_1.__importStar(require("fs"));
 function makeDir(path, root) {
     var dirs = path.split(/\/|\\/g), dir = dirs.shift();
     root = (root || '') + dir + '/';

package/lib/commonjs/mol-util/material.js

@@ -9,7 +9,7 @@ exports.Material = void 0;
 var tslib_1 = require("tslib");
 var param_definition_1 = require("./param-definition");
 function Material(values) {
-    return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, Material.Zero), values);
+    return tslib_1.__assign(tslib_1.__assign({}, Material.Zero), values);
 }
 exports.Material = Material;
 (function (Material) {
@@ -31,7 +31,7 @@ exports.Material = Material;
             metalness: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 1, step: 0.01 }),
             roughness: param_definition_1.ParamDefinition.Numeric(1, { min: 0, max: 1, step: 0.01 }),
             bumpiness: param_definition_1.ParamDefinition.Numeric(0, { min: 0, max: 1, step: 0.01 }),
-        }, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, info), { presets: [
+        }, tslib_1.__assign(tslib_1.__assign({}, info), { presets: [
                 [{ metalness: 0, roughness: 1, bumpiness: 0 }, 'Matte'],
                 [{ metalness: 0, roughness: 0.2, bumpiness: 0 }, 'Plastic'],
                 [{ metalness: 0, roughness: 0.6, bumpiness: 0 }, 'Glossy'],

package/lib/commonjs/mol-util/monadic-parser.js

@@ -113,7 +113,7 @@ var MonadicParser = /** @class */ (function () {
     };
     ;
     MonadicParser.prototype.atLeast = function (n) {
-        return MonadicParser.seq(this.times(n), this.many()).map(function (r) { return (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], r[0], true), r[1], true); });
+        return MonadicParser.seq(this.times(n), this.many()).map(function (r) { return tslib_1.__spreadArray(tslib_1.__spreadArray([], r[0], true), r[1], true); });
     };
     ;
     MonadicParser.prototype.map = function (f) {
@@ -237,7 +237,7 @@ exports.MonadicParser = MonadicParser;
     MonadicParser.sepBy = sepBy;
     function sepBy1(parser, separator) {
         var pairs = separator.then(parser).many();
-        return seq(parser, pairs).map(function (r) { return (0, tslib_1.__spreadArray)([r[0]], r[1], true); });
+        return seq(parser, pairs).map(function (r) { return tslib_1.__spreadArray([r[0]], r[1], true); });
     }
     MonadicParser.sepBy1 = sepBy1;
     function string(str) {

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

@@ -45,7 +45,7 @@ var ParamDefinition;
         return param;
     }
     function Optional(p) {
-        var ret = (0, tslib_1.__assign)({}, p);
+        var ret = tslib_1.__assign({}, p);
         ret.isOptional = true;
         return ret;
     }
@@ -417,9 +417,9 @@ var ParamDefinition;
     ParamDefinition.isParamEqual = isParamEqual;
     function merge(params, a, b) {
         if (a === undefined)
-            return (0, tslib_1.__assign)({}, b);
+            return tslib_1.__assign({}, b);
         if (b === undefined)
-            return (0, tslib_1.__assign)({}, a);
+            return tslib_1.__assign({}, a);
         var o = Object.create(null);
         for (var _a = 0, _b = Object.keys(params); _a < _b.length; _a++) {
             var k = _b[_a];
@@ -430,16 +430,16 @@ var ParamDefinition;
     ParamDefinition.merge = merge;
     function mergeParam(p, a, b) {
         if (a === undefined)
-            return typeof b === 'object' && !Array.isArray(b) ? (0, tslib_1.__assign)({}, b) : b;
+            return typeof b === 'object' && !Array.isArray(b) ? tslib_1.__assign({}, b) : b;
         if (b === undefined)
-            return typeof a === 'object' && !Array.isArray(a) ? (0, tslib_1.__assign)({}, a) : a;
+            return typeof a === 'object' && !Array.isArray(a) ? tslib_1.__assign({}, a) : a;
         if (p.type === 'group') {
             return merge(p.params, a, b);
         }
         else if (p.type === 'mapped') {
             var u = a, v = b;
             if (u.name !== v.name)
-                return (0, tslib_1.__assign)({}, v);
+                return tslib_1.__assign({}, v);
             var map = p.map(v.name);
             return {
                 name: v.name,
@@ -453,7 +453,7 @@ var ParamDefinition;
             if (Array.isArray(b)) {
                 return b;
             }
-            return (0, tslib_1.__assign)((0, tslib_1.__assign)({}, a), b);
+            return tslib_1.__assign(tslib_1.__assign({}, a), b);
         }
         else {
             return b;

package/lib/commonjs/mol-util/read.js

@@ -36,9 +36,9 @@ function readFileAsBuffer(file) {
 }
 exports.readFileAsBuffer = readFileAsBuffer;
 function readUrl(url, isBinary) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var response, _a, _b;
-        return (0, tslib_1.__generator)(this, function (_c) {
+        return tslib_1.__generator(this, function (_c) {
             switch (_c.label) {
                 case 0: return [4 /*yield*/, fetch(url)];
                 case 1:

package/lib/commonjs/mol-util/retry-if.js

@@ -9,9 +9,9 @@ exports.retryIf = void 0;
 var tslib_1 = require("tslib");
 function retryIf(promiseProvider, params) {
     var _a;
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var count, result, e_1;
-        return (0, tslib_1.__generator)(this, function (_b) {
+        return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     count = 0;

package/lib/commonjs/mol-util/string.js

@@ -74,7 +74,7 @@ exports.substringStartsWith = substringStartsWith;
 function interpolate(str, params) {
     var names = Object.keys(params);
     var values = Object.values(params);
-    return new (Function.bind.apply(Function, (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([void 0], names, false), ["return `".concat(str, "`;")], false)))().apply(void 0, values);
+    return new (Function.bind.apply(Function, tslib_1.__spreadArray(tslib_1.__spreadArray([void 0], names, false), ["return `".concat(str, "`;")], false)))().apply(void 0, values);
 }
 exports.interpolate = interpolate;
 function trimChar(str, char) {

package/lib/commonjs/mol-util/zip/deflate.js

@@ -10,6 +10,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports._deflateRaw = void 0;
 var tslib_1 = require("tslib");
+var type_helpers_1 = require("../type-helpers");
 var huffman_1 = require("./huffman");
 var util_1 = require("./util");
 function DeflateContext(data, out, opos, lvl) {
@@ -108,9 +109,9 @@ var Opts = [
     /* 9 */ [32, 258, 258, 4096, 1] /* max compression */
 ];
 function _deflateRaw(runtime, data, out, opos, lvl) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var ctx, dlen, i_1, pos_1, len, li, cvrd, pos, i, lits, bs, ebits;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     ctx = DeflateContext(data, out, opos, lvl);
@@ -266,7 +267,7 @@ function _writeBlock(BFINAL, lits, li, ebits, data, o0, l0, out, pos) {
             pos = _codeTiny(dset, util_1.U.itree, out, pos);
         }
         else {
-            throw new Error("unknown BTYPE ".concat(BTYPE));
+            (0, type_helpers_1.assertUnreachable)(BTYPE);
         }
         var off = o0;
         for (var si = 0; si < li; si += 2) {

package/lib/commonjs/mol-util/zip/inflate.js

@@ -135,9 +135,9 @@ function inflateBlocks(ctx, count) {
 }
 // https://tools.ietf.org/html/rfc1951
 function _inflate(runtime, data, buf) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var ctx;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (data[0] === 3 && data[1] === 0)

package/lib/commonjs/mol-util/zip/zip.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  *
@@ -9,6 +9,12 @@
  * - added `ungzip`
  */
 import { RuntimeContext, Task } from '../../mol-task';
+export declare function Unzip(buf: ArrayBuffer, onlyNames?: boolean): Task<{
+    [k: string]: Uint8Array | {
+        size: number;
+        csize: number;
+    };
+}>;
 export declare function unzip(runtime: RuntimeContext, buf: ArrayBuffer, onlyNames?: boolean): Promise<{
     [k: string]: Uint8Array | {
         size: number;

package/lib/commonjs/mol-util/zip/zip.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2020-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  *
@@ -10,18 +10,23 @@
  * - added `ungzip`
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.zip = exports.Zip = exports.deflate = exports.ungzip = exports.inflate = exports.inflateRaw = exports.unzip = void 0;
+exports.zip = exports.Zip = exports.deflate = exports.ungzip = exports.inflate = exports.inflateRaw = exports.unzip = exports.Unzip = void 0;
 var tslib_1 = require("tslib");
 var bin_1 = require("./bin");
 var checksum_1 = require("./checksum");
 var inflate_1 = require("./inflate");
 var deflate_1 = require("./deflate");
 var mol_task_1 = require("../../mol-task");
+function Unzip(buf, onlyNames) {
+    if (onlyNames === void 0) { onlyNames = false; }
+    return mol_task_1.Task.create('Unzip', function (ctx) { return unzip(ctx, buf, onlyNames); });
+}
+exports.Unzip = Unzip;
 function unzip(runtime, buf, onlyNames) {
     if (onlyNames === void 0) { onlyNames = false; }
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var out, data, eocd, o, cnu, coffs, i, csize, usize, nl, el, cl, roff;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     out = Object.create(null);
@@ -80,9 +85,9 @@ function unzip(runtime, buf, onlyNames) {
 }
 exports.unzip = unzip;
 function _readLocal(runtime, data, o, out, csize, usize, onlyNames) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var cmpr, nlen, elen, name, file, buf;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     // const sign  = readUint(data, o);
@@ -130,8 +135,8 @@ function _readLocal(runtime, data, o, out, csize, usize, onlyNames) {
     });
 }
 function inflateRaw(runtime, file, buf) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-        return (0, tslib_1.__generator)(this, function (_a) {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, (0, inflate_1._inflate)(runtime, file, buf)];
         });
     });
@@ -148,9 +153,9 @@ function inflate(runtime, file, buf) {
 exports.inflate = inflate;
 // https://tools.ietf.org/html/rfc1952
 function ungzip(runtime, file, buf) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var flg, o, xlen, zero, zero, crc32, isize, blocks, inflated, crcValue;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     flg = file[3];
@@ -200,9 +205,9 @@ function ungzip(runtime, file, buf) {
 }
 exports.ungzip = ungzip;
 function deflate(runtime, data, opts /* , buf, off*/) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var off, buf, crcValue;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (opts === undefined)
@@ -227,9 +232,9 @@ function deflate(runtime, data, opts /* , buf, off*/) {
 }
 exports.deflate = deflate;
 function deflateRaw(runtime, data, opts) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var buf, off;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     if (opts === undefined)
@@ -250,10 +255,10 @@ function Zip(obj, noCmpr) {
 exports.Zip = Zip;
 function zip(runtime, obj, noCmpr) {
     if (noCmpr === void 0) { noCmpr = false; }
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var tot, zpd, _a, _b, _i, p, cpr, buf, crcValue, _c, _d, _e, p, data, o, fof, p, file, i, ioff, p, file, csize;
         var _f;
-        return (0, tslib_1.__generator)(this, function (_g) {
+        return tslib_1.__generator(this, function (_g) {
             switch (_g.label) {
                 case 0:
                     tot = 0;

package/lib/commonjs/servers/common/file-handle.js

@@ -8,7 +8,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fileHandleFromDescriptor = void 0;
 var tslib_1 = require("tslib");
-var fs = (0, tslib_1.__importStar)(require("fs"));
+var fs = tslib_1.__importStar(require("fs"));
 var simple_buffer_1 = require("../../mol-io/common/simple-buffer");
 var mol_util_1 = require("../../mol-util");
 function fileHandleFromDescriptor(file, name) {

package/lib/commonjs/servers/common/swagger-ui/index.js

@@ -7,7 +7,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.swaggerUiIndexHandler = exports.swaggerUiAssetsHandler = void 0;
 var tslib_1 = require("tslib");
-var express = (0, tslib_1.__importStar)(require("express"));
+var express = tslib_1.__importStar(require("express"));
 var swagger_ui_dist_1 = require("swagger-ui-dist");
 var string_1 = require("../../../mol-util/string");
 var indexTemplate_1 = require("./indexTemplate");

package/lib/commonjs/servers/model/config.d.ts

@@ -53,7 +53,7 @@ declare const DefaultModelServerConfig: {
      *
      * /static query uses 'pdb-cif' and 'pdb-bcif' source names.
      */
-    sourceMap: ([string, string] | [string, string, "bcif" | "cif" | "cif.gz" | "bcif.gz"])[];
+    sourceMap: ([string, string] | [string, string, "cif" | "bcif" | "cif.gz" | "bcif.gz"])[];
 };
 export declare const ModelServerFetchFormats: readonly ["cif", "bcif", "cif.gz", "bcif.gz"];
 export declare type ModelServerFetchFormats = (typeof ModelServerFetchFormats)[number];
@@ -108,7 +108,7 @@ export declare const ModelServerConfig: {
      *
      * /static query uses 'pdb-cif' and 'pdb-bcif' source names.
      */
-    sourceMap: ([string, string] | [string, string, "bcif" | "cif" | "cif.gz" | "bcif.gz"])[];
+    sourceMap: ([string, string] | [string, string, "cif" | "bcif" | "cif.gz" | "bcif.gz"])[];
 };
 export declare const ModelServerConfigTemplate: ModelServerConfig;
 export declare function configureServer(): void;

package/lib/commonjs/servers/model/config.js

@@ -7,10 +7,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.configureServer = exports.ModelServerConfigTemplate = exports.ModelServerConfig = exports.mapSourceAndIdToFilename = exports.ModelServerFetchFormats = void 0;
 var tslib_1 = require("tslib");
-var argparse = (0, tslib_1.__importStar)(require("argparse"));
+var argparse = tslib_1.__importStar(require("argparse"));
 var type_helpers_1 = require("../../mol-util/type-helpers");
 var version_1 = require("./version");
-var fs = (0, tslib_1.__importStar)(require("fs"));
+var fs = tslib_1.__importStar(require("fs"));
 var DefaultModelServerConfig = {
     // 0 for off
     cacheMaxSizeInBytes: 2 * 1014 * 1024 * 1024,
@@ -185,8 +185,8 @@ function addServerArgs(parser) {
         ].join('\n'),
     });
 }
-exports.ModelServerConfig = (0, tslib_1.__assign)({}, DefaultModelServerConfig);
-exports.ModelServerConfigTemplate = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, DefaultModelServerConfig), { defaultSource: 'pdb-bcif', sourceMap: [
+exports.ModelServerConfig = tslib_1.__assign({}, DefaultModelServerConfig);
+exports.ModelServerConfigTemplate = tslib_1.__assign(tslib_1.__assign({}, DefaultModelServerConfig), { defaultSource: 'pdb-bcif', sourceMap: [
         ['pdb-bcif', './path-to-binary-cif/${id.substr(1, 2)}/${id}.bcif'],
         ['pdb-cif', './path-to-text-cif/${id.substr(1, 2)}/${id}.cif'],
         ['pdb-updated', 'https://www.ebi.ac.uk/pdbe/entry-files/download/${id}_updated.cif', 'cif']
@@ -222,7 +222,7 @@ function validateConfigAndSetupSourceMap() {
     if (!exports.ModelServerConfig.sourceMap || exports.ModelServerConfig.sourceMap.length === 0) {
         throw new Error("Please provide 'sourceMap' configuration. See [-h] for available options.");
     }
-    exports.mapSourceAndIdToFilename = new Function('source', 'id', (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([
+    exports.mapSourceAndIdToFilename = new Function('source', 'id', tslib_1.__spreadArray(tslib_1.__spreadArray([
         'switch (source.toLowerCase()) {'
     ], exports.ModelServerConfig.sourceMap.map(function (_a) {
         var source = _a[0], path = _a[1], format = _a[2];

package/lib/commonjs/servers/model/preprocess/converter.js

@@ -31,9 +31,9 @@ function classify(name, field) {
 }
 function classifyCif(frame) {
     var _this = this;
-    return mol_task_1.Task.create('Classify CIF Data', function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+    return mol_task_1.Task.create('Classify CIF Data', function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         var maxProgress, _i, _a, c, ret, current, _b, _c, c, cat, fields, _d, _e, f, cifField;
-        return (0, tslib_1.__generator)(this, function (_f) {
+        return tslib_1.__generator(this, function (_f) {
             switch (_f.label) {
                 case 0:
                     maxProgress = 0;

package/lib/commonjs/servers/model/preprocess/master.js

@@ -6,9 +6,9 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var fs = (0, tslib_1.__importStar)(require("fs"));
-var path = (0, tslib_1.__importStar)(require("path"));
-var argparse = (0, tslib_1.__importStar)(require("argparse"));
+var fs = tslib_1.__importStar(require("fs"));
+var path = tslib_1.__importStar(require("path"));
+var argparse = tslib_1.__importStar(require("argparse"));
 var parallel_1 = require("./parallel");
 function description() {
     var exampleCfg = {

package/lib/commonjs/servers/model/preprocess/parallel.js

@@ -7,8 +7,8 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.runChild = exports.runMaster = void 0;
 var tslib_1 = require("tslib");
-var path = (0, tslib_1.__importStar)(require("path"));
-var cluster_1 = (0, tslib_1.__importDefault)(require("cluster"));
+var path = tslib_1.__importStar(require("path"));
+var cluster_1 = tslib_1.__importDefault(require("cluster"));
 var now_1 = require("../../../mol-util/now");
 var performance_monitor_1 = require("../../../mol-util/performance-monitor");
 var preprocess_1 = require("./preprocess");
@@ -47,9 +47,9 @@ function runChild() {
     var _this = this;
     process.on('message', function (_a) {
         var entries = _a.entries, config = _a.config;
-        return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+        return tslib_1.__awaiter(_this, void 0, void 0, function () {
             var props, _i, entries_1, entry, e_1;
-            return (0, tslib_1.__generator)(this, function (_b) {
+            return tslib_1.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         props = (0, property_provider_1.createModelPropertiesProvider)(config.customProperties);
@@ -85,9 +85,9 @@ function runChild() {
 }
 exports.runChild = runChild;
 function runSingle(entry, config, onMessage) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var props, e_2;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     props = (0, property_provider_1.createModelPropertiesProvider)(config.customProperties);

package/lib/commonjs/servers/model/preprocess/preprocess.js

@@ -20,9 +20,9 @@ function preprocessFile(filename, propertyProvider, outputCif, outputBcif) {
 }
 exports.preprocessFile = preprocessFile;
 function preprocess(filename, propertyProvider, outputCif, outputBcif) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var input, categories, inputStructures, exportCtx, writer, encoder, writer, encoder;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, (0, structure_wrapper_1.readStructureWrapper)('entry', '_local_', filename, void 0, propertyProvider)];
                 case 1:
@@ -52,9 +52,9 @@ function preprocess(filename, propertyProvider, outputCif, outputBcif) {
     });
 }
 function convert(filename, outputCif, outputBcif) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var frame, categories, writer, encoder, writer, encoder;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0: return [4 /*yield*/, (0, structure_wrapper_1.readDataAndFrame)(filename)];
                 case 1:

package/lib/commonjs/servers/model/preprocess.js

@@ -7,7 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 var tslib_1 = require("tslib");
-var cluster_1 = (0, tslib_1.__importDefault)(require("cluster"));
+var cluster_1 = tslib_1.__importDefault(require("cluster"));
 var parallel_1 = require("./preprocess/parallel");
 if (cluster_1.default.isPrimary) {
     require('./preprocess/master');