Update README, example, add a kill function, make exttypes be encoded

README.md

@@ -11,39 +11,27 @@ Still a WIP, so any feedback, contributions, etc. are greatly appreciated.
 ```dart
 import 'package:dart_nvim_api/dart_nvim_api.dart';
 
-main(List<String> args) async {
-  // Start up Neovim instance and communicate over stdin/stdout:
-  var nvim = Neovim(nvimBinaryPath: 'nvim');
-
-  // Or connect to already running instance over TCP:
-  // var nvim = Neovim.connectToRunningInstance(host: '127.0.0.1', port: 8888);
+void main(List<String> args) async {
+  // Start up Neovim instance, with optional `onNotify` and `onRequest`
+  // callbacks.
+  // See also Nvim.child()
+  var nvim = await Nvim.spawn();
 
   // Run Neovim ex command.
   await nvim.command("echo 'hello'");
 
   // Get ex command output.
-  assert(await nvim.commandOutput("echo 'hello'") == null);
+
+  assert(await nvim.exec('echo 1 + 1', true) == '2');
 
   // Buffer example:
   var buf = await nvim.createBuf(true, false);
-  var bufNum = await buf.getNumber(nvim);
-  assert(bufNum == 2);
-  assert(await nvim.getCurrentBuf() is Buffer);
+  var bufNameWithoutPath = 'some name';
+  await nvim.bufSetName(buf, bufNameWithoutPath);
+  var bufName = await nvim.bufGetName(buf);
+  assert(bufName.contains(bufNameWithoutPath));
 
-  // Beyond that, you can run any Neovim api command. See `:help api-rpc` doc in Neovim.
-  // See also `example` directory.
+  // Kill Neovim when done.
+  nvim.kill();
 }
 ```
-
-# Contributing
-Changes to the `Neovim`, `Window`, `Buffer`, and `Tabpage` classes should be done
-in the template files in the `gen_bindings/src` folder. To generate `lib/src/*.dart` do 
-the following from the project root (requires `pip` in addition to `python` v3.7.4. Note that older versions 
-of Python 3 may work, I just haven't tested them):
-```console
-$ pip install -g datetime jinja2
-# Replacing <nvim binary path> as necessary:
-$ python gen_bindings/gen_bindings.py <nvim binary path> 'lib/src' 'gen_bindings/src/'
-```
-
-Changes to any other files can be done as usual.

example/example.dart

@@ -1,23 +1,25 @@
 import 'package:dart_nvim_api/dart_nvim_api.dart';
 
-main(List<String> args) async {
-  // Start up Neovim instance and communicate over stdin/stdout:
-  var nvim = Neovim(nvimBinaryPath: 'nvim');
-
-  // Or connect to already running instance over TCP:
-  // var nvim = Neovim.connectToRunningInstance(host: '127.0.0.1', port: 8888);
+void main(List<String> args) async {
+  // Start up Neovim instance, with optional `onNotify` and `onRequest`
+  // callbacks.
+  // See also Nvim.child()
+  var nvim = await Nvim.spawn();
 
   // Run Neovim ex command.
   await nvim.command("echo 'hello'");
 
   // Get ex command output.
-  assert(await nvim.commandOutput("echo 'hello'") == null);
+
+  assert(await nvim.exec('echo 1 + 1', true) == '2');
 
   // Buffer example:
   var buf = await nvim.createBuf(true, false);
-  var bufNum = await buf.getNumber(nvim);
-  assert(bufNum == 2);
-  assert(await nvim.getCurrentBuf() is Buffer);
+  var bufNameWithoutPath = 'some name';
+  await nvim.bufSetName(buf, bufNameWithoutPath);
+  var bufName = await nvim.bufGetName(buf);
+  assert(bufName.contains(bufNameWithoutPath));
 
-  // Beyond that, you can run any Neovim api command. See `:help api-rpc` doc in Neovim.
+  // Kill Neovim when done.
+  nvim.kill();
 }

lib/dart_nvim_api.dart

@@ -1,10 +1,3 @@
-/* export 'src/tabpage.dart';
-export 'src/window.dart';
-export 'src/buffer.dart';
-export 'src/ui_events.dart';
-export 'src/session.dart';
-export 'src/ui_attach_options.dart';
-export 'src/neovim.dart'; */
 export 'src/neovim.dart';
 export 'src/gen/nvim.g.dart';
 export 'src/gen/buffer.g.dart';

lib/src/ext_types.dart

@@ -32,3 +32,27 @@ class ExtTypeDecoder extends ExtDecoder {
     }
   }
 }
+
+class ExtTypeEncoder extends ExtEncoder {
+  @override
+  int extTypeForObject(dynamic object) {
+    if (object is Buffer) {
+      return 0;
+    } else if (object is Window) {
+      return 1;
+    } else if (object is Tabpage) {
+      return 2;
+    }
+
+    throw "Can't decode object, not a Neovim type: $object";
+  }
+
+  @override
+  Uint8List encodeObject(dynamic object) {
+    if (object is Buffer || object is Window || object is Tabpage) {
+      return serialize(object.data);
+    }
+
+    throw "Object wasn't a Neovim ext type!";
+  }
+}

lib/src/neovim.dart

@@ -77,12 +77,16 @@ class Nvim {
     ];
 
     if (_nvim != null) {
-      _nvim.stdin.add(mpack.serialize(cmd));
+      _nvim.stdin.add(mpack.serialize(cmd, extEncoder: ExtTypeEncoder()));
     } else {
-      stdout.add(mpack.serialize(cmd));
+      stdout.add(mpack.serialize(cmd, extEncoder: ExtTypeEncoder()));
     }
 
     _waiting[reqId] = Completer();
     return _waiting[reqId].future;
   }
+
+  void kill() {
+    _nvim.kill();
+  }
 }