mirror of
https://github.com/johnkerl/miller.git
synced 2026-07-18 00:45:47 +00:00
* 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>
198 lines
6.3 KiB
Go
198 lines
6.3 KiB
Go
package transformers
|
|
|
|
import (
|
|
"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 verbNameFormatValues = "format-values"
|
|
|
|
const defaultFormatValuesStringFormat = "%s"
|
|
const defaultFormatValuesIntFormat = "%d"
|
|
const defaultFormatValuesFloatFormat = "%f"
|
|
|
|
var formatValuesOptions = []OptionSpec{
|
|
{Flag: "-i", Arg: "{integer format}", Type: "string", Desc: "Integer format string; defaults to \"%d\". Examples: \"%06lld\", \"%08llx\". Note that Miller integers are long long so you must use formats which apply to long long, e.g. with ll in them. Undefined behavior results otherwise."},
|
|
{Flag: "-f", Arg: "{float format}", Type: "string", Desc: "Float format string; defaults to \"%f\". Examples: \"%8.3lf\", \"%.6le\". Note that Miller floats are double-precision so you must use formats which apply to double, e.g. with l[efg] in them. Undefined behavior results otherwise."},
|
|
{Flag: "-s", Arg: "{string format}", Type: "string", Desc: "String format string; defaults to \"%s\". Examples: \"_%s\", \"%08s\". Note that you must use formats which apply to string, e.g. with s in them. Undefined behavior results otherwise."},
|
|
{Flag: "-n", Type: "bool", Desc: "Coerce field values autodetected as int to float, and then apply the float format."},
|
|
}
|
|
|
|
var FormatValuesSetup = TransformerSetup{
|
|
Verb: verbNameFormatValues,
|
|
UsageFunc: transformerFormatValuesUsage,
|
|
ParseCLIFunc: transformerFormatValuesParseCLI,
|
|
IgnoresInput: false,
|
|
Options: formatValuesOptions,
|
|
}
|
|
|
|
func transformerFormatValuesUsage(
|
|
o *os.File,
|
|
) {
|
|
fmt.Fprintf(o, "Usage: %s %s [options]\n", "mlr", verbNameFormatValues)
|
|
fmt.Fprintf(o, "Applies format strings to all field values, depending on autodetected type.\n")
|
|
fmt.Fprintf(o, "* If a field value is detected to be integer, applies integer format.\n")
|
|
fmt.Fprintf(o, "* Else, if a field value is detected to be float, applies float format.\n")
|
|
fmt.Fprintf(o, "* Else, applies string format.\n")
|
|
fmt.Fprintf(o, "\n")
|
|
fmt.Fprintf(o, "Note: this is a low-keystroke way to apply formatting to many fields. To get\n")
|
|
fmt.Fprintf(o, "finer control, please see the fmtnum function within the mlr put DSL.\n")
|
|
fmt.Fprintf(o, "\n")
|
|
fmt.Fprintf(o, "Note: this verb lets you apply arbitrary format strings, which can produce\n")
|
|
fmt.Fprintf(o, "undefined behavior and/or program crashes. See your system's \"man printf\".\n")
|
|
fmt.Fprintf(o, "\n")
|
|
WriteVerbOptions(o, formatValuesOptions)
|
|
}
|
|
|
|
func transformerFormatValuesParseCLI(
|
|
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++
|
|
|
|
stringFormat := defaultFormatValuesStringFormat
|
|
intFormat := defaultFormatValuesIntFormat
|
|
floatFormat := defaultFormatValuesFloatFormat
|
|
coerceIntToFloat := false
|
|
|
|
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":
|
|
transformerFormatValuesUsage(os.Stdout)
|
|
return nil, cli.ErrHelpRequested
|
|
|
|
case "-s":
|
|
stringFormat, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case "-i":
|
|
intFormat, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case "-f":
|
|
floatFormat, err = cli.VerbGetStringArg(verb, opt, args, &argi, argc)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
case "-n":
|
|
coerceIntToFloat = true
|
|
|
|
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 := NewTransformerFormatValues(
|
|
stringFormat,
|
|
intFormat,
|
|
floatFormat,
|
|
coerceIntToFloat,
|
|
)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
return transformer, nil
|
|
}
|
|
|
|
type TransformerFormatValues struct {
|
|
stringFormatter mlrval.IFormatter
|
|
intFormatter mlrval.IFormatter
|
|
floatFormatter mlrval.IFormatter
|
|
coerceIntToFloat bool
|
|
}
|
|
|
|
func NewTransformerFormatValues(
|
|
stringFormat string,
|
|
intFormat string,
|
|
floatFormat string,
|
|
coerceIntToFloat bool,
|
|
) (*TransformerFormatValues, error) {
|
|
stringFormatter, err := mlrval.GetFormatter(stringFormat)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
intFormatter, err := mlrval.GetFormatter(intFormat)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
floatFormatter, err := mlrval.GetFormatter(floatFormat)
|
|
if err != nil {
|
|
return nil, err
|
|
}
|
|
|
|
tr := &TransformerFormatValues{
|
|
stringFormatter: stringFormatter,
|
|
intFormatter: intFormatter,
|
|
floatFormatter: floatFormatter,
|
|
coerceIntToFloat: coerceIntToFloat,
|
|
}
|
|
return tr, nil
|
|
}
|
|
|
|
func (tr *TransformerFormatValues) Transform(
|
|
inrecAndContext *types.RecordAndContext,
|
|
outputRecordsAndContexts *[]*types.RecordAndContext, // list of *types.RecordAndContext
|
|
inputDownstreamDoneChannel <-chan bool,
|
|
outputDownstreamDoneChannel chan<- bool,
|
|
) {
|
|
HandleDefaultDownstreamDone(inputDownstreamDoneChannel, outputDownstreamDoneChannel)
|
|
if inrecAndContext.EndOfStream {
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext) // emit end-of-stream marker
|
|
return
|
|
}
|
|
|
|
for pe := inrecAndContext.Record.Head; pe != nil; pe = pe.Next {
|
|
if tr.coerceIntToFloat {
|
|
_, isNumeric := pe.Value.GetNumericToFloatValue()
|
|
if isNumeric {
|
|
pe.Value = tr.floatFormatter.Format(pe.Value)
|
|
} else if pe.Value.IsStringOrVoid() {
|
|
pe.Value = tr.stringFormatter.Format(pe.Value)
|
|
} // else, don't rewrite booleans, arrays, maps, etc.
|
|
} else {
|
|
_, isInt := pe.Value.GetIntValue()
|
|
_, isFloat := pe.Value.GetFloatValue()
|
|
if isInt {
|
|
pe.Value = tr.intFormatter.Format(pe.Value)
|
|
} else if isFloat {
|
|
pe.Value = tr.floatFormatter.Format(pe.Value)
|
|
} else if pe.Value.IsStringOrVoid() {
|
|
pe.Value = tr.stringFormatter.Format(pe.Value)
|
|
} // else, don't rewrite booleans, arrays, maps, etc.
|
|
}
|
|
}
|
|
|
|
*outputRecordsAndContexts = append(*outputRecordsAndContexts, inrecAndContext)
|
|
}
|