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

234 lines
6.1 KiB
Go

package transformers
import (
"fmt"
"os"
"strings"
"github.com/johnkerl/miller/v6/pkg/bifs"
"github.com/johnkerl/miller/v6/pkg/cli"
"github.com/johnkerl/miller/v6/pkg/mlrval"
"github.com/johnkerl/miller/v6/pkg/types"
)
const verbNameSeqgen = "seqgen"
var seqgenOptions = []OptionSpec{
{Flag: "-f", Arg: "{name}", Type: "string", Desc: "Field name for counters. Default \"i\"."},
{Flag: "--start", Arg: "{value}", Type: "float", Desc: "Inclusive start value. Default 1."},
{Flag: "--step", Arg: "{value}", Type: "float", Desc: "Step value. Default 1. May be negative but not zero (unless start == stop)."},
{Flag: "--stop", Arg: "{value}", Type: "float", Desc: "Inclusive stop value. Default 100."},
}
var SeqgenSetup = TransformerSetup{
Verb: verbNameSeqgen,
UsageFunc: transformerSeqgenUsage,
ParseCLIFunc: transformerSeqgenParseCLI,
IgnoresInput: true,
Options: seqgenOptions,
}
func transformerSeqgenUsage(
o *os.File,
) {
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameSeqgen)
fmt.Fprintf(o, "Produces a sequence of counters. Discards the input record stream. Produces\n")
fmt.Fprintf(o, "output as specified by the options.\n")
fmt.Fprintf(o, "\n")
WriteVerbOptions(o, seqgenOptions)
fmt.Fprintf(o, "Start, stop, and/or step may be floating-point. Output is integer if start,\n")
fmt.Fprintf(o, "stop, and step are all integers. Step may be negative. It may not be zero\n")
fmt.Fprintf(o, "unless start == stop.\n")
}
func transformerSeqgenParseCLI(
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++
fieldName := "i"
startString := "1"
stopString := "100"
stepString := "1"
var err error
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":
transformerSeqgenUsage(os.Stdout)
return nil, cli.ErrHelpRequested
case "-f":
fieldName, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--start":
startString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--stop":
stopString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
case "--step":
stepString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
default:
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
}
}
*pargi = argi
if !doConstruct { // All transformers must do this for main command-line parsing
return nil, nil
}
transformer, err := NewTransformerSeqgen(
fieldName,
startString,
stopString,
stepString,
)
if err != nil {
return nil, err
}
return transformer, nil
}
type TransformerSeqgen struct {
fieldName string
start *mlrval.Mlrval
stop *mlrval.Mlrval
step *mlrval.Mlrval
doneComparator bifs.BinaryFunc
mdone *mlrval.Mlrval
}
func NewTransformerSeqgen(
fieldName string,
startString string,
stopString string,
stepString string,
) (*TransformerSeqgen, error) {
start := mlrval.FromInferredType(startString)
stop := mlrval.FromInferredType(stopString)
step := mlrval.FromInferredType(stepString)
var doneComparator bifs.BinaryFunc
fstart, startIsNumeric := start.GetNumericToFloatValue()
if !startIsNumeric {
return nil, fmt.Errorf("mlr seqgen: start value should be number; got \"%s\"", startString)
}
fstop, stopIsNumeric := stop.GetNumericToFloatValue()
if !stopIsNumeric {
return nil, fmt.Errorf("mlr seqgen: stop value should be number; got \"%s\"", stopString)
}
fstep, stepIsNumeric := step.GetNumericToFloatValue()
if !stepIsNumeric {
return nil, fmt.Errorf("mlr seqgen: step value should be number; got \"%s\"", stepString)
}
if fstep > 0 {
doneComparator = bifs.BIF_greater_than
} else if fstep < 0 {
doneComparator = bifs.BIF_less_than
} else {
if fstart == fstop {
doneComparator = bifs.BIF_equals
} else {
return nil, fmt.Errorf("mlr seqgen: step must not be zero unless start == stop")
}
}
return &TransformerSeqgen{
fieldName: fieldName,
start: start,
stop: stop,
step: step,
doneComparator: doneComparator,
mdone: mlrval.FALSE,
}, nil
}
func (tr *TransformerSeqgen) Transform(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
// Discard upstream records; generate output only when upstream is done.
return
}
counter := tr.start
context := types.NewNilContext()
context.UpdateForStartOfFile("seqgen")
keepGoing := true
for {
// See ChainTransformer. If a downstream transformer is discarding all
// further input -- e.g. head -n 10 -- and if no interverning
// transformer is interested either, then we should break out of our
// for loop. This way 'mlr seqgen --stop 1000000000 then head -n 10'
// finishes quickly.
select {
case b := <-inputDownstreamDoneChannel:
outputDownstreamDoneChannel <- b
keepGoing = false
default:
}
if !keepGoing {
break
}
tr.mdone = tr.doneComparator(counter, tr.stop)
done, _ := tr.mdone.GetBoolValue()
if done {
break
}
outrec := mlrval.NewMlrmapAsRecord()
outrec.PutCopy(tr.fieldName, counter)
context.UpdateForInputRecord()
outrecAndContext := types.NewRecordAndContext(outrec, context)
*outputRecordsAndContexts = append(*outputRecordsAndContexts, outrecAndContext)
counter = bifs.BIF_plus_binary(counter, tr.step)
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, types.NewEndOfStreamMarker(context))
}