@jbrowse/plugin-linear-genome-view 1.6.7 → 1.7.0

package/dist/LinearGenomeView/components/ImportForm.js

@@ -0,0 +1,330 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
+
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _mobxReact = require("mobx-react");
+
+var _util = require("@jbrowse/core/util");
+
+var _core = require("@material-ui/core");
+
+var _ErrorMessage = _interopRequireDefault(require("@jbrowse/core/ui/ErrorMessage"));
+
+var _BaseResults = _interopRequireDefault(require("@jbrowse/core/TextSearch/BaseResults"));
+
+var _AssemblySelector = _interopRequireDefault(require("@jbrowse/core/ui/AssemblySelector"));
+
+var _Close = _interopRequireDefault(require("@material-ui/icons/Close"));
+
+var _RefNameAutocomplete = _interopRequireDefault(require("./RefNameAutocomplete"));
+
+var _ = require("..");
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || (0, _typeof2["default"])(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+var SearchResultsDialog = /*#__PURE__*/(0, _react.lazy)(function () {
+  return Promise.resolve().then(function () {
+    return _interopRequireWildcard(require('./SearchResultsDialog'));
+  });
+});
+var useStyles = (0, _core.makeStyles)(function (theme) {
+  return {
+    importFormContainer: {
+      padding: theme.spacing(2)
+    },
+    button: {
+      margin: theme.spacing(2)
+    },
+    container: {
+      padding: theme.spacing(4)
+    }
+  };
+});
+var ImportForm = (0, _mobxReact.observer)(function (_ref) {
+  var _regions$;
+
+  var model = _ref.model;
+  var classes = useStyles();
+  var session = (0, _util.getSession)(model);
+  var assemblyNames = session.assemblyNames,
+      assemblyManager = session.assemblyManager,
+      textSearchManager = session.textSearchManager;
+  var rankSearchResults = model.rankSearchResults,
+      isSearchDialogDisplayed = model.isSearchDialogDisplayed,
+      modelError = model.error;
+
+  var _useState = (0, _react.useState)(assemblyNames[0]),
+      _useState2 = (0, _slicedToArray2["default"])(_useState, 2),
+      selectedAsm = _useState2[0],
+      setSelectedAsm = _useState2[1];
+
+  var _useState3 = (0, _react.useState)(modelError),
+      _useState4 = (0, _slicedToArray2["default"])(_useState3, 2),
+      error = _useState4[0],
+      setError = _useState4[1];
+
+  var searchScope = model.searchScope(selectedAsm);
+  var assembly = assemblyManager.get(selectedAsm);
+  var assemblyError = assemblyNames.length ? assembly === null || assembly === void 0 ? void 0 : assembly.error : 'No configured assemblies';
+  var regions = (assembly === null || assembly === void 0 ? void 0 : assembly.regions) || [];
+  var err = assemblyError || error;
+
+  var _useState5 = (0, _react.useState)(),
+      _useState6 = (0, _slicedToArray2["default"])(_useState5, 2),
+      myOption = _useState6[0],
+      setOption = _useState6[1]; // use this instead of useState initializer because the useState initializer
+  // won't update in response to an observable
+
+
+  var option = myOption || new _BaseResults["default"]({
+    label: (_regions$ = regions[0]) === null || _regions$ === void 0 ? void 0 : _regions$.refName
+  });
+  var selectedRegion = option === null || option === void 0 ? void 0 : option.getLocation();
+
+  function fetchResults(_x, _x2) {
+    return _fetchResults.apply(this, arguments);
+  } // gets a string as input, or use stored option results from previous query,
+  // then re-query and
+  // 1) if it has multiple results: pop a dialog
+  // 2) if it's a single result navigate to it
+  // 3) else assume it's a locstring and navigate to it
+
+
+  function _fetchResults() {
+    _fetchResults = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee(query, searchType) {
+      var _assembly$allRefNames;
+
+      var textSearchResults, refNameResults;
+      return _regenerator["default"].wrap(function _callee$(_context) {
+        while (1) {
+          switch (_context.prev = _context.next) {
+            case 0:
+              if (!textSearchManager) {
+                console.warn('No text search manager');
+              }
+
+              _context.next = 3;
+              return textSearchManager === null || textSearchManager === void 0 ? void 0 : textSearchManager.search({
+                queryString: query,
+                searchType: searchType
+              }, searchScope, rankSearchResults);
+
+            case 3:
+              textSearchResults = _context.sent;
+              refNameResults = assembly === null || assembly === void 0 ? void 0 : (_assembly$allRefNames = assembly.allRefNames) === null || _assembly$allRefNames === void 0 ? void 0 : _assembly$allRefNames.filter(function (refName) {
+                return refName.startsWith(query);
+              }).map(function (r) {
+                return new _BaseResults["default"]({
+                  label: r
+                });
+              }).slice(0, 10);
+              return _context.abrupt("return", [].concat((0, _toConsumableArray2["default"])(refNameResults || []), (0, _toConsumableArray2["default"])(textSearchResults || [])));
+
+            case 6:
+            case "end":
+              return _context.stop();
+          }
+        }
+      }, _callee);
+    }));
+    return _fetchResults.apply(this, arguments);
+  }
+
+  function handleSelectedRegion(_x3) {
+    return _handleSelectedRegion.apply(this, arguments);
+  }
+
+  function _handleSelectedRegion() {
+    _handleSelectedRegion = (0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2(input) {
+      var trackId, location, _assembly$allRefNames2, results;
+
+      return _regenerator["default"].wrap(function _callee2$(_context2) {
+        while (1) {
+          switch (_context2.prev = _context2.next) {
+            case 0:
+              if (option) {
+                _context2.next = 2;
+                break;
+              }
+
+              return _context2.abrupt("return");
+
+            case 2:
+              trackId = option.getTrackId();
+              location = input || option.getLocation() || '';
+              _context2.prev = 4;
+
+              if (!(assembly !== null && assembly !== void 0 && (_assembly$allRefNames2 = assembly.allRefNames) !== null && _assembly$allRefNames2 !== void 0 && _assembly$allRefNames2.includes(location))) {
+                _context2.next = 9;
+                break;
+              }
+
+              model.navToLocString(location, selectedAsm);
+              _context2.next = 20;
+              break;
+
+            case 9:
+              _context2.next = 11;
+              return fetchResults(input, 'exact');
+
+            case 11:
+              results = _context2.sent;
+
+              if (!(results && results.length > 1)) {
+                _context2.next = 17;
+                break;
+              }
+
+              model.setSearchResults(results, input.toLowerCase());
+              return _context2.abrupt("return");
+
+            case 17:
+              if ((results === null || results === void 0 ? void 0 : results.length) === 1) {
+                location = results[0].getLocation();
+                trackId = results[0].getTrackId();
+              }
+
+            case 18:
+              model.navToLocString(location, selectedAsm);
+
+              if (trackId) {
+                model.showTrack(trackId);
+              }
+
+            case 20:
+              _context2.next = 26;
+              break;
+
+            case 22:
+              _context2.prev = 22;
+              _context2.t0 = _context2["catch"](4);
+              console.error(_context2.t0);
+              session.notify("".concat(_context2.t0), 'warning');
+
+            case 26:
+            case "end":
+              return _context2.stop();
+          }
+        }
+      }, _callee2, null, [[4, 22]]);
+    }));
+    return _handleSelectedRegion.apply(this, arguments);
+  }
+
+  var height = _.WIDGET_HEIGHT + 5; // implementation notes:
+  // having this wrapped in a form allows intuitive use of enter key to submit
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    className: classes.container
+  }, err ? /*#__PURE__*/_react["default"].createElement(_ErrorMessage["default"], {
+    error: err
+  }) : null, /*#__PURE__*/_react["default"].createElement(_core.Container, {
+    className: classes.importFormContainer
+  }, /*#__PURE__*/_react["default"].createElement("form", {
+    onSubmit: function onSubmit(event) {
+      return event.preventDefault();
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_core.Grid, {
+    container: true,
+    spacing: 1,
+    justifyContent: "center",
+    alignItems: "center"
+  }, /*#__PURE__*/_react["default"].createElement(_core.Grid, {
+    item: true
+  }, /*#__PURE__*/_react["default"].createElement(_AssemblySelector["default"], {
+    onChange: function onChange(val) {
+      setError(undefined);
+      setSelectedAsm(val);
+    },
+    session: session,
+    selected: selectedAsm,
+    InputProps: {
+      style: {
+        height: height
+      }
+    }
+  })), /*#__PURE__*/_react["default"].createElement(_core.Grid, {
+    item: true
+  }, selectedAsm ? err ? /*#__PURE__*/_react["default"].createElement(_Close["default"], {
+    style: {
+      color: 'red'
+    }
+  }) : selectedRegion ? /*#__PURE__*/_react["default"].createElement(_RefNameAutocomplete["default"], {
+    fetchResults: fetchResults,
+    model: model,
+    assemblyName: assemblyError ? undefined : selectedAsm,
+    value: selectedRegion // note: minWidth 270 accomodates full width of helperText
+    ,
+    minWidth: 270,
+    onSelect: function onSelect(option) {
+      return setOption(option);
+    },
+    TextFieldProps: {
+      variant: 'outlined',
+      helperText: 'Enter sequence name, feature name, or location',
+      style: {
+        minWidth: '175px'
+      },
+      InputProps: {
+        style: {
+          height: height
+        }
+      }
+    }
+  }) : /*#__PURE__*/_react["default"].createElement(_core.CircularProgress, {
+    role: "progressbar",
+    size: 20,
+    disableShrink: true
+  }) : null), /*#__PURE__*/_react["default"].createElement(_core.Grid, {
+    item: true
+  }, /*#__PURE__*/_react["default"].createElement(_core.Button, {
+    type: "submit",
+    disabled: !selectedRegion,
+    className: classes.button,
+    onClick: function onClick() {
+      model.setError(undefined);
+
+      if (selectedRegion) {
+        handleSelectedRegion(selectedRegion);
+      }
+    },
+    variant: "contained",
+    color: "primary"
+  }, "Open"), /*#__PURE__*/_react["default"].createElement(_core.Button, {
+    disabled: !selectedRegion,
+    className: classes.button,
+    onClick: function onClick() {
+      model.setError(undefined);
+      model.showAllRegionsInAssembly(selectedAsm);
+    },
+    variant: "contained",
+    color: "secondary"
+  }, "Show all regions in assembly"))))), isSearchDialogDisplayed ? /*#__PURE__*/_react["default"].createElement(SearchResultsDialog, {
+    model: model,
+    optAssemblyName: selectedAsm,
+    handleClose: function handleClose() {
+      return model.setSearchResults(undefined, undefined);
+    }
+  }) : null);
+});
+var _default = ImportForm;
+exports["default"] = _default;

