@nyaomaru/divider 1.2.2 → 1.3.0

package/dist/cjs/core/divider-first.js

@@ -3,10 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.dividerFirst = dividerFirst;
 const divider_1 = require("@/core/divider");
 function dividerFirst(input, ...args) {
-    var _a, _b;
-    const result = (0, divider_1.divider)(input, ...args);
-    if (Array.isArray(result[0])) {
-        return (_a = result[0][0]) !== null && _a !== void 0 ? _a : '';
-    }
-    return (_b = result[0]) !== null && _b !== void 0 ? _b : '';
+    var _a;
+    const result = (0, divider_1.divider)(input, ...args, { flatten: true });
+    return (_a = result[0]) !== null && _a !== void 0 ? _a : '';
 }

package/dist/cjs/core/divider-last.js

@@ -4,9 +4,6 @@ exports.dividerLast = dividerLast;
 const divider_1 = require("@/core/divider");
 function dividerLast(input, ...args) {
     var _a;
-    const result = (0, divider_1.divider)(input, ...args);
-    if (result.length === 0)
-        return '';
-    const lastElement = result[result.length - 1];
-    return Array.isArray(lastElement) ? ((_a = lastElement.at(-1)) !== null && _a !== void 0 ? _a : '') : lastElement;
+    const result = (0, divider_1.divider)(input, ...args, { flatten: true });
+    return (_a = result.at(-1)) !== null && _a !== void 0 ? _a : '';
 }

package/dist/cjs/core/divider.js

@@ -2,18 +2,18 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.divider = divider;
 const parser_1 = require("@/core/parser");
