@nyaomaru/divider 2.0.5 → 2.0.6

package/dist/index.cjs

@@ -122,10 +122,7 @@ function isNoneMode(value) {
 function normalizeSeparators(separators) {
   return Array.from(new Set(separators)).filter(
     (separator) => !isEmptyString(separator)
-  ).sort((left, right) => right.length - left.length);
-}
-function createCacheKey(normalizedSeparators) {
-  return normalizedSeparators.join(CACHE_KEY_SEPARATOR);
+  );
 }
 var RegexCache = class {
   cache = /* @__PURE__ */ new Map();
@@ -141,15 +138,6 @@ var RegexCache = class {
    */
   get(separators) {
     const key = this.createKey(separators);
-    return this.getByKey(key);
-  }
-  /**
-   * Retrieves a cached RegExp for a precomputed cache key.
-   *
-   * @param key - Cache key string
-   * @returns Cached RegExp or null if not found
-   */
-  getByKey(key) {
     const regex = this.cache.get(key);
     if (regex) {
       this.cache.delete(key);
@@ -165,15 +153,6 @@ var RegexCache = class {
    */
   set(separators, regex) {
     const key = this.createKey(separators);
-    this.setByKey(key, regex);
-  }
-  /**
-   * Stores a RegExp in the cache for a precomputed cache key.
-   *
-   * @param key - Cache key string
-   * @param regex - Compiled RegExp to cache
-   */
-  setByKey(key, regex) {
     if (this.cache.has(key)) {
       this.cache.delete(key);
     }
@@ -194,7 +173,7 @@ var RegexCache = class {
    */
   createKey(separators) {
     const normalizedSeparators = normalizeSeparators(separators);
-    return createCacheKey(normalizedSeparators);
+    return normalizedSeparators.join(CACHE_KEY_SEPARATOR);
   }
   /**
    * Gets current cache size for debugging/monitoring.
@@ -215,16 +194,15 @@ var RegexCache = class {
 var regexCache = new RegexCache();
 function getRegex(separators) {
   if (isEmptyArray(separators)) return null;
+  const cached = regexCache.get(separators);
+  if (cached) return cached;
   const uniqueSeparators = normalizeSeparators(separators);
   if (uniqueSeparators.length === 0) {
     return null;
   }
-  const cacheKey = createCacheKey(uniqueSeparators);
-  const cached = regexCache.getByKey(cacheKey);
-  if (cached) return cached;
   const pattern = uniqueSeparators.map(escapeRegExp).join("|");
   const regex = new RegExp(`(?:${pattern})`, "g");
-  regexCache.setByKey(cacheKey, regex);
+  regexCache.set(separators, regex);
   return regex;
 }
 function escapeRegExp(str) {
@@ -444,41 +422,13 @@ function dividePreserve(input, separator) {
   if (isEmptyString(input)) return [""];
   return divider(input, separator, { preserveEmpty: true });
 }
-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;
+function countUnescaped(text, quote) {
+  const pair = quote + quote;
   let count = 0;
-  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++;
+  for (const chunk of dividePreserve(text, pair)) {
+    count += dividePreserve(chunk, quote).length - 1;
   }
   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;
@@ -530,8 +480,7 @@ var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
   const pieces = dividePreserve(line, delimiter);
   const state = {
     fields: [],
-    current: "",
-    insideQuotes: false
+    current: ""
   };
   for (const piece of pieces) {
     appendPiece(state, piece, delimiter, quote, trim, lenient);
@@ -541,18 +490,10 @@ 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) => {
-  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) {
+  state.current = isEmptyString(state.current) ? piece : state.current + delimiter + piece;
+  const insideQuotes = countUnescaped(state.current, quote) % 2 === 1;
+  if (!insideQuotes) {
     flushField(state, quote, trim, lenient);
   }
 };
@@ -561,7 +502,6 @@ 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
@@ -613,27 +553,8 @@ function tryExtractQuery(input) {
     const url = new URL(input);
     return url.search.startsWith(QUERY_SEPARATORS.QUESTION_MARK) ? url.search.slice(1) : url.search;
   } catch {
-    return extractQueryFromQuestionMark(input);
-  }
-}
-function extractQueryFromQuestionMark(input) {
-  const fragmentIndex = input.indexOf("#");
-  const withoutFragment = fragmentIndex >= 0 ? input.slice(0, fragmentIndex) : input;
-  const questionMarkIndex = withoutFragment.indexOf(
-    QUERY_SEPARATORS.QUESTION_MARK
-  );
-  if (questionMarkIndex < 0) {
-    return withoutFragment;
-  }
-  if (questionMarkIndex === 0) {
-    return withoutFragment.slice(1);
-  }
-  const prefix = withoutFragment.slice(0, questionMarkIndex);
-  const hasQuerySeparatorBefore = prefix.includes(QUERY_SEPARATORS.AMPERSAND) || prefix.includes(QUERY_SEPARATORS.EQUALS);
-  if (hasQuerySeparatorBefore) {
-    return withoutFragment;
+    return input;
   }
-  return withoutFragment.slice(questionMarkIndex + 1);
 }
 function stripLeadingQuestionMark(query) {
   return query.startsWith(QUERY_SEPARATORS.QUESTION_MARK) ? query.slice(1) : query;

package/dist/index.js

@@ -88,10 +88,7 @@ function isNoneMode(value) {
 function normalizeSeparators(separators) {
   return Array.from(new Set(separators)).filter(
     (separator) => !isEmptyString(separator)
-  ).sort((left, right) => right.length - left.length);
-}
-function createCacheKey(normalizedSeparators) {
-  return normalizedSeparators.join(CACHE_KEY_SEPARATOR);
+  );
 }
 var RegexCache = class {
   cache = /* @__PURE__ */ new Map();
@@ -107,15 +104,6 @@ var RegexCache = class {
    */
   get(separators) {
     const key = this.createKey(separators);
-    return this.getByKey(key);
-  }
-  /**
-   * Retrieves a cached RegExp for a precomputed cache key.
-   *
-   * @param key - Cache key string
-   * @returns Cached RegExp or null if not found
-   */
-  getByKey(key) {
     const regex = this.cache.get(key);
     if (regex) {
       this.cache.delete(key);
@@ -131,15 +119,6 @@ var RegexCache = class {
    */
   set(separators, regex) {
     const key = this.createKey(separators);
-    this.setByKey(key, regex);
-  }
-  /**
-   * Stores a RegExp in the cache for a precomputed cache key.
-   *
-   * @param key - Cache key string
-   * @param regex - Compiled RegExp to cache
-   */
-  setByKey(key, regex) {
     if (this.cache.has(key)) {
       this.cache.delete(key);
     }
@@ -160,7 +139,7 @@ var RegexCache = class {
    */
   createKey(separators) {
     const normalizedSeparators = normalizeSeparators(separators);
-    return createCacheKey(normalizedSeparators);
+    return normalizedSeparators.join(CACHE_KEY_SEPARATOR);
   }
   /**
    * Gets current cache size for debugging/monitoring.
@@ -181,16 +160,15 @@ var RegexCache = class {
 var regexCache = new RegexCache();
 function getRegex(separators) {
   if (isEmptyArray(separators)) return null;
+  const cached = regexCache.get(separators);
+  if (cached) return cached;
   const uniqueSeparators = normalizeSeparators(separators);
   if (uniqueSeparators.length === 0) {
     return null;
   }
-  const cacheKey = createCacheKey(uniqueSeparators);
-  const cached = regexCache.getByKey(cacheKey);
-  if (cached) return cached;
   const pattern = uniqueSeparators.map(escapeRegExp).join("|");
   const regex = new RegExp(`(?:${pattern})`, "g");
-  regexCache.setByKey(cacheKey, regex);
+  regexCache.set(separators, regex);
   return regex;
 }
 function escapeRegExp(str) {
@@ -410,41 +388,13 @@ function dividePreserve(input, separator) {
   if (isEmptyString(input)) return [""];
   return divider(input, separator, { preserveEmpty: true });
 }
-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;
+function countUnescaped(text, quote) {
+  const pair = quote + quote;
   let count = 0;
-  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++;
+  for (const chunk of dividePreserve(text, pair)) {
+    count += dividePreserve(chunk, quote).length - 1;
   }
   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;
@@ -496,8 +446,7 @@ var buildQuotedFields = (line, delimiter, quote, trim, lenient) => {
   const pieces = dividePreserve(line, delimiter);
   const state = {
     fields: [],
-    current: "",
-    insideQuotes: false
+    current: ""
   };
   for (const piece of pieces) {
     appendPiece(state, piece, delimiter, quote, trim, lenient);
@@ -507,18 +456,10 @@ 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) => {
-  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) {
+  state.current = isEmptyString(state.current) ? piece : state.current + delimiter + piece;
+  const insideQuotes = countUnescaped(state.current, quote) % 2 === 1;
+  if (!insideQuotes) {
     flushField(state, quote, trim, lenient);
   }
 };
@@ -527,7 +468,6 @@ 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
@@ -579,27 +519,8 @@ function tryExtractQuery(input) {
     const url = new URL(input);
     return url.search.startsWith(QUERY_SEPARATORS.QUESTION_MARK) ? url.search.slice(1) : url.search;
   } catch {
-    return extractQueryFromQuestionMark(input);
-  }
-}
-function extractQueryFromQuestionMark(input) {
-  const fragmentIndex = input.indexOf("#");
-  const withoutFragment = fragmentIndex >= 0 ? input.slice(0, fragmentIndex) : input;
-  const questionMarkIndex = withoutFragment.indexOf(
-    QUERY_SEPARATORS.QUESTION_MARK
-  );
-  if (questionMarkIndex < 0) {
-    return withoutFragment;
-  }
-  if (questionMarkIndex === 0) {
-    return withoutFragment.slice(1);
-  }
-  const prefix = withoutFragment.slice(0, questionMarkIndex);
-  const hasQuerySeparatorBefore = prefix.includes(QUERY_SEPARATORS.AMPERSAND) || prefix.includes(QUERY_SEPARATORS.EQUALS);
-  if (hasQuerySeparatorBefore) {
-    return withoutFragment;
+    return input;
   }
-  return withoutFragment.slice(questionMarkIndex + 1);
 }
 function stripLeadingQuestionMark(query) {
   return query.startsWith(QUERY_SEPARATORS.QUESTION_MARK) ? query.slice(1) : query;

package/package.json

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