@nyaomaru/divider 1.0.3 → 1.0.5

package/dist/cjs/index.js

@@ -4,13 +4,14 @@ 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);
     }
     const result = input.map((item) => divideString(item, separators));
-    return options.flatten ? result.flat() : result;
+    return (options.flatten ? result.flat() : result);
 }
 function divideString(input, separators) {
     if (separators.length === 0) {
@@ -22,14 +23,18 @@ 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;
 }
@@ -48,3 +53,9 @@ function sliceByIndexes(input, indexes) {
     parts.push(input.slice(start));
     return parts.filter((part) => part !== '');
 }
+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,13 +1,14 @@
 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);
     }
     const result = input.map((item) => divideString(item, separators));
-    return options.flatten ? result.flat() : result;
+    return (options.flatten ? result.flat() : result);
 }
 function divideString(input, separators) {
     if (separators.length === 0) {
@@ -19,14 +20,18 @@ 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;
 }
@@ -45,3 +50,9 @@ function sliceByIndexes(input, indexes) {
     parts.push(input.slice(start));
     return parts.filter((part) => part !== '');
 }
+function isOptions(arg) {
+    return typeof arg === 'object' && arg !== null && 'flatten' in arg;
+}
+function escapeRegExp(str) {
+    return str.replace(/[.*+?^${}()|[\]\\]/g, '\\$&');
+}

package/dist/index.d.ts

@@ -1,3 +1,5 @@
-export declare function divider(input: string | string[], ...args: (number | string | {
+type DividerResult<T extends string | string[], F extends boolean | undefined> = T extends string ? string[] : F extends true ? string[] : string[][];
+export declare function divider<T extends string | string[]>(input: string | string[], ...args: (number | string | {
     flatten?: boolean;
-})[]): string[] | string[][];
+})[]): DividerResult<T, boolean>;
+export {};

package/package.json

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