@nyaomaru/divider 2.0.7 → 2.0.8

package/dist/index.cjs

@@ -443,11 +443,7 @@ function dividerNumberString(input, options) {
   return transformDividerInput(input, divideNumberString, options);
 }
 
-// src/utils/quoted.ts
-function dividePreserve(input, separator) {
-  if (isEmptyString(input)) return [""];
-  return divider(input, separator, { preserveEmpty: true });
-}
+// src/utils/count-unescaped.ts
 var countUnescapedSingleChar = (text, quote) => {
   let count = 0;
   for (let index = 0; index < text.length; index++) {
@@ -484,22 +480,14 @@ function countUnescaped(text, quote) {
   if (quote.length === 1) return countUnescapedSingleChar(text, quote);
   return countUnescapedMultiChar(text, quote);
 }
-function stripOuterQuotes(text, quoteChar, { lenient = true } = {}) {
-  const escapedPair = quoteChar + quoteChar;
-  const isWhitespace = (char) => char === WHITE_SPACE || char === TAB;
-  const restoreEscapedQuotes = (fieldText) => fieldText.split(escapedPair).join(quoteChar);
-  const stripped = stripOuterQuotesRaw(text, quoteChar, lenient, isWhitespace);
-  return restoreEscapedQuotes(stripped);
-}
-function quotedDivide(line, {
-  delimiter = ",",
-  quote = '"',
-  trim = false,
-  lenient = true
-} = {}) {
-  if (isEmptyString(line)) return [""];
-  return buildQuotedFields(line, delimiter, quote, trim, lenient);
+
+// src/utils/divide-preserve.ts
+function dividePreserve(input, separator) {
+  if (isEmptyString(input)) return [""];
+  return divider(input, separator, { preserveEmpty: true });
 }
+
+// src/utils/strip-outer-quotes.ts
 var findNonSpaceBounds = (text, isWhitespace) => {
   let left = 0;
   let right = text.length - 1;
@@ -507,44 +495,42 @@ var findNonSpaceBounds = (text, isWhitespace) => {
   while (right >= left && isWhitespace(text[right])) right--;
   return { left, right };
 };
-var stripMatchedOuterQuotes = (text, left, right) => text.slice(0, left) + text.slice(left + 1, right) + text.slice(right + 1);
-var removeCharAt = (text, index) => text.slice(0, index) + text.slice(index + 1);
-var stripTrailingQuote = (text, quoteChar, isWhitespace) => {
+var stripMatchedOuterQuotes = (text, left, rightQuoteStart, quote) => text.slice(0, left) + text.slice(left + quote.length, rightQuoteStart) + text.slice(rightQuoteStart + quote.length);
+var removeQuoteAt = (text, start, quote) => text.slice(0, start) + text.slice(start + quote.length);
+var stripTrailingQuote = (text, quote, isWhitespace) => {
+  const quoteLength = quote.length;
   let lastNonSpaceIndex = text.length - 1;
   while (lastNonSpaceIndex >= 0 && isWhitespace(text[lastNonSpaceIndex])) {
     lastNonSpaceIndex--;
   }
-  if (lastNonSpaceIndex < 0 || text[lastNonSpaceIndex] !== quoteChar) {
+  const trailingQuoteStart = lastNonSpaceIndex - quoteLength + 1;
+  if (trailingQuoteStart < 0 || !text.startsWith(quote, trailingQuoteStart)) {
     return text;
   }
-  return removeCharAt(text, lastNonSpaceIndex);
+  return removeQuoteAt(text, trailingQuoteStart, quote);
 };
-var stripOuterQuotesRaw = (text, quoteChar, lenient, isWhitespace) => {
+var stripOuterQuotesRaw = (text, quote, lenient, isWhitespace) => {
+  if (quote.length === 0) return text;
   const { left, right } = findNonSpaceBounds(text, isWhitespace);
   if (left > right) return text;
-  if (text[left] !== quoteChar) return text;
-  if (text[right] === quoteChar && right > left) {
-    return stripMatchedOuterQuotes(text, left, right);
+  if (!text.startsWith(quote, left)) return text;
+  const rightQuoteStart = right - quote.length + 1;
+  if (rightQuoteStart >= left + quote.length && text.startsWith(quote, rightQuoteStart)) {
+    return stripMatchedOuterQuotes(text, left, rightQuoteStart, quote);
   }
   if (!lenient) return text;
-  const withoutLeading = removeCharAt(text, left);
-  return stripTrailingQuote(withoutLeading, quoteChar, isWhitespace);
-};
-var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
-  const pieces = dividePreserve(line, delimiter);
-  const state = {
-    fields: [],
-    current: "",
-    insideQuotes: false
-  };
-  for (const piece of pieces) {
-    appendPiece(state, piece, delimiter, quote, trim, lenient);
-  }
-  if (!isEmptyString(state.current)) {
-    flushField(state, quote, trim, lenient);
-  }
-  return state.fields;
+  const withoutLeading = removeQuoteAt(text, left, quote);
+  return stripTrailingQuote(withoutLeading, quote, isWhitespace);
 };
+function stripOuterQuotes(text, quoteChar, { lenient = true } = {}) {
+  const isWhitespace = (char) => char === WHITE_SPACE || char === TAB;
+  const stripped = stripOuterQuotesRaw(text, quoteChar, lenient, isWhitespace);
+  if (quoteChar.length === 0) return stripped;
+  const escapedPair = quoteChar + quoteChar;
+  return stripped.split(escapedPair).join(quoteChar);
+}
+
+// src/utils/quoted-parser.ts
 var advanceQuoteState = (insideQuotes, segment, quote) => {
   let nextInsideQuotes = insideQuotes;
   for (const char of segment) {
@@ -552,6 +538,13 @@ var advanceQuoteState = (insideQuotes, segment, quote) => {
   }
   return nextInsideQuotes;
 };
+var flushField = (state, quote, trim, lenient) => {
+  let fieldValue = stripOuterQuotes(state.current, quote, { lenient });
+  if (trim) fieldValue = fieldValue.trim();
+  state.fields.push(fieldValue);
+  state.current = "";
+  state.insideQuotes = false;
+};
 var appendPiece = (state, piece, delimiter, quote, trim, lenient) => {
   const segment = isEmptyString(state.current) ? piece : delimiter + piece;
   state.current += segment;
@@ -560,13 +553,30 @@ var appendPiece = (state, piece, delimiter, quote, trim, lenient) => {
     flushField(state, quote, trim, lenient);
   }
 };
-var flushField = (state, quote, trim, lenient) => {
-  let fieldValue = stripOuterQuotes(state.current, quote, { lenient });
-  if (trim) fieldValue = fieldValue.trim();
-  state.fields.push(fieldValue);
-  state.current = "";
-  state.insideQuotes = false;
+var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
+  const pieces = dividePreserve(line, delimiter);
+  const state = {
+    fields: [],
+    current: "",
+    insideQuotes: false
+  };
+  for (const piece of pieces) {
+    appendPiece(state, piece, delimiter, quote, trim, lenient);
+  }
+  if (!isEmptyString(state.current)) {
+    flushField(state, quote, trim, lenient);
+  }
+  return state.fields;
 };
+function quotedDivide(line, {
+  delimiter = ",",
+  quote = '"',
+  trim = false,
+  lenient = true
+} = {}) {
+  if (isEmptyString(line)) return [""];
+  return buildQuotedFields(line, delimiter, quote, trim, lenient);
+}
 
 // src/presets/csv-divider.ts
 function csvDivider(line, options = {}) {

package/dist/index.d.cts

@@ -223,9 +223,9 @@ type EmailDividerOptions = Pick<DividerOptions, 'trim'> & {
     readonly splitTLD?: boolean;
 };
 type CsvDividerOptions = Pick<DividerOptions, 'trim'> & {
-    /** Character used for quoting values. */
+    /** Quote string used for quoting values. */
     readonly quoteChar?: string;
-    /** Character used to separate CSV fields. */
+    /** Delimiter string used to separate CSV fields. */
     readonly delimiter?: string;
 };
 type PathDividerOptions = Pick<DividerOptions, 'trim'> & {
@@ -243,8 +243,8 @@ type QueryDividerOptions = Pick<DividerOptions, 'trim'> & {
  *
  * @param line - The CSV line string to be divided into fields
  * @param options - Configuration options for CSV parsing
- * @param options.delimiter - The character used to separate fields (default: ',')
- * @param options.quoteChar - The character used to quote fields containing delimiters or newlines (default: '"')
+ * @param options.delimiter - The delimiter string used to separate fields (default: ',')
+ * @param options.quoteChar - The quote string used to wrap fields containing delimiters or newlines (default: '"')
  * @param options.trim - Whether to trim whitespace from field values (default: false)
  * @returns A DividerStringResult containing the parsed CSV fields
  */

package/dist/index.d.ts

@@ -223,9 +223,9 @@ type EmailDividerOptions = Pick<DividerOptions, 'trim'> & {
     readonly splitTLD?: boolean;
 };
 type CsvDividerOptions = Pick<DividerOptions, 'trim'> & {
-    /** Character used for quoting values. */
+    /** Quote string used for quoting values. */
     readonly quoteChar?: string;
-    /** Character used to separate CSV fields. */
+    /** Delimiter string used to separate CSV fields. */
     readonly delimiter?: string;
 };
 type PathDividerOptions = Pick<DividerOptions, 'trim'> & {
@@ -243,8 +243,8 @@ type QueryDividerOptions = Pick<DividerOptions, 'trim'> & {
  *
  * @param line - The CSV line string to be divided into fields
  * @param options - Configuration options for CSV parsing
- * @param options.delimiter - The character used to separate fields (default: ',')
- * @param options.quoteChar - The character used to quote fields containing delimiters or newlines (default: '"')
+ * @param options.delimiter - The delimiter string used to separate fields (default: ',')
+ * @param options.quoteChar - The quote string used to wrap fields containing delimiters or newlines (default: '"')
  * @param options.trim - Whether to trim whitespace from field values (default: false)
  * @returns A DividerStringResult containing the parsed CSV fields
  */

package/dist/index.js

@@ -409,11 +409,7 @@ function dividerNumberString(input, options) {
   return transformDividerInput(input, divideNumberString, options);
 }
 
-// src/utils/quoted.ts
-function dividePreserve(input, separator) {
-  if (isEmptyString(input)) return [""];
-  return divider(input, separator, { preserveEmpty: true });
-}
+// src/utils/count-unescaped.ts
 var countUnescapedSingleChar = (text, quote) => {
   let count = 0;
   for (let index = 0; index < text.length; index++) {
@@ -450,22 +446,14 @@ function countUnescaped(text, quote) {
   if (quote.length === 1) return countUnescapedSingleChar(text, quote);
   return countUnescapedMultiChar(text, quote);
 }
-function stripOuterQuotes(text, quoteChar, { lenient = true } = {}) {
-  const escapedPair = quoteChar + quoteChar;
-  const isWhitespace = (char) => char === WHITE_SPACE || char === TAB;
-  const restoreEscapedQuotes = (fieldText) => fieldText.split(escapedPair).join(quoteChar);
-  const stripped = stripOuterQuotesRaw(text, quoteChar, lenient, isWhitespace);
-  return restoreEscapedQuotes(stripped);
-}
-function quotedDivide(line, {
-  delimiter = ",",
-  quote = '"',
-  trim = false,
-  lenient = true
-} = {}) {
-  if (isEmptyString(line)) return [""];
-  return buildQuotedFields(line, delimiter, quote, trim, lenient);
+
+// src/utils/divide-preserve.ts
+function dividePreserve(input, separator) {
+  if (isEmptyString(input)) return [""];
+  return divider(input, separator, { preserveEmpty: true });
 }
+
+// src/utils/strip-outer-quotes.ts
 var findNonSpaceBounds = (text, isWhitespace) => {
   let left = 0;
   let right = text.length - 1;
@@ -473,44 +461,42 @@ var findNonSpaceBounds = (text, isWhitespace) => {
   while (right >= left && isWhitespace(text[right])) right--;
   return { left, right };
 };
-var stripMatchedOuterQuotes = (text, left, right) => text.slice(0, left) + text.slice(left + 1, right) + text.slice(right + 1);
-var removeCharAt = (text, index) => text.slice(0, index) + text.slice(index + 1);
-var stripTrailingQuote = (text, quoteChar, isWhitespace) => {
+var stripMatchedOuterQuotes = (text, left, rightQuoteStart, quote) => text.slice(0, left) + text.slice(left + quote.length, rightQuoteStart) + text.slice(rightQuoteStart + quote.length);
+var removeQuoteAt = (text, start, quote) => text.slice(0, start) + text.slice(start + quote.length);
+var stripTrailingQuote = (text, quote, isWhitespace) => {
+  const quoteLength = quote.length;
   let lastNonSpaceIndex = text.length - 1;
   while (lastNonSpaceIndex >= 0 && isWhitespace(text[lastNonSpaceIndex])) {
     lastNonSpaceIndex--;
   }
-  if (lastNonSpaceIndex < 0 || text[lastNonSpaceIndex] !== quoteChar) {
+  const trailingQuoteStart = lastNonSpaceIndex - quoteLength + 1;
+  if (trailingQuoteStart < 0 || !text.startsWith(quote, trailingQuoteStart)) {
     return text;
   }
-  return removeCharAt(text, lastNonSpaceIndex);
+  return removeQuoteAt(text, trailingQuoteStart, quote);
 };
-var stripOuterQuotesRaw = (text, quoteChar, lenient, isWhitespace) => {
+var stripOuterQuotesRaw = (text, quote, lenient, isWhitespace) => {
+  if (quote.length === 0) return text;
   const { left, right } = findNonSpaceBounds(text, isWhitespace);
   if (left > right) return text;
-  if (text[left] !== quoteChar) return text;
-  if (text[right] === quoteChar && right > left) {
-    return stripMatchedOuterQuotes(text, left, right);
+  if (!text.startsWith(quote, left)) return text;
+  const rightQuoteStart = right - quote.length + 1;
+  if (rightQuoteStart >= left + quote.length && text.startsWith(quote, rightQuoteStart)) {
+    return stripMatchedOuterQuotes(text, left, rightQuoteStart, quote);
   }
   if (!lenient) return text;
-  const withoutLeading = removeCharAt(text, left);
-  return stripTrailingQuote(withoutLeading, quoteChar, isWhitespace);
-};
-var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
-  const pieces = dividePreserve(line, delimiter);
-  const state = {
-    fields: [],
-    current: "",
-    insideQuotes: false
-  };
-  for (const piece of pieces) {
-    appendPiece(state, piece, delimiter, quote, trim, lenient);
-  }
-  if (!isEmptyString(state.current)) {
-    flushField(state, quote, trim, lenient);
-  }
-  return state.fields;
+  const withoutLeading = removeQuoteAt(text, left, quote);
+  return stripTrailingQuote(withoutLeading, quote, isWhitespace);
 };
+function stripOuterQuotes(text, quoteChar, { lenient = true } = {}) {
+  const isWhitespace = (char) => char === WHITE_SPACE || char === TAB;
+  const stripped = stripOuterQuotesRaw(text, quoteChar, lenient, isWhitespace);
+  if (quoteChar.length === 0) return stripped;
+  const escapedPair = quoteChar + quoteChar;
+  return stripped.split(escapedPair).join(quoteChar);
+}
+
+// src/utils/quoted-parser.ts
 var advanceQuoteState = (insideQuotes, segment, quote) => {
   let nextInsideQuotes = insideQuotes;
   for (const char of segment) {
@@ -518,6 +504,13 @@ var advanceQuoteState = (insideQuotes, segment, quote) => {
   }
   return nextInsideQuotes;
 };
+var flushField = (state, quote, trim, lenient) => {
+  let fieldValue = stripOuterQuotes(state.current, quote, { lenient });
+  if (trim) fieldValue = fieldValue.trim();
+  state.fields.push(fieldValue);
+  state.current = "";
+  state.insideQuotes = false;
+};
 var appendPiece = (state, piece, delimiter, quote, trim, lenient) => {
   const segment = isEmptyString(state.current) ? piece : delimiter + piece;
   state.current += segment;
@@ -526,13 +519,30 @@ var appendPiece = (state, piece, delimiter, quote, trim, lenient) => {
     flushField(state, quote, trim, lenient);
   }
 };
-var flushField = (state, quote, trim, lenient) => {
-  let fieldValue = stripOuterQuotes(state.current, quote, { lenient });
-  if (trim) fieldValue = fieldValue.trim();
-  state.fields.push(fieldValue);
-  state.current = "";
-  state.insideQuotes = false;
+var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
+  const pieces = dividePreserve(line, delimiter);
+  const state = {
+    fields: [],
+    current: "",
+    insideQuotes: false
+  };
+  for (const piece of pieces) {
+    appendPiece(state, piece, delimiter, quote, trim, lenient);
+  }
+  if (!isEmptyString(state.current)) {
+    flushField(state, quote, trim, lenient);
+  }
+  return state.fields;
 };
+function quotedDivide(line, {
+  delimiter = ",",
+  quote = '"',
+  trim = false,
+  lenient = true
+} = {}) {
+  if (isEmptyString(line)) return [""];
+  return buildQuotedFields(line, delimiter, quote, trim, lenient);
+}
 
 // src/presets/csv-divider.ts
 function csvDivider(line, options = {}) {

package/package.json

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