pbjs descriptor.proto compatibility; always use Uint8Array in docs fo…

…r tsd, see #503
protobufjs · Nov 30, 2016 · 48bce16 · 48bce16
1 parent 29ff3f1
commit 48bce16
Show file tree

Hide file tree

Showing 22 changed files with 371 additions and 650 deletions.
diff --git a/cli/targets/proto.js b/cli/targets/proto.js
@@ -144,6 +144,18 @@ function buildEnum(enm) {
     push("}");
 }
 
+function buildRanges(keyword, ranges) {
+    if (ranges && ranges.length) {
+        push("");
+        ranges.forEach(function(range) {
+            if (range[0] === range[1])
+                push(keyword + " " + range[0] + ";");
+            else
+                push(keyword + " " + range[0] + " to " + (range[1] === 0x1FFFFFFF ? "max" : range[1]) + ";");
+        });
+    }
+}
+
 function buildType(type) {
     push("");
     push("message " + type.name + " {");
@@ -153,12 +165,8 @@ function buildType(type) {
     first = true;
     type.fieldsArray.forEach(build);
     consolidateExtends(type.nestedArray).remaining.forEach(build);
-    if (type.extensions && type.extensions.length) {
-        push("");
-        type.extensions.forEach(function(range) {
-            push("extensions " + range[0] + " to " + (range[1] === 0x1FFFFFFF ? "max" : range[1]) + ";");
-        });
-    }
+    buildRanges("extensions", type.extensions);
+    buildRanges("reserved", type.reserved);
     --indent;
     push("}");
 }

diff --git a/dist/protobuf.js b/dist/protobuf.js
diff --git a/dist/protobuf.js.map b/dist/protobuf.js.map
diff --git a/dist/protobuf.min.js b/dist/protobuf.min.js
diff --git a/dist/protobuf.min.js.gz b/dist/protobuf.min.js.gz
diff --git a/dist/protobuf.min.js.map b/dist/protobuf.min.js.map
diff --git a/google/protobuf/README.md b/google/protobuf/README.md
@@ -0,0 +1 @@
+This folder contains stripped and pre-parsed definitions of common Google types. These files are not used by protobuf.js directly but are here so you can use or include them where required.
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1 @@
		This folder contains stripped and pre-parsed definitions of common Google types. These files are not used by protobuf.js directly but are here so you can use or include them where required.