Fix: Enable ADVANCED_OPTIMIZATIONS in Closure Compiler

Author: sayjeyhi

commonjs/export.js

@@ -16,17 +16,16 @@ goog.require('jspb.Message');
 goog.require('jspb.Map');
 
 if (typeof exports === 'object') {
-  exports.Map = jspb.Map;
-  exports.Message = jspb.Message;
-  exports.BinaryReader = jspb.BinaryReader;
-  exports.BinaryWriter = jspb.BinaryWriter;
-  exports.ExtensionFieldInfo = jspb.ExtensionFieldInfo;
-  exports.ExtensionFieldBinaryInfo = jspb.ExtensionFieldBinaryInfo;
-
-  // These are used by generated code but should not be used directly by
-  // clients.
-  exports.exportSymbol = goog.exportSymbol;
-  exports.inherits = goog.inherits;
-  exports.object = {extend: goog.object.extend};
-  exports.typeOf = goog.typeOf;
+  exports['Map'] = jspb.Map;
+  exports['Message'] = jspb.Message;
+  exports['BinaryReader'] = jspb.BinaryReader;
+  exports['BinaryWriter'] = jspb.BinaryWriter;
+  exports['ExtensionFieldInfo'] = jspb.ExtensionFieldInfo;
+  exports['ExtensionFieldBinaryInfo'] = jspb.ExtensionFieldBinaryInfo;
+  
+  // These are used by generated code but should not be used directly by clients.
+  exports['exportSymbol'] = goog.exportSymbol;
+  exports['inherits'] = goog.inherits;
+  exports['object'] = {extend: goog.object.extend};
+  exports['typeOf'] = goog.typeOf;
 }

commonjs/export_testdeps.js

@@ -11,12 +11,5 @@ goog.provide('jspb.ExportTestDeps');
 
 goog.require('goog.crypt.base64');
 goog.require('goog.testing.PropertyReplacer');
-goog.require('jspb.arith.Int64');
-goog.require('jspb.arith.UInt64');
-goog.require('jspb.BinaryEncoder');
-goog.require('jspb.BinaryDecoder');
-goog.require('jspb.BinaryWriter');
-goog.require('jspb.utils');
 
 exports.goog = goog;
-exports.jspb = jspb;

commonjs/rewrite_tests_for_commonjs.js

@@ -67,7 +67,7 @@ console.log("var global = Function('return this')();");
 console.log("var googleProtobuf = require('google-protobuf');");
 console.log("var testdeps = require('testdeps_commonjs');");
 console.log("global.goog = testdeps.goog;");
-console.log("global.jspb = testdeps.jspb;");
+console.log("global.jspb = googleProtobuf.jspb;");
 console.log("var asserts = require('closure_asserts_commonjs');");
 console.log("");
 console.log("// Bring asserts into the global namespace.");

gulpfile.js

@@ -118,7 +118,12 @@ function genproto_group3_commonjs_strict(cb) {
 }
 
 
-function getClosureCompilerCommand(exportsFile, outputFile) {
+function getClosureCompilerCommand(exportsFile, outputFile, keepSymbols) {
+  var compilationLevel = 'ADVANCED_OPTIMIZATIONS';
+  if (keepSymbols === true) {
+    compilationLevel = 'SIMPLE_OPTIMIZATIONS';
+  }
+
   const closureLib = 'node_modules/google-closure-library';
   return [
     'node_modules/.bin/google-closure-compiler',
@@ -127,6 +132,8 @@ function getClosureCompilerCommand(exportsFile, outputFile) {
     '--js=message.js', '--js=binary/arith.js', '--js=binary/constants.js',
     '--js=binary/decoder.js', '--js=binary/encoder.js', '--js=binary/reader.js',
     '--js=binary/utils.js', '--js=binary/writer.js', `--js=${exportsFile}`,
+    `--compilation_level=${compilationLevel}"`, '--generate_exports',
+    '--export_local_property_definitions"',
     `--entry_point=${exportsFile}`, `> ${outputFile}`
   ].join(' ');
 }
@@ -145,7 +152,8 @@ function commonjs_asserts(cb) {
                 'mkdir -p commonjs_out/test_node_modules && ' +
                   getClosureCompilerCommand(
                       'commonjs/export_asserts.js',
-                      'commonjs_out/test_node_modules/closure_asserts_commonjs.js'),
+                      'commonjs_out/test_node_modules/closure_asserts_commonjs.js',
+                      true),
                 make_exec_logging_callback(cb));
 }
 
@@ -154,7 +162,8 @@ function commonjs_testdeps(cb) {
                 'mkdir -p commonjs_out/test_node_modules && ' +
                   getClosureCompilerCommand(
                       'commonjs/export_testdeps.js',
-                      'commonjs_out/test_node_modules/testdeps_commonjs.js'),
+                      'commonjs_out/test_node_modules/testdeps_commonjs.js',
+                      true),
                 make_exec_logging_callback(cb));
 }
 

message_test.js

@@ -746,7 +746,7 @@ describe('Message test suite', function() {
      /** @suppress {visibility} */ function() {
        var data =
            new proto.jspb.test.HasExtensions(['str1', {'a_key': 'an_object'}]);
-       assertEquals('an_object', data.extensionObject_['a_key']);
+       assertEquals('an_object', jspb.Message.getField(data,['a_key']));
      });
 
   it('testToObject_hasExtensionField', function() {