Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bed1ff975f | ||
|
|
7589c5f220 | ||
|
|
dd92379b68 | ||
|
|
06e5893734 | ||
|
|
332a24fd3e |
@@ -9,6 +9,11 @@ on:
|
|||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
tags: ['v*']
|
tags: ['v*']
|
||||||
|
paths-ignore:
|
||||||
|
- "docs/**"
|
||||||
|
- "README.md"
|
||||||
|
- "AGENTS.md"
|
||||||
|
- "LICENSE"
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
build-binaries:
|
build-binaries:
|
||||||
|
|||||||
@@ -4,6 +4,11 @@ name: test
|
|||||||
on:
|
on:
|
||||||
push:
|
push:
|
||||||
branches: [main]
|
branches: [main]
|
||||||
|
paths-ignore:
|
||||||
|
- "docs/**"
|
||||||
|
- "README.md"
|
||||||
|
- "AGENTS.md"
|
||||||
|
- "LICENSE"
|
||||||
pull_request:
|
pull_request:
|
||||||
|
|
||||||
jobs:
|
jobs:
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
# Topdata JSON Validation Tightening Design
|
# Topdata JSON Validation Tightening Design
|
||||||
|
|
||||||
**Date:** 2026-06-25
|
**Date:** 2026-06-25
|
||||||
**Status:** Approved design; implementation pending
|
**Status:** Implemented and reviewed
|
||||||
**Scope:** `sow-tools`
|
**Scope:** `sow-tools`
|
||||||
|
|
||||||
## Problem
|
## Problem
|
||||||
|
|||||||
@@ -1581,6 +1581,15 @@ func validateAutogenConfig(cfg AutogenConfig) []error {
|
|||||||
|
|
||||||
func validateAutogenConsumerSources(consumers []AutogenConsumerConfig) []error {
|
func validateAutogenConsumerSources(consumers []AutogenConsumerConfig) []error {
|
||||||
var failures []error
|
var failures []error
|
||||||
|
partsRows := 0
|
||||||
|
for _, c := range consumers {
|
||||||
|
if strings.TrimSpace(c.Mode) == "parts_rows" {
|
||||||
|
partsRows++
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if partsRows > 1 {
|
||||||
|
failures = append(failures, fmt.Errorf("at most one autogen consumer may use mode parts_rows; found %d (override precedence would be ambiguous)", partsRows))
|
||||||
|
}
|
||||||
for _, c := range consumers {
|
for _, c := range consumers {
|
||||||
if strings.TrimSpace(c.Source.Kind) != "cdn_channel" {
|
if strings.TrimSpace(c.Source.Kind) != "cdn_channel" {
|
||||||
continue
|
continue
|
||||||
|
|||||||
@@ -1864,6 +1864,20 @@ func TestValidateAutogenConsumerSourcesCDNChannel(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func TestValidateRejectsMultiplePartsRowsConsumers(t *testing.T) {
|
||||||
|
consumers := []AutogenConsumerConfig{
|
||||||
|
{ID: "parts-a", Mode: "parts_rows"},
|
||||||
|
{ID: "parts-b", Mode: "parts_rows"},
|
||||||
|
}
|
||||||
|
if failures := validateAutogenConsumerSources(consumers); len(failures) == 0 {
|
||||||
|
t.Fatal("expected error for two parts_rows consumers")
|
||||||
|
}
|
||||||
|
single := []AutogenConsumerConfig{{ID: "parts", Mode: "parts_rows"}}
|
||||||
|
if failures := validateAutogenConsumerSources(single); len(failures) != 0 {
|
||||||
|
t.Fatalf("single parts_rows consumer must validate, got %v", failures)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func loadAndValidate(root string) error {
|
func loadAndValidate(root string) error {
|
||||||
proj, err := Load(root)
|
proj, err := Load(root)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
|
|||||||
@@ -65,6 +65,33 @@ effective output while keeping project policy in topdata authoring files.
|
|||||||
`position` defaults to `append`. The module uses `prepend` for class feat
|
`position` defaults to `append`. The module uses `prepend` for class feat
|
||||||
injections to keep generated policy rows before per-class authored rows.
|
injections to keep generated policy rows before per-class authored rows.
|
||||||
|
|
||||||
|
## Global Injection Grammar
|
||||||
|
|
||||||
|
Each injection entry may use only `row`, `require_present`, `any_present`, and
|
||||||
|
`unless_present`. `when_present` is invalid and rejected; it is not an alias.
|
||||||
|
|
||||||
|
```json
|
||||||
|
{
|
||||||
|
"row": {
|
||||||
|
"FeatIndex": { "id": "feat:example" }
|
||||||
|
},
|
||||||
|
"require_present": [{ "field": "FeatIndex", "id": "feat:required" }],
|
||||||
|
"any_present": [
|
||||||
|
{ "field": "FeatIndex", "id": "masterfeats:metamagic" },
|
||||||
|
{ "field": "FeatIndex", "id": "masterfeats:combat" }
|
||||||
|
],
|
||||||
|
"unless_present": [{ "field": "FeatIndex", "id": "feat:example" }]
|
||||||
|
}
|
||||||
|
```
|
||||||
|
|
||||||
|
- `require_present` means every listed reference must exist.
|
||||||
|
- `any_present` means at least one listed reference must exist, and the array
|
||||||
|
must not be empty.
|
||||||
|
- `unless_present` means none of the listed references may exist.
|
||||||
|
- Every present group on an entry must pass.
|
||||||
|
- Conditions observe the current rows in injection order, so earlier injections
|
||||||
|
can affect later conditions.
|
||||||
|
|
||||||
## Acceptance Criteria
|
## Acceptance Criteria
|
||||||
|
|
||||||
- Class feat output contains the same effective shared feats as the prior YAML
|
- Class feat output contains the same effective shared feats as the prior YAML
|
||||||
|
|||||||
+104
-17
@@ -299,23 +299,34 @@ func resolveCDNChannelManifest(p *project.Project, consumer project.AutogenConsu
|
|||||||
progress = func(string) {}
|
progress = func(string) {}
|
||||||
}
|
}
|
||||||
|
|
||||||
// 1. Offline / air-gapped override: a vfxs.yml path or a manifest-repo
|
// Manifest basename + provenance label are derived from config, not hardcoded,
|
||||||
// checkout root containing assets/vfxs.yml. Skips the network entirely.
|
// so the same resolver serves vfxs.yml (accessory VFX) and part.yml (parts).
|
||||||
|
manifestBase := filepath.Base(filepath.FromSlash(strings.TrimSpace(src.ManifestPath)))
|
||||||
|
if manifestBase == "." || manifestBase == "" || manifestBase == string(filepath.Separator) {
|
||||||
|
manifestBase = "manifest.yml"
|
||||||
|
}
|
||||||
|
label := strings.TrimSpace(consumer.ID)
|
||||||
|
if label == "" {
|
||||||
|
label = "autogen"
|
||||||
|
}
|
||||||
|
|
||||||
|
// 1. Offline / air-gapped override: a manifest file path or a manifest-repo
|
||||||
|
// checkout root containing assets/<manifestBase>. Skips the network entirely.
|
||||||
if envName := strings.TrimSpace(src.OfflineOverrideEnv); envName != "" {
|
if envName := strings.TrimSpace(src.OfflineOverrideEnv); envName != "" {
|
||||||
if override := strings.TrimSpace(os.Getenv(envName)); override != "" {
|
if override := strings.TrimSpace(os.Getenv(envName)); override != "" {
|
||||||
vfxsPath := override
|
manifestPath := override
|
||||||
if info, err := os.Stat(override); err == nil && info.IsDir() {
|
if info, err := os.Stat(override); err == nil && info.IsDir() {
|
||||||
vfxsPath = filepath.Join(override, "assets", "vfxs.yml")
|
manifestPath = filepath.Join(override, "assets", manifestBase)
|
||||||
}
|
}
|
||||||
raw, err := os.ReadFile(vfxsPath)
|
raw, err := os.ReadFile(manifestPath)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, fmt.Errorf("offline vfxs override %s: %w", vfxsPath, err)
|
return nil, fmt.Errorf("offline %s override %s: %w", manifestBase, manifestPath, err)
|
||||||
}
|
}
|
||||||
entries, err := filterCDNChannelEntries(raw, consumer)
|
entries, err := filterCDNChannelEntries(raw, consumer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
progress(fmt.Sprintf("Using offline vfxs override for %s from %s...", consumer.ID, vfxsPath))
|
progress(fmt.Sprintf("Using offline %s override for %s from %s...", manifestBase, consumer.ID, manifestPath))
|
||||||
return &autogenManifest{ID: consumer.Producer, Ref: "local", Entries: entries}, nil
|
return &autogenManifest{ID: consumer.Producer, Ref: "local", Entries: entries}, nil
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -359,13 +370,13 @@ func resolveCDNChannelManifest(p *project.Project, consumer project.AutogenConsu
|
|||||||
if tag == "" {
|
if tag == "" {
|
||||||
return nil, unavailableAutogenManifest(fmt.Errorf("channel %q absent in channels.json (%s)", channel, channelsURL))
|
return nil, unavailableAutogenManifest(fmt.Errorf("channel %q absent in channels.json (%s)", channel, channelsURL))
|
||||||
}
|
}
|
||||||
progress(fmt.Sprintf("Accessory VFX: channel %s -> tag %s", channel, tag))
|
progress(fmt.Sprintf("%s: channel %s -> tag %s", label, channel, tag))
|
||||||
|
|
||||||
// 5. vfxs.yml for the tag.
|
// 5. per-tag manifest for the tag.
|
||||||
manifestURL := join(src.ManifestPath, tag)
|
manifestURL := join(src.ManifestPath, tag)
|
||||||
vstatus, vbody, err := httpGetStatus(manifestURL)
|
vstatus, vbody, err := httpGetStatus(manifestURL)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, unavailableAutogenManifest(fmt.Errorf("vfxs.yml unreachable %s: %w", manifestURL, err))
|
return nil, unavailableAutogenManifest(fmt.Errorf("%s unreachable %s: %w", manifestBase, manifestURL, err))
|
||||||
}
|
}
|
||||||
switch vstatus {
|
switch vstatus {
|
||||||
case http.StatusOK:
|
case http.StatusOK:
|
||||||
@@ -377,27 +388,103 @@ func resolveCDNChannelManifest(p *project.Project, consumer project.AutogenConsu
|
|||||||
if marker := strings.TrimSpace(src.ReleaseMarkerPath); marker != "" {
|
if marker := strings.TrimSpace(src.ReleaseMarkerPath); marker != "" {
|
||||||
markerURL := join(marker, tag)
|
markerURL := join(marker, tag)
|
||||||
if mstatus, _, merr := httpGetStatus(markerURL); merr == nil && mstatus == http.StatusOK {
|
if mstatus, _, merr := httpGetStatus(markerURL); merr == nil && mstatus == http.StatusOK {
|
||||||
return nil, fmt.Errorf("release %s has %s but no vfxs.yml (%s) — accessory rows would silently vanish; backfill/republish vfxs.yml for %s", tag, marker, manifestURL, tag)
|
return nil, fmt.Errorf("release %s has %s but no %s (%s) — rows would silently vanish; backfill/republish %s for %s", tag, marker, manifestBase, manifestURL, manifestBase, tag)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
return nil, unavailableAutogenManifest(fmt.Errorf("vfxs.yml 404 %s (no published release for %s)", manifestURL, tag))
|
return nil, unavailableAutogenManifest(fmt.Errorf("%s 404 %s (no published release for %s)", manifestBase, manifestURL, tag))
|
||||||
default:
|
default:
|
||||||
return nil, unavailableAutogenManifest(fmt.Errorf("vfxs.yml HTTP %d %s", vstatus, manifestURL))
|
return nil, unavailableAutogenManifest(fmt.Errorf("%s HTTP %d %s", manifestBase, vstatus, manifestURL))
|
||||||
}
|
}
|
||||||
|
|
||||||
entries, err := filterCDNChannelEntries(vbody, consumer)
|
entries, err := filterCDNChannelEntries(vbody, consumer)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err // malformed vfxs.yml = HARD fail
|
return nil, err // malformed manifest = HARD fail
|
||||||
}
|
}
|
||||||
progress(fmt.Sprintf("Accessory VFX: resolved %d model entries from %s", len(entries), manifestURL))
|
progress(fmt.Sprintf("%s: resolved %d model entries from %s", label, len(entries), manifestURL))
|
||||||
return &autogenManifest{ID: consumer.Producer, Ref: tag, Entries: entries}, nil
|
return &autogenManifest{ID: consumer.Producer, Ref: tag, Entries: entries}, nil
|
||||||
}
|
}
|
||||||
|
|
||||||
// filterCDNChannelEntries parses vfxs.yml and keeps restype==mdl assets under
|
// filterCDNChannelEntries dispatches per-tag manifest parsing on the consumer
|
||||||
|
// mode. parts_rows consumes part.yml (the parts inventory contract); every other
|
||||||
|
// mode consumes vfxs.yml (the accessory-VFX contract).
|
||||||
|
func filterCDNChannelEntries(raw []byte, consumer project.AutogenConsumerConfig) ([]autogenManifestEntry, error) {
|
||||||
|
switch strings.TrimSpace(consumer.Mode) {
|
||||||
|
case "parts_rows":
|
||||||
|
return filterPartsCDNChannelEntries(raw)
|
||||||
|
default:
|
||||||
|
return filterVFXCDNChannelEntries(raw, consumer)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// filterPartsCDNChannelEntries parses part.yml and keeps restype==mdl assets
|
||||||
|
// under part/<supported-category>/.../<stem><digits>.mdl. The asset category is
|
||||||
|
// the path segment after part/; the row ID is the trailing decimal of the
|
||||||
|
// filename stem. Body/race/gender/left-right variants dedup by (category,rowID).
|
||||||
|
// Zero accepted rows is a HARD fail (silent-drop guard).
|
||||||
|
func filterPartsCDNChannelEntries(raw []byte) ([]autogenManifestEntry, error) {
|
||||||
|
var manifest struct {
|
||||||
|
Assets *[]struct {
|
||||||
|
Path string `yaml:"path"`
|
||||||
|
Restype string `yaml:"restype"`
|
||||||
|
} `yaml:"assets"`
|
||||||
|
}
|
||||||
|
if err := yaml.Unmarshal(raw, &manifest); err != nil {
|
||||||
|
return nil, fmt.Errorf("malformed part.yml (cannot parse): %w", err)
|
||||||
|
}
|
||||||
|
if manifest.Assets == nil {
|
||||||
|
return nil, fmt.Errorf("malformed part.yml (no assets array)")
|
||||||
|
}
|
||||||
|
seen := map[string]struct{}{}
|
||||||
|
var entries []autogenManifestEntry
|
||||||
|
for _, a := range *manifest.Assets {
|
||||||
|
if a.Restype != "mdl" {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
path := filepath.ToSlash(strings.TrimSpace(a.Path))
|
||||||
|
if !strings.HasPrefix(path, "part/") {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
rel := strings.TrimPrefix(path, "part/")
|
||||||
|
segs := strings.Split(rel, "/")
|
||||||
|
if len(segs) < 2 {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
category := segs[0]
|
||||||
|
if !isSupportedPartCategory(category) {
|
||||||
|
continue // ignores _masters, cloak, head, helm, tail, wings
|
||||||
|
}
|
||||||
|
stem := strings.TrimSuffix(segs[len(segs)-1], ".mdl")
|
||||||
|
match := trailingNumberRegex.FindString(stem)
|
||||||
|
if match == "" {
|
||||||
|
return nil, fmt.Errorf("part.yml: supported-category model %q has no trailing row number", path)
|
||||||
|
}
|
||||||
|
rowID, err := strconv.Atoi(match)
|
||||||
|
if err != nil || rowID == 0 {
|
||||||
|
return nil, fmt.Errorf("part.yml: supported-category model %q resolves to invalid row id %q", path, match)
|
||||||
|
}
|
||||||
|
key := category + "/" + strconv.Itoa(rowID)
|
||||||
|
if _, dup := seen[key]; dup {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
seen[key] = struct{}{}
|
||||||
|
entries = append(entries, autogenManifestEntry{
|
||||||
|
Source: rel, Group: category, ModelStem: stem, RowID: rowID,
|
||||||
|
})
|
||||||
|
}
|
||||||
|
if len(entries) == 0 {
|
||||||
|
return nil, fmt.Errorf("part.yml: zero supported part rows after filtering")
|
||||||
|
}
|
||||||
|
slices.SortFunc(entries, func(a, b autogenManifestEntry) int {
|
||||||
|
return strings.Compare(a.Source, b.Source)
|
||||||
|
})
|
||||||
|
return entries, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
// filterVFXCDNChannelEntries parses vfxs.yml and keeps restype==mdl assets under
|
||||||
// vfxs/<group>/ for the consumer's 4 accessory groups, stripping the leading
|
// vfxs/<group>/ for the consumer's 4 accessory groups, stripping the leading
|
||||||
// vfxs/ from each source path. A present-but-malformed manifest (unparseable, or
|
// vfxs/ from each source path. A present-but-malformed manifest (unparseable, or
|
||||||
// no assets array) is an error; an empty assets array yields zero entries.
|
// no assets array) is an error; an empty assets array yields zero entries.
|
||||||
func filterCDNChannelEntries(raw []byte, consumer project.AutogenConsumerConfig) ([]autogenManifestEntry, error) {
|
func filterVFXCDNChannelEntries(raw []byte, consumer project.AutogenConsumerConfig) ([]autogenManifestEntry, error) {
|
||||||
var manifest struct {
|
var manifest struct {
|
||||||
Assets *[]struct {
|
Assets *[]struct {
|
||||||
Path string `yaml:"path"`
|
Path string `yaml:"path"`
|
||||||
|
|||||||
@@ -5,6 +5,7 @@ import (
|
|||||||
"fmt"
|
"fmt"
|
||||||
"net/http"
|
"net/http"
|
||||||
"net/http/httptest"
|
"net/http/httptest"
|
||||||
|
"os"
|
||||||
"path/filepath"
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
@@ -194,6 +195,35 @@ func TestResolveCDNChannelOfflineOverride(t *testing.T) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// TestResolveCDNChannelOfflineUsesManifestBasename proves the resolver derives
|
||||||
|
// the offline checkout filename from manifest_path's basename (part.yml here),
|
||||||
|
// not a hardcoded assets/vfxs.yml, and routes parts_rows through the parts filter.
|
||||||
|
func TestResolveCDNChannelOfflineUsesManifestBasename(t *testing.T) {
|
||||||
|
root := testProjectRoot(t)
|
||||||
|
dir := filepath.Join(root, "manifest-checkout")
|
||||||
|
if err := os.MkdirAll(filepath.Join(dir, "assets"), 0o755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
writeFile(t, filepath.Join(dir, "assets", "part.yml"),
|
||||||
|
"assets:\n - {path: part/belt/m/pfa0_belt017.mdl, restype: mdl}\n")
|
||||||
|
t.Setenv("SOW_PART_MANIFEST", dir)
|
||||||
|
|
||||||
|
c := projectPartsConsumer()
|
||||||
|
c.Source = project.AutogenSourceConfig{
|
||||||
|
Kind: "cdn_channel",
|
||||||
|
ManifestPath: "releases/haks/{tag}/part.yml",
|
||||||
|
OfflineOverrideEnv: "SOW_PART_MANIFEST",
|
||||||
|
}
|
||||||
|
|
||||||
|
m, err := resolveCDNChannelManifest(testProject(root), c, c.Source, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("resolve: %v", err)
|
||||||
|
}
|
||||||
|
if len(m.Entries) != 1 || m.Entries[0].RowID != 17 || m.Entries[0].Group != "belt" {
|
||||||
|
t.Fatalf("unexpected entries: %+v", m.Entries)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
func errorIsUnavailable(err error) bool {
|
func errorIsUnavailable(err error) bool {
|
||||||
return errors.Is(err, errAutogenManifestUnavailable)
|
return errors.Is(err, errAutogenManifestUnavailable)
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -0,0 +1,195 @@
|
|||||||
|
package topdata
|
||||||
|
|
||||||
|
import (
|
||||||
|
"errors"
|
||||||
|
"fmt"
|
||||||
|
"slices"
|
||||||
|
"strings"
|
||||||
|
)
|
||||||
|
|
||||||
|
type globalCondition struct {
|
||||||
|
Field string
|
||||||
|
ID string
|
||||||
|
}
|
||||||
|
|
||||||
|
type globalConditionGroups struct {
|
||||||
|
RequirePresent []globalCondition
|
||||||
|
AnyPresent []globalCondition
|
||||||
|
UnlessPresent []globalCondition
|
||||||
|
}
|
||||||
|
|
||||||
|
var (
|
||||||
|
baseOrPlainRootKeys = []string{
|
||||||
|
"output", "key", "columns", "rows", "compare_reference",
|
||||||
|
}
|
||||||
|
canonicalModuleRootKeys = []string{
|
||||||
|
"output", "key", "columns", "entries", "overrides", "rows",
|
||||||
|
}
|
||||||
|
globalRootKeys = []string{
|
||||||
|
"columns", "entries", "overrides", "defaults", "position", "injections",
|
||||||
|
}
|
||||||
|
globalInjectionKeys = []string{
|
||||||
|
"row", "require_present", "any_present", "unless_present",
|
||||||
|
}
|
||||||
|
globalConditionKeys = []string{"field", "id"}
|
||||||
|
globalDefaultRuleKeys = []string{"match", "values"}
|
||||||
|
globalDefaultMatchKeys = []string{"source"}
|
||||||
|
globalDefaultFormatKeys = []string{"format"}
|
||||||
|
)
|
||||||
|
|
||||||
|
func unsupportedObjectKeys(obj map[string]any, supported ...string) []string {
|
||||||
|
if len(obj) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
supportedSet := make(map[string]struct{}, len(supported))
|
||||||
|
for _, key := range supported {
|
||||||
|
supportedSet[key] = struct{}{}
|
||||||
|
}
|
||||||
|
unsupported := make([]string, 0, len(obj))
|
||||||
|
for key := range obj {
|
||||||
|
if _, ok := supportedSet[key]; ok {
|
||||||
|
continue
|
||||||
|
}
|
||||||
|
unsupported = append(unsupported, key)
|
||||||
|
}
|
||||||
|
slices.Sort(unsupported)
|
||||||
|
return unsupported
|
||||||
|
}
|
||||||
|
|
||||||
|
func unsupportedObjectKeysError(label string, obj map[string]any, supported ...string) error {
|
||||||
|
unsupported := unsupportedObjectKeys(obj, supported...)
|
||||||
|
if len(unsupported) == 0 {
|
||||||
|
return nil
|
||||||
|
}
|
||||||
|
return fmt.Errorf("%s contains unsupported key %q (supported keys: %s)", label, unsupported[0], strings.Join(supported, ", "))
|
||||||
|
}
|
||||||
|
|
||||||
|
type globalConditionParseOptions struct {
|
||||||
|
Label string
|
||||||
|
Report func(error)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseGlobalConditionGroups(injection map[string]any, options ...globalConditionParseOptions) (globalConditionGroups, error) {
|
||||||
|
if injection == nil {
|
||||||
|
return globalConditionGroups{}, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
label := "global injection"
|
||||||
|
var report func(error)
|
||||||
|
if len(options) > 0 {
|
||||||
|
if strings.TrimSpace(options[0].Label) != "" {
|
||||||
|
label = options[0].Label
|
||||||
|
}
|
||||||
|
report = options[0].Report
|
||||||
|
}
|
||||||
|
|
||||||
|
var errs []error
|
||||||
|
addError := func(err error) {
|
||||||
|
if err == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
errs = append(errs, err)
|
||||||
|
if report != nil {
|
||||||
|
report(err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if err := unsupportedObjectKeysError(label, injection, globalInjectionKeys...); err != nil {
|
||||||
|
addError(err)
|
||||||
|
}
|
||||||
|
|
||||||
|
var groups globalConditionGroups
|
||||||
|
if raw, ok := injection["require_present"]; ok {
|
||||||
|
parsed, err := parseGlobalConditionList(label+" require_present", raw, false)
|
||||||
|
if err != nil {
|
||||||
|
addError(err)
|
||||||
|
} else {
|
||||||
|
groups.RequirePresent = parsed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if raw, ok := injection["any_present"]; ok {
|
||||||
|
parsed, err := parseGlobalConditionList(label+" any_present", raw, true)
|
||||||
|
if err != nil {
|
||||||
|
addError(err)
|
||||||
|
} else {
|
||||||
|
groups.AnyPresent = parsed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if raw, ok := injection["unless_present"]; ok {
|
||||||
|
parsed, err := parseGlobalConditionList(label+" unless_present", raw, false)
|
||||||
|
if err != nil {
|
||||||
|
addError(err)
|
||||||
|
} else {
|
||||||
|
groups.UnlessPresent = parsed
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return groups, errors.Join(errs...)
|
||||||
|
}
|
||||||
|
|
||||||
|
func parseGlobalConditionList(name string, raw any, requireNonEmpty bool) ([]globalCondition, error) {
|
||||||
|
if raw == nil {
|
||||||
|
return nil, fmt.Errorf("%s must be an array", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
conditions, ok := raw.([]any)
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("%s must be an array", name)
|
||||||
|
}
|
||||||
|
if requireNonEmpty && len(conditions) == 0 {
|
||||||
|
return nil, fmt.Errorf("%s must contain at least one condition", name)
|
||||||
|
}
|
||||||
|
|
||||||
|
parsed := make([]globalCondition, 0, len(conditions))
|
||||||
|
for index, rawCondition := range conditions {
|
||||||
|
condition, ok := rawCondition.(map[string]any)
|
||||||
|
if !ok {
|
||||||
|
return nil, fmt.Errorf("%s[%d] must be an object", name, index)
|
||||||
|
}
|
||||||
|
if err := unsupportedObjectKeysError(fmt.Sprintf("%s[%d]", name, index), condition, globalConditionKeys...); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
|
|
||||||
|
field, _ := condition["field"].(string)
|
||||||
|
field = strings.TrimSpace(field)
|
||||||
|
if field == "" {
|
||||||
|
return nil, fmt.Errorf("%s[%d].field is required", name, index)
|
||||||
|
}
|
||||||
|
|
||||||
|
id, _ := condition["id"].(string)
|
||||||
|
id = strings.TrimSpace(id)
|
||||||
|
if id == "" {
|
||||||
|
return nil, fmt.Errorf("%s[%d].id is required", name, index)
|
||||||
|
}
|
||||||
|
|
||||||
|
parsed = append(parsed, globalCondition{Field: field, ID: id})
|
||||||
|
}
|
||||||
|
return parsed, nil
|
||||||
|
}
|
||||||
|
|
||||||
|
func globalConditionGroupsMatch(groups globalConditionGroups, rows []map[string]any) bool {
|
||||||
|
for _, condition := range groups.RequirePresent {
|
||||||
|
if !globalReferencePresent(rows, condition.Field, condition.ID) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if groups.AnyPresent != nil {
|
||||||
|
if len(groups.AnyPresent) == 0 {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
matched := false
|
||||||
|
for _, condition := range groups.AnyPresent {
|
||||||
|
if globalReferencePresent(rows, condition.Field, condition.ID) {
|
||||||
|
matched = true
|
||||||
|
break
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if !matched {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
for _, condition := range groups.UnlessPresent {
|
||||||
|
if globalReferencePresent(rows, condition.Field, condition.ID) {
|
||||||
|
return false
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return true
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
+13
-42
@@ -460,7 +460,15 @@ func buildNativeUnchecked(p *project.Project, opts NativeBuildOptions, progress
|
|||||||
if err != nil {
|
if err != nil {
|
||||||
return BuildResult{}, err
|
return BuildResult{}, err
|
||||||
}
|
}
|
||||||
collected, err = applyPartOverrides(sourceDir, collected)
|
// Single explicit parts sequence: augment (inside applyAutogenConsumers) ->
|
||||||
|
// normalize -> apply overrides exactly once, all under the one configured
|
||||||
|
// parts_rows consumer's policy.
|
||||||
|
partsCfg := partsRowsConfigForProject(p)
|
||||||
|
collected, err = normalizePartsRowsACBonus(collected, partsCfg)
|
||||||
|
if err != nil {
|
||||||
|
return BuildResult{}, err
|
||||||
|
}
|
||||||
|
collected, err = applyPartOverridesWithConfig(sourceDir, collected, partsCfg)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return BuildResult{}, err
|
return BuildResult{}, err
|
||||||
}
|
}
|
||||||
@@ -3886,48 +3894,11 @@ func globalManifestPosition(module nativeGeneratedModule) (string, error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func globalInjectionConditionsMatch(injection map[string]any, rows []map[string]any) (bool, error) {
|
func globalInjectionConditionsMatch(injection map[string]any, rows []map[string]any) (bool, error) {
|
||||||
if rawRequired, ok := injection["require_present"]; ok {
|
groups, err := parseGlobalConditionGroups(injection)
|
||||||
matches, err := globalConditionListMatches("require_present", rawRequired, rows, true)
|
if err != nil {
|
||||||
if err != nil || !matches {
|
return false, err
|
||||||
return matches, err
|
|
||||||
}
|
}
|
||||||
}
|
return globalConditionGroupsMatch(groups, rows), nil
|
||||||
if rawBlocked, ok := injection["unless_present"]; ok {
|
|
||||||
matches, err := globalConditionListMatches("unless_present", rawBlocked, rows, false)
|
|
||||||
if err != nil || !matches {
|
|
||||||
return matches, err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true, nil
|
|
||||||
}
|
|
||||||
|
|
||||||
func globalConditionListMatches(name string, raw any, rows []map[string]any, required bool) (bool, error) {
|
|
||||||
conditions, ok := raw.([]any)
|
|
||||||
if !ok {
|
|
||||||
return false, fmt.Errorf("%s must be an array", name)
|
|
||||||
}
|
|
||||||
for index, rawCondition := range conditions {
|
|
||||||
condition, ok := rawCondition.(map[string]any)
|
|
||||||
if !ok {
|
|
||||||
return false, fmt.Errorf("%s[%d] must be an object", name, index)
|
|
||||||
}
|
|
||||||
field, _ := condition["field"].(string)
|
|
||||||
id, _ := condition["id"].(string)
|
|
||||||
if strings.TrimSpace(field) == "" {
|
|
||||||
return false, fmt.Errorf("%s[%d].field is required", name, index)
|
|
||||||
}
|
|
||||||
if strings.TrimSpace(id) == "" {
|
|
||||||
return false, fmt.Errorf("%s[%d].id is required", name, index)
|
|
||||||
}
|
|
||||||
found := globalReferencePresent(rows, field, id)
|
|
||||||
if required && !found {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
if !required && found {
|
|
||||||
return false, nil
|
|
||||||
}
|
|
||||||
}
|
|
||||||
return true, nil
|
|
||||||
}
|
}
|
||||||
|
|
||||||
func globalRowIdentityPresent(row map[string]any, rows []map[string]any) bool {
|
func globalRowIdentityPresent(row map[string]any, rows []map[string]any) bool {
|
||||||
|
|||||||
@@ -1,6 +1,8 @@
|
|||||||
package topdata
|
package topdata
|
||||||
|
|
||||||
import (
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
"testing"
|
"testing"
|
||||||
|
|
||||||
"git.westgate.pw/ShadowsOverWestgate/sow-tools/internal/project"
|
"git.westgate.pw/ShadowsOverWestgate/sow-tools/internal/project"
|
||||||
@@ -54,3 +56,45 @@ func TestParityGuardCDNChannelProducesAccessoryRows(t *testing.T) {
|
|||||||
t.Fatalf("PARITY GUARD: expected lock id for %s, got %#v", wantKey, got[0].LockData)
|
t.Fatalf("PARITY GUARD: expected lock id for %s, got %#v", wantKey, got[0].LockData)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// PARITY GUARD (parts): a bare project whose only parts source is the offline
|
||||||
|
// CDN-equivalent (SOW_PART_MANIFEST -> a part.yml), with no NWN_ROOT, no token,
|
||||||
|
// no asset checkout, must produce parts rows from the filtered inventory. If
|
||||||
|
// parts resolution ever drifts back into a wrapper, this fails.
|
||||||
|
func TestParityGuardCDNChannelProducesPartsRows(t *testing.T) {
|
||||||
|
root := testProjectRoot(t)
|
||||||
|
checkout := filepath.Join(root, "manifest-checkout")
|
||||||
|
if err := os.MkdirAll(filepath.Join(checkout, "assets"), 0o755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
writeFile(t, filepath.Join(checkout, "assets", "part.yml"),
|
||||||
|
"assets:\n - {path: part/belt/m/pfa0_belt017.mdl, restype: mdl}\n - {path: part/belt/m/pfa0_belt018.mdl, restype: mdl}\n")
|
||||||
|
t.Setenv("SOW_PART_MANIFEST", checkout)
|
||||||
|
t.Setenv("NWN_ROOT", "")
|
||||||
|
|
||||||
|
c := projectPartsConsumer()
|
||||||
|
c.Source = project.AutogenSourceConfig{
|
||||||
|
Kind: "cdn_channel",
|
||||||
|
ChannelsPath: "releases/haks/channels.json",
|
||||||
|
ManifestPath: "releases/haks/{tag}/part.yml",
|
||||||
|
ReleaseMarkerPath: "releases/haks/{tag}/haks.json",
|
||||||
|
OfflineOverrideEnv: "SOW_PART_MANIFEST",
|
||||||
|
}
|
||||||
|
|
||||||
|
p := testProject(root)
|
||||||
|
p.Config.Autogen.Consumers = []project.AutogenConsumerConfig{c}
|
||||||
|
|
||||||
|
collected := []nativeCollectedDataset{partsDatasetWithIDs("parts/belt", nil)}
|
||||||
|
|
||||||
|
got, err := applyAutogenConsumers(p, collected, nil)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("applyAutogenConsumers failed: %v", err)
|
||||||
|
}
|
||||||
|
ids := map[int]bool{}
|
||||||
|
for _, row := range got[0].Rows {
|
||||||
|
ids[row["id"].(int)] = true
|
||||||
|
}
|
||||||
|
if !ids[17] || !ids[18] {
|
||||||
|
t.Fatalf("PARITY GUARD: expected belt rows 17 and 18 from inventory, got %#v", got[0].Rows)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -0,0 +1,87 @@
|
|||||||
|
package topdata
|
||||||
|
|
||||||
|
import (
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.westgate.pw/ShadowsOverWestgate/sow-tools/internal/project"
|
||||||
|
)
|
||||||
|
|
||||||
|
func projectPartsConsumer() project.AutogenConsumerConfig {
|
||||||
|
return project.AutogenConsumerConfig{ID: "parts", Producer: "parts", Mode: "parts_rows"}
|
||||||
|
}
|
||||||
|
|
||||||
|
const partYML = `assets:
|
||||||
|
- {path: part/belt/m/pfa0_belt017.mdl, restype: mdl}
|
||||||
|
- {path: part/hand/m/pfh0_handl105.mdl, restype: mdl}
|
||||||
|
- {path: part/hand/m/pfh0_handr105.mdl, restype: mdl}
|
||||||
|
- {path: part/leg/m/pfa0_legl001.mdl, restype: mdl}
|
||||||
|
- {path: part/leg/m/pfa0_legr001.mdl, restype: mdl}
|
||||||
|
- {path: part/cloak/m/cloak001.mdl, restype: mdl}
|
||||||
|
- {path: part/belt/m/readme.txt, restype: txt}
|
||||||
|
`
|
||||||
|
|
||||||
|
func TestFilterPartsKeepsSupportedDedupsVariants(t *testing.T) {
|
||||||
|
consumer := projectPartsConsumer()
|
||||||
|
entries, err := filterCDNChannelEntries([]byte(partYML), consumer)
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("filter: %v", err)
|
||||||
|
}
|
||||||
|
inv := autogenPartsInventory(entries)
|
||||||
|
if _, ok := inv["belt"][17]; !ok {
|
||||||
|
t.Errorf("missing belt 17")
|
||||||
|
}
|
||||||
|
if len(inv["hand"]) != 1 {
|
||||||
|
t.Errorf("hand should dedup l/r to 1 row, got %d", len(inv["hand"]))
|
||||||
|
}
|
||||||
|
if _, ok := inv["hand"][105]; !ok {
|
||||||
|
t.Errorf("missing hand 105")
|
||||||
|
}
|
||||||
|
if len(inv["leg"]) != 1 {
|
||||||
|
t.Errorf("leg should dedup l/r to 1 row, got %d", len(inv["leg"]))
|
||||||
|
}
|
||||||
|
if _, ok := inv["cloak"]; ok {
|
||||||
|
t.Errorf("cloak must be ignored")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterPartsRejectsZeroAccepted(t *testing.T) {
|
||||||
|
_, err := filterCDNChannelEntries([]byte("assets:\n - {path: part/cloak/m/cloak001.mdl, restype: mdl}\n"), projectPartsConsumer())
|
||||||
|
if err == nil {
|
||||||
|
t.Fatal("expected hard error on zero accepted part rows")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterPartsRejectsRowZeroAndNonNumeric(t *testing.T) {
|
||||||
|
for _, doc := range []string{
|
||||||
|
"assets:\n - {path: part/belt/m/pfa0_belt000.mdl, restype: mdl}\n",
|
||||||
|
"assets:\n - {path: part/belt/m/pfa0_belt.mdl, restype: mdl}\n",
|
||||||
|
} {
|
||||||
|
if _, err := filterCDNChannelEntries([]byte(doc), projectPartsConsumer()); err == nil {
|
||||||
|
t.Fatalf("expected error for %q", doc)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestFilterPartsRejectsMalformedAndMissingAssets(t *testing.T) {
|
||||||
|
if _, err := filterCDNChannelEntries([]byte("assets:\n - path: [unterminated"), projectPartsConsumer()); err == nil {
|
||||||
|
t.Fatal("expected malformed error")
|
||||||
|
}
|
||||||
|
if _, err := filterCDNChannelEntries([]byte("other: 1\n"), projectPartsConsumer()); err == nil {
|
||||||
|
t.Fatal("expected no-assets error")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestSupportedPartCategoriesCoverTwelveDatasets(t *testing.T) {
|
||||||
|
want := []string{"belt", "bicep", "chest", "foot", "forearm", "hand", "leg", "neck", "pelvis", "robe", "shin", "shoulder"}
|
||||||
|
for _, c := range want {
|
||||||
|
if !isSupportedPartCategory(c) {
|
||||||
|
t.Errorf("category %q not supported", c)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if partDatasetToAssetCategory["hand"] != "hand" {
|
||||||
|
t.Errorf("parts/hand must map to asset category hand")
|
||||||
|
}
|
||||||
|
if partDatasetToAssetCategory["legs"] != "leg" {
|
||||||
|
t.Errorf("parts/legs must map to asset category leg")
|
||||||
|
}
|
||||||
|
}
|
||||||
@@ -21,6 +21,7 @@ var supportedPartCategories = []string{
|
|||||||
"chest",
|
"chest",
|
||||||
"foot",
|
"foot",
|
||||||
"forearm",
|
"forearm",
|
||||||
|
"hand",
|
||||||
"leg",
|
"leg",
|
||||||
"neck",
|
"neck",
|
||||||
"pelvis",
|
"pelvis",
|
||||||
@@ -35,6 +36,7 @@ var partDatasetToAssetCategory = map[string]string{
|
|||||||
"chest": "chest",
|
"chest": "chest",
|
||||||
"foot": "foot",
|
"foot": "foot",
|
||||||
"forearm": "forearm",
|
"forearm": "forearm",
|
||||||
|
"hand": "hand",
|
||||||
"legs": "leg",
|
"legs": "leg",
|
||||||
"neck": "neck",
|
"neck": "neck",
|
||||||
"pelvis": "pelvis",
|
"pelvis": "pelvis",
|
||||||
@@ -390,6 +392,18 @@ func applyPartOverrides(sourceDir string, collected []nativeCollectedDataset) ([
|
|||||||
return applyPartOverridesWithConfig(sourceDir, collected, project.PartsRowsConfig{})
|
return applyPartOverridesWithConfig(sourceDir, collected, project.PartsRowsConfig{})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// partsRowsConfigForProject returns the PartsRows policy of the single configured
|
||||||
|
// parts_rows autogen consumer, or the zero value if none. Project validation
|
||||||
|
// guarantees at most one parts_rows consumer, so the first match is canonical.
|
||||||
|
func partsRowsConfigForProject(p *project.Project) project.PartsRowsConfig {
|
||||||
|
for _, c := range p.Config.Autogen.Consumers {
|
||||||
|
if strings.TrimSpace(c.Mode) == "parts_rows" {
|
||||||
|
return c.PartsRows
|
||||||
|
}
|
||||||
|
}
|
||||||
|
return project.PartsRowsConfig{}
|
||||||
|
}
|
||||||
|
|
||||||
func applyPartOverridesWithConfig(sourceDir string, collected []nativeCollectedDataset, cfg project.PartsRowsConfig) ([]nativeCollectedDataset, error) {
|
func applyPartOverridesWithConfig(sourceDir string, collected []nativeCollectedDataset, cfg project.PartsRowsConfig) ([]nativeCollectedDataset, error) {
|
||||||
result := make([]nativeCollectedDataset, len(collected))
|
result := make([]nativeCollectedDataset, len(collected))
|
||||||
copy(result, collected)
|
copy(result, collected)
|
||||||
@@ -430,9 +444,7 @@ func applyPartOverridesWithConfig(sourceDir string, collected []nativeCollectedD
|
|||||||
}
|
}
|
||||||
row, ok := rowByID[rowID]
|
row, ok := rowByID[rowID]
|
||||||
if !ok {
|
if !ok {
|
||||||
row = createDefaultPartRowForDataset(rowID, dataset.Dataset.Name, dataset.Columns, cfg)
|
return nil, fmt.Errorf("parts/%s override %d targets row id %d which is neither a baseline row nor a discovered model row; author the row in data/parts/%s.json instead", category, index, rowID, category)
|
||||||
rows = append(rows, row)
|
|
||||||
rowByID[rowID] = row
|
|
||||||
}
|
}
|
||||||
for field, value := range override {
|
for field, value := range override {
|
||||||
if field == "id" {
|
if field == "id" {
|
||||||
|
|||||||
@@ -0,0 +1,51 @@
|
|||||||
|
package topdata
|
||||||
|
|
||||||
|
import (
|
||||||
|
"os"
|
||||||
|
"path/filepath"
|
||||||
|
"testing"
|
||||||
|
|
||||||
|
"git.westgate.pw/ShadowsOverWestgate/sow-tools/internal/project"
|
||||||
|
)
|
||||||
|
|
||||||
|
func partsDatasetWithIDs(name string, ids []int) nativeCollectedDataset {
|
||||||
|
rows := make([]map[string]any, 0, len(ids))
|
||||||
|
for _, id := range ids {
|
||||||
|
rows = append(rows, map[string]any{"id": id, "COSTMODIFIER": "0", "ACBONUS": "0.00"})
|
||||||
|
}
|
||||||
|
return nativeCollectedDataset{
|
||||||
|
Dataset: nativeDataset{Name: name, Kind: nativeDatasetBase},
|
||||||
|
Columns: []string{"COSTMODIFIER", "ACBONUS"},
|
||||||
|
Rows: rows,
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestApplyPartOverridesRejectsOrphan(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
if err := os.MkdirAll(filepath.Join(dir, "data", "parts", "overrides"), 0o755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
writeFile(t, filepath.Join(dir, "data", "parts", "overrides", "belt.json"),
|
||||||
|
`{"overrides": [{"id": 999, "COSTMODIFIER": "5"}]}`)
|
||||||
|
collected := []nativeCollectedDataset{partsDatasetWithIDs("parts/belt", []int{17})}
|
||||||
|
if _, err := applyPartOverridesWithConfig(dir, collected, project.PartsRowsConfig{}); err == nil {
|
||||||
|
t.Fatal("expected orphan override to fail, not synthesize a row")
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
func TestApplyPartOverridesUpdatesDiscoveredRow(t *testing.T) {
|
||||||
|
dir := t.TempDir()
|
||||||
|
if err := os.MkdirAll(filepath.Join(dir, "data", "parts", "overrides"), 0o755); err != nil {
|
||||||
|
t.Fatal(err)
|
||||||
|
}
|
||||||
|
writeFile(t, filepath.Join(dir, "data", "parts", "overrides", "belt.json"),
|
||||||
|
`{"overrides": [{"id": 17, "COSTMODIFIER": "5"}]}`)
|
||||||
|
collected := []nativeCollectedDataset{partsDatasetWithIDs("parts/belt", []int{17})}
|
||||||
|
out, err := applyPartOverridesWithConfig(dir, collected, project.PartsRowsConfig{})
|
||||||
|
if err != nil {
|
||||||
|
t.Fatalf("override: %v", err)
|
||||||
|
}
|
||||||
|
if got := out[0].Rows[0]["COSTMODIFIER"]; got != "5" {
|
||||||
|
t.Fatalf("row 17 COSTMODIFIER want 5, got %v", got)
|
||||||
|
}
|
||||||
|
}
|
||||||
+59
-73
@@ -333,6 +333,17 @@ func validateDuplicateJSONKeys(path string, raw []byte, report *ValidationReport
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func reportTopdataContractError(path string, err error, report *ValidationReport) {
|
||||||
|
if err == nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
|
Severity: SeverityError,
|
||||||
|
Path: path,
|
||||||
|
Message: err.Error(),
|
||||||
|
})
|
||||||
|
}
|
||||||
|
|
||||||
func scanJSONValueForDuplicateKeys(decoder *json.Decoder, path string, report *ValidationReport) error {
|
func scanJSONValueForDuplicateKeys(decoder *json.Decoder, path string, report *ValidationReport) error {
|
||||||
token, err := decoder.Token()
|
token, err := decoder.Token()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
@@ -425,35 +436,40 @@ func validateDataObject(path string, obj map[string]any, report *ValidationRepor
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
if base == "base.json" {
|
if base == "base.json" {
|
||||||
|
reportTopdataContractError(path, unsupportedObjectKeysError("base.json root", obj, baseOrPlainRootKeys...), report)
|
||||||
validateRowsFile(path, obj, report, true)
|
validateRowsFile(path, obj, report, true)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if inModules {
|
if inModules {
|
||||||
if _, hasEntries := obj["entries"]; hasEntries {
|
reportTopdataContractError(path, unsupportedObjectKeysError("module root", obj, canonicalModuleRootKeys...), report)
|
||||||
validateEntriesFile(path, obj, report)
|
_, hasColumns := obj["columns"]
|
||||||
return
|
_, hasEntries := obj["entries"]
|
||||||
}
|
_, hasOverrides := obj["overrides"]
|
||||||
if _, hasOverrides := obj["overrides"]; hasOverrides {
|
_, hasRows := obj["rows"]
|
||||||
validateOverridesFile(path, obj, report)
|
if hasColumns {
|
||||||
return
|
|
||||||
}
|
|
||||||
if _, hasRows := obj["rows"]; hasRows {
|
|
||||||
validateRowsFile(path, obj, report, false)
|
|
||||||
return
|
|
||||||
}
|
|
||||||
if _, hasColumns := obj["columns"]; hasColumns {
|
|
||||||
validateColumnsFile(path, obj, report)
|
validateColumnsFile(path, obj, report)
|
||||||
return
|
|
||||||
}
|
}
|
||||||
|
if hasEntries {
|
||||||
|
validateEntriesFileWithColumns(path, obj, report, false)
|
||||||
|
}
|
||||||
|
if hasOverrides {
|
||||||
|
validateOverridesFileWithColumns(path, obj, report, false)
|
||||||
|
}
|
||||||
|
if hasRows {
|
||||||
|
validateRowsFileWithColumns(path, obj, report, false, false)
|
||||||
|
}
|
||||||
|
if !hasColumns && !hasEntries && !hasOverrides && !hasRows {
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
Severity: SeverityWarning,
|
Severity: SeverityWarning,
|
||||||
Path: path,
|
Path: path,
|
||||||
Message: "module file does not use a recognized canonical shape yet; expected one of columns, entries, overrides, or rows",
|
Message: "module file does not use a recognized canonical shape yet; expected one of columns, entries, overrides, or rows",
|
||||||
})
|
})
|
||||||
|
}
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
if _, hasRows := obj["rows"]; hasRows {
|
if _, hasRows := obj["rows"]; hasRows {
|
||||||
|
reportTopdataContractError(path, unsupportedObjectKeysError("plain rows root", obj, baseOrPlainRootKeys...), report)
|
||||||
validateRowsFile(path, obj, report, false)
|
validateRowsFile(path, obj, report, false)
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
@@ -516,6 +532,7 @@ func datasetInvariantForPath(dataPath topdataDataPath) (datasetValidationInvaria
|
|||||||
}
|
}
|
||||||
|
|
||||||
func validateDatasetInvariantBaseFile(path string, obj map[string]any, invariant datasetValidationInvariant, report *ValidationReport) {
|
func validateDatasetInvariantBaseFile(path string, obj map[string]any, invariant datasetValidationInvariant, report *ValidationReport) {
|
||||||
|
reportTopdataContractError(path, unsupportedObjectKeysError("base.json root", obj, baseOrPlainRootKeys...), report)
|
||||||
validateRowsFile(path, obj, report, true)
|
validateRowsFile(path, obj, report, true)
|
||||||
validateDerivedBaseOutput(path, obj, invariant.Name, report)
|
validateDerivedBaseOutput(path, obj, invariant.Name, report)
|
||||||
validateRequiredColumns(path, obj, invariant, report)
|
validateRequiredColumns(path, obj, invariant, report)
|
||||||
@@ -826,6 +843,10 @@ func validateLockObject(path string, obj map[string]any, report *ValidationRepor
|
|||||||
}
|
}
|
||||||
|
|
||||||
func validateRowsFile(path string, obj map[string]any, report *ValidationReport, requireColumns bool) {
|
func validateRowsFile(path string, obj map[string]any, report *ValidationReport, requireColumns bool) {
|
||||||
|
validateRowsFileWithColumns(path, obj, report, requireColumns, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateRowsFileWithColumns(path string, obj map[string]any, report *ValidationReport, requireColumns bool, validateColumns bool) {
|
||||||
rows, ok := obj["rows"]
|
rows, ok := obj["rows"]
|
||||||
if !ok {
|
if !ok {
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
@@ -845,7 +866,7 @@ func validateRowsFile(path string, obj map[string]any, report *ValidationReport,
|
|||||||
if rowsList, ok := rows.([]any); ok {
|
if rowsList, ok := rows.([]any); ok {
|
||||||
validateRowCollection(path, obj, rowsList, report)
|
validateRowCollection(path, obj, rowsList, report)
|
||||||
}
|
}
|
||||||
if _, ok := obj["columns"]; ok {
|
if _, ok := obj["columns"]; ok && validateColumns {
|
||||||
validateColumnsFile(path, obj, report)
|
validateColumnsFile(path, obj, report)
|
||||||
} else if requireColumns {
|
} else if requireColumns {
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
@@ -896,6 +917,10 @@ func validateColumnsFile(path string, obj map[string]any, report *ValidationRepo
|
|||||||
}
|
}
|
||||||
|
|
||||||
func validateEntriesFile(path string, obj map[string]any, report *ValidationReport) {
|
func validateEntriesFile(path string, obj map[string]any, report *ValidationReport) {
|
||||||
|
validateEntriesFileWithColumns(path, obj, report, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateEntriesFileWithColumns(path string, obj map[string]any, report *ValidationReport, validateColumns bool) {
|
||||||
entries, ok := obj["entries"]
|
entries, ok := obj["entries"]
|
||||||
if !ok {
|
if !ok {
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
@@ -931,12 +956,16 @@ func validateEntriesFile(path string, obj map[string]any, report *ValidationRepo
|
|||||||
validateInlineTextUsage(path, key, entry, report)
|
validateInlineTextUsage(path, key, entry, report)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
if _, ok := obj["columns"]; ok {
|
if _, ok := obj["columns"]; ok && validateColumns {
|
||||||
validateColumnsFile(path, obj, report)
|
validateColumnsFile(path, obj, report)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func validateOverridesFile(path string, obj map[string]any, report *ValidationReport) {
|
func validateOverridesFile(path string, obj map[string]any, report *ValidationReport) {
|
||||||
|
validateOverridesFileWithColumns(path, obj, report, true)
|
||||||
|
}
|
||||||
|
|
||||||
|
func validateOverridesFileWithColumns(path string, obj map[string]any, report *ValidationReport, validateColumns bool) {
|
||||||
overrides, ok := obj["overrides"]
|
overrides, ok := obj["overrides"]
|
||||||
if !ok {
|
if !ok {
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
@@ -957,20 +986,21 @@ func validateOverridesFile(path string, obj map[string]any, report *ValidationRe
|
|||||||
container := map[string]any{"rows": overrideList}
|
container := map[string]any{"rows": overrideList}
|
||||||
validateRowCollection(path, container, overrideList, report)
|
validateRowCollection(path, container, overrideList, report)
|
||||||
}
|
}
|
||||||
if _, ok := obj["columns"]; ok {
|
if _, ok := obj["columns"]; ok && validateColumns {
|
||||||
validateColumnsFile(path, obj, report)
|
validateColumnsFile(path, obj, report)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func validateGlobalJSONFile(path string, obj map[string]any, report *ValidationReport) {
|
func validateGlobalJSONFile(path string, obj map[string]any, report *ValidationReport) {
|
||||||
|
reportTopdataContractError(path, unsupportedObjectKeysError("global.json root", obj, globalRootKeys...), report)
|
||||||
if _, ok := obj["columns"]; ok {
|
if _, ok := obj["columns"]; ok {
|
||||||
validateColumnsFile(path, obj, report)
|
validateColumnsFile(path, obj, report)
|
||||||
}
|
}
|
||||||
if _, ok := obj["entries"]; ok {
|
if _, ok := obj["entries"]; ok {
|
||||||
validateEntriesFile(path, obj, report)
|
validateEntriesFileWithColumns(path, obj, report, false)
|
||||||
}
|
}
|
||||||
if _, ok := obj["overrides"]; ok {
|
if _, ok := obj["overrides"]; ok {
|
||||||
validateOverridesFile(path, obj, report)
|
validateOverridesFileWithColumns(path, obj, report, false)
|
||||||
}
|
}
|
||||||
if _, ok := obj["defaults"]; ok {
|
if _, ok := obj["defaults"]; ok {
|
||||||
validateGlobalDefaults(path, obj, report)
|
validateGlobalDefaults(path, obj, report)
|
||||||
@@ -1029,8 +1059,12 @@ func validateGlobalJSONFile(path string, obj map[string]any, report *ValidationR
|
|||||||
} else {
|
} else {
|
||||||
rows = append(rows, row)
|
rows = append(rows, row)
|
||||||
}
|
}
|
||||||
validateGlobalConditionList(path, fmt.Sprintf("global injection %d require_present", index), injection["require_present"], report)
|
_, _ = parseGlobalConditionGroups(injection, globalConditionParseOptions{
|
||||||
validateGlobalConditionList(path, fmt.Sprintf("global injection %d unless_present", index), injection["unless_present"], report)
|
Label: fmt.Sprintf("global injection %d", index),
|
||||||
|
Report: func(err error) {
|
||||||
|
reportTopdataContractError(path, err, report)
|
||||||
|
},
|
||||||
|
})
|
||||||
}
|
}
|
||||||
validateRowCollection(path, obj, rows, report)
|
validateRowCollection(path, obj, rows, report)
|
||||||
}
|
}
|
||||||
@@ -1099,6 +1133,7 @@ func validateGlobalDefaults(path string, obj map[string]any, report *ValidationR
|
|||||||
})
|
})
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
|
reportTopdataContractError(path, unsupportedObjectKeysError(fmt.Sprintf("global default %d", index), defaultRule, globalDefaultRuleKeys...), report)
|
||||||
validateGlobalDefaultMatch(path, index, defaultRule["match"], report)
|
validateGlobalDefaultMatch(path, index, defaultRule["match"], report)
|
||||||
rawValues, ok := defaultRule["values"]
|
rawValues, ok := defaultRule["values"]
|
||||||
if !ok {
|
if !ok {
|
||||||
@@ -1155,15 +1190,13 @@ func validateGlobalDefaultMatch(path string, index int, rawMatch any, report *Va
|
|||||||
})
|
})
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
for key := range match {
|
for _, key := range unsupportedObjectKeys(match, globalDefaultMatchKeys...) {
|
||||||
if key != "source" {
|
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
Severity: SeverityError,
|
Severity: SeverityError,
|
||||||
Path: path,
|
Path: path,
|
||||||
Message: fmt.Sprintf("global default %d match.%s is not supported", index, key),
|
Message: fmt.Sprintf("global default %d match.%s is not supported (unsupported key; supported keys: %s)", index, key, strings.Join(globalDefaultMatchKeys, ", ")),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
}
|
|
||||||
source, ok := match["source"].(string)
|
source, ok := match["source"].(string)
|
||||||
if !ok || strings.TrimSpace(source) == "" {
|
if !ok || strings.TrimSpace(source) == "" {
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
@@ -1193,14 +1226,7 @@ func validateGlobalDefaultValue(path string, index int, field string, value any,
|
|||||||
if !hasFormat {
|
if !hasFormat {
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if len(obj) != 1 {
|
reportTopdataContractError(path, unsupportedObjectKeysError(fmt.Sprintf("global default %d values.%s", index, field), obj, globalDefaultFormatKeys...), report)
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
|
||||||
Severity: SeverityError,
|
|
||||||
Path: path,
|
|
||||||
Message: fmt.Sprintf("global default %d values.%s format object must contain only format", index, field),
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
format, ok := rawFormat.(string)
|
format, ok := rawFormat.(string)
|
||||||
if !ok {
|
if !ok {
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
||||||
@@ -1220,46 +1246,6 @@ func validateGlobalDefaultValue(path string, index int, field string, value any,
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
func validateGlobalConditionList(path, label string, raw any, report *ValidationReport) {
|
|
||||||
if raw == nil {
|
|
||||||
return
|
|
||||||
}
|
|
||||||
conditions, ok := raw.([]any)
|
|
||||||
if !ok {
|
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
|
||||||
Severity: SeverityError,
|
|
||||||
Path: path,
|
|
||||||
Message: fmt.Sprintf("%s must be a JSON array", label),
|
|
||||||
})
|
|
||||||
return
|
|
||||||
}
|
|
||||||
for index, rawCondition := range conditions {
|
|
||||||
condition, ok := rawCondition.(map[string]any)
|
|
||||||
if !ok {
|
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
|
||||||
Severity: SeverityError,
|
|
||||||
Path: path,
|
|
||||||
Message: fmt.Sprintf("%s[%d] must be an object", label, index),
|
|
||||||
})
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
if field, ok := condition["field"].(string); !ok || strings.TrimSpace(field) == "" {
|
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
|
||||||
Severity: SeverityError,
|
|
||||||
Path: path,
|
|
||||||
Message: fmt.Sprintf("%s[%d].field is required", label, index),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
if id, ok := condition["id"].(string); !ok || strings.TrimSpace(id) == "" {
|
|
||||||
report.Diagnostics = append(report.Diagnostics, Diagnostic{
|
|
||||||
Severity: SeverityError,
|
|
||||||
Path: path,
|
|
||||||
Message: fmt.Sprintf("%s[%d].id is required", label, index),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
func validateStateObject(path string, obj map[string]any, report *ValidationReport) {
|
func validateStateObject(path string, obj map[string]any, report *ValidationReport) {
|
||||||
entries, ok := obj["entries"].(map[string]any)
|
entries, ok := obj["entries"].(map[string]any)
|
||||||
if !ok {
|
if !ok {
|
||||||
|
|||||||
Reference in New Issue
Block a user