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

367 lines
11 KiB
Go

package transformers
import (
"fmt"
"os"
"regexp"
"strings"
"github.com/johnkerl/miller/v6/pkg/cli"
"github.com/johnkerl/miller/v6/pkg/lib"
"github.com/johnkerl/miller/v6/pkg/types"
)
type tHavingFieldsCriterion int
const (
havingFieldsCriterionUnspecified tHavingFieldsCriterion = iota
havingFieldsAtLeast
havingFieldsWhichAre
havingFieldsAtMost
havingAllFieldsMatching
havingAnyFieldsMatching
havingNoFieldsMatching
)
const verbNameHavingFields = "having-fields"
var havingFieldsOptions = []OptionSpec{
{Flag: "--at-least", Arg: "{comma-separated names}", Type: "csv-list", Desc: "Pass records that have at least these field names."},
{Flag: "--which-are", Arg: "{comma-separated names}", Type: "csv-list", Desc: "Pass records whose field names are exactly these."},
{Flag: "--at-most", Arg: "{comma-separated names}", Type: "csv-list", Desc: "Pass records that have at most these field names."},
{Flag: "--all-matching", Arg: "{regular expression}", Type: "regex", Desc: "Pass records where all field names match the regex."},
{Flag: "--any-matching", Arg: "{regular expression}", Type: "regex", Desc: "Pass records where any field name matches the regex."},
{Flag: "--none-matching", Arg: "{regular expression}", Type: "regex", Desc: "Pass records where no field name matches the regex."},
}
var HavingFieldsSetup = TransformerSetup{
Verb: verbNameHavingFields,
UsageFunc: transformerHavingFieldsUsage,
ParseCLIFunc: transformerHavingFieldsParseCLI,
IgnoresInput: false,
Options: havingFieldsOptions,
}
func transformerHavingFieldsUsage(
o *os.File,
) {
exeName := "mlr"
verb := verbNameHavingFields
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameHavingFields)
fmt.Fprintf(o, "Conditionally passes through records depending on each record's field names.\n")
WriteVerbOptions(o, havingFieldsOptions)
fmt.Fprintf(o, "Examples:\n")
fmt.Fprintf(o, " %s %s --which-are amount,status,owner\n", exeName, verb)
fmt.Fprintf(o, " %s %s --any-matching 'sda[0-9]'\n", exeName, verb)
fmt.Fprintf(o, " %s %s --any-matching '\"sda[0-9]\"'\n", exeName, verb)
fmt.Fprintf(o, " %s %s --any-matching '\"sda[0-9]\"i' (this is case-insensitive)\n", exeName, verb)
}
func transformerHavingFieldsParseCLI(
pargi *int,
argc int,
args []string,
_ *cli.TOptions,
doConstruct bool, // false for first pass of CLI-parse, true for second pass
) (RecordTransformer, error) {
havingFieldsCriterion := havingFieldsCriterionUnspecified
var fieldNames []string = nil
regexString := ""
// Skip the verb name from the current spot in the mlr command line
argi := *pargi
verb := args[argi]
argi++
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":
transformerHavingFieldsUsage(os.Stdout)
return nil, cli.ErrHelpRequested
case "--at-least":
havingFieldsCriterion = havingFieldsAtLeast
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
regexString = ""
case "--which-are":
havingFieldsCriterion = havingFieldsWhichAre
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
regexString = ""
case "--at-most":
havingFieldsCriterion = havingFieldsAtMost
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
regexString = ""
case "--all-matching":
havingFieldsCriterion = havingAllFieldsMatching
regexString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
fieldNames = nil
case "--any-matching":
havingFieldsCriterion = havingAnyFieldsMatching
regexString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
fieldNames = nil
case "--none-matching":
havingFieldsCriterion = havingNoFieldsMatching
regexString, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
fieldNames = nil
default:
return nil, cli.VerbErrorf(verb, "option \"%s\" not recognized", opt)
}
}
if havingFieldsCriterion == havingFieldsCriterionUnspecified {
return nil, cli.VerbErrorf(verb, "-a, -b, -n, or --any-matching/--all-matching/--none-matching is required")
}
if fieldNames == nil && regexString == "" {
return nil, cli.VerbErrorf(verb, "field names or regex required")
}
*pargi = argi
if !doConstruct { // All transformers must do this for main command-line parsing
return nil, nil
}
transformer, err := NewTransformerHavingFields(
havingFieldsCriterion,
fieldNames,
regexString,
)
if err != nil {
return nil, err
}
return transformer, nil
}
type TransformerHavingFields struct {
fieldNames []string
numFieldNames int64
fieldNameSet map[string]bool
regex *regexp.Regexp
recordTransformerFunc RecordTransformerFunc
}
func NewTransformerHavingFields(
havingFieldsCriterion tHavingFieldsCriterion,
fieldNames []string,
regexString string,
) (*TransformerHavingFields, error) {
tr := &TransformerHavingFields{}
if fieldNames != nil {
tr.fieldNames = fieldNames
tr.numFieldNames = int64(len(fieldNames))
tr.fieldNameSet = lib.StringListToSet(fieldNames)
switch havingFieldsCriterion {
case havingFieldsAtLeast:
tr.recordTransformerFunc = tr.transformHavingFieldsAtLeast
case havingFieldsWhichAre:
tr.recordTransformerFunc = tr.transformHavingFieldsWhichAre
case havingFieldsAtMost:
tr.recordTransformerFunc = tr.transformHavingFieldsAtMost
default:
lib.InternalCodingErrorIf(true)
}
} else {
// Let them type in a.*b if they want, or "a.*b", or "a.*b"i.
// Strip off the leading " and trailing " or "i.
regex, err := lib.CompileMillerRegex(regexString)
if err != nil {
fmt.Fprintf(
os.Stderr,
"%s %s: cannot compile regex \"%s\"\n",
"mlr",
verbNameHavingFields,
regexString,
)
os.Exit(1)
// return nil, err
}
tr.regex = regex
switch havingFieldsCriterion {
case havingAllFieldsMatching:
tr.recordTransformerFunc = tr.transformHavingAllFieldsMatching
case havingAnyFieldsMatching:
tr.recordTransformerFunc = tr.transformHavingAnyFieldsMatching
case havingNoFieldsMatching:
tr.recordTransformerFunc = tr.transformHavingNoFieldsMatching
default:
lib.InternalCodingErrorIf(true)
}
}
return tr, nil
}
func (tr *TransformerHavingFields) 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 *TransformerHavingFields) transformHavingFieldsAtLeast(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
inrec := inrecAndContext.Record
numFound := int64(0)
for pe := inrec.Head; pe != nil; pe = pe.Next {
if tr.fieldNameSet[pe.Key] {
numFound++
if numFound == tr.numFieldNames {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
return
}
}
}
} else {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
}
}
func (tr *TransformerHavingFields) transformHavingFieldsWhichAre(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
inrec := inrecAndContext.Record
if inrec.FieldCount != tr.numFieldNames {
return
}
for pe := inrec.Head; pe != nil; pe = pe.Next {
if !tr.fieldNameSet[pe.Key] {
return
}
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
} else {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
}
}
func (tr *TransformerHavingFields) transformHavingFieldsAtMost(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
inrec := inrecAndContext.Record
for pe := inrec.Head; pe != nil; pe = pe.Next {
if !tr.fieldNameSet[pe.Key] {
return
}
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
} else {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
}
}
func (tr *TransformerHavingFields) transformHavingAllFieldsMatching(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
inrec := inrecAndContext.Record
for pe := inrec.Head; pe != nil; pe = pe.Next {
if !tr.regex.MatchString(pe.Key) {
return
}
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
} else {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
}
}
func (tr *TransformerHavingFields) transformHavingAnyFieldsMatching(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
inrec := inrecAndContext.Record
for pe := inrec.Head; pe != nil; pe = pe.Next {
if tr.regex.MatchString(pe.Key) {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
return
}
}
} else {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
}
}
func (tr *TransformerHavingFields) transformHavingNoFieldsMatching(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
if !inrecAndContext.EndOfStream {
inrec := inrecAndContext.Record
for pe := inrec.Head; pe != nil; pe = pe.Next {
if tr.regex.MatchString(pe.Key) {
return
}
}
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
} else {
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
}
}