@nyaomaru/divider 2.0.15 → 2.0.17

package/dist/index.cjs

@@ -355,6 +355,13 @@ function applyDividerOptions(result, options) {
   return output;
 }
 
+// src/utils/transform-divider-input.ts
+function transformDividerInput(input, transform, options) {
+  const result = isString(input) ? transform(input) : input.map(transform);
+  const resolvedOptions = options ?? {};
+  return applyDividerOptions(result, resolvedOptions);
+}
+
 // src/utils/separator.ts
 function classifySeparators(args) {
   return args.reduce(
@@ -367,11 +374,15 @@ function classifySeparators(args) {
   );
 }
 
-// src/utils/transform-divider-input.ts
-function transformDividerInput(input, transform, options) {
-  const result = isString(input) ? transform(input) : input.map(transform);
-  const resolvedOptions = options ?? {};
-  return applyDividerOptions(result, resolvedOptions);
+// src/core/divider-plan.ts
+function createDividerPlan(args) {
+  const { cleanedArgs, options } = extractOptions(args);
+  const { numSeparators, strSeparators } = classifySeparators(cleanedArgs);
+  return {
+    numSeparators,
+    strSeparators,
+    options
+  };
 }
 
 // src/core/divider.ts
@@ -385,8 +396,7 @@ function divider(input, ...args) {
   if (isEmptyArray(args)) {
     return ensureStringArray(input);
   }
-  const { cleanedArgs, options } = extractOptions(args);
-  const { numSeparators, strSeparators } = classifySeparators(cleanedArgs);
+  const { numSeparators, strSeparators, options } = createDividerPlan(args);
   const applyDivision = (str) => divideString(str, numSeparators, strSeparators, {
     preserveEmpty: options.preserveEmpty
   });
@@ -641,11 +651,11 @@ var buildPathSegments = (input, collapse) => collapse ? divider(input, PATH_SEPA
 var trimSegments2 = (segments, trim) => trim ? segments.map((segment) => segment.trim()) : segments;
 var applyCollapseRules = (segments, collapse) => collapse ? segments.filter((segment) => !isEmptyString(segment)) : segments;
 
-// src/presets/query-divider.ts
-function tryExtractQuery(input) {
+// src/utils/query.ts
+function extractQuery(input) {
   try {
     const url = new URL(input);
-    return url.search.startsWith(QUERY_SEPARATORS.QUESTION_MARK) ? url.search.slice(1) : url.search;
+    return stripLeadingQuestionMark(url.search);
   } catch {
     return extractQueryFromQuestionMark(input);
   }
@@ -664,40 +674,47 @@ function extractQueryFromQuestionMark(input) {
   }
   const prefix = withoutFragment.slice(0, questionMarkIndex);
   const hasQuerySeparatorBefore = prefix.includes(QUERY_SEPARATORS.AMPERSAND) || prefix.includes(QUERY_SEPARATORS.EQUALS);
-  if (hasQuerySeparatorBefore) {
-    return withoutFragment;
-  }
-  return withoutFragment.slice(questionMarkIndex + 1);
+  return hasQuerySeparatorBefore ? withoutFragment : withoutFragment.slice(questionMarkIndex + 1);
 }
 function stripLeadingQuestionMark(query) {
   return query.startsWith(QUERY_SEPARATORS.QUESTION_MARK) ? query.slice(1) : query;
 }
-function splitOnFirstEquals(part) {
-  const kv = dividePreserve(part, QUERY_SEPARATORS.EQUALS);
-  if (kv.length === 1) return [kv[0] ?? "", ""];
-  return [kv[0] ?? "", kv.slice(1).join(QUERY_SEPARATORS.EQUALS)];
+function splitQueryPair(part) {
+  const keyValue = dividePreserve(part, QUERY_SEPARATORS.EQUALS);
+  if (keyValue.length === 1) return [keyValue[0] ?? "", ""];
+  return [
+    keyValue[0] ?? "",
+    keyValue.slice(1).join(QUERY_SEPARATORS.EQUALS)
+  ];
 }
-function decodeField(text, mode, trim) {
-  let t = text;
+function decodeQueryField(text, mode, trim) {
+  let decoded = text;
   if (mode === QUERY_DECODE_MODES.AUTO) {
-    t = t.replace(/\+/g, " ");
+    decoded = decoded.replace(/\+/g, " ");
     try {
-      t = decodeURIComponent(t);
+      decoded = decodeURIComponent(decoded);
     } catch {
     }
   }
-  if (trim) t = t.trim();
-  return t;
+  return trim ? decoded.trim() : decoded;
 }
-function queryDivider(input, { mode = QUERY_DECODE_MODES.AUTO, trim = false } = {}) {
+function parseQueryPairs(input, { mode = QUERY_DECODE_MODES.AUTO, trim = false } = {}) {
   if (input.length === 0) return [];
-  const query = stripLeadingQuestionMark(tryExtractQuery(input));
+  const query = stripLeadingQuestionMark(extractQuery(input));
   if (query.length === 0) return [];
   return dividePreserve(query, QUERY_SEPARATORS.AMPERSAND).map((part) => {
-    const [key, value] = splitOnFirstEquals(part);
-    return [decodeField(key, mode, trim), decodeField(value, mode, trim)];
+    const [key, value] = splitQueryPair(part);
+    return [
+      decodeQueryField(key, mode, trim),
+      decodeQueryField(value, mode, trim)
+    ];
   });
 }
+
+// src/presets/query-divider.ts
+function queryDivider(input, options = {}) {
+  return parseQueryPairs(input, options);
+}
 // Annotate the CommonJS export names for ESM import in node:
 0 && (module.exports = {
   csvDivider,

package/dist/index.d.cts

@@ -278,6 +278,6 @@ declare function pathDivider(input: string, options?: PathDividerOptions): Divid
  * @param options Parsing options: { mode?: 'auto' | 'raw'; trim?: boolean }.
  * @returns Array of [key, value] string tuples in input order.
  */
-declare function queryDivider(input: string, { mode, trim }?: QueryDividerOptions): DividerArrayResult;
+declare function queryDivider(input: string, options?: QueryDividerOptions): DividerArrayResult;
 
 export { type CsvDividerOptions, type DividerArg, type DividerArgs, type DividerArrayResult, type DividerEmptyOptions, type DividerExcludeMode, type DividerInferredOptions, type DividerInput, type DividerLoopEmptyOptions, type DividerLoopOptions, type DividerLoopOptionsLike, type DividerOptions, type DividerResult, type DividerReturn, type DividerSeparator, type DividerSeparators, type DividerStringResult, type EmailDividerOptions, type ExtractedDividerOptions, type NumericSeparator, type PathDividerOptions, type QueryDecodeMode, type QueryDividerOptions, type StringArrayInput, type StringInput, type StringSeparator, csvDivider, divider, dividerFirst, dividerLast, dividerLoop, dividerNumberString, emailDivider, pathDivider, queryDivider };

package/dist/index.d.ts

@@ -278,6 +278,6 @@ declare function pathDivider(input: string, options?: PathDividerOptions): Divid
  * @param options Parsing options: { mode?: 'auto' | 'raw'; trim?: boolean }.
  * @returns Array of [key, value] string tuples in input order.
  */
-declare function queryDivider(input: string, { mode, trim }?: QueryDividerOptions): DividerArrayResult;
+declare function queryDivider(input: string, options?: QueryDividerOptions): DividerArrayResult;
 
 export { type CsvDividerOptions, type DividerArg, type DividerArgs, type DividerArrayResult, type DividerEmptyOptions, type DividerExcludeMode, type DividerInferredOptions, type DividerInput, type DividerLoopEmptyOptions, type DividerLoopOptions, type DividerLoopOptionsLike, type DividerOptions, type DividerResult, type DividerReturn, type DividerSeparator, type DividerSeparators, type DividerStringResult, type EmailDividerOptions, type ExtractedDividerOptions, type NumericSeparator, type PathDividerOptions, type QueryDecodeMode, type QueryDividerOptions, type StringArrayInput, type StringInput, type StringSeparator, csvDivider, divider, dividerFirst, dividerLast, dividerLoop, dividerNumberString, emailDivider, pathDivider, queryDivider };

package/dist/index.js

@@ -321,6 +321,13 @@ function applyDividerOptions(result, options) {
   return output;
 }
 
+// src/utils/transform-divider-input.ts
+function transformDividerInput(input, transform, options) {
+  const result = isString(input) ? transform(input) : input.map(transform);
+  const resolvedOptions = options ?? {};
+  return applyDividerOptions(result, resolvedOptions);
+}
+
 // src/utils/separator.ts
 function classifySeparators(args) {
   return args.reduce(
@@ -333,11 +340,15 @@ function classifySeparators(args) {
   );
 }
 
-// src/utils/transform-divider-input.ts
-function transformDividerInput(input, transform, options) {
-  const result = isString(input) ? transform(input) : input.map(transform);
-  const resolvedOptions = options ?? {};
-  return applyDividerOptions(result, resolvedOptions);
+// src/core/divider-plan.ts
+function createDividerPlan(args) {
+  const { cleanedArgs, options } = extractOptions(args);
+  const { numSeparators, strSeparators } = classifySeparators(cleanedArgs);
+  return {
+    numSeparators,
+    strSeparators,
+    options
+  };
 }
 
 // src/core/divider.ts
@@ -351,8 +362,7 @@ function divider(input, ...args) {
   if (isEmptyArray(args)) {
     return ensureStringArray(input);
   }
-  const { cleanedArgs, options } = extractOptions(args);
-  const { numSeparators, strSeparators } = classifySeparators(cleanedArgs);
+  const { numSeparators, strSeparators, options } = createDividerPlan(args);
   const applyDivision = (str) => divideString(str, numSeparators, strSeparators, {
     preserveEmpty: options.preserveEmpty
   });
@@ -607,11 +617,11 @@ var buildPathSegments = (input, collapse) => collapse ? divider(input, PATH_SEPA
 var trimSegments2 = (segments, trim) => trim ? segments.map((segment) => segment.trim()) : segments;
 var applyCollapseRules = (segments, collapse) => collapse ? segments.filter((segment) => !isEmptyString(segment)) : segments;
 
-// src/presets/query-divider.ts
-function tryExtractQuery(input) {
+// src/utils/query.ts
+function extractQuery(input) {
   try {
     const url = new URL(input);
-    return url.search.startsWith(QUERY_SEPARATORS.QUESTION_MARK) ? url.search.slice(1) : url.search;
+    return stripLeadingQuestionMark(url.search);
   } catch {
     return extractQueryFromQuestionMark(input);
   }
@@ -630,40 +640,47 @@ function extractQueryFromQuestionMark(input) {
   }
   const prefix = withoutFragment.slice(0, questionMarkIndex);
   const hasQuerySeparatorBefore = prefix.includes(QUERY_SEPARATORS.AMPERSAND) || prefix.includes(QUERY_SEPARATORS.EQUALS);
-  if (hasQuerySeparatorBefore) {
-    return withoutFragment;
-  }
-  return withoutFragment.slice(questionMarkIndex + 1);
+  return hasQuerySeparatorBefore ? withoutFragment : withoutFragment.slice(questionMarkIndex + 1);
 }
 function stripLeadingQuestionMark(query) {
   return query.startsWith(QUERY_SEPARATORS.QUESTION_MARK) ? query.slice(1) : query;
 }
-function splitOnFirstEquals(part) {
-  const kv = dividePreserve(part, QUERY_SEPARATORS.EQUALS);
-  if (kv.length === 1) return [kv[0] ?? "", ""];
-  return [kv[0] ?? "", kv.slice(1).join(QUERY_SEPARATORS.EQUALS)];
+function splitQueryPair(part) {
+  const keyValue = dividePreserve(part, QUERY_SEPARATORS.EQUALS);
+  if (keyValue.length === 1) return [keyValue[0] ?? "", ""];
+  return [
+    keyValue[0] ?? "",
+    keyValue.slice(1).join(QUERY_SEPARATORS.EQUALS)
+  ];
 }
-function decodeField(text, mode, trim) {
-  let t = text;
+function decodeQueryField(text, mode, trim) {
+  let decoded = text;
   if (mode === QUERY_DECODE_MODES.AUTO) {
-    t = t.replace(/\+/g, " ");
+    decoded = decoded.replace(/\+/g, " ");
     try {
-      t = decodeURIComponent(t);
+      decoded = decodeURIComponent(decoded);
     } catch {
     }
   }
-  if (trim) t = t.trim();
-  return t;
+  return trim ? decoded.trim() : decoded;
 }
-function queryDivider(input, { mode = QUERY_DECODE_MODES.AUTO, trim = false } = {}) {
+function parseQueryPairs(input, { mode = QUERY_DECODE_MODES.AUTO, trim = false } = {}) {
   if (input.length === 0) return [];
-  const query = stripLeadingQuestionMark(tryExtractQuery(input));
+  const query = stripLeadingQuestionMark(extractQuery(input));
   if (query.length === 0) return [];
   return dividePreserve(query, QUERY_SEPARATORS.AMPERSAND).map((part) => {
-    const [key, value] = splitOnFirstEquals(part);
-    return [decodeField(key, mode, trim), decodeField(value, mode, trim)];
+    const [key, value] = splitQueryPair(part);
+    return [
+      decodeQueryField(key, mode, trim),
+      decodeQueryField(value, mode, trim)
+    ];
   });
 }
+
+// src/presets/query-divider.ts
+function queryDivider(input, options = {}) {
+  return parseQueryPairs(input, options);
+}
 export {
   csvDivider,
   divider,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@nyaomaru/divider",
   "type": "module",
-  "version": "2.0.15",
+  "version": "2.0.17",
   "description": "To divide string or string[] with a given separator",
   "main": "./dist/index.cjs",
   "module": "./dist/index.js",
@@ -35,9 +35,9 @@
   "author": "nyaomaru",
   "license": "MIT",
   "devDependencies": {
+    "@eslint/js": "^9.26.0",
     "@swc/core": "^1.15.21",
     "@swc/jest": "^0.2.39",
-    "@eslint/js": "^9.26.0",
     "@types/jest": "^30.0.0",
     "@types/node": "^22.15.12",
     "@typescript-eslint/eslint-plugin": "^8.32.1",
@@ -64,6 +64,7 @@
   },
   "scripts": {
     "test": "jest",
+    "test:types": "tsc -p tests/tsconfig.json",
     "test:performance": "jest --config jest.performance.config.cjs",
     "test:unit": "jest --testPathIgnorePatterns=performance",
     "lint": "eslint .",