* chore: update coverage badge [skip ci] * chore: update coverage badge [skip ci] * chore: update coverage badge [skip ci] * chore: update coverage badge [skip ci] * chore: update coverage badge [skip ci] * 1.0.19 changelog * stick opt * fix(cli): utf-8 safe sticky suffix guard + changelog (#272) SuffixLooksLikeValue used to read suffix[0] (a single byte) for both the uuid format branch and the fallback "is the first rune a letter?" check. For multi-byte UTF-8 leading runes — common in dws because value text is often Chinese — this picked up only the first byte (0xE0..0xF4 lead), which is not a letter and not a hex digit, so the function silently returned true and let glued tokens like --name<CJK> get split into --name <CJK>... This switches both branches to utf8.DecodeRuneInString and adds a utf8.RuneError guard so invalid UTF-8 input is rejected too. Also locks down the new behaviour in CHANGELOG ## [Unreleased]: - Changed: schema-aware sticky flag splitting - Added: available_flags field on unknown-flag errors Co-authored-by: Cursor <cursoragent@cursor.com> --------- Co-authored-by: github-actions[bot] <github-actions[bot]@users.noreply.github.com> Co-authored-by: Cursor <cursoragent@cursor.com>
131 lines
3.4 KiB
Go
131 lines
3.4 KiB
Go
// Copyright 2026 Alibaba Group
|
|
// Licensed under the Apache License, Version 2.0 (the "License");
|
|
// you may not use this file except in compliance with the License.
|
|
// You may obtain a copy of the License at
|
|
//
|
|
// http://www.apache.org/licenses/LICENSE-2.0
|
|
//
|
|
// Unless required by applicable law or agreed to in writing, software
|
|
// distributed under the License is distributed on an "AS IS" BASIS,
|
|
// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
// See the License for the specific language governing permissions and
|
|
// limitations under the License.
|
|
|
|
package pipeline
|
|
|
|
import (
|
|
"log/slog"
|
|
"os"
|
|
|
|
"github.com/spf13/cobra"
|
|
"github.com/spf13/pflag"
|
|
)
|
|
|
|
// RunPreParse resolves the target command from the raw args, extracts
|
|
// flag names from the Cobra command tree, and runs all PreParse
|
|
// handlers. The corrected args are set back on the root command via
|
|
// SetArgs so that Cobra's subsequent ExecuteC uses the corrected
|
|
// values.
|
|
//
|
|
// If the target command cannot be resolved (e.g. the user typed a
|
|
// non-existent command), PreParse is skipped silently and Cobra will
|
|
// handle the error.
|
|
func RunPreParse(root *cobra.Command, engine *Engine) {
|
|
if engine == nil || !engine.HasHandlers(PreParse) {
|
|
return
|
|
}
|
|
|
|
rawArgs := os.Args[1:]
|
|
if len(rawArgs) == 0 {
|
|
return
|
|
}
|
|
|
|
// Traverse the command tree to find the target command.
|
|
target, _, err := root.Traverse(rawArgs)
|
|
if err != nil || target == nil {
|
|
return
|
|
}
|
|
|
|
// Build FlagInfo from the target command's registered flags.
|
|
flagInfos := FlagInfoFromCommand(target)
|
|
if len(flagInfos) == 0 {
|
|
return
|
|
}
|
|
|
|
ctx := &Context{
|
|
Args: append([]string{}, rawArgs...),
|
|
FlagSpecs: flagInfos,
|
|
}
|
|
|
|
if err := engine.RunPhase(PreParse, ctx); err != nil {
|
|
slog.Debug("pipeline pre-parse", "error", err)
|
|
return
|
|
}
|
|
|
|
// Only set corrected args if PreParse actually changed something.
|
|
if len(ctx.Corrections) > 0 {
|
|
root.SetArgs(ctx.Args)
|
|
for _, c := range ctx.Corrections {
|
|
slog.Debug("pipeline correction",
|
|
"handler", c.Handler,
|
|
"kind", c.Kind,
|
|
"field", c.Field,
|
|
"original", c.Original,
|
|
"corrected", c.Corrected,
|
|
)
|
|
}
|
|
}
|
|
}
|
|
|
|
// FlagInfoFromCommand extracts FlagInfo entries from a Cobra
|
|
// command's registered flags (both local and inherited).
|
|
//
|
|
// JSON Schema "format" and "enum" hints injected via pflag
|
|
// annotations (x-cli-format / x-cli-enum, see
|
|
// internal/compat/dynamic_commands.go) are surfaced on FlagInfo
|
|
// so PreParse handlers can validate sticky-split candidates against
|
|
// the actual schema, not just the pflag type.
|
|
func FlagInfoFromCommand(cmd *cobra.Command) []FlagInfo {
|
|
if cmd == nil {
|
|
return nil
|
|
}
|
|
|
|
seen := make(map[string]bool)
|
|
var infos []FlagInfo
|
|
|
|
cmd.Flags().VisitAll(func(f *pflag.Flag) {
|
|
if seen[f.Name] {
|
|
return
|
|
}
|
|
seen[f.Name] = true
|
|
infos = append(infos, flagInfoFromPflag(f))
|
|
})
|
|
|
|
cmd.InheritedFlags().VisitAll(func(f *pflag.Flag) {
|
|
if seen[f.Name] {
|
|
return
|
|
}
|
|
seen[f.Name] = true
|
|
infos = append(infos, flagInfoFromPflag(f))
|
|
})
|
|
|
|
return infos
|
|
}
|
|
|
|
// flagInfoFromPflag builds a FlagInfo from a pflag.Flag, copying
|
|
// schema metadata stashed in the flag's annotations map.
|
|
func flagInfoFromPflag(f *pflag.Flag) FlagInfo {
|
|
fi := FlagInfo{
|
|
Name: f.Name,
|
|
PropertyName: f.Name,
|
|
Type: f.Value.Type(),
|
|
}
|
|
if v := f.Annotations["x-cli-format"]; len(v) > 0 {
|
|
fi.Format = v[0]
|
|
}
|
|
if v := f.Annotations["x-cli-enum"]; len(v) > 0 {
|
|
fi.Enum = append([]string{}, v...)
|
|
}
|
|
return fi
|
|
}
|