Adopt type=module (#81)

* Adopt type=module

follow changes in d3-format:
* type=module
* add exports
* remove zip
* license: ISC
* update dependencies

* update dependencies

* bin/*.js

* Update README

* cleaner imports

* remove Sublime project

* add eslint.json

Co-authored-by: Mike Bostock <[email protected]>

.eslintrc.json

@@ -4,11 +4,6 @@
     "sourceType": "module",
     "ecmaVersion": 8
   },
-  "env": {
-    "es6": true,
-    "node": true,
-    "browser": true
-  },
   "rules": {
     "no-cond-assign": 0
   }

.github/eslint.json

@@ -0,0 +1,18 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "eslint-compact",
+      "pattern": [
+        {
+          "regexp": "^(.+):\\sline\\s(\\d+),\\scol\\s(\\d+),\\s(Error|Warning|Info)\\s-\\s(.+)\\s\\((.+)\\)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "severity": 4,
+          "message": 5,
+          "code": 6
+        }
+      ]
+    }
+  ]
+}

.github/workflows/node.js.yml

@@ -0,0 +1,30 @@
+# https://help.github.com/actions/language-and-framework-guides/using-nodejs-with-github-actions
+
+name: Node.js CI
+
+on:
+  push:
+    branches: [ main ]
+  pull_request:
+    branches: [ main ]
+
+jobs:
+  build:
+
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        node-version: [14.x]
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Use Node.js ${{ matrix.node-version }}
+      uses: actions/setup-node@v1
+      with:
+        node-version: ${{ matrix.node-version }}
+    - run: yarn --frozen-lockfile
+    - run: |
+        echo ::add-matcher::.github/eslint.json
+        yarn run eslint src test --format=compact
+    - run: yarn test

LICENSE

@@ -1,27 +1,13 @@
-Copyright 2013-2016 Mike Bostock
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without modification,
-are permitted provided that the following conditions are met:
-
-* Redistributions of source code must retain the above copyright notice, this
-  list of conditions and the following disclaimer.
-
-* Redistributions in binary form must reproduce the above copyright notice,
-  this list of conditions and the following disclaimer in the documentation
-  and/or other materials provided with the distribution.
-
-* Neither the name of the author nor the names of contributors may be used to
-  endorse or promote products derived from this software without specific prior
-  written permission.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
-ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
-WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
-ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
-(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
-LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON
-ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
-SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+Copyright 2013-2021 Mike Bostock
+
+Permission to use, copy, modify, and/or distribute this software for any purpose
+with or without fee is hereby granted, provided that the above copyright notice
+and this permission notice appear in all copies.
+
+THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES WITH
+REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT,
+INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS
+OF USE, DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
+THIS SOFTWARE.

README.md

@@ -19,7 +19,7 @@ d3.tsvFormat([{foo: "1", bar: "2"}]); // "foo\tbar\n1\t2"
 To use a different delimiter, such as “|” for pipe-separated values, use [d3.dsvFormat](#dsvFormat):
 
 ```js
-var psv = d3.dsvFormat("|");
+const psv = d3.dsvFormat("|");
 
 console.log(psv.parse("foo|bar\n1|2")); // [{foo: "1", bar: "2"}, columns: ["foo", "bar"]]
 ```
@@ -28,18 +28,28 @@ For easy loading of DSV files in a browser, see [d3-fetch](https://github.com/d3
 
 ## Installing
 
-If you use NPM, `npm install d3-dsv`. Otherwise, download the [latest release](https://github.com/d3/d3-dsv/releases/latest). You can also load directly from [d3js.org](https://d3js.org), either as a [standalone library](https://d3js.org/d3-dsv.v1.min.js) or as part of [D3](https://github.com/d3/d3). AMD, CommonJS, and vanilla environments are supported. In vanilla, a `d3` global is exported:
+If you use npm, `npm install d3-dsv`. You can also download the [latest release on GitHub](https://github.com/d3/d3-dsv/releases/latest). For vanilla HTML in modern browsers, import d3-dsv from Skypack:
 
 ```html
-<script src="https://d3js.org/d3-dsv.v1.min.js"></script>
-<script>
+<script type="module">
+
+import {csvParse} from "https://cdn.skypack.dev/d3-dsv@3";
 
-var data = d3.csvParse(string);
+const data = csvParse(string);
 
 </script>
 ```
 
-[Try d3-dsv in your browser.](https://tonicdev.com/npm/d3-dsv)
+For legacy environments, you can load d3-dsv’s UMD bundle from an npm-based CDN such as jsDelivr; a `d3` global is exported:
+
+```html
+<script src="https://cdn.jsdelivr.net/npm/d3-dsv@3"></script>
+<script>
+
+const data = d3.csvParse(string);
+
+</script>
+```
 
 ## API Reference
 
@@ -137,7 +147,7 @@ If a *row* conversion function is not specified, field values are strings. For s
 If a *row* conversion function is specified, the specified function is invoked for each row, being passed an object representing the current row (`d`), the index (`i`) starting at zero for the first non-header row, and the array of column names. If the returned value is null or undefined, the row is skipped and will be omitted from the array returned by *dsv*.parse; otherwise, the returned value defines the corresponding row object. For example:
 
 ```js
-var data = d3.csvParse(string, function(d) {
+const data = d3.csvParse(string, (d) => {
   return {
     year: new Date(+d.Year, 0, 1), // lowercase and convert "Year" to Date
     make: d.Make, // lowercase
@@ -176,7 +186,7 @@ If a *row* conversion function is not specified, field values are strings. For s
 If a *row* conversion function is specified, the specified function is invoked for each row, being passed an array representing the current row (`d`), the index (`i`) starting at zero for the first row, and the array of column names. If the returned value is null or undefined, the row is skipped and will be omitted from the array returned by *dsv*.parse; otherwise, the returned value defines the corresponding row object. For example:
 
 ```js
-var data = d3.csvParseRows(string, function(d, i) {
+const data = d3.csvParseRows(string, (d, i) => {
   return {
     year: new Date(+d[0], 0, 1), // convert first colum column to Date
     make: d[1],
@@ -195,7 +205,7 @@ Formats the specified array of object *rows* as delimiter-separated values, retu
 If *columns* is not specified, the list of column names that forms the header row is determined by the union of all properties on all objects in *rows*; the order of columns is nondeterministic. If *columns* is specified, it is an array of strings representing the column names. For example:
 
 ```js
-var string = d3.csvFormat(data, ["year", "make", "model", "length"]);
+const string = d3.csvFormat(data, ["year", "make", "model", "length"]);
 ```
 
 All fields on each row object will be coerced to strings. If the field value is null or undefined, the empty string is used. If the field value is a Date, the [ECMAScript date-time string format](https://www.ecma-international.org/ecma-262/9.0/index.html#sec-date-time-string-format) (a subset of ISO 8601) is used: for example, dates at UTC midnight are formatted as `YYYY-MM-DD`. For more control over which and how fields are formatted, first map *rows* to an array of array of string, and then use [*dsv*.formatRows](#dsv_formatRows).
@@ -211,7 +221,7 @@ Formats the specified array of array of string *rows* as delimiter-separated val
 To convert an array of objects to an array of arrays while explicitly specifying the columns, use [*array*.map](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/map). For example:
 
 ```js
-var string = d3.csvFormatRows(data.map(function(d, i) {
+const string = d3.csvFormatRows(data.map((d, i) => {
   return [
     d.year.getFullYear(), // Assuming d.year is a Date object.
     d.make,
@@ -224,12 +234,12 @@ var string = d3.csvFormatRows(data.map(function(d, i) {
 If you like, you can also [*array*.concat](https://developer.mozilla.org/en-US/docs/Web/JavaScript/Reference/Global_Objects/Array/concat) this result with an array of column names to generate the first row:
 
 ```js
-var string = d3.csvFormatRows([[
+const string = d3.csvFormatRows([[
     "year",
     "make",
     "model",
     "length"
-  ]].concat(data.map(function(d, i) {
+  ]].concat(data.map((d, i) => {
   return [
     d.year.getFullYear(), // Assuming d.year is a Date object.
     d.make,

bin/dsv2dsv.js

@@ -0,0 +1,35 @@
+#!/usr/bin/env node
+
+import {EOL} from "os";
+import {basename, dirname, resolve} from "path";
+import {readFileSync} from "fs";
+import {fileURLToPath} from "url";
+import rw from "rw";
+import {program} from "commander";
+import iconv from "iconv-lite";
+import {dsvFormat} from "../src/index.js";
+
+const progname = basename(process.argv[1]);
+const defaultInDelimiter = progname.slice(0, 3) === "tsv" ? "\t" : ",";
+const defaultOutDelimiter = progname.slice(-3) === "tsv" ? "\t" : ",";
+
+const options = program
+    .version(JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), "../package.json"))).version)
+    .usage("[options] [file]")
+    .option("-o, --out <file>", "output file name; defaults to “-” for stdout", "-")
+    .option("-r, --input-delimiter <character>", "input delimiter character", defaultInDelimiter)
+    .option("-w, --output-delimiter <character>", "output delimiter character", defaultOutDelimiter)
+    .option("--input-encoding <encoding>", "input character encoding; defaults to “utf8”", "utf8")
+    .option("--output-encoding <encoding>", "output character encoding; defaults to “utf8”", "utf8")
+    .parse(process.argv)
+    .opts();
+
+const inFormat = dsvFormat(options.inputDelimiter);
+const outFormat = dsvFormat(options.outputDelimiter);
+
+rw.dash.readFile(program.args[0] || "-", (error, text) => {
+  if (error) throw error;
+  rw.dash.writeFile("-", iconv.encode(outFormat.format(inFormat.parse(iconv.decode(text, options.inputEncoding))) + EOL, options.outputEncoding), (error) => {
+    if (error) throw error;
+  });
+});

bin/dsv2json.js

@@ -0,0 +1,38 @@
+#!/usr/bin/env node
+
+import {EOL} from "os";
+import {basename, dirname, resolve} from "path";
+import {readFileSync} from "fs";
+import {fileURLToPath} from "url";
+import rw from "rw";
+import {program} from "commander";
+import iconv from "iconv-lite";
+import {dsvFormat} from "../src/index.js";
+
+const progname = basename(process.argv[1]);
+const defaultInDelimiter = progname.slice(0, 3) === "tsv" ? "\t" : ",";
+
+const options = program
+    .version(JSON.parse(readFileSync(resolve(dirname(fileURLToPath(import.meta.url)), "../package.json"))).version)
+    .usage("[options] [file]")
+    .option("-o, --out <file>", "output file name; defaults to “-” for stdout", "-")
+    .option("-r, --input-delimiter <character>", "input delimiter character", defaultInDelimiter)
+    .option("-a, --auto-type", "parse rows with type inference (see d3.autoType)")
+    .option("-n, --newline-delimited", "output newline-delimited JSON")
+    .option("--input-encoding <encoding>", "input character encoding; defaults to “utf8”", "utf8")
+    .option("--output-encoding <encoding>", "output character encoding; defaults to “utf8”", "utf8")
+    .parse(process.argv)
+    .opts();
+
+const inFormat = dsvFormat(options.inputDelimiter);
+
+rw.dash.readFile(program.args[0] || "-", (error, text) => {
+  if (error) throw error;
+  const rowConverter = options.autoType ? dsv.autoType : null
+  const rows = inFormat.parse(iconv.decode(text, options.inputEncoding), rowConverter);
+  rw.dash.writeFile(options.out, iconv.encode(options.newlineDelimited
+      ? rows.map((row) => JSON.stringify(row)).join("\n") + "\n"
+      : JSON.stringify(rows) + EOL, options.outputEncoding), (error) => {
+    if (error) throw error;
+  });
+});