-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
0 parents
commit 980159e
Showing
31 changed files
with
2,962 additions
and
0 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
# Changelog | ||
|
||
## [1.0.0](https://github.com/protobufjs/protobuf.js/compare/protobufjs-cli-v0.1.0...protobufjs-cli-v1.0.0) (2022-07-08) | ||
|
||
|
||
### ⚠ BREAKING CHANGES | ||
|
||
* drop support for Node 4, 6, 8, 10 (#1764) | ||
* move command line tool to a new package named protobufjs-cli (#1234) | ||
|
||
### Features | ||
|
||
* add --no-service option for pbjs static target ([#1577](https://github.com/protobufjs/protobuf.js/issues/1577)) ([d01394a](https://github.com/protobufjs/protobuf.js/commit/d01394a1463062824c066b653aad53c449752202)) | ||
* add alt-comment CLI option ([#1692](https://github.com/protobufjs/protobuf.js/issues/1692)) ([7558ef0](https://github.com/protobufjs/protobuf.js/commit/7558ef0f93177978272f68f1710144a26b63e525)) | ||
* add getTypeUrl method to generated code ([#1463](https://github.com/protobufjs/protobuf.js/issues/1463)) ([d13d5d5](https://github.com/protobufjs/protobuf.js/commit/d13d5d5688052e366aa2e9169f50dfca376b32cf)) | ||
* add null-defaults option ([#1611](https://github.com/protobufjs/protobuf.js/issues/1611)) ([6e713ba](https://github.com/protobufjs/protobuf.js/commit/6e713baf54bd987ae52cbf92a4f2742c70201dc0)) | ||
* add support for buffer configuration ([#1372](https://github.com/protobufjs/protobuf.js/issues/1372)) ([101aa1a](https://github.com/protobufjs/protobuf.js/commit/101aa1a4f148516fdc83a74f54a229f06e24a5de)) | ||
* allow message.getTypeUrl provide custom typeUrlPrefix ([#1762](https://github.com/protobufjs/protobuf.js/issues/1762)) ([8aad1dd](https://github.com/protobufjs/protobuf.js/commit/8aad1dd994b1fc1f23bd71adf3a81b7a5616b210)) | ||
* move command line tool to a new package named protobufjs-cli ([#1234](https://github.com/protobufjs/protobuf.js/issues/1234)) ([da34f43](https://github.com/protobufjs/protobuf.js/commit/da34f43ccd51ad97017e139f137521782f5ef119)) | ||
* prepare initial publication of cli ([#1752](https://github.com/protobufjs/protobuf.js/issues/1752)) ([64811d5](https://github.com/protobufjs/protobuf.js/commit/64811d5878c31e4a86a39da5fec6aea35da22fcd)) | ||
* proto3 optional support ([#1584](https://github.com/protobufjs/protobuf.js/issues/1584)) ([6c4d307](https://github.com/protobufjs/protobuf.js/commit/6c4d30716a9a756dcdc21d64f9c9d069315fc5b1)) | ||
* update dependencies / general cleanup ([#1356](https://github.com/protobufjs/protobuf.js/issues/1356)) ([42f49b4](https://github.com/protobufjs/protobuf.js/commit/42f49b43f692c24c2bc1ae081b4d1ad9fa173cd7)) | ||
|
||
|
||
### Bug Fixes | ||
|
||
* **deps:** patch minimatch vulnerability ([#1704](https://github.com/protobufjs/protobuf.js/issues/1704)) ([bac61b8](https://github.com/protobufjs/protobuf.js/commit/bac61b8c2757804bbb9c5fa0f8bc6a7bcf0bb374)) | ||
* drop support for Node 4, 6, 8, 10 ([#1764](https://github.com/protobufjs/protobuf.js/issues/1764)) ([50370dd](https://github.com/protobufjs/protobuf.js/commit/50370dd7747a0986e83ddbe51c54b97033af5ead)) | ||
* es6 export enum ([#1446](https://github.com/protobufjs/protobuf.js/issues/1446)) ([9f33784](https://github.com/protobufjs/protobuf.js/commit/9f33784350b1efc2e774bbfc087cbd2c47828748)) | ||
* fromObject should not initialize oneof members ([#1597](https://github.com/protobufjs/protobuf.js/issues/1597)) ([90afe44](https://github.com/protobufjs/protobuf.js/commit/90afe4412de8070b0c0681e5905a6e0213072a85)) | ||
* proper relative path to protobufjs in cli ([#1753](https://github.com/protobufjs/protobuf.js/issues/1753)) ([a1d6029](https://github.com/protobufjs/protobuf.js/commit/a1d60292ecb22fcf89c493c562ae07ab10ef49c9)) | ||
* typo in pbjs help text ([#1552](https://github.com/protobufjs/protobuf.js/issues/1552)) ([7f46dbe](https://github.com/protobufjs/protobuf.js/commit/7f46dbeb538a6277035a896e1ab5e1a070e28681)) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,33 @@ | ||
Copyright (c) 2016, Daniel Wirtz All rights reserved. | ||
|
||
Redistribution and use in source and binary forms, with or without | ||
modification, are permitted provided that the following conditions are | ||
met: | ||
|
||
* Redistributions of source code must retain the above copyright | ||
notice, this list of conditions and the following disclaimer. | ||
* Redistributions in binary form must reproduce the above copyright | ||
notice, this list of conditions and the following disclaimer in the | ||
documentation and/or other materials provided with the distribution. | ||
* Neither the name of its author, nor the names of its contributors | ||
may be used to endorse or promote products derived from this software | ||
without specific prior written permission. | ||
|
||
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS | ||
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT | ||
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR | ||
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT | ||
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, | ||
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT | ||
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, | ||
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY | ||
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT | ||
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE | ||
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. | ||
|
||
--- | ||
|
||
Code generated by the command line utilities is owned by the owner | ||
of the input file used when generating it. This code is not | ||
standalone and requires a support library to be linked with it. This | ||
support library is itself covered by the above license. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,173 @@ | ||
protobufjs-cli | ||
============== | ||
[![npm](https://img.shields.io/npm/v/protobufjs-cli.svg)](https://www.npmjs.com/package/protobufjs-cli) | ||
|
||
Command line interface (CLI) for [protobuf.js](https://github.com/dcodeIO/protobuf.js). | ||
|
||
This can be used to translate between file formats and to generate static code as well as TypeScript definitions. | ||
|
||
* [pbjs for JavaScript](#pbjs-for-javascript) | ||
* [pbts for TypeScript](#pbts-for-typescript) | ||
* [Reflection vs. static code](#reflection-vs-static-code) | ||
* [Command line API](#command-line-api)<br /> | ||
|
||
### pbjs for JavaScript | ||
|
||
``` | ||
Translates between file formats and generates static code. | ||
-t, --target Specifies the target format. Also accepts a path to require a custom target. | ||
json JSON representation | ||
json-module JSON representation as a module | ||
proto2 Protocol Buffers, Version 2 | ||
proto3 Protocol Buffers, Version 3 | ||
static Static code without reflection (non-functional on its own) | ||
static-module Static code without reflection as a module | ||
-p, --path Adds a directory to the include path. | ||
-o, --out Saves to a file instead of writing to stdout. | ||
--sparse Exports only those types referenced from a main file (experimental). | ||
Module targets only: | ||
-w, --wrap Specifies the wrapper to use. Also accepts a path to require a custom wrapper. | ||
default Default wrapper supporting both CommonJS and AMD | ||
commonjs CommonJS wrapper | ||
amd AMD wrapper | ||
es6 ES6 wrapper (implies --es6) | ||
closure A closure adding to protobuf.roots where protobuf is a global | ||
-r, --root Specifies an alternative protobuf.roots name. | ||
-l, --lint Linter configuration. Defaults to protobuf.js-compatible rules: | ||
eslint-disable block-scoped-var, no-redeclare, no-control-regex, no-prototype-builtins | ||
--es6 Enables ES6 syntax (const/let instead of var) | ||
Proto sources only: | ||
--keep-case Keeps field casing instead of converting to camel case. | ||
Static targets only: | ||
--no-create Does not generate create functions used for reflection compatibility. | ||
--no-encode Does not generate encode functions. | ||
--no-decode Does not generate decode functions. | ||
--no-verify Does not generate verify functions. | ||
--no-convert Does not generate convert functions like from/toObject | ||
--no-delimited Does not generate delimited encode/decode functions. | ||
--no-beautify Does not beautify generated code. | ||
--no-comments Does not output any JSDoc comments. | ||
--no-service Does not output service classes. | ||
--force-long Enforces the use of 'Long' for s-/u-/int64 and s-/fixed64 fields. | ||
--force-number Enforces the use of 'number' for s-/u-/int64 and s-/fixed64 fields. | ||
--force-message Enforces the use of message instances instead of plain objects. | ||
usage: pbjs [options] file1.proto file2.json ... (or pipe) other | pbjs [options] - | ||
``` | ||
|
||
For production environments it is recommended to bundle all your .proto files to a single .json file, which minimizes the number of network requests and avoids any parser overhead (hint: works with just the **light** library): | ||
|
||
``` | ||
$> pbjs -t json file1.proto file2.proto > bundle.json | ||
``` | ||
|
||
Now, either include this file in your final bundle: | ||
|
||
```js | ||
var root = protobuf.Root.fromJSON(require("./bundle.json")); | ||
``` | ||
|
||
or load it the usual way: | ||
|
||
```js | ||
protobuf.load("bundle.json", function(err, root) { | ||
... | ||
}); | ||
``` | ||
|
||
Generated static code, on the other hand, works with just the **minimal** library. For example | ||
|
||
``` | ||
$> pbjs -t static-module -w commonjs -o compiled.js file1.proto file2.proto | ||
``` | ||
|
||
will generate static code for definitions within `file1.proto` and `file2.proto` to a CommonJS module `compiled.js`. | ||
|
||
**ProTip!** Documenting your .proto files with `/** ... */`-blocks or (trailing) `/// ...` lines translates to generated static code. | ||
|
||
|
||
### pbts for TypeScript | ||
|
||
``` | ||
Generates TypeScript definitions from annotated JavaScript files. | ||
-o, --out Saves to a file instead of writing to stdout. | ||
-g, --global Name of the global object in browser environments, if any. | ||
--no-comments Does not output any JSDoc comments. | ||
Internal flags: | ||
-n, --name Wraps everything in a module of the specified name. | ||
-m, --main Whether building the main library without any imports. | ||
usage: pbts [options] file1.js file2.js ... (or) other | pbts [options] - | ||
``` | ||
|
||
Picking up on the example above, the following not only generates static code to a CommonJS module `compiled.js` but also its respective TypeScript definitions to `compiled.d.ts`: | ||
|
||
``` | ||
$> pbjs -t static-module -w commonjs -o compiled.js file1.proto file2.proto | ||
$> pbts -o compiled.d.ts compiled.js | ||
``` | ||
|
||
Additionally, TypeScript definitions of static modules are compatible with their reflection-based counterparts (i.e. as exported by JSON modules), as long as the following conditions are met: | ||
|
||
1. Instead of using `new SomeMessage(...)`, always use `SomeMessage.create(...)` because reflection objects do not provide a constructor. | ||
2. Types, services and enums must start with an uppercase letter to become available as properties of the reflected types as well (i.e. to be able to use `MyMessage.MyEnum` instead of `root.lookup("MyMessage.MyEnum")`). | ||
|
||
For example, the following generates a JSON module `bundle.js` and a `bundle.d.ts`, but no static code: | ||
|
||
``` | ||
$> pbjs -t json-module -w commonjs -o bundle.js file1.proto file2.proto | ||
$> pbjs -t static-module file1.proto file2.proto | pbts -o bundle.d.ts - | ||
``` | ||
|
||
### Reflection vs. static code | ||
|
||
While using .proto files directly requires the full library respectively pure reflection/JSON the light library, pretty much all code but the relatively short descriptors is shared. | ||
|
||
Static code, on the other hand, requires just the minimal library, but generates additional source code without any reflection features. This also implies that there is a break-even point where statically generated code becomes larger than descriptor-based code once the amount of code generated exceeds the size of the full respectively light library. | ||
|
||
There is no significant difference performance-wise as the code generated statically is pretty much the same as generated at runtime and both are largely interchangeable as seen in the previous section. | ||
|
||
| Source | Library | Advantages | Tradeoffs | ||
|--------|---------|------------|----------- | ||
| .proto | full | Easily editable<br />Interoperability with other libraries<br />No compile step | Some parsing and possibly network overhead | ||
| JSON | light | Easily editable<br />No parsing overhead<br />Single bundle (no network overhead) | protobuf.js specific<br />Has a compile step | ||
| static | minimal | Works where `eval` access is restricted<br />Fully documented<br />Small footprint for small protos | Can be hard to edit<br />No reflection<br />Has a compile step | ||
|
||
### Command line API | ||
|
||
Both utilities can be used programmatically by providing command line arguments and a callback to their respective `main` functions: | ||
|
||
```js | ||
var pbjs = require("protobufjs-cli/pbjs"); // or require("protobufjs-cli").pbjs / .pbts | ||
|
||
pbjs.main([ "--target", "json-module", "path/to/myproto.proto" ], function(err, output) { | ||
if (err) | ||
throw err; | ||
// do something with output | ||
}); | ||
``` | ||
|
||
**License:** [BSD 3-Clause License](https://opensource.org/licenses/BSD-3-Clause) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#!/usr/bin/env node | ||
var path = require("path"), | ||
cli = require(path.join(__dirname, "..", "pbjs.js")); | ||
var ret = cli.main(process.argv.slice(2)); | ||
if (typeof ret === 'number') | ||
process.exit(ret); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,6 @@ | ||
#!/usr/bin/env node | ||
var path = require("path"), | ||
cli = require(path.join(__dirname, "..", "pbts.js")); | ||
var ret = cli.main(process.argv.slice(2)); | ||
if (typeof ret === 'number') | ||
process.exit(ret); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
import * as pbjs from "./pbjs.js"; | ||
import * as pbts from "./pbts.js"; | ||
export { pbjs, pbts }; |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
"use strict"; | ||
exports.pbjs = require("./pbjs"); | ||
exports.pbts = require("./pbts"); |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
{ | ||
"tags": { | ||
"allowUnknownTags": false | ||
}, | ||
"plugins": [ | ||
"./tsd-jsdoc/plugin" | ||
], | ||
"opts": { | ||
"encoding" : "utf8", | ||
"recurse" : true, | ||
"lenient" : true, | ||
"template" : "./tsd-jsdoc", | ||
|
||
"private" : false, | ||
"comments" : true, | ||
"destination" : false | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
The MIT License | ||
|
||
Copyright (c) 2016 Chad Engler | ||
|
||
Permission is hereby granted, free of charge, to any person obtaining a copy | ||
of this software and associated documentation files (the "Software"), to deal | ||
in the Software without restriction, including without limitation the rights | ||
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell | ||
copies of the Software, and to permit persons to whom the Software is | ||
furnished to do so, subject to the following conditions: | ||
|
||
The above copyright notice and this permission notice shall be included in | ||
all copies or substantial portions of the Software. | ||
|
||
THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR | ||
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, | ||
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE | ||
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER | ||
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, | ||
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN | ||
THE SOFTWARE. |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,23 @@ | ||
protobuf.js fork of tsd-jsdoc | ||
============================= | ||
|
||
This is a modified version of [tsd-jsdoc](https://github.com/englercj/tsd-jsdoc) v1.0.1 for use with protobuf.js, parked here so we can process issues and pull requests. The ultimate goal is to switch back to the a recent version of tsd-jsdoc once it meets our needs. | ||
|
||
Options | ||
------- | ||
|
||
* **module: `string`**<br /> | ||
Wraps everything in a module of the specified name. | ||
|
||
* **private: `boolean`**<br /> | ||
Includes private members when set to `true`. | ||
|
||
* **comments: `boolean`**<br /> | ||
Skips comments when explicitly set to `false`. | ||
|
||
* **destination: `string|boolean`**<br /> | ||
Saves to the specified destination file or to console when set to `false`. | ||
|
||
Setting options on the command line | ||
----------------------------------- | ||
Providing `-q, --query <queryString>` on the command line will set respectively override existing options. Example: `-q module=protobufjs` |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,21 @@ | ||
"use strict"; | ||
exports.defineTags = function(dictionary) { | ||
|
||
dictionary.defineTag("template", { | ||
mustHaveValue: true, | ||
canHaveType: false, | ||
canHaveName: false, | ||
onTagged: function(doclet, tag) { | ||
(doclet.templates || (doclet.templates = [])).push(tag.text); | ||
} | ||
}); | ||
|
||
dictionary.defineTag("tstype", { | ||
mustHaveValue: true, | ||
canHaveType: false, | ||
canHaveName: false, | ||
onTagged: function(doclet, tag) { | ||
doclet.tsType = tag.text; | ||
} | ||
}); | ||
}; |
Oops, something went wrong.