@nyaomaru/divider 2.0.4 → 2.0.5

package/dist/index.cjs

@@ -444,13 +444,41 @@ function dividePreserve(input, separator) {
   if (isEmptyString(input)) return [""];
   return divider(input, separator, { preserveEmpty: true });
 }
-function countUnescaped(text, quote) {
-  const pair = quote + quote;
+var countUnescapedSingleChar = (text, quote) => {
+  let count = 0;
+  for (let index = 0; index < text.length; index++) {
+    if (text[index] !== quote) continue;
+    if (text[index + 1] === quote) {
+      index++;
+      continue;
+    }
+    count++;
+  }
+  return count;
+};
+var countUnescapedMultiChar = (text, quote) => {
+  const escapedPair = quote + quote;
+  const quoteLength = quote.length;
+  const escapedPairLength = escapedPair.length;
   let count = 0;
-  for (const chunk of dividePreserve(text, pair)) {
-    count += dividePreserve(chunk, quote).length - 1;
+  for (let index = 0; index < text.length; ) {
+    if (text.startsWith(escapedPair, index)) {
+      index += escapedPairLength;
+      continue;
+    }
+    if (text.startsWith(quote, index)) {
+      count++;
+      index += quoteLength;
+      continue;
+    }
+    index++;
   }
   return count;
+};
+function countUnescaped(text, quote) {
+  if (isEmptyString(quote)) return 0;
+  if (quote.length === 1) return countUnescapedSingleChar(text, quote);
+  return countUnescapedMultiChar(text, quote);
 }
 function stripOuterQuotes(text, quoteChar, { lenient = true } = {}) {
   const escapedPair = quoteChar + quoteChar;
@@ -502,7 +530,8 @@ var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
   const pieces = dividePreserve(line, delimiter);
   const state = {
     fields: [],
-    current: ""
+    current: "",
+    insideQuotes: false
   };
   for (const piece of pieces) {
     appendPiece(state, piece, delimiter, quote, trim, lenient);
@@ -512,10 +541,18 @@ var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
   }
   return state.fields;
 };
+var advanceQuoteState = (insideQuotes, segment, quote) => {
+  let nextInsideQuotes = insideQuotes;
+  for (const char of segment) {
+    if (char === quote) nextInsideQuotes = !nextInsideQuotes;
+  }
+  return nextInsideQuotes;
+};
 var appendPiece = (state, piece, delimiter, quote, trim, lenient) => {
-  state.current = isEmptyString(state.current) ? piece : state.current + delimiter + piece;
-  const insideQuotes = countUnescaped(state.current, quote) % 2 === 1;
-  if (!insideQuotes) {
+  const segment = isEmptyString(state.current) ? piece : delimiter + piece;
+  state.current += segment;
+  state.insideQuotes = quote.length === 1 ? advanceQuoteState(state.insideQuotes, segment, quote) : countUnescaped(state.current, quote) % 2 === 1;
+  if (!state.insideQuotes) {
     flushField(state, quote, trim, lenient);
   }
 };
@@ -524,6 +561,7 @@ var flushField = (state, quote, trim, lenient) => {
   if (trim) fieldValue = fieldValue.trim();
   state.fields.push(fieldValue);
   state.current = "";
+  state.insideQuotes = false;
 };
 
 // src/presets/csv-divider.ts

package/dist/index.js

@@ -410,13 +410,41 @@ function dividePreserve(input, separator) {
   if (isEmptyString(input)) return [""];
   return divider(input, separator, { preserveEmpty: true });
 }
-function countUnescaped(text, quote) {
-  const pair = quote + quote;
+var countUnescapedSingleChar = (text, quote) => {
+  let count = 0;
+  for (let index = 0; index < text.length; index++) {
+    if (text[index] !== quote) continue;
+    if (text[index + 1] === quote) {
+      index++;
+      continue;
+    }
+    count++;
+  }
+  return count;
+};
+var countUnescapedMultiChar = (text, quote) => {
+  const escapedPair = quote + quote;
+  const quoteLength = quote.length;
+  const escapedPairLength = escapedPair.length;
   let count = 0;
-  for (const chunk of dividePreserve(text, pair)) {
-    count += dividePreserve(chunk, quote).length - 1;
+  for (let index = 0; index < text.length; ) {
+    if (text.startsWith(escapedPair, index)) {
+      index += escapedPairLength;
+      continue;
+    }
+    if (text.startsWith(quote, index)) {
+      count++;
+      index += quoteLength;
+      continue;
+    }
+    index++;
   }
   return count;
+};
+function countUnescaped(text, quote) {
+  if (isEmptyString(quote)) return 0;
+  if (quote.length === 1) return countUnescapedSingleChar(text, quote);
+  return countUnescapedMultiChar(text, quote);
 }
 function stripOuterQuotes(text, quoteChar, { lenient = true } = {}) {
   const escapedPair = quoteChar + quoteChar;
@@ -468,7 +496,8 @@ var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
   const pieces = dividePreserve(line, delimiter);
   const state = {
     fields: [],
-    current: ""
+    current: "",
+    insideQuotes: false
   };
   for (const piece of pieces) {
     appendPiece(state, piece, delimiter, quote, trim, lenient);
@@ -478,10 +507,18 @@ var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
   }
   return state.fields;
 };
+var advanceQuoteState = (insideQuotes, segment, quote) => {
+  let nextInsideQuotes = insideQuotes;
+  for (const char of segment) {
+    if (char === quote) nextInsideQuotes = !nextInsideQuotes;
+  }
+  return nextInsideQuotes;
+};
 var appendPiece = (state, piece, delimiter, quote, trim, lenient) => {
-  state.current = isEmptyString(state.current) ? piece : state.current + delimiter + piece;
-  const insideQuotes = countUnescaped(state.current, quote) % 2 === 1;
-  if (!insideQuotes) {
+  const segment = isEmptyString(state.current) ? piece : delimiter + piece;
+  state.current += segment;
+  state.insideQuotes = quote.length === 1 ? advanceQuoteState(state.insideQuotes, segment, quote) : countUnescaped(state.current, quote) % 2 === 1;
+  if (!state.insideQuotes) {
     flushField(state, quote, trim, lenient);
   }
 };
@@ -490,6 +527,7 @@ var flushField = (state, quote, trim, lenient) => {
   if (trim) fieldValue = fieldValue.trim();
   state.fields.push(fieldValue);
   state.current = "";
+  state.insideQuotes = false;
 };
 
 // src/presets/csv-divider.ts

package/package.json

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