Merge branch 'dev'

package.json

@@ -60,12 +60,13 @@
  },
  "scripts": {
  "build": "run-s format build:*",
- "build:dist": "run-s clean:dist bundle",
+ "build:dist": "run-s clean:dist bundle format:dist",
  "build:docs": "run-s clean:docs mustache",
  "bundle": "run-s bundle:*",
  "bundle:cjs": "run-s \"rollup -c tools/build-cjs.js\"",
  "bundle:es": "run-s \"rollup -c tools/build-es.js\"",
  "format": "run-s \"lint --fix\"",
+ "format:dist": "prettier --write \"dist/**/{jaysn.es.js,jaysn.js}\"",
  "clean:dist": "run-s \"rm -rf dist\"",
  "clean:docs": "run-s \"rm -rf docs\" \"mkdir docs\"",
  "coverage": "nyc report --reporter=text-lcov | coveralls",

src/jaysn.js → src/DB.js

@@ -1,12 +1,10 @@
 import { existsSync } from 'fs';
 import { struct } from 'superstruct';
 import Immutable from 'immutable';
-import { cwd } from 'process';
-import { join } from 'path';
 import { File } from './adapters/File';
 import { LocalStorage } from './adapters/LocalStorage';
 
-export const JAYSN_PATH = join(cwd(), '.jaysn');
+export const JAYSN_PATH = '.jaysn';
 
 const IMMUTABLE_TYPE = [
  'List',
@@ -39,7 +37,7 @@ const IMMUTABLE_WRITE = [
  'updateIn',
 ];
 
-export class Jaysn {
+export class DB {
  constructor(schema, options = {}) {
  const defaultOpts = {
  use: 'File',
@@ -100,7 +98,8 @@ export class Jaysn {
  Immutable[K].prototype.write = () => {
  const data = this.getState().toJS();
 
- adapter.write(data);
+ this._state.push(Immutable.fromJS(adapter.write(data)));
+ this._stateId += 1;
  return this.getState();
  };
  }
@@ -117,6 +116,8 @@ export class Jaysn {
  IMMUTABLE_READ.forEach(method => {
  this[method] = (...args) => {
  const state = this.getState();
+ this._state.push(Immutable.fromJS(adapter.read()));
+ this._stateId += 1;
 
  return state[method](...args);
  };
@@ -167,3 +168,5 @@ export class Jaysn {
  return this._state[this._stateId];
  }
 }
+
+export default DB;

src/Jaysn.js

@@ -0,0 +1,4 @@
+import { DB } from './DB';
+
+export const jaysn = (...args) => new DB(...args);
+export default jaysn;

test/Jaysn.spec.js

@@ -10,7 +10,7 @@
 import { assert } from 'chai';
 import { existsSync, unlinkSync } from 'fs';
 import { fromJS } from 'immutable';
-import { Jaysn } from '../src/index';
+import { jaysn } from '../src/Jaysn';
 
 const opts = {
  source: 'db.json',
@@ -53,7 +53,7 @@ describe('new Jaysn()', () => {
  if (existsSync(opts.source)) {
  unlinkSync(opts.source);
  }
- DB = new Jaysn(schema, opts);
+ DB = jaysn(schema, opts);
  });
 
  describe('.set(key, data).write()', () => {

tools/build-cjs.js

@@ -7,6 +7,7 @@ import json from 'rollup-plugin-json';
 import saveLicense from 'uglify-save-license';
 import stripBanner from 'rollup-plugin-strip-banner';
 import nodeResolve from 'rollup-plugin-node-resolve';
+import { capitalize } from './utils';
 import pkg from '../package.json';
 
 const copyright = readFileSync(join('tools', 'COPYRIGHT'), 'utf-8');
@@ -21,16 +22,17 @@ export default {
  .replace('{pkg.homepage}', pkg.homepage)
  .replace('{pkg.author}', pkg.author)
  .replace('{pkg.license}', pkg.license),
- name: pkg.name,
- input: join(SRC_DIR, 'index.js'),
+ name: 'Jaysn',
+ input: join(SRC_DIR, `${capitalize(pkg.name)}.js`),
  external: ['fs', 'process', 'util', ...Object.keys(pkg.dependencies)],
  globals: {
- immutable: 'immutable',
+ superstruct: 'Superstruct',
+ immutable: 'Immutable',
  },
  output: {
- exports: 'named',
+ export: 'named',
  file: join(DIST_DIR, `${pkg.name}.js`),
- format: 'cjs',
+ format: 'umd',
  },
  plugins: [
  nodeResolve(),

tools/build-es.js

@@ -4,6 +4,7 @@ import buble from 'rollup-plugin-buble';
 import commonjs from 'rollup-plugin-commonjs';
 import json from 'rollup-plugin-json';
 import stripBanner from 'rollup-plugin-strip-banner';
+import { capitalize } from './utils';
 import pkg from '../package.json';
 
 const copyright = readFileSync(join('tools', 'COPYRIGHT'), 'utf-8');
@@ -19,7 +20,7 @@ export default {
  .replace('{pkg.author}', pkg.author)
  .replace('{pkg.license}', pkg.license),
  name: pkg.name,
- input: join(SRC_DIR, 'index.js'),
+ input: join(SRC_DIR, `${capitalize(pkg.name)}.js`),
  external: ['fs', 'process', 'util', ...Object.keys(pkg.dependencies)],
  output: {
  file: join(DIST_DIR, `${pkg.name}.es.js`),

tools/utils.js

@@ -0,0 +1,5 @@
+export function capitalize(string) {
+ return string.charAt(0).toUpperCase() + string.slice(1);
+}
+
+export default capitalize;