Lowercase the webrpc-cli custom -options

webrpc · Nov 8, 2022 · 291f8ef · 291f8ef
1 parent f43dabc
commit 291f8ef
Show file tree

Hide file tree

Showing 7 changed files with 32 additions and 32 deletions.
diff --git a/README.md b/README.md
@@ -20,33 +20,33 @@ write by hand.
 ## Usage
 
 ```
-webrpc-gen -schema=example.ridl -target=javascript -Server -Client -out=./example.gen.ts
+webrpc-gen -schema=example.ridl -target=javascript -server -client -out=./example.gen.ts
 ```
 
 or 
 
 ```
-webrpc-gen -schema=example.ridl -target=github.com/webrpc/[email protected] -Server -Client -out=./example.gen.js
+webrpc-gen -schema=example.ridl -target=github.com/webrpc/[email protected] -server -client -out=./example.gen.js
 ```
 
 or
 
 ```
-webrpc-gen -schema=example.ridl -target=./local-templates-on-disk -Server -Client -out=./example.gen.js
+webrpc-gen -schema=example.ridl -target=./local-templates-on-disk -server -client -out=./example.gen.js
 ```
 
 ### Set custom template variables
 Change any of the following values by passing `-Option="Value"` CLI flag to `webrpc-gen`.
 
 | CLI option flag      | Description                | Default value              |
 |----------------------|----------------------------|----------------------------|
-| `-Client`            | generate client code       | unset (`false`)            |
-| `-Server`            | generate server code       | unset (`false`)            |
-| `-Exports=false`     | disable "exports" in code  | enabled (`true`)           |
+| `-client`            | generate client code       | unset (`false`)            |
+| `-server`            | generate server code       | unset (`false`)            |
+| `-exports=false`     | disable "exports" in code  | enabled (`true`)           |
 
 Example:
 ```
-webrpc-gen -schema=example.ridl -target=javascript -Server -Client -Exports=false -out=./example.gen.js
+webrpc-gen -schema=example.ridl -target=javascript -server -client -exports=false -out=./example.gen.js
 ```
 
 ## LICENSE

diff --git a/_examples/hello-webrpc/Makefile b/_examples/hello-webrpc/Makefile
@@ -10,7 +10,7 @@ generate-server:
 	webrpc-gen -schema=hello-api.ridl -target=go -pkg=main -server -out=./server/hello_api.gen.go
 
 generate-client:
-	webrpc-gen -schema=hello-api.ridl -target=../../ -Export=false -client -out=./webapp/client.gen.js
+	webrpc-gen -schema=hello-api.ridl -target=../../ -exports=false -client -out=./webapp/client.gen.js
 
 run-server:
 	go run ./server

diff --git a/_examples/hello-webrpc/webapp/client.gen.js b/_examples/hello-webrpc/webapp/client.gen.js
@@ -2,7 +2,7 @@
 // --
 // Code generated by [email protected] with custom generator. DO NOT EDIT.
 //
-// webrpc-gen -schema=hello-api.ridl -target=../../ -Export=false -client -out=./webapp/client.gen.js
+// webrpc-gen -schema=hello-api.ridl -target=../../ -exports=false -client -out=./webapp/client.gen.js
 
 // WebRPC description and code-gen version
 export const WebRPCVersion = "v1"

diff --git a/client.go.tmpl b/client.go.tmpl
@@ -7,7 +7,7 @@
 // Client
 //
 {{ range .Services}}
