es6 file

package.json

@@ -3,14 +3,15 @@
   "version": "2.0.2",
   "description": "A library for reading in and writing out data in Node.js.",
   "main": "dist/indian-ocean.node.js",
+  "browser": "dist/indian-ocean.browser.es6.js",
   "module": "index.node.js",
   "scripts": {
     "docs-view": "npm run build-docs && npm run serve-docs",
     "coverage": "istanbul cover mocha -- -R spec",
     "build-docs": "documentation -g -f html -o docs -t ./docs/theme/",
     "build:node": "rollup --config rollup.config.node.js",
-    "build:umd": "rollup --config rollup.config.browser.js --banner \"$(preamble)\" && uglifyjs --preamble \"$(preamble)\" -o dist/indian-ocean.min.js -cm -- dist/indian-ocean.js",
-    "build": "rm -rf dist && mkdir dist && npm run build:node && npm run build:umd",
+    "build:browser": "rollup --config rollup.config.browser.js --banner \"$(preamble)\" && uglifyjs --preamble \"$(preamble)\" -o dist/indian-ocean.min.js -cm -- dist/indian-ocean.js",
+    "build": "rm -rf dist && mkdir dist && npm run build:node && npm run build:browser",
     "dev": "rm -rf dist && mkdir dist && rollup --config -w",
     "serve-docs": "http-server docs -p 8080 -o",
     "start": "npm run build && npm test",
@@ -55,7 +56,6 @@
     "js-yaml": "^3.4.2",
     "lodash": "^4.17.4",
     "mkdirp": "^0.5.1",
-    "parse-json": "^2.2.0",
     "shapefile": "^0.6.2",
     "text-encoding": "^0.6.4"
   },
@@ -73,8 +73,6 @@
     "rollup": "^0.41.4",
     "rollup-plugin-babel": "^2.7.1",
     "rollup-plugin-commonjs": "^7.0.0",
-    "rollup-plugin-node-builtins": "^2.1.0",
-    "rollup-plugin-node-globals": "^1.1.0",
     "rollup-plugin-node-resolve": "^2.0.0",
     "rollup-watch": "^3.2.2",
     "standard": "^8.3.0",

rollup.config.browser.js

@@ -1,3 +1,4 @@
+// TODO, break this out into its own browser repo to avoid the need for builtins and globals
 import babel from 'rollup-plugin-babel'
 import nodeResolve from 'rollup-plugin-node-resolve'
 import commonjs from 'rollup-plugin-commonjs'
@@ -6,8 +7,15 @@ import globals from 'rollup-plugin-node-globals'
 
 export default {
   entry: 'index.browser.js',
-  format: 'umd',
   moduleName: 'io',
-  plugins: [ babel(), nodeResolve(), commonjs(), builtins(), globals() ],
-  dest: 'dist/indian-ocean.js'
+  plugins: [nodeResolve(), commonjs(), builtins(), globals(), babel()],
+  targets: [
+    {
+      format: 'umd',
+      dest: 'dist/indian-ocean.js'
+    }, {
+      format: 'es',
+      dest: 'dist/indian-ocean.browser.es6.js'
+    }
+  ]
 }

rollup.config.node.js

@@ -5,7 +5,7 @@ import commonjs from 'rollup-plugin-commonjs'
 export default {
   entry: 'index.node.js',
   format: 'cjs',
-  plugins: [ babel(), nodeResolve(), commonjs() ],
+  plugins: [ nodeResolve(), commonjs(), babel() ],
   dest: 'dist/indian-ocean.node.js',
   external: ['fs', 'path', 'util']
 }

src/parsers/json.js

@@ -1,12 +1,11 @@
-import parseJson from 'parse-json'
-import mapValues from 'lodash/mapValues'
 import identity from '../utils/identity'
-import map from 'lodash/map'
+import _ from 'underscore'
 
 export default function (str, parserOptions) {
   parserOptions = parserOptions || {}
     // Do a naive test whether this is a string or an object
-  var mapFn = parserOptions.map ? str.trim().charAt(0) === '[' ? map : mapValues : identity
-  var jsonParser = parserOptions.nativeParser === true ? JSON.parse : parseJson
+  var mapFn = parserOptions.map ? str.trim().charAt(0) === '[' ? _.map : _.mapObject : identity
+  var jsonParser = parserOptions.nativeParser === true ? JSON.parse : JSON.parse
+  // var jsonParser = parserOptions.nativeParser === true ? JSON.parse : parseJson
   return mapFn(jsonParser(str, parserOptions.reviver, parserOptions.filename), parserOptions.map)
 }

src/readers/readData.js

