protobufjs 5.0.1 → 5.0.2

package/tests/options.json

@@ -1,32 +1,32 @@
-{
-    "package": "My",
-    "messages": [
-        {
-            "name": "Test",
-            "fields": [
-                {
-                    "rule": "optional",
-                    "options": {
-                        "default": "Max"
-                    },
-                    "type": "string",
-                    "name": "name",
-                    "id": 1
-                }
-            ],
-            "enums": [],
-            "messages": [],
-            "options": {
-                "(inmessage)": "My.Test",
-                "(foo.my_option).bar": false
-            }
-        }
-    ],
-    "enums": [],
-    "imports": [],
-    "options": {
-        "(toplevel_1)": 10,
-        "(toplevel_2)": "Hello world!"
-    },
-    "services": []
-}
+{
+    "package": "My",
+    "messages": [
+        {
+            "name": "Test",
+            "fields": [
+                {
+                    "rule": "optional",
+                    "options": {
+                        "default": "Max"
+                    },
+                    "type": "string",
+                    "name": "name",
+                    "id": 1
+                }
+            ],
+            "enums": [],
+            "messages": [],
+            "options": {
+                "(inmessage)": "My.Test",
+                "(foo.my_option).bar": false
+            }
+        }
+    ],
+    "enums": [],
+    "imports": [],
+    "options": {
+        "(toplevel_1)": 10,
+        "(toplevel_2)": "Hello world!"
+    },
+    "services": []
+}

package/tests/proto2js/Bar.json

@@ -1,46 +1,46 @@
-{
-    "package": null,
-    "messages": [
-        {
-            "ref": "Foo",
-            "fields": [
-                {
-                    "rule": "required",
-                    "type": "string",
-                    "name": "buzz",
-                    "id": 2,
-                    "options": {}
-                }
-            ]
-        }
-    ],
-    "enums": [],
-    "imports": [
-        {
-            "package": null,
-            "messages": [
-                {
-                    "name": "Foo",
-                    "fields": [
-                        {
-                            "rule": "required",
-                            "type": "string",
-                            "name": "fizz",
-                            "id": 1,
-                            "options": {}
-                        }
-                    ],
-                    "enums": [],
-                    "messages": [],
-                    "options": {}
-                }
-            ],
-            "enums": [],
-            "imports": [],
-            "options": {},
-            "services": []
-        }
-    ],
-    "options": {},
-    "services": []
-}
+{
+    "package": null,
+    "messages": [
+        {
+            "ref": "Foo",
+            "fields": [
+                {
+                    "rule": "required",
+                    "type": "string",
+                    "name": "buzz",
+                    "id": 2,
+                    "options": {}
+                }
+            ]
+        }
+    ],
+    "enums": [],
+    "imports": [
+        {
+            "package": null,
+            "messages": [
+                {
+                    "name": "Foo",
+                    "fields": [
+                        {
+                            "rule": "required",
+                            "type": "string",
+                            "name": "fizz",
+                            "id": 1,
+                            "options": {}
+                        }
+                    ],
+                    "enums": [],
+                    "messages": [],
+                    "options": {}
+                }
+            ],
+            "enums": [],
+            "imports": [],
+            "options": {},
+            "services": []
+        }
+    ],
+    "options": {},
+    "services": []
+}

package/tests/suite.js

@@ -263,6 +263,36 @@
             test.deepEqual(t2, t3);
             test.done();
         },
