molstar 3.3.1 → 3.4.0

package/lib/commonjs/mol-plugin-state/actions/file.js

@@ -1,6 +1,6 @@
 "use strict";
 /**
- * Copyright (c) 2019-2020 mol* contributors, licensed under MIT, See LICENSE file for more info.
+ * Copyright (c) 2019-2022 mol* contributors, licensed under MIT, See LICENSE file for more info.
  *
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
@@ -14,6 +14,41 @@ var file_info_1 = require("../../mol-util/file-info");
 var param_definition_1 = require("../../mol-util/param-definition");
 var zip_1 = require("../../mol-util/zip/zip");
 var objects_1 = require("../objects");
+function processFile(file, plugin, format, visuals) {
+    var _a, _b;
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
+        var info, isBinary, data, provider, parsed;
+        return tslib_1.__generator(this, function (_c) {
+            switch (_c.label) {
+                case 0:
+                    info = (0, file_info_1.getFileInfo)(file.file);
+                    isBinary = plugin.dataFormats.binaryExtensions.has(info.ext);
+                    return [4 /*yield*/, plugin.builders.data.readFile({ file: file, isBinary: isBinary })];
+                case 1:
+                    data = (_c.sent()).data;
+                    provider = format === 'auto'
+                        ? plugin.dataFormats.auto(info, (_a = data.cell) === null || _a === void 0 ? void 0 : _a.obj)
+                        : plugin.dataFormats.get(format);
+                    if (!!provider) return [3 /*break*/, 3];
+                    plugin.log.warn("OpenFiles: could not find data provider for '".concat(info.ext, "'"));
+                    return [4 /*yield*/, plugin.state.data.build().delete(data).commit()];
+                case 2:
+                    _c.sent();
+                    return [2 /*return*/];
+                case 3: return [4 /*yield*/, provider.parse(plugin, data)];
+                case 4:
+                    parsed = _c.sent();
+                    if (!visuals) return [3 /*break*/, 6];
+                    return [4 /*yield*/, ((_b = provider.visuals) === null || _b === void 0 ? void 0 : _b.call(provider, plugin, parsed))];
+                case 5:
+                    _c.sent();
+                    _c.label = 6;
+                case 6: return [2 /*return*/];
+            }
+        });
+    });
+}
+;
 exports.OpenFiles = mol_state_1.StateAction.build({
     display: { name: 'Open Files', description: 'Load one or more files and optionally create default visuals' },
     from: objects_1.PluginStateObject.Root,
@@ -30,50 +65,20 @@ exports.OpenFiles = mol_state_1.StateAction.build({
     }
 })(function (_a, plugin) {
     var params = _a.params, state = _a.state;
-    return mol_task_1.Task.create('Open Files', function (taskCtx) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
-        return (0, tslib_1.__generator)(this, function (_a) {
+    return mol_task_1.Task.create('Open Files', function (taskCtx) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     plugin.behaviors.layout.leftPanelTabName.next('data');
-                    return [4 /*yield*/, state.transaction(function () { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
-                            var processFile, _i, _a, file, zippedFiles, _b, _c, _d, _e, _f, fn, filedata, asset, e_1;
-                            return (0, tslib_1.__generator)(this, function (_g) {
+                    return [4 /*yield*/, state.transaction(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                            var _i, _a, file, zippedFiles, _b, _c, _d, _e, _f, fn, filedata, asset, format, e_1;
+                            return tslib_1.__generator(this, function (_g) {
                                 switch (_g.label) {
                                     case 0:
                                         if (params.files === null) {
                                             plugin.log.error('No file(s) selected');
                                             return [2 /*return*/];
                                         }
-                                        processFile = function (file) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
-                                            var info, isBinary, data, provider, parsed;
-                                            var _a, _b;
-                                            return (0, tslib_1.__generator)(this, function (_c) {
-                                                switch (_c.label) {
-                                                    case 0:
-                                                        info = (0, file_info_1.getFileInfo)(file.file);
-                                                        isBinary = plugin.dataFormats.binaryExtensions.has(info.ext);
-                                                        return [4 /*yield*/, plugin.builders.data.readFile({ file: file, isBinary: isBinary })];
-                                                    case 1:
-                                                        data = (_c.sent()).data;
-                                                        provider = params.format.name === 'auto'
-                                                            ? plugin.dataFormats.auto(info, (_a = data.cell) === null || _a === void 0 ? void 0 : _a.obj)
-                                                            : plugin.dataFormats.get(params.format.params);
-                                                        if (!provider) {
-                                                            plugin.log.warn("OpenFiles: could not find data provider for '".concat(info.name, ".").concat(info.ext, "'"));
-                                                            return [2 /*return*/];
-                                                        }
-                                                        return [4 /*yield*/, provider.parse(plugin, data)];
-                                                    case 2:
-                                                        parsed = _c.sent();
-                                                        if (!params.visuals) return [3 /*break*/, 4];
-                                                        return [4 /*yield*/, ((_b = provider.visuals) === null || _b === void 0 ? void 0 : _b.call(provider, plugin, parsed))];
-                                                    case 3:
-                                                        _c.sent();
-                                                        _c.label = 4;
-                                                    case 4: return [2 /*return*/];
-                                                }
-                                            });
-                                        }); };
                                         _i = 0, _a = params.files;
                                         _g.label = 1;
                                     case 1:
@@ -94,8 +99,10 @@ exports.OpenFiles = mol_state_1.StateAction.build({
                                     case 5:
                                         if (!(_d < _e.length)) return [3 /*break*/, 8];
                                         _f = _e[_d], fn = _f[0], filedata = _f[1];
+                                        if (!(filedata instanceof Uint8Array) || filedata.length === 0)
+                                            return [3 /*break*/, 7];
                                         asset = assets_1.Asset.File(new File([filedata], fn));
-                                        return [4 /*yield*/, processFile(asset)];
+                                        return [4 /*yield*/, processFile(asset, plugin, 'auto', params.visuals)];
                                     case 6:
                                         _g.sent();
                                         _g.label = 7;
@@ -103,7 +110,9 @@ exports.OpenFiles = mol_state_1.StateAction.build({
                                         _d++;
                                         return [3 /*break*/, 5];
                                     case 8: return [3 /*break*/, 11];
-                                    case 9: return [4 /*yield*/, processFile(file)];
+                                    case 9:
+                                        format = params.format.name === 'auto' ? 'auto' : params.format.params;
+                                        return [4 /*yield*/, processFile(file, plugin, format, params.visuals)];
                                     case 10:
                                         _g.sent();
                                         _g.label = 11;
@@ -131,7 +140,7 @@ exports.DownloadFile = mol_state_1.StateAction.build({
     display: { name: 'Download File', description: 'Load one or more file from an URL' },
     from: objects_1.PluginStateObject.Root,
     params: function (a, ctx) {
-        var options = ctx.dataFormats.options;
+        var options = tslib_1.__spreadArray(tslib_1.__spreadArray([], ctx.dataFormats.options, true), [['zip', 'Zip']], false);
         return {
             url: param_definition_1.ParamDefinition.Url(''),
             format: param_definition_1.ParamDefinition.Select(options[0][0], options),
@@ -141,41 +150,65 @@ exports.DownloadFile = mol_state_1.StateAction.build({
     }
 })(function (_a, plugin) {
     var params = _a.params, state = _a.state;
-    return mol_task_1.Task.create('Open Files', function (taskCtx) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
-        return (0, tslib_1.__generator)(this, function (_a) {
+    return mol_task_1.Task.create('Open Files', function (taskCtx) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+        return tslib_1.__generator(this, function (_a) {
             switch (_a.label) {
                 case 0:
                     plugin.behaviors.layout.leftPanelTabName.next('data');
-                    return [4 /*yield*/, state.transaction(function () { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
-                            var provider, data, parsed, e_2;
-                            var _a;
-                            return (0, tslib_1.__generator)(this, function (_b) {
-                                switch (_b.label) {
+                    return [4 /*yield*/, state.transaction(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                            var data, zippedFiles, _i, _a, _b, fn, filedata, asset, provider, data, parsed, e_2;
+                            var _c, _d;
+                            return tslib_1.__generator(this, function (_e) {
+                                switch (_e.label) {
                                     case 0:
-                                        _b.trys.push([0, 5, , 6]);
+                                        _e.trys.push([0, 12, , 13]);
+                                        if (!(params.format === 'zip')) return [3 /*break*/, 7];
+                                        return [4 /*yield*/, plugin.builders.data.download({ url: params.url, isBinary: true })];
+                                    case 1:
+                                        data = _e.sent();
+                                        return [4 /*yield*/, (0, zip_1.unzip)(taskCtx, ((_c = data.obj) === null || _c === void 0 ? void 0 : _c.data).buffer)];
+                                    case 2:
+                                        zippedFiles = _e.sent();
+                                        _i = 0, _a = Object.entries(zippedFiles);
+                                        _e.label = 3;
+                                    case 3:
+                                        if (!(_i < _a.length)) return [3 /*break*/, 6];
+                                        _b = _a[_i], fn = _b[0], filedata = _b[1];
+                                        if (!(filedata instanceof Uint8Array) || filedata.length === 0)
+                                            return [3 /*break*/, 5];
+                                        asset = assets_1.Asset.File(new File([filedata], fn));
+                                        return [4 /*yield*/, processFile(asset, plugin, 'auto', params.visuals)];
+                                    case 4:
+                                        _e.sent();
+                                        _e.label = 5;
+                                    case 5:
+                                        _i++;
+                                        return [3 /*break*/, 3];
+                                    case 6: return [3 /*break*/, 11];
+                                    case 7:
                                         provider = plugin.dataFormats.get(params.format);
                                         if (!provider) {
                                             plugin.log.warn("DownloadFile: could not find data provider for '".concat(params.format, "'"));
                                             return [2 /*return*/];
                                         }
                                         return [4 /*yield*/, plugin.builders.data.download({ url: params.url, isBinary: params.isBinary })];
-                                    case 1:
-                                        data = _b.sent();
+                                    case 8:
+                                        data = _e.sent();
                                         return [4 /*yield*/, provider.parse(plugin, data)];
-                                    case 2:
-                                        parsed = _b.sent();
-                                        if (!params.visuals) return [3 /*break*/, 4];
-                                        return [4 /*yield*/, ((_a = provider.visuals) === null || _a === void 0 ? void 0 : _a.call(provider, plugin, parsed))];
-                                    case 3:
-                                        _b.sent();
-                                        _b.label = 4;
-                                    case 4: return [3 /*break*/, 6];
-                                    case 5:
-                                        e_2 = _b.sent();
+                                    case 9:
+                                        parsed = _e.sent();
+                                        if (!params.visuals) return [3 /*break*/, 11];
+                                        return [4 /*yield*/, ((_d = provider.visuals) === null || _d === void 0 ? void 0 : _d.call(provider, plugin, parsed))];
+                                    case 10:
+                                        _e.sent();
+                                        _e.label = 11;
+                                    case 11: return [3 /*break*/, 13];
+                                    case 12:
+                                        e_2 = _e.sent();
                                         console.error(e_2);
                                         plugin.log.error("Error downloading '".concat(typeof params.url === 'string' ? params.url : params.url.url, "'"));
-                                        return [3 /*break*/, 6];
-                                    case 6: return [2 /*return*/];
+                                        return [3 /*break*/, 13];
+                                    case 13: return [2 /*return*/];
                                 }
                             });
                         }); }).runInContext(taskCtx)];

package/lib/commonjs/mol-plugin-state/actions/structure.d.ts

@@ -1,5 +1,5 @@
 /**
- * Copyright (c) 2018-2021 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 David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
@@ -9,7 +9,7 @@ import { ParamDefinition as PD } from '../../mol-util/param-definition';
 import { PluginStateObject } from '../objects';
 export declare const PdbDownloadProvider: {
     rcsb: PD.Group<PD.Normalize<{
-        encoding: "bcif" | "cif";
+        encoding: "cif" | "bcif";
     }>>;
     pdbe: PD.Group<PD.Normalize<{
         variant: "updated" | "updated-bcif" | "updtaed-bcif" | "archival";
@@ -65,3 +65,12 @@ export declare const AddTrajectory: StateAction<PluginStateObject.Root, void, PD
     model: string;
     coordinates: string;
 }>>;
+export declare const LoadTrajectory: StateAction<PluginStateObject.Root, void, PD.Normalize<{
+    source: PD.NamedParams<PD.Normalize<{
+        model: any;
+        coordinates: any;
+    }>, "url"> | PD.NamedParams<PD.Normalize<{
+        model: any;
+        coordinates: any;
+    }>, "file">;
+}>>;

package/lib/commonjs/mol-plugin-state/actions/structure.js

@@ -1,12 +1,12 @@
 "use strict";
 /**
- * Copyright (c) 2018-2021 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 David Sehnal <david.sehnal@gmail.com>
  * @author Alexander Rose <alexander.rose@weirdbyte.de>
  */
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.AddTrajectory = exports.EnableStructureCustomProps = exports.EnableModelCustomProps = exports.UpdateTrajectory = exports.DownloadStructure = exports.PdbDownloadProvider = void 0;
+exports.LoadTrajectory = exports.AddTrajectory = exports.EnableStructureCustomProps = exports.EnableModelCustomProps = exports.UpdateTrajectory = exports.DownloadStructure = exports.PdbDownloadProvider = void 0;
 var tslib_1 = require("tslib");
 var mol_state_1 = require("../../mol-state");
 var mol_task_1 = require("../../mol-task");
@@ -21,6 +21,8 @@ var assets_1 = require("../../mol-util/assets");
 var config_1 = require("../../mol-plugin/config");
 var file_info_1 = require("../../mol-util/file-info");
 var type_helpers_1 = require("../../mol-util/type-helpers");
+var topology_1 = require("../formats/topology");
+var coordinates_1 = require("../formats/coordinates");
 var DownloadModelRepresentationOptions = function (plugin) {
     var representationDefault = plugin.config.get(config_1.PluginConfig.Structure.DefaultRepresentationPreset) || representation_preset_1.PresetStructureRepresentations.auto.id;
     return param_definition_1.ParamDefinition.Group({
@@ -88,9 +90,9 @@ var DownloadStructure = mol_state_1.StateAction.build({
     }
 })(function (_a, plugin) {
     var params = _a.params, state = _a.state;
-    return mol_task_1.Task.create('Download Structure', function (ctx) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
+    return mol_task_1.Task.create('Download Structure', function (ctx) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var src, downloadParams, asTrajectory, format, _a, representationPreset, showUnitcell, structure;
-        return (0, tslib_1.__generator)(this, function (_b) {
+        return tslib_1.__generator(this, function (_b) {
             switch (_b.label) {
                 case 0:
                     plugin.behaviors.layout.leftPanelTabName.next('data');
@@ -138,9 +140,9 @@ var DownloadStructure = mol_state_1.StateAction.build({
                     asTrajectory = !!src.params.options.asTrajectory;
                     format = 'pdb';
                     return [3 /*break*/, 15];
-                case 8: return [4 /*yield*/, getDownloadParams(src.params.id, function (id) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
+                case 8: return [4 /*yield*/, getDownloadParams(src.params.id, function (id) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
                         var url, info;
-                        return (0, tslib_1.__generator)(this, function (_a) {
+                        return tslib_1.__generator(this, function (_a) {
                             switch (_a.label) {
                                 case 0:
                                     url = "https://www.alphafold.ebi.ac.uk/api/prediction/".concat(id.toUpperCase());
@@ -170,15 +172,17 @@ var DownloadStructure = mol_state_1.StateAction.build({
                     asTrajectory = !!src.params.options.asTrajectory;
                     format = 'mol';
                     return [3 /*break*/, 15];
-                case 14: throw new Error("".concat(src.name, " not supported."));
+                case 14:
+                    (0, type_helpers_1.assertUnreachable)(src);
+                    _b.label = 15;
                 case 15:
                     representationPreset = params.source.params.options.representation || plugin.config.get(config_1.PluginConfig.Structure.DefaultRepresentationPreset) || representation_preset_1.PresetStructureRepresentations.auto.id;
                     showUnitcell = representationPreset !== representation_preset_1.PresetStructureRepresentations.empty.id;
                     structure = src.params.options.type.name === 'auto' ? void 0 : src.params.options.type;
-                    return [4 /*yield*/, state.transaction(function () { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
+                    return [4 /*yield*/, state.transaction(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
                             var blob, trajectory, _i, downloadParams_1, download, data, provider, trajectory;
                             var _a;
-                            return (0, tslib_1.__generator)(this, function (_b) {
+                            return tslib_1.__generator(this, function (_b) {
                                 switch (_b.label) {
                                     case 0:
                                         if (!(downloadParams.length > 0 && asTrajectory)) return [3 /*break*/, 4];
@@ -242,10 +246,10 @@ var DownloadStructure = mol_state_1.StateAction.build({
 });
 exports.DownloadStructure = DownloadStructure;
 function getDownloadParams(src, url, label, isBinary) {
-    return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+    return tslib_1.__awaiter(this, void 0, void 0, function () {
         var ids, ret, _i, ids_1, id, _a, _b, _c, _d;
         var _e;
-        return (0, tslib_1.__generator)(this, function (_f) {
+        return tslib_1.__generator(this, function (_f) {
             switch (_f.label) {
                 case 0:
                     ids = src.split(/[,\s]/).map(function (id) { return id.trim(); }).filter(function (id) { return !!id && (id.length >= 4 || /^[1-9][0-9]*$/.test(id)); });
@@ -271,8 +275,8 @@ function getDownloadParams(src, url, label, isBinary) {
     });
 }
 function getPdbeDownloadParams(src) {
-    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) {
             if (src.name !== 'pdb' || src.params.provider.server.name !== 'pdbe')
                 throw new Error('expected pdbe');
             return [2 /*return*/, src.params.provider.server.params.variant === 'updated'
@@ -284,8 +288,8 @@ function getPdbeDownloadParams(src) {
     });
 }
 function getPdbjDownloadParams(src) {
-    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) {
             if (src.name !== 'pdb' || src.params.provider.server.name !== 'pdbj')
                 throw new Error('expected pdbj');
             return [2 /*return*/, getDownloadParams(src.params.provider.id, function (id) { return "https://data.pdbjbk1.pdbj.org/pub/pdb/data/structures/divided/mmCIF/".concat(id.toLowerCase().substring(1, 3), "/").concat(id.toLowerCase(), ".cif"); }, function (id) { return "PDBj: ".concat(id, " (cif)"); }, false)];
@@ -293,8 +297,8 @@ function getPdbjDownloadParams(src) {
     });
 }
 function getRcsbDownloadParams(src) {
-    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) {
             if (src.name !== 'pdb' || src.params.provider.server.name !== 'rcsb')
                 throw new Error('expected rcsb');
             return [2 /*return*/, src.params.provider.server.params.encoding === 'cif'
@@ -370,7 +374,7 @@ exports.AddTrajectory = mol_state_1.StateAction.build({
     from: objects_1.PluginStateObject.Root,
     params: function (a, ctx) {
         var state = ctx.state.data;
-        var models = (0, tslib_1.__spreadArray)((0, tslib_1.__spreadArray)([], state.selectQ(function (q) { return q.rootsOfType(objects_1.PluginStateObject.Molecule.Model); }), true), state.selectQ(function (q) { return q.rootsOfType(objects_1.PluginStateObject.Molecule.Topology); }), true);
+        var models = tslib_1.__spreadArray(tslib_1.__spreadArray([], state.selectQ(function (q) { return q.rootsOfType(objects_1.PluginStateObject.Molecule.Model); }), true), state.selectQ(function (q) { return q.rootsOfType(objects_1.PluginStateObject.Molecule.Topology); }), true);
         var modelOptions = models.map(function (t) { return [t.transform.ref, t.obj.label]; });
         var coords = state.selectQ(function (q) { return q.rootsOfType(objects_1.PluginStateObject.Molecule.Coordinates); });
         var coordOptions = coords.map(function (c) { return [c.transform.ref, c.obj.label]; });
@@ -382,9 +386,9 @@ exports.AddTrajectory = mol_state_1.StateAction.build({
 })(function (_a, ctx) {
     var params = _a.params, state = _a.state;
     return mol_task_1.Task.create('Add Trajectory', function (taskCtx) {
-        return state.transaction(function () { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
+        return state.transaction(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
             var dependsOn, model, structure;
-            return (0, tslib_1.__generator)(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         dependsOn = [params.model, params.coordinates];
@@ -409,3 +413,169 @@ exports.AddTrajectory = mol_state_1.StateAction.build({
         }); }).runInContext(taskCtx);
     });
 });
+exports.LoadTrajectory = mol_state_1.StateAction.build({
+    display: { name: 'Load Trajectory', description: 'Load trajectory of model/topology and coordinates from URL or file.' },
+    from: objects_1.PluginStateObject.Root,
+    params: function (a, ctx) {
+        var options = ctx.dataFormats.options;
+        var modelOptions = options.filter(function (o) { return o[2] === trajectory_1.TrajectoryFormatCategory || o[2] === topology_1.TopologyFormatCategory; });
+        var coordinatesOptions = options.filter(function (o) { return o[2] === coordinates_1.CoordinatesFormatCategory; });
+        var modelExts = [];
+        var coordinatesExts = [];
+        for (var _i = 0, _a = ctx.dataFormats.list; _i < _a.length; _i++) {
+            var provider = _a[_i].provider;
+            if (provider.category === trajectory_1.TrajectoryFormatCategory || provider.category === topology_1.TopologyFormatCategory) {
+                if (provider.binaryExtensions)
+                    modelExts.push.apply(modelExts, provider.binaryExtensions);
+                if (provider.stringExtensions)
+                    modelExts.push.apply(modelExts, provider.stringExtensions);
+            }
+            else if (provider.category === coordinates_1.CoordinatesFormatCategory) {
+                if (provider.binaryExtensions)
+                    coordinatesExts.push.apply(coordinatesExts, provider.binaryExtensions);
+                if (provider.stringExtensions)
+                    coordinatesExts.push.apply(coordinatesExts, provider.stringExtensions);
+            }
+        }
+        return {
+            source: param_definition_1.ParamDefinition.MappedStatic('file', {
+                url: param_definition_1.ParamDefinition.Group({
+                    model: param_definition_1.ParamDefinition.Group({
+                        url: param_definition_1.ParamDefinition.Url(''),
+                        format: param_definition_1.ParamDefinition.Select(modelOptions[0][0], modelOptions),
+                        isBinary: param_definition_1.ParamDefinition.Boolean(false),
+                    }, { isExpanded: true }),
+                    coordinates: param_definition_1.ParamDefinition.Group({
+                        url: param_definition_1.ParamDefinition.Url(''),
+                        format: param_definition_1.ParamDefinition.Select(coordinatesOptions[0][0], coordinatesOptions),
+                    }, { isExpanded: true })
+                }, { isFlat: true }),
+                file: param_definition_1.ParamDefinition.Group({
+                    model: param_definition_1.ParamDefinition.File({ accept: modelExts.map(function (e) { return ".".concat(e); }).join(','), label: 'Model' }),
+                    coordinates: param_definition_1.ParamDefinition.File({ accept: coordinatesExts.map(function (e) { return ".".concat(e); }).join(','), label: 'Coordinates' }),
+                }, { isFlat: true }),
+            }, { options: [['url', 'URL'], ['file', 'File']] })
+        };
+    }
+})(function (_a, ctx) {
+    var params = _a.params, state = _a.state;
+    return mol_task_1.Task.create('Load Trajectory', function (taskCtx) {
+        return state.transaction(function () { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+            var s, processUrl, processFile, modelParsed, _a, model, coordinates, _b, dependsOn, traj, structure, e_1;
+            return tslib_1.__generator(this, function (_c) {
+                switch (_c.label) {
+                    case 0:
+                        s = params.source;
+                        if (s.name === 'file' && (s.params.model === null || s.params.coordinates === null)) {
+                            ctx.log.error('No file(s) selected');
+                            return [2 /*return*/];
+                        }
+                        if (s.name === 'url' && (!s.params.model || !s.params.coordinates)) {
+                            ctx.log.error('No URL(s) given');
+                            return [2 /*return*/];
+                        }
+                        processUrl = function (url, format, isBinary) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                            var data, provider;
+                            return tslib_1.__generator(this, function (_a) {
+                                switch (_a.label) {
+                                    case 0: return [4 /*yield*/, ctx.builders.data.download({ url: url, isBinary: isBinary })];
+                                    case 1:
+                                        data = _a.sent();
+                                        provider = ctx.dataFormats.get(format);
+                                        if (!provider) {
+                                            ctx.log.warn("LoadTrajectory: could not find data provider for '".concat(format, "'"));
+                                            return [2 /*return*/];
+                                        }
+                                        return [2 /*return*/, provider.parse(ctx, data)];
+                                }
+                            });
+                        }); };
+                        processFile = function (file) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
+                            var info, isBinary, data, provider;
+                            var _a;
+                            return tslib_1.__generator(this, function (_b) {
+                                switch (_b.label) {
+                                    case 0:
+                                        if (!file)
+                                            throw new Error('No file selected');
+                                        info = (0, file_info_1.getFileInfo)(file.file);
+                                        isBinary = ctx.dataFormats.binaryExtensions.has(info.ext);
+                                        return [4 /*yield*/, ctx.builders.data.readFile({ file: file, isBinary: isBinary })];
+                                    case 1:
+                                        data = (_b.sent()).data;
+                                        provider = ctx.dataFormats.auto(info, (_a = data.cell) === null || _a === void 0 ? void 0 : _a.obj);
+                                        if (!!provider) return [3 /*break*/, 3];
+                                        ctx.log.warn("LoadTrajectory: could not find data provider for '".concat(info.ext, "'"));
+                                        return [4 /*yield*/, ctx.state.data.build().delete(data).commit()];
+                                    case 2:
+                                        _b.sent();
+                                        return [2 /*return*/];
+                                    case 3: return [2 /*return*/, provider.parse(ctx, data)];
+                                }
+                            });
+                        }); };
+                        _c.label = 1;
+                    case 1:
+                        _c.trys.push([1, 16, , 17]);
+                        if (!(s.name === 'url')) return [3 /*break*/, 3];
+                        return [4 /*yield*/, processUrl(s.params.model.url, s.params.model.format, s.params.model.isBinary)];
+                    case 2:
+                        _a = _c.sent();
+                        return [3 /*break*/, 5];
+                    case 3: return [4 /*yield*/, processFile(s.params.model)];
+                    case 4:
+                        _a = _c.sent();
+                        _c.label = 5;
+                    case 5:
+                        modelParsed = _a;
+                        model = void 0;
+                        if (!('trajectory' in modelParsed)) return [3 /*break*/, 7];
+                        return [4 /*yield*/, state.build().to(modelParsed.trajectory)
+                                .apply(model_1.ModelFromTrajectory, { modelIndex: 0 })
+                                .commit()];
+                    case 6:
+                        model = _c.sent();
+                        return [3 /*break*/, 8];
+                    case 7:
+                        model = modelParsed.topology;
+                        _c.label = 8;
+                    case 8:
+                        if (!(s.name === 'url')) return [3 /*break*/, 10];
+                        return [4 /*yield*/, processUrl(s.params.coordinates.url, s.params.coordinates.format, true)];
+                    case 9:
+                        _b = _c.sent();
+                        return [3 /*break*/, 12];
+                    case 10: return [4 /*yield*/, processFile(s.params.coordinates)];
+                    case 11:
+                        _b = _c.sent();
+                        _c.label = 12;
+                    case 12:
+                        coordinates = _b;
+                        dependsOn = [model.ref, coordinates.ref];
+                        traj = state.build().toRoot()
+                            .apply(model_1.TrajectoryFromModelAndCoordinates, {
+                            modelRef: model.ref,
+                            coordinatesRef: coordinates.ref
+                        }, { dependsOn: dependsOn })
+                            .apply(transforms_1.StateTransforms.Model.ModelFromTrajectory, { modelIndex: 0 });
+                        return [4 /*yield*/, state.updateTree(traj).runInContext(taskCtx)];
+                    case 13:
+                        _c.sent();
+                        return [4 /*yield*/, ctx.builders.structure.createStructure(traj.selector)];
+                    case 14:
+                        structure = _c.sent();
+                        return [4 /*yield*/, ctx.builders.structure.representation.applyPreset(structure, 'auto')];
+                    case 15:
+                        _c.sent();
+                        return [3 /*break*/, 17];
+                    case 16:
+                        e_1 = _c.sent();
+                        console.error(e_1);
+                        ctx.log.error("Error loading trajectory");
+                        return [3 /*break*/, 17];
+                    case 17: return [2 /*return*/];
+                }
+            });
+        }); }).runInContext(taskCtx);
+    });
+});

package/lib/commonjs/mol-plugin-state/actions/volume.js

@@ -15,6 +15,7 @@ var param_definition_1 = require("../../mol-util/param-definition");
 var objects_1 = require("../objects");
 var assets_1 = require("../../mol-util/assets");
 var transforms_1 = require("../transforms");
+var type_helpers_1 = require("../../mol-util/type-helpers");
 var DownloadDensity = mol_state_1.StateAction.build({
     from: objects_1.PluginStateObject.Root,
     display: { name: 'Download Density', description: 'Load a density from the provided source and create its default visual.' },
@@ -60,10 +61,10 @@ var DownloadDensity = mol_state_1.StateAction.build({
     }
 })(function (_a, plugin) {
     var params = _a.params;
-    return mol_task_1.Task.create('Download Density', function (taskCtx) { return (0, tslib_1.__awaiter)(void 0, void 0, void 0, function () {
+    return mol_task_1.Task.create('Download Density', function (taskCtx) { return tslib_1.__awaiter(void 0, void 0, void 0, function () {
         var src, downloadParams, provider, data, entryId, volumes;
         var _a, _b;
-        return (0, tslib_1.__generator)(this, function (_c) {
+        return tslib_1.__generator(this, function (_c) {
             switch (_c.label) {
                 case 0:
                     src = params.source;
@@ -108,7 +109,7 @@ var DownloadDensity = mol_state_1.StateAction.build({
                                 label: "RCSB PDB X-ray Density Server: ".concat(src.params.provider.id)
                             };
                             break;
-                        default: throw new Error("".concat(src.name, " not supported."));
+                        default: (0, type_helpers_1.assertUnreachable)(src);
                     }
                     return [4 /*yield*/, plugin.builders.data.download(downloadParams)];
                 case 1:
@@ -130,7 +131,7 @@ var DownloadDensity = mol_state_1.StateAction.build({
                             entryId = src.params.provider.id;
                             provider = plugin.dataFormats.get('dscif');
                             break;
-                        default: throw new Error("".concat(src.name, " not supported."));
+                        default: (0, type_helpers_1.assertUnreachable)(src);
                     }
                     if (!provider) {
                         plugin.log.warn('DownloadDensity: Format provider not found.');

package/lib/commonjs/mol-plugin-state/actions.js

@@ -7,9 +7,9 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.StateActions = void 0;
 var tslib_1 = require("tslib");
-var Structure = (0, tslib_1.__importStar)(require("./actions/structure"));
-var Volume = (0, tslib_1.__importStar)(require("./actions/volume"));
-var DataFormat = (0, tslib_1.__importStar)(require("./actions/file"));
+var Structure = tslib_1.__importStar(require("./actions/structure"));
+var Volume = tslib_1.__importStar(require("./actions/volume"));
+var DataFormat = tslib_1.__importStar(require("./actions/file"));
 exports.StateActions = {
     Structure: Structure,
     Volume: Volume,

package/lib/commonjs/mol-plugin-state/animation/built-in/assembly-unwind.js

@@ -76,9 +76,9 @@ exports.AnimateAssemblyUnwind = model_1.PluginStateAnimation.create({
         return update.commit();
     },
     apply: function (animState, t, ctx) {
-        return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
+        return tslib_1.__awaiter(this, void 0, void 0, function () {
             var state, root, anims, update, d, newTime, finished, _i, anims_1, m;
-            return (0, tslib_1.__generator)(this, function (_a) {
+            return tslib_1.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         state = ctx.plugin.state.data;