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

390 lines
11 KiB
Go

package transformers
import (
"fmt"
"os"
"regexp"
"strings"
"github.com/johnkerl/miller/v6/pkg/bifs"
"github.com/johnkerl/miller/v6/pkg/cli"
"github.com/johnkerl/miller/v6/pkg/lib"
"github.com/johnkerl/miller/v6/pkg/mlrval"
"github.com/johnkerl/miller/v6/pkg/types"
)
const verbNameSub = "sub"
const verbNameGsub = "gsub"
const verbNameSsub = "ssub"
var subOptions = []OptionSpec{
{Flag: "-f", Arg: "{a,b,c}", Type: "csv-list", Desc: "Field names to apply substitution to."},
{Flag: "-r", Arg: "{regex}", Type: "regex", Desc: "Regular expression for field names to apply substitution to."},
{Flag: "-a", Type: "bool", Desc: "Apply substitution to all fields."},
}
var SubSetup = TransformerSetup{
Verb: verbNameSub,
UsageFunc: transformerSubUsage,
ParseCLIFunc: transformerSubParseCLI,
IgnoresInput: false,
Options: subOptions,
}
var gsubOptions = []OptionSpec{
{Flag: "-f", Arg: "{a,b,c}", Type: "csv-list", Desc: "Field names to apply substitution to."},
{Flag: "-r", Arg: "{regex}", Type: "regex", Desc: "Regular expression for field names to apply substitution to."},
{Flag: "-a", Type: "bool", Desc: "Apply substitution to all fields."},
}
var GsubSetup = TransformerSetup{
Verb: verbNameGsub,
UsageFunc: transformerGsubUsage,
ParseCLIFunc: transformerGsubParseCLI,
IgnoresInput: false,
Options: gsubOptions,
}
var ssubOptions = []OptionSpec{
{Flag: "-f", Arg: "{a,b,c}", Type: "csv-list", Desc: "Field names to apply substitution to."},
{Flag: "-r", Arg: "{regex}", Type: "regex", Desc: "Regular expression for field names to apply substitution to."},
{Flag: "-a", Type: "bool", Desc: "Apply substitution to all fields."},
}
var SsubSetup = TransformerSetup{
Verb: verbNameSsub,
UsageFunc: transformerSsubUsage,
ParseCLIFunc: transformerSsubParseCLI,
IgnoresInput: false,
Options: ssubOptions,
}
func transformerSubUsage(
o *os.File,
) {
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameSub)
fmt.Fprintf(o, "Replaces old string with new string in specified field(s), with regex support\n")
fmt.Fprintf(o, "for the old string and not handling multiple matches, like the `sub` DSL function.\n")
fmt.Fprintf(o, "The replacement string supports C-style backslash escapes such as \\n, \\t,\n")
fmt.Fprintf(o, "and \\x1f. Write \\\\ to get a literal backslash.\n")
fmt.Fprintf(o, "See also the `gsub` and `ssub` verbs.\n")
WriteVerbOptions(o, subOptions)
}
func transformerGsubUsage(
o *os.File,
) {
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameGsub)
fmt.Fprintf(o, "Replaces old string with new string in specified field(s), with regex support\n")
fmt.Fprintf(o, "for the old string and handling multiple matches, like the `gsub` DSL function.\n")
fmt.Fprintf(o, "The replacement string supports C-style backslash escapes such as \\n, \\t,\n")
fmt.Fprintf(o, "and \\x1f. Write \\\\ to get a literal backslash.\n")
fmt.Fprintf(o, "See also the `sub` and `ssub` verbs.\n")
WriteVerbOptions(o, gsubOptions)
}
func transformerSsubUsage(
o *os.File,
) {
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameSsub)
fmt.Fprintf(o, "Replaces old string with new string in specified field(s), without regex support for\n")
fmt.Fprintf(o, "the old string, like the `ssub` DSL function.\n")
fmt.Fprintf(o, "Both the search and replacement strings support C-style backslash escapes such\n")
fmt.Fprintf(o, "as \\n, \\t, and \\x1f. Write \\\\ to get a literal backslash.\n")
fmt.Fprintf(o, "See also the `gsub` and `sub` verbs.\n")
WriteVerbOptions(o, ssubOptions)
}
type subConstructorFunc func(
fieldNames []string,
doAllFieldNames bool,
doRegexes bool,
oldText string,
newText string,
) (RecordTransformer, error)
type fieldAcceptorFunc func(
fieldName string,
) bool
func transformerSubParseCLI(
pargi *int,
argc int,
args []string,
opts *cli.TOptions,
doConstruct bool, // false for first pass of CLI-parse, true for second pass
) (RecordTransformer, error) {
return transformerSubsParseCLI(pargi, argc, args, opts, doConstruct, transformerSubUsage, NewTransformerSub, false)
}
func transformerGsubParseCLI(
pargi *int,
argc int,
args []string,
opts *cli.TOptions,
doConstruct bool, // false for first pass of CLI-parse, true for second pass
) (RecordTransformer, error) {
return transformerSubsParseCLI(pargi, argc, args, opts, doConstruct, transformerGsubUsage, NewTransformerGsub, false)
}
func transformerSsubParseCLI(
pargi *int,
argc int,
args []string,
opts *cli.TOptions,
doConstruct bool, // false for first pass of CLI-parse, true for second pass
) (RecordTransformer, error) {
return transformerSubsParseCLI(pargi, argc, args, opts, doConstruct, transformerSsubUsage, NewTransformerSsub, true)
}
// transformerSubsParseCLI is a shared CLI-parser for the sub, gsub, and ssub verbs.
// When unbackslashOldText is true (ssub only), the search string is also unescaped;
// for sub/gsub the search string is a regex and Go's regexp engine handles \n/\t/etc.
func transformerSubsParseCLI(
pargi *int,
argc int,
args []string,
_ *cli.TOptions,
doConstruct bool, // false for first pass of CLI-parse, true for second pass
usageFunc TransformerUsageFunc,
constructorFunc subConstructorFunc,
unbackslashOldText bool,
) (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 fieldNames []string = nil
doAllFieldNames := false
doRegexes := false
var oldText string
var newText string
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":
usageFunc(os.Stdout)
os.Exit(0)
case "-a":
doAllFieldNames = true
doRegexes = false
fieldNames = nil
case "-r":
doRegexes = true
case "-f":
fieldNames, err = cli.VerbGetStringArrayArg(verb, opt, args, &argi, argc)
if err != nil {
return nil, err
}
doAllFieldNames = false
default:
usageFunc(os.Stderr)
os.Exit(1)
}
}
if fieldNames == nil && !doAllFieldNames {
usageFunc(os.Stderr)
os.Exit(1)
}
// Get the old and new text from the command line
if (argc - argi) < 2 {
usageFunc(os.Stderr)
os.Exit(1)
}
oldText = args[argi]
newText = args[argi+1]
// Interpret C-style backslash escapes ("\n", "\t", "\x1f", etc.) in the
// replacement string the same way the DSL string-literal parser does, so
// that e.g. `mlr sub -a r "\n"` matches `sub($x, "r", "\n")` in the DSL.
// For sub/gsub the search string is a regex and Go's regexp engine already
// handles \n/\r/\t inside patterns; pre-unescaping would corrupt user-
// supplied regex metachars like \d or \s. For ssub the search string is a
// literal, so we unescape it too.
newText = lib.UnbackslashStringLiteral(newText)
if unbackslashOldText {
oldText = lib.UnbackslashStringLiteral(oldText)
}
argi += 2
*pargi = argi
if !doConstruct { // All transformers must do this for main command-line parsing
return nil, nil
}
transformer, err := constructorFunc(
fieldNames,
doAllFieldNames,
doRegexes,
oldText,
newText,
)
if err != nil {
return nil, err
}
return transformer, nil
}
type TransformerSubs struct {
fieldNamesSet map[string]bool // for -f
regexes []*regexp.Regexp // for -r
oldText *mlrval.Mlrval
newText *mlrval.Mlrval
fieldAcceptor fieldAcceptorFunc // for -f, -r, -a
subber bifs.TernaryFunc // for sub, gsub, ssub
}
func NewTransformerSub(
fieldNames []string,
doAllFieldNames bool,
doRegexes bool,
oldText string,
newText string,
) (RecordTransformer, error) {
return NewTransformerSubs(fieldNames, doAllFieldNames, doRegexes, oldText, newText, safe_sub)
}
func NewTransformerGsub(
fieldNames []string,
doAllFieldNames bool,
doRegexes bool,
oldText string,
newText string,
) (RecordTransformer, error) {
return NewTransformerSubs(fieldNames, doAllFieldNames, doRegexes, oldText, newText, safe_gsub)
}
func NewTransformerSsub(
fieldNames []string,
doAllFieldNames bool,
doRegexes bool,
oldText string,
newText string,
) (RecordTransformer, error) {
return NewTransformerSubs(fieldNames, doAllFieldNames, doRegexes, oldText, newText, safe_ssub)
}
func NewTransformerSubs(
fieldNames []string,
doAllFieldNames bool,
doRegexes bool,
oldText string,
newText string,
subber bifs.TernaryFunc,
) (RecordTransformer, error) {
tr := &TransformerSubs{
fieldNamesSet: lib.StringListToSet(fieldNames),
oldText: mlrval.FromString(oldText),
newText: mlrval.FromString(newText),
subber: subber,
}
if doAllFieldNames {
tr.fieldAcceptor = tr.fieldAcceptorAll
} else if doRegexes {
tr.fieldAcceptor = tr.fieldAcceptorByRegexes
tr.regexes = make([]*regexp.Regexp, len(fieldNames))
for i, regexString := range fieldNames {
// Handles "a.*b"i Miller case-insensitive-regex specification
regex, err := lib.CompileMillerRegex(regexString)
if err != nil {
return nil, cli.VerbErrorf("sub", "invalid regex \"%s\": %w", regexString, err)
}
tr.regexes[i] = regex
}
} else {
tr.fieldAcceptor = tr.fieldAcceptorByNames
}
return tr, nil
}
func (tr *TransformerSubs) Transform(
inrecAndContext *types.RecordAndContext,
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
inputDownstreamDoneChannel <-chan bool,
outputDownstreamDoneChannel chan<- bool,
) {
HandleDefaultDownstreamDone(inputDownstreamDoneChannel, outputDownstreamDoneChannel)
if !inrecAndContext.EndOfStream {
inrec := inrecAndContext.Record
// Run sub, gsub, or ssub on the user-specified field names
for pe := inrec.Head; pe != nil; pe = pe.Next {
if tr.fieldAcceptor(pe.Key) {
pe.Value = tr.subber(pe.Value, tr.oldText, tr.newText)
}
}
}
// Including emit of end-of-stream marker
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
}
// fieldAcceptorByNames implements -f
func (tr *TransformerSubs) fieldAcceptorByNames(
fieldName string,
) bool {
return tr.fieldNamesSet[fieldName]
}
// fieldAcceptorByRegexes implements -r
func (tr *TransformerSubs) fieldAcceptorByRegexes(
fieldName string,
) bool {
for _, regex := range tr.regexes {
if regex.MatchString(fieldName) {
return true
}
}
return false
}
// fieldAcceptorAll implements -a
func (tr *TransformerSubs) fieldAcceptorAll(
fieldName string,
) bool {
return true
}
// safe_sub implements sub, but doesn't produce error-type on non-string input.
func safe_sub(input1, input2, input3 *mlrval.Mlrval) *mlrval.Mlrval {
if input1.IsString() {
return bifs.BIF_sub(input1, input2, input3)
}
return input1
}
// safe_gsub implements gsub, but doesn't produce error-type on non-string input.
func safe_gsub(input1, input2, input3 *mlrval.Mlrval) *mlrval.Mlrval {
if input1.IsString() {
return bifs.BIF_gsub(input1, input2, input3)
}
return input1
}
// safe_ssub implements ssub, but doesn't produce error-type on non-string input.
func safe_ssub(input1, input2, input3 *mlrval.Mlrval) *mlrval.Mlrval {
if input1.IsString() {
return bifs.BIF_ssub(input1, input2, input3)
}
return input1
}