refactor(encoding/csv): merge files (#2524)

denoland · Aug 16, 2022 · 51bf5f7 · 51bf5f7
1 parent 237cc49
commit 51bf5f7
Show file tree

Hide file tree

Showing 4 changed files with 1,504 additions and 1,450 deletions.
diff --git a/encoding/csv.ts b/encoding/csv.ts
@@ -23,14 +23,174 @@ export {
   ParseError,
 } from "./csv/_io.ts";
 export type { ReadOptions } from "./csv/_io.ts";
-export { NEWLINE, stringify, StringifyError } from "./csv_stringify.ts";
-
-export type {
-  Column,
-  ColumnDetails,
-  DataItem,
-  StringifyOptions,
-} from "./csv_stringify.ts";
+
+const QUOTE = '"';
+export const NEWLINE = "\r\n";
+
+export class StringifyError extends Error {
+  override readonly name = "StringifyError";
+}
+
+function getEscapedString(value: unknown, sep: string): string {
+  if (value === undefined || value === null) return "";
+  let str = "";
+
+  if (typeof value === "object") str = JSON.stringify(value);
+  else str = String(value);
+
+  // Is regex.test more performant here? If so, how to dynamically create?
+  // https://stackoverflow.com/questions/3561493/
+  if (str.includes(sep) || str.includes(NEWLINE) || str.includes(QUOTE)) {
+    return `${QUOTE}${str.replaceAll(QUOTE, `${QUOTE}${QUOTE}`)}${QUOTE}`;
+  }
+
+  return str;
+}
+
+type PropertyAccessor = number | string;
+
+/**
+ * @param fn Optional callback for transforming the value
+ *
+ * @param header Explicit column header name. If omitted,
+ * the (final) property accessor is used for this value.
+ *
+ * @param prop Property accessor(s) used to access the value on the object
+ */
+export type ColumnDetails = {
+  // "unknown" is more type-safe, but inconvenient for user. How to resolve?
+  // deno-lint-ignore no-explicit-any
+  fn?: (value: any) => string | Promise<string>;
+  header?: string;
+  prop: PropertyAccessor | PropertyAccessor[];
+};
+
+export type Column = ColumnDetails | PropertyAccessor | PropertyAccessor[];
+
+type NormalizedColumn = Omit<ColumnDetails, "header" | "prop"> & {
+  header: string;
+  prop: PropertyAccessor[];
+};
+
+function normalizeColumn(column: Column): NormalizedColumn {
+  let fn: NormalizedColumn["fn"],
+    header: NormalizedColumn["header"],
+    prop: NormalizedColumn["prop"];
+
+  if (typeof column === "object") {
+    if (Array.isArray(column)) {
+      header = String(column[column.length - 1]);
+      prop = column;
+    } else {
+      ({ fn } = column);
+      prop = Array.isArray(column.prop) ? column.prop : [column.prop];
+      header = typeof column.header === "string"
+        ? column.header
+        : String(prop[prop.length - 1]);
+    }
+  } else {
+    header = String(column);
+    prop = [column];
+  }
+
+  return { fn, header, prop };
+}
+
+type ObjectWithStringPropertyKeys = Record<string, unknown>;
+
+/** An object (plain or array) */
+export type DataItem = ObjectWithStringPropertyKeys | unknown[];
+
+/**
+ * Returns an array of values from an object using the property accessors
+ * (and optional transform function) in each column
+ */
+async function getValuesFromItem(
+  item: DataItem,
+  normalizedColumns: NormalizedColumn[],
+): Promise<unknown[]> {
+  const values: unknown[] = [];
+
+  for (const column of normalizedColumns) {
+    let value: unknown = item;
+
+    for (const prop of column.prop) {
+      if (typeof value !== "object" || value === null) continue;
+      if (Array.isArray(value)) {
+        if (typeof prop === "number") value = value[prop];
+        else {
+          throw new StringifyError('Property accessor is not of type "number"');
+        }
+      } // I think this assertion is safe. Confirm?
+      else value = (value as ObjectWithStringPropertyKeys)[prop];
+    }
+
+    if (typeof column.fn === "function") value = await column.fn(value);
+    values.push(value);
+  }
+
+  return values;
+}
+
+/**
+ * @param headers Whether or not to include the row of headers.
+ * Default: `true`
+ *
+ * @param separator Delimiter used to separate values. Examples:
+ *  - `","` _comma_ (Default)
+ *  - `"\t"` _tab_
+ *  - `"|"` _pipe_
+ *  - etc.
+ */
+export type StringifyOptions = {
+  headers?: boolean;
+  separator?: string;
+};
+
+/**
+ * @param data The array of objects to encode
+ * @param columns Array of values specifying which data to include in the output
+ * @param options Output formatting options
+ */
+export async function stringify(
+  data: DataItem[],
+  columns: Column[],
+  options: StringifyOptions = {},
+): Promise<string> {
+  const { headers, separator: sep } = {
+    headers: true,
+    separator: ",",
+    ...options,
+  };
+  if (sep.includes(QUOTE) || sep.includes(NEWLINE)) {
+    const message = [
+      "Separator cannot include the following strings:",
+      '  - U+0022: Quotation mark (")',
+      "  - U+000D U+000A: Carriage Return + Line Feed (\\r\\n)",
+    ].join("\n");
+    throw new StringifyError(message);
+  }
+
+  const normalizedColumns = columns.map(normalizeColumn);
+  let output = "";
+
+  if (headers) {
+    output += normalizedColumns
+      .map((column) => getEscapedString(column.header, sep))
+      .join(sep);
+    output += NEWLINE;
+  }
+
+  for (const item of data) {
+    const values = await getValuesFromItem(item, normalizedColumns);
+    output += values
+      .map((value) => getEscapedString(value, sep))
+      .join(sep);
+    output += NEWLINE;
+  }
+
+  return output;
+}
 
 /**
  * Parse the CSV string/buffer with the options provided.

diff --git a/encoding/csv_stringify.ts b/encoding/csv_stringify.ts
@@ -1,5 +1,14 @@
 // Copyright 2018-2022 the Deno authors. All rights reserved. MIT license.
 
+import {
+  Column,
+  ColumnDetails,
+  DataItem,
+  NEWLINE,
+  stringify,
+  StringifyOptions,
+} from "./csv.ts";
+
 /**
  * Provides {@linkcode stringify} to encode data following the
  * [CSV specification](https://tools.ietf.org/html/rfc4180).
@@ -9,170 +18,38 @@
  * @module
  */
 
-const QUOTE = '"';
-export const NEWLINE = "\r\n";
-
+/**
+ * @deprecated This file will be removed soon. Use `Error` instead.
+ */
 export class StringifyError extends Error {
   override readonly name = "StringifyError";
 }
 
-function getEscapedString(value: unknown, sep: string): string {
-  if (value === undefined || value === null) return "";
-  let str = "";
-
-  if (typeof value === "object") str = JSON.stringify(value);
-  else str = String(value);
-
-  // Is regex.test more performant here? If so, how to dynamically create?
-  // https://stackoverflow.com/questions/3561493/
-  if (str.includes(sep) || str.includes(NEWLINE) || str.includes(QUOTE)) {
-    return `${QUOTE}${str.replaceAll(QUOTE, `${QUOTE}${QUOTE}`)}${QUOTE}`;
-  }
-
-  return str;
-}
-
-type PropertyAccessor = number | string;
-
-/**
- * @param fn Optional callback for transforming the value
- *
- * @param header Explicit column header name. If omitted,
- * the (final) property accessor is used for this value.
- *
- * @param prop Property accessor(s) used to access the value on the object
- */
-export type ColumnDetails = {
-  // "unknown" is more type-safe, but inconvenient for user. How to resolve?
-  // deno-lint-ignore no-explicit-any
-  fn?: (value: any) => string | Promise<string>;
-  header?: string;
-  prop: PropertyAccessor | PropertyAccessor[];
-};
-
-export type Column = ColumnDetails | PropertyAccessor | PropertyAccessor[];
-
-type NormalizedColumn = Omit<ColumnDetails, "header" | "prop"> & {
-  header: string;
-  prop: PropertyAccessor[];
+export type {
+  /**
+   * @deprecated This file will be removed soon. Import from "./csv.ts" instead.
+   */
+  Column,
+  /**
+   * @deprecated This file will be removed soon. Import from "./csv.ts" instead.
+   */
+  ColumnDetails,
+  /**
+   * @deprecated This file will be removed soon. Import from "./csv.ts" instead.
+   */
+  DataItem,
+  /**
+   * @deprecated This file will be removed soon. Import from "./csv.ts" instead.
+   */
+  StringifyOptions,
 };
 
-function normalizeColumn(column: Column): NormalizedColumn {
-  let fn: NormalizedColumn["fn"],
-    header: NormalizedColumn["header"],
-    prop: NormalizedColumn["prop"];
-
-  if (typeof column === "object") {
-    if (Array.isArray(column)) {
-      header = String(column[column.length - 1]);
-      prop = column;
-    } else {
-      ({ fn } = column);
-      prop = Array.isArray(column.prop) ? column.prop : [column.prop];
-      header = typeof column.header === "string"
-        ? column.header
-        : String(prop[prop.length - 1]);
-    }
-  } else {
-    header = String(column);
-    prop = [column];
-  }
-
-  return { fn, header, prop };
-}
-
-type ObjectWithStringPropertyKeys = Record<string, unknown>;
-
-/** An object (plain or array) */
-export type DataItem = ObjectWithStringPropertyKeys | unknown[];
-
-/**
- * Returns an array of values from an object using the property accessors
- * (and optional transform function) in each column
- */
-async function getValuesFromItem(
-  item: DataItem,
-  normalizedColumns: NormalizedColumn[],
-): Promise<unknown[]> {
-  const values: unknown[] = [];
-
-  for (const column of normalizedColumns) {
-    let value: unknown = item;
-
-    for (const prop of column.prop) {
-      if (typeof value !== "object" || value === null) continue;
-      if (Array.isArray(value)) {
-        if (typeof prop === "number") value = value[prop];
-        else {
-          throw new StringifyError('Property accessor is not of type "number"');
-        }
-      } // I think this assertion is safe. Confirm?
-      else value = (value as ObjectWithStringPropertyKeys)[prop];
-    }
-
-    if (typeof column.fn === "function") value = await column.fn(value);
-    values.push(value);
-  }
-
-  return values;
-}
-
-/**
- * @param headers Whether or not to include the row of headers.
- * Default: `true`
- *
- * @param separator Delimiter used to separate values. Examples:
- *  - `","` _comma_ (Default)
- *  - `"\t"` _tab_
- *  - `"|"` _pipe_
- *  - etc.
- */
-export type StringifyOptions = {
-  headers?: boolean;
-  separator?: string;
+export {
+  /**
+   * @deprecated This file will be removed soon. Use `"\r\n"` instead.
+   */ NEWLINE,
+  /**
+   * @deprecated This file will be removed soon. Import from "./csv.ts" instead.
+   */
+  stringify,
 };
-
-/**
- * @param data The array of objects to encode
- * @param columns Array of values specifying which data to include in the output
- * @param options Output formatting options
- */
-export async function stringify(
-  data: DataItem[],
-  columns: Column[],
-  options: StringifyOptions = {},
-): Promise<string> {
-  const { headers, separator: sep } = {
-    headers: true,
-    separator: ",",
-    ...options,
-  };
-  if (sep.includes(QUOTE) || sep.includes(NEWLINE)) {
-    const message = [
-      "Separator cannot include the following strings:",
-      '  - U+0022: Quotation mark (")',
-      "  - U+000D U+000A: Carriage Return + Line Feed (\\r\\n)",
-    ].join("\n");
-    throw new StringifyError(message);
-  }
-
-  const normalizedColumns = columns.map(normalizeColumn);
-  let output = "";
-
-  if (headers) {
-    output += normalizedColumns
-      .map((column) => getEscapedString(column.header, sep))
-      .join(sep);
-    output += NEWLINE;
-  }
-
-  for (const item of data) {
-    const values = await getValuesFromItem(item, normalizedColumns);
-    output += values
-      .map((value) => getEscapedString(value, sep))
-      .join(sep);
-    output += NEWLINE;
-  }
-
-  return output;
-}