@@ -3,7 +3,7 @@ import getParser from '../helpers/getParser'
 import discernParser from '../helpers/discernParser'
 import discernFormat from '../helpers/discernFormat'
 import {formatsIndex} from '../config/equivalentFormats'
-import isEmpty from 'lodash/isEmpty'
+import _ from 'underscore'
 
 /**
  * Asynchronously read data given a path ending in the file format.
@@ -88,7 +88,7 @@ export default function readData (filePath, opts_, cb_) {
     if (opts_.parser) {
       parser = getParser(opts_.parser)
       delete opts_.parser
-      if (isEmpty(opts_)) {
+      if (_.isEmpty(opts_)) {
         opts_ = undefined
       }
     } else {

src/readers/readDataSync.js

@@ -3,7 +3,7 @@ import getParser from '../helpers/getParser'
 import discernParser from '../helpers/discernParser'
 import discernFormat from '../helpers/discernFormat'
 import {formatsIndex} from '../config/equivalentFormats'
-import isEmpty from 'lodash/isEmpty'
+import _ from 'underscore'
 
 /**
  * Syncronous version of {@link readers#readData}
@@ -66,7 +66,7 @@ export default function readDataSync (filePath, opts_) {
     if (opts_.parser) {
       parser = getParser(opts_.parser)
       delete opts_.parser
-      if (isEmpty(opts_)) {
+      if (_.isEmpty(opts_)) {
         opts_ = undefined
       }
     } else {

src/writers/appendData.js

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import isEmpty from 'lodash/isEmpty'
+import _ from 'underscore'
 import makeDirectories from '../helpers/makeDirectories'
 import readData from '../readers/readData'
 import writeData from './writeData'
@@ -51,7 +51,7 @@ export default function appendData (outPath, data, opts_, cb) {
       if (!err) {
         readData(outPath, function (err, existingData) {
           if (!err) {
-            if (!isEmpty(existingData)) {
+            if (!_.isEmpty(existingData)) {
               if (Array.isArray(existingData)) {
                 data = existingData.concat(data)
               } else if (typeof existingData === 'object') {

src/writers/appendDataSync.js

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import isEmpty from 'lodash/isEmpty'
+import _ from 'underscore'
 import makeDirectoriesSync from '../helpers/makeDirectoriesSync'
 import readDataSync from '../readers/readDataSync'
 import writeDataSync from './writeDataSync'
@@ -26,7 +26,7 @@ export default function appendDataSync (outPath, data, opts_) {
   }
   fs.appendFileSync(outPath, '')
   var existingData = readDataSync(outPath)
-  if (!isEmpty(existingData)) {
+  if (!_.isEmpty(existingData)) {
     if (Array.isArray(existingData)) {
       data = existingData.concat(data)
     } else if (typeof existingData === 'object') {

src/writers/writeData.js

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import isEmpty from 'lodash/isEmpty'
+import _ from 'underscore'
 import warn from '../reporters/warn'
 import discernFileFormatter from '../helpers/discernFileFormatter'
 import makeDirectories from '../helpers/makeDirectories'
@@ -68,7 +68,7 @@ export default function writeData (outPath, data, opts_, cb) {
     cb = opts_
     opts_ = undefined
   }
-  if (isEmpty(data)) {
+  if (_.isEmpty(data)) {
     warn('You didn\'t pass any data to write for file: `' + outPath + '`. Writing out an empty file...')
   }
 

src/writers/writeDataSync.js

@@ -1,5 +1,5 @@
 import fs from 'fs'
-import isEmpty from 'lodash/isEmpty'
+import _ from 'underscore'
 import warn from '../reporters/warn'
 import discernFileFormatter from '../helpers/discernFileFormatter'
 import makeDirectoriesSync from '../helpers/makeDirectoriesSync'
@@ -45,7 +45,7 @@ import makeDirectoriesSync from '../helpers/makeDirectoriesSync'
  * })
  */
 export default function writeDataSync (outPath, data, opts_) {
-  if (isEmpty(data)) {
+  if (_.isEmpty(data)) {
     warn('You didn\'t pass any data to write for file: `' + outPath + '`. Writing out an empty file...')
   }
   var writeOptions

test/test.js

@@ -2129,7 +2129,7 @@ describe('shorthandReaders', function () {
     describe('invalid', function () {
       it('should raise an error', function (done) {
         io.readJson(testDataPath('json/invalid.json'), function (err, json) {
-          assert.equal(err.message, 'Unexpected token \'w\' at 1:3\n{ wrong: }\n  ^')
+          assert.equal(err.message, 'Unexpected token w in JSON at position 2')
           done()
         })
       })