Skip to content

feat(args): accept snake_case and kebab-case keys in bookshop validation #293

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
markdumay merged 2 commits into from
Mar 13, 2026
Merged

feat(args): accept snake_case and kebab-case keys in bookshop validation #293

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f89611
feat(args): accept snake_case and kebab-case keys in bookshop validation
markdumay Mar 13, 2026
9de0c38
Merge branch 'main' into develop
markdumay Mar 13, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 37 additions & 7 deletions layouts/_partials/utilities/InitArgs.html
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
<!--
<!--
Copyright © 2024 - 2025 The Hinode Team / Mark Dumay. All rights reserved.
Use of this source code is governed by The MIT License (MIT) that can be found in the LICENSE file.
Visit gethinode.com/license for more details.
Expand Down Expand Up @@ -94,6 +94,36 @@
{{ range $key, $val := $namedargs }}
{{ $def := index $types.types $key }}

{{/* Bookshop-only: normalize snake_case ↔ kebab-case argument keys */}}
{{ if and $bookshop (ne $key "_default") }}
{{ if not $def }}
{{/* Key not found — try the alternate casing (snake↔kebab). */}}
{{ $match := findRESubmatch "^(_*)(.*)$" $key }}
{{ $prefix := index $match 0 1 }}
{{ $body := index $match 0 2 }}
{{ $altKey := "" }}
{{ if strings.Contains $body "_" }}
{{/* snake_case input: try kebab-case lookup (v5 InitTypes stores kebab keys) */}}
{{ $altKey = print $prefix (replaceRE "_" "-" $body) }}
{{ else if strings.Contains $body "-" }}
{{/* kebab-case input: try snake_case lookup (v4 InitTypes stores snake keys); warn. */}}
{{ $altKey = print $prefix (replaceRE "-" "_" $body) }}
{{ end }}
{{ if $altKey }}
{{ with index $types.types $altKey }}
{{ $def = . }}
{{/* Warn only when the caller used kebab-case (snake_case is preferred). */}}
{{ if strings.Contains $key "-" }}
{{ $warnmsg = $warnmsg | append (printf "[%s] argument '%s': prefer snake_case '%s'" $bookshop $key (replaceRE "-" "_" $key)) }}
{{ end }}
{{ end }}
{{ end }}
{{ else if strings.Contains $key "-" }}
{{/* Kebab-case key found directly (v5 InitTypes) — warn to use snake_case instead. */}}
{{ $warnmsg = $warnmsg | append (printf "[%s] argument '%s': prefer snake_case '%s'" $bookshop $key (replaceRE "-" "_" $key)) }}
{{ end }}
{{ end }}

{{ if eq $key "_default" }}
{{ $default = $default | append $val }}
{{ else if not $def }}
Expand Down Expand Up @@ -146,7 +176,7 @@
{{ break }}
{{ end }}
{{ else if and (reflect.IsMap $def.options) (or $def.options.min $def.options.max) (in (slice "int" "float" "float64") $actual) }}
{{ if or
{{ if or
(and $def.options.min (lt $val $def.options.min))
(and $def.options.max (gt $val $def.options.max))
}}
Expand All @@ -155,7 +185,7 @@
{{ $errmsg = $errmsg | append (printf "[%s] argument '%s': value '%s' out of range [%s, %s]" (or $structure $bookshop) (string $key) (string $val) $min $max) }}
{{ $error = true }}
{{ break }}
{{ end }}
{{ end }}
{{ end }}

{{/* validate if argument is deprecated */}}
Expand Down Expand Up @@ -208,7 +238,7 @@
{{ $check2 := index $val "default" }}
{{ if or $check1 $check2 }}
{{ $params = merge $params (dict
$key (partial "inline/default.html" (dict "config" $val.config "default" $val.default))
$key (partial "inline/default.html" (dict "config" $val.config "default" $val.default))
) }}
{{ $default = $default | append $key }}
{{ else if $udt }}
Expand All @@ -218,8 +248,8 @@
{{ $nested := dict }}
{{ range $k, $v := $udt }}
{{ if and (reflect.IsMap $v) (or $v.config $v.default) }}
{{ $nested = merge $nested (dict
$k (partial "inline/default.html" (dict "config" $val.config "default" $val.default))
{{ $nested = merge $nested (dict
$k (partial "inline/default.html" (dict "config" $val.config "default" $val.default))
)}}
{{ end }}
{{ end }}
Expand All @@ -240,4 +270,4 @@
{{ end }}

{{ $params = merge $params (dict "err" $error "errmsg" $errmsg "warnmsg" $warnmsg "default" $default) }}
{{ return $params }}
{{ return $params }}
Loading