move options related code to options/ dir

Author: severo

src/check.ts src/options/check.tssrc/check.ts renamed to src/options/check.ts

@@ -1,6 +1,6 @@
+import { parse } from '../parser'
+import { testEmptyLine } from '../utils'
 import { BAD_DELIMITERS, RECORD_SEP, UNIT_SEP } from './constants'
-import { parse } from './parser'
-import { testEmptyLine } from './utils'
 
 /**
  * Validates the delimiter

src/comments.ts src/options/comments.tssrc/comments.ts renamed to src/options/comments.ts

@@ -1,4 +1,4 @@
-import { escapeRegExp } from './utils'
+import { escapeRegExp } from '../utils'
 
 type Newline = '\n' | '\r' | '\r\n'
 

src/constants.ts src/options/constants.tssrc/constants.ts renamed to src/options/constants.ts

@@ -1,3 +1,4 @@
+import { validateComments } from './comments'
 import { DefaultDelimiter } from './constants'
 import { guessDelimiter, validateDelimiter } from './delimiter'
 import { validateEscapeChar } from './escapeChar'
@@ -64,3 +65,47 @@ export function validateAndGuessParseOptions(parseOptions: ParseOptions, { input
     error,
   }
 }
+
+export interface ValidParseOptions {
+  delimiter: string
+  newline: '\n' | '\r' | '\r\n'
+  comments: string | false
+  quoteChar: string
+  escapeChar: string
+}
+
+/**
+ * Validates and fills in default options
+ * @param parseOptions The parsing options to validate and guess.
+ * @param parseOptions.delimiter The delimiter used in the CSV data. Defaults to ','.
+ * @param parseOptions.newline The newline used in the CSV data. Defaults to '\n'.
+ * @param parseOptions.quoteChar The quote character used in the CSV data. Defaults to '"'.
+ * @param parseOptions.escapeChar The escape character used in the CSV data. Defaults to the quote character.
+ * @param parseOptions.comments The comment character or boolean to indicate comments.
+ * @returns The validated options
+ */
+export function validateAndSetDefaultParseOptions(parseOptions: ParseOptions): ValidParseOptions {
+  const quoteChar = validateQuoteChar(parseOptions.quoteChar)
+  const escapeChar = validateEscapeChar(parseOptions.escapeChar) ?? quoteChar
+
+  // Delimiter must be valid
+  // TODO(SL): it now throws if invalid delimiter is provided instead of defaulting to ,
+  const delimiter = validateDelimiter(parseOptions.delimiter) ?? ','
+
+  // Comment character must be valid
+  // TODO(SL): it now throws if invalid comment character is provided instead of defaulting to false
+  const comments = validateComments(parseOptions.comments, delimiter) ?? false
+
+  // Newline must be valid: \r, \n, or \r\n
+  // TODO(SL): it now throws if invalid newline is provided instead of defaulting to \n
+  // TODO(SL): force newline to have the correct type?
+  const newline = validateNewline(parseOptions.newline) ?? '\n'
+
+  return {
+    delimiter,
+    newline,
+    comments,
+    quoteChar,
+    escapeChar,
+  }
+}

src/delimiter.ts src/options/delimiter.tssrc/delimiter.ts renamed to src/options/delimiter.ts

@@ -1,79 +1,27 @@
 // Adapted from PapaParse (https://www.papaparse.com/)
-import { validateComments } from './comments'
-import { validateDelimiter } from './delimiter'
-import { validateEscapeChar } from './escapeChar'
-import { validateNewline } from './newline'
-import { validateQuoteChar } from './quoteChar'
+import { type ParseOptions, validateAndSetDefaultParseOptions } from './options/parseOptions'
 import type { ParseError, ParseResult } from './types'
 import { escapeRegExp } from './utils'
 
-export interface ParseOptions {
-  delimiter?: string
-  newline?: string
-  comments?: string | boolean
-  quoteChar?: string
-  escapeChar?: string
-  ignoreLastRow?: boolean
-}
-export interface ValidParseOptions {
-  delimiter: string
-  newline: '\n' | '\r' | '\r\n'
-  comments: string | false
-  quoteChar: string
-  escapeChar: string
-  ignoreLastRow: boolean
-}
-
-/**
- * Validates and fills in default options
- * @param options The options to validate
- * @returns The validated options
- */
-export function validateOptions(options: ParseOptions): ValidParseOptions {
-  const quoteChar = validateQuoteChar(options.quoteChar)
-  const escapeChar = validateEscapeChar(options.escapeChar) ?? quoteChar
-
-  // Delimiter must be valid
-  // TODO(SL): it now throws if invalid delimiter is provided instead of defaulting to ,
-  const delimiter = validateDelimiter(options.delimiter) ?? ','
-
-  // Comment character must be valid
-  // TODO(SL): it now throws if invalid comment character is provided instead of defaulting to false
-  const comments = validateComments(options.comments, delimiter) ?? false
-
-  // Newline must be valid: \r, \n, or \r\n
-  // TODO(SL): it now throws if invalid newline is provided instead of defaulting to \n
-  // TODO(SL): force newline to have the correct type?
-  const newline = validateNewline(options.newline) ?? '\n'
-
-  const ignoreLastRow = options.ignoreLastRow ?? false
-
-  return {
-    delimiter,
-    newline,
-    comments,
-    quoteChar,
-    escapeChar,
-    ignoreLastRow,
-  }
-}
 /**
  * Parses the input string with the given options
  * @param input The input string to parse
  * @param options The options for parsing
  * @yields The parse results, one row at a time
  * @returns A generator yielding parse results
  */
-export function* parse(input: string, options: ParseOptions): Generator<ParseResult, void, unknown> {
+export function* parse(input: string, options: ParseOptions & {
+  ignoreLastRow?: boolean
+}): Generator<ParseResult, void, unknown> {
   const {
     delimiter,
     newline,
     comments,
     quoteChar,
     escapeChar,
-    ignoreLastRow,
-  } = validateOptions(options)
+  } = validateAndSetDefaultParseOptions(options)
   // TODO(SL): allow passing no options?
+  const ignoreLastRow = options.ignoreLastRow ?? false
 
   // We don't need to compute some of these every time parse() is called,
   // but having them in a more local scope seems to perform better

src/escapeChar.ts src/options/escapeChar.tssrc/escapeChar.ts renamed to src/options/escapeChar.ts

@@ -1,4 +1,4 @@
-import { type DelimiterError, type ParseOptions, validateAndGuessParseOptions } from './parseOptions'
+import { type DelimiterError, type ParseOptions, validateAndGuessParseOptions } from './options/parseOptions'
 import { parse } from './parser'
 import type { ParseResult } from './types'
 import { testEmptyLine } from './utils'