[datajs][lg]: move src code outside datajs folder

Author: risenW

datajs/browser-test/index.spec.js

@@ -11,15 +11,15 @@ module.exports = function (config) {
     frameworks: ['jasmine', 'browserify'],
 
     // list of files / patterns to load in the browser
-    files: ['dist/browser/bundle.js', 'datajs/browser-test/*.js'],
+    files: ['dist/browser/bundle.js', 'browser-test/*.js'],
 
     // list of files / patterns to exclude
     exclude: [],
 
     // preprocess matching files before serving them to the browser
     // available preprocessors: https://npmjs.org/browse/keyword/karma-preprocessor
     preprocessors: {
-      'datajs/browser-test/*.js': ['browserify'],
+      'browser-test/*.js': ['browserify'],
     },
 
     // test results reporter to use

karma.conf.js

@@ -4,19 +4,19 @@
   "description": "",
   "main": "dist/node/index.js",
   "directories": {
-    "test": "datajs/test"
+    "test": "src/test"
   },
   "scripts": {
     "test": "yarn run test:node && yarn run test:browser",
     "test:browser": "yarn run build:browser && karma start karma.conf.js --browsers=ChromeHeadless",
-    "test:node": "nyc mocha --require @babel/register datajs/test/*",
+    "test:node": "nyc mocha --require @babel/register test/*",
     "build:browser": "webpack --mode production",
-    "build:node": "babel ./datajs/ -d ./dist/node --no-comments",
+    "build:node": "babel ./src/ -d ./dist/node --no-comments",
     "build": "yarn run build:node && yarn run build:browser",
     "build:watch": "webpack --watch",
     "coveralls": "cat ./coverage/lcov.info | ./node_modules/.bin/coveralls",
     "coverage": "nyc report --reporter=text-lcov | coveralls && nyc report --reporter=lcov",
-    "lint": "eslint ./datajs"
+    "lint": "eslint ./src"
   },
   "repository": {
     "type": "git",

package.json

@@ -1,7 +1,7 @@
 import assert from 'assert'
 import path from 'path'
 import nock from 'nock'
-import * as data from '../data'
+import * as data from '../src/data'
 
 describe('isUrl', () => {
   it('Tests if given path is url or not', async () => {
@@ -160,15 +160,15 @@ describe('parsePath', () => {
 
 describe('isDataset', () => {
   it('isDataset function works on different examples', async () => {
-    let pathToDataset = 'datajs/test/fixtures/co2-ppm'
+    let pathToDataset = 'test/fixtures/co2-ppm'
     let res = data.isDataset(pathToDataset)
     assert.strictEqual(res, true)
 
-    pathToDataset = 'datajs/test/fixtures/co2-ppm/datapackage.json'
+    pathToDataset = 'test/fixtures/co2-ppm/datapackage.json'
     res = data.isDataset(pathToDataset)
     assert.strictEqual(res, true)
 
-    const pathToFile = 'datajs/test/fixtures/sample.csv'
+    const pathToFile = 'test/fixtures/sample.csv'
     res = data.isDataset(pathToFile)
     assert.strictEqual(res, false)
 

datajs/browser-utils/utils.js renamed to src/browser-utils/utils.js

@@ -1,8 +1,8 @@
 import assert from 'assert'
 import path from 'path'
 import nock from 'nock'
-import * as data from '../data'
-import { Dataset } from '../dataset'
+import * as data from '../src/data'
+import { Dataset } from '../src/dataset'
 
 describe('Dataset', () => {
   it('Dataset constructor works', async () => {
@@ -18,14 +18,14 @@ describe('Dataset', () => {
   })
 
   it('Dataset with inline README works', async () => {
-    const path = 'datajs/test/fixtures/dp-with-inline-readme'
+    const path = 'test/fixtures/dp-with-inline-readme'
     const dataset = await Dataset.load(path)
     assert.deepStrictEqual(dataset.identifier.type, 'local')
     assert.deepStrictEqual(dataset.readme, 'This is the README')
   })
 
   it('Dataset.load works with co2-ppm', async () => {
-    const path = 'datajs/test/fixtures/co2-ppm'
+    const path = 'test/fixtures/co2-ppm'
     const dataset2 = await Dataset.load(path)
     assert.strictEqual(dataset2.identifier.type, 'local')
 
@@ -34,7 +34,7 @@ describe('Dataset', () => {
     assert.strictEqual(dataset2.resources[0].descriptor.name, 'co2-mm-mlo')
     assert.strictEqual(
       dataset2.resources[0].path.includes(
-        'datajs/test/fixtures/co2-ppm/data/co2-mm-mlo.csv'
+        'test/fixtures/co2-ppm/data/co2-mm-mlo.csv'
       ),
       true
     )
@@ -47,7 +47,7 @@ describe('Dataset', () => {
   })
 
   it('Dataset.load with dir/datapckage.json', async () => {
-    const path = 'datajs/test/fixtures/co2-ppm/datapackage.json'
+    const path = 'test/fixtures/co2-ppm/datapackage.json'
     const dataset = await Dataset.load(path)
     assert.strictEqual(dataset.descriptor.name, 'co2-ppm')
     assert.strictEqual(dataset.identifier.type, 'local')
@@ -91,7 +91,7 @@ describe('Dataset', () => {
   it('Dataset.addResource method works', async () => {
     const resourceAsPlainObj = {
       name: 'sample',
-      path: 'datajs/test/fixtures/sample.csv',
+      path: 'test/fixtures/sample.csv',
       format: 'csv',
     }
     const resourceAsFileObj = data.open(resourceAsPlainObj)

datajs/data.js renamed to src/data.js

@@ -1,11 +1,11 @@
 import assert from 'assert'
-import * as data from '../data'
+import * as data from '../src/data'
 import toArray from 'stream-to-array'
-import { File } from '../file-base'
+import { File } from '../src/file-base'
 // common method to test all the functionality which we can use for all types
 // of files
 export const testFile = async (assert, file) => {
-  assert.strictEqual(file.path, 'datajs/test/fixtures/sample.csv')
+  assert.strictEqual(file.path, 'test/fixtures/sample.csv')
   assert.strictEqual(file.size, 46)
   await testFileStream(assert, file)
 }
@@ -47,7 +47,7 @@ export const testFileStream = async (assert, file) => {
 
 describe('File Base', async () => {
   it('cyrillic encoding is working', () => {
-    const path_ = 'datajs/test/fixtures/sample-cyrillic-encoding.csv'
+    const path_ = 'test/fixtures/sample-cyrillic-encoding.csv'
     const file = data.open(path_)
     //const buffer = await file.buffer
     //t.is(buffer.toString().slice(0, 12), 'номер, город')
@@ -56,32 +56,32 @@ describe('File Base', async () => {
 
   it('File class with path', async () => {
     // With path
-    const path_ = 'datajs/test/fixtures/sample.csv'
+    const path_ = 'test/fixtures/sample.csv'
     const res = data.open(path_)
     await testFile(assert, res)
   })
 
   it('File class with descriptor', async () => {
-    const descriptor = { path: 'datajs/test/fixtures/sample.csv' }
+    const descriptor = { path: 'test/fixtures/sample.csv' }
     const obj2 = data.open(descriptor)
     await testFile(assert, obj2)
   })
 
   it('File with path and basePath', async () => {
-    const obj3 = data.open('sample.csv', { basePath: 'datajs/test/fixtures' })
+    const obj3 = data.open('sample.csv', { basePath: 'test/fixtures' })
     testFile(assert, obj3)
   })
 
   it('File name has spaces and dots', async () => {
-    let path_ = 'datajs/test/fixtures/some file.name.ext'
+    let path_ = 'test/fixtures/some file.name.ext'
     let file = File.load(path_)
     assert.strictEqual(file.descriptor.name, 'some-file.name')
   })
 })
 
 describe('bufferInChunks', () => {
   it('File is loaded in chunks', async () => {
-    const path_ = 'datajs/test/fixtures/sample-cyrillic-encoding.csv'
+    const path_ = 'test/fixtures/sample-cyrillic-encoding.csv'
     const file = data.open(path_)
 
     file.bufferInChunks((chunk, percent) => {
@@ -93,7 +93,7 @@ describe('bufferInChunks', () => {
 
 describe('hashSha256', () => {
   it('hashSha256 returns right hash', async () => {
-    const path_ = 'datajs/test/fixtures/sample-cyrillic-encoding.csv'
+    const path_ = 'test/fixtures/sample-cyrillic-encoding.csv'
     const file = data.open(path_)
 
     let hash = await file.hashSha256()

datajs/dataset.js renamed to src/dataset.js

@@ -1,5 +1,5 @@
 import assert from 'assert'
-import * as data from '../data'
+import * as data from '../src/data'
 import toArray from 'stream-to-array'
 import { testFile } from './file-base'
 
@@ -20,7 +20,7 @@ describe('File-Inline', () => {
     const inlineData = `number,string,boolean\n1,two,true\n3,four,false`
     // To make it testable with testFile we add the path but it is not needed
     const file = data.open({
-      path: 'datajs/test/fixtures/sample.csv',
+      path: 'test/fixtures/sample.csv',
       format: 'csv',
       inlineData,
     })

datajs/file-base.js renamed to src/file-base.js

@@ -1,9 +1,9 @@
 import assert from 'assert'
-import * as data from '../data'
+import * as data from '../src/data'
 
 describe('File Local', function () {
   it('File class for addSchema method', async () => {
-    let path_ = 'datajs/test/fixtures/sample.csv'
+    let path_ = 'test/fixtures/sample.csv'
     let file = data.open(path_)
     assert.strictEqual(file.descriptor.schema, undefined)
 
@@ -15,18 +15,18 @@ describe('File Local', function () {
   })
 
   it("File classes have displayName method'", () => {
-    const fileLocal = data.open('datajs/test/fixtures/sample.csv')
+    const fileLocal = data.open('test/fixtures/sample.csv')
     assert.strictEqual(fileLocal.displayName, 'FileLocal')
   })
 
   it('Calculates the streaming hash (md5) of a csv file', async () => {
-    const fileLocal = data.open('datajs/test/fixtures/sample.csv')
+    const fileLocal = data.open('test/fixtures/sample.csv')
     let hash = await fileLocal.hash('md5')
     assert.strictEqual(hash, 'b0661d9566498a800fbf95365ce28747')
   })
 
   it('Calculates the streaming hash (sha256) of a csv file', async () => {
-    const fileLocal = data.open('datajs/test/fixtures/sample.csv')
+    const fileLocal = data.open('test/fixtures/sample.csv')
     let hash = await fileLocal.hash('sha256')
     assert.strictEqual( hash,'d9d47b90ac9607c5111ff9a83aa37bc10e058ce6206c00b6626ade091784e098')
   })

datajs/file-inline.js renamed to src/file-inline.js

@@ -1,7 +1,7 @@
 import assert from 'assert'
 import path from 'path'
 import nock from 'nock'
-import * as data from '../data'
+import * as data from '../src/data'
 import { testFileStream } from './file-base'
 
 describe('File Remote', function () {

datajs/file-interface.js renamed to src/file-interface.js

@@ -1,13 +1,13 @@
 import assert from 'assert'
 import toArray from 'stream-to-array'
-import { csvParser, guessParseOptions } from '../../parser/csv'
-import * as data from '../../index'
+import { csvParser, guessParseOptions } from '../../src/parser/csv'
+import * as data from '../../src/index'
 
 describe('csvParser', function () {
   this.timeout(30000) // all tests in this suite get 10 seconds before timeout
 
   it('csvParser iso8859 file encoding', async () => {
-    const path_ = 'datajs/test/fixtures/encodings/iso8859.csv'
+    const path_ = 'test/fixtures/encodings/iso8859.csv'
     const file = data.open(path_)
     const parsed_file = await csvParser(file)
     const rows = await toArray(parsed_file)
@@ -24,7 +24,7 @@ describe('csvParser', function () {
   })
 
   it('csvParser western-macos-roman file encoding', async () => {
-    const path_ = 'datajs/test/fixtures/encodings/western-macos-roman.csv'
+    const path_ = 'test/fixtures/encodings/western-macos-roman.csv'
     const file = data.open(path_)
     const parsed_file = await csvParser(file)
     const rows = await toArray(parsed_file)
@@ -41,7 +41,7 @@ describe('csvParser', function () {
   })
 
   it('guessParseOptions for local data', async () => {
-    const path_ = 'datajs/test/fixtures/semicolon-delimited.csv'
+    const path_ = 'test/fixtures/semicolon-delimited.csv'
     let file = data.open(path_)
     let parseOptions = await guessParseOptions(file)
     assert.deepStrictEqual(parseOptions.delimiter, ';')