@nyaomaru/divider 1.0.4 → 1.0.6

package/dist/cjs/index.js

@@ -4,8 +4,9 @@ exports.divider = divider;
 function divider(input, ...args) {
     // extract the options from the input
     const lastArg = args[args.length - 1];
-    const options = typeof lastArg === 'object' ? args.pop() : {};
-    const separators = args;
+    const options = isOptions(lastArg) ? lastArg : {};
+    // filter out only numbers and strings
+    const separators = args.filter((arg) => typeof arg === 'number' || typeof arg === 'string');
     if (typeof input === 'string') {
         return divideString(input, separators);
     }
@@ -22,29 +23,40 @@ function divideString(input, separators) {
             : acc.strSeparators.push(separator);
         return acc;
     }, { numSeparators: [], strSeparators: [] });
+    // If there are no number delimiters, split by string delimiters only
+    if (numSeparators.length === 0 && strSeparators.length > 0) {
+        return input
+            .split(new RegExp(`[${strSeparators.map(escapeRegExp).join('')}]`, 'g'))
+            .filter(Boolean);
+    }
     // Divide by number delimiters
     let parts = sliceByIndexes(input, numSeparators);
     // Divide by string delimiters
     if (strSeparators.length) {
-        const regex = new RegExp(`[${strSeparators.join('')}]`, 'g');
-        parts = parts
-            .flatMap((part) => part.split(regex))
-            .filter((part) => part !== '');
+        const regex = new RegExp(`[${strSeparators.map(escapeRegExp).join('')}]`, 'g');
+        parts = parts.flatMap((part) => part.split(regex)).filter(Boolean);
     }
     return parts;
 }
 function sliceByIndexes(input, indexes) {
     if (!indexes.length)
         return [input];
-    indexes.sort((a, b) => a - b);
-    let parts = [];
+    const sortedIndexes = indexes.slice().sort((a, b) => a - b);
+    const parts = new Array(sortedIndexes.length + 1).fill(null);
     let start = 0;
-    for (const index of indexes) {
+    for (let i = 0; i < sortedIndexes.length; i++) {
+        const index = sortedIndexes[i];
         if (index > start && index < input.length) {
-            parts.push(input.slice(start, index));
+            parts[i] = input.slice(start, index);
             start = index;
         }
     }
-    parts.push(input.slice(start));
-    return parts.filter((part) => part !== '');
+    parts[sortedIndexes.length] = input.slice(start);
+    return parts.filter(Boolean);
+}
+function isOptions(arg) {
+    return typeof arg === 'object' && arg !== null && 'flatten' in arg;
+}
+function escapeRegExp(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }

package/dist/esm/index.js

@@ -1,8 +1,9 @@
 export function divider(input, ...args) {
     // extract the options from the input
     const lastArg = args[args.length - 1];
-    const options = typeof lastArg === 'object' ? args.pop() : {};
-    const separators = args;
+    const options = isOptions(lastArg) ? lastArg : {};
+    // filter out only numbers and strings
+    const separators = args.filter((arg) => typeof arg === 'number' || typeof arg === 'string');
     if (typeof input === 'string') {
         return divideString(input, separators);
     }
@@ -19,29 +20,40 @@ function divideString(input, separators) {
             : acc.strSeparators.push(separator);
         return acc;
     }, { numSeparators: [], strSeparators: [] });
+    // If there are no number delimiters, split by string delimiters only
+    if (numSeparators.length === 0 && strSeparators.length > 0) {
+        return input
+            .split(new RegExp(`[${strSeparators.map(escapeRegExp).join('')}]`, 'g'))
+            .filter(Boolean);
+    }
     // Divide by number delimiters
     let parts = sliceByIndexes(input, numSeparators);
     // Divide by string delimiters
     if (strSeparators.length) {
-        const regex = new RegExp(`[${strSeparators.join('')}]`, 'g');
-        parts = parts
-            .flatMap((part) => part.split(regex))
-            .filter((part) => part !== '');
+        const regex = new RegExp(`[${strSeparators.map(escapeRegExp).join('')}]`, 'g');
+        parts = parts.flatMap((part) => part.split(regex)).filter(Boolean);
     }
     return parts;
 }
 function sliceByIndexes(input, indexes) {
     if (!indexes.length)
         return [input];
-    indexes.sort((a, b) => a - b);
-    let parts = [];
+    const sortedIndexes = indexes.slice().sort((a, b) => a - b);
+    const parts = new Array(sortedIndexes.length + 1).fill(null);
     let start = 0;
-    for (const index of indexes) {
+    for (let i = 0; i < sortedIndexes.length; i++) {
+        const index = sortedIndexes[i];
         if (index > start && index < input.length) {
-            parts.push(input.slice(start, index));
+            parts[i] = input.slice(start, index);
             start = index;
         }
     }
-    parts.push(input.slice(start));
-    return parts.filter((part) => part !== '');
+    parts[sortedIndexes.length] = input.slice(start);
+    return parts.filter(Boolean);
+}
+function isOptions(arg) {
+    return typeof arg === 'object' && arg !== null && 'flatten' in arg;
+}
+function escapeRegExp(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
 }

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nyaomaru/divider",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.6",
   "description": "To divide string or string[] with a given separator",
   "main": "dist/cjs/index.js",
   "module": "dist/esm/index.js",