package/dist/LinearGenomeView/components/LinearGenomeView.js

@@ -0,0 +1,129 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireDefault(require("react"));
+
+var _core = require("@material-ui/core");
+
+var _Icons = require("@jbrowse/core/ui/Icons");
+
+var _mobxReact = require("mobx-react");
+
+var _Header = _interopRequireDefault(require("./Header"));
+
+var _TrackContainer = _interopRequireDefault(require("./TrackContainer"));
+
+var _TracksContainer = _interopRequireDefault(require("./TracksContainer"));
+
+var _ImportForm = _interopRequireDefault(require("./ImportForm"));
+
+var _MiniControls = _interopRequireDefault(require("./MiniControls"));
+
+var _SequenceDialog = _interopRequireDefault(require("./SequenceDialog"));
+
+var _SearchResultsDialog = _interopRequireDefault(require("./SearchResultsDialog"));
+
+var useStyles = (0, _core.makeStyles)(function (theme) {
+  return {
+    note: {
+      textAlign: 'center',
+      paddingTop: theme.spacing(1),
+      paddingBottom: theme.spacing(1)
+    },
+    dots: {
+      '&::after': {
+        display: 'inline-block',
+        animation: '$ellipsis 1.5s infinite',
+        content: '"."',
+        width: '1em',
+        textAlign: 'left'
+      }
+    },
+    '@keyframes ellipsis': {
+      '0%': {
+        content: '"."'
+      },
+      '33%': {
+        content: '".."'
+      },
+      '66%': {
+        content: '"..."'
+      }
+    }
+  };
+});
+var LinearGenomeView = (0, _mobxReact.observer)(function (_ref) {
+  var model = _ref.model;
+  var tracks = model.tracks,
+      error = model.error,
+      hideHeader = model.hideHeader,
+      initialized = model.initialized,
+      hasDisplayedRegions = model.hasDisplayedRegions;
+  var classes = useStyles();
+
+  if (!initialized && !error) {
+    return /*#__PURE__*/_react["default"].createElement(_core.Typography, {
+      className: classes.dots,
+      variant: "h5"
+    }, "Loading");
+  }
+
+  if (!hasDisplayedRegions || error) {
+    return /*#__PURE__*/_react["default"].createElement(_ImportForm["default"], {
+      model: model
+    });
+  }
+
+  return /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      position: 'relative'
+    }
+  }, model.seqDialogDisplayed ? /*#__PURE__*/_react["default"].createElement(_SequenceDialog["default"], {
+    model: model,
+    handleClose: function handleClose() {
+      model.setSequenceDialogOpen(false);
+    }
+  }) : null, model.isSearchDialogDisplayed ? /*#__PURE__*/_react["default"].createElement(_SearchResultsDialog["default"], {
+    model: model,
+    handleClose: function handleClose() {
+      model.setSearchResults(undefined, undefined);
+    }
+  }) : null, !hideHeader ? /*#__PURE__*/_react["default"].createElement(_Header["default"], {
+    model: model
+  }) : /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      position: 'absolute',
+      right: 0,
+      zIndex: 1001
+    }
+  }, /*#__PURE__*/_react["default"].createElement(_MiniControls["default"], {
+    model: model
+  })), /*#__PURE__*/_react["default"].createElement(_TracksContainer["default"], {
+    model: model
+  }, !tracks.length ? /*#__PURE__*/_react["default"].createElement(_core.Paper, {
+    variant: "outlined",
+    className: classes.note
+  }, /*#__PURE__*/_react["default"].createElement(_core.Typography, null, "No tracks active."), /*#__PURE__*/_react["default"].createElement(_core.Button, {
+    variant: "contained",
+    color: "primary",
+    onClick: model.activateTrackSelector,
+    style: {
+      zIndex: 1000
+    },
+    startIcon: /*#__PURE__*/_react["default"].createElement(_Icons.TrackSelector, null)
+  }, "Open track selector")) : tracks.map(function (track) {
+    return /*#__PURE__*/_react["default"].createElement(_TrackContainer["default"], {
+      key: track.id,
+      model: model,
+      track: track
+    });
+  })));
+});
+var _default = LinearGenomeView;
+exports["default"] = _default;

