diff --git a/dist/indian-ocean.browser.es6.js b/dist/indian-ocean.browser.es6.js index ae62dbd..c8c51a5 100644 --- a/dist/indian-ocean.browser.es6.js +++ b/dist/indian-ocean.browser.es6.js @@ -6565,6 +6565,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol /** * A port of jQuery's extend. Merge the contents of two or more objects together into the first object. Supports deep extending with `true` as the first argument. * + * @function extend * @param {Boolean} [deepExtend] Optional, set to `true` to merge recursively. * @param {Object} destination The object to modify * @param {Object} source The object whose contents to take @@ -6682,6 +6683,7 @@ function extend$1() { /** * A more semantic convenience function. Delegates to {@link helpers#extend} and passes `true` as the first argument. Recursively merge the contents of two or more objects together into the first object. * + * @function deepExtend * @param {Object} destination The object to modify * @param {Object} source The object whose contents to take * @param {Object} [source2] Optional, You can add any number of objects as arguments. @@ -6734,6 +6736,8 @@ function extname(filename) { /** * Given a `fileName` return its file extension. Used internally by `.discernPaser` and `.discernFileFormatter`. + * + * @function discernFormat * @param {String} fileName the name of the file * @returns {String} the file's extension * @@ -6751,6 +6755,8 @@ function discernFormat(fileName) { /** * Returns a formatter that will format json data to file type specified by the extension in `fileName`. Used internally by `.writeData` and `.writeDataSync`. + * + * @function discernFileFormatter * @param {String} fileName the name of the file * @returns {Object} a formatter that can write the file * @@ -8710,6 +8716,8 @@ formatsList.forEach(function (format) { /** * Given a `fileName` return a parser that can read that file as json. Parses as text if format not supported by a built-in parser. If given a delimter string as the second argument, return a parser for that delimiter regardless of `fileName`. Used internally by `.readData` and `.readDataSync`. + * + * @function discernParser * @param {String} fileName the name of the file * @param {String} delimiter Alternative usage is to pass a delimiter string. Delegates to `dsv.dsvFormat`. * @returns {Object} a parser that can read the file @@ -8736,6 +8744,7 @@ function discernParser(fileName, delimiter) { /** * Test whether a file name has the given extension * + * @function extMatchesStr * @param {String} fileName The name of the file. * @param {String} extension The extension to test. An empty string will match a file with no extension. * @returns {Boolean} whether The extension matched or not. @@ -8765,6 +8774,7 @@ function getParser(delimiterOrParser) { /** * Test whether a string matches a given Regular Expression. * + * @function matchesRegExp * @param {String} fileName The name of the file or file path. * @param {RegExp} RegEx The RegEx to match with. * @returns {Boolean} whether The string matches the RegEx. @@ -8787,6 +8797,7 @@ function isRegExp$1(obj) { /** * Test whether a file name or path matches a given matcher. Delegates to {@link helpers#extMatches} if `matcher` is a string` and tests only against the file name extension. Delegates to {@link helpers#extMatchRegEx} if matcher is a Regular Expression and tests against entire string, which is usefulf or testing the full file path. * + * @function matches * @param {String} fileName The name of the file or path to the file. * @returns {String} matcher The string to match with. * diff --git a/dist/indian-ocean.js b/dist/indian-ocean.js index c5d5e7a..3f9f012 100644 --- a/dist/indian-ocean.js +++ b/dist/indian-ocean.js @@ -6571,6 +6571,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol /** * A port of jQuery's extend. Merge the contents of two or more objects together into the first object. Supports deep extending with `true` as the first argument. * + * @function extend * @param {Boolean} [deepExtend] Optional, set to `true` to merge recursively. * @param {Object} destination The object to modify * @param {Object} source The object whose contents to take @@ -6688,6 +6689,7 @@ function extend$1() { /** * A more semantic convenience function. Delegates to {@link helpers#extend} and passes `true` as the first argument. Recursively merge the contents of two or more objects together into the first object. * + * @function deepExtend * @param {Object} destination The object to modify * @param {Object} source The object whose contents to take * @param {Object} [source2] Optional, You can add any number of objects as arguments. @@ -6740,6 +6742,8 @@ function extname(filename) { /** * Given a `fileName` return its file extension. Used internally by `.discernPaser` and `.discernFileFormatter`. + * + * @function discernFormat * @param {String} fileName the name of the file * @returns {String} the file's extension * @@ -6757,6 +6761,8 @@ function discernFormat(fileName) { /** * Returns a formatter that will format json data to file type specified by the extension in `fileName`. Used internally by `.writeData` and `.writeDataSync`. + * + * @function discernFileFormatter * @param {String} fileName the name of the file * @returns {Object} a formatter that can write the file * @@ -8716,6 +8722,8 @@ formatsList.forEach(function (format) { /** * Given a `fileName` return a parser that can read that file as json. Parses as text if format not supported by a built-in parser. If given a delimter string as the second argument, return a parser for that delimiter regardless of `fileName`. Used internally by `.readData` and `.readDataSync`. + * + * @function discernParser * @param {String} fileName the name of the file * @param {String} delimiter Alternative usage is to pass a delimiter string. Delegates to `dsv.dsvFormat`. * @returns {Object} a parser that can read the file @@ -8742,6 +8750,7 @@ function discernParser(fileName, delimiter) { /** * Test whether a file name has the given extension * + * @function extMatchesStr * @param {String} fileName The name of the file. * @param {String} extension The extension to test. An empty string will match a file with no extension. * @returns {Boolean} whether The extension matched or not. @@ -8771,6 +8780,7 @@ function getParser(delimiterOrParser) { /** * Test whether a string matches a given Regular Expression. * + * @function matchesRegExp * @param {String} fileName The name of the file or file path. * @param {RegExp} RegEx The RegEx to match with. * @returns {Boolean} whether The string matches the RegEx. @@ -8793,6 +8803,7 @@ function isRegExp$1(obj) { /** * Test whether a file name or path matches a given matcher. Delegates to {@link helpers#extMatches} if `matcher` is a string` and tests only against the file name extension. Delegates to {@link helpers#extMatchRegEx} if matcher is a Regular Expression and tests against entire string, which is usefulf or testing the full file path. * + * @function matches * @param {String} fileName The name of the file or path to the file. * @returns {String} matcher The string to match with. * diff --git a/dist/indian-ocean.node.js b/dist/indian-ocean.node.js index 009a088..be5593a 100644 --- a/dist/indian-ocean.node.js +++ b/dist/indian-ocean.node.js @@ -15,6 +15,7 @@ var shapefile = require('shapefile'); /** * Asynchronously read a dbf file. Returns an empty array if file is empty. * + * @function readDbf * @param {String} fileName the name of the file * @param {Function|Object} [map] Optional map function or object with `map` key that is a function, called once for each row (header row skipped). Has signature `(row)`. See example below. * @param {Function} callback callback used when read data is read, takes error (if any) and the data read @@ -1926,6 +1927,8 @@ function joinPath() { /** * Given a `fileName` return its file extension. Used internally by `.discernPaser` and `.discernFileFormatter`. + * + * @function discernFormat * @param {String} fileName the name of the file * @returns {String} the file's extension * @@ -6087,6 +6090,8 @@ formatsList.forEach(function (format) { /** * Returns a formatter that will format json data to file type specified by the extension in `fileName`. Used internally by `.writeData` and `.writeDataSync`. + * + * @function discernFileFormatter * @param {String} fileName the name of the file * @returns {Object} a formatter that can write the file * @@ -6201,6 +6206,7 @@ mkdirP.sync = function sync(p, opts, made) { /** * Asynchronously Create directories in a given file path * + * @function makeDirectories * @param {String} outPath The path to a file * @param {Function} callback The function to do once this is done. Has signature of `(err)` * @@ -6234,6 +6240,7 @@ var _typeof = typeof Symbol === "function" && typeof Symbol.iterator === "symbol * * `.yaml` Yaml file, also supports `.yml` * * `.dbf` Database file, commonly used in ESRI-shapefile format. * + * @function writeData * @param {String} fileName the name of the file * @param {Object} data the data to write * @param {Object} [options] Optional config object, see below @@ -6316,13 +6323,13 @@ function writeData(outPath, data, opts_, cb) { } /** - * Reads in a dbf file with `.readDbf` and write to file using `.writeData`. A convenience function for converting DBFs to more useable formats. Formerly known as `writeDbfToData` and is aliased for legacy support. + * Reads in a dbf fil e with `.readDbf` and write to file using `.writeData`. A convenience function for converting DBFs to more useable formats. Formerly known as `writeDbfToData` and is aliased for legacy support. * - * @param {String} inFileName the input file name - * @param {String} outFileName the output file name - * @param {Object} [options] Optional config object, see below - * @param {Boolean} [options.makeDirectories=false] If true, create intermediate directories to your data file. - * @param {Function} callback callback that takes error (if any) + * @function convertDbfToData + * @param {String} inFilePath Input file path + * @param {String} outFileName Output file path + * @param {Object} [options] Optional config object that's passed to {@link writeData}. See its documentation for full options. + * @param {Function} callback Has signature `(err)` * * @example * io.convertDbfToData('path/to/data.dbf', 'path/to/data.csv', function (err) { @@ -6333,7 +6340,7 @@ function writeData(outPath, data, opts_, cb) { * console.log(err) * }) */ -function dbfToData(inPath, outPath, opts_, cb) { +function convertDbfToData(inPath, outPath, opts_, cb) { if (typeof cb === 'undefined') { cb = opts_; } @@ -6349,6 +6356,7 @@ function dbfToData(inPath, outPath, opts_, cb) { /** * A port of jQuery's extend. Merge the contents of two or more objects together into the first object. Supports deep extending with `true` as the first argument. * + * @function extend * @param {Boolean} [deepExtend] Optional, set to `true` to merge recursively. * @param {Object} destination The object to modify * @param {Object} source The object whose contents to take @@ -6466,6 +6474,7 @@ function extend$1() { /** * A more semantic convenience function. Delegates to {@link helpers#extend} and passes `true` as the first argument. Recursively merge the contents of two or more objects together into the first object. * + * @function deepExtend * @param {Object} destination The object to modify * @param {Object} source The object whose contents to take * @param {Object} [source2] Optional, You can add any number of objects as arguments. @@ -6874,6 +6883,8 @@ formatsList.forEach(function (format) { /** * Given a `fileName` return a parser that can read that file as json. Parses as text if format not supported by a built-in parser. If given a delimter string as the second argument, return a parser for that delimiter regardless of `fileName`. Used internally by `.readData` and `.readDataSync`. + * + * @function discernParser * @param {String} fileName the name of the file * @param {String} delimiter Alternative usage is to pass a delimiter string. Delegates to `dsv.dsvFormat`. * @returns {Object} a parser that can read the file @@ -6899,6 +6910,8 @@ function discernParser(fileName, delimiter) { /** * Asynchronously test whether a file exists or not by using `fs.access` modified from https://github.com/nodejs/io.js/issues/1592#issuecomment-98392899. + * + * @function exists * @param {String} fileName the name of the file * @param {Function} callback has the signature `(err, exists)` * @@ -6924,6 +6937,7 @@ function exists(filename, cb) { /** * Syncronous version of {@link helpers#exists}. Falls back to `fs.existsSync` if that function exists * + * @function existsSync * @param {String} fileName the name of the file * @returns {Boolean} whether the file exists or not * @@ -6947,6 +6961,7 @@ function existsSync(filename) { /** * Test whether a file name has the given extension * + * @function extMatchesStr * @param {String} fileName The name of the file. * @param {String} extension The extension to test. An empty string will match a file with no extension. * @returns {Boolean} whether The extension matched or not. @@ -6976,6 +6991,7 @@ function getParser(delimiterOrParser) { /** * Synchronous version of `makeDirectories` * + * @function makeDirectoriesSync * @param {String} outPath The path to a file * * @example @@ -6989,6 +7005,7 @@ function makeDirectoriesSync(outPath) { /** * Test whether a string matches a given Regular Expression. * + * @function matchesRegExp * @param {String} fileName The name of the file or file path. * @param {RegExp} RegEx The RegEx to match with. * @returns {Boolean} whether The string matches the RegEx. @@ -7011,6 +7028,7 @@ function isRegExp$1(obj) { /** * Test whether a file name or path matches a given matcher. Delegates to {@link helpers#extMatches} if `matcher` is a string` and tests only against the file name extension. Delegates to {@link helpers#extMatchRegEx} if matcher is a Regular Expression and tests against entire string, which is usefulf or testing the full file path. * + * @function matches * @param {String} fileName The name of the file or path to the file. * @returns {String} matcher The string to match with. * @@ -7050,6 +7068,7 @@ function matches(fileName, matcher) { * * *Note: Does not currently support `.dbf` files. `.yaml` and `.yml` formats are read with js-yaml's `.load` method, which has no security checking. See js-yaml library for more secure options.* * + * @function readData * @param {String} fileName the name of the file * @param {Object|Function} [parserOptions] Optional. Set this as a function as a shorthand for `map`. * @param {String|Function|Object} [parserOptions.parser] optional This can be a string that is the file's delimiter or a function that returns the json. See `parsers` in library source for examples. For convenience, this can also take a dsv object such as `dsv.dsv('_')` or any object that has a `parse` method that's a function. @@ -7165,6 +7184,7 @@ function readData(filePath, opts_, cb_) { /** * Syncronous version of {@link readers#readData} * + * @function readDataSync * @param {String} fileName the name of the file * @param {Function|Object} [parserOptions] Can be a map function, or an object specifying other options. * @param {String|Function|Object} [parserOptions.parser] optional This can be a string that is the file's delimiter or a function that returns the json. See `parsers` in library source for examples. For convenience, this can also take a dsv object such as `dsv.dsv('_')` or any object that has a `parse` method that's a function. @@ -7188,7 +7208,7 @@ function readData(filePath, opts_, cb_) { * console.log(data) // Json data * * // Parser as an object with a `parse` method - * var naiveJsonLines = function(dataAsString) + * var naiveJsonLines = function(dataAsString) { * return dataAsString.split('\n').map(function (row) { return JSON.parse(row) }) * } * var data = io.readDataSync('path/to/data.jsonlines', {parser: naiveJsonLines}) @@ -7507,6 +7527,7 @@ function readdir(modeInfo, dirPath, opts_, cb) { /** * Get a list of a directory's files and folders if certain critera are met. * + * @function readdirFilter * @param {String} dirPath The directory to read from * @param {Object} options Optional, filter options, see below * @param {String|RegExp|Array|Array} options.include If given a string, return files that have that string as their extension. If given a Regular Expression, return the file that matches the pattern. Can also take a list of both. List matching behavior is described in `includeAll`. @@ -7541,6 +7562,7 @@ function readdirFilter(dirPath, opts_, cb) { /** * Synchronously get a list of a directory's files and folders if certain critera are met. * + * @function readdirFilterSync * @param {String} dirPath The directory to read from * @param {Object} [options] Optional, filter options, see below * @param {String|RegExp|Array|Array} [options.include] Optional, if given a string, return files that have that string as their extension. If given a Regular Expression, return the file that matches the pattern. Can also take a list of both. List matching behavior is described in `includeAll`. @@ -7571,6 +7593,7 @@ function readdirFilterSync(dirPath, opts_) { /** * Asynchronously read an ArchieMl file. Returns an empty object if file is empty. * + * @function readAml * @param {String} fileName the name of the file. * @param {Function} [map] Optional map function. Takes the parsed filed, return modified file. See example below. * @param {Function} callback callback used when read data is read, takes error (if any) and the data read. @@ -7601,6 +7624,7 @@ function readAml(path$$1, opts_, cb) { /** * Synchronously read an ArchieML file. Returns an empty TK if file is empty. * + * @function readAmlSync * @param {String} fileName the name of the file * @param {Function} [map] Optional map function. Takes the parsed filed, return modified file. See example below. * @returns {Object} the contents of the file as a string @@ -7626,6 +7650,7 @@ function readAmlSync(path$$1, opts_) { /** * Asynchronously read a comma-separated value file. Returns an empty array if file is empty. * + * @function readCsv * @param {String} fileName the name of the file * @param {Function} [map] Optional map function, called once for each row (header row skipped). Has signature `(row, i, columns)`. See example below or d3-dsv documentation for details. * @param {Function} callback callback used when read data is read, takes error (if any) and the data read @@ -7657,6 +7682,7 @@ function readCsv(path$$1, opts_, cb) { /** * Synchronously read a comma-separated value file. Returns an empty array if file is empty. * + * @function readCsvSync * @param {String} fileName the name of the file * @param {Function|Object} [map] Optional map function, called once for each row (header row skipped). Has signature `(row, i, columns)`. See example below or d3-dsv documentation for details. * @returns {Array} the contents of the file as JSON @@ -7684,6 +7710,7 @@ function readCsvSync(path$$1, opts_) { /** * Asynchronously read a JSON file. Returns an empty array if file is empty. * + * @function readJson * @param {String} fileName the name of the file * @param {Function|Object} [parserOptions] Can be a map function, or an object specifying other options. * @param {Function} [parserOptions.map] Optional map function, called once for each row (header row skipped). If your file is an array (tests if first non-whitespace character is a `[`), has signature `(row, i)`, delegates to `_.map`. If file is an object has signature `(value, key)`, delegates to `_.mapObject`. See example below. @@ -7759,6 +7786,7 @@ function readJson(path$$1, opts_, cb) { /** * Synchronously read a JSON file. Returns an empty array if file is empty. * + * @function readJsonSync * @param {String} fileName the name of the file * @param {Function|Object} [parserOptions] Can be a map function, or an object specifying other options. * @param {Function} [parserOptions.map] Optional map function, called once for each row (header row skipped). If your file is an array (tests if first non-whitespace character is a `[`), has signature `(row, i)`, delegates to `_.map`. If file is an object has signature `(value, key)`, delegates to `_.mapObject`. See example below. @@ -7808,6 +7836,7 @@ function readJsonSync(path$$1, opts_) { /** * Asynchronously read a pipe-separated value file. Returns an empty array if file is empty. * + * @function readPsv * @param {String} fileName the name of the file * @param {Function} [map] Optional map function, called once for each row (header row skipped). Has signature `(row, i, columns)`. See example below or d3-dsv documentation for details. * @param {Function} callback callback used when read data is read, takes error (if any) and the data read @@ -7839,6 +7868,7 @@ function readPsv(path$$1, opts_, cb) { /** * Synchronously read a pipe-separated value file. Returns an empty array if file is empty. * + * @function readPsvSync * @param {String} fileName the name of the file * @param {Function} [map] Optional map function, called once for each row (header row skipped). Has signature `(row, i, columns)`. See example below or d3-dsv documentation for details. * @returns {Array} the contents of the file as JSON @@ -7865,6 +7895,7 @@ function readPsvSync(path$$1, opts_) { /** * Asynchronously read a tab-separated value file. Returns an empty array if file is empty. * + * @function readTsv * @param {String} fileName the name of the file * @param {Function} [map] Optional map function, called once for each row (header row skipped). Has signature `(row, i, columns)`. See example below or d3-dsv documentation for details. * @param {Function} callback callback used when read data is read, takes error (if any) and the data read @@ -7896,6 +7927,7 @@ function readTsv(path$$1, opts_, cb) { /** * Synchronously read a tab-separated value file. Returns an empty array if file is empty. * + * @function readTsvSync * @param {String} fileName the name of the file * @param {Function} [map] Optional map function, called once for each row (header row skipped). Has signature `(row, i, columns)`. See example below or d3-dsv documentation for details. * @returns {Array} the contents of the file as JSON @@ -7923,6 +7955,7 @@ function readTsvSync(path$$1, opts_) { /** * Asynchronously read a text file. Returns an empty string if file is empty. * + * @function readTxt * @param {String} fileName the name of the file * @param {Function} [map] Optional map function, take the file and returns any mapped value * @param {Function} callback callback used when read data is read, takes error (if any) and the data read @@ -7951,6 +7984,7 @@ function readTxt(path$$1, opts_, cb) { /** * Synchronously read a text file. Returns an empty string if file is empty. * + * @function readTxtSync * @param {String} fileName the name of the file * @param {Function} [map] Optional map function, called once for each row (header row skipped). Has signature `(row, i, columns)`. See example below or d3-dsv documentation for details. * @returns {Array} the contents of the file as a string @@ -7975,6 +8009,7 @@ function readTxtSync(path$$1, opts_) { /** * Asynchronously read a yaml file. Returns an empty object if file is empty. `parseOptions` will pass any other optinos directl to js-yaml library. See its documentation for more detail https://github.com/nodeca/js-yaml * + * @function readYaml * @param {String} fileName the name of the file * @param {Function|Object} [parserOptions] Can be a map function or an object specifying that or other options. * @param {Function} [parserOptions.map] Optional map function. Takes the parsed filed, return modified file. See example below. @@ -8019,6 +8054,7 @@ function readYaml(path$$1, opts_, cb) { /** * Synchronously read a yaml file. Returns an empty object if file is empty. `parseOptions` will pass any other optinos directl to js-yaml library. See its documentation for more detail https://github.com/nodeca/js-yaml * + * @function readYamlSync * @param {String} fileName the name of the file * @param {Function|Object} [parserOptions] Can be a map function or an object specifying that or other options. * @param {Function} [parserOptions.map] Optional map function. Takes the parsed filed, return modified file. See example below. @@ -8068,6 +8104,7 @@ function readYamlSync(path$$1, opts_) { * * *Note: Does not currently support .dbf files.* * + * @function appendData * @param {String} fileName the name of the file * @param {Object} data the data to write * @param {Object} [options] Optional config object, see below @@ -8125,6 +8162,7 @@ function appendData(outPath, data, opts_, cb) { * * Supports the same formats with the exception of `.dbf` files * + * @function writeDataSync * @param {String} fileName the name of the file * @param {Object} [options] Optional config object, see below * @param {Boolean} [options.makeDirectories=false] If true, create intermediate directories to your data file. @@ -8181,6 +8219,7 @@ function writeDataSync(outPath, data, opts_) { /** * Synchronous version of {@link writers#appendData}. See that function for supported formats * + * @function appendDataSync * @param {String} fileName the name of the file * @param {Object} [options] Optional config object, see below * @param {Boolean} [options.makeDirectories=false] If true, create intermediate directories to your data file. @@ -8212,7 +8251,8 @@ function appendDataSync(outPath, data, opts_) { // converters -exports.convertDbfToData = dbfToData; +exports.convertDbfToData = convertDbfToData; +exports.writeDbfToData = convertDbfToData; exports.formatters = formatters; exports.formatCsv = csv; exports.formatDbf = dbf; @@ -8248,9 +8288,9 @@ exports.readdirFilter = readdirFilter; exports.readdirFilterSync = readdirFilterSync; exports.readAml = readAml; exports.readAmlSync = readAmlSync; -exports.readDbf = readDbf; exports.readCsv = readCsv; exports.readCsvSync = readCsvSync; +exports.readDbf = readDbf; exports.readJson = readJson; exports.readJsonSync = readJsonSync; exports.readPsv = readPsv; diff --git a/docs/index.html b/docs/index.html index 1208785..808b029 100644 --- a/docs/index.html +++ b/docs/index.html @@ -511,7 +511,7 @@

- + source @@ -719,7 +719,7 @@

- + source @@ -906,7 +906,7 @@

- + source @@ -1090,7 +1090,7 @@

- + source @@ -1285,7 +1285,7 @@

- + source @@ -1503,7 +1503,7 @@

- + source @@ -1694,7 +1694,7 @@

- + source @@ -1837,7 +1837,7 @@

- + source @@ -1975,7 +1975,7 @@

- + source @@ -2073,7 +2073,7 @@

- + source @@ -2167,7 +2167,7 @@

- + source @@ -2270,7 +2270,7 @@

- + source @@ -2371,7 +2371,7 @@

- + source @@ -2469,7 +2469,7 @@

- + source @@ -2657,7 +2657,7 @@

- + source @@ -2828,7 +2828,7 @@

- + source @@ -2929,7 +2929,7 @@

- + source @@ -3026,7 +3026,7 @@

- + source @@ -3127,7 +3127,7 @@

- + source @@ -3225,7 +3225,7 @@

- + source @@ -3321,7 +3321,7 @@

- + source @@ -3416,7 +3416,7 @@

- + source @@ -3560,7 +3560,7 @@

- + source @@ -3715,7 +3715,7 @@

- + source @@ -3836,7 +3836,7 @@

- + source @@ -3953,7 +3953,7 @@

- + source @@ -4032,7 +4032,7 @@

- + source @@ -4111,7 +4111,7 @@

- + source @@ -4203,7 +4203,7 @@

- + source @@ -4285,7 +4285,7 @@

- + source @@ -4364,7 +4364,7 @@

- + source @@ -4508,7 +4508,7 @@

- + source @@ -4596,7 +4596,7 @@

- + source @@ -4678,7 +4678,7 @@

- + source @@ -4748,7 +4748,7 @@

- + source @@ -4833,7 +4833,7 @@

- + source diff --git a/index.node.js b/index.node.js index 189707a..6de72e9 100644 --- a/index.node.js +++ b/index.node.js @@ -38,22 +38,22 @@ export {default as readData} from './src/readers/readData' export {default as readDataSync} from './src/readers/readDataSync' export {default as readdirFilter} from './src/readers/readdirFilter' export {default as readdirFilterSync} from './src/readers/readdirFilterSync' -// shorthandreaders -export {default as readAml} from './src/shorthandreaders/readAml' -export {default as readAmlSync} from './src/shorthandreaders/readAmlSync' -export {default as readDbf} from './src/readers/readDbf' -export {default as readCsv} from './src/shorthandreaders/readCsv' -export {default as readCsvSync} from './src/shorthandreaders/readCsvSync' -export {default as readJson} from './src/shorthandreaders/readJson' -export {default as readJsonSync} from './src/shorthandreaders/readJsonSync' -export {default as readPsv} from './src/shorthandreaders/readPsv' -export {default as readPsvSync} from './src/shorthandreaders/readPsvSync' -export {default as readTsv} from './src/shorthandreaders/readTsv' -export {default as readTsvSync} from './src/shorthandreaders/readTsvSync' -export {default as readTxt} from './src/shorthandreaders/readTxt' -export {default as readTxtSync} from './src/shorthandreaders/readTxtSync' -export {default as readYaml} from './src/shorthandreaders/readYaml' -export {default as readYamlSync} from './src/shorthandreaders/readYamlSync' +// directReaders +export {default as readAml} from './src/directReaders/readAml' +export {default as readAmlSync} from './src/directReaders/readAmlSync' +export {default as readCsv} from './src/directReaders/readCsv' +export {default as readCsvSync} from './src/directReaders/readCsvSync' +export {default as readDbf} from './src/directReaders/readDbf' +export {default as readJson} from './src/directReaders/readJson' +export {default as readJsonSync} from './src/directReaders/readJsonSync' +export {default as readPsv} from './src/directReaders/readPsv' +export {default as readPsvSync} from './src/directReaders/readPsvSync' +export {default as readTsv} from './src/directReaders/readTsv' +export {default as readTsvSync} from './src/directReaders/readTsvSync' +export {default as readTxt} from './src/directReaders/readTxt' +export {default as readTxtSync} from './src/directReaders/readTxtSync' +export {default as readYaml} from './src/directReaders/readYaml' +export {default as readYamlSync} from './src/directReaders/readYamlSync' // writers export {default as appendData} from './src/writers/appendData' export {default as appendDataSync} from './src/writers/appendDataSync' diff --git a/src/converters/convertDbfToData.js b/src/converters/convertDbfToData.js index a4a977b..5ba0943 100644 --- a/src/converters/convertDbfToData.js +++ b/src/converters/convertDbfToData.js @@ -1,4 +1,4 @@ -import readDbf from '../readers/readDbf' +import readDbf from '../directReaders/readDbf' import writeData from '../writers/writeData' /** diff --git a/src/shorthandreaders/readAml.js b/src/directReaders/readAml.js similarity index 100% rename from src/shorthandreaders/readAml.js rename to src/directReaders/readAml.js diff --git a/src/shorthandreaders/readAmlSync.js b/src/directReaders/readAmlSync.js similarity index 100% rename from src/shorthandreaders/readAmlSync.js rename to src/directReaders/readAmlSync.js diff --git a/src/shorthandreaders/readCsv.js b/src/directReaders/readCsv.js similarity index 100% rename from src/shorthandreaders/readCsv.js rename to src/directReaders/readCsv.js diff --git a/src/shorthandreaders/readCsvSync.js b/src/directReaders/readCsvSync.js similarity index 100% rename from src/shorthandreaders/readCsvSync.js rename to src/directReaders/readCsvSync.js diff --git a/src/readers/readDbf.js b/src/directReaders/readDbf.js similarity index 100% rename from src/readers/readDbf.js rename to src/directReaders/readDbf.js diff --git a/src/shorthandreaders/readJson.js b/src/directReaders/readJson.js similarity index 100% rename from src/shorthandreaders/readJson.js rename to src/directReaders/readJson.js diff --git a/src/shorthandreaders/readJsonSync.js b/src/directReaders/readJsonSync.js similarity index 100% rename from src/shorthandreaders/readJsonSync.js rename to src/directReaders/readJsonSync.js diff --git a/src/shorthandreaders/readPsv.js b/src/directReaders/readPsv.js similarity index 100% rename from src/shorthandreaders/readPsv.js rename to src/directReaders/readPsv.js diff --git a/src/shorthandreaders/readPsvSync.js b/src/directReaders/readPsvSync.js similarity index 100% rename from src/shorthandreaders/readPsvSync.js rename to src/directReaders/readPsvSync.js diff --git a/src/shorthandreaders/readTsv.js b/src/directReaders/readTsv.js similarity index 100% rename from src/shorthandreaders/readTsv.js rename to src/directReaders/readTsv.js diff --git a/src/shorthandreaders/readTsvSync.js b/src/directReaders/readTsvSync.js similarity index 100% rename from src/shorthandreaders/readTsvSync.js rename to src/directReaders/readTsvSync.js diff --git a/src/shorthandreaders/readTxt.js b/src/directReaders/readTxt.js similarity index 100% rename from src/shorthandreaders/readTxt.js rename to src/directReaders/readTxt.js diff --git a/src/shorthandreaders/readTxtSync.js b/src/directReaders/readTxtSync.js similarity index 100% rename from src/shorthandreaders/readTxtSync.js rename to src/directReaders/readTxtSync.js diff --git a/src/shorthandreaders/readYaml.js b/src/directReaders/readYaml.js similarity index 100% rename from src/shorthandreaders/readYaml.js rename to src/directReaders/readYaml.js diff --git a/src/shorthandreaders/readYamlSync.js b/src/directReaders/readYamlSync.js similarity index 100% rename from src/shorthandreaders/readYamlSync.js rename to src/directReaders/readYamlSync.js