nodegit · tbranyen · Oct 7, 2014 · Jul 19, 2014 · Jul 22, 2014 · Sep 24, 2014
diff --git a/.gitignore b/.gitignore
@@ -19,3 +19,5 @@
 /include/*
 !/include/functions/copy.h
 !/include/wrapper.h
+
+*.log
diff --git a/README.md b/README.md
@@ -45,8 +45,8 @@ git clone git://github.com/tbranyen/nodegit.git
 # Enter the repository.
 cd nodegit
 
-# Install the template engine, run the code generation script, and install.
-npm install ejs && npm run codegen && npm install
+# Installs the template engine, run the code generation script, and build.
+npm install
 ```
 
 If you encounter errors, you most likely have not configured the dependencies
@@ -93,35 +93,19 @@ npm install nodegit --msvs_version=2013
 ### Cloning a repository and reading a file: ###
 
 ``` javascript
-var clone = require("nodegit").Repo.clone;
+var clone = require("nodegit").Repository.clone;
 
 // Clone a given repository into a specific folder.
-clone("https://github.com/nodegit/nodegit", "tmp", null, function(err, repo) {
-  if (err) {
-    throw err;
-  }
-
+clone("https://github.com/nodegit/nodegit", "tmp", null).then(function(repo) {
   // Use a known commit sha from this repository.
   var sha = "59b20b8d5c6ff8d09518454d4dd8b7b30f095ab5";
 
   // Look up this known commit.
-  repo.getCommit(sha, function(err, commit) {
-    if (err) {
-      throw err;
-    }
-
+  repo.getCommit(sha).then(function(commit) {
     // Look up a specific file within that commit.
-    commit.getEntry("README.md", function(err, entry) {
-      if (err) {
-        throw err;
-      }
-
+    commit.getEntry("README.md").then(function(entry) {
       // Get the blob contents from the file.
-      entry.getBlob(function(err, blob) {
-        if (err) {
-          throw err;
-        }
-
+      entry.getBlob().then(function(blob) {
         // Show the name, sha, and filesize in byes.
         console.log(entry.name() + entry.sha() + blob.size() + "b");
 
@@ -139,20 +123,12 @@ clone("https://github.com/nodegit/nodegit", "tmp", null, function(err, repo) {
 ### Emulating git log: ###
 
 ``` javascript
-var open = require("nodegit").Repo.open;
+var open = require("nodegit").Repository.open;
 
 // Open the repository directory.
-open("tmp", function(err, repo) {
-  if (err) {
-    throw err;
-  }
-
+open("tmp").then(function(repo) {
   // Open the master branch.
-  repo.getMaster(function(err, branch) {
-    if (err) {
-      throw err;
-    }
-
+  repo.getMaster().then(function(branch) {
     // Create a new history event emitter.
     var history = branch.history();
 

diff --git a/generate/filters/and.js b/generate/filters/and.js
@@ -0,0 +1,3 @@
+module.exports = function(value, other) {
+  return value && other;
+};
diff --git a/generate/filters/args_info.js b/generate/filters/args_info.js
@@ -0,0 +1,30 @@
+module.exports = function(args) {
+  var result = [],
+      cArg,
+      jsArg;
+
+  for(cArg = 0, jsArg = 0; cArg < args.length; cArg++) {
+    var arg = args[cArg];
+
+    if (!arg.isReturn && !arg.isSelf && !arg.isPayload) {
+      arg.isJsArg = true;
+      arg.jsArg = jsArg;
+
+      jsArg++;
+    }
+
+    if (cArg === args.length -1) {
+      arg.lastArg = true;
+    }
+    else {
+      arg.lastArg = false;
+    }
+
+    arg.cArg = cArg;
+    arg.isCppClassStringOrArray = ~["String", "Array"].indexOf(arg.cppClassName);
+
+    result.push(arg);
+  }
+
+  return result;
+};
diff --git a/generate/filters/cpp_to_v8.js b/generate/filters/cpp_to_v8.js
@@ -0,0 +1,5 @@
+var isV8Value = require("./is_v8_value");
+
+module.exports = function(cppClassName) {
+  return isV8Value(cppClassName) ? cppClassName : "Object";
+};
diff --git a/generate/filters/default_value.js b/generate/filters/default_value.js
@@ -0,0 +1,3 @@
+module.exports = function(cType) {
+  return cType === "git_otype" ? "GIT_OBJ_ANY" : "0";
+};
diff --git a/generate/filters/fields_info.js b/generate/filters/fields_info.js
@@ -0,0 +1,17 @@
+module.exports = function(fields) {
+  var result = [];
+
+  fields.forEach(function (field){
+    var fieldInfo = {};
+
+    fieldInfo.__proto__ = field;
+
+    fieldInfo.parsedName = field.name || "result";
+    fieldInfo.isCppClassIntType = ~["Uint32", "Int32"].indexOf(field.cppClassName);
+    fieldInfo.parsedClassName = (field.cppClassName || '').toLowerCase() + "_t";
+
+    result.push(fieldInfo);
+  });
+
+  return result;
+};
diff --git a/generate/filters/has_return_type.js b/generate/filters/has_return_type.js
@@ -0,0 +1,7 @@
+module.exports = function(functionInfo) {
+  if (functionInfo.return) {
+    return functionInfo.return.cType != "void" || functionInfo.return.isErrorCode;
+  }
+
+  return false;
+};
diff --git a/generate/filters/has_returns.js b/generate/filters/has_returns.js
@@ -0,0 +1,15 @@
+module.exports = function(fn) {
+  var args = fn.args || [];
+  var result = args.some(function (arg) {
+    return arg.isReturn;
+  });
+
+  if (!result
+      && fn.return
+      && !fn.return.isErrorCode
+      && fn.return.cType != "void") {
+    result = true;
+  }
+
+  return result || (fn.return && fn.return.isErrorCode);
+};
diff --git a/generate/filters/is_double_pointer.js b/generate/filters/is_double_pointer.js
@@ -0,0 +1,3 @@
+module.exports = function(cType) {
+  return /\s*\*\*\s*/.test(cType);
+};
diff --git a/generate/filters/is_pointer.js b/generate/filters/is_pointer.js
@@ -0,0 +1,3 @@
+module.exports = function(cType) {
+  return /\s*\*\s*/.test(cType);
+};
diff --git a/generate/filters/is_v8_value.js b/generate/filters/is_v8_value.js
@@ -0,0 +1,14 @@
+var v8 = [
+  "Boolean",
+  "Number",
+  "String",
+  "Integer",
+  "Int32",
+  "Uint32",
+  "Date",
+  "Function"
+];
+
+module.exports = function(cppClassName) {
+  return v8.indexOf(cppClassName) > -1;
+};
diff --git a/generate/filters/js_args_count.js b/generate/filters/js_args_count.js
@@ -0,0 +1,18 @@
+module.exports = function(args) {
+  var cArg,
+      jsArg;
+
+  if (!args) {
+    return 0;
+  }
+
+  for(cArg = 0, jsArg = 0; cArg < args.length; cArg++) {
+    var arg = args[cArg];
+
+    if (!arg.isReturn && !arg.isSelf && !arg.isPayload) {
+      jsArg++;
+    }
+  }
+
+  return jsArg;
+};
diff --git a/generate/filters/or.js b/generate/filters/or.js
@@ -0,0 +1,3 @@
+module.exports = function(value, other) {
+  return value || other;
+};
diff --git a/generate/filters/replace.js b/generate/filters/replace.js
@@ -0,0 +1,3 @@
+module.exports = function(value, find, replace) {
+  return value.replace(find, replace);
+};
diff --git a/generate/filters/returns_count.js b/generate/filters/returns_count.js
@@ -0,0 +1,15 @@
+module.exports = function(fn) {
+  var args = fn.args || [];
+  var result = args.reduce(function (currentValue, arg) {
+    return currentValue + (arg.isReturn ? 1 : 0);
+  }, 0);
+
+  if (!result
+      && fn.return
+      && !fn.return.isErrorCode
+      && fn.return.cType != "void") {
+    result = 1;
+  }
+
+  return result;
+};
diff --git a/generate/filters/returns_info.js b/generate/filters/returns_info.js
@@ -0,0 +1,40 @@
+module.exports = function(fn, argReturnsOnly, isAsync) {
+  var result = [];
+  var args = fn.args || [];
+
+  args.forEach(function (arg) {
+    if (!arg.isReturn) return;
+
+    var return_info = {};
+
+    return_info.__proto__ = arg;
+
+    return_info.parsedName = isAsync ? "baton->" + return_info.name : return_info.name;
+    return_info.isCppClassIntType = ~['Uint32', 'Int32'].indexOf(return_info.cppClassName);
+    return_info.parsedClassName = (return_info.cppClassName || '').toLowerCase() + "_t";
+    return_info.jsNameOrName = return_info.jsName | return_info.name;
+    return_info.jsOrCppClassName = return_info.jsClassName || return_info.cppClassName;
+
+    result.push(return_info);
+  });
+
+  if (!result.length
+      && !argReturnsOnly
+      && fn.return
+      && !fn.return.isErrorCode
+      && fn.return.cType != "void") {
+    var return_info = {};
+
+    return_info.__proto__ = fn.return;
+    return_info.parsedName = return_info.name && isAsync ? "baton->" + return_info.name : "result";
+    return_info.isCppClassIntType = ~['Uint32', 'Int32'].indexOf(return_info.cppClassName);
+    return_info.parsedClassName = (return_info.cppClassName || '').toLowerCase() + "_t";
+    return_info.jsNameOrName = return_info.jsName | return_info.name;
+    return_info.jsOrCppClassName = return_info.jsClassName || return_info.cppClassName;
+
+    result.push(return_info);
+  }
+
+
+  return result;
+};
diff --git a/generate/filters/un_pointer.js b/generate/filters/un_pointer.js
@@ -0,0 +1,3 @@
+module.exports = function(cType) {
+  return cType.replace(/\s*\*\s*$/, "");
+};
diff --git a/generate/filters/upper.js b/generate/filters/upper.js
@@ -0,0 +1,3 @@
+module.exports = function(value) {
+  return value.toUpperCase();
+};
diff --git a/generate/index.js b/generate/index.js
@@ -1,44 +1,88 @@
-// https://github.com/nodegit/nodegit/issues/94
-const fs = require("fs");
-const ejs = require("ejs");
 const path = require("path");
