playball 3.1.0 → 3.1.2

package/{src/components/Grid.jsx → dist/components/Grid.js}

@@ -1,14 +1,21 @@
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
 import React, { useCallback, useEffect, useRef, useState } from 'react';
 import PropTypes from 'prop-types';
-import useKey from '../hooks/useKey.js';
-
-function Grid({ items, itemHeight, itemMinWidth, onSelect }) {
+import useKey from "../hooks/useKey.js";
+function Grid({
+  items,
+  itemHeight,
+  itemMinWidth,
+  onSelect
+}) {
   const containerRef = useRef();
   const [size, setSize] = useState([0, 0]);
   const [selectedIndex, setSelectedIndex] = useState(0);
-  const updateSize = () => setSize([containerRef.current?.width, containerRef.current?.height]);
+  const updateSize = () => {
+    var _containerRef$current, _containerRef$current2;
+    return setSize([(_containerRef$current = containerRef.current) === null || _containerRef$current === void 0 ? void 0 : _containerRef$current.width, (_containerRef$current2 = containerRef.current) === null || _containerRef$current2 === void 0 ? void 0 : _containerRef$current2.height]);
+  };
   useEffect(updateSize, []);
-
   const pos = [];
   let row = 0;
   let col = 0;
@@ -19,7 +26,7 @@ function Grid({ items, itemHeight, itemMinWidth, onSelect }) {
       top: row,
       left: col,
       width: colWidth,
-      height: itemHeight,
+      height: itemHeight
     });
     col += colWidth;
     if (col > size[0] - colWidth) {
@@ -27,14 +34,12 @@ function Grid({ items, itemHeight, itemMinWidth, onSelect }) {
       row += itemHeight;
     }
   }
-
   useEffect(() => {
     const curr = pos[selectedIndex].top;
     const total = pos[pos.length - 1].top;
     const perc = Math.round(curr / total * 100);
     containerRef.current.setScrollPerc(perc);
   }, [pos, selectedIndex]);
-
   useKey(['right', 'l'], useCallback(() => setSelectedIndex(prev => Math.min(prev + 1, items.length - 1)), [items.length]));
   useKey(['left', 'h'], useCallback(() => setSelectedIndex(prev => Math.max(prev - 1, 0)), []));
   useKey(['down', 'j'], useCallback(() => {
@@ -58,34 +63,26 @@ function Grid({ items, itemHeight, itemMinWidth, onSelect }) {
     });
   }, [numCols]));
   useKey('enter', () => onSelect(selectedIndex));
-
-  return (
-    <box 
-      ref={containerRef} 
-      onResize={updateSize} 
-      width='100%' 
-      height='100%'
-      scrollable={true}
-    >
-      {pos.map((p, idx) => (
-        <box 
-          {...p} 
-          border={{type: selectedIndex === idx ? 'line' : 'bg'}}
-          key={items[idx]}
-          tags
-          content={items[idx]}
-          wrap={false}
-        />
-      ))}
-    </box>
-  );
+  return /*#__PURE__*/React.createElement("box", {
+    ref: containerRef,
+    onResize: updateSize,
+    width: "100%",
+    height: "100%",
+    scrollable: true
+  }, pos.map((p, idx) => /*#__PURE__*/React.createElement("box", _extends({}, p, {
+    border: {
+      type: selectedIndex === idx ? 'line' : 'bg'
+    },
+    key: items[idx],
+    tags: true,
+    content: items[idx],
+    wrap: false
+  }))));
 }
-
 Grid.propTypes = {
   items: PropTypes.arrayOf(PropTypes.string),
   itemHeight: PropTypes.number,
   itemMinWidth: PropTypes.number,
-  onSelect: PropTypes.func,
+  onSelect: PropTypes.func
 };
-
-export default Grid;
+export default Grid;

package/dist/components/HelpBar.js

