Skip to content

Commit

Permalink
revert #1166
Browse files Browse the repository at this point in the history
  • Loading branch information
@dcodeIO
dcodeIO committed Feb 5, 2020
1 parent a95953a commit 52263a5
Show file tree
Hide file tree
Showing 11 changed files with 192 additions and 204 deletions.
22 changes: 11 additions & 11 deletions bench/data/static_pbjs.js
View file
Expand Up @@ -24,13 +24,13 @@ $root.Test = (function() {
Test.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.string != null && message.hasOwnProperty("string"))
if (message.string != null && Object.hasOwnProperty.call(message, "string"))
writer.uint32(10).string(message.string);
if (message.uint32 != null && message.hasOwnProperty("uint32"))
if (message.uint32 != null && Object.hasOwnProperty.call(message, "uint32"))
writer.uint32(16).uint32(message.uint32);
if (message.inner != null && message.hasOwnProperty("inner"))
if (message.inner != null && Object.hasOwnProperty.call(message, "inner"))
$root.Test.Inner.encode(message.inner, writer.uint32(26).fork()).ldelim();
if (message.float != null && message.hasOwnProperty("float"))
if (message.float != null && Object.hasOwnProperty.call(message, "float"))
writer.uint32(37).float(message.float);
return writer;
};
Expand Down Expand Up @@ -78,11 +78,11 @@ $root.Test = (function() {
Inner.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.int32 != null && message.hasOwnProperty("int32"))
if (message.int32 != null && Object.hasOwnProperty.call(message, "int32"))
writer.uint32(8).int32(message.int32);
if (message.innerInner != null && message.hasOwnProperty("innerInner"))
if (message.innerInner != null && Object.hasOwnProperty.call(message, "innerInner"))
$root.Test.Inner.InnerInner.encode(message.innerInner, writer.uint32(18).fork()).ldelim();
if (message.outer != null && message.hasOwnProperty("outer"))
if (message.outer != null && Object.hasOwnProperty.call(message, "outer"))
$root.Outer.encode(message.outer, writer.uint32(26).fork()).ldelim();
return writer;
};
Expand Down Expand Up @@ -127,11 +127,11 @@ $root.Test = (function() {
InnerInner.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.long != null && message.hasOwnProperty("long"))
if (message.long != null && Object.hasOwnProperty.call(message, "long"))
writer.uint32(8).int64(message.long);
if (message["enum"] != null && message.hasOwnProperty("enum"))
if (message["enum"] != null && Object.hasOwnProperty.call(message, "enum"))
writer.uint32(16).int32(message["enum"]);
if (message.sint32 != null && message.hasOwnProperty("sint32"))
if (message.sint32 != null && Object.hasOwnProperty.call(message, "sint32"))
writer.uint32(24).sint32(message.sint32);
return writer;
};
Expand Down Expand Up @@ -201,7 +201,7 @@ $root.Outer = (function() {
writer.bool(message.bool[i]);
writer.ldelim();
}
if (message.double != null && message.hasOwnProperty("double"))
if (message.double != null && Object.hasOwnProperty.call(message, "double"))
writer.uint32(17).double(message.double);
return writer;
};
Expand Down
5 changes: 0 additions & 5 deletions cli/pbts.js
View file
Expand Up @@ -151,11 +151,6 @@ exports.main = function(args, callback) {
"// DO NOT EDIT! This is a generated file. Edit the JSDoc in src/*.js instead and run 'npm run types'.",
""
);
else // the main package defines a dummy implementation for where long is not available
output.push(
"import * as Long from \"long\";",
""
);
if (argv.global)
output.push(
"export as namespace " + argv.global + ";",
Expand Down
7 changes: 0 additions & 7 deletions tests/data/comments.d.ts
View file
Expand Up @@ -36,10 +36,3 @@ export class Test2 implements ITest2 {
public static toObject(message: Test2, options?: $protobuf.IConversionOptions): { [k: string]: any };
public toJSON(): { [k: string]: any };
}

export enum Test3 {
ONE = 1,
TWO = 2,
THREE = 3,
FOUR = 4
}
6 changes: 3 additions & 3 deletions tests/data/comments.js
View file
Expand Up @@ -86,11 +86,11 @@ $root.Test1 = (function() {
Test1.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.field1 != null && message.hasOwnProperty("field1"))
if (message.field1 != null && Object.hasOwnProperty.call(message, "field1"))
writer.uint32(/* id 1, wireType 2 =*/10).string(message.field1);
if (message.field2 != null && message.hasOwnProperty("field2"))
if (message.field2 != null && Object.hasOwnProperty.call(message, "field2"))
writer.uint32(/* id 2, wireType 0 =*/16).uint32(message.field2);
if (message.field3 != null && message.hasOwnProperty("field3"))
if (message.field3 != null && Object.hasOwnProperty.call(message, "field3"))
writer.uint32(/* id 3, wireType 0 =*/24).bool(message.field3);
return writer;
};
Expand Down
10 changes: 5 additions & 5 deletions tests/data/convert.js
View file
Expand Up @@ -142,33 +142,33 @@ $root.Message = (function() {
Message.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.stringVal != null && message.hasOwnProperty("stringVal"))
if (message.stringVal != null && Object.hasOwnProperty.call(message, "stringVal"))
writer.uint32(/* id 1, wireType 2 =*/10).string(message.stringVal);
if (message.stringRepeated != null && message.stringRepeated.length)
for (var i = 0; i < message.stringRepeated.length; ++i)
writer.uint32(/* id 2, wireType 2 =*/18).string(message.stringRepeated[i]);
if (message.uint64Val != null && message.hasOwnProperty("uint64Val"))
if (message.uint64Val != null && Object.hasOwnProperty.call(message, "uint64Val"))
writer.uint32(/* id 3, wireType 0 =*/24).uint64(message.uint64Val);
if (message.uint64Repeated != null && message.uint64Repeated.length) {
writer.uint32(/* id 4, wireType 2 =*/34).fork();
for (var i = 0; i < message.uint64Repeated.length; ++i)
writer.uint64(message.uint64Repeated[i]);
writer.ldelim();
}
if (message.bytesVal != null && message.hasOwnProperty("bytesVal"))
if (message.bytesVal != null && Object.hasOwnProperty.call(message, "bytesVal"))
writer.uint32(/* id 5, wireType 2 =*/42).bytes(message.bytesVal);
if (message.bytesRepeated != null && message.bytesRepeated.length)
for (var i = 0; i < message.bytesRepeated.length; ++i)
writer.uint32(/* id 6, wireType 2 =*/50).bytes(message.bytesRepeated[i]);
if (message.enumVal != null && message.hasOwnProperty("enumVal"))
if (message.enumVal != null && Object.hasOwnProperty.call(message, "enumVal"))
writer.uint32(/* id 7, wireType 0 =*/56).int32(message.enumVal);
if (message.enumRepeated != null && message.enumRepeated.length) {
writer.uint32(/* id 8, wireType 2 =*/66).fork();
for (var i = 0; i < message.enumRepeated.length; ++i)
writer.int32(message.enumRepeated[i]);
writer.ldelim();
}
if (message.int64Map != null && message.hasOwnProperty("int64Map"))
if (message.int64Map != null && Object.hasOwnProperty.call(message, "int64Map"))
for (var keys = Object.keys(message.int64Map), i = 0; i < keys.length; ++i)
writer.uint32(/* id 9, wireType 2 =*/74).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 0 =*/16).int64(message.int64Map[keys[i]]).ldelim();
return writer;
Expand Down
20 changes: 10 additions & 10 deletions tests/data/mapbox/vector_tile.js
View file
Expand Up @@ -351,19 +351,19 @@ $root.vector_tile = (function() {
Value.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.stringValue != null && message.hasOwnProperty("stringValue"))
if (message.stringValue != null && Object.hasOwnProperty.call(message, "stringValue"))
writer.uint32(/* id 1, wireType 2 =*/10).string(message.stringValue);
if (message.floatValue != null && message.hasOwnProperty("floatValue"))
if (message.floatValue != null && Object.hasOwnProperty.call(message, "floatValue"))
writer.uint32(/* id 2, wireType 5 =*/21).float(message.floatValue);
if (message.doubleValue != null && message.hasOwnProperty("doubleValue"))
if (message.doubleValue != null && Object.hasOwnProperty.call(message, "doubleValue"))
writer.uint32(/* id 3, wireType 1 =*/25).double(message.doubleValue);
if (message.intValue != null && message.hasOwnProperty("intValue"))
if (message.intValue != null && Object.hasOwnProperty.call(message, "intValue"))
writer.uint32(/* id 4, wireType 0 =*/32).int64(message.intValue);
if (message.uintValue != null && message.hasOwnProperty("uintValue"))
if (message.uintValue != null && Object.hasOwnProperty.call(message, "uintValue"))
writer.uint32(/* id 5, wireType 0 =*/40).uint64(message.uintValue);
if (message.sintValue != null && message.hasOwnProperty("sintValue"))
if (message.sintValue != null && Object.hasOwnProperty.call(message, "sintValue"))
writer.uint32(/* id 6, wireType 0 =*/48).sint64(message.sintValue);
if (message.boolValue != null && message.hasOwnProperty("boolValue"))
if (message.boolValue != null && Object.hasOwnProperty.call(message, "boolValue"))
writer.uint32(/* id 7, wireType 0 =*/56).bool(message.boolValue);
return writer;
};
Expand Down Expand Up @@ -688,15 +688,15 @@ $root.vector_tile = (function() {
Feature.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.id != null && message.hasOwnProperty("id"))
if (message.id != null && Object.hasOwnProperty.call(message, "id"))
writer.uint32(/* id 1, wireType 0 =*/8).uint64(message.id);
if (message.tags != null && message.tags.length) {
writer.uint32(/* id 2, wireType 2 =*/18).fork();
for (var i = 0; i < message.tags.length; ++i)
writer.uint32(message.tags[i]);
writer.ldelim();
}
if (message.type != null && message.hasOwnProperty("type"))
if (message.type != null && Object.hasOwnProperty.call(message, "type"))
writer.uint32(/* id 3, wireType 0 =*/24).int32(message.type);
if (message.geometry != null && message.geometry.length) {
writer.uint32(/* id 4, wireType 2 =*/34).fork();
Expand Down Expand Up @@ -1058,7 +1058,7 @@ $root.vector_tile = (function() {
if (message.values != null && message.values.length)
for (var i = 0; i < message.values.length; ++i)
$root.vector_tile.Tile.Value.encode(message.values[i], writer.uint32(/* id 4, wireType 2 =*/34).fork()).ldelim();
if (message.extent != null && message.hasOwnProperty("extent"))
if (message.extent != null && Object.hasOwnProperty.call(message, "extent"))
writer.uint32(/* id 5, wireType 0 =*/40).uint32(message.extent);
writer.uint32(/* id 15, wireType 0 =*/120).uint32(message.version);
return writer;
Expand Down
34 changes: 17 additions & 17 deletions tests/data/package.js
View file
Expand Up @@ -215,45 +215,45 @@ $root.Package = (function() {
Package.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.name != null && message.hasOwnProperty("name"))
if (message.name != null && Object.hasOwnProperty.call(message, "name"))
writer.uint32(/* id 1, wireType 2 =*/10).string(message.name);
if (message.version != null && message.hasOwnProperty("version"))
if (message.version != null && Object.hasOwnProperty.call(message, "version"))
writer.uint32(/* id 2, wireType 2 =*/18).string(message.version);
if (message.description != null && message.hasOwnProperty("description"))
if (message.description != null && Object.hasOwnProperty.call(message, "description"))
writer.uint32(/* id 3, wireType 2 =*/26).string(message.description);
if (message.author != null && message.hasOwnProperty("author"))
if (message.author != null && Object.hasOwnProperty.call(message, "author"))
writer.uint32(/* id 4, wireType 2 =*/34).string(message.author);
if (message.license != null && message.hasOwnProperty("license"))
if (message.license != null && Object.hasOwnProperty.call(message, "license"))
writer.uint32(/* id 5, wireType 2 =*/42).string(message.license);
if (message.repository != null && message.hasOwnProperty("repository"))
if (message.repository != null && Object.hasOwnProperty.call(message, "repository"))
$root.Package.Repository.encode(message.repository, writer.uint32(/* id 6, wireType 2 =*/50).fork()).ldelim();
if (message.bugs != null && message.hasOwnProperty("bugs"))
if (message.bugs != null && Object.hasOwnProperty.call(message, "bugs"))
writer.uint32(/* id 7, wireType 2 =*/58).string(message.bugs);
if (message.homepage != null && message.hasOwnProperty("homepage"))
if (message.homepage != null && Object.hasOwnProperty.call(message, "homepage"))
writer.uint32(/* id 8, wireType 2 =*/66).string(message.homepage);
if (message.keywords != null && message.keywords.length)
for (var i = 0; i < message.keywords.length; ++i)
writer.uint32(/* id 9, wireType 2 =*/74).string(message.keywords[i]);
if (message.main != null && message.hasOwnProperty("main"))
if (message.main != null && Object.hasOwnProperty.call(message, "main"))
writer.uint32(/* id 10, wireType 2 =*/82).string(message.main);
if (message.bin != null && message.hasOwnProperty("bin"))
if (message.bin != null && Object.hasOwnProperty.call(message, "bin"))
for (var keys = Object.keys(message.bin), i = 0; i < keys.length; ++i)
writer.uint32(/* id 11, wireType 2 =*/90).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.bin[keys[i]]).ldelim();
if (message.scripts != null && message.hasOwnProperty("scripts"))
if (message.scripts != null && Object.hasOwnProperty.call(message, "scripts"))
for (var keys = Object.keys(message.scripts), i = 0; i < keys.length; ++i)
writer.uint32(/* id 12, wireType 2 =*/98).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.scripts[keys[i]]).ldelim();
if (message.dependencies != null && message.hasOwnProperty("dependencies"))
if (message.dependencies != null && Object.hasOwnProperty.call(message, "dependencies"))
for (var keys = Object.keys(message.dependencies), i = 0; i < keys.length; ++i)
writer.uint32(/* id 13, wireType 2 =*/106).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.dependencies[keys[i]]).ldelim();
if (message.devDependencies != null && message.hasOwnProperty("devDependencies"))
if (message.devDependencies != null && Object.hasOwnProperty.call(message, "devDependencies"))
for (var keys = Object.keys(message.devDependencies), i = 0; i < keys.length; ++i)
writer.uint32(/* id 15, wireType 2 =*/122).fork().uint32(/* id 1, wireType 2 =*/10).string(keys[i]).uint32(/* id 2, wireType 2 =*/18).string(message.devDependencies[keys[i]]).ldelim();
if (message.types != null && message.hasOwnProperty("types"))
if (message.types != null && Object.hasOwnProperty.call(message, "types"))
writer.uint32(/* id 17, wireType 2 =*/138).string(message.types);
if (message.cliDependencies != null && message.cliDependencies.length)
for (var i = 0; i < message.cliDependencies.length; ++i)
writer.uint32(/* id 18, wireType 2 =*/146).string(message.cliDependencies[i]);
if (message.versionScheme != null && message.hasOwnProperty("versionScheme"))
if (message.versionScheme != null && Object.hasOwnProperty.call(message, "versionScheme"))
writer.uint32(/* id 19, wireType 2 =*/154).string(message.versionScheme);
return writer;
};
Expand Down Expand Up @@ -733,9 +733,9 @@ $root.Package = (function() {
Repository.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.type != null && message.hasOwnProperty("type"))
if (message.type != null && Object.hasOwnProperty.call(message, "type"))
writer.uint32(/* id 1, wireType 2 =*/10).string(message.type);
if (message.url != null && message.hasOwnProperty("url"))
if (message.url != null && Object.hasOwnProperty.call(message, "url"))
writer.uint32(/* id 2, wireType 2 =*/18).string(message.url);
return writer;
};
Expand Down
4 changes: 2 additions & 2 deletions tests/data/rpc-es6.js
View file
Expand Up @@ -131,7 +131,7 @@ export const MyRequest = $root.MyRequest = (() => {
MyRequest.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.path != null && message.hasOwnProperty("path"))
if (message.path != null && Object.hasOwnProperty.call(message, "path"))
writer.uint32(/* id 1, wireType 2 =*/10).string(message.path);
return writer;
};
Expand Down Expand Up @@ -318,7 +318,7 @@ export const MyResponse = $root.MyResponse = (() => {
MyResponse.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.status != null && message.hasOwnProperty("status"))
if (message.status != null && Object.hasOwnProperty.call(message, "status"))
writer.uint32(/* id 2, wireType 0 =*/16).int32(message.status);
return writer;
};
Expand Down
4 changes: 2 additions & 2 deletions tests/data/rpc-reserved.js
View file
Expand Up @@ -133,7 +133,7 @@ $root.MyRequest = (function() {
MyRequest.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.path != null && message.hasOwnProperty("path"))
if (message.path != null && Object.hasOwnProperty.call(message, "path"))
writer.uint32(/* id 1, wireType 2 =*/10).string(message.path);
return writer;
};
Expand Down Expand Up @@ -320,7 +320,7 @@ $root.MyResponse = (function() {
MyResponse.encode = function encode(message, writer) {
if (!writer)
writer = $Writer.create();
if (message.status != null && message.hasOwnProperty("status"))
if (message.status != null && Object.hasOwnProperty.call(message, "status"))
writer.uint32(/* id 2, wireType 0 =*/16).int32(message.status);
return writer;
};
Expand Down

0 comments on commit 52263a5

Please sign in to comment.