@nyaomaru/divider 2.0.11 → 2.0.13

package/dist/index.cjs

@@ -304,13 +304,26 @@ function extractOptions(args) {
     options
   };
 }
+function mapDividerOutput(output, transform) {
+  return isNestedStringArray(output) ? output.map(transform) : transform(output);
+}
+function filterDividerOutput(output, shouldKeep, preserveEmpty) {
+  if (!isNestedStringArray(output)) {
+    return output.filter(shouldKeep);
+  }
+  const filteredRows = output.map((row) => row.filter(shouldKeep));
+  return preserveEmpty ? filteredRows : filteredRows.filter((row) => row.length > 0);
+}
+function resolveExcludePredicate(exclude) {
+  if (exclude == null || isNoneMode(exclude) || typeof exclude !== "string") {
+    return null;
+  }
+  return Object.hasOwn(excludePredicateMap, exclude) ? excludePredicateMap[exclude] : null;
+}
 function trimSegments(segments, preserveEmpty) {
   const trimmed = segments.map((segment) => segment.trim());
   return preserveEmpty ? trimmed : trimmed.filter((segment) => !isEmptyString(segment));
 }
-function trimNestedSegments(rows, preserveEmpty) {
-  return rows.map((row) => trimSegments(row, preserveEmpty));
-}
 function applyDividerOptions(result, options) {
   const shouldPreserveEmpty = options.preserveEmpty === true;
   let output = result;
@@ -321,22 +334,15 @@ function applyDividerOptions(result, options) {
 }
 var applyTrimOption = (output, options, shouldPreserveEmpty) => {
   if (!options.trim) return output;
-  return isNestedStringArray(output) ? trimNestedSegments(output, shouldPreserveEmpty) : trimSegments(output, shouldPreserveEmpty);
+  return mapDividerOutput(
+    output,
+    (segments) => trimSegments(segments, shouldPreserveEmpty)
+  );
 };
-var applyFlattenOption = (output, options) => options.flatten ? output.flat() : output;
+var applyFlattenOption = (output, options) => options.flatten && isNestedStringArray(output) ? output.flat() : output;
 var applyExcludeOption = (output, options, shouldPreserveEmpty) => {
-  if (options.exclude == null || isNoneMode(options.exclude)) return output;
-  const exclude = options.exclude;
-  let shouldKeep = () => true;
-  if (exclude in excludePredicateMap) {
-    shouldKeep = excludePredicateMap[exclude];
-  }
-  const filterNested = (arr) => {
-    const filteredRows = arr.map((row) => row.filter(shouldKeep));
-    return shouldPreserveEmpty ? filteredRows : filteredRows.filter((row) => row.length > 0);
-  };
-  const filterFlat = (arr) => arr.filter(shouldKeep);
-  return isNestedStringArray(output) ? filterNested(output) : filterFlat(output);
+  const shouldKeep = resolveExcludePredicate(options.exclude);
+  return shouldKeep == null ? output : filterDividerOutput(output, shouldKeep, shouldPreserveEmpty);
 };
 
 // src/utils/separator.ts

package/dist/index.js

@@ -270,13 +270,26 @@ function extractOptions(args) {
     options
   };
 }
+function mapDividerOutput(output, transform) {
+  return isNestedStringArray(output) ? output.map(transform) : transform(output);
+}
+function filterDividerOutput(output, shouldKeep, preserveEmpty) {
+  if (!isNestedStringArray(output)) {
+    return output.filter(shouldKeep);
+  }
+  const filteredRows = output.map((row) => row.filter(shouldKeep));
+  return preserveEmpty ? filteredRows : filteredRows.filter((row) => row.length > 0);
+}
+function resolveExcludePredicate(exclude) {
+  if (exclude == null || isNoneMode(exclude) || typeof exclude !== "string") {
+    return null;
+  }
+  return Object.hasOwn(excludePredicateMap, exclude) ? excludePredicateMap[exclude] : null;
+}
 function trimSegments(segments, preserveEmpty) {
   const trimmed = segments.map((segment) => segment.trim());
   return preserveEmpty ? trimmed : trimmed.filter((segment) => !isEmptyString(segment));
 }
-function trimNestedSegments(rows, preserveEmpty) {
-  return rows.map((row) => trimSegments(row, preserveEmpty));
-}
 function applyDividerOptions(result, options) {
   const shouldPreserveEmpty = options.preserveEmpty === true;
   let output = result;
@@ -287,22 +300,15 @@ function applyDividerOptions(result, options) {
 }
 var applyTrimOption = (output, options, shouldPreserveEmpty) => {
   if (!options.trim) return output;
-  return isNestedStringArray(output) ? trimNestedSegments(output, shouldPreserveEmpty) : trimSegments(output, shouldPreserveEmpty);
+  return mapDividerOutput(
+    output,
+    (segments) => trimSegments(segments, shouldPreserveEmpty)
+  );
 };
-var applyFlattenOption = (output, options) => options.flatten ? output.flat() : output;
+var applyFlattenOption = (output, options) => options.flatten && isNestedStringArray(output) ? output.flat() : output;
 var applyExcludeOption = (output, options, shouldPreserveEmpty) => {
-  if (options.exclude == null || isNoneMode(options.exclude)) return output;
-  const exclude = options.exclude;
-  let shouldKeep = () => true;
-  if (exclude in excludePredicateMap) {
-    shouldKeep = excludePredicateMap[exclude];
-  }
-  const filterNested = (arr) => {
-    const filteredRows = arr.map((row) => row.filter(shouldKeep));
-    return shouldPreserveEmpty ? filteredRows : filteredRows.filter((row) => row.length > 0);
-  };
-  const filterFlat = (arr) => arr.filter(shouldKeep);
-  return isNestedStringArray(output) ? filterNested(output) : filterFlat(output);
+  const shouldKeep = resolveExcludePredicate(options.exclude);
+  return shouldKeep == null ? output : filterDividerOutput(output, shouldKeep, shouldPreserveEmpty);
 };
 
 // src/utils/separator.ts

package/package.json

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