Skip to content

Commit 014fb66

Browse files
committed
Update README/dist to reflect recent changes
1 parent 090d8ea commit 014fb66

7 files changed

+32
-21
lines changed

README.md

+9-3
Original file line numberDiff line numberDiff line change
@@ -306,14 +306,20 @@ The `pbjs` command line utility can be used to bundle and translate between .pro
306306
```
307307
Consolidates imports and converts between file formats.
308308
309-
-t, --target Specifies the target format. [json, proto2, proto3, static]
310-
Also accepts a path to require a custom target.
309+
-t, --target Specifies the target format. Also accepts a path to require a custom target.
310+
311+
json-module JSON representation as a module (AMD, CommonJS, global)
312+
json JSON representation
313+
proto2 Protocol Buffers, Version 2
314+
proto3 Protocol Buffers, Version 3
315+
static-module Static code without reflection as a module (AMD, CommonJS, global)
316+
static Static code without reflection
311317
312318
-p, --path Adds a directory to the include path.
313319
314320
-o, --out Saves to a file instead of writing to stdout.
315321
316-
-w, --wrap Specifies an alternative wrapper for the static target.
322+
-w, --wrap Specifies an alternative wrapper for any *-module target.
317323
318324
usage: pbjs [options] file1.proto file2.json ...
319325
```

dist/protobuf.js

+16-12
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.min.js

+3-3
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

dist/protobuf.min.js.gz

8 Bytes
Binary file not shown.

dist/protobuf.min.js.map

+1-1
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

types/protobuf.js.d.ts

+2-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
/*
55
* protobuf.js v6.0.2 TypeScript definitions
6-
* Generated Tue, 06 Dec 2016 17:00:05 UTC
6+
* Generated Wed, 07 Dec 2016 12:23:58 UTC
77
*/
88
declare module "protobufjs" {
99

@@ -929,6 +929,7 @@ declare module "protobufjs" {
929929
* @param {Function} [options.enum=Number] Enum value conversion type.
930930
* Valid values are `String` and `Number` (the global types).
931931
* Defaults to the numeric ids.
932+
* @param {boolean} [options.defaults=false] Also sets default values on the resulting object
932933
* @returns {Object.<string,*>} JSON object
933934
*/
934935
asJSON(options?: { [k: string]: any }): { [k: string]: any };

0 commit comments

Comments
 (0)