miller/pkg/transformers/bar.go
John Kerl f637633420
Tier-2 structured verb options: OptionSpec, initial migration (#2098) (#2111)
* Tier-2 structured verb options: OptionSpec, initial migration (#2098)

PR 3 of the AI-friendly roadmap (plans/plan-2098-llm.md).

Infrastructure:
- Add OptionSpec{Flag,Arg,Type,Desc,Repeatable,Values} to
  pkg/transformers/aaa_record_transformer.go alongside TransformerSetup.
  Type is one of: bool, string, int, float, csv-list, regex, filename,
  format, enum. For type=="enum", Values lists the valid choices.
- Add Options []OptionSpec to TransformerSetup (nil = not yet migrated).
- Emit Options in VerbInfoForJSON (omitempty so unmigrated verbs stay
  backward-compatible; agents check key presence for Tier-2 availability).
  UsageText is always present as the Tier-1 prose fallback.
- Add VerbOptionsNilCheck() in aaa_verb_options_check.go: progress report
  of migrated vs. unmigrated verbs, analogous to FLAG_TABLE.NilCheck().
- Wire verb-options-nil-check into mlr help (internal/docgen section).

Initial migration (5/70 verbs):
- nothing: empty Options (no verb-specific options, explicitly migrated)
- cat: -n (bool), -N (string), -g (csv-list), --filename, --filenum (bool)
- head: -g (csv-list), -n (int)
- tail: -g (csv-list), -n (int)
- tee: -a, -p (bool)

Tests:
- 5 new unit tests in aaa_transformer_json_test.go covering migrated/
  unmigrated paths, field population, JSON round-trip, and key-presence.
- Regression test case 0003: mlr help verb-options-nil-check golden output.

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

* Migrate all 70 verbs to structured OptionSpec; bump catalog schema to v2

Completes the Tier-2 migration started in the previous commit. Every verb
in TRANSFORMER_LOOKUP_TABLE now has a non-nil Options field.

- Workflow-migrated all 65 remaining verbs. Each Setup var now carries
  Options: []OptionSpec{...} with Flag/Arg/Type/Desc fields. Verbs with
  no verb-specific options (altkv, check, group-like, nothing, etc.) use
  an empty slice to signal "migrated but no options."
- Drop `omitempty` from VerbInfoForJSON.Options: empty slices were silently
  dropped, making migrated-no-option verbs indistinguishable from unmigrated
  ones in JSON. Without omitempty: null=unmigrated, []=migrated-no-options,
  [...]= migrated-with-options. Bump catalogSchemaVersion 1→2 for this shape
  change.
- Replace the two "unmigrated-verb" unit tests (which used stats1 as an
  example) with TestAllVerbsFullyMigrated (asserts every verb has non-nil
  Options) and TestAllVerbsHaveOptionsKeyInJSON (asserts every migrated
  verb emits the "options" key in JSON).
- Regenerate test/cases/cli-help/0003/expout: now reads
  "Verb options migration: 70/70 migrated."

Co-Authored-By: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>

* remove a transitional helper

* git rms

* Render verb usage Options blocks from structured OptionSpec

Each verb's usage message and its Tier-2 OptionSpec list previously
duplicated the option text. New WriteVerbOptions (aaa_verb_usage.go)
renders the "Options:" block from the specs: aligned flag column,
descriptions word-wrapped at 80, uniform trailing -h|--help line.

- OptionSpec gains Aliases (JSON "aliases") so long-form spellings
  like join's --lk|--left-keep-field-names survive in both outputs
- All 70 verbs migrated; options literals hoisted to package-level
  vars (usage funcs can't reference their Setup var without a Go
  init cycle)
- Hand-written per-option details the specs had condensed away are
  merged into Desc, enriching the JSON catalog
- Non-option prose (examples, cross-references, dynamic accumulator
  listings) kept verbatim
- Regenerated the six usage-embedding regression expectations and
  the two affected doc pages

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* Fix pre-existing usage-text bugs surfaced by the OptionSpec migration

- gap: usage said "One of -f or -g is required" but the parser takes
  -n or -g
- seqgen: drop description line copy-pasted from cat ("Passes input
  records directly to output...") which contradicted "Discards the
  input record stream"
- utf8-to-latin1: description read inverted ("from Latin-1 to UTF-8")
- sec2gmtdate: usage said "../c/mlr" instead of "mlr"
- top: document the accepted-but-undocumented --max flag
- stats2: add linreg-pca to the -a enum values, matching the runtime
  accumulator table

Regression expectations and docs regenerated accordingly.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

* Fix check usage sentence order; stats1 usage blank line to usage stream

- check: the description's second and third lines were swapped,
  reading "Consumes records without printing any output, / Useful for
  doing a well-formatted check on input data. / with the exception
  that warnings are printed to stderr."
- stats1: a bare fmt.Println() in the usage func wrote its blank line
  to process stdout instead of the usage output stream

Regression expectation and docs regenerated.

Co-Authored-By: Claude Fable 5 <noreply@anthropic.com>

---------

Co-authored-by: Claude Sonnet 4.6 (1M context) <noreply@anthropic.com>
2026-07-03 14:27:23 -04:00

339 lines
9.1 KiB
Go

package transformers
import (
"bytes"
"fmt"
"os"
"strings"
"github.com/johnkerl/miller/v6/pkg/cli"
"github.com/johnkerl/miller/v6/pkg/mlrval"
"github.com/johnkerl/miller/v6/pkg/types"
)
const barDefaultFillString = "*"
const barDefaultOOBString = "#"
const barDefaultBlankString = "."
const barDefaultLo = 0.0
const barDefaultHi = 100.0
const barDefaultWidth = int64(40)
const verbNameBar = "bar"
var barOptions = []OptionSpec{
{Flag: "-f", Arg: "{a,b,c}", Type: "csv-list", Desc: "Field names to convert to bars."},
{Flag: "--lo", Arg: "{lo}", Type: "float", Desc: "Lower-limit value for min-width bar: default '0.000000'."},
{Flag: "--hi", Arg: "{hi}", Type: "float", Desc: "Upper-limit value for max-width bar: default '100.000000'."},
{Flag: "-w", Arg: "{n}", Type: "int", Desc: "Bar-field width: default '40'."},
{Flag: "--auto", Type: "bool", Desc: "Automatically computes limits, ignoring --lo and --hi. Holds all records in memory before producing any output."},
{Flag: "-c", Arg: "{character}", Type: "string", Desc: "Fill character: default '*'."},
{Flag: "-x", Arg: "{character}", Type: "string", Desc: "Out-of-bounds character: default '#'."},
{Flag: "-b", Arg: "{character}", Type: "string", Desc: "Blank character: default '.'."},
}
var BarSetup = TransformerSetup{
Verb: verbNameBar,
UsageFunc: transformerBarUsage,
ParseCLIFunc: transformerBarParseCLI,
IgnoresInput: false,
Options: barOptions,
}
func transformerBarUsage(
o *os.File,
) {
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameBar)
fmt.Fprintf(o, "Replaces a numeric field with a number of asterisks, allowing for cheesy\n")
fmt.Fprintf(o, "bar plots. These align best with --opprint or --oxtab output format.\n")
WriteVerbOptions(o, barOptions)
fmt.Fprintf(o, "Nominally the fill, out-of-bounds, and blank characters will be strings of length 1.\n")
fmt.Fprintf(o, "However you can make them all longer if you so desire.\n")
}
func transformerBarParseCLI(
pargi *int,
argc int,
args []string,
_ *cli.TOptions,
doConstruct bool, // false for first pass of CLI-parse, true for second pass
) (RecordTransformer, error) {
// Skip the verb name from the current spot in the mlr command line
argi := *pargi
verb := args[argi]
argi++
// Parse local flags
var err error
var fieldNames []string = nil
lo := barDefaultLo
hi := barDefaultHi
width := barDefaultWidth
doAuto := false
fillString := barDefaultFillString
oobString := barDefaultOOBString
blankString := barDefaultBlankString
for argi < argc /* variable increment: 1 or 2 depending on flag */ {
opt := args[argi]
if !strings.HasPrefix(opt, "-") {
break // No more flag options to process
}
if args[argi] == "--" {
break // All transformers must do this so main-flags can follow verb-flags
}
argi++
switch opt {
case "-h", "--help":
transformerBarUsage(os.Stdout)
return nil, cli.ErrHelpRequested
case "-f":
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--lo":
lo, err = cli.VerbGetFloatArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "-w":
width, err = cli.VerbGetIntArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--hi":
hi, err = cli.VerbGetFloatArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "-c":
fillString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "-x":
oobString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "-b":
blankString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--auto":
doAuto = true
default:
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
}
}
if fieldNames == nil {
return nil, cli.VerbErrorf(verb, "-f field names required")
}
*pargi = argi
if !doConstruct { // All transformers must do this for main command-line parsing
return nil, nil
}
transformer, err := NewTransformerBar(
fieldNames,
lo,
hi,
int(width),
doAuto,
fillString,
oobString,
blankString,
)
if err != nil {
return nil, err
}
return transformer, nil
}
type TransformerBar struct {
fieldNames []string
lo float64
hi float64
width int
fillString string
oobString string
blankString string
bars []string
recordsForAutoMode []*types.RecordAndContext
recordTransformerFunc RecordTransformerFunc
}
func NewTransformerBar(
fieldNames []string,
lo float64,
hi float64,
width int,
doAuto bool,
fillString string,
oobString string,
blankString string,
) (*TransformerBar, error) {
tr := &TransformerBar{
fieldNames: fieldNames,
lo: lo,
hi: hi,
width: width,
fillString: fillString,
oobString: oobString,
blankString: blankString,
}
tr.bars = make([]string, width+1)
for i := 0; i <= tr.width; i++ {
var bar string
if i == 0 {
bar = tr.oobString + strings.Repeat(tr.blankString, width-1)
} else if i < width {
bar = strings.Repeat(tr.fillString, i) + strings.Repeat(tr.blankString, width-i)
} else {
bar = strings.Repeat(tr.fillString, width-1) + tr.oobString
}
tr.bars[i] = bar
}
if doAuto {
tr.recordTransformerFunc = tr.processAuto
tr.recordsForAutoMode = []*types.RecordAndContext{}
} else {
tr.recordTransformerFunc = tr.processNoAuto
tr.recordsForAutoMode = nil
}
return tr, nil
}
func (tr *TransformerBar) Transform(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
HandleDefaultDownstreamDone(inputDownstreamDoneChannel, outputDownstreamDoneChannel)
tr.recordTransformerFunc(inrecAndContext, outputRecordsAndContexts, inputDownstreamDoneChannel, outputDownstreamDoneChannel)
}
func (tr *TransformerBar) processNoAuto(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
inrec := inrecAndContext.Record
for _, fieldName := range tr.fieldNames {
mvalue := inrec.Get(fieldName)
if mvalue == nil {
continue
}
floatValue, ok := mvalue.GetNumericToFloatValue()
if !ok {
continue
}
idx := min(max(int(float64(tr.width)*(floatValue-tr.lo)/(tr.hi-tr.lo)), 0), tr.width)
inrec.PutReference(fieldName, mlrval.FromString(tr.bars[idx]))
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
} else {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // emit end-of-stream marker
}
}
func (tr *TransformerBar) processAuto(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
tr.recordsForAutoMode = append(tr.recordsForAutoMode, inrecAndContext.Copy())
return
}
// Else, end of stream
// Loop over field names to be barred
for _, fieldName := range tr.fieldNames {
lo := 0.0
hi := 0.0
// The first pass computes lo and hi from the data
onFirst := true
for _, recordAndContext := range tr.recordsForAutoMode {
record := recordAndContext.Record
mvalue := record.Get(fieldName)
if mvalue == nil {
continue
}
floatValue, ok := mvalue.GetNumericToFloatValue()
if !ok {
continue
}
if onFirst || floatValue < lo {
lo = floatValue
}
if onFirst || floatValue > hi {
hi = floatValue
}
onFirst = false
}
// The second pass applies the bars. There is some redundant computation
// which could be hoisted out of the loop for performance ... but this
// verb computes data solely for visual inspection and I take the
// nominal use case to be tens or hundreds of records. So, optimization
// isn't worth the effort here.
slo := fmt.Sprintf("%g", lo)
shi := fmt.Sprintf("%g", hi)
for _, recordAndContext := range tr.recordsForAutoMode {
record := recordAndContext.Record
mvalue := record.Get(fieldName)
if mvalue == nil {
continue
}
floatValue, ok := mvalue.GetNumericToFloatValue()
if !ok {
continue
}
idx := min(max(int((float64(tr.width)*(floatValue-lo)/(hi-lo))), 0), tr.width)
var buffer bytes.Buffer
buffer.WriteString("[")
buffer.WriteString(slo)
buffer.WriteString("]")
buffer.WriteString(tr.bars[idx])
buffer.WriteString("[")
buffer.WriteString(shi)
buffer.WriteString("]")
record.PutReference(fieldName, mlrval.FromString(buffer.String()))
}
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, tr.recordsForAutoMode...)
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // Emit the end-of-stream marker
}