@ckirby/mr-lister - npm Package Compare versions

Comparing version 2.7.1 to 2.8.0

dist/cjs/list-string.js

@@ -8,2 +8,5 @@ "use strict";
 function listString(list, options = {}) {
+    if (list.length <= 1) {
+        return list.join('');
+    }
     let andor;
@@ -17,7 +20,10 @@ if (isString(options)) {
     else {
-        andor = options.andor || options.conjunction || 'and';
+        andor = options.conjunction ?? 'and';
     }
     const andOrProvided = Boolean(andor);
+    // ensure whitespace around andor
+    if (andor)
+        andor = andor.replace(/^(?=\S)|(?<=\S)$/g, ' ');
     const { article } = options;
-    const comma = options.comma || options.separator || ', ';
+    const comma = options.comma ?? ', ';
     const minRangeDelta = options.minRangeDelta || 1;
@@ -27,7 +33,7 @@ // is the list an array of numbers or string-versions of numbers?
     let isAlpha = false;
-    let arr = null;
+    let ranges;
     if (isNumeric) {
         let numberList = Array.from(list).map((a) => parseInt(a, 10));
         // is numeric range
-        arr = utils_1.consolidateRanges(numberList, '–', list, minRangeDelta);
+        ranges = utils_1.consolidateRanges(numberList, '–', list, minRangeDelta);
     }
@@ -37,34 +43,31 @@ else { // test if alphabetic range
         if (isAlpha) {
-            arr = utils_1.consolidateAlphaRanges(list);
+            ranges = utils_1.consolidateAlphaRanges(list);
         }
     }
-    let delimiter;
-    if (list.length > 2) {
-        if (arr !== null) {
-            if (arr.length > 2) {
-                delimiter = comma;
+    let delimiter = comma;
+    if (ranges) {
+        list = ranges;
+    }
+    else {
+        if (list.length > 1) {
+            const complex = list.find((x) => /,/.test(`${x}`));
+            if (complex) {
+                delimiter = comma.replace(/,/, ';');
             }
         }
         else {
-            const complex = list.find((x) => /,/.test(x));
-            delimiter = complex ? comma.replace(/,/, ';') : comma;
+            delimiter = andOrProvided ? andor : '';
+            delimiter = delimiter.replace(/^(?![,.;:\s])/, ' ').replace(/[^,.;:\s]$/, '$& ');
         }
+        // add articles
+        if (article) {
+            list = list.map((item) => `${article} ${item}`);
+        }
     }
-    if (!delimiter) {
-        delimiter = andOrProvided ? andor : '';
-        delimiter = delimiter.replace(/^(?![,.;:\s])/, ' ').replace(/[^,.;:\s]$/, '$& ');
+    if (andOrProvided && (list.length > 2)) {
+        list.push(`${andor.replace(/^\s+/, '')}${list.pop()}`);
     }
-    if (!arr) {
-        arr = list.slice();
-    }
-    // add articles
-    if (article) {
-        arr = arr.map((item) => `${article} ${item}`);
-    }
-    if (andOrProvided && (arr.length > 2)) {
-        arr.push(`${andor} ${arr.pop()}`);
-    }
-    return arr.join(delimiter);
+    return list.join(list.length === 2 ? andor || delimiter : delimiter);
 }
 exports.default = listString;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdC1zdHJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGlzdC1zdHJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxtQ0FJaUI7QUFjakIsU0FBUyxRQUFRLENBQUMsS0FBYztJQUM5QixPQUFPLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssaUJBQWlCLENBQUE7QUFDbkQsQ0FBQztBQUVELFNBQXdCLFVBQVUsQ0FBQyxJQUFVLEVBQUUsVUFBc0MsRUFBRTtJQUNyRixJQUFJLEtBQWEsQ0FBQztJQUVsQixJQUFJLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRTtRQUNyQix1Q0FBdUM7UUFDdkMsS0FBSyxHQUFHLE9BQU8sQ0FBQztRQUNoQixJQUFJLENBQUUsQUFBRCxFQUFFLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBRSxHQUFHLFNBQVMsQ0FBQztRQUN0QyxPQUFPLEdBQUcsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUM7S0FDOUI7U0FBTTtRQUNMLEtBQUssR0FBRyxPQUFPLENBQUMsS0FBSyxJQUFJLE9BQU8sQ0FBQyxXQUFXLElBQUksS0FBSyxDQUFDO0tBQ3ZEO0lBRUQsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRXJDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUM7SUFFNUIsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEtBQUssSUFBSSxPQUFPLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQztJQUN6RCxNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsYUFBYSxJQUFJLENBQUMsQ0FBQztJQUVqRCxpRUFBaUU7SUFDakUsSUFBSSxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxhQUFLLENBQUMsQ0FBQztJQUNsQyxJQUFJLE9BQU8sR0FBRyxLQUFLLENBQUM7SUFDcEIsSUFBSSxHQUFHLEdBQXFCLElBQUksQ0FBQztJQUNqQyxJQUFJLFNBQVMsRUFBRTtRQUNiLElBQUksVUFBVSxHQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUF1QixDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLENBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzlGLG1CQUFtQjtRQUNuQixHQUFHLEdBQUcseUJBQWlCLENBQ3JCLFVBQVUsRUFDVixHQUFHLEVBQ0gsSUFBSSxFQUNKLGFBQWEsQ0FDZCxDQUFDO0tBQ0g7U0FBTSxFQUFFLDJCQUEyQjtRQUNsQyxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFXLENBQUMsQ0FBQyxDQUFDO1FBQzFELElBQUksT0FBTyxFQUFFO1lBQ1gsR0FBRyxHQUFHLDhCQUFzQixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ3BDO0tBQ0Y7SUFFRCxJQUFJLFNBQVMsQ0FBQztJQUNkLElBQUksSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7UUFDbkIsSUFBSSxHQUFHLEtBQUssSUFBSSxFQUFFO1lBQ2hCLElBQUksR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7Z0JBQ2xCLFNBQVMsR0FBRyxLQUFLLENBQUM7YUFDbkI7U0FDRjthQUFNO1lBQ0wsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFXLENBQUMsQ0FBQyxDQUFDO1lBQ3hELFNBQVMsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7U0FDdkQ7S0FDRjtJQUVELElBQUksQ0FBQyxTQUFTLEVBQUU7UUFDZCxTQUFTLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUN2QyxTQUFTLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxLQUFLLENBQUMsQ0FBQztLQUNsRjtJQUVELElBQUksQ0FBQyxHQUFHLEVBQUU7UUFDUixHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO0tBQ3BCO0lBRUQsZUFBZTtJQUNmLElBQUksT0FBTyxFQUFFO1FBQ1gsR0FBRyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLEdBQUcsT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUM7S0FDL0M7SUFFRCxJQUFJLGFBQWEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLEVBQUU7UUFDckMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLEtBQUssSUFBSSxHQUFHLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0tBQ25DO0lBQ0QsT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLENBQUM7QUFyRUQsNkJBcUVDIiwic291cmNlc0NvbnRlbnQiOlsiXG5pbXBvcnQge1xuICBpc0ludCxcbiAgY29uc29saWRhdGVSYW5nZXMsXG4gIGNvbnNvbGlkYXRlQWxwaGFSYW5nZXNcbn0gZnJvbSAnLi91dGlscyc7XG5cbnR5cGUgTGlzdFN0cmluZ09wdGlvbnMgPSB7XG4gIGFydGljbGU/OiBzdHJpbmc7XG4gIGNvbW1hPzogc3RyaW5nO1xuICBkZWxpbWl0ZXI/OiBzdHJpbmc7XG4gIGFuZG9yPzogc3RyaW5nO1xuICBjb25qdW5jdGlvbj86IHN0cmluZztcbiAgc2VwYXJhdG9yPzogc3RyaW5nO1xuICBtaW5SYW5nZURlbHRhPzogbnVtYmVyO1xufVxuXG50eXBlIExpc3QgPSB1bmtub3duW10gJiB7IG5lZWRzU29ydD86IGJvb2xlYW4sIG5lZWRzVW5pcXVlPzogYm9vbGVhbiB9O1xuXG5mdW5jdGlvbiBpc1N0cmluZyh2YWx1ZTogdW5rbm93bik6IHZhbHVlIGlzIHN0cmluZyB7XG4gIHJldHVybiB0b1N0cmluZy5jYWxsKHZhbHVlKSA9PT0gJ1tvYmplY3QgU3RyaW5nXSdcbn1cblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gbGlzdFN0cmluZyhsaXN0OiBMaXN0LCBvcHRpb25zOiBMaXN0U3RyaW5nT3B0aW9ucyB8IHN0cmluZyA9IHt9KSB7XG4gIGxldCBhbmRvcjogc3RyaW5nO1xuXG4gIGlmIChpc1N0cmluZyhvcHRpb25zKSkge1xuICAgIC8vIGNvbXBhdGFiaWxpdHkgd2l0aCBvbGQtc3R5bGUgZm4gY2FsbFxuICAgIGFuZG9yID0gb3B0aW9ucztcbiAgICBsZXQgWyAsLCBhcnRpY2xlLCBjb21tYSBdID0gYXJndW1lbnRzO1xuICAgIG9wdGlvbnMgPSB7IGFydGljbGUsIGNvbW1hIH07XG4gIH0gZWxzZSB7XG4gICAgYW5kb3IgPSBvcHRpb25zLmFuZG9yIHx8IG9wdGlvbnMuY29uanVuY3Rpb24gfHwgJ2FuZCc7XG4gIH1cblxuICBjb25zdCBhbmRPclByb3ZpZGVkID0gQm9vbGVhbihhbmRvcik7XG5cbiAgY29uc3QgeyBhcnRpY2xlIH0gPSBvcHRpb25zO1xuXG4gIGNvbnN0IGNvbW1hID0gb3B0aW9ucy5jb21tYSB8fCBvcHRpb25zLnNlcGFyYXRvciB8fCAnLCAnO1xuICBjb25zdCBtaW5SYW5nZURlbHRhID0gb3B0aW9ucy5taW5SYW5nZURlbHRhIHx8IDE7XG5cbiAgLy8gaXMgdGhlIGxpc3QgYW4gYXJyYXkgb2YgbnVtYmVycyBvciBzdHJpbmctdmVyc2lvbnMgb2YgbnVtYmVycz9cbiAgbGV0IGlzTnVtZXJpYyA9IGxpc3QuZXZlcnkoaXNJbnQpO1xuICBsZXQgaXNBbHBoYSA9IGZhbHNlO1xuICBsZXQgYXJyOiB1bmtub3duW10gfCBudWxsID0gbnVsbDtcbiAgaWYgKGlzTnVtZXJpYykge1xuICAgIGxldCBudW1iZXJMaXN0ID0gKEFycmF5LmZyb20obGlzdCkgYXMgKHN0cmluZ3xudW1iZXIpW10pLm1hcCgoYSkgPT4gcGFyc2VJbnQoYSBhcyBzdHJpbmcsIDEwKSlcbiAgICAvLyBpcyBudW1lcmljIHJhbmdlXG4gICAgYXJyID0gY29uc29saWRhdGVSYW5nZXMoXG4gICAgICBudW1iZXJMaXN0LFxuICAgICAgJ+KAkycsXG4gICAgICBsaXN0LFxuICAgICAgbWluUmFuZ2VEZWx0YVxuICAgICk7XG4gIH0gZWxzZSB7IC8vIHRlc3QgaWYgYWxwaGFiZXRpYyByYW5nZVxuICAgIGlzQWxwaGEgPSBsaXN0LmV2ZXJ5KCh4KSA9PiAvXlthLXpdJC9pLnRlc3QoeCBhcyBzdHJpbmcpKTtcbiAgICBpZiAoaXNBbHBoYSkge1xuICAgICAgYXJyID0gY29uc29saWRhdGVBbHBoYVJhbmdlcyhsaXN0KTtcbiAgICB9XG4gIH1cblxuICBsZXQgZGVsaW1pdGVyO1xuICBpZiAobGlzdC5sZW5ndGggPiAyKSB7XG4gICAgaWYgKGFyciAhPT0gbnVsbCkge1xuICAgICAgaWYgKGFyci5sZW5ndGggPiAyKSB7XG4gICAgICAgIGRlbGltaXRlciA9IGNvbW1hO1xuICAgICAgfVxuICAgIH0gZWxzZSB7XG4gICAgICBjb25zdCBjb21wbGV4ID0gbGlzdC5maW5kKCh4KSA9PiAvLC8udGVzdCh4IGFzIHN0cmluZykpO1xuICAgICAgZGVsaW1pdGVyID0gY29tcGxleCA/IGNvbW1hLnJlcGxhY2UoLywvLCAnOycpIDogY29tbWE7XG4gICAgfVxuICB9XG5cbiAgaWYgKCFkZWxpbWl0ZXIpIHtcbiAgICBkZWxpbWl0ZXIgPSBhbmRPclByb3ZpZGVkID8gYW5kb3IgOiAnJztcbiAgICBkZWxpbWl0ZXIgPSBkZWxpbWl0ZXIucmVwbGFjZSgvXig/IVssLjs6XFxzXSkvLCAnICcpLnJlcGxhY2UoL1teLC47Olxcc10kLywgJyQmICcpO1xuICB9XG5cbiAgaWYgKCFhcnIpIHtcbiAgICBhcnIgPSBsaXN0LnNsaWNlKCk7XG4gIH1cblxuICAvLyBhZGQgYXJ0aWNsZXNcbiAgaWYgKGFydGljbGUpIHtcbiAgICBhcnIgPSBhcnIubWFwKChpdGVtKSA9PiBgJHthcnRpY2xlfSAke2l0ZW19YCk7XG4gIH1cblxuICBpZiAoYW5kT3JQcm92aWRlZCAmJiAoYXJyLmxlbmd0aCA+IDIpKSB7XG4gICAgYXJyLnB1c2goYCR7YW5kb3J9ICR7YXJyLnBvcCgpfWApO1xuICB9XG4gIHJldHVybiBhcnIuam9pbihkZWxpbWl0ZXIpO1xufVxuIl19
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdC1zdHJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGlzdC1zdHJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7QUFDQSxtQ0FJaUI7QUFXakIsU0FBUyxRQUFRLENBQUMsS0FBYztJQUM5QixPQUFPLFFBQVEsQ0FBQyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssaUJBQWlCLENBQUE7QUFDbkQsQ0FBQztBQUVELFNBQXdCLFVBQVUsQ0FBQyxJQUFVLEVBQUUsVUFBc0MsRUFBRTtJQUNyRixJQUFJLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztLQUN0QjtJQUVELElBQUksS0FBYSxDQUFDO0lBRWxCLElBQUksUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ3JCLHVDQUF1QztRQUN2QyxLQUFLLEdBQUcsT0FBTyxDQUFDO1FBQ2hCLElBQUksQ0FBRSxBQUFELEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFFLEdBQUcsU0FBUyxDQUFDO1FBQ3RDLE9BQU8sR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsQ0FBQztLQUM5QjtTQUFNO1FBQ0wsS0FBSyxHQUFHLE9BQU8sQ0FBQyxXQUFXLElBQUksS0FBSyxDQUFDO0tBQ3RDO0lBRUQsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3JDLGlDQUFpQztJQUNqQyxJQUFJLEtBQUs7UUFBRSxLQUFLLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUUzRCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDO0lBRTVCLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDO0lBQ3BDLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxhQUFhLElBQUksQ0FBQyxDQUFDO0lBRWpELGlFQUFpRTtJQUNqRSxJQUFJLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLGFBQUssQ0FBQyxDQUFDO0lBQ2xDLElBQUksT0FBTyxHQUFHLEtBQUssQ0FBQztJQUNwQixJQUFJLE1BQTRCLENBQUM7SUFDakMsSUFBSSxTQUFTLEVBQUU7UUFDYixJQUFJLFVBQVUsR0FBSSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBdUIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFXLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM5RixtQkFBbUI7UUFDbkIsTUFBTSxHQUFHLHlCQUFpQixDQUN4QixVQUFVLEVBQ1YsR0FBRyxFQUNILElBQUksRUFDSixhQUFhLENBQ2QsQ0FBQztLQUNIO1NBQU0sRUFBRSwyQkFBMkI7UUFDbEMsT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBVyxDQUFDLENBQUMsQ0FBQztRQUMxRCxJQUFJLE9BQU8sRUFBRTtZQUNYLE1BQU0sR0FBRyw4QkFBc0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUN2QztLQUNGO0lBRUQsSUFBSSxTQUFTLEdBQUcsS0FBSyxDQUFDO0lBQ3RCLElBQUksTUFBTSxFQUFFO1FBQ1YsSUFBSSxHQUFHLE1BQU0sQ0FBQztLQUNmO1NBQU07UUFDTCxJQUFJLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ2pCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDbkQsSUFBSSxPQUFPLEVBQUU7Z0JBQ1gsU0FBUyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO2FBQ3JDO1NBQ0o7YUFBTTtZQUNMLFNBQVMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQ3ZDLFNBQVMsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRSxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLEtBQUssQ0FBQyxDQUFDO1NBQ2xGO1FBRUQsZUFBZTtRQUNmLElBQUksT0FBTyxFQUFFO1lBQ1gsSUFBSSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLEdBQUcsT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUM7U0FDakQ7S0FDRjtJQUNELElBQUksYUFBYSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsRUFBRTtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztLQUN4RDtJQUNELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxJQUFJLFNBQVMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDdkUsQ0FBQztBQXBFRCw2QkFvRUMiLCJzb3VyY2VzQ29udGVudCI6WyJcbmltcG9ydCB7XG4gIGlzSW50LFxuICBjb25zb2xpZGF0ZVJhbmdlcyxcbiAgY29uc29saWRhdGVBbHBoYVJhbmdlc1xufSBmcm9tICcuL3V0aWxzJztcblxudHlwZSBMaXN0U3RyaW5nT3B0aW9ucyA9IHtcbiAgYXJ0aWNsZT86IHN0cmluZztcbiAgY29tbWE/OiBzdHJpbmc7XG4gIGNvbmp1bmN0aW9uPzogc3RyaW5nO1xuICBtaW5SYW5nZURlbHRhPzogbnVtYmVyO1xufVxuXG50eXBlIExpc3QgPSB1bmtub3duW10gJiB7IG5lZWRzU29ydD86IGJvb2xlYW4sIG5lZWRzVW5pcXVlPzogYm9vbGVhbiB9O1xuXG5mdW5jdGlvbiBpc1N0cmluZyh2YWx1ZTogdW5rbm93bik6IHZhbHVlIGlzIHN0cmluZyB7XG4gIHJldHVybiB0b1N0cmluZy5jYWxsKHZhbHVlKSA9PT0gJ1tvYmplY3QgU3RyaW5nXSdcbn1cblxuZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gbGlzdFN0cmluZyhsaXN0OiBMaXN0LCBvcHRpb25zOiBMaXN0U3RyaW5nT3B0aW9ucyB8IHN0cmluZyA9IHt9KSB7XG4gIGlmIChsaXN0Lmxlbmd0aCA8PSAxKSB7XG4gICAgcmV0dXJuIGxpc3Quam9pbignJyk7XG4gIH1cblxuICBsZXQgYW5kb3I6IHN0cmluZztcblxuICBpZiAoaXNTdHJpbmcob3B0aW9ucykpIHtcbiAgICAvLyBjb21wYXRhYmlsaXR5IHdpdGggb2xkLXN0eWxlIGZuIGNhbGxcbiAgICBhbmRvciA9IG9wdGlvbnM7XG4gICAgbGV0IFsgLCwgYXJ0aWNsZSwgY29tbWEgXSA9IGFyZ3VtZW50cztcbiAgICBvcHRpb25zID0geyBhcnRpY2xlLCBjb21tYSB9O1xuICB9IGVsc2Uge1xuICAgIGFuZG9yID0gb3B0aW9ucy5jb25qdW5jdGlvbiA/PyAnYW5kJztcbiAgfVxuXG4gIGNvbnN0IGFuZE9yUHJvdmlkZWQgPSBCb29sZWFuKGFuZG9yKTtcbiAgLy8gZW5zdXJlIHdoaXRlc3BhY2UgYXJvdW5kIGFuZG9yXG4gIGlmIChhbmRvcikgYW5kb3IgPSBhbmRvci5yZXBsYWNlKC9eKD89XFxTKXwoPzw9XFxTKSQvZywgJyAnKTtcblxuICBjb25zdCB7IGFydGljbGUgfSA9IG9wdGlvbnM7XG5cbiAgY29uc3QgY29tbWEgPSBvcHRpb25zLmNvbW1hID8/ICcsICc7XG4gIGNvbnN0IG1pblJhbmdlRGVsdGEgPSBvcHRpb25zLm1pblJhbmdlRGVsdGEgfHwgMTtcblxuICAvLyBpcyB0aGUgbGlzdCBhbiBhcnJheSBvZiBudW1iZXJzIG9yIHN0cmluZy12ZXJzaW9ucyBvZiBudW1iZXJzP1xuICBsZXQgaXNOdW1lcmljID0gbGlzdC5ldmVyeShpc0ludCk7XG4gIGxldCBpc0FscGhhID0gZmFsc2U7XG4gIGxldCByYW5nZXM6IHN0cmluZ1tdIHwgdW5kZWZpbmVkO1xuICBpZiAoaXNOdW1lcmljKSB7XG4gICAgbGV0IG51bWJlckxpc3QgPSAoQXJyYXkuZnJvbShsaXN0KSBhcyAoc3RyaW5nfG51bWJlcilbXSkubWFwKChhKSA9PiBwYXJzZUludChhIGFzIHN0cmluZywgMTApKVxuICAgIC8vIGlzIG51bWVyaWMgcmFuZ2VcbiAgICByYW5nZXMgPSBjb25zb2xpZGF0ZVJhbmdlcyhcbiAgICAgIG51bWJlckxpc3QsXG4gICAgICAn4oCTJyxcbiAgICAgIGxpc3QsXG4gICAgICBtaW5SYW5nZURlbHRhXG4gICAgKTtcbiAgfSBlbHNlIHsgLy8gdGVzdCBpZiBhbHBoYWJldGljIHJhbmdlXG4gICAgaXNBbHBoYSA9IGxpc3QuZXZlcnkoKHgpID0+IC9eW2Etel0kL2kudGVzdCh4IGFzIHN0cmluZykpO1xuICAgIGlmIChpc0FscGhhKSB7XG4gICAgICByYW5nZXMgPSBjb25zb2xpZGF0ZUFscGhhUmFuZ2VzKGxpc3QpO1xuICAgIH1cbiAgfVxuXG4gIGxldCBkZWxpbWl0ZXIgPSBjb21tYTtcbiAgaWYgKHJhbmdlcykge1xuICAgIGxpc3QgPSByYW5nZXM7XG4gIH0gZWxzZSB7XG4gICAgaWYgKGxpc3QubGVuZ3RoID4gMSkge1xuICAgICAgICBjb25zdCBjb21wbGV4ID0gbGlzdC5maW5kKCh4KSA9PiAvLC8udGVzdChgJHt4fWApKTtcbiAgICAgICAgaWYgKGNvbXBsZXgpIHtcbiAgICAgICAgICBkZWxpbWl0ZXIgPSBjb21tYS5yZXBsYWNlKC8sLywgJzsnKTtcbiAgICAgICAgfVxuICAgIH0gZWxzZSB7XG4gICAgICBkZWxpbWl0ZXIgPSBhbmRPclByb3ZpZGVkID8gYW5kb3IgOiAnJztcbiAgICAgIGRlbGltaXRlciA9IGRlbGltaXRlci5yZXBsYWNlKC9eKD8hWywuOzpcXHNdKS8sICcgJykucmVwbGFjZSgvW14sLjs6XFxzXSQvLCAnJCYgJyk7XG4gICAgfVxuXG4gICAgLy8gYWRkIGFydGljbGVzXG4gICAgaWYgKGFydGljbGUpIHtcbiAgICAgIGxpc3QgPSBsaXN0Lm1hcCgoaXRlbSkgPT4gYCR7YXJ0aWNsZX0gJHtpdGVtfWApO1xuICAgIH1cbiAgfVxuICBpZiAoYW5kT3JQcm92aWRlZCAmJiAobGlzdC5sZW5ndGggPiAyKSkge1xuICAgIGxpc3QucHVzaChgJHthbmRvci5yZXBsYWNlKC9eXFxzKy8sICcnKX0ke2xpc3QucG9wKCl9YCk7XG4gIH1cbiAgcmV0dXJuIGxpc3Quam9pbihsaXN0Lmxlbmd0aCA9PT0gMiA/IGFuZG9yIHx8IGRlbGltaXRlciA6IGRlbGltaXRlcik7XG59XG4iXX0=

dist/cjs/utils.js

@@ -35,6 +35,6 @@ "use strict";
         if (start.val === end.val) {
-            out.push(start.val);
+            out.push(`${start.val}`);
         }
         else if (getVal(end.val) - getVal(start.val) < minRangeDelta) {
-            out.push(...arr.slice(start.index, end.index + 1));
+            out.push(...arr.slice(start.index, end.index + 1).map(x => `${x}`));
         }
@@ -73,2 +73,2 @@ else {
 exports.expandAlphaRange = expandAlphaRange;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsU0FBZ0IsUUFBUSxDQUFDLENBQVU7SUFDakMsT0FBTyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBVyxDQUFDLENBQUMsSUFBSSxRQUFRLENBQUMsQ0FBVyxDQUFDLENBQUM7QUFDbEUsQ0FBQztBQUZELDRCQUVDO0FBRUQsU0FBZ0IsS0FBSyxDQUFDLENBQVU7SUFDOUIsSUFBSSxDQUFDLEdBQUcsQ0FBVyxDQUFDO0lBQ3BCLE9BQU8sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLFVBQVUsQ0FBQyxDQUFDLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3RFLENBQUM7QUFIRCxzQkFHQztBQUVELFNBQWdCLE1BQU0sQ0FBQyxHQUFjO0lBQ25DLE9BQU8sQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7QUFDM0IsQ0FBQztBQUZELHdCQUVDO0FBRUQsU0FBUyxXQUFXLENBQ2xCLEdBQWMsRUFDZCxTQUFpQixFQUNqQixNQUE4QixFQUM5QixhQUFhLEdBQUcsQ0FBQztJQUdqQixNQUFNLFNBQVMsR0FBaUIsRUFBRSxDQUFDO0lBQ25DLE1BQU0sU0FBUyxHQUFpQixFQUFFLENBQUM7SUFDbkMsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUU7UUFDL0MsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEMsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUVsQyxJQUFJLElBQUksS0FBSyxJQUFJLEdBQUcsQ0FBQyxFQUFFO1lBQ3JCLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDNUM7UUFDRCxJQUFJLElBQUksS0FBSyxJQUFJLEdBQUcsQ0FBQyxFQUFFO1lBQ3JCLFNBQVMsQ0FBQyxJQUFJLENBQUMsRUFBRSxLQUFLLEVBQUUsR0FBRyxFQUFFLEdBQUcsQ0FBQyxLQUFLLENBQUMsRUFBRSxDQUFDLENBQUM7U0FDNUM7S0FDRjtJQUNELElBQUksR0FBRyxHQUFjLEVBQUUsQ0FBQztJQUN4QixLQUFLLE1BQU0sQ0FBQyxDQUFDLEVBQUUsS0FBSyxDQUFDLElBQUksU0FBUyxDQUFDLE9BQU8sRUFBRSxFQUFFO1FBQzVDLE1BQU0sR0FBRyxHQUFHLFNBQVMsQ0FBQyxDQUFDLENBQUMsQ0FBQztRQUN6QixJQUFJLEtBQUssQ0FBQyxHQUFHLEtBQUssR0FBRyxDQUFDLEdBQUcsRUFBRTtZQUN6QixHQUFHLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxHQUFHLENBQUMsQ0FBQztTQUNyQjthQUFNLElBQUksTUFBTSxDQUFDLEdBQUcsQ0FBQyxHQUFHLENBQUMsR0FBRyxNQUFNLENBQUMsS0FBSyxDQUFDLEdBQUcsQ0FBQyxHQUFHLGFBQWEsRUFBRTtZQUM5RCxHQUFHLENBQUMsSUFBSSxDQUFDLEdBQUcsR0FBRyxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsS0FBSyxFQUFFLEdBQUcsQ0FBQyxLQUFLLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQztTQUNwRDthQUFNO1lBQ0wsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLEtBQUssQ0FBQyxHQUFHLEdBQUcsU0FBUyxHQUFHLEdBQUcsQ0FBQyxHQUFHLEVBQUUsQ0FBQyxDQUFDO1NBQ2hEO0tBQ0Y7SUFDRCxPQUFPLEdBQUcsQ0FBQztBQUNiLENBQUM7QUFFRCxTQUFnQixpQkFBaUIsQ0FDL0IsVUFBcUIsRUFDckIsU0FBUyxHQUFHLEdBQUcsRUFDZixFQUFFLFNBQVMsR0FBRyxJQUFJLEVBQUUsV0FBVyxHQUFHLElBQUksRUFBRSxHQUFHLEVBQUUsRUFDN0MsYUFBcUI7SUFFckIsSUFBSSxHQUFHLEdBQUcsVUFBVSxDQUFDLEtBQUssRUFBRSxDQUFDO0lBQzdCLElBQUksV0FBVyxFQUFFO1FBQ2YsR0FBRyxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQWEsQ0FBQztLQUMvQjtJQUNELElBQUksU0FBUyxFQUFFO1FBQ2IsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLEVBQUUsRUFBRSxDQUFTLENBQUMsR0FBVyxDQUFDLENBQUMsQ0FBQztLQUMzQztJQUNELE9BQU8sV0FBVyxDQUFDLEdBQUcsRUFBRSxTQUFTLEVBQUUsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLENBQVcsRUFBRSxhQUFhLENBQUMsQ0FBQztBQUN4RSxDQUFDO0FBZEQsOENBY0M7QUFFRCxTQUFnQixzQkFBc0IsQ0FDcEMsVUFBcUIsRUFDckIsU0FBUyxHQUFHLEdBQUc7SUFFZixPQUFPLFdBQVcsQ0FBQyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsU0FBUyxFQUFFLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FDN0QsQ0FBQyxDQUFDLENBQUMsQ0FBRSxDQUFZLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQ3RDLENBQUM7QUFDSixDQUFDO0FBUEQsd0RBT0M7QUFFRCxTQUFnQixnQkFBZ0IsQ0FBQyxRQUFnQixFQUFFLE1BQWM7SUFDL0QsSUFBSSxRQUFRLEdBQUcsUUFBUSxDQUFDLFVBQVUsQ0FBQyxDQUFDLENBQUMsQ0FBQztJQUN0QyxJQUFJLE1BQU0sR0FBRyxNQUFNLENBQUMsVUFBVSxDQUFDLENBQUMsQ0FBQyxDQUFDO0lBQ2xDLElBQUksUUFBUSxHQUFHLE1BQU0sRUFBRTtRQUNyQixDQUFDLE1BQU0sRUFBRSxRQUFRLENBQUMsR0FBRyxDQUFDLFFBQVEsRUFBRSxNQUFNLENBQUMsQ0FBQztLQUN6QztJQUNELE9BQU8sQ0FBQyxHQUFHLEtBQUssQ0FBQyxNQUFNLEdBQUcsUUFBUSxHQUFHLENBQUMsQ0FBQyxDQUFDLElBQUksRUFBRSxDQUFDO1NBQzVDLEdBQUcsQ0FBQyxDQUFDLEVBQUUsRUFBRSxFQUFFLENBQUMsTUFBTSxDQUFDLFlBQVksQ0FBQyxRQUFRLEdBQUcsRUFBRSxDQUFDLENBQUM7U0FDL0MsTUFBTSxDQUFDLENBQUMsSUFBSSxFQUFFLEVBQUUsQ0FBQyxRQUFRLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUM7QUFDM0MsQ0FBQztBQVRELDRDQVNDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGlzTnVtYmVyKG46IHVua25vd24pOiBuIGlzIG51bWJlciB7XG4gIHJldHVybiAhaXNOYU4ocGFyc2VGbG9hdChuIGFzIHN0cmluZykpICYmIGlzRmluaXRlKG4gYXMgbnVtYmVyKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGlzSW50KG46IHVua25vd24pOiBib29sZWFuIHtcbiAgbGV0IHMgPSBuIGFzIHN0cmluZztcbiAgcmV0dXJuICFpc05hTihwYXJzZUludChzLCAxMCkpICYmIHBhcnNlRmxvYXQocykgPT09IHBhcnNlSW50KHMsIDEwKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHVuaXF1ZShhcnI6IHVua25vd25bXSk6IHVua25vd25bXSB7XG4gIHJldHVybiBbLi4ubmV3IFNldChhcnIpXTtcbn1cblxuZnVuY3Rpb24gY29uc29saWRhdGUoXG4gIGFycjogdW5rbm93bltdLFxuICBkZWxpbWl0ZXI6IHN0cmluZyxcbiAgZ2V0VmFsOiAoeDogdW5rbm93bikgPT4gbnVtYmVyLFxuICBtaW5SYW5nZURlbHRhID0gMVxuKTogdW5rbm93bltdIHtcbiAgdHlwZSBSYW5nZUJvdW5kID0geyBpbmRleDogbnVtYmVyOyB2YWw6IHVua25vd24gfTtcbiAgY29uc3QgcmFuZ2VCZWdzOiBSYW5nZUJvdW5kW10gPSBbXTtcbiAgY29uc3QgcmFuZ2VFbmRzOiBSYW5nZUJvdW5kW10gPSBbXTtcbiAgZm9yIChsZXQgaW5kZXggPSAwOyBpbmRleCA8IGFyci5sZW5ndGg7IGluZGV4KyspIHtcbiAgICBsZXQgY3VyciA9IGdldFZhbChhcnJbaW5kZXhdKTtcbiAgICBsZXQgcHJldiA9IGdldFZhbChhcnJbaW5kZXggLSAxXSk7XG4gICAgbGV0IG5leHQgPSBnZXRWYWwoYXJyW2luZGV4ICsgMV0pO1xuXG4gICAgaWYgKGN1cnIgIT09IHByZXYgKyAxKSB7XG4gICAgICByYW5nZUJlZ3MucHVzaCh7IGluZGV4LCB2YWw6IGFycltpbmRleF0gfSk7XG4gICAgfVxuICAgIGlmIChjdXJyICE9PSBuZXh0IC0gMSkge1xuICAgICAgcmFuZ2VFbmRzLnB1c2goeyBpbmRleCwgdmFsOiBhcnJbaW5kZXhdIH0pO1xuICAgIH1cbiAgfVxuICBsZXQgb3V0OiB1bmtub3duW10gPSBbXTtcbiAgZm9yIChjb25zdCBbaSwgc3RhcnRdIG9mIHJhbmdlQmVncy5lbnRyaWVzKCkpIHtcbiAgICBjb25zdCBlbmQgPSByYW5nZUVuZHNbaV07XG4gICAgaWYgKHN0YXJ0LnZhbCA9PT0gZW5kLnZhbCkge1xuICAgICAgb3V0LnB1c2goc3RhcnQudmFsKTtcbiAgICB9IGVsc2UgaWYgKGdldFZhbChlbmQudmFsKSAtIGdldFZhbChzdGFydC52YWwpIDwgbWluUmFuZ2VEZWx0YSkge1xuICAgICAgb3V0LnB1c2goLi4uYXJyLnNsaWNlKHN0YXJ0LmluZGV4LCBlbmQuaW5kZXggKyAxKSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIG91dC5wdXNoKGAke3N0YXJ0LnZhbH0ke2RlbGltaXRlcn0ke2VuZC52YWx9YCk7XG4gICAgfVxuICB9XG4gIHJldHVybiBvdXQ7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb25zb2xpZGF0ZVJhbmdlcyhcbiAgaW5wdXRBcnJheTogdW5rbm93bltdLFxuICBkZWxpbWl0ZXIgPSBcIuKAk1wiLFxuICB7IG5lZWRzU29ydCA9IHRydWUsIG5lZWRzVW5pcXVlID0gdHJ1ZSB9ID0ge30sXG4gIG1pblJhbmdlRGVsdGE6IG51bWJlclxuKTogdW5rbm93bltdIHtcbiAgbGV0IGFyciA9IGlucHV0QXJyYXkuc2xpY2UoKTtcbiAgaWYgKG5lZWRzVW5pcXVlKSB7XG4gICAgYXJyID0gdW5pcXVlKGFycikgYXMgbnVtYmVyW107XG4gIH1cbiAgaWYgKG5lZWRzU29ydCkge1xuICAgIGFyci5zb3J0KChhLCBiKSA9PiA8bnVtYmVyPmEgLSA8bnVtYmVyPmIpO1xuICB9XG4gIHJldHVybiBjb25zb2xpZGF0ZShhcnIsIGRlbGltaXRlciwgKHgpID0+IHggYXMgbnVtYmVyLCBtaW5SYW5nZURlbHRhKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGlkYXRlQWxwaGFSYW5nZXMoXG4gIGlucHV0QXJyYXk6IHVua25vd25bXSxcbiAgZGVsaW1pdGVyID0gXCLigJNcIlxuKTogdW5rbm93bltdIHtcbiAgcmV0dXJuIGNvbnNvbGlkYXRlKHVuaXF1ZShpbnB1dEFycmF5KS5zb3J0KCksIGRlbGltaXRlciwgKHgpID0+XG4gICAgeCA/ICh4IGFzIHN0cmluZykuY2hhckNvZGVBdCgwKSA6IE5hTlxuICApO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZXhwYW5kQWxwaGFSYW5nZShmcm9tQ2hhcjogc3RyaW5nLCB0b0NoYXI6IHN0cmluZyk6IHN0cmluZ1tdIHtcbiAgbGV0IGZyb21Db2RlID0gZnJvbUNoYXIuY2hhckNvZGVBdCgwKTtcbiAgbGV0IHRvQ29kZSA9IHRvQ2hhci5jaGFyQ29kZUF0KDApO1xuICBpZiAoZnJvbUNvZGUgPiB0b0NvZGUpIHtcbiAgICBbdG9Db2RlLCBmcm9tQ29kZV0gPSBbZnJvbUNvZGUsIHRvQ29kZV07XG4gIH1cbiAgcmV0dXJuIFsuLi5BcnJheSh0b0NvZGUgLSBmcm9tQ29kZSArIDEpLmtleXMoKV1cbiAgICAubWFwKChpaSkgPT4gU3RyaW5nLmZyb21DaGFyQ29kZShmcm9tQ29kZSArIGlpKSlcbiAgICAuZmlsdGVyKChjaGFyKSA9PiAvW2Etel0vaS50ZXN0KGNoYXIpKTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7O0FBQUEsU0FBZ0IsUUFBUSxDQUFDLENBQVU7SUFDakMsT0FBTyxDQUFDLEtBQUssQ0FBQyxVQUFVLENBQUMsQ0FBVyxDQUFDLENBQUMsSUFBSSxRQUFRLENBQUMsQ0FBVyxDQUFDLENBQUM7QUFDbEUsQ0FBQztBQUZELDRCQUVDO0FBRUQsU0FBZ0IsS0FBSyxDQUFDLENBQVU7SUFDOUIsSUFBSSxDQUFDLEdBQUcsQ0FBVyxDQUFDO0lBQ3BCLE9BQU8sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLFVBQVUsQ0FBQyxDQUFDLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3RFLENBQUM7QUFIRCxzQkFHQztBQUVELFNBQWdCLE1BQU0sQ0FBQyxHQUFjO0lBQ25DLE9BQU8sQ0FBQyxHQUFHLElBQUksR0FBRyxDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUM7QUFDM0IsQ0FBQztBQUZELHdCQUVDO0FBRUQsU0FBUyxXQUFXLENBQ2xCLEdBQWMsRUFDZCxTQUFpQixFQUNqQixNQUE4QixFQUM5QixhQUFhLEdBQUcsQ0FBQztJQUdqQixNQUFNLFNBQVMsR0FBaUIsRUFBRSxDQUFDO0lBQ25DLE1BQU0sU0FBUyxHQUFpQixFQUFFLENBQUM7SUFDbkMsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUU7UUFDL0MsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEMsSUFB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Q3RDLElBQUksTUFBTSxHQUFHLE1BQU0sQ0FBQyxVQUFVLENBQUMsQ0FBQyxDQUFDLENBQUM7SUFDbEMsSUFBSSxRQUFRLEdBQUcsTUFBTSxFQUFFO1FBQ3JCLENBQUMsTUFBTSxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0tBQ3pDO0lBQ0QsT0FBTyxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7U0FDNUMsR0FBRyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUMsQ0FBQztTQUMvQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztBQUMzQyxDQUFDO0FBVEQsNENBU0MiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gaXNOdW1iZXIobjogdW5rbm93bik6IG4gaXMgbnVtYmVyIHtcbiAgcmV0dXJuICFpc05hTihwYXJzZUZsb2F0KG4gYXMgc3RyaW5nKSkgJiYgaXNGaW5pdGUobiBhcyBudW1iZXIpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gaXNJbnQobjogdW5rbm93bik6IGJvb2xlYW4ge1xuICBsZXQgcyA9IG4gYXMgc3RyaW5nO1xuICByZXR1cm4gIWlzTmFOKHBhcnNlSW50KHMsIDEwKSkgJiYgcGFyc2VGbG9hdChzKSA9PT0gcGFyc2VJbnQocywgMTApO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdW5pcXVlKGFycjogdW5rbm93bltdKTogdW5rbm93bltdIHtcbiAgcmV0dXJuIFsuLi5uZXcgU2V0KGFycildO1xufVxuXG5mdW5jdGlvbiBjb25zb2xpZGF0ZShcbiAgYXJyOiB1bmtub3duW10sXG4gIGRlbGltaXRlcjogc3RyaW5nLFxuICBnZXRWYWw6ICh4OiB1bmtub3duKSA9PiBudW1iZXIsXG4gIG1pblJhbmdlRGVsdGEgPSAxXG4pOiBzdHJpbmdbXSB7XG4gIHR5cGUgUmFuZ2VCb3VuZCA9IHsgaW5kZXg6IG51bWJlcjsgdmFsOiB1bmtub3duIH07XG4gIGNvbnN0IHJhbmdlQmVnczogUmFuZ2VCb3VuZFtdID0gW107XG4gIGNvbnN0IHJhbmdlRW5kczogUmFuZ2VCb3VuZFtdID0gW107XG4gIGZvciAobGV0IGluZGV4ID0gMDsgaW5kZXggPCBhcnIubGVuZ3RoOyBpbmRleCsrKSB7XG4gICAgbGV0IGN1cnIgPSBnZXRWYWwoYXJyW2luZGV4XSk7XG4gICAgbGV0IHByZXYgPSBnZXRWYWwoYXJyW2luZGV4IC0gMV0pO1xuICAgIGxldCBuZXh0ID0gZ2V0VmFsKGFycltpbmRleCArIDFdKTtcblxuICAgIGlmIChjdXJyICE9PSBwcmV2ICsgMSkge1xuICAgICAgcmFuZ2VCZWdzLnB1c2goeyBpbmRleCwgdmFsOiBhcnJbaW5kZXhdIH0pO1xuICAgIH1cbiAgICBpZiAoY3VyciAhPT0gbmV4dCAtIDEpIHtcbiAgICAgIHJhbmdlRW5kcy5wdXNoKHsgaW5kZXgsIHZhbDogYXJyW2luZGV4XSB9KTtcbiAgICB9XG4gIH1cbiAgbGV0IG91dDogc3RyaW5nW10gPSBbXTtcbiAgZm9yIChjb25zdCBbaSwgc3RhcnRdIG9mIHJhbmdlQmVncy5lbnRyaWVzKCkpIHtcbiAgICBjb25zdCBlbmQgPSByYW5nZUVuZHNbaV07XG4gICAgaWYgKHN0YXJ0LnZhbCA9PT0gZW5kLnZhbCkge1xuICAgICAgb3V0LnB1c2goYCR7c3RhcnQudmFsfWApO1xuICAgIH0gZWxzZSBpZiAoZ2V0VmFsKGVuZC52YWwpIC0gZ2V0VmFsKHN0YXJ0LnZhbCkgPCBtaW5SYW5nZURlbHRhKSB7XG4gICAgICBvdXQucHVzaCguLi5hcnIuc2xpY2Uoc3RhcnQuaW5kZXgsIGVuZC5pbmRleCArIDEpLm1hcCh4ID0+IGAke3h9YCkpO1xuICAgIH0gZWxzZSB7XG4gICAgICBvdXQucHVzaChgJHtzdGFydC52YWx9JHtkZWxpbWl0ZXJ9JHtlbmQudmFsfWApO1xuICAgIH1cbiAgfVxuICByZXR1cm4gb3V0O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29uc29saWRhdGVSYW5nZXMoXG4gIGlucHV0QXJyYXk6IHVua25vd25bXSxcbiAgZGVsaW1pdGVyID0gXCLigJNcIixcbiAgeyBuZWVkc1NvcnQgPSB0cnVlLCBuZWVkc1VuaXF1ZSA9IHRydWUgfSA9IHt9LFxuICBtaW5SYW5nZURlbHRhOiBudW1iZXJcbik6IHN0cmluZ1tdIHtcbiAgbGV0IGFyciA9IGlucHV0QXJyYXkuc2xpY2UoKTtcbiAgaWYgKG5lZWRzVW5pcXVlKSB7XG4gICAgYXJyID0gdW5pcXVlKGFycikgYXMgbnVtYmVyW107XG4gIH1cbiAgaWYgKG5lZWRzU29ydCkge1xuICAgIGFyci5zb3J0KChhLCBiKSA9PiA8bnVtYmVyPmEgLSA8bnVtYmVyPmIpO1xuICB9XG4gIHJldHVybiBjb25zb2xpZGF0ZShhcnIsIGRlbGltaXRlciwgKHgpID0+IHggYXMgbnVtYmVyLCBtaW5SYW5nZURlbHRhKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGlkYXRlQWxwaGFSYW5nZXMoXG4gIGlucHV0QXJyYXk6IHVua25vd25bXSxcbiAgZGVsaW1pdGVyID0gXCLigJNcIlxuKTogc3RyaW5nW10ge1xuICByZXR1cm4gY29uc29saWRhdGUodW5pcXVlKGlucHV0QXJyYXkpLnNvcnQoKSwgZGVsaW1pdGVyLCAoeCkgPT5cbiAgICB4ID8gKHggYXMgc3RyaW5nKS5jaGFyQ29kZUF0KDApIDogTmFOXG4gICk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBleHBhbmRBbHBoYVJhbmdlKGZyb21DaGFyOiBzdHJpbmcsIHRvQ2hhcjogc3RyaW5nKTogc3RyaW5nW10ge1xuICBsZXQgZnJvbUNvZGUgPSBmcm9tQ2hhci5jaGFyQ29kZUF0KDApO1xuICBsZXQgdG9Db2RlID0gdG9DaGFyLmNoYXJDb2RlQXQoMCk7XG4gIGlmIChmcm9tQ29kZSA+IHRvQ29kZSkge1xuICAgIFt0b0NvZGUsIGZyb21Db2RlXSA9IFtmcm9tQ29kZSwgdG9Db2RlXTtcbiAgfVxuICByZXR1cm4gWy4uLkFycmF5KHRvQ29kZSAtIGZyb21Db2RlICsgMSkua2V5cygpXVxuICAgIC5tYXAoKGlpKSA9PiBTdHJpbmcuZnJvbUNoYXJDb2RlKGZyb21Db2RlICsgaWkpKVxuICAgIC5maWx0ZXIoKGNoYXIpID0+IC9bYS16XS9pLnRlc3QoY2hhcikpO1xufVxuIl19

dist/esm/list-string.js

@@ -6,2 +6,5 @@ import { isInt, consolidateRanges, consolidateAlphaRanges } from './utils';
 export default function listString(list, options = {}) {
+    if (list.length <= 1) {
+        return list.join('');
+    }
     let andor;
@@ -15,7 +18,10 @@ if (isString(options)) {
     else {
-        andor = options.andor || options.conjunction || 'and';
+        andor = options.conjunction ?? 'and';
     }
     const andOrProvided = Boolean(andor);
+    // ensure whitespace around andor
+    if (andor)
+        andor = andor.replace(/^(?=\S)|(?<=\S)$/g, ' ');
     const { article } = options;
-    const comma = options.comma || options.separator || ', ';
+    const comma = options.comma ?? ', ';
     const minRangeDelta = options.minRangeDelta || 1;
@@ -25,7 +31,7 @@ // is the list an array of numbers or string-versions of numbers?
     let isAlpha = false;
-    let arr = null;
+    let ranges;
     if (isNumeric) {
         let numberList = Array.from(list).map((a) => parseInt(a, 10));
         // is numeric range
-        arr = consolidateRanges(numberList, '–', list, minRangeDelta);
+        ranges = consolidateRanges(numberList, '–', list, minRangeDelta);
     }
@@ -35,33 +41,30 @@ else { // test if alphabetic range
         if (isAlpha) {
-            arr = consolidateAlphaRanges(list);
+            ranges = consolidateAlphaRanges(list);
         }
     }
-    let delimiter;
-    if (list.length > 2) {
-        if (arr !== null) {
-            if (arr.length > 2) {
-                delimiter = comma;
+    let delimiter = comma;
+    if (ranges) {
+        list = ranges;
+    }
+    else {
+        if (list.length > 1) {
+            const complex = list.find((x) => /,/.test(`${x}`));
+            if (complex) {
+                delimiter = comma.replace(/,/, ';');
             }
         }
         else {
-            const complex = list.find((x) => /,/.test(x));
-            delimiter = complex ? comma.replace(/,/, ';') : comma;
+            delimiter = andOrProvided ? andor : '';
+            delimiter = delimiter.replace(/^(?![,.;:\s])/, ' ').replace(/[^,.;:\s]$/, '$& ');
         }
+        // add articles
+        if (article) {
+            list = list.map((item) => `${article} ${item}`);
+        }
     }
-    if (!delimiter) {
-        delimiter = andOrProvided ? andor : '';
-        delimiter = delimiter.replace(/^(?![,.;:\s])/, ' ').replace(/[^,.;:\s]$/, '$& ');
+    if (andOrProvided && (list.length > 2)) {
+        list.push(`${andor.replace(/^\s+/, '')}${list.pop()}`);
     }
-    if (!arr) {
-        arr = list.slice();
-    }
-    // add articles
-    if (article) {
-        arr = arr.map((item) => `${article} ${item}`);
-    }
-    if (andOrProvided && (arr.length > 2)) {
-        arr.push(`${andor} ${arr.pop()}`);
-    }
-    return arr.join(delimiter);
+    return list.join(list.length === 2 ? andor || delimiter : delimiter);
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdC1zdHJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGlzdC1zdHJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLEtBQUssRUFDTCxpQkFBaUIsRUFDakIsc0JBQXNCLEVBQ3ZCLE1BQU0sU0FBUyxDQUFDO0FBY2pCLFNBQVMsUUFBUSxDQUFDLEtBQWM7SUFDOUIsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLGlCQUFpQixDQUFBO0FBQ25ELENBQUM7QUFFRCxNQUFNLENBQUMsT0FBTyxVQUFVLFVBQVUsQ0FBQyxJQUFVLEVBQUUsVUFBc0MsRUFBRTtJQUNyRixJQUFJLEtBQWEsQ0FBQztJQUVsQixJQUFJLFFBQVEsQ0FBQyxPQUFPLENBQUMsRUFBRTtRQUNyQix1Q0FBdUM7UUFDdkMsS0FBSyxHQUFHLE9BQU8sQ0FBQztRQUNoQixJQUFJLENBQUUsQUFBRCxFQUFFLEVBQUUsT0FBTyxFQUFFLEtBQUssQ0FBRSxHQUFHLFNBQVMsQ0FBQztRQUN0QyxPQUFPLEdBQUcsRUFBRSxPQUFPLEVBQUUsS0FBSyxFQUFFLENBQUM7S0FDOUI7U0FBTTtRQUNMLEtBQUssR0FBRyxPQUFPLENBQUMsS0FBSyxJQUFJLE9BQU8sQ0FBQyxXQUFXLElBQUksS0FBSyxDQUFDO0tBQ3ZEO0lBRUQsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBRXJDLE1BQU0sRUFBRSxPQUFPLEVBQUUsR0FBRyxPQUFPLENBQUM7SUFFNUIsTUFBTSxLQUFLLEdBQUcsT0FBTyxDQUFDLEtBQUssSUFBSSxPQUFPLENBQUMsU0FBUyxJQUFJLElBQUksQ0FBQztJQUN6RCxNQUFNLGFBQWEsR0FBRyxPQUFPLENBQUMsYUFBYSxJQUFJLENBQUMsQ0FBQztJQUVqRCxpRUFBaUU7SUFDakUsSUFBSSxTQUFTLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLENBQUMsQ0FBQztJQUNsQyxJQUFJLE9BQU8sR0FBRyxLQUFLLENBQUM7SUFDcEIsSUFBSSxHQUFHLEdBQXFCLElBQUksQ0FBQztJQUNqQyxJQUFJLFNBQVMsRUFBRTtRQUNiLElBQUksVUFBVSxHQUFJLEtBQUssQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUF1QixDQUFDLEdBQUcsQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLENBQVcsRUFBRSxFQUFFLENBQUMsQ0FBQyxDQUFBO1FBQzlGLG1CQUFtQjtRQUNuQixHQUFHLEdBQUcsaUJBQWlCLENBQ3JCLFVBQVUsRUFDVixHQUFHLEVBQ0gsSUFBSSxFQUNKLGFBQWEsQ0FDZCxDQUFDO0tBQ0g7U0FBTSxFQUFFLDJCQUEyQjtRQUNsQyxPQUFPLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsVUFBVSxDQUFDLElBQUksQ0FBQyxDQUFXLENBQUMsQ0FBQyxDQUFDO1FBQzFELElBQUksT0FBTyxFQUFFO1lBQ1gsR0FBRyxHQUFHLHNCQUFzQixDQUFDLElBQUksQ0FBQyxDQUFDO1NBQ3BDO0tBQ0Y7SUFFRCxJQUFJLFNBQVMsQ0FBQztJQUNkLElBQUksSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7UUFDbkIsSUFBSSxHQUFHLEtBQUssSUFBSSxFQUFFO1lBQ2hCLElBQUksR0FBRyxDQUFDLE1BQU0sR0FBRyxDQUFDLEVBQUU7Z0JBQ2xCLFNBQVMsR0FBRyxLQUFLLENBQUM7YUFDbkI7U0FDRjthQUFNO1lBQ0wsTUFBTSxPQUFPLEdBQUcsSUFBSSxDQUFDLElBQUksQ0FBQyxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsR0FBRyxDQUFDLElBQUksQ0FBQyxDQUFXLENBQUMsQ0FBQyxDQUFDO1lBQ3hELFNBQVMsR0FBRyxPQUFPLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUM7U0FDdkQ7S0FDRjtJQUVELElBQUksQ0FBQyxTQUFTLEVBQUU7UUFDZCxTQUFTLEdBQUcsYUFBYSxDQUFDLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUN2QyxTQUFTLEdBQUcsU0FBUyxDQUFDLE9BQU8sQ0FBQyxlQUFlLEVBQUUsR0FBRyxDQUFDLENBQUMsT0FBTyxDQUFDLFlBQVksRUFBRSxLQUFLLENBQUMsQ0FBQztLQUNsRjtJQUVELElBQUksQ0FBQyxHQUFHLEVBQUU7UUFDUixHQUFHLEdBQUcsSUFBSSxDQUFDLEtBQUssRUFBRSxDQUFDO0tBQ3BCO0lBRUQsZUFBZTtJQUNmLElBQUksT0FBTyxFQUFFO1FBQ1gsR0FBRyxHQUFHLEdBQUcsQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLEdBQUcsT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUM7S0FDL0M7SUFFRCxJQUFJLGFBQWEsSUFBSSxDQUFDLEdBQUcsQ0FBQyxNQUFNLEdBQUcsQ0FBQyxDQUFDLEVBQUU7UUFDckMsR0FBRyxDQUFDLElBQUksQ0FBQyxHQUFHLEtBQUssSUFBSSxHQUFHLENBQUMsR0FBRyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0tBQ25DO0lBQ0QsT0FBTyxHQUFHLENBQUMsSUFBSSxDQUFDLFNBQVMsQ0FBQyxDQUFDO0FBQzdCLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJcbmltcG9ydCB7XG4gIGlzSW50LFxuICBjb25zb2xpZGF0ZVJhbmdlcyxcbiAgY29uc29saWRhdGVBbHBoYVJhbmdlc1xufSBmcm9tICcuL3V0aWxzJztcblxudHlwZSBMaXN0U3RyaW5nT3B0aW9ucyA9IHtcbiAgYXJ0aWNsZT86IHN0cmluZztcbiAgY29tbWE/OiBzdHJpbmc7XG4gIGRlbGltaXRlcj86IHN0cmluZztcbiAgYW5kb3I/OiBzdHJpbmc7XG4gIGNvbmp1bmN0aW9uPzogc3RyaW5nO1xuICBzZXBhcmF0b3I/OiBzdHJpbmc7XG4gIG1pblJhbmdlRGVsdGE/OiBudW1iZXI7XG59XG5cbnR5cGUgTGlzdCA9IHVua25vd25bXSAmIHsgbmVlZHNTb3J0PzogYm9vbGVhbiwgbmVlZHNVbmlxdWU/OiBib29sZWFuIH07XG5cbmZ1bmN0aW9uIGlzU3RyaW5nKHZhbHVlOiB1bmtub3duKTogdmFsdWUgaXMgc3RyaW5nIHtcbiAgcmV0dXJuIHRvU3RyaW5nLmNhbGwodmFsdWUpID09PSAnW29iamVjdCBTdHJpbmddJ1xufVxuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBsaXN0U3RyaW5nKGxpc3Q6IExpc3QsIG9wdGlvbnM6IExpc3RTdHJpbmdPcHRpb25zIHwgc3RyaW5nID0ge30pIHtcbiAgbGV0IGFuZG9yOiBzdHJpbmc7XG5cbiAgaWYgKGlzU3RyaW5nKG9wdGlvbnMpKSB7XG4gICAgLy8gY29tcGF0YWJpbGl0eSB3aXRoIG9sZC1zdHlsZSBmbiBjYWxsXG4gICAgYW5kb3IgPSBvcHRpb25zO1xuICAgIGxldCBbICwsIGFydGljbGUsIGNvbW1hIF0gPSBhcmd1bWVudHM7XG4gICAgb3B0aW9ucyA9IHsgYXJ0aWNsZSwgY29tbWEgfTtcbiAgfSBlbHNlIHtcbiAgICBhbmRvciA9IG9wdGlvbnMuYW5kb3IgfHwgb3B0aW9ucy5jb25qdW5jdGlvbiB8fCAnYW5kJztcbiAgfVxuXG4gIGNvbnN0IGFuZE9yUHJvdmlkZWQgPSBCb29sZWFuKGFuZG9yKTtcblxuICBjb25zdCB7IGFydGljbGUgfSA9IG9wdGlvbnM7XG5cbiAgY29uc3QgY29tbWEgPSBvcHRpb25zLmNvbW1hIHx8IG9wdGlvbnMuc2VwYXJhdG9yIHx8ICcsICc7XG4gIGNvbnN0IG1pblJhbmdlRGVsdGEgPSBvcHRpb25zLm1pblJhbmdlRGVsdGEgfHwgMTtcblxuICAvLyBpcyB0aGUgbGlzdCBhbiBhcnJheSBvZiBudW1iZXJzIG9yIHN0cmluZy12ZXJzaW9ucyBvZiBudW1iZXJzP1xuICBsZXQgaXNOdW1lcmljID0gbGlzdC5ldmVyeShpc0ludCk7XG4gIGxldCBpc0FscGhhID0gZmFsc2U7XG4gIGxldCBhcnI6IHVua25vd25bXSB8IG51bGwgPSBudWxsO1xuICBpZiAoaXNOdW1lcmljKSB7XG4gICAgbGV0IG51bWJlckxpc3QgPSAoQXJyYXkuZnJvbShsaXN0KSBhcyAoc3RyaW5nfG51bWJlcilbXSkubWFwKChhKSA9PiBwYXJzZUludChhIGFzIHN0cmluZywgMTApKVxuICAgIC8vIGlzIG51bWVyaWMgcmFuZ2VcbiAgICBhcnIgPSBjb25zb2xpZGF0ZVJhbmdlcyhcbiAgICAgIG51bWJlckxpc3QsXG4gICAgICAn4oCTJyxcbiAgICAgIGxpc3QsXG4gICAgICBtaW5SYW5nZURlbHRhXG4gICAgKTtcbiAgfSBlbHNlIHsgLy8gdGVzdCBpZiBhbHBoYWJldGljIHJhbmdlXG4gICAgaXNBbHBoYSA9IGxpc3QuZXZlcnkoKHgpID0+IC9eW2Etel0kL2kudGVzdCh4IGFzIHN0cmluZykpO1xuICAgIGlmIChpc0FscGhhKSB7XG4gICAgICBhcnIgPSBjb25zb2xpZGF0ZUFscGhhUmFuZ2VzKGxpc3QpO1xuICAgIH1cbiAgfVxuXG4gIGxldCBkZWxpbWl0ZXI7XG4gIGlmIChsaXN0Lmxlbmd0aCA+IDIpIHtcbiAgICBpZiAoYXJyICE9PSBudWxsKSB7XG4gICAgICBpZiAoYXJyLmxlbmd0aCA+IDIpIHtcbiAgICAgICAgZGVsaW1pdGVyID0gY29tbWE7XG4gICAgICB9XG4gICAgfSBlbHNlIHtcbiAgICAgIGNvbnN0IGNvbXBsZXggPSBsaXN0LmZpbmQoKHgpID0+IC8sLy50ZXN0KHggYXMgc3RyaW5nKSk7XG4gICAgICBkZWxpbWl0ZXIgPSBjb21wbGV4ID8gY29tbWEucmVwbGFjZSgvLC8sICc7JykgOiBjb21tYTtcbiAgICB9XG4gIH1cblxuICBpZiAoIWRlbGltaXRlcikge1xuICAgIGRlbGltaXRlciA9IGFuZE9yUHJvdmlkZWQgPyBhbmRvciA6ICcnO1xuICAgIGRlbGltaXRlciA9IGRlbGltaXRlci5yZXBsYWNlKC9eKD8hWywuOzpcXHNdKS8sICcgJykucmVwbGFjZSgvW14sLjs6XFxzXSQvLCAnJCYgJyk7XG4gIH1cblxuICBpZiAoIWFycikge1xuICAgIGFyciA9IGxpc3Quc2xpY2UoKTtcbiAgfVxuXG4gIC8vIGFkZCBhcnRpY2xlc1xuICBpZiAoYXJ0aWNsZSkge1xuICAgIGFyciA9IGFyci5tYXAoKGl0ZW0pID0+IGAke2FydGljbGV9ICR7aXRlbX1gKTtcbiAgfVxuXG4gIGlmIChhbmRPclByb3ZpZGVkICYmIChhcnIubGVuZ3RoID4gMikpIHtcbiAgICBhcnIucHVzaChgJHthbmRvcn0gJHthcnIucG9wKCl9YCk7XG4gIH1cbiAgcmV0dXJuIGFyci5qb2luKGRlbGltaXRlcik7XG59XG4iXX0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoibGlzdC1zdHJpbmcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvbGlzdC1zdHJpbmcudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQ0EsT0FBTyxFQUNMLEtBQUssRUFDTCxpQkFBaUIsRUFDakIsc0JBQXNCLEVBQ3ZCLE1BQU0sU0FBUyxDQUFDO0FBV2pCLFNBQVMsUUFBUSxDQUFDLEtBQWM7SUFDOUIsT0FBTyxRQUFRLENBQUMsSUFBSSxDQUFDLEtBQUssQ0FBQyxLQUFLLGlCQUFpQixDQUFBO0FBQ25ELENBQUM7QUFFRCxNQUFNLENBQUMsT0FBTyxVQUFVLFVBQVUsQ0FBQyxJQUFVLEVBQUUsVUFBc0MsRUFBRTtJQUNyRixJQUFJLElBQUksQ0FBQyxNQUFNLElBQUksQ0FBQyxFQUFFO1FBQ3BCLE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxFQUFFLENBQUMsQ0FBQztLQUN0QjtJQUVELElBQUksS0FBYSxDQUFDO0lBRWxCLElBQUksUUFBUSxDQUFDLE9BQU8sQ0FBQyxFQUFFO1FBQ3JCLHVDQUF1QztRQUN2QyxLQUFLLEdBQUcsT0FBTyxDQUFDO1FBQ2hCLElBQUksQ0FBRSxBQUFELEVBQUUsRUFBRSxPQUFPLEVBQUUsS0FBSyxDQUFFLEdBQUcsU0FBUyxDQUFDO1FBQ3RDLE9BQU8sR0FBRyxFQUFFLE9BQU8sRUFBRSxLQUFLLEVBQUUsQ0FBQztLQUM5QjtTQUFNO1FBQ0wsS0FBSyxHQUFHLE9BQU8sQ0FBQyxXQUFXLElBQUksS0FBSyxDQUFDO0tBQ3RDO0lBRUQsTUFBTSxhQUFhLEdBQUcsT0FBTyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ3JDLGlDQUFpQztJQUNqQyxJQUFJLEtBQUs7UUFBRSxLQUFLLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxtQkFBbUIsRUFBRSxHQUFHLENBQUMsQ0FBQztJQUUzRCxNQUFNLEVBQUUsT0FBTyxFQUFFLEdBQUcsT0FBTyxDQUFDO0lBRTVCLE1BQU0sS0FBSyxHQUFHLE9BQU8sQ0FBQyxLQUFLLElBQUksSUFBSSxDQUFDO0lBQ3BDLE1BQU0sYUFBYSxHQUFHLE9BQU8sQ0FBQyxhQUFhLElBQUksQ0FBQyxDQUFDO0lBRWpELGlFQUFpRTtJQUNqRSxJQUFJLFNBQVMsR0FBRyxJQUFJLENBQUMsS0FBSyxDQUFDLEtBQUssQ0FBQyxDQUFDO0lBQ2xDLElBQUksT0FBTyxHQUFHLEtBQUssQ0FBQztJQUNwQixJQUFJLE1BQTRCLENBQUM7SUFDakMsSUFBSSxTQUFTLEVBQUU7UUFDYixJQUFJLFVBQVUsR0FBSSxLQUFLLENBQUMsSUFBSSxDQUFDLElBQUksQ0FBdUIsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxDQUFXLEVBQUUsRUFBRSxDQUFDLENBQUMsQ0FBQTtRQUM5RixtQkFBbUI7UUFDbkIsTUFBTSxHQUFHLGlCQUFpQixDQUN4QixVQUFVLEVBQ1YsR0FBRyxFQUNILElBQUksRUFDSixhQUFhLENBQ2QsQ0FBQztLQUNIO1NBQU0sRUFBRSwyQkFBMkI7UUFDbEMsT0FBTyxHQUFHLElBQUksQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLFVBQVUsQ0FBQyxJQUFJLENBQUMsQ0FBVyxDQUFDLENBQUMsQ0FBQztRQUMxRCxJQUFJLE9BQU8sRUFBRTtZQUNYLE1BQU0sR0FBRyxzQkFBc0IsQ0FBQyxJQUFJLENBQUMsQ0FBQztTQUN2QztLQUNGO0lBRUQsSUFBSSxTQUFTLEdBQUcsS0FBSyxDQUFDO0lBQ3RCLElBQUksTUFBTSxFQUFFO1FBQ1YsSUFBSSxHQUFHLE1BQU0sQ0FBQztLQUNmO1NBQU07UUFDTCxJQUFJLElBQUksQ0FBQyxNQUFNLEdBQUcsQ0FBQyxFQUFFO1lBQ2pCLE1BQU0sT0FBTyxHQUFHLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLEVBQUUsRUFBRSxDQUFDLEdBQUcsQ0FBQyxJQUFJLENBQUMsR0FBRyxDQUFDLEVBQUUsQ0FBQyxDQUFDLENBQUM7WUFDbkQsSUFBSSxPQUFPLEVBQUU7Z0JBQ1gsU0FBUyxHQUFHLEtBQUssQ0FBQyxPQUFPLENBQUMsR0FBRyxFQUFFLEdBQUcsQ0FBQyxDQUFDO2FBQ3JDO1NBQ0o7YUFBTTtZQUNMLFNBQVMsR0FBRyxhQUFhLENBQUMsQ0FBQyxDQUFDLEtBQUssQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDO1lBQ3ZDLFNBQVMsR0FBRyxTQUFTLENBQUMsT0FBTyxDQUFDLGVBQWUsRUFBRSxHQUFHLENBQUMsQ0FBQyxPQUFPLENBQUMsWUFBWSxFQUFFLEtBQUssQ0FBQyxDQUFDO1NBQ2xGO1FBRUQsZUFBZTtRQUNmLElBQUksT0FBTyxFQUFFO1lBQ1gsSUFBSSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLEdBQUcsT0FBTyxJQUFJLElBQUksRUFBRSxDQUFDLENBQUM7U0FDakQ7S0FDRjtJQUNELElBQUksYUFBYSxJQUFJLENBQUMsSUFBSSxDQUFDLE1BQU0sR0FBRyxDQUFDLENBQUMsRUFBRTtRQUN0QyxJQUFJLENBQUMsSUFBSSxDQUFDLEdBQUcsS0FBSyxDQUFDLE9BQU8sQ0FBQyxNQUFNLEVBQUUsRUFBRSxDQUFDLEdBQUcsSUFBSSxDQUFDLEdBQUcsRUFBRSxFQUFFLENBQUMsQ0FBQztLQUN4RDtJQUNELE9BQU8sSUFBSSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsTUFBTSxLQUFLLENBQUMsQ0FBQyxDQUFDLENBQUMsS0FBSyxJQUFJLFNBQVMsQ0FBQyxDQUFDLENBQUMsU0FBUyxDQUFDLENBQUM7QUFDdkUsQ0FBQyIsInNvdXJjZXNDb250ZW50IjpbIlxuaW1wb3J0IHtcbiAgaXNJbnQsXG4gIGNvbnNvbGlkYXRlUmFuZ2VzLFxuICBjb25zb2xpZGF0ZUFscGhhUmFuZ2VzXG59IGZyb20gJy4vdXRpbHMnO1xuXG50eXBlIExpc3RTdHJpbmdPcHRpb25zID0ge1xuICBhcnRpY2xlPzogc3RyaW5nO1xuICBjb21tYT86IHN0cmluZztcbiAgY29uanVuY3Rpb24/OiBzdHJpbmc7XG4gIG1pblJhbmdlRGVsdGE/OiBudW1iZXI7XG59XG5cbnR5cGUgTGlzdCA9IHVua25vd25bXSAmIHsgbmVlZHNTb3J0PzogYm9vbGVhbiwgbmVlZHNVbmlxdWU/OiBib29sZWFuIH07XG5cbmZ1bmN0aW9uIGlzU3RyaW5nKHZhbHVlOiB1bmtub3duKTogdmFsdWUgaXMgc3RyaW5nIHtcbiAgcmV0dXJuIHRvU3RyaW5nLmNhbGwodmFsdWUpID09PSAnW29iamVjdCBTdHJpbmddJ1xufVxuXG5leHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBsaXN0U3RyaW5nKGxpc3Q6IExpc3QsIG9wdGlvbnM6IExpc3RTdHJpbmdPcHRpb25zIHwgc3RyaW5nID0ge30pIHtcbiAgaWYgKGxpc3QubGVuZ3RoIDw9IDEpIHtcbiAgICByZXR1cm4gbGlzdC5qb2luKCcnKTtcbiAgfVxuXG4gIGxldCBhbmRvcjogc3RyaW5nO1xuXG4gIGlmIChpc1N0cmluZyhvcHRpb25zKSkge1xuICAgIC8vIGNvbXBhdGFiaWxpdHkgd2l0aCBvbGQtc3R5bGUgZm4gY2FsbFxuICAgIGFuZG9yID0gb3B0aW9ucztcbiAgICBsZXQgWyAsLCBhcnRpY2xlLCBjb21tYSBdID0gYXJndW1lbnRzO1xuICAgIG9wdGlvbnMgPSB7IGFydGljbGUsIGNvbW1hIH07XG4gIH0gZWxzZSB7XG4gICAgYW5kb3IgPSBvcHRpb25zLmNvbmp1bmN0aW9uID8/ICdhbmQnO1xuICB9XG5cbiAgY29uc3QgYW5kT3JQcm92aWRlZCA9IEJvb2xlYW4oYW5kb3IpO1xuICAvLyBlbnN1cmUgd2hpdGVzcGFjZSBhcm91bmQgYW5kb3JcbiAgaWYgKGFuZG9yKSBhbmRvciA9IGFuZG9yLnJlcGxhY2UoL14oPz1cXFMpfCg/PD1cXFMpJC9nLCAnICcpO1xuXG4gIGNvbnN0IHsgYXJ0aWNsZSB9ID0gb3B0aW9ucztcblxuICBjb25zdCBjb21tYSA9IG9wdGlvbnMuY29tbWEgPz8gJywgJztcbiAgY29uc3QgbWluUmFuZ2VEZWx0YSA9IG9wdGlvbnMubWluUmFuZ2VEZWx0YSB8fCAxO1xuXG4gIC8vIGlzIHRoZSBsaXN0IGFuIGFycmF5IG9mIG51bWJlcnMgb3Igc3RyaW5nLXZlcnNpb25zIG9mIG51bWJlcnM/XG4gIGxldCBpc051bWVyaWMgPSBsaXN0LmV2ZXJ5KGlzSW50KTtcbiAgbGV0IGlzQWxwaGEgPSBmYWxzZTtcbiAgbGV0IHJhbmdlczogc3RyaW5nW10gfCB1bmRlZmluZWQ7XG4gIGlmIChpc051bWVyaWMpIHtcbiAgICBsZXQgbnVtYmVyTGlzdCA9IChBcnJheS5mcm9tKGxpc3QpIGFzIChzdHJpbmd8bnVtYmVyKVtdKS5tYXAoKGEpID0+IHBhcnNlSW50KGEgYXMgc3RyaW5nLCAxMCkpXG4gICAgLy8gaXMgbnVtZXJpYyByYW5nZVxuICAgIHJhbmdlcyA9IGNvbnNvbGlkYXRlUmFuZ2VzKFxuICAgICAgbnVtYmVyTGlzdCxcbiAgICAgICfigJMnLFxuICAgICAgbGlzdCxcbiAgICAgIG1pblJhbmdlRGVsdGFcbiAgICApO1xuICB9IGVsc2UgeyAvLyB0ZXN0IGlmIGFscGhhYmV0aWMgcmFuZ2VcbiAgICBpc0FscGhhID0gbGlzdC5ldmVyeSgoeCkgPT4gL15bYS16XSQvaS50ZXN0KHggYXMgc3RyaW5nKSk7XG4gICAgaWYgKGlzQWxwaGEpIHtcbiAgICAgIHJhbmdlcyA9IGNvbnNvbGlkYXRlQWxwaGFSYW5nZXMobGlzdCk7XG4gICAgfVxuICB9XG5cbiAgbGV0IGRlbGltaXRlciA9IGNvbW1hO1xuICBpZiAocmFuZ2VzKSB7XG4gICAgbGlzdCA9IHJhbmdlcztcbiAgfSBlbHNlIHtcbiAgICBpZiAobGlzdC5sZW5ndGggPiAxKSB7XG4gICAgICAgIGNvbnN0IGNvbXBsZXggPSBsaXN0LmZpbmQoKHgpID0+IC8sLy50ZXN0KGAke3h9YCkpO1xuICAgICAgICBpZiAoY29tcGxleCkge1xuICAgICAgICAgIGRlbGltaXRlciA9IGNvbW1hLnJlcGxhY2UoLywvLCAnOycpO1xuICAgICAgICB9XG4gICAgfSBlbHNlIHtcbiAgICAgIGRlbGltaXRlciA9IGFuZE9yUHJvdmlkZWQgPyBhbmRvciA6ICcnO1xuICAgICAgZGVsaW1pdGVyID0gZGVsaW1pdGVyLnJlcGxhY2UoL14oPyFbLC47Olxcc10pLywgJyAnKS5yZXBsYWNlKC9bXiwuOzpcXHNdJC8sICckJiAnKTtcbiAgICB9XG5cbiAgICAvLyBhZGQgYXJ0aWNsZXNcbiAgICBpZiAoYXJ0aWNsZSkge1xuICAgICAgbGlzdCA9IGxpc3QubWFwKChpdGVtKSA9PiBgJHthcnRpY2xlfSAke2l0ZW19YCk7XG4gICAgfVxuICB9XG4gIGlmIChhbmRPclByb3ZpZGVkICYmIChsaXN0Lmxlbmd0aCA+IDIpKSB7XG4gICAgbGlzdC5wdXNoKGAke2FuZG9yLnJlcGxhY2UoL15cXHMrLywgJycpfSR7bGlzdC5wb3AoKX1gKTtcbiAgfVxuICByZXR1cm4gbGlzdC5qb2luKGxpc3QubGVuZ3RoID09PSAyID8gYW5kb3IgfHwgZGVsaW1pdGVyIDogZGVsaW1pdGVyKTtcbn1cbiJdfQ==

dist/esm/utils.js

@@ -29,6 +29,6 @@ export function isNumber(n) {
         if (start.val === end.val) {
-            out.push(start.val);
+            out.push(`${start.val}`);
         }
         else if (getVal(end.val) - getVal(start.val) < minRangeDelta) {
-            out.push(...arr.slice(start.index, end.index + 1));
+            out.push(...arr.slice(start.index, end.index + 1).map(x => `${x}`));
         }
@@ -64,2 +64,2 @@ else {
 }
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxVQUFVLFFBQVEsQ0FBQyxDQUFVO0lBQ2pDLE9BQU8sQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQVcsQ0FBQyxDQUFDLElBQUksUUFBUSxDQUFDLENBQVcsQ0FBQyxDQUFDO0FBQ2xFLENBQUM7QUFFRCxNQUFNLFVBQVUsS0FBSyxDQUFDLENBQVU7SUFDOUIsSUFBSSxDQUFDLEdBQUcsQ0FBVyxDQUFDO0lBQ3BCLE9BQU8sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLFVBQVUsQ0FBQyxDQUFDLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3RFLENBQUM7QUFFRCxNQUFNLFVBQVUsTUFBTSxDQUFDLEdBQWM7SUFDbkMsT0FBTyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztBQUMzQixDQUFDO0FBRUQsU0FBUyxXQUFXLENBQ2xCLEdBQWMsRUFDZCxTQUFpQixFQUNqQixNQUE4QixFQUM5QixhQUFhLEdBQUcsQ0FBQztJQUdqQixNQUFNLFNBQVMsR0FBaUIsRUFBRSxDQUFDO0lBQ25DLE1BQU0sU0FBUyxHQUFpQixFQUFFLENBQUM7SUFDbkMsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUU7UUFDL0MsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEMsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdB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TSxFQUFFLFFBQVEsQ0FBQyxHQUFHLENBQUMsUUFBUSxFQUFFLE1BQU0sQ0FBQyxDQUFDO0tBQ3pDO0lBQ0QsT0FBTyxDQUFDLEdBQUcsS0FBSyxDQUFDLE1BQU0sR0FBRyxRQUFRLEdBQUcsQ0FBQyxDQUFDLENBQUMsSUFBSSxFQUFFLENBQUM7U0FDNUMsR0FBRyxDQUFDLENBQUMsRUFBRSxFQUFFLEVBQUUsQ0FBQyxNQUFNLENBQUMsWUFBWSxDQUFDLFFBQVEsR0FBRyxFQUFFLENBQUMsQ0FBQztTQUMvQyxNQUFNLENBQUMsQ0FBQyxJQUFJLEVBQUUsRUFBRSxDQUFDLFFBQVEsQ0FBQyxJQUFJLENBQUMsSUFBSSxDQUFDLENBQUMsQ0FBQztBQUMzQyxDQUFDIiwic291cmNlc0NvbnRlbnQiOlsiZXhwb3J0IGZ1bmN0aW9uIGlzTnVtYmVyKG46IHVua25vd24pOiBuIGlzIG51bWJlciB7XG4gIHJldHVybiAhaXNOYU4ocGFyc2VGbG9hdChuIGFzIHN0cmluZykpICYmIGlzRmluaXRlKG4gYXMgbnVtYmVyKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGlzSW50KG46IHVua25vd24pOiBib29sZWFuIHtcbiAgbGV0IHMgPSBuIGFzIHN0cmluZztcbiAgcmV0dXJuICFpc05hTihwYXJzZUludChzLCAxMCkpICYmIHBhcnNlRmxvYXQocykgPT09IHBhcnNlSW50KHMsIDEwKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIHVuaXF1ZShhcnI6IHVua25vd25bXSk6IHVua25vd25bXSB7XG4gIHJldHVybiBbLi4ubmV3IFNldChhcnIpXTtcbn1cblxuZnVuY3Rpb24gY29uc29saWRhdGUoXG4gIGFycjogdW5rbm93bltdLFxuICBkZWxpbWl0ZXI6IHN0cmluZyxcbiAgZ2V0VmFsOiAoeDogdW5rbm93bikgPT4gbnVtYmVyLFxuICBtaW5SYW5nZURlbHRhID0gMVxuKTogdW5rbm93bltdIHtcbiAgdHlwZSBSYW5nZUJvdW5kID0geyBpbmRleDogbnVtYmVyOyB2YWw6IHVua25vd24gfTtcbiAgY29uc3QgcmFuZ2VCZWdzOiBSYW5nZUJvdW5kW10gPSBbXTtcbiAgY29uc3QgcmFuZ2VFbmRzOiBSYW5nZUJvdW5kW10gPSBbXTtcbiAgZm9yIChsZXQgaW5kZXggPSAwOyBpbmRleCA8IGFyci5sZW5ndGg7IGluZGV4KyspIHtcbiAgICBsZXQgY3VyciA9IGdldFZhbChhcnJbaW5kZXhdKTtcbiAgICBsZXQgcHJldiA9IGdldFZhbChhcnJbaW5kZXggLSAxXSk7XG4gICAgbGV0IG5leHQgPSBnZXRWYWwoYXJyW2luZGV4ICsgMV0pO1xuXG4gICAgaWYgKGN1cnIgIT09IHByZXYgKyAxKSB7XG4gICAgICByYW5nZUJlZ3MucHVzaCh7IGluZGV4LCB2YWw6IGFycltpbmRleF0gfSk7XG4gICAgfVxuICAgIGlmIChjdXJyICE9PSBuZXh0IC0gMSkge1xuICAgICAgcmFuZ2VFbmRzLnB1c2goeyBpbmRleCwgdmFsOiBhcnJbaW5kZXhdIH0pO1xuICAgIH1cbiAgfVxuICBsZXQgb3V0OiB1bmtub3duW10gPSBbXTtcbiAgZm9yIChjb25zdCBbaSwgc3RhcnRdIG9mIHJhbmdlQmVncy5lbnRyaWVzKCkpIHtcbiAgICBjb25zdCBlbmQgPSByYW5nZUVuZHNbaV07XG4gICAgaWYgKHN0YXJ0LnZhbCA9PT0gZW5kLnZhbCkge1xuICAgICAgb3V0LnB1c2goc3RhcnQudmFsKTtcbiAgICB9IGVsc2UgaWYgKGdldFZhbChlbmQudmFsKSAtIGdldFZhbChzdGFydC52YWwpIDwgbWluUmFuZ2VEZWx0YSkge1xuICAgICAgb3V0LnB1c2goLi4uYXJyLnNsaWNlKHN0YXJ0LmluZGV4LCBlbmQuaW5kZXggKyAxKSk7XG4gICAgfSBlbHNlIHtcbiAgICAgIG91dC5wdXNoKGAke3N0YXJ0LnZhbH0ke2RlbGltaXRlcn0ke2VuZC52YWx9YCk7XG4gICAgfVxuICB9XG4gIHJldHVybiBvdXQ7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBjb25zb2xpZGF0ZVJhbmdlcyhcbiAgaW5wdXRBcnJheTogdW5rbm93bltdLFxuICBkZWxpbWl0ZXIgPSBcIuKAk1wiLFxuICB7IG5lZWRzU29ydCA9IHRydWUsIG5lZWRzVW5pcXVlID0gdHJ1ZSB9ID0ge30sXG4gIG1pblJhbmdlRGVsdGE6IG51bWJlclxuKTogdW5rbm93bltdIHtcbiAgbGV0IGFyciA9IGlucHV0QXJyYXkuc2xpY2UoKTtcbiAgaWYgKG5lZWRzVW5pcXVlKSB7XG4gICAgYXJyID0gdW5pcXVlKGFycikgYXMgbnVtYmVyW107XG4gIH1cbiAgaWYgKG5lZWRzU29ydCkge1xuICAgIGFyci5zb3J0KChhLCBiKSA9PiA8bnVtYmVyPmEgLSA8bnVtYmVyPmIpO1xuICB9XG4gIHJldHVybiBjb25zb2xpZGF0ZShhcnIsIGRlbGltaXRlciwgKHgpID0+IHggYXMgbnVtYmVyLCBtaW5SYW5nZURlbHRhKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGlkYXRlQWxwaGFSYW5nZXMoXG4gIGlucHV0QXJyYXk6IHVua25vd25bXSxcbiAgZGVsaW1pdGVyID0gXCLigJNcIlxuKTogdW5rbm93bltdIHtcbiAgcmV0dXJuIGNvbnNvbGlkYXRlKHVuaXF1ZShpbnB1dEFycmF5KS5zb3J0KCksIGRlbGltaXRlciwgKHgpID0+XG4gICAgeCA/ICh4IGFzIHN0cmluZykuY2hhckNvZGVBdCgwKSA6IE5hTlxuICApO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gZXhwYW5kQWxwaGFSYW5nZShmcm9tQ2hhcjogc3RyaW5nLCB0b0NoYXI6IHN0cmluZyk6IHN0cmluZ1tdIHtcbiAgbGV0IGZyb21Db2RlID0gZnJvbUNoYXIuY2hhckNvZGVBdCgwKTtcbiAgbGV0IHRvQ29kZSA9IHRvQ2hhci5jaGFyQ29kZUF0KDApO1xuICBpZiAoZnJvbUNvZGUgPiB0b0NvZGUpIHtcbiAgICBbdG9Db2RlLCBmcm9tQ29kZV0gPSBbZnJvbUNvZGUsIHRvQ29kZV07XG4gIH1cbiAgcmV0dXJuIFsuLi5BcnJheSh0b0NvZGUgLSBmcm9tQ29kZSArIDEpLmtleXMoKV1cbiAgICAubWFwKChpaSkgPT4gU3RyaW5nLmZyb21DaGFyQ29kZShmcm9tQ29kZSArIGlpKSlcbiAgICAuZmlsdGVyKChjaGFyKSA9PiAvW2Etel0vaS50ZXN0KGNoYXIpKTtcbn1cbiJdfQ==
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoidXRpbHMuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvdXRpbHMudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsTUFBTSxVQUFVLFFBQVEsQ0FBQyxDQUFVO0lBQ2pDLE9BQU8sQ0FBQyxLQUFLLENBQUMsVUFBVSxDQUFDLENBQVcsQ0FBQyxDQUFDLElBQUksUUFBUSxDQUFDLENBQVcsQ0FBQyxDQUFDO0FBQ2xFLENBQUM7QUFFRCxNQUFNLFVBQVUsS0FBSyxDQUFDLENBQVU7SUFDOUIsSUFBSSxDQUFDLEdBQUcsQ0FBVyxDQUFDO0lBQ3BCLE9BQU8sQ0FBQyxLQUFLLENBQUMsUUFBUSxDQUFDLENBQUMsRUFBRSxFQUFFLENBQUMsQ0FBQyxJQUFJLFVBQVUsQ0FBQyxDQUFDLENBQUMsS0FBSyxRQUFRLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQ3RFLENBQUM7QUFFRCxNQUFNLFVBQVUsTUFBTSxDQUFDLEdBQWM7SUFDbkMsT0FBTyxDQUFDLEdBQUcsSUFBSSxHQUFHLENBQUMsR0FBRyxDQUFDLENBQUMsQ0FBQztBQUMzQixDQUFDO0FBRUQsU0FBUyxXQUFXLENBQ2xCLEdBQWMsRUFDZCxTQUFpQixFQUNqQixNQUE4QixFQUM5QixhQUFhLEdBQUcsQ0FBQztJQUdqQixNQUFNLFNBQVMsR0FBaUIsRUFBRSxDQUFDO0lBQ25DLE1BQU0sU0FBUyxHQUFpQixFQUFFLENBQUM7SUFDbkMsS0FBSyxJQUFJLEtBQUssR0FBRyxDQUFDLEVBQUUsS0FBSyxHQUFHLEdBQUcsQ0FBQyxNQUFNLEVBQUUsS0FBSyxFQUFFLEVBQUU7UUFDL0MsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdBQUcsQ0FBQyxLQUFLLENBQUMsQ0FBQyxDQUFDO1FBQzlCLElBQUksSUFBSSxHQUFHLE1BQU0sQ0FBQyxHQUFHLENBQUMsS0FBSyxHQUFHLENBQUMsQ0FBQyxDQUFDLENBQUM7UUFDbEMsSUFBSSxJQUFJLEdBQUcsTUFBTSxDQUFDLEdB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Q0FBQyxDQUFDLENBQUMsQ0FBQztJQUNsQyxJQUFJLFFBQVEsR0FBRyxNQUFNLEVBQUU7UUFDckIsQ0FBQyxNQUFNLEVBQUUsUUFBUSxDQUFDLEdBQUcsQ0FBQyxRQUFRLEVBQUUsTUFBTSxDQUFDLENBQUM7S0FDekM7SUFDRCxPQUFPLENBQUMsR0FBRyxLQUFLLENBQUMsTUFBTSxHQUFHLFFBQVEsR0FBRyxDQUFDLENBQUMsQ0FBQyxJQUFJLEVBQUUsQ0FBQztTQUM1QyxHQUFHLENBQUMsQ0FBQyxFQUFFLEVBQUUsRUFBRSxDQUFDLE1BQU0sQ0FBQyxZQUFZLENBQUMsUUFBUSxHQUFHLEVBQUUsQ0FBQyxDQUFDO1NBQy9DLE1BQU0sQ0FBQyxDQUFDLElBQUksRUFBRSxFQUFFLENBQUMsUUFBUSxDQUFDLElBQUksQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDO0FBQzNDLENBQUMiLCJzb3VyY2VzQ29udGVudCI6WyJleHBvcnQgZnVuY3Rpb24gaXNOdW1iZXIobjogdW5rbm93bik6IG4gaXMgbnVtYmVyIHtcbiAgcmV0dXJuICFpc05hTihwYXJzZUZsb2F0KG4gYXMgc3RyaW5nKSkgJiYgaXNGaW5pdGUobiBhcyBudW1iZXIpO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gaXNJbnQobjogdW5rbm93bik6IGJvb2xlYW4ge1xuICBsZXQgcyA9IG4gYXMgc3RyaW5nO1xuICByZXR1cm4gIWlzTmFOKHBhcnNlSW50KHMsIDEwKSkgJiYgcGFyc2VGbG9hdChzKSA9PT0gcGFyc2VJbnQocywgMTApO1xufVxuXG5leHBvcnQgZnVuY3Rpb24gdW5pcXVlKGFycjogdW5rbm93bltdKTogdW5rbm93bltdIHtcbiAgcmV0dXJuIFsuLi5uZXcgU2V0KGFycildO1xufVxuXG5mdW5jdGlvbiBjb25zb2xpZGF0ZShcbiAgYXJyOiB1bmtub3duW10sXG4gIGRlbGltaXRlcjogc3RyaW5nLFxuICBnZXRWYWw6ICh4OiB1bmtub3duKSA9PiBudW1iZXIsXG4gIG1pblJhbmdlRGVsdGEgPSAxXG4pOiBzdHJpbmdbXSB7XG4gIHR5cGUgUmFuZ2VCb3VuZCA9IHsgaW5kZXg6IG51bWJlcjsgdmFsOiB1bmtub3duIH07XG4gIGNvbnN0IHJhbmdlQmVnczogUmFuZ2VCb3VuZFtdID0gW107XG4gIGNvbnN0IHJhbmdlRW5kczogUmFuZ2VCb3VuZFtdID0gW107XG4gIGZvciAobGV0IGluZGV4ID0gMDsgaW5kZXggPCBhcnIubGVuZ3RoOyBpbmRleCsrKSB7XG4gICAgbGV0IGN1cnIgPSBnZXRWYWwoYXJyW2luZGV4XSk7XG4gICAgbGV0IHByZXYgPSBnZXRWYWwoYXJyW2luZGV4IC0gMV0pO1xuICAgIGxldCBuZXh0ID0gZ2V0VmFsKGFycltpbmRleCArIDFdKTtcblxuICAgIGlmIChjdXJyICE9PSBwcmV2ICsgMSkge1xuICAgICAgcmFuZ2VCZWdzLnB1c2goeyBpbmRleCwgdmFsOiBhcnJbaW5kZXhdIH0pO1xuICAgIH1cbiAgICBpZiAoY3VyciAhPT0gbmV4dCAtIDEpIHtcbiAgICAgIHJhbmdlRW5kcy5wdXNoKHsgaW5kZXgsIHZhbDogYXJyW2luZGV4XSB9KTtcbiAgICB9XG4gIH1cbiAgbGV0IG91dDogc3RyaW5nW10gPSBbXTtcbiAgZm9yIChjb25zdCBbaSwgc3RhcnRdIG9mIHJhbmdlQmVncy5lbnRyaWVzKCkpIHtcbiAgICBjb25zdCBlbmQgPSByYW5nZUVuZHNbaV07XG4gICAgaWYgKHN0YXJ0LnZhbCA9PT0gZW5kLnZhbCkge1xuICAgICAgb3V0LnB1c2goYCR7c3RhcnQudmFsfWApO1xuICAgIH0gZWxzZSBpZiAoZ2V0VmFsKGVuZC52YWwpIC0gZ2V0VmFsKHN0YXJ0LnZhbCkgPCBtaW5SYW5nZURlbHRhKSB7XG4gICAgICBvdXQucHVzaCguLi5hcnIuc2xpY2Uoc3RhcnQuaW5kZXgsIGVuZC5pbmRleCArIDEpLm1hcCh4ID0+IGAke3h9YCkpO1xuICAgIH0gZWxzZSB7XG4gICAgICBvdXQucHVzaChgJHtzdGFydC52YWx9JHtkZWxpbWl0ZXJ9JHtlbmQudmFsfWApO1xuICAgIH1cbiAgfVxuICByZXR1cm4gb3V0O1xufVxuXG5leHBvcnQgZnVuY3Rpb24gY29uc29saWRhdGVSYW5nZXMoXG4gIGlucHV0QXJyYXk6IHVua25vd25bXSxcbiAgZGVsaW1pdGVyID0gXCLigJNcIixcbiAgeyBuZWVkc1NvcnQgPSB0cnVlLCBuZWVkc1VuaXF1ZSA9IHRydWUgfSA9IHt9LFxuICBtaW5SYW5nZURlbHRhOiBudW1iZXJcbik6IHN0cmluZ1tdIHtcbiAgbGV0IGFyciA9IGlucHV0QXJyYXkuc2xpY2UoKTtcbiAgaWYgKG5lZWRzVW5pcXVlKSB7XG4gICAgYXJyID0gdW5pcXVlKGFycikgYXMgbnVtYmVyW107XG4gIH1cbiAgaWYgKG5lZWRzU29ydCkge1xuICAgIGFyci5zb3J0KChhLCBiKSA9PiA8bnVtYmVyPmEgLSA8bnVtYmVyPmIpO1xuICB9XG4gIHJldHVybiBjb25zb2xpZGF0ZShhcnIsIGRlbGltaXRlciwgKHgpID0+IHggYXMgbnVtYmVyLCBtaW5SYW5nZURlbHRhKTtcbn1cblxuZXhwb3J0IGZ1bmN0aW9uIGNvbnNvbGlkYXRlQWxwaGFSYW5nZXMoXG4gIGlucHV0QXJyYXk6IHVua25vd25bXSxcbiAgZGVsaW1pdGVyID0gXCLigJNcIlxuKTogc3RyaW5nW10ge1xuICByZXR1cm4gY29uc29saWRhdGUodW5pcXVlKGlucHV0QXJyYXkpLnNvcnQoKSwgZGVsaW1pdGVyLCAoeCkgPT5cbiAgICB4ID8gKHggYXMgc3RyaW5nKS5jaGFyQ29kZUF0KDApIDogTmFOXG4gICk7XG59XG5cbmV4cG9ydCBmdW5jdGlvbiBleHBhbmRBbHBoYVJhbmdlKGZyb21DaGFyOiBzdHJpbmcsIHRvQ2hhcjogc3RyaW5nKTogc3RyaW5nW10ge1xuICBsZXQgZnJvbUNvZGUgPSBmcm9tQ2hhci5jaGFyQ29kZUF0KDApO1xuICBsZXQgdG9Db2RlID0gdG9DaGFyLmNoYXJDb2RlQXQoMCk7XG4gIGlmIChmcm9tQ29kZSA+IHRvQ29kZSkge1xuICAgIFt0b0NvZGUsIGZyb21Db2RlXSA9IFtmcm9tQ29kZSwgdG9Db2RlXTtcbiAgfVxuICByZXR1cm4gWy4uLkFycmF5KHRvQ29kZSAtIGZyb21Db2RlICsgMSkua2V5cygpXVxuICAgIC5tYXAoKGlpKSA9PiBTdHJpbmcuZnJvbUNoYXJDb2RlKGZyb21Db2RlICsgaWkpKVxuICAgIC5maWx0ZXIoKGNoYXIpID0+IC9bYS16XS9pLnRlc3QoY2hhcikpO1xufVxuIl19

package.json

 {
   "name": "@ckirby/mr-lister",
-  "version": "2.7.1",
+  "version": "2.8.0",
   "description": "format lists of numbers, letters, or arbitrary items",
@@ -5,0 +5,0 @@ "main": "./dist/cjs/index.js",

types/list-string.d.ts

 declare type ListStringOptions = {
     article?: string;
     comma?: string;
-    delimiter?: string;
-    andor?: string;
     conjunction?: string;
-    separator?: string;
     minRangeDelta?: number;
@@ -9,0 +6,0 @@ };

types/utils.d.ts

@@ -7,4 +7,4 @@ export declare function isNumber(n: unknown): n is number;
     needsUnique?: boolean | undefined;
-} | undefined, minRangeDelta: number): unknown[];
-export declare function consolidateAlphaRanges(inputArray: unknown[], delimiter?: string): unknown[];
+} | undefined, minRangeDelta: number): string[];
+export declare function consolidateAlphaRanges(inputArray: unknown[], delimiter?: string): string[];
 export declare function expandAlphaRange(fromChar: string, toChar: string): string[];

New alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Fixed alerts

License Policy Violation

License

This package is not allowed per your license policy. Review the package's license to ensure compliance.

Found 1 instance in 1 package

Improved metrics

Total package byte prevSize

70206

increased by1.26%

Lines of code

529

increased by0.57%

No dependency changes