molstar 3.3.1 → 3.4.0

package/lib/commonjs/mol-state/transformer.js

@@ -87,7 +87,7 @@ var Transformer;
     var Builder;
     (function (Builder) {
         function root(namespace, info) {
-            return function (def) { return create(namespace, (0, tslib_1.__assign)({ name: info.name, from: info.from instanceof Array ? info.from : [info.from], to: info.to instanceof Array ? info.to : [info.to], display: typeof info.display === 'string'
+            return function (def) { return create(namespace, tslib_1.__assign({ name: info.name, from: info.from instanceof Array ? info.from : [info.from], to: info.to instanceof Array ? info.to : [info.to], display: typeof info.display === 'string'
                     ? { name: info.display }
                     : !!info.display
                         ? info.display

package/lib/commonjs/mol-task/execution/observable.js

@@ -63,7 +63,7 @@ function createAbortFunction(token) {
     };
 }
 function cloneTree(root) {
-    return { progress: (0, tslib_1.__assign)({}, root.progress), children: root.children.map(cloneTree) };
+    return { progress: tslib_1.__assign({}, root.progress), children: root.children.map(cloneTree) };
 }
 function canAbort(root) {
     return root.progress.canAbort && root.children.every(canAbort);
@@ -72,9 +72,9 @@ function snapshotProgress(info) {
     return { root: cloneTree(info.root), canAbort: canAbort(info.root), requestAbort: info.tryAbort };
 }
 function execute(task, ctx) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var ret, e_1;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     user_timing_1.UserTiming.markStart(task);
@@ -200,9 +200,9 @@ var ObservableRuntimeContext = /** @class */ (function () {
         return scheduler_1.Scheduler.immediatePromise();
     };
     ObservableRuntimeContext.prototype.runChild = function (task, progress) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var node, children, ctx, e_2, idx, i, _i;
-            return (0, tslib_1.__generator)(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         this.updateProgress(progress);

package/lib/commonjs/mol-task/task.js

@@ -52,21 +52,21 @@ var Task;
     Task.create = create;
     function constant(name, value) {
         var _this = this;
-        return create(name, function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () { return (0, tslib_1.__generator)(this, function (_a) {
+        return create(name, function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/, value];
         }); }); });
     }
     Task.constant = constant;
     function empty() {
         var _this = this;
-        return create('', function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () { return (0, tslib_1.__generator)(this, function (_a) {
+        return create('', function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             return [2 /*return*/];
         }); }); });
     }
     Task.empty = empty;
     function fail(name, reason) {
         var _this = this;
-        return create(name, function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () { return (0, tslib_1.__generator)(this, function (_a) {
+        return create(name, function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
             throw new Error(reason);
         }); }); });
     }

package/lib/commonjs/mol-task/util/chunked.js

@@ -9,9 +9,9 @@ exports.chunkedSubtask = void 0;
 var tslib_1 = require("tslib");
 var now_1 = require("../../mol-util/now");
 function chunkedSubtask(ctx, initialChunk, state, f, update) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var chunkSize, globalProcessed, globalTime, start, lastSize, currentTime, delta;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     chunkSize = Math.max(initialChunk, 0);

package/lib/commonjs/mol-task/util/multistep.js

@@ -10,7 +10,7 @@ var tslib_1 = require("tslib");
 var task_1 = require("../task");
 function MultistepTask(name, steps, f, onAbort) {
     var _this = this;
-    return function (params) { return task_1.Task.create(name, function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () { return (0, tslib_1.__generator)(this, function (_a) {
+    return function (params) { return task_1.Task.create(name, function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () { return tslib_1.__generator(this, function (_a) {
         return [2 /*return*/, f(params, function (n) { return ctx.update({ message: "".concat(steps[n]), current: n + 1, max: steps.length }); }, ctx)];
     }); }); }, onAbort); };
 }

package/lib/commonjs/mol-task/util/scheduler.d.ts

@@ -5,8 +5,8 @@
  */
 /// <reference types="node" />
 declare const Scheduler: {
-    setImmediate: ((callback: (...args: any[]) => void, ...args: any[]) => number) | typeof setImmediate;
-    clearImmediate: ((handle: number) => void) | typeof clearImmediate;
+    setImmediate: typeof setImmediate | ((callback: (...args: any[]) => void, ...args: any[]) => number);
+    clearImmediate: typeof clearImmediate | ((handle: number) => void);
     immediatePromise(): Promise<void>;
     delay<T>(timeout: number, value?: T | undefined): Promise<T>;
 };

package/lib/commonjs/mol-task/util/scheduler.js

@@ -8,7 +8,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Scheduler = void 0;
 var tslib_1 = require("tslib");
 function createImmediateActions() {
-    var global = (function () {
+    var thisGlobal = (function () {
         var _window = typeof window !== 'undefined' && window;
         var _self = typeof self !== 'undefined' && typeof WorkerGlobalScope !== 'undefined' && self instanceof WorkerGlobalScope && self;
         var _global = typeof global !== 'undefined' && global;
@@ -68,14 +68,14 @@ function createImmediateActions() {
         };
     }
     function canUsePostMessage() {
-        if (global && global.postMessage && !global.importScripts) {
+        if (thisGlobal && thisGlobal.postMessage && !thisGlobal.importScripts) {
             var postMessageIsAsynchronous_1 = true;
-            var oldOnMessage = global.onmessage;
-            global.onmessage = function () {
+            var oldOnMessage = thisGlobal.onmessage;
+            thisGlobal.onmessage = function () {
                 postMessageIsAsynchronous_1 = false;
             };
-            global.postMessage('', '*');
-            global.onmessage = oldOnMessage;
+            thisGlobal.postMessage('', '*');
+            thisGlobal.onmessage = oldOnMessage;
             return postMessageIsAsynchronous_1;
         }
     }
@@ -85,7 +85,7 @@ function createImmediateActions() {
         // * http://www.whatwg.org/specs/web-apps/current-work/multipage/comms.html#crossDocumentMessages
         var messagePrefix = 'setImmediate$' + Math.random() + '$';
         var onGlobalMessage = function (event) {
-            if (event.source === global &&
+            if (event.source === thisGlobal &&
                 typeof event.data === 'string' &&
                 event.data.indexOf(messagePrefix) === 0) {
                 runIfPresent(+event.data.slice(messagePrefix.length));
@@ -167,7 +167,7 @@ var immediateActions = (function () {
                     for (var _i = 1; _i < arguments.length; _i++) {
                         args[_i - 1] = arguments[_i];
                     }
-                    return (_a = window).setImmediate.apply(_a, (0, tslib_1.__spreadArray)([handler], args, false));
+                    return (_a = window).setImmediate.apply(_a, tslib_1.__spreadArray([handler], args, false));
                 },
                 clearImmediate: function (handle) { return window.clearImmediate(handle); }
             };

package/lib/commonjs/mol-theme/color/atom-id.js

@@ -14,7 +14,7 @@ var palette_1 = require("../../mol-util/color/palette");
 var DefaultList = 'many-distinct';
 var DefaultColor = (0, color_1.Color)(0xFAFAFA);
 var Description = 'Gives every atom a color based on its `label_atom_id` value.';
-exports.AtomIdColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.AtomIdColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getAtomIdColorThemeParams(ctx) {
     var params = param_definition_1.ParamDefinition.clone(exports.AtomIdColorThemeParams);
     return params;

package/lib/commonjs/mol-theme/color/chain-id.js

@@ -14,7 +14,7 @@ var palette_1 = require("../../mol-util/color/palette");
 var DefaultList = 'many-distinct';
 var DefaultColor = (0, color_1.Color)(0xFAFAFA);
 var Description = 'Gives every chain a color based on its `asym_id` value.';
-exports.ChainIdColorThemeParams = (0, tslib_1.__assign)({ asymId: param_definition_1.ParamDefinition.Select('auth', param_definition_1.ParamDefinition.arrayToOptions(['auth', 'label'])) }, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.ChainIdColorThemeParams = tslib_1.__assign({ asymId: param_definition_1.ParamDefinition.Select('auth', param_definition_1.ParamDefinition.arrayToOptions(['auth', 'label'])) }, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getChainIdColorThemeParams(ctx) {
     var _a;
     var params = param_definition_1.ParamDefinition.clone(exports.ChainIdColorThemeParams);

package/lib/commonjs/mol-theme/color/element-index.js

@@ -14,7 +14,7 @@ var param_definition_1 = require("../../mol-util/param-definition");
 var palette_1 = require("../../mol-util/color/palette");
 var DefaultColor = (0, color_1.Color)(0xCCCCCC);
 var Description = 'Gives every element (atom or coarse sphere/gaussian) a unique color based on the position (index) of the element in the list of elements in the structure.';
-exports.ElementIndexColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: 'red-yellow-blue' }));
+exports.ElementIndexColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: 'red-yellow-blue' }));
 function getElementIndexColorThemeParams(ctx) {
     return exports.ElementIndexColorThemeParams; // TODO return copy
 }

package/lib/commonjs/mol-theme/color/entity-id.js

@@ -14,7 +14,7 @@ var palette_1 = require("../../mol-util/color/palette");
 var DefaultList = 'many-distinct';
 var DefaultColor = (0, color_1.Color)(0xFAFAFA);
 var Description = 'Gives every chain a color based on its `label_entity_id` value.';
-exports.EntityIdColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.EntityIdColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getEntityIdColorThemeParams(ctx) {
     var params = param_definition_1.ParamDefinition.clone(exports.EntityIdColorThemeParams);
     return params;

package/lib/commonjs/mol-theme/color/entity-source.js

@@ -17,13 +17,13 @@ var mmcif_1 = require("../../mol-model-formats/structure/mmcif");
 var DefaultList = 'dark-2';
 var DefaultColor = (0, color_1.Color)(0xFAFAFA);
 var Description = 'Gives ranges of a polymer chain a color based on the entity source it originates from (e.g. gene, plasmid, organism).';
-exports.EntitySourceColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.EntitySourceColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getEntitySourceColorThemeParams(ctx) {
     var params = param_definition_1.ParamDefinition.clone(exports.EntitySourceColorThemeParams);
     if (ctx.structure) {
         if (getMaps(ctx.structure.root.models).srcKeySerialMap.size > lists_1.ColorLists[DefaultList].list.length) {
             params.palette.defaultValue.name = 'colors';
-            params.palette.defaultValue.params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
+            params.palette.defaultValue.params = tslib_1.__assign(tslib_1.__assign({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
         }
     }
     return params;

package/lib/commonjs/mol-theme/color/hydrophobicity.js

@@ -50,8 +50,8 @@ function HydrophobicityColorTheme(ctx, props) {
     var scale = color_1.ColorScale.create({
         listOrName: props.list.colors,
         domain: [max, min],
-        minLabel: 'Hydrophobic',
-        maxLabel: 'Hydrophilic'
+        minLabel: 'Hydrophilic',
+        maxLabel: 'Hydrophobic'
     });
     function color(location) {
         var compId;

package/lib/commonjs/mol-theme/color/model-index.js

@@ -13,7 +13,7 @@ var param_definition_1 = require("../../mol-util/param-definition");
 var palette_1 = require("../../mol-util/color/palette");
 var DefaultColor = (0, color_1.Color)(0xCCCCCC);
 var Description = 'Gives every model a unique color based on the position (index) of the model in the list of models in the structure.';
-exports.ModelIndexColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: 'purples' }));
+exports.ModelIndexColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: 'purples' }));
 function getModelIndexColorThemeParams(ctx) {
     return exports.ModelIndexColorThemeParams; // TODO return copy
 }

package/lib/commonjs/mol-theme/color/operator-hkl.js

@@ -16,13 +16,13 @@ var lists_1 = require("../../mol-util/color/lists");
 var DefaultList = 'dark-2';
 var DefaultColor = (0, color_1.Color)(0xCCCCCC);
 var Description = "Assigns a color based on the operator HKL value of a transformed chain.";
-exports.OperatorHklColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.OperatorHklColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getOperatorHklColorThemeParams(ctx) {
     var params = param_definition_1.ParamDefinition.clone(exports.OperatorHklColorThemeParams);
     if (ctx.structure) {
         if (getOperatorHklSerialMap(ctx.structure.root).map.size > lists_1.ColorLists[DefaultList].list.length) {
             params.palette.defaultValue.name = 'colors';
-            params.palette.defaultValue.params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
+            params.palette.defaultValue.params = tslib_1.__assign(tslib_1.__assign({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
         }
     }
     return params;

package/lib/commonjs/mol-theme/color/operator-name.js

@@ -14,7 +14,7 @@ var palette_1 = require("../../mol-util/color/palette");
 var DefaultList = 'many-distinct';
 var DefaultColor = (0, color_1.Color)(0xCCCCCC);
 var Description = "Assigns a color based on the operator name of a transformed chain.";
-exports.OperatorNameColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.OperatorNameColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getOperatorNameColorThemeParams(ctx) {
     var params = param_definition_1.ParamDefinition.clone(exports.OperatorNameColorThemeParams);
     return params;

package/lib/commonjs/mol-theme/color/polymer-id.js

@@ -16,13 +16,13 @@ var lists_1 = require("../../mol-util/color/lists");
 var DefaultList = 'dark-2';
 var DefaultColor = (0, color_1.Color)(0xFAFAFA);
 var Description = 'Gives every polymer chain a color based on its `asym_id` value.';
-exports.PolymerIdColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.PolymerIdColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getPolymerIdColorThemeParams(ctx) {
     var params = param_definition_1.ParamDefinition.clone(exports.PolymerIdColorThemeParams);
     if (ctx.structure) {
         if (getPolymerAsymIdSerialMap(ctx.structure.root).size > lists_1.ColorLists[DefaultList].list.length) {
             params.palette.defaultValue.name = 'colors';
-            params.palette.defaultValue.params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
+            params.palette.defaultValue.params = tslib_1.__assign(tslib_1.__assign({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
         }
     }
     return params;

package/lib/commonjs/mol-theme/color/polymer-index.js

@@ -15,13 +15,13 @@ var lists_1 = require("../../mol-util/color/lists");
 var DefaultList = 'dark-2';
 var DefaultColor = (0, color_1.Color)(0xCCCCCC);
 var Description = 'Gives every polymer chain instance a unique color based on the position (index) of the polymer in the list of polymers in the structure.';
-exports.PolymerIndexColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.PolymerIndexColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getPolymerIndexColorThemeParams(ctx) {
     var params = param_definition_1.ParamDefinition.clone(exports.PolymerIndexColorThemeParams);
     if (ctx.structure) {
         if (getPolymerChainCount(ctx.structure.root) > lists_1.ColorLists[DefaultList].list.length) {
             params.palette.defaultValue.name = 'colors';
-            params.palette.defaultValue.params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
+            params.palette.defaultValue.params = tslib_1.__assign(tslib_1.__assign({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
         }
     }
     return params;

package/lib/commonjs/mol-theme/color/unit-index.js

@@ -15,13 +15,13 @@ var lists_1 = require("../../mol-util/color/lists");
 var DefaultList = 'dark-2';
 var DefaultColor = (0, color_1.Color)(0xCCCCCC);
 var Description = 'Gives every chain instance (single chain or collection of single elements) a unique color based on the position (index) of the chain in the list of chains in the structure.';
-exports.UnitIndexColorThemeParams = (0, tslib_1.__assign)({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
+exports.UnitIndexColorThemeParams = tslib_1.__assign({}, (0, palette_1.getPaletteParams)({ type: 'colors', colorList: DefaultList }));
 function getUnitIndexColorThemeParams(ctx) {
     var params = param_definition_1.ParamDefinition.clone(exports.UnitIndexColorThemeParams);
     if (ctx.structure) {
         if (ctx.structure.root.units.length > lists_1.ColorLists[DefaultList].list.length) {
             params.palette.defaultValue.name = 'colors';
-            params.palette.defaultValue.params = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
+            params.palette.defaultValue.params = tslib_1.__assign(tslib_1.__assign({}, params.palette.defaultValue.params), { list: { kind: 'interpolate', colors: (0, lists_1.getColorListFromName)(DefaultList).list } });
         }
     }
     return params;

package/lib/commonjs/mol-theme/label.js

@@ -83,7 +83,7 @@ function getResidueCount(unit) {
 }
 function structureElementStatsLabel(stats, options) {
     if (options === void 0) { options = {}; }
-    var o = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultLabelOptions), options);
+    var o = tslib_1.__assign(tslib_1.__assign({}, exports.DefaultLabelOptions), options);
     var label = _structureElementStatsLabel(stats, o.countsOnly, o.hidePrefix, o.condensed, o.reverse);
     return o.htmlStyling ? label : (0, string_1.stripTags)(label);
 }
@@ -164,7 +164,7 @@ function bondLabel(bond, options) {
 exports.bondLabel = bondLabel;
 function bundleLabel(bundle, options) {
     if (options === void 0) { options = {}; }
-    var o = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultLabelOptions), options);
+    var o = tslib_1.__assign(tslib_1.__assign({}, exports.DefaultLabelOptions), options);
     var label = _bundleLabel(bundle, o);
     return o.htmlStyling ? label : (0, string_1.stripTags)(label);
 }
@@ -222,7 +222,7 @@ exports._bundleLabel = _bundleLabel;
 function elementLabel(location, options) {
     var _a, _b;
     if (options === void 0) { options = {}; }
-    var o = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultLabelOptions), options);
+    var o = tslib_1.__assign(tslib_1.__assign({}, exports.DefaultLabelOptions), options);
     var _label = _elementLabel(location, o.granularity, o.hidePrefix, o.reverse || o.condensed);
     // TODO: condensed label for single atom structure returns empty label.. handle this case here?
     var label = o.condensed ? (_b = (_a = _label[0]) === null || _a === void 0 ? void 0 : _a.replace(/\[.*\]/g, '').trim()) !== null && _b !== void 0 ? _b : '' : _label.filter(function (l) { return !!l; }).join(' | ');
@@ -326,7 +326,7 @@ function _coarseElementLabel(location, granularity) {
 //
 function distanceLabel(pair, options) {
     if (options === void 0) { options = {}; }
-    var o = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultLabelOptions), { measureOnly: false, unitLabel: '\u212B' }), options);
+    var o = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, exports.DefaultLabelOptions), { measureOnly: false, unitLabel: '\u212B' }), options);
     var _a = pair.loci.map(function (l) { return loci_1.Loci.getCenter(l); }), cA = _a[0], cB = _a[1];
     var distance = "".concat(linear_algebra_1.Vec3.distance(cA, cB).toFixed(2), " ").concat(o.unitLabel);
     if (o.measureOnly)
@@ -337,7 +337,7 @@ function distanceLabel(pair, options) {
 exports.distanceLabel = distanceLabel;
 function angleLabel(triple, options) {
     if (options === void 0) { options = {}; }
-    var o = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultLabelOptions), { measureOnly: false }), options);
+    var o = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, exports.DefaultLabelOptions), { measureOnly: false }), options);
     var _a = triple.loci.map(function (l) { return loci_1.Loci.getCenter(l); }), cA = _a[0], cB = _a[1], cC = _a[2];
     var vAB = linear_algebra_1.Vec3.sub((0, linear_algebra_1.Vec3)(), cA, cB);
     var vCB = linear_algebra_1.Vec3.sub((0, linear_algebra_1.Vec3)(), cC, cB);
@@ -350,7 +350,7 @@ function angleLabel(triple, options) {
 exports.angleLabel = angleLabel;
 function dihedralLabel(quad, options) {
     if (options === void 0) { options = {}; }
-    var o = (0, tslib_1.__assign)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultLabelOptions), { measureOnly: false }), options);
+    var o = tslib_1.__assign(tslib_1.__assign(tslib_1.__assign({}, exports.DefaultLabelOptions), { measureOnly: false }), options);
     var _a = quad.loci.map(function (l) { return loci_1.Loci.getCenter(l); }), cA = _a[0], cB = _a[1], cC = _a[2], cD = _a[3];
     var dihedral = "".concat((0, misc_1.radToDeg)(linear_algebra_1.Vec3.dihedralAngle(cA, cB, cC, cD)).toFixed(2), "\u00B0");
     if (o.measureOnly)

package/lib/commonjs/mol-theme/theme.js

@@ -28,8 +28,8 @@ var Theme;
     Theme.createEmpty = createEmpty;
     function ensureDependencies(ctx, theme, data, props) {
         var _a, _b;
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_c) {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
+            return tslib_1.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0: return [4 /*yield*/, ((_a = theme.colorThemeRegistry.get(props.colorTheme.name).ensureCustomProperties) === null || _a === void 0 ? void 0 : _a.attach(ctx, data))];
                     case 1:
@@ -122,7 +122,7 @@ var ThemeRegistry = /** @class */ (function () {
     ThemeRegistry.prototype.create = function (name, ctx, props) {
         if (props === void 0) { props = {}; }
         var provider = this.get(name);
-        return provider.factory(ctx, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, param_definition_1.ParamDefinition.getDefaultValues(provider.getParams(ctx))), props));
+        return provider.factory(ctx, tslib_1.__assign(tslib_1.__assign({}, param_definition_1.ParamDefinition.getDefaultValues(provider.getParams(ctx))), props));
     };
     ThemeRegistry.prototype.getApplicableList = function (ctx) {
         return this._list.filter(function (e) { return e.provider.isApplicable(ctx); });

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

@@ -15,7 +15,7 @@ var mol_task_1 = require("../mol-task");
 var Asset;
 (function (Asset) {
     function Url(url, options) {
-        return (0, tslib_1.__assign)({ kind: 'url', id: uuid_1.UUID.create22(), url: url }, options);
+        return tslib_1.__assign({ kind: 'url', id: uuid_1.UUID.create22(), url: url }, options);
     }
     Asset.Url = Url;
     function File(file) {
@@ -84,9 +84,9 @@ var AssetManager = /** @class */ (function () {
         var _this = this;
         if (store === void 0) { store = true; }
         if (Asset.isUrl(asset)) {
-            return mol_task_1.Task.create("Download ".concat(asset.title || asset.url), function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+            return mol_task_1.Task.create("Download ".concat(asset.title || asset.url), function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var entry, _a, _b, _c, _d, data, file, _e, _f;
-                return (0, tslib_1.__generator)(this, function (_g) {
+                return tslib_1.__generator(this, function (_g) {
                     switch (_g.label) {
                         case 0:
                             if (!this._assets.has(asset.id)) return [3 /*break*/, 2];
@@ -98,9 +98,9 @@ var AssetManager = /** @class */ (function () {
                         case 2:
                             if (!!store) return [3 /*break*/, 4];
                             _d = (_c = Asset).Wrapper;
-                            return [4 /*yield*/, (0, data_source_1.ajaxGet)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, asset), { type: type })).runInContext(ctx)];
+                            return [4 /*yield*/, (0, data_source_1.ajaxGet)(tslib_1.__assign(tslib_1.__assign({}, asset), { type: type })).runInContext(ctx)];
                         case 3: return [2 /*return*/, _d.apply(_c, [_g.sent(), asset, this])];
-                        case 4: return [4 /*yield*/, (0, data_source_1.ajaxGet)((0, tslib_1.__assign)((0, tslib_1.__assign)({}, asset), { type: 'binary' })).runInContext(ctx)];
+                        case 4: return [4 /*yield*/, (0, data_source_1.ajaxGet)(tslib_1.__assign(tslib_1.__assign({}, asset), { type: 'binary' })).runInContext(ctx)];
                         case 5:
                             data = _g.sent();
                             file = new File([data], 'raw-data');
@@ -113,9 +113,9 @@ var AssetManager = /** @class */ (function () {
             }); });
         }
         else {
-            return mol_task_1.Task.create("Read ".concat(asset.name), function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+            return mol_task_1.Task.create("Read ".concat(asset.name), function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
                 var entry, _a, _b, _c, _d;
-                return (0, tslib_1.__generator)(this, function (_e) {
+                return tslib_1.__generator(this, function (_e) {
                     switch (_e.label) {
                         case 0:
                             if (!this._assets.has(asset.id)) return [3 /*break*/, 2];

package/lib/commonjs/mol-util/color/distinct.js

@@ -88,7 +88,7 @@ function getSamples(count, p) {
  */
 function distinctColors(count, props) {
     if (props === void 0) { props = {}; }
-    var p = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, param_definition_1.ParamDefinition.getDefaultValues(exports.DistinctColorsParams)), props);
+    var p = tslib_1.__assign(tslib_1.__assign({}, param_definition_1.ParamDefinition.getDefaultValues(exports.DistinctColorsParams)), props);
     if (count <= 0)
         return [];
     var samples = getSamples(Math.max(p.minSampleCount, count * 5), p);

package/lib/commonjs/mol-util/color/palette.js

@@ -19,13 +19,13 @@ var DefaultGetPaletteProps = {
 };
 function getPaletteParams(props) {
     if (props === void 0) { props = {}; }
-    var p = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, DefaultGetPaletteProps), props);
+    var p = tslib_1.__assign(tslib_1.__assign({}, DefaultGetPaletteProps), props);
     return {
         palette: param_definition_1.ParamDefinition.MappedStatic(p.type, {
             colors: param_definition_1.ParamDefinition.Group({
                 list: param_definition_1.ParamDefinition.ColorList(p.colorList),
             }, { isFlat: true }),
-            generate: param_definition_1.ParamDefinition.Group((0, tslib_1.__assign)((0, tslib_1.__assign)({}, distinct_1.DistinctColorsParams), { maxCount: param_definition_1.ParamDefinition.Numeric(75, { min: 1, max: 250, step: 1 }) }), { isFlat: true })
+            generate: param_definition_1.ParamDefinition.Group(tslib_1.__assign(tslib_1.__assign({}, distinct_1.DistinctColorsParams), { maxCount: param_definition_1.ParamDefinition.Numeric(75, { min: 1, max: 250, step: 1 }) }), { isFlat: true })
         }, {
             options: [
                 ['colors', 'Color List'],
@@ -49,7 +49,7 @@ function getPalette(count, props, labelOptions) {
     if (props.palette.name === 'colors' && props.palette.params.list.kind === 'interpolate') {
         var list = props.palette.params.list;
         var domain = [0, count - 1];
-        var _b = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, DefaultLabelOptions), labelOptions), minLabel = _b.minLabel, maxLabel = _b.maxLabel;
+        var _b = tslib_1.__assign(tslib_1.__assign({}, DefaultLabelOptions), labelOptions), minLabel = _b.minLabel, maxLabel = _b.maxLabel;
         var colors = list.colors;
         if (colors.length === 0)
             colors = (0, lists_1.getColorListFromName)(DefaultGetPaletteProps.colorList).list;

package/lib/commonjs/mol-util/color/scale.js

@@ -23,7 +23,7 @@ exports.DefaultColorScaleProps = {
 var ColorScale;
 (function (ColorScale) {
     function create(props) {
-        var _a = (0, tslib_1.__assign)((0, tslib_1.__assign)({}, exports.DefaultColorScaleProps), props), domain = _a.domain, reverse = _a.reverse, listOrName = _a.listOrName;
+        var _a = tslib_1.__assign(tslib_1.__assign({}, exports.DefaultColorScaleProps), props), domain = _a.domain, reverse = _a.reverse, listOrName = _a.listOrName;
         var list = typeof listOrName === 'string' ? (0, lists_1.getColorListFromName)(listOrName).list : listOrName;
         var colors = reverse ? list.slice().reverse() : list;
         var count1 = colors.length - 1;
@@ -39,7 +39,7 @@ var ColorScale;
         var color;
         var hasOffsets = colors.every(function (c) { return Array.isArray(c); });
         if (hasOffsets) {
-            var sorted = (0, tslib_1.__spreadArray)([], colors, true);
+            var sorted = tslib_1.__spreadArray([], colors, true);
             sorted.sort(function (a, b) { return a[1] - b[1]; });
             var src_1 = sorted.map(function (c) { return c[0]; });
             var off_1 = int_1.SortedArray.ofSortedArray(sorted.map(function (c) { return c[1]; }));

package/lib/commonjs/mol-util/data-source.js

@@ -100,10 +100,11 @@ function getCompression(name) {
         /\.zip$/i.test(name) ? DataCompressionMethod.Zip :
             DataCompressionMethod.None;
 }
+var reFilterPath = /^(__MACOSX|.DS_Store)/;
 function decompress(ctx, data, compression) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var _a, parsed, names;
-        return (0, tslib_1.__generator)(this, function (_b) {
+        return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     _a = compression;
@@ -118,7 +119,7 @@ function decompress(ctx, data, compression) {
                 case 3: return [4 /*yield*/, (0, zip_1.unzip)(ctx, data.buffer)];
                 case 4:
                     parsed = _b.sent();
-                    names = Object.keys(parsed);
+                    names = Object.keys(parsed).filter(function (n) { return !reFilterPath.test(n); });
                     if (names.length !== 1)
                         throw new Error('can only decompress zip files with a single entry');
                     return [2 /*return*/, parsed[names[0]]];
@@ -128,9 +129,9 @@ function decompress(ctx, data, compression) {
     });
 }
 function processFile(ctx, reader, type, compression) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var result, data, decompressed, parser;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     result = reader.result;
@@ -179,9 +180,9 @@ function processFile(ctx, reader, type, compression) {
 function readFromFileInternal(file, type) {
     var _this = this;
     var reader = void 0;
-    return mol_task_1.Task.create('Read File', function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+    return mol_task_1.Task.create('Read File', function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         var compression, fileReader;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, , 5, 6]);
@@ -273,9 +274,9 @@ function getRequestResponseType(type) {
 function ajaxGetInternal(title, url, type, body, headers) {
     var _this = this;
     var xhttp = void 0;
-    return mol_task_1.Task.create(title ? title : 'Download', function (ctx) { return (0, tslib_1.__awaiter)(_this, void 0, void 0, function () {
+    return mol_task_1.Task.create(title ? title : 'Download', function (ctx) { return tslib_1.__awaiter(_this, void 0, void 0, function () {
         var _a, headers_1, _b, name_1, value, req, result;
-        return (0, tslib_1.__generator)(this, function (_c) {
+        return tslib_1.__generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     xhttp = RequestPool.get();
@@ -310,9 +311,9 @@ function ajaxGetInternal(title, url, type, body, headers) {
     });
 }
 function ajaxGetMany(ctx, assetManager, sources, maxConcurrency) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var len, slots, promises, promiseKeys, currentSrc, _i, current, done, r, src, idx, current, asset;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     len = sources.length;
@@ -368,9 +369,9 @@ function _filterRemoveIndex(_, i) {
     return this !== i;
 }
 function wrapPromise(index, id, p) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var result, error_1;
-        return (0, tslib_1.__generator)(this, function (_a) {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     _a.trys.push([0, 2, , 3]);

package/lib/commonjs/mol-util/file-info.d.ts

@@ -1,5 +1,5 @@
 /**
- * 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>
  */
@@ -11,8 +11,6 @@ export interface FileInfo {
     ext: string;
     base: string;
     dir: string;
-    compressed: string | boolean;
-    binary: boolean;
     protocol: string;
     query: string;
     src: FileInput;