cof-cli 1.0.0__tar.gz → 1.0.1__tar.gz

{cof_cli-1.0.0 → cof_cli-1.0.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cof-cli
-Version: 1.0.0
+Version: 1.0.1
 Summary: COF — Character Open File: validate, pack, unpack and convert .cof character containers
 Author: Yann Souetre
 License-Expression: MIT

{cof_cli-1.0.0 → cof_cli-1.0.1}/cof_cli/__init__.py

@@ -1,5 +1,5 @@
 """cof-cli — reference tooling for COF (Character Open File)."""
 
-__version__ = "1.0.0"
+__version__ = "1.0.1"
 MIMETYPE = "application/vnd.cof.character+zip"
 SPEC_VERSION = "1.0"

{cof_cli-1.0.0 → cof_cli-1.0.1}/cof_cli/model.py

@@ -17,6 +17,12 @@ KINDS = {
 }
 # categories that are LIBRARIES in a preset: several variants of any kind, none mandatory at inference
 LIBRARY_CATEGORIES = {"posture", "motion", "files"}
+
+
+def is_library(cat: str) -> bool:
+    """Library regime (SPEC § 2.3): posture, motion, files — and every category this version does not know
+    (`x-` categories, and categories added by a later 1.x minor), which are libraries unless an RFC says otherwise."""
+    return cat in LIBRARY_CATEGORIES or cat not in CATEGORIES
 # kinds that may appear several times in one preset (subject to region rules)
 MULTI_KINDS = {"clothing", "accessory", "pilosity", "feature", "environment"}
 
@@ -452,7 +458,7 @@ def region_conflicts(res: dict[str, list[dict]]) -> list[str]:
 def single_kind_violations(res: dict[str, list[dict]]) -> list[str]:
     out = []
     for cat, lst in res.items():
-        if cat in LIBRARY_CATEGORIES:
+        if is_library(cat):
             continue
         seen = {}
         for v in lst:

{cof_cli-1.0.0 → cof_cli-1.0.1}/cof_cli/validate.py

@@ -180,12 +180,23 @@ def validate_manifest(manifest: dict, rep: Report, newer: bool = False) -> None:
         loc = "/".join(str(p) for p in e.path) or "(root)"
         if newer and (e.validator == "enum" or (e.validator == "additionalProperties")):
             rep.warnings.append(f"manifest.json [{loc}]: {_schema_msg(e)} (value or field from a later 1.x version — kept, not checked)")
+        elif newer and _later_category(e):
+            rep.warnings.append(f"manifest.json [{loc}]: category '{e.instance}' comes from a later 1.x version — kept as a library, its variants are not checked")
         elif e.validator == "required" and "'presets'" in e.message:
             rep.errors.append(f"manifest.json [{loc}]: {_schema_msg(e)} — a file declares at least one preset (`cof migrate` adds 'default')")
         else:
             rep.errors.append(f"manifest.json [{loc}]: {_schema_msg(e)}")
 
 
+def _later_category(e) -> bool:
+    """A key of `elements`, or of a preset's `slots` / `alternatives`, that the 1.0 schema's category pattern rejects:
+    in a later-minor file it is a category this validator does not know (SPEC § 12: warn, never refuse)."""
+    path = [str(p) for p in e.path]
+    if e.validator != "pattern" or not isinstance(e.instance, str):
+        return False
+    return path == ["elements"] or (len(path) == 3 and path[0] == "presets" and path[2] in ("slots", "alternatives"))
+
+
 def validate_card(card: dict, rep: Report, lang: str, where: str) -> dict:
     tokens = {}
     if card.get("spec") not in ("chara_card_v3", "chara_card_v2"):

{cof_cli-1.0.0 → cof_cli-1.0.1}/cof_cli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cof-cli
-Version: 1.0.0
+Version: 1.0.1
 Summary: COF — Character Open File: validate, pack, unpack and convert .cof character containers
 Author: Yann Souetre
 License-Expression: MIT

{cof_cli-1.0.0 → cof_cli-1.0.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "cof-cli"
-version = "1.0.0"
+version = "1.0.1"
 description = "COF — Character Open File: validate, pack, unpack and convert .cof character containers"
 readme = "README.md"
 license = "MIT"

{cof_cli-1.0.0 → cof_cli-1.0.1}/tests/test_roundtrip.py

@@ -812,3 +812,43 @@ def test_age_tags_only_for_human_shapes():
     assert "child" not in t and "has-minor-preset" not in t and "mechanical" in t
     t2 = auto_tags(json.loads((ROOT / "spec/examples/02-ecoliere/manifest.json").read_text("utf-8")))
     assert "child" in t2
+
+
+def _with_later_category(m: dict, cat: str) -> dict:
+    """Add a category this validator does not know, with two variants of one kind, listed by the default preset."""
+    m["elements"][cat] = {"variants": {"n1": {"kind": "note", "label": "One"}, "n2": {"kind": "note", "label": "Two"}}}
+    m["presets"]["default"].setdefault("slots", {})[cat] = ["n1", "n2"]
+    return m
+
+
+def test_later_minor_category_is_a_warning_and_a_library(workdir):
+    """SPEC § 12: a validator of an earlier minor treats what a later 1.x adds as a warning, never a reason to refuse;
+    SPEC § 2.3: categories it does not know are libraries (several variants of one kind are allowed)."""
+    mp = workdir / "manifest.json"
+    m = _with_later_category(json.loads(mp.read_text("utf-8")), "sketches")
+    m["cof"] = "1.9"
+    mp.write_text(json.dumps(m), "utf-8")
+    rep = Report()
+    validate_dir(workdir, rep, recompute=False)
+    assert rep.ok, rep.errors
+    assert any("sketches" in w and "later 1.x" in w for w in rep.warnings), rep.warnings
+
+
+def test_x_category_is_a_library(workdir):
+    """`x-` categories are accepted by the 1.0 schema and are libraries unless an RFC says otherwise (SPEC § 2.3)."""
+    mp = workdir / "manifest.json"
+    m = _with_later_category(json.loads(mp.read_text("utf-8")), "x-notes")
+    mp.write_text(json.dumps(m), "utf-8")
+    rep = Report()
+    validate_dir(workdir, rep, recompute=False)
+    assert rep.ok, rep.errors
+
+
+def test_unknown_category_in_a_1_0_file_is_an_error(workdir):
+    """A file that declares 1.0 cannot use a category the 1.0 schema does not define."""
+    mp = workdir / "manifest.json"
+    m = _with_later_category(json.loads(mp.read_text("utf-8")), "sketches")
+    mp.write_text(json.dumps(m), "utf-8")
+    rep = Report()
+    validate_dir(workdir, rep, recompute=False)
+    assert not rep.ok and any("sketches" in e for e in rep.errors)