+const combyne = require("combyne");
+const file = require("./util/file");
 const idefs = require("./idefs");
 
-var local = path.join.bind(null, __dirname);
+// Customize the delimiters so as to not process `{{{` or `}}}`.
+combyne.settings.delimiters = {
+  START_RAW: "{{=",
+  END_RAW: "=}}"
+};
 
-var classTemplate = ejs.compile(
-  "" + fs.readFileSync(local("templates/class.cc.ejs")), {
-    filename: "class.cc"
-  });
+var partials = {
+  asyncFunction: file.read("partials/async_function.cc"),
+  convertFromV8: file.read("partials/convert_from_v8.cc"),
+  convertToV8: file.read("partials/convert_to_v8.cc"),
+  doc: file.read("partials/doc.cc"),
+  fields: file.read("partials/fields.cc"),
+  guardArguments: file.read("partials/guard_arguments.cc"),
+  syncFunction: file.read("partials/sync_function.cc")
+};
+
+var templates = {
+  class: file.read("templates/class.cc"),
+  header: file.read("templates/header.h"),
+  binding: file.read("templates/binding.gyp"),
+  nodegit: file.read("templates/nodegit.cc")
+};
+
+var filters = {
+  upper: require("./filters/upper"),
+  replace: require("./filters/replace"),
+  or: require("./filters/or"),
+  and: require("./filters/and"),
+  defaultValue: require("./filters/default_value"),
+  argsInfo: require("./filters/args_info"),
+  cppToV8: require("./filters/cpp_to_v8"),
+  jsArgsCount: require("./filters/js_args_count"),
+  isV8Value: require("./filters/is_v8_value"),
+  isPointer: require("./filters/is_pointer"),
+  isDoublePointer: require("./filters/is_double_pointer"),
+  unPointer: require("./filters/un_pointer"),
+  hasReturnType: require("./filters/has_return_type"),
+  hasReturns: require("./filters/has_returns"),
+  returnsCount: require("./filters/returns_count"),
+  returnsInfo: require("./filters/returns_info"),
+  fieldsInfo: require("./filters/fields_info")
+};
 