@@ -0,0 +1,16 @@
+import React from 'react';
+import { useSelector } from "react-redux/lib/alternate-renderers.js";
+import LoadingSpinner from "./LoadingSpinner.js";
+const HelpBar = () => {
+  const keys = useSelector(state => state.keys);
+  const content = keys.map(({
+    key,
+    label
+  }) => `{inverse}${key}{/inverse}:${label}`).join('  ');
+  return /*#__PURE__*/React.createElement("element", null, /*#__PURE__*/React.createElement(LoadingSpinner, null), /*#__PURE__*/React.createElement("box", {
+    left: 3,
+    content: content,
+    tags: true
+  }));
+};
+export default HelpBar;

package/dist/components/InningDisplay.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import { useSelector } from "react-redux/lib/alternate-renderers.js";
+import { selectLineScore } from "../features/games.js";
+function InningDisplay() {
+  const linescore = useSelector(selectLineScore);
+  const content = [linescore.isTopInning ? '▲' : '', linescore.currentInning, linescore.isTopInning ? '' : '▼'].join('\n');
+  return /*#__PURE__*/React.createElement("box", {
+    content: content,
+    align: "right"
+  });
+}
+export default InningDisplay;

package/dist/components/LineScore.js

@@ -0,0 +1,39 @@
+import React from 'react';
+import PropTypes from 'prop-types';
+import { useSelector } from "react-redux/lib/alternate-renderers.js";
+import { selectLineScore, selectTeams } from "../features/games.js";
+const getRuns = (inning, homeAway, isFinal) => {
+  const runs = inning[homeAway].runs;
+  if (runs !== undefined) {
+    return runs;
+  }
+  return isFinal ? 'X' : '';
+};
+const getTeamLine = (linescore, totalInnings, homeAway, final) => linescore.innings.map(inning => getRuns(inning, homeAway, final)).map(r => r.toString().padStart(2)).join(' ').padEnd(totalInnings * 3) + '{bold}' + linescore.teams[homeAway].runs.toString().padStart(3) + '{/bold}' + linescore.teams[homeAway].hits.toString().padStart(3) + linescore.teams[homeAway].errors.toString().padStart(3);
+function LineScore({
+  align,
+  final
+}) {
+  const linescore = useSelector(selectLineScore);
+  const teams = useSelector(selectTeams);
+  const currentInning = linescore.currentInning;
+  if (!currentInning) {
+    return '';
+  }
+  const totalInnings = Math.max(currentInning, 9);
+  const home = teams.home.abbreviation;
+  const away = teams.away.abbreviation;
+  const teamNameLength = 3;
+  let str = ''.padEnd(teamNameLength) + Array.from(Array(totalInnings).keys()).map(i => (i + 1).toString().padStart(2)).join(' ') + '   {bold}R{/bold}  H  E\n' + away.padEnd(teamNameLength) + getTeamLine(linescore, totalInnings, 'away', final) + '\n' + home.padEnd(teamNameLength) + getTeamLine(linescore, totalInnings, 'home', final);
+  return /*#__PURE__*/React.createElement("box", {
+    align: align,
+    content: str,
+    tags: true,
+    wrap: false
+  });
+}
+LineScore.propTypes = {
+  align: PropTypes.oneOf(['left', 'center', 'right']),
+  final: PropTypes.bool
+};
+export default LineScore;

package/dist/components/LiveGame.js