-{{if $opts.Export}}export {{end}}class {{.Name}} {
+{{if $opts.exports}}export {{end}}class {{.Name}} {
   constructor(hostname, fetch) {
     this.path = '/rpc/{{.Name}}/'
     this.hostname = hostname

diff --git a/help.go.tmpl b/help.go.tmpl
@@ -1,6 +1,6 @@
 {{- define "help" -}}
-  {{- stderrPrintf "\nAvailable template options:\n" -}}
   {{- range $k, $v := . -}}
     {{- stderrPrintf "  -%v=%v\n" $k $v -}}
   {{- end -}}
+  {{- stderrPrintf "See https://github.com/webrpc/gen-javascript for more info.\n" -}}
 {{- end -}}
diff --git a/main.go.tmpl b/main.go.tmpl
@@ -1,36 +1,36 @@
 {{- define "main" -}}
 
-{{- if ne .WebrpcVersion "v1" -}}
-  {{- stderrPrintf "%s generator error: unsupported webrpc version %s\n" .WebrpcTarget .WebrpcVersion -}}
-  {{- exit 1 -}}
-{{- end -}}
-
-{{- if not (minVersion .WebrpcGenVersion "v0.7.0") -}}
-  {{- stderrPrintf "%s generator error: unsupported webrpc-gen version %s, please update\n" .WebrpcTarget .WebrpcGenVersion -}}
-  {{- exit 1 -}}
-{{- end -}}
-
 {{- /* Options with default values. */ -}}
 {{- $opts := dict -}}
-{{- set $opts "Client" (ternary (in .Opts.Client "" "true") true false) -}}
-{{- set $opts "Server" (ternary (in .Opts.Server "" "true") true false) -}}
-{{- set $opts "Export" (ternary (in .Opts.Export "false") false true) -}}
+{{- set $opts "client" (ternary (in .Opts.client "" "true") true false) -}}
+{{- set $opts "server" (ternary (in .Opts.server "" "true") true false) -}}
+{{- set $opts "exports" (ternary (in .Opts.exports "false") false true) -}}
 
-{{- /* Print help on -Help. */ -}}
-{{- if exists .Opts "Help" -}}
-  {{ template "help" $opts }}
+{{- /* Print help on -help. */ -}}
+{{- if exists .Opts "help" -}}
+  {{- template "help" $opts -}}
   {{- exit 0 -}}
 {{- end -}}
 
 {{- /* Print help on unsupported option. */ -}}
 {{- range $k, $v := .Opts }}
   {{- if not (exists $opts $k) -}}
-    {{- stderrPrintf "  -%v=%q is not supported option\n" $k $v -}}
+    {{- stderrPrintf "-%v=%q is not supported target option\n\nUsage:\n" $k $v -}}
     {{- template "help" $opts -}}
     {{- exit 1 -}}
   {{- end -}}
 {{- end -}}
 
+{{- if ne .WebrpcVersion "v1" -}}
+  {{- stderrPrintf "%s generator error: unsupported webrpc version %s\n" .WebrpcTarget .WebrpcVersion -}}
+  {{- exit 1 -}}
+{{- end -}}
+
+{{- if not (minVersion .WebrpcGenVersion "v0.7.0") -}}
+  {{- stderrPrintf "%s generator error: unsupported webrpc-gen version %s, please update\n" .WebrpcTarget .WebrpcGenVersion -}}
+  {{- exit 1 -}}
+{{- end -}}
+
 {{- /* Map webrpc data types to JS. */ -}}
 {{- $typeMap := dict }}
 {{- set $typeMap "null" "null" -}}
@@ -68,11 +68,11 @@ export const WebRPCSchemaVersion = "{{.SchemaVersion}}"
 export const WebRPCSchemaHash = "{{.SchemaHash}}"
 
 {{template "types" dict "Services" .Services "Messages" .Messages "Opts" $opts}}
-{{- if $opts.Client}}
+{{- if $opts.client}}
   {{template "client" dict "Services" .Services "Opts" $opts}}
   {{template "client_helpers" .}}
 {{- end}}
-{{- if $opts.Server}}
+{{- if $opts.server}}
   {{template "server" dict "Services" .Services "Opts" $opts "TypeMap" $typeMap}}
 {{- end}}
 {{- end}}
diff --git a/types.go.tmpl b/types.go.tmpl
@@ -10,7 +10,7 @@
 
 {{if .Type | isEnumType -}}
 {{$enumName := .Name}}
-{{if $opts.Export}}export {{end}}var {{$enumName}};
+{{if $opts.exports}}export {{end}}var {{$enumName}};
 (function ({{$enumName}}) {
 {{- range $i, $field := .Fields}}
   {{$enumName}}["{{$field.Name}}"] = "{{$field.Name}}"
@@ -19,7 +19,7 @@
 {{end -}}
 
 {{- if .Type | isStructType  }}
-{{if $opts.Export}}export {{end}}class {{.Name}} {
+{{if $opts.exports}}export {{end}}class {{.Name}} {
   constructor(_data) {
     this._data = {}
     if (_data) {