package/dist/LinearGenomeView/components/LinearGenomeView.test.js

@@ -0,0 +1,234 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault");
+
+var _regenerator = _interopRequireDefault(require("@babel/runtime/regenerator"));
+
+var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
+
+var _react = _interopRequireDefault(require("react"));
+
+var _react2 = require("@testing-library/react");
+
+require("@testing-library/jest-dom/extend-expect");
+
+var _rootModel = require("@jbrowse/web/src/rootModel");
+
+require("requestidlecallback-polyfill");
+
+var _LinearGenomeView = _interopRequireDefault(require("./LinearGenomeView"));
+
+jest.mock('@jbrowse/web/src/makeWorkerInstance', function () {
+  return function () {};
+});
+var assemblyConf = {
+  name: 'volMyt1',
+  sequence: {
+    trackId: 'sequenceConfigId',
+    type: 'ReferenceSequenceTrack',
+    adapter: {
+      type: 'FromConfigSequenceAdapter',
+      features: [{
+        refName: 'ctgA',
+        uniqueId: 'firstId',
+        start: 0,
+        end: 10,
+        seq: 'cattgttgcg'
+      }]
+    }
+  }
+};
+describe('<LinearGenomeView />', function () {
+  it('renders setup wizard', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee() {
+    var session, model, _render, findByText;
+
+    return _regenerator["default"].wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            session = (0, _rootModel.createTestSession)();
+            session.addAssemblyConf(assemblyConf);
+            session.addView('LinearGenomeView', {
+              id: 'lgv'
+            });
+            model = session.views[0];
+            model.setWidth(800);
+            _render = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_LinearGenomeView["default"], {
+              model: model
+            })), findByText = _render.findByText;
+            expect(model.displayedRegions.length).toEqual(0);
+            _context.t0 = _react2.fireEvent;
+            _context.next = 10;
+            return findByText('Open');
+
+          case 10:
+            _context.t1 = _context.sent;
+
+            _context.t0.click.call(_context.t0, _context.t1);
+
+            _context.next = 14;
+            return (0, _react2.waitFor)(function () {
+              expect(model.displayedRegions.length).toEqual(1);
+            });
+
+          case 14:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee);
+  })));
+  it('renders one track, one region', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee2() {
+    var session, model, _render2, container, findByText;
+
+    return _regenerator["default"].wrap(function _callee2$(_context2) {
+      while (1) {
+        switch (_context2.prev = _context2.next) {
+          case 0:
+            session = (0, _rootModel.createTestSession)();
+            session.addAssemblyConf(assemblyConf);
+            session.addTrackConf({
+              trackId: 'testConfig',
+              assemblyNames: ['volMyt1'],
+              name: 'Foo Track',
+              type: 'BasicTrack',
+              adapter: {
+                type: 'FromConfigAdapter',
+                features: []
+              }
+            });
+            session.addView('LinearGenomeView', {
+              type: 'LinearGenomeView',
+              id: 'lgv',
+              offsetPx: 0,
+              bpPerPx: 1,
+              tracks: [{
+                id: 'foo',
+                type: 'BasicTrack',
+                height: 20,
+                configuration: 'testConfig',
+                displays: [{
+                  type: 'LinearBareDisplay',
+                  configuration: 'testConfig-LinearBareDisplay'
+                }]
+              }],
+              displayedRegions: [{
+                assemblyName: 'volMyt1',
+                refName: 'ctgA',
+                start: 0,
+                end: 100
+              }]
+            });
+            model = session.views[0];
+            model.setWidth(800);
+            _render2 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_LinearGenomeView["default"], {
+              model: model
+            })), container = _render2.container, findByText = _render2.findByText;
+            _context2.next = 9;
+            return findByText('Foo Track');
+
+          case 9:
+            _context2.next = 11;
+            return findByText('100 bp');
+
+          case 11:
+            expect(container.firstChild).toMatchSnapshot();
+
+          case 12:
+          case "end":
+            return _context2.stop();
+        }
+      }
+    }, _callee2);
+  })));
+  it('renders two tracks, two regions', /*#__PURE__*/(0, _asyncToGenerator2["default"])( /*#__PURE__*/_regenerator["default"].mark(function _callee3() {
+    var session, model, _render3, container, findByText, findAllByTestId;
+
+    return _regenerator["default"].wrap(function _callee3$(_context3) {
+      while (1) {
+        switch (_context3.prev = _context3.next) {
+          case 0:
+            session = (0, _rootModel.createTestSession)();
+            session.addAssemblyConf(assemblyConf);
+            session.addTrackConf({
+              trackId: 'testConfig',
+              name: 'Foo Track',
+              assemblyNames: ['volMyt1'],
+              type: 'BasicTrack',
+              adapter: {
+                type: 'FromConfigAdapter',
+                features: []
+              }
+            });
+            session.addTrackConf({
+              trackId: 'testConfig2',
+              name: 'Bar Track',
+              assemblyNames: ['volMyt1'],
+              type: 'BasicTrack',
+              adapter: {
+                type: 'FromConfigAdapter',
+                features: []
+              }
+            });
+            session.addView('LinearGenomeView', {
+              id: 'lgv',
+              offsetPx: 0,
+              bpPerPx: 1,
+              displayedRegions: [{
+                assemblyName: 'volMyt1',
+                refName: 'ctgA',
+                start: 0,
+                end: 100
+              }, {
+                assemblyName: 'volMyt1',
+                refName: 'ctgB',
+                start: 1000,
+                end: 2000
+              }],
+              tracks: [{
+                id: 'foo',
+                type: 'BasicTrack',
+                height: 20,
+                configuration: 'testConfig',
+                displays: [{
+                  type: 'LinearBareDisplay',
+                  configuration: 'testConfig-LinearBareDisplay'
+                }]
+              }, {
+                id: 'bar',
+                type: 'BasicTrack',
+                height: 20,
+                configuration: 'testConfig2',
+                displays: [{
+                  type: 'LinearBareDisplay',
+                  configuration: 'testConfig2-LinearBareDisplay'
+                }]
+              }]
+            });
+            model = session.views[0];
+            model.setWidth(800);
+            _render3 = (0, _react2.render)( /*#__PURE__*/_react["default"].createElement(_LinearGenomeView["default"], {
+              model: model
+            })), container = _render3.container, findByText = _render3.findByText, findAllByTestId = _render3.findAllByTestId;
+            _context3.next = 10;
+            return findByText('Foo Track');
+
+          case 10:
+            _context3.next = 12;
+            return findByText('798 bp');
+
+          case 12:
+            _context3.next = 14;
+            return findAllByTestId('svgfeatures');
+
+          case 14:
+            expect(container.firstChild).toMatchSnapshot();
+
+          case 15:
+          case "end":
+            return _context3.stop();
+        }
+      }
+    }, _callee3);
+  })));
+});