-var headerTemplate = ejs.compile(
-  "" + fs.readFileSync(local("templates/header.h.ejs")), {
-    filename: "header.h"
+// Convert Buffers to Combyne templates.
+Object.keys(templates).forEach(function(template) {
+  templates[template] = combyne(templates[template]);
+
+  // Attach all filters to all templates.
+  Object.keys(filters).forEach(function(filter) {
+    templates[template].registerFilter(filter, filters[filter]);
   });
+});
 
-var bindingTemplate = ejs.compile(
-  "" + fs.readFileSync(local("templates/binding.gyp.ejs")), {});
+// Attach all partials to select templates.
+Object.keys(partials).forEach(function(partial) {
+ templates.class.registerPartial(partial, combyne(partials[partial]));
+});
 
-var nodegitSourceTemplate = ejs.compile(
-  "" + fs.readFileSync(local("templates/nodegit.cc.ejs")), {});
 
+// Determine which definitions to actually include in the source code.
 var enabled = idefs.filter(function(idef) {
+  // Additionally provide a friendly name to the actual filename.
   idef.name = path.basename(idef.filename, ".h");
+
+  // We need some custom data on each of the functions
+  idef.functions.forEach(function(fn) {
+    fn.cppClassName = idef.cppClassName;
+  });
+
   return !idef.ignore;
 });
 
-enabled.forEach(function(idef) {
-  fs.writeFileSync(local("../include/", idef.filename), headerTemplate(idef));
-
-  fs.writeFileSync(
-    local("../src/", path.basename(idef.filename, ".h")) + ".cc",
-      classTemplate(idef));
+// TODO Wipe out all existing source files.
 
-  fs.writeFileSync(local("../binding.gyp"), bindingTemplate({
-    idefs: idefs
-  }));
+// Write out single purpose templates.
+file.write("../binding.gyp", templates.binding.render(enabled));
+file.write("../src/nodegit.cc", templates.nodegit.render(enabled));
 
-  fs.writeFileSync(local("../src/nodegit.cc"), nodegitSourceTemplate({
-    idefs: idefs
-  }));
+// Write out all the classes.
+enabled.forEach(function(idef) {
+  file.write("../src/" + idef.name + ".cc", templates.class.render(idef));
+  file.write("../include/" + idef.name + ".h", templates.header.render(idef));
 });