Bound --repeat at MaxRepeat and stream the renders; name an unknown flag by its rune; --list rejects an inert --repeat or --separator
Tests / vet + fmt + tests (pull_request) Successful in 56s

This commit is contained in:
2026-09-02 19:06:20 +02:00
parent 5a75df8034
commit 3d3efbb642
4 changed files with 43 additions and 30 deletions
+1 -1
View File
@@ -44,7 +44,7 @@ level — folders, then the category (a JSON file), then fields.
| `-d`, `--data-path D` | a directory to layer over the shipped data; repeatable, the last wins a name clash | | `-d`, `--data-path D` | a directory to layer over the shipped data; repeatable, the last wins a name clash |
| `--no-shipped-data` | load only the `--data-path` directories | | `--no-shipped-data` | load only the `--data-path` directories |
| `-s`, `--seed N` | reproducible output | | `-s`, `--seed N` | reproducible output |
| `-n`, `--repeat N` | render the path N times, each an independent draw | | `-n`, `--repeat N` | render the path N times (up to 1048576), each an independent draw, streamed |
| `--separator S` | between repeated values (default a newline) | | `--separator S` | between repeated values (default a newline) |
| `--list` | print every path, then exit | | `--list` | print every path, then exit |
| `--version`, `-h`, `--help` | print, then exit | | `--version`, `-h`, `--help` | print, then exit |
+1 -1
View File
@@ -14,7 +14,7 @@ import (
// fat-fingered or overflowing argument fails at New instead of trying to allocate // fat-fingered or overflowing argument fails at New instead of trying to allocate
// gigabytes — or panicking — at render. // gigabytes — or panicking — at render.
const ( const (
maxLen = 1 << 20 // 1,048,576 chars/bytes maxLen = MaxRepeat
maxDecimals = 1024 maxDecimals = 1024
) )
+28 -18
View File
@@ -8,6 +8,7 @@
package main package main
import ( import (
"bufio"
"errors" "errors"
"fmt" "fmt"
"io" "io"
@@ -27,7 +28,7 @@ const usage = `Usage: fejkdata [flags] <path>
-h, --help print this help, then exit -h, --help print this help, then exit
--list list the paths the data offers, then exit --list list the paths the data offers, then exit
--no-shipped-data load only the --data-path directories --no-shipped-data load only the --data-path directories
-n, --repeat N render the path N times (default 1) -n, --repeat N render the path N times, 1..1048576 (default 1)
-s, --seed N seed for reproducible output -s, --seed N seed for reproducible output
--separator S string between repeated values (default newline) --separator S string between repeated values (default newline)
--version print the version, then exit --version print the version, then exit
@@ -43,9 +44,11 @@ type invocation struct {
noShipped bool noShipped bool
paths []string paths []string
repeat int repeat int
repeatSet bool
seed uint64 seed uint64
seeded bool seeded bool
separator string separator string
separatorSet bool
version bool version bool
} }
@@ -63,10 +66,10 @@ var flagDefs = []flagDef{
{"no-shipped-data", "", false, func(in *invocation, _ string) error { in.noShipped = true; return nil }}, {"no-shipped-data", "", false, func(in *invocation, _ string) error { in.noShipped = true; return nil }},
{"repeat", "n", true, func(in *invocation, v string) error { {"repeat", "n", true, func(in *invocation, v string) error {
n, err := strconv.Atoi(v) n, err := strconv.Atoi(v)
if err != nil || n < 1 { if err != nil || n < 1 || n > fejkdata.MaxRepeat {
return fmt.Errorf("--repeat needs a positive integer, got %q", v) return fmt.Errorf("--repeat needs an integer in 1..%d, got %q", fejkdata.MaxRepeat, v)
} }
in.repeat = n in.repeat, in.repeatSet = n, true
return nil return nil
}}, }},
{"seed", "s", true, func(in *invocation, v string) error { {"seed", "s", true, func(in *invocation, v string) error {
@@ -77,7 +80,7 @@ var flagDefs = []flagDef{
in.seed, in.seeded = n, true in.seed, in.seeded = n, true
return nil return nil
}}, }},
{"separator", "", true, func(in *invocation, v string) error { in.separator = v; return nil }}, {"separator", "", true, func(in *invocation, v string) error { in.separator, in.separatorSet = v, true; return nil }},
{"version", "", false, func(in *invocation, _ string) error { in.version = true; return nil }}, {"version", "", false, func(in *invocation, _ string) error { in.version = true; return nil }},
} }
@@ -124,8 +127,8 @@ func splitFlags(arg string) ([]flagArg, error) {
} }
var flags []flagArg var flags []flagArg
letters := arg[1:] letters := arg[1:]
for i := 0; i < len(letters); i++ { for i, r := range letters {
letter := letters[i : i+1] letter := string(r)
def := flagByShort(letter) def := flagByShort(letter)
if def == nil { if def == nil {
return nil, fmt.Errorf("unknown flag -%s", letter) return nil, fmt.Errorf("unknown flag -%s", letter)
@@ -134,7 +137,7 @@ func splitFlags(arg string) ([]flagArg, error) {
flags = append(flags, flagArg{def: def}) flags = append(flags, flagArg{def: def})
continue continue
} }
rest := letters[i+1:] rest := letters[i+len(letter):]
if strings.HasPrefix(rest, "=") { if strings.HasPrefix(rest, "=") {
return nil, fmt.Errorf("-%s takes its value attached (-%s%s) or next (-%s %s); = belongs to --%s=%s", return nil, fmt.Errorf("-%s takes its value attached (-%s%s) or next (-%s %s); = belongs to --%s=%s",
letter, letter, rest[1:], letter, rest[1:], def.long, rest[1:]) letter, letter, rest[1:], letter, rest[1:], def.long, rest[1:])
@@ -188,6 +191,9 @@ func (in invocation) check() error {
if in.list && len(in.paths) > 0 { if in.list && len(in.paths) > 0 {
return errors.New("--list takes no path") return errors.New("--list takes no path")
} }
if in.list && (in.repeatSet || in.separatorSet) {
return errors.New("--list takes no --repeat or --separator")
}
if !in.list && len(in.paths) != 1 { if !in.list && len(in.paths) != 1 {
return fmt.Errorf("expected one path, got %d", len(in.paths)) return fmt.Errorf("expected one path, got %d", len(in.paths))
} }
@@ -208,17 +214,23 @@ func (in invocation) options() []fejkdata.Option {
return opts return opts
} }
// values renders the path repeat times, joined by the separator. // write streams the path's renders to w, repeat of them joined by the separator
func (in invocation) values(f *fejkdata.Generator) (string, error) { // and ended by a newline. A path that renders once renders every time, so the only
vals := make([]string, in.repeat) // failure comes before anything is written.
for i := range vals { func (in invocation) write(f *fejkdata.Generator, w io.Writer) error {
out := bufio.NewWriter(w)
for i := 0; i < in.repeat; i++ {
v, err := f.Fake(in.paths[0]) v, err := f.Fake(in.paths[0])
if err != nil { if err != nil {
return "", err return err
} }
vals[i] = v if i > 0 {
out.WriteString(in.separator)
} }
return strings.Join(vals, in.separator), nil out.WriteString(v)
}
out.WriteString("\n")
return out.Flush()
} }
func main() { os.Exit(run(os.Args[1:], os.Stdout, os.Stderr)) } func main() { os.Exit(run(os.Args[1:], os.Stdout, os.Stderr)) }
@@ -254,12 +266,10 @@ func run(args []string, stdout, stderr io.Writer) int {
} }
return 0 return 0
} }
out, err := in.values(f) if err := in.write(f, stdout); err != nil {
if err != nil {
fmt.Fprintln(stderr, err) fmt.Fprintln(stderr, err)
return 1 return 1
} }
fmt.Fprintln(stdout, out)
return 0 return 0
} }
+3
View File
@@ -28,6 +28,9 @@ import (
//go:embed data //go:embed data
var shippedFS embed.FS var shippedFS embed.FS
// MaxRepeat caps a repeat, and the renders nested repeats multiply to along any path.
const MaxRepeat = 1 << 20
// ErrNoData is returned by New when no source is loaded at all. // ErrNoData is returned by New when no source is loaded at all.
var ErrNoData = errors.New("no data: WithoutShippedData needs at least one WithDataPath or WithDataFS") var ErrNoData = errors.New("no data: WithoutShippedData needs at least one WithDataPath or WithDataFS")