@teselagen/range-utils 0.3.7 → 0.3.8

package/src/convertRangeIndices.test.js

@@ -1,22 +1,41 @@
-import convertRangeIndices from './convertRangeIndices';
-import chai from 'chai';
+import convertRangeIndices from "./convertRangeIndices";
+import chai from "chai";
 chai.should();
-describe('convertRangeIndices', function () {
-	it('should correctly convert various types of ranges', function () {
-		convertRangeIndices({start: 9,end:0},{inclusive1BasedStart: true}).should.deep.equal({start: 8,end: 0})
-		convertRangeIndices({start: 9,end:0},{inclusive1BasedStart: true}, {inclusive1BasedEnd: true}).should.deep.equal({start: 8,end: 1})
-		convertRangeIndices({start: 9,end:0},{inclusive1BasedEnd: true}, {inclusive1BasedEnd: true}).should.deep.equal({start: 9,end: 0})
-		convertRangeIndices({start: 4,end:5},{inclusive1BasedEnd: true}, {inclusive1BasedStart: true}).should.deep.equal({start: 5,end: 4})
-		convertRangeIndices({
-                start: '1',
-                end: '28',
-            },
-            {inclusive1BasedStart: true, inclusive1BasedEnd: true},
-            {})
-            .should.deep.equal({start: 0,end: 27})
-	});
-    it('should not remove other attributes on the range object', function () {
-    	convertRangeIndices({start: 4,end:5, someOtherAttribute: 'yay'},{inclusive1BasedEnd: true}, {inclusive1BasedStart: true})
-            .should.deep.equal({start: 5,end: 4, someOtherAttribute: 'yay'})
-	});
-})
+describe("convertRangeIndices", function () {
+  it("should correctly convert various types of ranges", function () {
+    convertRangeIndices(
+      { start: 9, end: 0 },
+      { inclusive1BasedStart: true }
+    ).should.deep.equal({ start: 8, end: 0 });
+    convertRangeIndices(
+      { start: 9, end: 0 },
+      { inclusive1BasedStart: true },
+      { inclusive1BasedEnd: true }
+    ).should.deep.equal({ start: 8, end: 1 });
+    convertRangeIndices(
+      { start: 9, end: 0 },
+      { inclusive1BasedEnd: true },
+      { inclusive1BasedEnd: true }
+    ).should.deep.equal({ start: 9, end: 0 });
+    convertRangeIndices(
+      { start: 4, end: 5 },
+      { inclusive1BasedEnd: true },
+      { inclusive1BasedStart: true }
+    ).should.deep.equal({ start: 5, end: 4 });
+    convertRangeIndices(
+      {
+        start: "1",
+        end: "28"
+      },
+      { inclusive1BasedStart: true, inclusive1BasedEnd: true },
+      {}
+    ).should.deep.equal({ start: 0, end: 27 });
+  });
+  it("should not remove other attributes on the range object", function () {
+    convertRangeIndices(
+      { start: 4, end: 5, someOtherAttribute: "yay" },
+      { inclusive1BasedEnd: true },
+      { inclusive1BasedStart: true }
+    ).should.deep.equal({ start: 5, end: 4, someOtherAttribute: "yay" });
+  });
+});

package/src/convertRangeTo0Based.js

@@ -1,5 +1,8 @@
-import convertRangeIndices from './convertRangeIndices';
+import convertRangeIndices from "./convertRangeIndices";
 
-export default function convertRangeTo0Based (range) {
-  return convertRangeIndices(range, {inclusive1BasedStart: true, inclusive1BasedEnd: true})
-};
+export default function convertRangeTo0Based(range) {
+  return convertRangeIndices(range, {
+    inclusive1BasedStart: true,
+    inclusive1BasedEnd: true
+  });
+}

package/src/convertRangeTo1Based.js

@@ -1,5 +1,9 @@
-import convertRangeIndices from './convertRangeIndices';
+import convertRangeIndices from "./convertRangeIndices";
 
