Commit Graph

183 Commits

Author SHA1 Message Date
Yilun Chong
0adb74c2d3 Down-integrate internal changes to github. (#5555)
* Down-integrate internal changes to github.

* fix python conformance test

* fix csharp conformance test

* add back java map_lite_test.proto's optimize for option

* fix php conformance test
2019-01-08 15:06:30 -08:00
Bo Yang
624a40a387 Down-integrate internal changes to github. 2018-12-20 14:21:20 -08:00
Adam Cozzette
24204c9c4f Added new JS test protos to gulpfile.js 2018-11-09 11:40:27 -08:00
Adam Cozzette
0894e07536 Integrated internal changes from Google 2018-11-09 11:28:22 -08:00
Feng Xiao
afe98de32a Replace repo links. 2018-08-22 11:55:30 -07:00
Feng Xiao
a8465b738e Merge master branch. 2018-08-08 17:14:42 -07:00
Feng Xiao
6bbe197e9c Down-integrate from google3. 2018-08-08 17:00:41 -07:00
Yilun Chong
9bbc4b1fab
Merge pull request #4981 from BSBandme/fix_js_skipgroup
Fix js reader.js's skipGroup
2018-08-08 11:01:53 -07:00
Yilun Chong
600e4e5f3b fix 2018-08-01 15:39:03 -07:00
Adam Cozzette
94d55e5292 Merge branch '3.6.x' into merge-3-6-x 2018-08-01 13:44:55 -07:00
Yilun Chong
1bec76f04c fix 2018-08-01 13:24:54 -07:00
Yilun Chong
2ab6cb4570 fix 2018-08-01 10:06:27 -07:00
Yilun Chong
ed1cd2c5c6 fix 2018-07-31 15:14:08 -07:00
Yilun Chong
82a4e4e3d3 Fix js reader.js's skipGroup 2018-07-31 11:35:48 -07:00
Adam Cozzette
9e1286b949 Updated version numbers to 3.6.1 2018-07-27 13:30:28 -07:00
Feng Xiao
2dcd6ae409
Remove/replace travis references (#4953)
* Remove/replace travis references.
2018-07-22 17:14:24 -07:00
Joshua Haberman
0ea3d74c3d
Merge pull request #4299 from hekike/feat/add-commonjs-strict-import-style
Feat: add import-style=commonjs_strict option to the compiler
2018-07-02 13:58:42 -07:00
Adam Cozzette
d1af029104 Fixed JS parsing of unspecified map keys
We need to use a default of 0 when parsing unspecified map keys, instead
of failing an assertion.

This change was written by Michael Aaron (michaelaaron@google.com) but I
am cherry-picking it directly instead of waiting for the next sync of
Google-internal changes.
2018-05-25 14:44:22 -07:00
Jisi Liu
45eb28b588 Update version number to 3.6.0 2018-05-14 16:06:22 -07:00
Peter Marton
13f94b4092 Fix strict JS generator with import in a protofile 2018-05-08 09:23:56 -07:00
Peter Marton
3c4e368473 Test: cover import_style=commonjs_strict 2018-05-08 09:23:56 -07:00
Peter Marton
1062d985b9 Feat: add import-style=commonjs_strict option to the compiler 2018-05-08 09:23:56 -07:00
Paul Yang
c931743461
Merge branch (#4466)
* Fix setup.py for windows build.

* Bump version number to 3.5.2

* Cat the test-suite.log on errors for presubits
2018-04-02 15:55:28 -07:00
Charlie Moad
579f81e1c6 js message support for jstype string on integers (#4332) 2018-04-02 15:44:28 -07:00
Adam Cozzette
afe96b6d42 Merge branch 'master' into down-integrate 2018-03-13 16:54:31 -07:00
Adam Cozzette
0400cca323 Integrated internal changes from Google 2018-03-13 16:37:29 -07:00
Adam Cozzette
f8005a5d5a Revert "Removed mention of Buffer in byteSourceToUint8Array"
This reverts commit f00e06c95b.

Although Node Buffers are not covered by the tests, it seems that there
are users relying on them, so we need to add back in support for them.

This fixes issue #4359.
2018-03-09 15:08:52 -08:00
Jisi Liu
383a4941d5 Merge remote-tracking branch 'origin/3.5.x' into master 2018-01-03 09:28:40 -08:00
Jisi Liu
050fc9a437 Update version number to 3.5.1 2017-12-19 11:00:33 -08:00
Adam Cozzette
e372df5c97 Fixed failing JS tests 2017-12-05 10:41:31 -08:00
Adam Cozzette
0ba8eea655 Merge branch 'master' into down-integrate 2017-12-01 10:05:19 -08:00
Adam Cozzette
92a7e778e7 Integrated internal changes from Google 2017-12-01 10:05:10 -08:00
Jisi Liu
97dd175a91 Update version number to 3.5.0 2017-11-02 14:16:22 -07:00
Stefan Huber
44daa59e53 To be clear that we set a new variable 2017-10-24 14:01:22 +02:00
Jisi Liu
1a7a7fca80 Merge from google internal 2017-10-18 12:22:18 -07:00
Jisi Liu
de15e73d58 Merge remote-tracking branch 'origin/3.4.x' into master 2017-10-11 14:44:03 -07:00
Jisi Liu
dba647a6b2 Bump version for minor release 2017-09-14 11:12:55 -07:00
Adam Cozzette
13fd045dbb Integrated internal changes from Google 2017-09-14 10:03:57 -07:00
Paul Yang
8741da3e45 Revert "Fix js conformance tests. (#3604)" (#3633)
This reverts commit 2bd55a9fbc.
2017-09-13 14:23:59 -07:00
Paul Yang
2bd55a9fbc Fix js conformance tests. (#3604)
* Fix js conformance tests.

* Remove old incorrect compatibility tests
2017-09-12 15:09:47 -07:00
Jisi Liu
7bb39bef1a Update version number for 3.4.0 2017-07-24 16:03:49 -07:00
Jisi Liu
988376c95b remove broken imports in JS 2017-07-19 14:07:09 -07:00
Jisi Liu
3af881c7e2 Merge master into 3.4.x 2017-07-18 16:26:16 -07:00
Jisi Liu
09354db143 Merge from Google internal for 3.4 release 2017-07-18 15:38:30 -07:00
dylanetaft
36fcc2a5d8 Expand documentation in Readme.md
Add some supporting documentation regarding Closure for those unfamiliar., Also substantiate details for "files in this directory" - including them all will result in a project that does not compile as some are used for test cases and aren't part of the core library.
2017-07-15 01:52:07 -04:00
Adam Cozzette
f00e06c95b Removed mention of Buffer in byteSourceToUint8Array
The Closure compiler complains about Buffer since that class exists only
in Node. That logic does not seem to be needed (unit tests and conformance
tests pass without it), so let's just remove it to solve the problem.
2017-05-02 17:25:54 -07:00
Paul Jolly
bcb3506641 Fix #1562 by using goog.crypt.byteArrayToString instead of String.fromCharCode.apply 2017-05-02 13:40:42 +01:00
Adam Cozzette
9053033a50 Merge remote-tracking branch 'remotes/google/3.3.x' into merge-3.3-to-master 2017-04-27 14:55:53 -07:00
Feng Xiao
80f0c0ac40 Update version number and changelog for 3.3.0 2017-04-05 17:32:17 -07:00
Adam Cozzette
10ea25133d Added compatibility tests for version 3.0.0 2017-04-03 12:55:20 -07:00
Adam Cozzette
7e5f980508 Split test protos into two groups 2017-04-03 12:55:20 -07:00
Feng Xiao
d36c0c538a Down-integrate from google3. 2017-03-29 14:33:05 -07:00
Joshua Haberman
c565e25c7d Merge pull request #1662 from haberman/jsconformance
Conformance tests for JavaScript (Node.js). 15 tests are failing.
2017-03-27 12:03:09 -07:00
Adam Cozzette
651ba62ab5 JS: ensure that extension values are serialized even if they're falsy
There was a bug where for JavaScript we would only serialize an
extension value if it evaluated as truthy, which meant that values like
0 would get silently dropped (even in proto2, where field presence is
significant). This fixes issue #2605, and takes care of the output of
toObject() in addition to the binary format.
2017-03-06 15:37:40 -08:00
Josh Haberman
f873d3213c Added JavaScript conformance tests. All tests pass! 2017-03-06 10:42:27 -08:00
Adam Cozzette
671e075c5e Use closurebuilder.py in favor of calcdeps.py for compiling JavaScript
There are two motivations for this:
1) calcdeps.py is deprecated and replaced by closurebuilder.py.
2) As part of this I was able to tweak things so that the Closure
compiler does not attempt to examine every .js file in the tree under
js/. This makes it possible to put compatibility tests and related files
in a subdirectory without them getting mixed up with the main .js files
we care about.
2017-03-01 07:43:11 -08:00
Adam Cozzette
aff9d9d39c Removed log statement from writer_test.js
This tweak makes the test output a bit easier to read because it cuts
out a lot of unnecessary logging.
2017-02-28 13:49:56 -08:00
Paul Yang
7f3e237071 Merge 3.2.x branch into master (#2648)
* Down-integrate internal changes to github.

* Update conformance test failure list.

* Explicitly import used class in nano test to avoid random test fail.

* Update _GNUC_VER to use the correct implementation of atomic operation
on Mac.

* maps_test.js: check whether Symbol is defined before using it (#2524)

Symbol is not yet available on older versions of Node.js and so this
test fails with them. This change just directly checks whether Symbol is
available before we try to use it.

* Added well_known_types_embed.cc to CLEANFILES so that it gets cleaned up

* Updated Makefile.am to fix out-of-tree builds

* Added Bazel genrule for generating well_known_types_embed.cc

In pull request #2517 I made this change for the CMake and autotools
builds but forgot to do it for the Bazel build.

* Update _GNUC_VER to use the correct implementation of atomic operation on Mac.

* Add new js file in extra dist.

* Bump version number to 3.2.0

* Fixed issue with autoloading - Invalid paths (#2538)

* PHP fix int64 decoding (#2516)

* fix int64 decoding

* fix int64 decoding + tests

* Fix int64 decoding on 32-bit machines.

* Fix warning in compiler/js/embed.cc

embed.cc: In function ‘std::string CEscape(const string&)’:
embed.cc:51:32: warning: comparison between signed and unsigned integer expressions [-Wsign-compare]
   for (int i = 0; i < str.size(); ++i) {
                                ^

* Fix include in auto-generated well_known_types_embed.cc

Restore include style fix (e3da722) that has been trampled by
auto-generation of well_known_types_embed.cc

* Fixed cross compilations with the Autotools build

Pull request #2517 caused cross compilations to start failing, because
the js_embed binary was being built to run on the target platform
instead of on the build machine. This change updates the Autotools build
to use the AX_PROG_CXX_FOR_BUILD macro to find a suitable compiler for
the build machine and always use that when building js_embed.

* Minor fix for autocreated object repeated fields and maps.

- If setting/clearing a repeated field/map that was objects, check the class
  before checking the autocreator.
- Just to be paranoid, don’t mutate within copy/mutableCopy for the autocreated
  classes to ensure there is less chance of issues if someone does something
  really crazy threading wise.
- Some more tests for the internal AutocreatedArray/AutocreatedDictionary
  classes to ensure things are working as expected.
- Add Xcode 8.2 to the full_mac_build.sh supported list.

* Fix generation of extending nested messages in JavaScript (#2439)

* Fix generation of extending nested messages in JavaScript

* Added missing test8.proto to build

* Fix generated code when there is no namespace but there is enum definition.

* Decoding unknown field should succeed.

* Add embed.cc in src/Makefile.am to fix dist check.

* Fixed "make distcheck" for the Autotools build

To make the test pass I needed to fix out-of-tree builds and update
EXTRA_DIST and CLEANFILES.

* Remove redundent embed.cc from src/Makefile.am

* Update version number to 3.2.0-rc.1 (#2578)

* Change protoc-artifacts version to 3.2.0-rc.1

* Update version number to 3.2.0rc2

* Update change logs for 3.2.0 release.

* Update php README

* Update upb, fixes some bugs (including a hash table problem). (#2611)

* Update upb, fixes some bugs (including a hash table problem).

* Ruby: added a test for the previous hash table corruption.

Verified that this triggers the bug in the currently released
version.

* Ruby: bugfix for SEGV.

* Ruby: removed old code for dup'ing defs.

* Reverting deployment target to 7.0 (#2618)

The Protobuf library doesn’t require the 7.1 deployment target so
reverting it back to 7.0

* Fix typo that breaks builds on big-endian (#2632)

* Bump version number to 3.2.0
2017-01-31 09:17:32 -08:00
Marcus Longmuir
2c16f6979a Fix generation of extending nested messages in JavaScript (#2439)
* Fix generation of extending nested messages in JavaScript

* Added missing test8.proto to build
2017-01-06 16:59:47 -08:00
Adam Cozzette
fda876a149 Added back in binary serialization round-trip in message_test.js 2016-11-21 12:14:42 -08:00
Adam Cozzette
40f3586412 Fixed remaining JSPB test failures 2016-11-21 09:19:22 -08:00
Adam Cozzette
315350b2fa Updated message_test.js so that it does not depend on fromObject 2016-11-21 09:08:23 -08:00
Adam Cozzette
b4dd686ab4 Updated enum names in test.proto to avoid conflicting with testbinary.proto 2016-11-21 09:08:23 -08:00
Adam Cozzette
5d63097fc2 Merge branch 'master' into down-integrate-with-msvc-fix 2016-11-17 17:04:30 -08:00
Adam Cozzette
5a76e633ea Integrated internal changes from Google 2016-11-17 16:59:59 -08:00
Joshua Haberman
c6f3d700b9 Merge pull request #1907 from evokly/js-utf8-fix
JS: Fix for high utf-8 codepoints.
2016-11-15 09:29:46 -08:00
Wojciech Mandrysz
bd850a25f5 JS: Well, this is the right place for surrogates. 2016-11-15 14:10:09 +01:00
Wojciech Mandrysz
292c2c91cf JS: Re-added comment, moved surrogates code to the right place 2016-11-15 12:44:15 +01:00
Josh Haberman
5d9dbe3ecc Fixed JavaScript license declaration. 2016-11-14 10:37:51 -08:00
Wojciech Mandrysz
7332ffb1f0 JS: Replaced fromCodePoint/codePointAt with fromCharCode/charCodeAt because of functions limited availability, fixed typo in tests. 2016-10-10 23:00:01 +02:00
Josh Haberman
f2eeaf7110 Added alias getFieldProto3 as used by older generated code.
Un-breaks users who have old generated code and upgrade
to the 3.1.0 release.
2016-10-10 11:44:21 -07:00
Adam Cozzette
4a4a1627c1 Fixed references to foreign nested messages with CommonJS-style imports
A bug was causing generated JSPB code with CommonJS-style imports to
refer incorrectly to nested messages from other .proto files. The
generated code would have things like "test_pb.InnerMessage" instead of
"test_pb.OuterMessage.InnerMessage". This commit fixes the problem by
correctly taking into account any message nesting.
2016-10-10 11:44:21 -07:00
Feng Xiao
f933d10fbe Update version number.
[skip ci]

Change-Id: I1ba6f6372a08b5796570851336e1a548602f60da
2016-10-10 11:44:21 -07:00
Bo Yang
15f4db6cb1 Bump version number to 3.1.0-alpha-1. 2016-10-10 11:24:31 -07:00
Joshua Haberman
af62fde5e8 Fix for maps_test.js in JavaScript. (#2145)
Had to strip out some JSPB-format test code,
but also added some .proto test messages that
had been improperly stripped out.
2016-10-10 11:23:36 -07:00
Bo Yang
cc8ca5b6a5 Integrate internal changes 2016-10-10 11:23:36 -07:00
Wojciech Mandrysz
fe1d0a1f5a JS: Added string encoding/decoding tests for UTF-8 2016-10-03 01:44:15 +02:00
Wojciech Mandrysz
23f108d471 JS: Fixed UTF-8 string encoder/decoder for high codepoints. 2016-10-03 01:44:15 +02:00
Jisi Liu
58860c021f Merge remote-tracking branch 'origin/3.0.x' into merge 2016-09-14 09:37:48 -07:00
Joshua Haberman
7645a3d03d Merge pull request #1884 from hochhaus/valueWriterFn
Fix valueWriterFn_ variable name
2016-09-07 10:15:10 -07:00
Jisi Liu
6e11540b32 Bump version number to 3.0.2 2016-09-02 11:57:49 -07:00
Guillaume Egles
8335b7d93e Fix missing import of jspb.Map (#1885) 2016-08-29 16:30:48 -07:00
Guillaume Egles
ea081fe220 Fix missing import of jspb.Map (#1885) 2016-08-03 17:47:49 -07:00
Joshua Haberman
6b3d120539 Merge pull request #1887 from sheffatguidance/fix-js-api-documentation
Fix Issue #1869: faulty js API documentation
2016-07-29 16:52:01 -07:00
Joshua Haberman
1112989a1b Merge pull request #1884 from hochhaus/valueWriterFn
Fix valueWriterFn_ variable name
2016-07-29 16:09:53 -07:00
sheffatguidance
9a11ab4f4f Fix Issue #1869: faulty js API documentation 2016-07-29 12:53:59 -05:00
Andy Hochhaus
a2174089b2 Fix valueWriterFn variable name 2016-07-29 09:21:01 -07:00
Jisi Liu
fb7a7c5f1f Bump version number for GA 2016-07-25 12:07:56 -07:00
Nikolai Vavilov
73e0b49272 fix debug.dump 2016-07-20 17:11:04 +03:00
Nikolai Vavilov
e4b129f304 restore old behavior for toObject 2016-07-19 10:34:58 +03:00
Nikolai Vavilov
970a4fda17 Make implicit defaults consistent with explicit defaults 2016-07-19 09:39:52 +03:00
Joshua Haberman
77b08afaf8 Merge pull request #1802 from haberman/jsmapbin
JavaScript: segregate references to binary functionality
2016-07-18 22:52:07 -07:00
Josh Haberman
e0e7377119 Fix goog.require()/goog.provide() ordering. 2016-07-18 20:49:11 -07:00
Josh Haberman
7429b91eda JavaScript: move extension binary info to separate struct. 2016-07-18 15:58:58 -07:00
Josh Haberman
923eae8b16 JavaScript maps: move binary callbacks out of constructor.
This change will help us separate binary support into
separate files, because we only refer to binary serialization
functions in the actual binary serialization paths.
2016-07-18 14:46:12 -07:00
Feng Xiao
932f94e16e Update version number to 3.0.0-beta-4 2016-07-13 16:08:47 -07:00
Feng Xiao
9086d96439 Integrate from internal code base. 2016-07-13 13:48:40 -07:00
Adam Cozzette
c64d86ed4f Fixed failing JS tests
A couple of small tweaks were needed to fix test failures that were
inadvertently introduced in the last down integration. I also had to add
the map.js file which was missing.
2016-07-06 14:11:39 -07:00
Adam Cozzette
d64a2d9941 Integrated internal changes from Google
This includes all internal changes from around May 20 to now.
2016-06-29 15:38:03 -07:00
Josh Haberman
6a6f95d522 JS package.json: Added author and updated Closure Library version. 2016-06-23 15:08:15 -07:00