Merged with 1.0.0 branch

Author: Josema

.gitignore

@@ -21,3 +21,4 @@ yarn.lock
 examples/drag/package-lock.json
 examples/todomvc/package-lock.json
 .vscode/launch.json
+*.tgz

Gruntfile.js

@@ -1,43 +1,39 @@
 module.exports = function(grunt) {
-
- var dop = 'dop.js';
- var dopnodejs = 'dop.nodejs.js';
- var dopmin = 'dop.min.js';
+ var dop = 'dop.js'
+ var dopnodejs = 'dop.nodejs.js'
+ var dopmin = 'dop.min.js'
 
  // Project configuration.
  grunt.initConfig({
-
  pkg: grunt.file.readJSON('package.json'),
 
  watch: {
  scripts: {
  files: ['src/**', 'package.json'],
  tasks: ['default'],
  options: {
- spawn: false,
- },
- },
+ spawn: false
+ }
+ }
  },
 
-
-
  copy: {
  main: {
  src: 'node_modules/dop-transports/connect/websocket.js',
- dest: 'src/env/browser/websocket.js',
- },
+ dest: 'src/env/browser/websocket.js'
+ }
  },
 
  concat: {
  options: {
- banner: '/*\n' +
- ' * dop@<%= pkg.version %>\n' +
- ' * www.distributedobjectprotocol.org\n' +
- ' * (c) 2018 Josema Gonzalez\n' +
- ' * MIT License.\n' +
- ' */\n',
+ banner:
+  '/*\n' +
+  ' * dop@<%= pkg.version %>\n' +
+  ' * www.distributedobjectprotocol.org\n' +
+  ' * MIT License.\n' +
+  ' */\n',
  process: function(src, filepath) {
- return '\n////////// ' + filepath + '\n' + src + '\n\n\n';
+ return '\n////////// ' + filepath + '\n' + src + '\n\n\n'
  }
  },
  nodejs: {
@@ -51,7 +47,7 @@ module.exports = function(grunt) {
  'src/node/*',
  'src/umd.js'
  ],
- dest: 'dist/'+dopnodejs
+ dest: 'dist/' + dopnodejs
  },
  browser: {
  src: [
@@ -64,30 +60,30 @@ module.exports = function(grunt) {
  'src/node/*',
  'src/umd.js'
  ],
- dest: 'dist/'+dop
+ dest: 'dist/' + dop
  }
  },
 
-
  'string-replace': {
  dist: {
  files: {
- 'dist/': ['dist/'+dop,'dist/'+dopnodejs],
+ 'dist/': ['dist/' + dop, 'dist/' + dopnodejs]
  },
  options: {
- replacements: [{
- pattern: /{{VERSION}}/ig,
- replacement: '<%= pkg.version %>'
- }]
+ replacements: [
+ {
+ pattern: /{{VERSION}}/gi,
+ replacement: '<%= pkg.version %>'
+ }
+ ]
  }
  }
  },
 
-
  uglify: {
  build: {
- src: 'dist/'+dop,
- dest: 'dist/'+dopmin
+ src: 'dist/' + dop,
+ dest: 'dist/' + dopmin
  },
  options: {
  banner: '/* dop - (c) 2018 Josema Gonzalez - MIT Licensed */\n'
@@ -116,7 +112,7 @@ module.exports = function(grunt) {
  {
  expand: true,
  flatten: true,
- src: 'dist/'+dopmin,
+ src: 'dist/' + dopmin,
  dest: 'dist'
  }
  ]
@@ -130,28 +126,27 @@ module.exports = function(grunt) {
  },
  dist: {
  files: {
- 'dist/dop.min.opt.js': 'dist/'+dopmin
+ 'dist/dop.min.opt.js': 'dist/' + dopmin
  }
  }
  }
-
- });
-
-
-
- grunt.loadNpmTasks('grunt-contrib-copy');
- grunt.loadNpmTasks('grunt-contrib-concat');
- grunt.loadNpmTasks('grunt-contrib-uglify');
- grunt.loadNpmTasks('grunt-contrib-watch');
- grunt.loadNpmTasks('grunt-replace');
- grunt.loadNpmTasks('grunt-optimize-js');
- grunt.loadNpmTasks('grunt-string-replace');
-
-
- var tasks = ['copy', 'concat:nodejs', 'concat:browser', 'string-replace', 'uglify', /*'replace', 'optimize-js'*/];
- if (grunt.option('build') === undefined)
- tasks.push('watch');
- grunt.registerTask('default', tasks);
-
-
-};
+ })
+
+ grunt.loadNpmTasks('grunt-contrib-copy')
+ grunt.loadNpmTasks('grunt-contrib-concat')
+ grunt.loadNpmTasks('grunt-contrib-uglify')
+ grunt.loadNpmTasks('grunt-contrib-watch')
+ grunt.loadNpmTasks('grunt-replace')
+ grunt.loadNpmTasks('grunt-optimize-js')
+ grunt.loadNpmTasks('grunt-string-replace')
+
+ var tasks = [
+ 'copy',
+ 'concat:nodejs',
+ 'concat:browser',
+ 'string-replace',
+ 'uglify' /*'replace', 'optimize-js'*/
+ ]
+ if (grunt.option('build') === undefined) tasks.push('watch')
+ grunt.registerTask('default', tasks)
+}