-const validator_1 = require("@/core/validator");
+const is_1 = require("@/utils/is");
 function divider(input, ...args) {
     if (typeof input !== 'string' && !Array.isArray(input)) {
         console.warn("divider: 'input' must be a string or an array of strings. So returning an empty array.");
         return [];
     }
-    if ((0, validator_1.isEmptyArray)(args)) {
+    if ((0, is_1.isEmptyArray)(args)) {
         return (typeof input === 'string' ? [input] : input);
     }
     // Extract the options from the input
     const lastArg = args[args.length - 1];
-    const options = (0, validator_1.isOptions)(lastArg) ? (args.pop(), lastArg) : {};
+    const options = (0, is_1.isOptions)(lastArg) ? (args.pop(), lastArg) : {};
     // Filter out only numbers and strings
     const { numSeparators, strSeparators } = args.reduce((acc, arg) => {
         if (typeof arg === 'number') {

package/dist/cjs/core/parser.js

@@ -1,10 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.divideString = divideString;
-const slice_1 = require("@/utils/slice");
+const is_1 = require("@/utils/is");
 const regex_1 = require("@/utils/regex");
+const slice_1 = require("@/utils/slice");
 function divideString(input, numSeparators, strSeparators) {
-    if (numSeparators.length === 0 && strSeparators.length === 0) {
+    if ((0, is_1.isEmptyArray)(numSeparators) && (0, is_1.isEmptyArray)(strSeparators)) {
         return [input];
     }
     // Precompile regex for string separators

package/dist/cjs/{core/validator.js → utils/is.js}

@@ -6,5 +6,5 @@ function isOptions(arg) {
     return typeof arg === 'object' && arg !== null && 'flatten' in arg;
 }
 function isEmptyArray(input) {
-    return input.length === 0;
+    return Array.isArray(input) && input.length === 0;
 }

package/dist/cjs/utils/regex.js

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getRegex = getRegex;
+const is_1 = require("@/utils/is");
 const regexCache = new Map();
 function getRegex(separators) {
-    if (separators.length === 0)
+    if ((0, is_1.isEmptyArray)(separators))
         return null;
     const key = JSON.stringify(separators);
     if (!regexCache.has(key)) {

package/dist/cjs/utils/slice.js

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.sliceByIndexes = sliceByIndexes;
+const is_1 = require("@/utils/is");
 function sliceByIndexes(input, indexes) {
-    if (indexes.length === 0)
+    if ((0, is_1.isEmptyArray)(indexes))
         return [input];
     const parts = [];
     let start = 0;

package/dist/esm/core/divider-first.js

@@ -1,9 +1,6 @@
 import { divider } from '@/core/divider';
 export function dividerFirst(input, ...args) {
-    var _a, _b;
-    const result = divider(input, ...args);
-    if (Array.isArray(result[0])) {
-        return (_a = result[0][0]) !== null && _a !== void 0 ? _a : '';
-    }
-    return (_b = result[0]) !== null && _b !== void 0 ? _b : '';
+    var _a;
+    const result = divider(input, ...args, { flatten: true });
+    return (_a = result[0]) !== null && _a !== void 0 ? _a : '';
 }

package/dist/esm/core/divider-last.js

@@ -1,9 +1,6 @@
 import { divider } from '@/core/divider';
 export function dividerLast(input, ...args) {
     var _a;
-    const result = divider(input, ...args);
-    if (result.length === 0)
-        return '';
-    const lastElement = result[result.length - 1];
-    return Array.isArray(lastElement) ? ((_a = lastElement.at(-1)) !== null && _a !== void 0 ? _a : '') : lastElement;
+    const result = divider(input, ...args, { flatten: true });
+    return (_a = result.at(-1)) !== null && _a !== void 0 ? _a : '';
 }

package/dist/esm/core/divider.js

@@ -1,5 +1,5 @@
 import { divideString } from '@/core/parser';
-import { isOptions, isEmptyArray } from '@/core/validator';
+import { isOptions, isEmptyArray } from '@/utils/is';
 export function divider(input, ...args) {
     if (typeof input !== 'string' && !Array.isArray(input)) {
         console.warn("divider: 'input' must be a string or an array of strings. So returning an empty array.");

package/dist/esm/core/parser.js

@@ -1,7 +1,8 @@
-import { sliceByIndexes } from '@/utils/slice';
+import { isEmptyArray } from '@/utils/is';
 import { getRegex } from '@/utils/regex';
+import { sliceByIndexes } from '@/utils/slice';
 export function divideString(input, numSeparators, strSeparators) {
-    if (numSeparators.length === 0 && strSeparators.length === 0) {
+    if (isEmptyArray(numSeparators) && isEmptyArray(strSeparators)) {
         return [input];
     }
     // Precompile regex for string separators

package/dist/esm/{core/validator.js → utils/is.js}

@@ -2,5 +2,5 @@ export function isOptions(arg) {
     return typeof arg === 'object' && arg !== null && 'flatten' in arg;
 }
 export function isEmptyArray(input) {
-    return input.length === 0;
+    return Array.isArray(input) && input.length === 0;
 }

package/dist/esm/utils/regex.js

@@ -1,6 +1,7 @@
+import { isEmptyArray } from '@/utils/is';
 const regexCache = new Map();
 export function getRegex(separators) {
-    if (separators.length === 0)
+    if (isEmptyArray(separators))
         return null;
     const key = JSON.stringify(separators);
     if (!regexCache.has(key)) {

package/dist/esm/utils/slice.js

@@ -1,5 +1,6 @@
+import { isEmptyArray } from '@/utils/is';
 export function sliceByIndexes(input, indexes) {
-    if (indexes.length === 0)
+    if (isEmptyArray(indexes))
         return [input];
     const parts = [];
     let start = 0;

package/dist/types/core/divider-first.d.ts

@@ -1,2 +1,2 @@
-import type { DividerArgs } from '@/core/types';
-export declare function dividerFirst<T extends string | string[], F extends boolean = false>(input: T, ...args: DividerArgs<F>): string;
+import type { DividerSeparators } from '@/core/types';
+export declare function dividerFirst<T extends string | string[]>(input: T, ...args: DividerSeparators): string;

package/dist/types/core/divider-last.d.ts

@@ -1,2 +1,2 @@
-import type { DividerArgs } from '@/core/types';
-export declare function dividerLast<T extends string | string[], F extends boolean = false>(input: T, ...args: DividerArgs<F>): string;
+import type { DividerSeparators } from '@/core/types';
+export declare function dividerLast<T extends string | string[]>(input: T, ...args: DividerSeparators): string;

package/dist/types/core/types.d.ts

@@ -2,4 +2,5 @@ export type DividerResult<T extends string | string[], F extends boolean = false
 export type DividerOptions<F extends boolean> = {
     flatten?: F;
 };
-export type DividerArgs<F extends boolean> = (number | string)[] | [...(number | string)[], DividerOptions<F>];
+export type DividerSeparators = (number | string)[];
+export type DividerArgs<F extends boolean> = DividerSeparators | [...DividerSeparators, DividerOptions<F>];

package/package.json

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