A better way of wrapping native methods

tbranyen · tbranyen · commit 39e5d0747a1e · 2014-07-03T21:11:48.000-04:00
diff --git a/lib/nodegit.js b/lib/nodegit.js
@@ -1,72 +1,61 @@
-var promisify = require('promisify-node');
-var descriptors = require('../generate/v0.20.0.json');
+var promisify = require("promisify-node");
+var descriptors = require("../generate/idefs.json");
 var rawApi;
 
 // Attempt to load the production release first, if it fails fall back to the
 // debug release.
 try {
-  rawApi = require('../build/Release/nodegit');
+  rawApi = require("../build/Release/nodegit");
 }
 catch (e) {
-  rawApi = require('../build/Debug/nodegit');
+  rawApi = require("../build/Debug/nodegit");
 }
 
 // Set the exports prototype to the raw API.
 exports.__proto__ = rawApi;
 
 // Import extensions
-require('./commit.js');
-require('./diff.js');
-require('./blob.js');
-require('./object.js');
-require('./signature.js');
-require('./odb.js');
-require('./oid.js');
-require('./index.js');
-require('./repository.js');
-require('./reference.js');
-require('./revwalk.js');
-require('./tree.js');
+require("./commit.js");
+require("./diff.js");
+require("./blob.js");
+require("./object.js");
+require("./signature.js");
+require("./odb.js");
+require("./oid.js");
+require("./index.js");
+require("./repository.js");
+require("./reference.js");
+require("./revwalk.js");
+require("./tree.js");
 
 // Wrap asynchronous methods to return promises.
 promisify(exports);
 
 // Native methods do not return an identifiable function, so this function will
 // filter down the function identity to match the libgit2 descriptor.
-promisify(rawApi, function(func, keyName, parentKeyName) {
-  // Find the correct descriptor.
-  var descriptor = descriptors.filter(function(descriptor) {
-    var key = parentKeyName ? parentKeyName.slice(0, -1) : keyName; 
-    return descriptor.jsClassName === key;
-  })[0];
-
-  // If this is a top level construct, recurse into.
-  if (!parentKeyName) {
-    return true;
-  }
-
-  // Determine if this is a prototype method.
-  var isPrototypeMethod = parentKeyName.slice(-1) === "#";
-
-  if (descriptor && descriptor.functions) {
-    // Find the nested function in the descriptor.
-    if (parentKeyName.indexOf("Repo") > -1) { console.log(arguments); }
-    var nestedFunction = descriptor.functions.filter(function(nestedFunction) {
-      var test = keyName || func.name || parentKeyName;
-
-      if (nestedFunction.jsFunctionName === keyName) {
-        return func.isPrototypeMethod === isPrototypeMethod;
-      }
-    })[0];
-
-    // Verify it is an asynchronous method.
-    //console.log(nestedFunction && nestedFunction.isAsync);
-    return nestedFunction && nestedFunction.isAsync;
-  }
+descriptors.forEach(function(descriptor) {
+  var Ctor =  rawApi[descriptor.jsClassName];
+
+  // Iterate over each function in the file.
+  descriptor.functions.filter(function(func) {
+    return func.isAsync;
+  }).forEach(function(asyncFunc) {
+    var original = null;
+
+    // Special case when you have a prototype method.
+    if (asyncFunc.isPrototypeMethod) {
+      original = Ctor.prototype[asyncFunc.jsFunctionName];
+      Ctor.prototype[asyncFunc.jsFunctionName] = promisify(original);
+    }
+    else {
+      original = Ctor[asyncFunc.jsFunctionName];
+      Ctor[asyncFunc.jsFunctionName] = promisify(original);
+    }
+  });
 });
 
 // Set version.
-exports.version = require('./package').version;
+exports.version = require("../package").version;
 
 // Initialize threads.
-exports.Threads.init();
+exports.Threads.threadsInit();