package.json

@@ -1,6 +1,6 @@
 {
  "name": "dop",
- "version": "0.43.4",
+ "version": "1.0.0-rc3",
  "main": "./dist/dop.nodejs.js",
  "browser": "./dist/dop.js",
  "unpkg": "./dist/dop.min.js",
@@ -34,7 +34,7 @@
  "client"
  ],
  "dependencies": {
- "dop-transports": "^2.0.14"
+ "dop-transports": "3.0.0-rc1"
  },
  "devDependencies": {
  "coveralls": "^2.11.4",
@@ -60,15 +60,10 @@
  "dev": "grunt",
  "build": "grunt --build",
  "test": "tap test/*.js test/protocol/*.js",
- "test:websockets": "tap test/protocol/*.js --test-arg=websockets",
- "test:socketio": "tap test/protocol/*.js --test-arg=socketio",
- "test:sockjs": "tap test/protocol/*.js --test-arg=sockjs",
- "test:local": "tap test/protocol/*.js --test-arg=local",
  "test:electron": "browserify test/protocol/*.js test/*.js | tape-run --render=\"faucet\"",
  "test:chrome": "browserify test/protocol/*.js test/*.js | tape-run --render=\"faucet\" --browser chrome",
  "test:firefox": "browserify test/protocol/*.js test/*.js | tape-run --render=\"faucet\" --browser firefox",
  "test:safari": "browserify test/protocol/*.js test/*.js | tape-run --render=\"faucet\" --browser safari",
- "test:proxy": "tap test/*.js test/protocol/*.js --test-arg=proxy",
  "testtravis": "tap test/*.js test/protocol/*.js"
  }
 }

src/api/action.js

@@ -1,13 +1,13 @@
-dop.action = function(f) {
+dop.action = function(f, filterMutationsToNode) {
  dop.util.invariant(
  isFunction(f),
- 'dop.action only accept one argument as function'
+ 'dop.action needs one argument as function'
  )
  return function() {
  var collectors = dop.data.collectors
  var collector = dop.core.createCollector(collectors, collectors.length)
  var output = f.apply(this, arguments)
- collector.emit()
+ collector.emit(filterMutationsToNode)
  return output
  }
 }

src/api/collectGetters.js

@@ -0,0 +1,21 @@
+dop.collectGetters = function() {
+ var stopCollect = dop.core.collectGettersPaths()
+ return function stopCollectGetters() {
+ var objects_collected = stopCollect()
+ var output = []
+ var unique_paths = {}
+ for (var index = 0; index < objects_collected.length; ++index) {
+ var object_collected = objects_collected[index]
+ var unique_path = dop.core.pathSeparator(object_collected.path)
+ if (unique_paths[unique_path] === undefined) {
+ unique_paths[unique_path] = true
+ output.push({
+ object: dop.getObjectProxy(object_collected.object),
+ property: object_collected.property
+ // path: object_collected.path
+ })
+ }
+ }
+ return output
+ }
+}

src/api/connect.js

@@ -0,0 +1,10 @@
+dop.connect = function(options) {
+ if (dop.util.typeof(options) != 'object') options = {}
+
+ if (options.transport === undefined)
+ options.transport = dop.getDefaultConnectTransport()
+
+ return typeof options.transport == 'function'
+ ? options.transport(dop, options)
+ : options.transport
+}

src/api/createObserver.js

@@ -1,16 +1,16 @@
-dop.createObserver = function(callback) {
- dop.util.invariant(
- isFunction(callback),
- 'dop.createObserver only accept one argument as function'
- )
- var observers = dop.data.observers,
- index,
- observer_id,
- observer
- for (index in observers)
- if (observers[index].callback === callback) return observers[index]
-
- observer_id = dop.data.observers_inc++
- observer = new dop.core.observer(callback, observer_id)
- return (observers[observer_id] = observer)
-}
+dop.createObserver = function(callback) {
+ dop.util.invariant(
+ isFunction(callback),
+ 'dop.createObserver only accept one argument as function'
+ )
+ var observers = dop.data.observers,
+ index,
+ observer_id,
+ observer
+ for (index in observers)
+ if (observers[index].callback === callback) return observers[index]
+
+ observer_id = dop.data.observers_inc++
+ observer = new dop.core.observer(callback, observer_id)
+ return (observers[observer_id] = observer)
+}

src/api/createTransport.js

@@ -0,0 +1,3 @@
+dop.createTransport = function(socket, close) {
+ return new dop.core.transport(socket, close)
+}

src/api/decode.js

@@ -1,9 +1,9 @@
-dop.decode = function(data, node) {
+dop.decode = function(data) {
  var undefineds = [],
  index = 0,
  total,
  output = JSON.parse(data, function(property, value) {
- return dop.core.decode.call(this, property, value, node, undefineds)
+ return dop.core.decode.call(this, property, value, undefineds)
  })
 
  for (total = undefineds.length, index = 0; index < total; ++index)

src/api/getNode.js

@@ -0,0 +1,3 @@
+dop.getNode = function(args) {
+ return dop.getRequest(args).node
+}