reslop 0.1.1 → 0.1.2

package/lib/select.js

@@ -20,12 +20,12 @@ const isRange = (sel) => {
 };
 
 const ordered = (sel) => {
-  const a = sel.start;
-  const b = sel.end;
-  if (a.y < b.y) return [a, b];
-  if (a.y > b.y) return [b, a];
-  if (a.x <= b.x) return [a, b];
-  return [b, a];
+  const start = sel.start;
+  const end = sel.end;
+  if (start.y < end.y) return { first: start, last: end };
+  if (start.y > end.y) return { first: end, last: start };
+  if (start.x <= end.x) return { first: start, last: end };
+  return { first: end, last: start };
 };
 
 const slicePlain = (plain, fromCol, toCol) => {
@@ -43,25 +43,25 @@ const slicePlain = (plain, fromCol, toCol) => {
 };
 
 const lineRange = (rowIndex, sel) => {
-  const [a, b] = ordered(sel);
+  const { first, last } = ordered(sel);
   const y = rowIndex + 1;
-  if (y < a.y || y > b.y) return null;
+  if (y < first.y || y > last.y) return null;
   let from = 0;
-  let to = 1e9;
-  if (y === a.y) from = a.x - 1;
-  if (y === b.y) to = b.x;
+  let to = Infinity;
+  if (y === first.y) from = first.x - 1;
+  if (y === last.y) to = last.x;
   if (to <= from) return null;
   return { from, to };
 };
 
 const extractText = (rows, sel) => {
   if (!isRange(sel) || !rows || !rows.length) return '';
-  const [a, b] = ordered(sel);
+  const { first, last } = ordered(sel);
   const lines = [];
-  for (let r = a.y - 1; r <= b.y - 1; r++) {
-    const range = lineRange(r, sel);
+  for (let row = first.y - 1; row <= last.y - 1; row++) {
+    const range = lineRange(row, sel);
     if (!range) continue;
-    const plain = stripAnsi(rows[r] ?? '');
+    const plain = stripAnsi(rows[row] ?? '');
     const chunk = slicePlain(plain, range.from, range.to);
     lines.push(chunk.replace(/\s+$/g, ''));
   }
@@ -202,9 +202,7 @@ const overlayRows = (rows, sel) => {
 
 module.exports = {
   isRange,
-  ordered,
   extractText,
-  overlayRows,
   overlayRange,
-  slicePlain,
+  overlayRows,
 };