miller/pkg/transformers/aaa_verb_usage.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

73 lines
2 KiB
Go

// Renders the "Options:" block of a verb's usage message from its structured
// []OptionSpec, so that the prose usage text and the JSON catalog (Tier-2)
// stay in sync -- each verb's option list is written once, in its OptionSpec.
package transformers
import (
"fmt"
"os"
"strings"
)
// verbUsageLineWidth is the wrap width for generated option descriptions.
const verbUsageLineWidth = 80
const helpFlagHead = "-h|--help"
// WriteVerbOptions writes the "Options:" block for a verb's usage message
// from its structured option list. Flag heads are aligned into a single
// column; descriptions are word-wrapped with continuation lines indented to
// the description column. Since every verb supports -h|--help, that line is
// appended uniformly.
func WriteVerbOptions(o *os.File, options []OptionSpec) {
fmt.Fprintf(o, "Options:\n")
heads := make([]string, len(options))
maxHeadLen := len(helpFlagHead)
for i := range options {
opt := &options[i]
head := opt.Flag
if len(opt.Aliases) > 0 {
head = opt.Flag + "|" + strings.Join(opt.Aliases, "|")
}
if opt.Arg != "" {
head += " " + opt.Arg
}
heads[i] = head
if len(head) > maxHeadLen {
maxHeadLen = len(head)
}
}
descColumn := maxHeadLen + 1
for i := range options {
writeVerbOptionLine(o, heads[i], options[i].Desc, descColumn)
}
writeVerbOptionLine(o, helpFlagHead, "Show this message.", descColumn)
}
// writeVerbOptionLine writes one option's head and word-wrapped description,
// with continuation lines indented to descColumn.
func writeVerbOptionLine(o *os.File, head string, desc string, descColumn int) {
if desc == "" {
fmt.Fprintf(o, "%s\n", head)
return
}
indent := strings.Repeat(" ", descColumn)
line := fmt.Sprintf("%-*s", descColumn, head)
lineHasDesc := false
for word := range strings.FieldsSeq(desc) {
if lineHasDesc && len(line)+1+len(word) > verbUsageLineWidth {
fmt.Fprintf(o, "%s\n", line)
line = indent
lineHasDesc = false
}
if lineHasDesc {
line += " "
}
line += word
lineHasDesc = true
}
fmt.Fprintf(o, "%s\n", line)
}