Skip to content

Root functions should keep their function prototypes correctly #1681

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
implausible merged 1 commit into from
May 31, 2019
Merged

Root functions should keep their function prototypes correctly #1681

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions generate/input/descriptor.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3408,6 +3408,7 @@
],
"functions": {
"git_reset": {
"isCollectionRoot": true,
"args": {
"checkout_opts": {
"isOptional": true
Expand Down
2 changes: 2 additions & 0 deletions generate/scripts/generateNativeCode.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,8 @@ module.exports = function generateNativeCode() {
cppToV8: require("../templates/filters/cpp_to_v8"),
defaultValue: require("../templates/filters/default_value"),
fieldsInfo: require("../templates/filters/fields_info"),
getCPPFunctionForRootProto: require("../templates/filters/get_cpp_function_for_root_proto"),
hasFunctionOnRootProto: require("../templates/filters/has_function_on_root_proto"),
hasReturnType: require("../templates/filters/has_return_type"),
hasReturnValue: require("../templates/filters/has_return_value"),
isArrayType: require("../templates/filters/is_array_type"),
Expand Down
12 changes: 12 additions & 0 deletions generate/templates/filters/get_cpp_function_for_root_proto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
module.exports = function(functions) {
if (!functions || functions.length === 0) {
throw new Error("Should not be able to get function from empty function list");
}

const fun = functions.find(function(f) { return f.useAsOnRootProto; });
if (!fun) {
throw new Error("There is no function on the root prototype for this collection");
}

return fun.cppFunctionName;
};
7 changes: 7 additions & 0 deletions generate/templates/filters/has_function_on_root_proto.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
module.exports = function(functions) {
if (!functions || functions.length === 0) {
return false;
}

return functions.some(function(f) { return f.useAsOnRootProto; });
};
16 changes: 14 additions & 2 deletions generate/templates/templates/class_content.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,15 +79,27 @@ using namespace node;
void {{ cppClassName }}::InitializeComponent(v8::Local<v8::Object> target) {
Nan::HandleScope scope;

v8::Local<Object> object = Nan::New<Object>();
{% if functions|hasFunctionOnRootProto %}
v8::Local<FunctionTemplate> object = Nan::New<FunctionTemplate>({{ functions|getCPPFunctionForRootProto }});
{% else %}
v8::Local<Object> object = Nan::New<Object>();
{% endif %}

{% each functions as function %}
{% if not function.ignore %}
Nan::SetMethod(object, "{{ function.jsFunctionName }}", {{ function.cppFunctionName }});
{% endif %}
{% endeach %}

Nan::Set(target, Nan::New<String>("{{ jsClassName }}").ToLocalChecked(), object);
Nan::Set(
target,
Nan::New("{{ jsClassName }}").ToLocalChecked(),
{% if functions|hasFunctionOnRootProto %}
Nan::GetFunction(object).ToLocalChecked()
{% else %}
object
{% endif %}
);
}

{% endif %}
Expand Down