-export default function convertRangeTo1Based (range) {
-  return convertRangeIndices(range, {}, {inclusive1BasedStart: true, inclusive1BasedEnd: true})
-};
+export default function convertRangeTo1Based(range) {
+  return convertRangeIndices(
+    range,
+    {},
+    { inclusive1BasedStart: true, inclusive1BasedEnd: true }
+  );
+}

package/src/doesRangeSpanEntireSequence.js

@@ -1,7 +1,7 @@
-import getRangeLength from './getRangeLength';
+import getRangeLength from "./getRangeLength";
 
-export default function doesRangeSpanEntireSequence (range, sequenceLength) {
+export default function doesRangeSpanEntireSequence(range, sequenceLength) {
   if (getRangeLength(range) === sequenceLength) {
-  	return true
+    return true;
   }
-};
+}

package/src/doesRangeSpanOrigin.js

@@ -1,3 +1,3 @@
-export default function doesRangeSpanOrigin (range) {
-  return range.start > range.end
-};
+export default function doesRangeSpanOrigin(range) {
+  return range.start > range.end;
+}

package/src/expandOrContractCircularRangeToPosition.js

@@ -1,41 +1,48 @@
-import normalizePositionByRangeLength from './normalizePositionByRangeLength';
-import {assign} from "lodash";
+import normalizePositionByRangeLength from "./normalizePositionByRangeLength";
+import { assign } from "lodash";
 
