nodegit · maxkorp · Mar 3, 2015 · Mar 3, 2015 · Mar 3, 2015 · Mar 3, 2015
diff --git a/generate/scripts/helpers.js b/generate/scripts/helpers.js
@@ -324,6 +324,9 @@ var Helpers = {
       }
     }).value();
 
+    if ("git_" + typeDef.typeName == fnDef.cFunctionName) {
+      fnDef.useAsOnRootProto = true;
+    }
     _.merge(fnDef, _.omit(fnOverrides, "args", "return"));
   },
 

diff --git a/generate/templates/templates/enums.js b/generate/templates/templates/enums.js
@@ -4,7 +4,8 @@ NodeGit.Enums = {};
 {% each . as enumerable %}
   {% if not enumerable.ignore %}
     {% if enumerable.type == "enum" %}
-      NodeGit.{{ enumerable.owner }}.{{ enumerable.JsName }} = {
+      NodeGit.{{ enumerable.owner }}.{{ enumerable.JsName }} =
+        NodeGit.{{ enumerable.owner }}.__proto__.{{ enumerable.JsName }} = {
         {% each enumerable.values as value %}
           {{ value.JsName }}: {{ value.value }},
         {% endeach %}

diff --git a/generate/templates/templates/nodegit.js b/generate/templates/templates/nodegit.js
@@ -53,18 +53,54 @@ exports.__proto__ = rawApi;
 var importExtension = function(name) {
   try {
     require("./" + name);
-  } catch (unhandledException) {}
+  }
+  catch (unhandledException) {
+    if (unhandledException.code != "MODULE_NOT_FOUND") {
+      throw unhandledException;
+    }
+  }
 };
 
+// Load up utils
+rawApi.Utils = {};
+require("./utils/lookup_wrapper");
+require("./utils/normalize_options");
+
+// Load up extra types;
+require("./convenient_hunk");
+require("./convenient_patch");
+require("./status_file");
+require("./enums.js");
+
 // Import extensions
 {% each %}
   {% if type != "enum" %}
     importExtension("{{ filename }}");
   {% endif %}
 {% endeach %}
+/* jshint ignore:start */
+{% each . as idef %}
+  {% if idef.type != "enum" %}
+    {% each idef.functions as fn %}
+      {% if fn.useAsOnRootProto %}
+
+        // Inherit directly from the original {{idef.jsClassName}} object.
+        _{{ idef.jsClassName }}.{{ fn.jsFunctionName }}.__proto__ =
+          _{{ idef.jsClassName }};
 
-//must go last!
-require("./enums");
+        // Ensure we're using the correct prototype.
+        _{{ idef.jsClassName }}.{{ fn.jsFunctionName }}.prototype =
+          _{{ idef.jsClassName }}.prototype;
+
+        // Assign the function as the root
+        rawApi.{{idef.jsClassName}} =
+          _{{ idef.jsClassName }}.{{ fn.jsFunctionName }};
+
+      {% endif %}
+    {% endeach %}
+  {% endif %}
+{% endeach %}
+/* jshint ignore:end */
 
 // Wrap asynchronous methods to return promises.
 promisify(exports);

diff --git a/lib/attr.js b/lib/attr.js
diff --git a/lib/blob.js b/lib/blob.js
@@ -1,8 +1,8 @@
 var NodeGit = require("../");
-var TreeEntry = require("./tree_entry");
-var LookupWrapper = require("./util/lookupWrapper");
-
 var Blob = NodeGit.Blob;
+var LookupWrapper = NodeGit.Utils.lookupWrapper;
+var TreeEntry = NodeGit.TreeEntry;
+
 
 /**
 * Retrieves the blob pointed to by the oid
@@ -41,5 +41,3 @@ Blob.prototype.filemode = function() {
 
   return this.isBinary() ? FileMode.EXECUTABLE : FileMode.BLOB;
 };
-
-module.exports = Blob;
diff --git a/lib/branch.js b/lib/branch.js
diff --git a/lib/checkout.js b/lib/checkout.js
@@ -1,5 +1,5 @@
 var NodeGit = require("../");
-var normalizeOptions = require("./util/normalize_options");
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
 
 var Checkout = NodeGit.Checkout;
 var head = Checkout.head;
@@ -33,5 +33,3 @@ Checkout.tree = function(repo, treeish, options) {
 
   return tree.call(this, repo, treeish, options);
 };
-
-module.exports = Checkout;
diff --git a/lib/clone.js b/lib/clone.js
@@ -1,5 +1,5 @@
 var NodeGit = require("../");
-var normalizeOptions = require("./util/normalize_options");
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
 
 var Clone = NodeGit.Clone;
 var clone = Clone.clone;
@@ -44,11 +44,3 @@ Clone.clone = function(url, local_path, options) {
     .then(freeRepository)
     .then(openRepository);
 };
-
-// Inherit directly from the original clone object.
-Clone.clone.__proto__ = Clone;
-
-// Ensure we're using the correct prototype.
-Clone.clone.prototype = Clone.prototype;
-
-module.exports = Clone.clone;
diff --git a/lib/commit.js b/lib/commit.js
@@ -1,9 +1,8 @@
 var events = require("events");
 var Promise = require("nodegit-promise");
 var NodeGit = require("../");
-var LookupWrapper = require("./util/lookupWrapper");
-
 var Commit = NodeGit.Commit;
+var LookupWrapper = NodeGit.Utils.lookupWrapper;
 
 /**
  * Retrieves the commit pointed to by the oid
@@ -207,5 +206,3 @@ Commit.prototype.getDiff = function(callback) {
 Commit.prototype.toString = function() {
   return this.sha();
 };
-
-module.exports = Commit;
diff --git a/lib/convenient_hunk.js b/lib/convenient_hunk.js
@@ -1,3 +1,5 @@
+var NodeGit = require("../");
+
 function ConvenientHunk(raw, i) {
   this.raw = raw;
   this.i = i;
@@ -32,4 +34,4 @@ ConvenientHunk.prototype.lines = function() {
   return result;
 };
 
-module.exports = ConvenientHunk;
+NodeGit.ConvenientHunk = ConvenientHunk;
diff --git a/lib/convenient_patch.js b/lib/convenient_patch.js
@@ -1,13 +1,12 @@
-var git = require("../");
-var Diff = git.Diff;
-var ConvenientHunk = require("./convenient_hunk");
+var NodeGit = require("../");
+var Diff = NodeGit.Diff;
+var ConvenientHunk = NodeGit.ConvenientHunk;
 
 function ConvenientPatch(delta, patch) {
   this.delta = delta;
   this.patch = patch;
 }
 
-
 /**
  * Old name of the file
  * @return {String}
@@ -126,4 +125,4 @@ ConvenientPatch.prototype.isTypeChange = function() {
   return this.status() == Diff.DELTA.TYPECHANGE;
 };
 
-module.exports = ConvenientPatch;
+NodeGit.ConvenientPatch = ConvenientPatch;
diff --git a/lib/diff.js b/lib/diff.js
@@ -1,9 +1,9 @@
 var NodeGit = require("../");
-var Patch = require("./patch");
-var ConvenientPatch = require("./convenient_patch");
-var normalizeOptions = require("./util/normalize_options");
-
 var Diff = NodeGit.Diff;
+var ConvenientPatch = NodeGit.ConvenientPatch;
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
+var Patch = NodeGit.Patch;
+
 
 /**
  * Retrieve patches in this difflist
@@ -62,5 +62,3 @@ Diff.prototype.findSimilar = function(opts) {
   opts = normalizeOptions(opts, NodeGit.DiffFindOptions);
   return findSimilar.call(this, opts);
 };
-
-module.exports = Diff;
diff --git a/lib/index.js b/lib/index.js
@@ -31,5 +31,3 @@ var updateAll = Index.prototype.updateAll;
 Index.prototype.updateAll = function(pathspec, matchedCallback) {
   return updateAll.call(this, pathspec || "*", matchedCallback, null);
 };
-
-module.exports = Index;
diff --git a/lib/merge.js b/lib/merge.js
@@ -1,5 +1,5 @@
 var NodeGit = require("../");
-var normalizeOptions = require("./util/normalize_options");
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
 var Promise = require("nodegit-promise");
 
 var Merge = NodeGit.Merge;
@@ -24,5 +24,3 @@ Merge.commits = function(repo, ourCommit, theirCommit, options) {
     return mergeCommits.call(this, repo, commits[0], commits[1], options);
   });
 };
-
-module.exports = Merge;
diff --git a/lib/object.js b/lib/object.js
@@ -33,5 +33,3 @@ Obj.prototype.isBlob = function() {
 Obj.prototype.isTag = function() {
   return this.type() == Obj.TYPE.TAG;
 };
-
-module.exports = Obj;
diff --git a/lib/odb.js b/lib/odb.js
@@ -1,6 +1,6 @@
-var git = require("../");
+var NodeGit = require("../");
 
-var Odb = git.Odb;
+var Odb = NodeGit.Odb;
 var read = Odb.prototype.read;
 
 Odb.prototype.read = function(oid, callback) {
@@ -12,5 +12,3 @@ Odb.prototype.read = function(oid, callback) {
     return odbObject;
   }, callback);
 };
-
-module.exports = Odb;
diff --git a/lib/odb_object.js b/lib/odb_object.js
@@ -7,5 +7,3 @@ OdbObject.prototype.toString = function(size) {
 
   return this.data().toBuffer(size).toString();
 };
-
-module.exports = OdbObject;
diff --git a/lib/oid.js b/lib/oid.js
@@ -17,5 +17,3 @@ Object.defineProperties(Oid.prototype, {
 Oid.prototype.inspect = function() {
   return "[Oid " + this.allocfmt() + "]";
 };
-
-module.exports = Oid;
diff --git a/lib/patch.js b/lib/patch.js
diff --git a/lib/reference.js b/lib/reference.js
@@ -1,5 +1,5 @@
 var NodeGit = require("../");
-var LookupWrapper = require("./util/lookupWrapper");
+var LookupWrapper = NodeGit.Utils.lookupWrapper;
 
 var Reference = NodeGit.Reference;
 var Branch = NodeGit.Branch;
@@ -63,5 +63,3 @@ Reference.prototype.toString = function() {
 Reference.prototype.isHead = function() {
   return Branch.isHead(this);
 };
-
-module.exports = Reference;
diff --git a/lib/remote.js b/lib/remote.js
@@ -1,6 +1,6 @@
 var NodeGit = require("../");
-var normalizeOptions = require("./util/normalize_options");
-var lookupWrapper = require("./util/lookupWrapper");
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
+var lookupWrapper = NodeGit.Utils.lookupWrapper;
 
 var Remote = NodeGit.Remote;
 var setCallbacks = Remote.prototype.setCallbacks;

diff --git a/lib/repository.js b/lib/repository.js
@@ -1,19 +1,18 @@
-var NodeGit = require("../");
-var Blob = require("./blob");
-var Tree = require("./tree");
-var Tag = require("./tag");
-var Reference = require("./reference");
-var Revwalk = require("./revwalk");
-var Commit = require("./commit");
-var Remote = require("./remote");
 var Promise = require("nodegit-promise");
-var normalizeOptions = require("./util/normalize_options");
-var Status = require("./status");
-var StatusFile = require("./status_file");
-var StatusList = require("./status_list");
-
-var TreeBuilder = NodeGit.Treebuilder;
+var NodeGit = require("../");
+var Blob = NodeGit.Blob;
+var Commit = NodeGit.Commit;
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
+var Reference = NodeGit.Reference;
+var Remote = NodeGit.Remote;
 var Repository = NodeGit.Repository;
+var Revwalk = NodeGit.Revwalk;
+var Status = NodeGit.Status;
+var StatusFile = NodeGit.StatusFile;
+var StatusList = NodeGit.StatusList;
+var Tag = NodeGit.Tag;
+var Tree = NodeGit.Tree;
+var TreeBuilder = NodeGit.Treebuilder;
 
 Object.defineProperty(Repository.prototype, "openIndex", {
   enumerable: false,

diff --git a/lib/reset.js b/lib/reset.js
@@ -1,30 +1,18 @@
 var NodeGit = require("../");
-var normalizeOptions = require("./util/normalize_options");
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
 
 var Reset = NodeGit.Reset;
-
 var defaultFn = Reset.default;
+
 Reset.default = function(repo, target, pathspecs) {
   return defaultFn.call(this, repo, target, pathspecs);
 };
 
 var reset = Reset.reset;
-Reset.reset = function( repo,
-                        target,
-                        resetType,
-                        checkoutOpts,
-                        signature,
-                        logMessage) {
-  checkoutOpts = normalizeOptions(checkoutOpts, NodeGit.CheckoutOptions);
+Reset.reset = function(repo, target, resetType, opts, signature, logMessage) {
+  opts = normalizeOptions(opts, NodeGit.CheckoutOptions);
 
-  return reset.call(
-    this,
-    repo,
-    target,
-    resetType,
-    checkoutOpts,
-    signature,
-    logMessage);
+  return reset.call(this, repo, target, resetType, opts, signature, logMessage);
 };
 
 module.exports = Reset;
diff --git a/lib/revwalk.js b/lib/revwalk.js
@@ -112,5 +112,3 @@ Revwalk.prototype.getCommits = function(count) {
     return Promise.all(promises);
   });
 };
-
-module.exports = Revwalk;
diff --git a/lib/signature.js b/lib/signature.js
@@ -9,5 +9,3 @@ var Signature = NodeGit.Signature;
 Signature.prototype.toString = function() {
   return this.name().toString() + " <" + this.email().toString() + ">";
 };
-
-module.exports = Signature;
diff --git a/lib/status.js b/lib/status.js
@@ -1,5 +1,5 @@
 var NodeGit = require("../");
-var normalizeOptions = require("./util/normalize_options");
+var normalizeOptions = NodeGit.Utils.normalizeOptions;
 
 var Status = NodeGit.Status;
 
@@ -15,5 +15,3 @@ Status.foreachExt = function(repo, opts, callback) {
   opts = normalizeOptions(opts, NodeGit.StatusOptions);
   return foreachExt(repo, opts, callback, null);
 };
-
-module.exports = Status;
diff --git a/lib/status_file.js b/lib/status_file.js
@@ -1,5 +1,4 @@
 var NodeGit = require("../");
-
 var Status = NodeGit.Status;
 
 var StatusFile = function(args) {
@@ -87,4 +86,4 @@ var StatusFile = function(args) {
   };
 };
 
-module.exports = StatusFile;
+NodeGit.StatusFile = StatusFile;
Original file line number	Diff line number	Diff line change
Expand Up		@@ -7,5 +7,3 @@ OdbObject.prototype.toString = function(size) {

		return this.data().toBuffer(size).toString();
		};

		module.exports = OdbObject;
-Original file line number
+Diff line change
@@ Expand Up / @@ -112,5 +112,3 @@ Revwalk.prototype.getCommits = function(count) { @@
         return Promise.all(promises);
       });
     };
-    module.exports = Revwalk;