@@ -0,0 +1,51 @@
+import React from 'react';
+import Count from "./Count.js";
+import Bases from "./Bases.js";
+import LineScore from "./LineScore.js";
+import Matchup from "./Matchup.js";
+import AtBat from "./AtBat.js";
+import AllPlays from "./AllPlays.js";
+import InningDisplay from "./InningDisplay.js";
+function LiveGame() {
+  return /*#__PURE__*/React.createElement("element", null, /*#__PURE__*/React.createElement("element", {
+    top: 0,
+    left: 1,
+    width: "100%-1",
+    height: 3
+  }, /*#__PURE__*/React.createElement("element", {
+    left: 0,
+    width: 2
+  }, /*#__PURE__*/React.createElement(InningDisplay, null)), /*#__PURE__*/React.createElement("element", {
+    left: 5,
+    width: "25%-5"
+  }, /*#__PURE__*/React.createElement(Count, null)), /*#__PURE__*/React.createElement("element", {
+    left: "25%+1",
+    width: "25%"
+  }, /*#__PURE__*/React.createElement(Bases, null)), /*#__PURE__*/React.createElement("element", {
+    left: "50%+2",
+    width: "50%-2"
+  }, /*#__PURE__*/React.createElement(LineScore, null))), /*#__PURE__*/React.createElement("line", {
+    orientation: "horizontal",
+    type: "line",
+    top: 3,
+    width: "100%"
+  }), /*#__PURE__*/React.createElement("element", {
+    top: 4,
+    left: 1
+  }, /*#__PURE__*/React.createElement("element", {
+    width: "50%-1"
+  }, /*#__PURE__*/React.createElement("element", {
+    top: 0,
+    height: 2
+  }, /*#__PURE__*/React.createElement(Matchup, null)), /*#__PURE__*/React.createElement("element", {
+    top: 3
+  }, /*#__PURE__*/React.createElement(AtBat, null))), /*#__PURE__*/React.createElement("line", {
+    orientation: "vertical",
+    type: "line",
+    left: "50%"
+  }), /*#__PURE__*/React.createElement("element", {
+    left: "50%+2",
+    width: "50%-2"
+  }, /*#__PURE__*/React.createElement(AllPlays, null))));
+}
+export default LiveGame;

package/{src/components/LoadingSpinner.jsx → dist/components/LoadingSpinner.js}

@@ -1,32 +1,17 @@
 import React, { useEffect, useRef, useState } from 'react';