-export default function expandOrContractCircularRangeToPosition(range, position, maxLength) {
-
-    // 0 1 2 3 4 5 6 7 8 9
-    // r r r r r - - r r r
-    //0 1 2 3 4 5 6 7 8 9 10
-    //        | 
-    const newRange = assign({}, range);
-    let endMoved = true;
-    if (range.end >= position) {
-        if (position + maxLength - range.start > range.end - position) {
-            newRange.end = normalizePositionByRangeLength(position - 1, maxLength, false);
-        } else {
-            newRange.start = position;
-            endMoved = false;
-        }
+export default function expandOrContractCircularRangeToPosition(
+  range,
+  position,
+  maxLength
+) {
+  // 0 1 2 3 4 5 6 7 8 9
+  // r r r r r - - r r r
+  //0 1 2 3 4 5 6 7 8 9 10
+  //        |
+  const newRange = assign({}, range);
+  let endMoved = true;
+  if (range.end >= position) {
+    if (position + maxLength - range.start > range.end - position) {
+      newRange.end = normalizePositionByRangeLength(
+        position - 1,
+        maxLength,
+        false
+      );
+    } else {
+      newRange.start = position;
+      endMoved = false;
+    }
+  } else {
+    if (range.start < position) {
+      if (range.end + maxLength - position > position - range.start) {
+        newRange.start = position;
+        endMoved = false;
+      } else {
+        newRange.end = position - 1;
+      }
     } else {
-        if (range.start < position) {
-            if (range.end + maxLength - position > position - range.start) {
-                newRange.start = position;
-                endMoved = false;
-            } else {
-                newRange.end = position - 1;
-            }
-        } else {
-            //position somewhere between end and start
-            if (range.start - position > position - range.end) {
-                newRange.end = position - 1;
-            } else {
-                endMoved = false;
-                newRange.start = position;
-            }
-        }
+      //position somewhere between end and start
+      if (range.start - position > position - range.end) {
+        newRange.end = position - 1;
+      } else {
+        endMoved = false;
+        newRange.start = position;
+      }
     }
-    return ({
-        newRange: newRange, 
-        endMoved: endMoved
-    })
-};
+  }
+  return {
+    newRange: newRange,
+    endMoved: endMoved
+  };
+}

package/src/expandOrContractNonCircularRangeToPosition.js

@@ -1,25 +1,28 @@
-import {assign} from "lodash";
+import { assign } from "lodash";
 
-export default function expandOrContractNonCircularRangeToPosition (range, position) {
-    const newRange = assign({},range);
-    let endMoved = true;
-    if (range.start > position) {
+export default function expandOrContractNonCircularRangeToPosition(
+  range,
+  position
+) {
+  const newRange = assign({}, range);
+  let endMoved = true;
+  if (range.start > position) {
+    newRange.start = position;
+    endMoved = false;
+  } else {
+    if (range.end < position) {
+      newRange.end = position - 1;
+    } else {
+      if (position - range.start > range.end - position) {
+        newRange.end = position - 1;
+      } else {
         newRange.start = position;
         endMoved = false;
-    } else {
-        if (range.end < position) {
-            newRange.end = position - 1;
-        } else {
-            if (position - range.start > range.end - position) {
-                newRange.end = position - 1;
-            } else {
-                newRange.start = position;
-                endMoved = false;
-            }
-        }
+      }
     }
-    return ({
-        newRange: newRange,
-        endMoved: endMoved
-    })
-};
+  }
+  return {
+    newRange: newRange,
+    endMoved: endMoved
+  };
+}

package/src/expandOrContractRangeByLength.js

@@ -1,12 +1,17 @@
-import {clone} from 'lodash';
-import normalizeRange from './normalizeRange';
+import { clone } from "lodash";
+import normalizeRange from "./normalizeRange";
 
-export default function expandOrContractRangeByLength(range, shiftBy, shiftStart, sequenceLength) {
-    const rangeToReturn = clone(range);
-    if (shiftStart) {
-    	rangeToReturn.start -=shiftBy
-    } else {
-    	rangeToReturn.end +=shiftBy
-    }
-    return normalizeRange(rangeToReturn,sequenceLength)
-};
+export default function expandOrContractRangeByLength(
+  range,
+  shiftBy,
+  shiftStart,
+  sequenceLength
+) {
+  const rangeToReturn = clone(range);
+  if (shiftStart) {
+    rangeToReturn.start -= shiftBy;
+  } else {
+    rangeToReturn.end += shiftBy;
+  }
+  return normalizeRange(rangeToReturn, sequenceLength);
+}

package/src/expandOrContractRangeByLength.test.js

@@ -1,77 +1,115 @@
-import expandOrContractRangeByLength from './expandOrContractRangeByLength';
-import chai from 'chai';
-const expect = chai.expect;
+import expandOrContractRangeByLength from "./expandOrContractRangeByLength";
+import chai from "chai";
 chai.should();
 
-describe('expandOrContractRangeByLength', function () {
-	it('shift start by 1 ', function () {
-		const expandedRange = expandOrContractRangeByLength({start: 3,end:4}, 1, true, 10);
-		expandedRange.should.deep.equal({
-			start: 2,
-			end: 4
-		})
-	});
-	it('shift end by 1 ', function () {
-		const expandedRange = expandOrContractRangeByLength({start: 3,end:4}, 1, false, 10);
-		expandedRange.should.deep.equal({
-			start: 3,
-			end: 5
-		})
-	});
-	it('shift end by 6 ', function () {
-		const expandedRange = expandOrContractRangeByLength({start: 3,end:4}, 6, false, 10);
-		expandedRange.should.deep.equal({
-			start: 3,
-			end: 0
-		})
-	});
+describe("expandOrContractRangeByLength", function () {
+  it("shift start by 1 ", function () {
+    const expandedRange = expandOrContractRangeByLength(
+      { start: 3, end: 4 },
+      1,
+      true,
+      10
+    );
+    expandedRange.should.deep.equal({
+      start: 2,
+      end: 4
+    });
+  });
+  it("shift end by 1 ", function () {
+    const expandedRange = expandOrContractRangeByLength(
+      { start: 3, end: 4 },
+      1,
+      false,
+      10
+    );
+    expandedRange.should.deep.equal({
+      start: 3,
+      end: 5
+    });
+  });
+  it("shift end by 6 ", function () {
+    const expandedRange = expandOrContractRangeByLength(
+      { start: 3, end: 4 },
+      6,
+      false,
+      10
+    );
+    expandedRange.should.deep.equal({
+      start: 3,
+      end: 0
+    });
+  });
 
-	it('circular range', function () {
-		const expandedRange = expandOrContractRangeByLength({start: 6,end:4}, 1, false, 10);
-		expandedRange.should.deep.equal({
-			start: 6,
-			end: 5
-		})
-	});
-	it('circular range', function () {
-		const expandedRange = expandOrContractRangeByLength({start: 6,end:4}, 1, true, 10);
-		expandedRange.should.deep.equal({
-			start: 5,
-			end: 4
-		})
-	});
-	it('circular range', function () {
-		const expandedRange = expandOrContractRangeByLength({start: 6,end:4}, 1, true, 10);
-		expandedRange.should.deep.equal({
-			start: 5,
-			end: 4
-		})
-	});
+  it("circular range", function () {
+    const expandedRange = expandOrContractRangeByLength(
+      { start: 6, end: 4 },
+      1,
+      false,
+      10
+    );
+    expandedRange.should.deep.equal({
+      start: 6,
+      end: 5
+    });
+  });
+  it("circular range", function () {
+    const expandedRange = expandOrContractRangeByLength(
+      { start: 6, end: 4 },
+      1,
+      true,
+      10
+    );
+    expandedRange.should.deep.equal({
+      start: 5,
+      end: 4
+    });
+  });
+  it("circular range", function () {
+    const expandedRange = expandOrContractRangeByLength(
+      { start: 6, end: 4 },
+      1,
+      true,
+      10
+    );
+    expandedRange.should.deep.equal({
+      start: 5,
+      end: 4
+    });
+  });
 
-	it('negative shiftBy', function () {
-		const expandedRange = expandOrContractRangeByLength({start: 6,end:4}, -1, true, 10);
-		expandedRange.should.deep.equal({
-			start: 7,
-			end: 4
-		})
-	});
-	it('negative shiftBy', function () {
-		const expandedRange = expandOrContractRangeByLength({start: 6,end:4}, -1, false, 10);
-		expandedRange.should.deep.equal({
-			start: 6,
-			end: 3
-		})
-	});
+  it("negative shiftBy", function () {
+    const expandedRange = expandOrContractRangeByLength(
+      { start: 6, end: 4 },
+      -1,
+      true,
+      10
+    );
+    expandedRange.should.deep.equal({
+      start: 7,
+      end: 4
+    });
+  });
+  it("negative shiftBy", function () {
+    const expandedRange = expandOrContractRangeByLength(
+      { start: 6, end: 4 },
+      -1,
+      false,
+      10
+    );
+    expandedRange.should.deep.equal({
+      start: 6,
+      end: 3
+    });
+  });
 
-	// it('should error if trying to expand more than possible', function () {
-	// 	var error = false;
-	// 	try {
-	// 		var range = expandOrContractRangeByLength({start: 6,end:4}, 10, false, 10)
-	// 		console.log('range:', range)
-	// 	} catch (e) {
-	// 	    error = true;
-	// 	}
-	// 	expect(error).to.be.true;
-	// });
+  // it('should error if trying to expand more than possible', function () {
+  // 	var error = false;
+  // 	try {
+  // 		var range = expandOrContractRangeByLength({start: 6,end:4}, 10, false, 10)
+  // 		console.log('range:', range)
+  // 	} catch (e) {
+  // 	    error = true;
+  // 	}
+  // 	expect(error).to.be.true;
+  // });
 });
-

package/src/expandOrContractRangeToPosition.js

@@ -1,10 +1,18 @@
-import expandOrContractCircularRangeToPosition from './expandOrContractCircularRangeToPosition';
-import expandOrContractNonCircularRangeToPosition from './expandOrContractNonCircularRangeToPosition';
+import expandOrContractCircularRangeToPosition from "./expandOrContractCircularRangeToPosition";
+import expandOrContractNonCircularRangeToPosition from "./expandOrContractNonCircularRangeToPosition";
 
-export default function expandOrContractRangeToPosition(range, position, maxLength) {
-    if (range.start > range.end) {
-        return expandOrContractCircularRangeToPosition(range, position, maxLength)
-    } else {
-        return expandOrContractNonCircularRangeToPosition(range, position, maxLength)
-    }
-};
+export default function expandOrContractRangeToPosition(
+  range,
+  position,
+  maxLength
+) {
+  if (range.start > range.end) {
+    return expandOrContractCircularRangeToPosition(range, position, maxLength);
+  } else {
+    return expandOrContractNonCircularRangeToPosition(
+      range,
+      position,
+      maxLength
+    );
+  }
+}