Maintenance

.github/workflows/ci.yml

@@ -7,10 +7,9 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: denolib/setup-deno@master
+      - uses: denoland/setup-deno@master
         with:
-          deno-version: "v1.x"
-
+          deno-version: "1.42.4"
       - run: deno --version
-      - run: make lint
-      - run: make test
+      - run: deno lint
+      - run: deno task test

csv_spectrum_test.ts

@@ -1,5 +1,5 @@
 import { readCSVObjects } from "./mod.ts";
-import { assertEquals } from "./dev_deps.ts";
+import { assertEquals } from "@std/assert/assert-equals";
 
 for await (const file of Deno.readDir("./third_party/csv-spectrum/csvs")) {
   const csvFilePath = "./third_party/csv-spectrum/csvs/" + file.name;

deno.json

@@ -0,0 +1,22 @@
+{
+  "imports": {
+    "@std/io": "jsr:@std/[email protected]",
+    "@std/bytes": "jsr:@std/[email protected]",
+    "@std/log": "jsr:@std/[email protected]",
+    "@std/assert": "jsr:@std/[email protected]",
+    "chiefbiiko/sha256": "https://denopkg.com/chiefbiiko/[email protected]/mod.ts"
+  },
+  "tasks": {
+    "test": "deno test --allow-read",
+    "benchmark": "cd benchmarks && make"
+  },
+  "test": {
+    "include": ["reader_test.ts", "writer_test.ts", "csv_spectrum_test.ts"]
+  },
+  "lint": {
+    "include": ["*.ts", "benchmarks/*.ts", "benchmarks/*.js"]
+  },
+  "fmt": {
+    "include": ["*.ts", "benchmarks/*.ts", "benchmarks/*.js", "*.json"]
+  }
+}

reader.ts

@@ -1,4 +1,8 @@
-import { concat, getLogger, iterateReader, Logger, repeat } from "./deps.ts";
+import type { Reader } from "@std/io/types";
+import { concat } from "@std/bytes/concat";
+import { repeat } from "@std/bytes/repeat";
+import { getLogger, Logger } from "@std/log";
+import { iterateReader } from "@std/io/iterate-reader";
 import { getUint8Array, hasPrefixFrom } from "./utils.ts";
 
 /** Common options for CSV reader module */
@@ -114,7 +118,7 @@ export class CSVReader {
   private fromLine: number;
   private toLine: number;
 
-  constructor(reader: Deno.Reader, options?: Partial<CSVReaderOptions>) {
+  constructor(reader: Reader, options?: Partial<CSVReaderOptions>) {
     this.decoder = new TextDecoder(options?.encoding);
     const mergedOptions: HiddenCSVReaderOptions = {
       ...defaultCSVReaderOptions,
@@ -240,7 +244,7 @@ export class CSVReader {
     if (done) {
       this.readerEmpty = true;
     } else {
-      this.inputBuffer = concat(this.inputBuffer, value);
+      this.inputBuffer = concat([this.inputBuffer, value]);
       this.inputBufferUnprocessed += value.length;
     }
   }
@@ -500,7 +504,7 @@ class CSVStreamReader implements AsyncIterableIterator<string | symbol> {
   ) => void;
   private nextPromiseReject?: (err: Error) => void;
 
-  constructor(reader: Deno.Reader, options?: Partial<CommonCSVReaderOptions>) {
+  constructor(reader: Reader, options?: Partial<CommonCSVReaderOptions>) {
     this.buffer = [];
     this.done = false;
     this.reader = new CSVReader(reader, {
@@ -597,7 +601,7 @@ export const newLine = Symbol("newLine");
  *       }
  */
 export function readCSVStream(
-  reader: Deno.Reader,
+  reader: Reader,
   options?: Partial<CommonCSVReaderOptions>,
 ): AsyncIterable<string | symbol> {
   return new CSVStreamReader(reader, options);
@@ -612,7 +616,7 @@ class CSVRowReader implements AsyncIterableIterator<string[]> {
   private nextPromiseResolve?: (res: IteratorResult<string[], void>) => void;
   private nextPromiseReject?: (err: Error) => void;
 
-  constructor(reader: Deno.Reader, options?: Partial<CommonCSVReaderOptions>) {
+  constructor(reader: Reader, options?: Partial<CommonCSVReaderOptions>) {
     this.buffer = [];
     this.done = false;
     this.row = [];
@@ -701,7 +705,7 @@ class CSVRowReader implements AsyncIterableIterator<string[]> {
  *       }
  */
 export function readCSVRows(
-  reader: Deno.Reader,
+  reader: Reader,
   options?: Partial<CommonCSVReaderOptions>,
 ): AsyncIterable<string[]> {
   return new CSVRowReader(reader, options);
@@ -740,7 +744,7 @@ class RowIterator implements AsyncIterableIterator<string> {
     }
 
     const { done, value } = this.buffer.length > 0
-      ? this.buffer.shift() as IteratorResult<string | symbol>
+      ? (this.buffer.shift() as IteratorResult<string | symbol>)
       : await this.onRequested();
 
     if (done || value === newLine) {
@@ -767,7 +771,7 @@ class CSVRowIteratorReader implements AsyncIterableIterator<RowIterator> {
   ) => void;
   private nextPromiseReject?: (err: Error) => void;
 
-  constructor(reader: Deno.Reader, options?: Partial<CommonCSVReaderOptions>) {
+  constructor(reader: Reader, options?: Partial<CommonCSVReaderOptions>) {
     this.done = false;
     this.buffer = [];
     this.reader = new CSVReader(reader, {
@@ -875,7 +879,7 @@ class CSVRowIteratorReader implements AsyncIterableIterator<RowIterator> {
  *       }
  */
 export function readCSV(
-  reader: Deno.Reader,
+  reader: Reader,
   options?: Partial<CommonCSVReaderOptions>,
 ): AsyncIterable<AsyncIterable<string>> {
   return new CSVRowIteratorReader(reader, options);
@@ -888,7 +892,7 @@ export function readCSV(
  *       }
  */
 export async function* readCSVObjects(
-  reader: Deno.Reader,
+  reader: Reader,
   options?: Partial<CommonCSVReaderOptions>,
 ): AsyncIterable<{ [key: string]: string }> {
   let header: string[] | undefined;

reader_test.ts

@@ -1,5 +1,7 @@
-import { concat } from "./deps.ts";
-import { assertEquals, assertRejects } from "./dev_deps.ts";
+import type { Reader } from "@std/io/types";
+import { concat } from "@std/bytes/concat";
+import { assertRejects } from "@std/assert/assert-rejects";
+import { assertEquals } from "@std/assert/assert-equals";
 import {
   newLine,
   readCSV,
@@ -9,15 +11,15 @@ import {
 } from "./reader.ts";
 import { asyncArrayFrom, asyncArrayFrom2 } from "./utils.ts";
 
-class MyReader implements Deno.Reader {
+class MyReader implements Reader {
   private buf: Uint8Array;
   private index: number;
 
   constructor(content: string, options: { withBom?: boolean } = {}) {
     const opts = { withBom: false, ...options };
     this.buf = new TextEncoder().encode(content);
     if (opts.withBom) {
-      this.buf = concat(new Uint8Array([0xef, 0xbb, 0xbf]), this.buf);
+      this.buf = concat([new Uint8Array([0xef, 0xbb, 0xbf]), this.buf]);
     }
     this.index = 0;
   }

utils.ts

@@ -1,4 +1,4 @@
-import { getLogger } from "./deps.ts";
+import { getLogger } from "@std/log";
 
 const enc = new TextEncoder();
 

writer.ts

@@ -1,4 +1,5 @@
-import { concat, indexOfNeedle } from "./deps.ts";
+import { concat } from "@std/bytes/concat";
+import { indexOfNeedle } from "@std/bytes/index-of-needle";
 import {
   dummyAsyncIterable,
   getUint8Array,
@@ -113,7 +114,7 @@ export class CSVWriter {
         if (done) {
           inputBufferEmpty = true;
         } else {
-          inputBuffer = concat(inputBuffer, value);
+          inputBuffer = concat([inputBuffer, value]);
         }
         continue;
       }

writer_test.ts

@@ -1,4 +1,5 @@
-import { assertEquals, Buffer } from "./dev_deps.ts";
+import { assertEquals } from "@std/assert/assert-equals";
+import { Buffer } from "@std/io/buffer";
 import { CSVWriter, writeCSV, writeCSVObjects } from "./writer.ts";
 
 Deno.test({