-import { useSelector } from 'react-redux';
-import { selectLoading as selectScheduleLoading } from '../features/schedule.js';
-import { selectLoading as gamesLoading } from '../features/games.js';
-
-const frames = [
-  '⠋',
-  '⠙',
-  '⠹',
-  '⠸',
-  '⠼',
-  '⠴',
-  '⠦',
-  '⠧',
-  '⠇',
-  '⠏'
-];
-
-function LoadingSpinner() { 
+import { useSelector } from "react-redux/lib/alternate-renderers.js";
+import { selectLoading as selectScheduleLoading } from "../features/schedule.js";
+import { selectLoading as gamesLoading } from "../features/games.js";
+const frames = ['⠋', '⠙', '⠹', '⠸', '⠼', '⠴', '⠦', '⠧', '⠇', '⠏'];
+function LoadingSpinner() {
   const [frame, setFrame] = useState(0);
   const [animating, setAnimating] = useState(false);
   const timerRef = useRef(null);
   const scheduleLoading = useSelector(selectScheduleLoading);
   const gameLoading = useSelector(gamesLoading);
-
   const increment = () => {
     setFrame(prevFrame => (prevFrame + 1) % frames.length);
   };
-
   const doUpdate = () => {
     if (!animating && (gameLoading || scheduleLoading)) {
       setAnimating(true);
@@ -38,12 +23,11 @@ function LoadingSpinner() {
       clearInterval(timerRef.current);
     }
   };
-
   useEffect(() => {
     doUpdate();
   }, [gameLoading, scheduleLoading, frame]);
-
-  return <box content={animating ? frames[frame] : ' '} />;
+  return /*#__PURE__*/React.createElement("box", {
+    content: animating ? frames[frame] : ' '
+  });
 }
-
 export default LoadingSpinner;

package/dist/components/Matchup.js

@@ -0,0 +1,40 @@
+import React from 'react';
+import { useSelector } from "react-redux/lib/alternate-renderers.js";
+import { selectCurrentPlay, selectBoxscore, selectTeams } from "../features/games.js";
+const getPlayerStats = (boxscore, teams, id) => {
+  const key = 'ID' + id;
+  const homePlayers = boxscore.home.players;
+  if (homePlayers[key]) {
+    return {
+      team: teams.home,
+      player: homePlayers[key]
+    };
+  }
+  return {
+    team: teams.away,
+    player: boxscore.away.players[key]
+  };
+};
+function Matchup() {
+  var _currentPlay$matchup, _currentPlay$matchup2;
+  const boxscore = useSelector(selectBoxscore);
+  const currentPlay = useSelector(selectCurrentPlay);
+  const teams = useSelector(selectTeams);
+  const pitcherId = (_currentPlay$matchup = currentPlay.matchup) === null || _currentPlay$matchup === void 0 || (_currentPlay$matchup = _currentPlay$matchup.pitcher) === null || _currentPlay$matchup === void 0 ? void 0 : _currentPlay$matchup.id;
+  const batterId = (_currentPlay$matchup2 = currentPlay.matchup) === null || _currentPlay$matchup2 === void 0 || (_currentPlay$matchup2 = _currentPlay$matchup2.batter) === null || _currentPlay$matchup2 === void 0 ? void 0 : _currentPlay$matchup2.id;
+  const {
+    team: pitchTeam,
+    player: pitcher
+  } = getPlayerStats(boxscore, teams, pitcherId);
+  const {
+    team: batTeam,
+    player: batter
+  } = getPlayerStats(boxscore, teams, batterId);
+  const display = `${pitchTeam.abbreviation} Pitching: ` + `{bold}${pitcher.person.fullName}{/bold} ${pitcher.stats.pitching.inningsPitched} IP, ${pitcher.stats.pitching.pitchesThrown || 0} P, ${pitcher.seasonStats.pitching.era} ERA\n` + `${batTeam.abbreviation} At Bat:   ` + `{bold}${batter.person.fullName}{/bold} ${batter.stats.batting.hits}-${batter.stats.batting.atBats}, ${batter.seasonStats.batting.avg} AVG, ${batter.seasonStats.batting.homeRuns} HR`;
+  return /*#__PURE__*/React.createElement("box", {
+    tags: true,
+    content: display,
+    wrap: false
+  });
+}
+export default Matchup;

package/dist/components/PreviewGame.js

@@ -0,0 +1,54 @@
+import React from 'react';
+import { useSelector } from "react-redux/lib/alternate-renderers.js";
+import { format } from 'date-fns';
+import { selectTeams, selectVenue, selectStartTime, selectBoxscore, selectProbablePitchers, selectGameStatus } from "../features/games.js";
+const formatPitcherName = pitcher => {
+  let display = pitcher.person.fullName;
+  const number = pitcher.jerseyNumber;
+  if (number) {
+    display += `, #${number}`;
+  }
+  return display;
+};
+const formatTeam = (teams, probables, boxscore, homeAway) => {
+  const pitcherId = probables[homeAway].id;
+  const pitcher = boxscore[homeAway].players['ID' + pitcherId];
+  let lines = [teams[homeAway].teamName, `(${teams[homeAway].record.wins}-${teams[homeAway].record.losses})`];
+  if (pitcher) {
+    var _pitcher$seasonStats, _pitcher$seasonStats2, _pitcher$seasonStats3, _pitcher$seasonStats4;
+    lines = lines.concat(['', formatPitcherName(pitcher), `${(_pitcher$seasonStats = pitcher.seasonStats) === null || _pitcher$seasonStats === void 0 || (_pitcher$seasonStats = _pitcher$seasonStats.pitching) === null || _pitcher$seasonStats === void 0 ? void 0 : _pitcher$seasonStats.wins}-${(_pitcher$seasonStats2 = pitcher.seasonStats) === null || _pitcher$seasonStats2 === void 0 || (_pitcher$seasonStats2 = _pitcher$seasonStats2.pitching) === null || _pitcher$seasonStats2 === void 0 ? void 0 : _pitcher$seasonStats2.losses}`, `${(_pitcher$seasonStats3 = pitcher.seasonStats) === null || _pitcher$seasonStats3 === void 0 || (_pitcher$seasonStats3 = _pitcher$seasonStats3.pitching) === null || _pitcher$seasonStats3 === void 0 ? void 0 : _pitcher$seasonStats3.era} ERA ${(_pitcher$seasonStats4 = pitcher.seasonStats) === null || _pitcher$seasonStats4 === void 0 || (_pitcher$seasonStats4 = _pitcher$seasonStats4.pitching) === null || _pitcher$seasonStats4 === void 0 ? void 0 : _pitcher$seasonStats4.strikeOuts} K`]);
+  }
+  return lines;
+};
+function PreviewGame() {
+  const boxscore = useSelector(selectBoxscore);
+  const probables = useSelector(selectProbablePitchers);
+  const startTime = useSelector(selectStartTime);
+  const status = useSelector(selectGameStatus);
+  const teams = useSelector(selectTeams);
+  const venue = useSelector(selectVenue);
+  const away = formatTeam(teams, probables, boxscore, 'away');
+  const home = formatTeam(teams, probables, boxscore, 'home');
+  const formattedStart = status.startTimeTBD ? 'Start time TBD' : format(new Date(startTime), 'MMMM d, yyy p');
+  return /*#__PURE__*/React.createElement("element", null, /*#__PURE__*/React.createElement("element", {
+    height: "60%"
+  }, /*#__PURE__*/React.createElement("box", {
+    content: away.join('\n'),
+    width: "33%-1",
+    top: "50%",
+    align: "center"
+  }), /*#__PURE__*/React.createElement("box", {
+    content: `\nvs.\n\n${formattedStart}\n${venue.name}\n${venue.location.city}, ${venue.location.stateAbbrev}`,
+    width: "33%-1",
+    left: "33%",
+    top: "50%",
+    align: "center"
+  }), /*#__PURE__*/React.createElement("box", {
+    content: home.join('\n'),
+    width: "34%",
+    top: "50%",
+    left: "66%",
+    align: "center"
+  })));
+}
+export default PreviewGame;

package/dist/components/Standings.js

@@ -0,0 +1,70 @@
+import React, { useEffect } from 'react';
+import PropTypes from 'prop-types';
+import { useDispatch, useSelector } from "react-redux/lib/alternate-renderers.js";
+import { fetchStandings, selectData } from "../features/standings.js";
+import { teamFavoriteStar } from "../utils.js";
+function formatHeaderRow(record) {
+  return record.division.nameShort.padEnd(15) + '    W' + '    L' + '    PCT' + '    GB' + '  WCGB' + '   L10' + ' STRK';
+}
+function formatTeamRow(record) {
+  var _record$streak;
+  const lastTen = record.records.splitRecords.find(o => o.type === 'lastTen');
+  const star = teamFavoriteStar(record.team);
+  return star + record.team.teamName.padEnd(star ? 13 : 15) + record.wins.toString().padStart(5) + record.losses.toString().padStart(5) + record.winningPercentage.padStart(7) + record.gamesBack.padStart(6) + record.wildCardGamesBack.padStart(6) + `${lastTen.wins}-${lastTen.losses}`.padStart(6) + (((_record$streak = record.streak) === null || _record$streak === void 0 ? void 0 : _record$streak.streakCode) || '').padStart(5);
+}
+function Division({
+  record,
+  top,
+  left,
+  width
+}) {
+  return /*#__PURE__*/React.createElement("box", {
+    top: top,
+    left: left,
+    height: 6,
+    width: width
+  }, /*#__PURE__*/React.createElement("box", {
+    top: 0,
+    left: 0,
+    height: 1,
+    fg: "black",
+    bg: "white",
+    content: formatHeaderRow(record),
+    wrap: false
+  }), /*#__PURE__*/React.createElement("box", {
+    top: 1,
+    left: 0,
+    height: 5,
+    content: record.teamRecords.map(formatTeamRow).join('\n'),
+    wrap: false,
+    tags: true
+  }));
+}
+Division.propTypes = {
+  record: PropTypes.object,
+  top: PropTypes.number,
+  left: PropTypes.oneOfType([PropTypes.number, PropTypes.string]),
+  width: PropTypes.oneOfType([PropTypes.number, PropTypes.string])
+};
+function Standings() {
+  const dispatch = useDispatch();
+  const standings = useSelector(selectData);
+  useEffect(() => dispatch(fetchStandings()), []);
+  if (!standings) {
+    return /*#__PURE__*/React.createElement("element", null);
+  }
+  return /*#__PURE__*/React.createElement("element", null, standings.records.filter(record => record.league.id === 103).map((record, idx) => /*#__PURE__*/React.createElement(Division, {
+    top: idx * 7,
+    left: 0,
+    width: "50%-1",
+    key: record.division.id,
+    record: record
+  })), standings.records.filter(record => record.league.id === 104).map((record, idx) => /*#__PURE__*/React.createElement(Division, {
+    top: idx * 7,
+    left: "50%+1",
+    width: "50%-1",
+    key: record.division.id,
+    record: record
+  })));
+}
+export default Standings;

package/{src → dist}/config.js

@@ -1,9 +1,6 @@
-import pkg from './package.js';
-
+import pkg from "./package.js";
 import Conf from 'conf';
-
 const colorPattern = '^(((light-|bright-)?(black|red|green|yellow|blue|magenta|cyan|white|grey))|default|#([0-9a-fA-F]{3}){1,2})$';
-
 const schema = {
   color: {
     type: 'object',
@@ -11,63 +8,63 @@ const schema = {
       ball: {
         type: 'string',
         default: 'green',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       strike: {
         type: 'string',
         default: 'red',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       out: {
         type: 'string',
         default: 'red',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'on-base': {
         type: 'string',
         default: 'yellow',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'strike-out': {
         type: 'string',
         default: 'red',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'walk': {
         type: 'string',
         default: 'green',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'other-event': {
         type: 'string',
         default: 'white',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'in-play-no-out': {
         type: 'string',
         default: 'blue',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'in-play-out': {
         type: 'string',
         default: 'white',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'in-play-runs-bg': {
         type: 'string',
         default: 'white',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'in-play-runs-fg': {
         type: 'string',
         default: 'black',
-        pattern: colorPattern,
+        pattern: colorPattern
       },
       'favorite-star': {
         type: 'string',
         default: 'yellow',
-        pattern: colorPattern,
-      },
+        pattern: colorPattern
+      }
     },
     default: {}
   },
@@ -75,70 +72,34 @@ const schema = {
     type: 'array',
     items: {
       type: 'string',
-      enum: [
-        'ATL',
-        'AZ',
-        'BAL',
-        'BOS',
-        'CHC',
-        'CIN',
-        'CLE',
-        'COL',
-        'CWS',
-        'DET',
-        'HOU',
-        'KC',
-        'LAA',
-        'LAD',
-        'MIA',
-        'MIL',
-        'MIN',
-        'NYM',
-        'NYY',
-        'OAK',
-        'PHI',
-        'PIT',
-        'SD',
-        'SEA',
-        'SF',
-        'STL',
-        'TB',
-        'TEX',
-        'TOR',
-        'WSH'
-      ],
+      enum: ['ATL', 'AZ', 'BAL', 'BOS', 'CHC', 'CIN', 'CLE', 'COL', 'CWS', 'DET', 'HOU', 'KC', 'LAA', 'LAD', 'MIA', 'MIL', 'MIN', 'NYM', 'NYY', 'OAK', 'PHI', 'PIT', 'SD', 'SEA', 'SF', 'STL', 'TB', 'TEX', 'TOR', 'WSH']
     },
     default: []
-  },
+  }
 };
-
 const config = new Conf({
   projectName: pkg.name,
-  schema,
+  schema
 });
-
 function serialize(value) {
   if (value && Array.isArray(value)) {
     return value.join(',');
-  } 
+  }
   return value;
 }
-
 function deserialize(key, value) {
-  if (value && schema[key]?.type === 'array') {
+  var _schema$key;
+  if (value && ((_schema$key = schema[key]) === null || _schema$key === void 0 ? void 0 : _schema$key.type) === 'array') {
     return value.split(/\s*,\s*/);
   }
   return value;
 }
-
 export function get(key) {
   return serialize(config.get(key));
 }
-
 export function set(key, value) {
   return config.set(key, deserialize(key, value));
 }
-
 export function unset(key) {
   if (key) {
     return config.delete(key);
@@ -146,7 +107,6 @@ export function unset(key) {
     return config.clear();
   }
 }
-
 function flatten(obj) {
   const result = {};
   for (const [key, value] of Object.entries(obj).sort()) {
@@ -161,7 +121,6 @@ function flatten(obj) {
   }
   return result;
 }
-
 export function getAll() {
   return flatten(config.store);
-}
+}