Merge branch 'main' of github.com:protocolbuffers/protobuf-javascript

� Conflicts:
�	gulpfile.js

Author: sayjeyhi

BUILD

@@ -0,0 +1,61 @@
+# Protobuf JS runtime
+#
+# See also code generation logic under generator/
+
+load("@rules_pkg//:mappings.bzl", "pkg_attributes", "pkg_files", "strip_prefix")
+load("@rules_pkg//:pkg.bzl", "pkg_tar", "pkg_zip")
+load("//:protobuf_javascript_release.bzl", "package_naming")
+
+package_naming(
+    name = "protobuf_javascript_pkg_naming",
+)
+
+pkg_files(
+    name = "plugin_files",
+    srcs = ["//generator:protoc-gen-js"],
+    attributes = pkg_attributes(mode = "0555"),
+    prefix = "bin/",
+)
+
+pkg_files(
+    name = "dist_files",
+    srcs = glob([
+        "google/protobuf/*.js",
+        "google/protobuf/compiler/*.js"
+    ]) + [
+        "google-protobuf.js",
+        "package.json",
+        "README.md",
+        "LICENSE.md",
+    ],
+    strip_prefix = strip_prefix.from_root(""),
+)
+
+pkg_tar(
+    name = "dist_tar",
+    srcs = [
+        ":dist_files",
+        ":plugin_files",
+    ],
+    extension = "tar.gz",
+    package_file_name = "protobuf-javascript-{version}-{platform}.tar.gz",
+    package_variables = ":protobuf_javascript_pkg_naming",
+)
+
+pkg_zip(
+    name = "dist_zip",
+    srcs = [
+        ":dist_files",
+        ":plugin_files",
+    ],
+    package_file_name = "protobuf-javascript-{version}-{platform}.zip",
+    package_variables = ":protobuf_javascript_pkg_naming",
+)
+
+filegroup(
+    name = "dist_all",
+    srcs = [
+        ":dist_tar",
+        ":dist_zip",
+    ]
+)

BUILD.bazel