+        
+        "constructorWithOneofs": function(test) {
+            try {
+                var builder = ProtoBuf.loadProtoFile(__dirname+"/oneof.proto"),
+                    MyOneOf = builder.build("MyOneOf"),
+                    TOneOf = builder.lookup(".MyOneOf");
+                test.ok(TOneOf.getChild("my_oneof"));
+                
+                var myOneOf = new MyOneOf();
+                test.strictEqual(myOneOf.my_oneof, null);
+                myOneOf.set("id", 1);
+                test.strictEqual(myOneOf.my_oneof, "id");
+                myOneOf.set("name", "me");
+                test.strictEqual(myOneOf.my_oneof, "name");
+                test.strictEqual(myOneOf.id, null);
+                
+                var copy = new MyOneOf(myOneOf); // this line is what was failing
+                // Error: .MyOneOf#my_oneof is not a field: undefined
+                
+                test.deepEqual(myOneOf, copy);
+                
+                // Test same things are there
+                test.strictEqual(copy.my_oneof, "name");
+                test.strictEqual(copy.name, "me");
+                test.strictEqual(copy.id, null);
+            } catch (e) {
+                fail(e);
+            }
+            test.done();
+        },
 
         "numberFormats": function(test) {
             try {
@@ -396,7 +426,7 @@
             try {
                 var builder = ProtoBuf.loadProto("message Image { required bytes data = 1; }"),
                     Image = builder.build("Image"),
-                    data = fs.readFileSync(__dirname+"/../ProtoBuf.png"),
+                    data = fs.readFileSync(__dirname+"/../protobuf.png"),
                     image = new Image({ data: data }),
                     bb = image.encode(),
                     imageDec = Image.decode(bb),
@@ -674,6 +704,18 @@
             test.done();
         },
 
+        // Test error messages
+        "errorMessage": function(test) {
+            test.throws(function() {
+                var builder = ProtoBuf.loadJsonFile(__dirname+"/complex.json");
+                var Game = builder.build("Game");
+                var car = new Game.Cars.Car();
+                car.speed = "hello";
+                car.encode();
+            }, /Illegal value for speed/);
+            test.done();
+        },
+
         // Builder reused to add definitions from multiple sources
         "multiBuilder": function(test) {
             try {

package/sandbox/gapi/googleapis/google/api/annotations.proto

@@ -1,29 +0,0 @@
-// Copyright (c) 2015, Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package google.api;
-
-import "google/api/http.proto";
-import "google/protobuf/descriptor.proto";
-
-option java_multiple_files = true;
-option java_outer_classname = "AnnotationsProto";
-option java_package = "com.google.api";
-
-extend google.protobuf.MethodOptions {
-  // See `HttpRule`.
-  HttpRule http = 72295728;
-}

package/sandbox/gapi/googleapis/google/api/http.proto

@@ -1,245 +0,0 @@
-// Copyright (c) 2015, Google Inc.
-//
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-syntax = "proto3";
-
-package google.api;
-
-option java_multiple_files = true;
-option java_outer_classname = "HttpProto";
-option java_package = "com.google.api";
-
-
-// `HttpRule` defines the mapping of an RPC method to one or more HTTP
-// REST APIs.  The mapping determines what portions of the request
-// message are populated from the path, query parameters, or body of
-// the HTTP request.  The mapping is typically specified as an
-// `google.api.http` annotation, see "google/api/annotations.proto"
-// for details.
-//
-// The mapping consists of a field specifying the path template and
-// method kind.  The path template can refer to fields in the request
-// message, as in the example below which describes a REST GET
-// operation on a resource collection of messages:
-//
-// ```proto
-// service Messaging {
-//   rpc GetMessage(GetMessageRequest) returns (Message) {
-//     option (google.api.http).get = "/v1/messages/{message_id}";
-//   }
-// }
-// message GetMessageRequest {
-//   string message_id = 1; // mapped to the URL
-// }
-// message Message {
-//   string text = 1; // content of the resource
-// }
-// ```
-//
-// This definition enables an automatic, bidrectional mapping of HTTP
-// JSON to RPC. Example:
-//
-// HTTP | RPC
-// -----|-----
-// `GET /v1/messages/123456`  | `GetMessage(message_id: "123456")`
-//
-// In general, not only fields but also field paths can be referenced
-// from a path pattern. Fields mapped to the path pattern cannot be
-// repeated and must have a primitive (non-message) type.
-//
-// Any fields in the request message which are not bound by the path
-// pattern automatically become (optional) HTTP query
-// parameters. Assume the following definition of the request message:
-//
-// ```proto
-// message GetMessageRequest {
-//   string message_id = 1; // mapped to the URL
-//   int64 revision = 2;    // becomes a parameter
-// }
-// ```
-//
-// This enables a HTTP JSON to RPC mapping as below:
-//
-// HTTP | RPC
-// -----|-----
-// `GET /v1/messages/123456?revision=2` | `GetMessage(message_id: "123456" revision: 2)`
-//
-// Note that fields which are mapped to HTTP parameters must have a
-// primitive type or a repeated primitive type. Message types are not
-// allowed. In the case of a repeated type, the parameter can be
-// repeated in the URL, as in `...?param=A&param=B`.
-//
-// For HTTP method kinds which allow a request body, the `body` field
-// specifies the mapping. Consider a REST update method on the
-// message resource collection:
-//
-// ```proto
-// service Messaging {
-//   rpc UpdateMessage(UpdateMessageRequest) returns (Message) {
-//     option (google.api.http) = {
-//       put: "/v1/messages/{message_id}"
-//       body: "message"
-//   }
-// }
-// message UpdateMessageRequest {
-//   string message_id = 1; // mapped to the URL
-//   Message message = 2;   // mapped to the body
-// }
-// ```
-//
-// The following HTTP JSON to RPC mapping is enabled, where the
-// representation of the JSON in the request body is determined by
-// protos JSON encoding:
-//
-// HTTP | RPC
-// -----|-----
-// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" message { text: "Hi!" })`
-//
-// The special name `*` can be used in the body mapping to define that
-// every field not bound by the path template should be mapped to the
-// request body.  This enables the following alternative definition of
-// the update method:
-//
-// ```proto
-// service Messaging {
-//   rpc UpdateMessage(Message) returns (Message) {
-//     option (google.api.http) = {
-//       put: "/v1/messages/{message_id}"
-//       body: "*"
-//   }
-// }
-// message Message {
-//   string message_id = 2;
-//   string text = 2;
-// }
-// ```
-//
-// The following HTTP JSON to RPC mapping is enabled:
-//
-// HTTP | RPC
-// -----|-----
-// `PUT /v1/messages/123456 { "text": "Hi!" }` | `UpdateMessage(message_id: "123456" text: "Hi!")`
-//
-// Note that when using `*` in the body mapping, it is not possible to
-// have HTTP parameters, as all fields not bound by the path end in
-// the body. This makes this option more rarely used in practice of
-// defining REST APIs. The common usage of `*` is in custom methods
-// which don't use the URL at all for transferring data.
-//
-// It is possible to define multiple HTTP methods for one RPC by using
-// the `additional_bindings` option. Example:
-//
-// ```proto
-// service Messaging {
-//   rpc GetMessage(GetMessageRequest) returns (Message) {
-//     option (google.api.http) = {
-//       get: "/v1/messages/{message_id}"
-//       additional_bindings {
-//         get: "/v1/users/{user_id}/messages/{message_id}"
-//       }
-//   }
-// }
-// message GetMessageRequest {
-//   string message_id = 1;
-//   string user_id = 2;
-// }
-// ```
-//
-// This enables the following two alternative HTTP JSON to RPC
-// mappings:
-//
-// HTTP | RPC
-// -----|-----
-// `GET /v1/messages/123456` | `GetMessage(message_id: "123456")`
-// `GET /v1/users/me/messages/123456` | `GetMessage(user_id: "me" message_id: "123456")`
-//
-// # Rules for HTTP mapping
-// The rules for mapping HTTP path, query parameters, and body fields
-// to the request message are as follows:
-//
-// 1. The `body` field specifies either `*` or a field path, or is
-//    omitted. If omitted, it assumes there is no HTTP body.
-// 2. Leaf fields (recursive expansion of nested messages in the
-//    request) can be classified into three types:
-//     (a) Matched in the URL template.
-//     (b) Covered by body (if body is `*`, everything except (a) fields;
-//         else everything under the body field)
-//     (c) All other fields.
-// 3. URL query parameters found in the HTTP request are mapped to (c) fields.
-// 4. Any body sent with an HTTP request can contain only (b) fields.
-//
-// The syntax of the path template is as follows:
-//
-//     Template = "/" Segments [ Verb ] ;
-//     Segments = Segment { "/" Segment } ;
-//     Segment  = "*" | "**" | LITERAL | Variable ;
-//     Variable = "{" FieldPath [ "=" Segments ] "}" ;
-//     FieldPath = IDENT { "." IDENT } ;
-//     Verb     = ":" LITERAL ;
-//
-// `*` matches a single path component, `**` zero or more path components, and
-// `LITERAL` a constant.  A `Variable` can match an entire path as specified
-// again by a template; this nested template must not contain further variables.
-// If no template is given with a variable, it matches a single path component.
-// The notation `{var}` is henceforth equivalent to `{var=*}`. NOTE: the field
-// paths in variables and in the `body` must not refer to repeated fields.
-//
-// Use CustomHttpPattern to specify any HTTP method that is not included in the
-// pattern field, such as HEAD, or "*" to leave the HTTP method unspecified for
-// a given URL path rule. The wild-card rule is useful for services that provide
-// content to Web (HTML) clients.
-message HttpRule {
-
-  // Determines the URL pattern is matched by this rules. This pattern can be
-  // used with any of the {get|put|post|delete|patch} methods. A custom method
-  // can be defined using the 'custom' field.
-  oneof pattern {
-    // Used for listing and getting information about resources.
-    string get = 2;
-
-    // Used for updating a resource.
-    string put = 3;
-
-    // Used for creating a resource.
-    string post = 4;
-
-    // Used for deleting a resource.
-    string delete = 5;
-
-    // Used for updating a resource.
-    string patch = 6;
-
-    // Custom pattern is used for defining custom verbs.
-    CustomHttpPattern custom = 8;
-  }
-
-  // The name of the request field whose value is mapped to the HTTP body, or
-  // `*` for mapping all fields not captured by the path pattern to the HTTP
-  // body. NOTE: the referred field must not be a repeated field.
-  string body = 7;
-
-  // Additional HTTP bindings for the selector. Nested bindings must
-  // not contain an `additional_bindings` field themselves (that is,
-  // the nesting may only be one level deep).
-  repeated HttpRule additional_bindings = 11;
-}
-
-// A custom pattern is used for defining custom HTTP verb.
-message CustomHttpPattern {
-  // The name of this custom HTTP verb.
-  string kind = 1;
-
-  // The path matched by this custom verb.
-  string path = 2;
-}