basic cli fleshed out

Author: konsumer

README.md

@@ -24,7 +24,8 @@ If you just want the CLI, and don't use node, you can also find standalone build
 
 ### CLI
 
-I am still working on this, but will offer a CLI for all the different things you can do with this lib.
+Install it in your path with `npm i -g rawproto` or use it 1-off with `npx rawproto`. Get help with `rawproto --help`
+
 
 ### code
 

package.json

@@ -12,7 +12,7 @@
   "module": "./dist/rawproto.module.js",
   "unpkg": "./dist/rawproto.umd.js",
   "bin": {
-    "rawproto": "rawproto_cli.cjs"
+    "rawproto": "rawproto_cli.js"
   },
   "dependencies": {
     "flat": "^6.0.1",

rawproto_cli.cjs renamed to rawproto_cli.js

@@ -1,27 +1,38 @@
 #!/usr/bin/env node
 
-const yargs = require('yargs/yargs')
-const { hideBin } = require('yargs/helpers')
-const RawProto = require('./dist/rawproto.cjs')
+import yargs from 'yargs/yargs'
+import { hideBin } from 'yargs/helpers'
+import RawProto from './dist/rawproto.modern.js'
+import { readFile } from 'fs/promises'
 
 async function getStdin () {
   const chunks = []
   for await (const chunk of process.stdin) chunks.push(chunk)
   return Buffer.concat(chunks)
 }
 
-async function actionJson ({ types }) {
-  const p = new RawProto(await getStdin(), types)
-  console.log(JSON.stringify(p.toJS(), null, 2))
+async function actionJson ({ types, prefix }) {
+  if (types) {
+    types = JSON.parse(await readFile(types))
+  } else {
+    types = {}
+  }
+  const j = new RawProto(await getStdin()).toJS(types, prefix)
+  console.log(JSON.stringify(j, null, 2))
 }
 
-async function actionProto ({ types }) {
-  const p = new RawProto(await getStdin(), types)
-  console.log(p.toProto())
+async function actionProto ({ types, prefix }) {
+  if (types) {
+    types = JSON.parse(await readFile(types))
+  } else {
+    types = {}
+  }
+  const p = new RawProto(await getStdin(), types).toProto(types, prefix)
+  console.log(p)
 }
 
-async function actionQuery ({ query, types }) {
-  const p = new RawProto(await getStdin(), types)
+async function actionQuery ({ query }) {
+  const p = new RawProto(await getStdin())
   console.log(JSON.stringify(p.query(query), null, 2))
 }
 
@@ -36,8 +47,15 @@ yargs(hideBin(process.argv))
       .positional('types', {
         describe: 'JSON file that selects types for fields'
       })
+      .option('prefix', {
+        alias: 'p',
+        type: 'string',
+        description: 'Path-prefix to add to fields on output',
+        default: 'f'
+      })
       .example('cat myfile.pb | $0 json', 'Get the JSON from myfile.pb, guessing types')
       .example('$0 json < myfile.pb', 'Get the JSON from myfile.pb, guessing types')
+      .example('$0 json -p "" < myfile.pb', 'Get the JSON from myfile.pb, guessing types, oputput no field-prefixes')
       .example('$0 json choices.json < myfile.pb', 'Get the JSON from myfile.pb, using choices.json for types')
   }, (argv) => {
     actionJson(argv)
@@ -47,33 +65,35 @@ yargs(hideBin(process.argv))
       .positional('types', {
         describe: 'JSON file that selects types for fields'
       })
+      .option('prefix', {
+        alias: 'p',
+        type: 'string',
+        description: 'Path-prefix to add to fields on output',
+        default: 'f'
+      })
       .example('cat myfile.pb | $0 proto', 'Get the proto from myfile.pb, guessing types')
       .example('$0 proto < myfile.pb', 'Get the proto from myfile.pb, guessing types')
       .example('$0 proto choices.json < myfile.pb', 'Get the proto from myfile.pb, using choices.json for types')
   }, (argv) => {
     actionProto(argv)
   })
-  .command('query <query> [types]', 'Output JSON  (on stdout) for a specific query, for binary protobuf (on stdin)', (yargs) => {
+  .command('query <query>', 'Output JSON  (on stdout) for a specific query, for binary protobuf (on stdin)', (yargs) => {
     return yargs
       .positional('query', {
         describe: 'Your protobuf query string'
       })
-      .positional('types', {
-        describe: 'JSON file that selects types for fields'
-      })
       .example('cat myfile.pb | $0 query 1.2.4.10.5:string', 'Get the query from myfile.pb')
       .example('$0 query 1.2.4.10.5:string < myfile.pb', 'Get the query from myfile.pb')
-      .example('$0 query 1.2.4.10.5 choices.json < myfile.pb', 'Get the query from myfile.pb, using choices.json for types')
   }, (argv) => {
     actionQuery(argv)
   })
-  .command('$0 types', 'Output JSON types guess (on stdout) for binary protobuf (on stdin)', (yargs) => {
-    return yargs
-      .example('cat myfile.pb | $0 types', 'Get the types from myfile.pb')
-      .example('$0 types < myfile.pb', 'Get the types from myfile.pb')
-  }, (argv) => {
-    actionTypes(argv)
-  })
+  // .command('$0 types', 'Output JSON types guess (on stdout) for binary protobuf (on stdin)', (yargs) => {
+  //   return yargs
+  //     .example('cat myfile.pb | $0 types', 'Get the types from myfile.pb')
+  //     .example('$0 types < myfile.pb', 'Get the types from myfile.pb')
+  // }, (argv) => {
+  //   actionTypes(argv)
+  // })
   .example('$0 json --help', 'Get more detailed help on json')
   .example('$0 proto --help', 'Get more detailed help on proto')
   .example('$0 query --help', 'Get more detailed help on query')

test/hearthstone.json

@@ -0,0 +1,6 @@
+{
+  "id": "1.2.4.1:string",
+  "title": "1.2.4.5:string",
+  "company": "1.2.4.6:string",
+  "description": "1.2.4.7:string"
+}