@@ -11,3 +11,6 @@ http_archive(
 load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
 
 protobuf_deps()
+
+load("@rules_pkg//:deps.bzl", "rules_pkg_dependencies")
+rules_pkg_dependencies()

LICENSE renamed to LICENSE.md

@@ -35,7 +35,7 @@ goog.require('goog.testing.asserts');
 goog.require('jspb.BinaryWriter');
 goog.require('jspb.Message');
 
-// CommonJS-LoadFromFile: ../testbinary_pb proto.jspb.test
+// CommonJS-LoadFromFile: ../protos/testbinary_pb proto.jspb.test
 goog.require('proto.jspb.test.ExtendsWithMessage');
 goog.require('proto.jspb.test.ForeignEnum');
 goog.require('proto.jspb.test.ForeignMessage');

WORKSPACE

@@ -39,8 +39,8 @@ var global = Function('return this')();
 // Bring asserts into the global namespace.
 googleProtobuf.object.extend(global, asserts);
 
-var test9_pb = require('./test9_pb');
-var test10_pb = require('./test10_pb');
+var test9_pb = require('./protos/test9_pb');
+var test10_pb = require('./protos/test10_pb');
 
 describe('Strict test suite', function() {
   it('testImportedMessage', function() {

binary/proto_test.js

@@ -9,11 +9,8 @@ cc_binary(
     ],
     visibility = ["//visibility:public"],
     deps = [
-        #"@com_google_absl//absl/base:core_headers",
-        #"@com_google_absl//absl/container:flat_hash_map",
-        #"@com_google_absl//absl/container:flat_hash_set",
-        #"@com_google_absl//absl/strings",
         "@com_google_protobuf//:protobuf",
         "@com_google_protobuf//:protoc_lib",
     ],
 )
+

commonjs/strict_test.js

@@ -28,32 +28,32 @@ const wellKnownTypes = [
 wellKnownTypes.forEach((path) => protocInc + '/' + path);
 
 const group1Protos = [
-  'data.proto',
-  'test3.proto',
-  'test5.proto',
+  'protos/data.proto',
+  'protos/test3.proto',
+  'protos/test5.proto',
   'commonjs/test6/test6.proto',
-  'test8.proto',
-  'test11.proto',
-  'test12.proto',
-  'test13.proto',
-  'test14.proto',
-  'test15.proto',
-  'testbinary.proto',
-  'testempty.proto',
-  'test.proto',
-  'testlargenumbers.proto',
+  'protos/test8.proto',
+  'protos/test11.proto',
+  'protos/test12.proto',
+  'protos/test13.proto',
+  'protos/test14.proto',
+  'protos/test15.proto',
+  'protos/testbinary.proto',
+  'protos/testempty.proto',
+  'protos/test.proto',
+  'protos/testlargenumbers.proto',
 ];
 
 const group2Protos = [
-  'proto3_test.proto',
-  'test2.proto',
-  'test4.proto',
+  'protos/proto3_test.proto',
+  'protos/test2.proto',
+  'protos/test4.proto',
   'commonjs/test7/test7.proto',
 ];
 
 const group3Protos = [
-  'test9.proto',
-  'test10.proto'
+  'protos/test9.proto',
+  'protos/test10.proto'
 ];
 
 function make_exec_logging_callback(cb) {

generator/BUILD renamed to generator/BUILD.bazel

@@ -32,7 +32,7 @@ goog.require('goog.testing.asserts');
 goog.require('goog.testing.TestCase');
 goog.require('goog.userAgent');
 
-// CommonJS-LoadFromFile: testbinary_pb proto.jspb.test
+// CommonJS-LoadFromFile: protos/testbinary_pb proto.jspb.test
 goog.require('proto.jspb.test.MapValueEnum');
 goog.require('proto.jspb.test.MapValueMessage');
 goog.require('proto.jspb.test.TestMapFields');
@@ -50,7 +50,7 @@ goog.require('proto.jspb.test.MapEntryOptionalValuesDoubleValue');
 goog.require('proto.jspb.test.MapEntryOptionalValuesEnumValue');
 goog.require('proto.jspb.test.MapEntryOptionalValuesMessageValue');
 
-// CommonJS-LoadFromFile: test_pb proto.jspb.test
+// CommonJS-LoadFromFile: protos/test_pb proto.jspb.test
 goog.require('proto.jspb.test.MapValueMessageNoBinary');
 goog.require('proto.jspb.test.TestMapFieldsNoBinary');
 

gulpfile.js

@@ -37,20 +37,20 @@ goog.require('goog.testing.asserts');
 goog.require('goog.testing.TestCase');
 goog.require('goog.userAgent');
 
-// CommonJS-LoadFromFile: google-protobuf jspb
+// CommonJS-LoadFromFile: protos/google-protobuf jspb
 goog.require('jspb.Message');
 
-// CommonJS-LoadFromFile: test15_pb proto.jspb.filenametest.package1
+// CommonJS-LoadFromFile: protos/test15_pb proto.jspb.filenametest.package1
 goog.require('proto.jspb.filenametest.package1.b');
 
-// CommonJS-LoadFromFile: test14_pb proto.jspb.filenametest.package2
+// CommonJS-LoadFromFile: protos/test14_pb proto.jspb.filenametest.package2
 goog.require('proto.jspb.filenametest.package2.TestMessage');
 
-// CommonJS-LoadFromFile: test13_pb proto.jspb.filenametest.package1
+// CommonJS-LoadFromFile: protos/test13_pb proto.jspb.filenametest.package1
 goog.require('proto.jspb.filenametest.package1.a');
 goog.require('proto.jspb.filenametest.package1.TestMessage');
 
-// CommonJS-LoadFromFile: test12_pb proto.jspb.circulartest
+// CommonJS-LoadFromFile: protos/test12_pb proto.jspb.circulartest
 goog.require('proto.jspb.circulartest.ExtensionContainingType1');
 goog.require('proto.jspb.circulartest.ExtensionContainingType2');
 goog.require('proto.jspb.circulartest.ExtensionField1');
@@ -67,25 +67,25 @@ goog.require('proto.jspb.circulartest.NestedMessage2');
 goog.require('proto.jspb.circulartest.RepeatedMessageField1');
 goog.require('proto.jspb.circulartest.RepeatedMessageField2');
 
-// CommonJS-LoadFromFile: test11_pb proto.jspb.exttest.reverse
+// CommonJS-LoadFromFile: protos/test11_pb proto.jspb.exttest.reverse
 goog.require('proto.jspb.exttest.reverse.TestExtensionReverseOrderMessage1');
 goog.require('proto.jspb.exttest.reverse.TestExtensionReverseOrderMessage2');
 goog.require('proto.jspb.exttest.reverse.c');
 
-// CommonJS-LoadFromFile: test8_pb proto.jspb.exttest.nested
+// CommonJS-LoadFromFile: protos/test8_pb proto.jspb.exttest.nested
 goog.require('proto.jspb.exttest.nested.TestNestedExtensionsMessage');
 goog.require('proto.jspb.exttest.nested.TestOuterMessage');
 
-// CommonJS-LoadFromFile: test5_pb proto.jspb.exttest.beta
+// CommonJS-LoadFromFile: protos/test5_pb proto.jspb.exttest.beta
 goog.require('proto.jspb.exttest.beta.floatingStrField');
 
-// CommonJS-LoadFromFile: test3_pb proto.jspb.exttest
+// CommonJS-LoadFromFile: protos/test3_pb proto.jspb.exttest
 goog.require('proto.jspb.exttest.floatingMsgField');
 
-// CommonJS-LoadFromFile: test4_pb proto.jspb.exttest
+// CommonJS-LoadFromFile: protos/test4_pb proto.jspb.exttest
 goog.require('proto.jspb.exttest.floatingMsgFieldTwo');
 
-// CommonJS-LoadFromFile: test_pb proto.jspb.test
+// CommonJS-LoadFromFile: protos/test_pb proto.jspb.test
 goog.require('proto.jspb.test.BooleanFields');
 goog.require('proto.jspb.test.CloneExtension');
 goog.require('proto.jspb.test.Complex');
@@ -114,12 +114,12 @@ goog.require('proto.jspb.test.TestMessageWithOneof');
 goog.require('proto.jspb.test.TestReservedNames');
 goog.require('proto.jspb.test.TestReservedNamesExtension');
 
-// CommonJS-LoadFromFile: test2_pb proto.jspb.test
+// CommonJS-LoadFromFile: protos/test2_pb proto.jspb.test
 goog.require('proto.jspb.test.ExtensionMessage');
 goog.require('proto.jspb.test.TestExtensionsMessage');
 
 goog.require('proto.jspb.test.TestAllowAliasEnum');
-// CommonJS-LoadFromFile: testlargenumbers_pb proto.jspb.test
+// CommonJS-LoadFromFile: protos/testlargenumbers_pb proto.jspb.test
 goog.require('proto.jspb.test.MessageWithLargeFieldNumbers');
 
 goog.require('proto.jspb.test.simple1');

maps_test.js

@@ -30,9 +30,9 @@
 
 goog.require('goog.crypt.base64');
 goog.require('goog.testing.asserts');
-// CommonJS-LoadFromFile: testbinary_pb proto.jspb.test
+// CommonJS-LoadFromFile: protos/testbinary_pb proto.jspb.test
 goog.require('proto.jspb.test.ForeignMessage');
-// CommonJS-LoadFromFile: proto3_test_pb proto.jspb.test
+// CommonJS-LoadFromFile: protos/proto3_test_pb proto.jspb.test
 goog.require('proto.jspb.test.Proto3Enum');
 goog.require('proto.jspb.test.TestProto3');
 // CommonJS-LoadFromFile: google/protobuf/any_pb proto.google.protobuf

message_test.js

@@ -0,0 +1,51 @@
+"""
+Generates package naming variables for use with rules_pkg.
+"""
+
+load("@rules_pkg//:providers.bzl", "PackageVariablesInfo")
+load("@bazel_tools//tools/cpp:toolchain_utils.bzl", "find_cpp_toolchain")
+
+_PROTOBUF_JAVASCRIPT_VERSION = '3.21.0'
+
+def _package_naming_impl(ctx):
+  values = {}
+  values["version"] = _PROTOBUF_JAVASCRIPT_VERSION
+
+  # infer from the current cpp toolchain.
+  toolchain = find_cpp_toolchain(ctx)
+  cpu = toolchain.cpu
+  system_name = toolchain.target_gnu_system_name
+
+  # rename cpus to match what we want artifacts to be
+  if cpu == "systemz":
+    cpu = "s390_64"
+  elif cpu == "aarch64":
+    cpu = "aarch_64"
+  elif cpu == "ppc64":
+    cpu = "ppcle_64"
+
+  # use the system name to determine the os and then create platform names
+  if "apple" in system_name:
+    values["platform"] = "osx-" + cpu
+  elif "linux" in system_name:
+    values["platform"] = "linux-" + cpu
+  elif "mingw" in system_name:
+    if cpu == "x86_64":
+      values["platform"] = "win64"
+    else:
+      values["platform"] = "win32"
+  else:
+    values["platform"] = "unknown"
+
+  return PackageVariablesInfo(values = values)
+
+
+package_naming = rule(
+  implementation = _package_naming_impl,
+    attrs = {
+      # Necessary data dependency for find_cpp_toolchain.
+      "_cc_toolchain": attr.label(default = Label("@bazel_tools//tools/cpp:current_cc_toolchain")),
+    },
+    toolchains = ["@bazel_tools//tools/cpp:toolchain_type"],
+    incompatible_use_toolchain_transition = True,
+)

proto3_test.js

@@ -32,7 +32,7 @@ syntax = "proto3";
 
 package jspb.test;
 
-import "testbinary.proto";
+import "protos/testbinary.proto";
 
 message TestProto3 {
   int32 singular_int32 = 1;

protobuf_javascript_release.bzl

@@ -32,7 +32,7 @@ syntax = "proto3";
 
 package jspb.exttest.strict.ten;
 
-import "test9.proto";
+import "protos/test9.proto";
 
 message Simple10 {
     jspb.exttest.strict.nine.Simple9 a = 1;

data.proto renamed to protos/data.proto

@@ -32,7 +32,7 @@ syntax = "proto2";
 
 package jspb.filenametest.package1;
 
-import "test13.proto";
+import "protos/test13.proto";
 
 extend TestMessage {
   optional int32 b = 2;

proto3_test.proto renamed to protos/proto3_test.proto

@@ -32,7 +32,7 @@ syntax = "proto2";
 
 package jspb.test;
 
-import "test.proto";
+import "protos/test.proto";
 
 option java_package = "com.google.apps.jspb.proto";
 option java_multiple_files = true;

test.proto renamed to protos/test.proto

@@ -32,7 +32,7 @@ syntax = "proto2";
 
 package jspb.exttest;
 
-import "test3.proto";
+import "protos/test3.proto";
 
 option java_package = "com.google.apps.jspb.proto";
 option java_multiple_files = true;