AuroraMiddleware/protobuf
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

JS: import well-known types from google-protobuf package.

Browse Source
This commit is contained in:
Josh Haberman 2016-06-16 11:59:08 -07:00
parent f180ef6398
commit 1337486755
2 changed files with 33 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
js/gulpfile.js
View File

@ -8,6 +8,20 @@ function exec(command, cb) {
var protoc = process.env.PROTOC || '../src/protoc';
var wellKnownTypes = [
'../src/google/protobuf/any.proto',
'../src/google/protobuf/api.proto',
'../src/google/protobuf/descriptor.proto',
'../src/google/protobuf/duration.proto',
'../src/google/protobuf/empty.proto',
'../src/google/protobuf/field_mask.proto',
'../src/google/protobuf/source_context.proto',
'../src/google/protobuf/struct.proto',
'../src/google/protobuf/timestamp.proto',
'../src/google/protobuf/type.proto',
'../src/google/protobuf/wrappers.proto',
];
gulp.task('genproto_closure', function (cb) {
exec(protoc + ' --js_out=library=testproto_libs,binary:. -I ../src -I . *.proto ../src/google/protobuf/descriptor.proto',
function (err, stdout, stderr) {
@ -18,7 +32,7 @@ gulp.task('genproto_closure', function (cb) {
});
gulp.task('genproto_commonjs', function (cb) {
exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ../src/google/protobuf/descriptor.proto',
exec('mkdir -p commonjs_out && ' + protoc + ' --js_out=import_style=commonjs,binary:commonjs_out -I ../src -I commonjs -I . *.proto commonjs/test*/*.proto ../src/google/protobuf/descriptor.proto' + wellKnownTypes.join(' '),
function (err, stdout, stderr) {
console.log(stdout);
console.log(stderr);
@ -26,7 +40,16 @@ gulp.task('genproto_commonjs', function (cb) {
});
});
gulp.task('dist', function (cb) {
gulp.task('genproto_wellknowntypes', function (cb) {
exec(protoc + ' --js_out=import_style=commonjs,binary:. -I ../src ' + wellKnownTypes.join(' '),
function (err, stdout, stderr) {
console.log(stdout);
console.log(stderr);
cb(err);
});
});
gulp.task('dist', ['genproto_wellknowntypes'], function (cb) {
// TODO(haberman): minify this more aggressively.
// Will require proper externs/exports.
exec('./node_modules/google-closure-library/closure/bin/calcdeps.py -i message.js -i binary/reader.js -i binary/writer.js -i commonjs/export.js -p . -p node_modules/google-closure-library/closure -o compiled --compiler_jar node_modules/google-closure-compiler/compiler.jar > google-protobuf.js',

8
src/google/protobuf/compiler/js/js_generator.cc
View File

@ -160,6 +160,14 @@ string GetJSFilename(const string& filename) {
// Given a filename like foo/bar/baz.proto, returns the root directory
// path ../../
string GetRootPath(const string& filename) {
if (filename.find("google/protobuf") == 0) {
// Well-known types (.proto files in the google/protobuf directory) are
// assumed to come from the 'google-protobuf' npm package. We may want to
// generalize this exception later by letting others put generated code in
// their own npm packages.
return "google-protobuf/";
}
size_t slashes = std::count(filename.begin(), filename.end(), '/');
if (slashes == 0) {
return "./";