fix: address CodeRabbit MAJOR review comments (PR #20)

- entities/store: rename graph relation key `schema_id` -> `type_id`
  to match GTS spec v0.10+ terminology (v0.13 rebase); update tests
- x_gts_ref: avoid redundant `_without_x_gts_ref` recomputation in the
  combinator-stripping path to prevent exponential recursion on deep
  single-branch allOf/anyOf/oneOf chains
- Makefile: set `SHELL := /bin/bash` so POSIX recipes don't fall back
  to cmd.exe via COMSPEC on Windows

Signed-off-by: Artfizer <artifizer@gmail.com>

Author: Artifizer

Makefile

@@ -1,5 +1,11 @@
 CI := 1
 
+# These recipes rely on POSIX tools (command -v, touch, rm -rf, sleep, kill,
+# cat) and POSIX syntax (background jobs, inline env assignments). Require Bash
+# explicitly so GNU Make does not fall back to cmd.exe via COMSPEC on Windows.
+# On Windows, run these targets from a Bash environment (e.g. Git Bash / MSYS2).
+SHELL := /bin/bash
+
 # Python: PYTHON_BOOTSTRAP is used only to create the virtual environment;
 # PYTHON is the venv interpreter used by all other targets.
 PYTHON_BOOTSTRAP ?= $(shell command -v python3 2>/dev/null || command -v python 2>/dev/null || echo python3)

gts/src/gts/entities.py

@@ -379,4 +379,4 @@ def get_graph(self) -> dict[str, set[str]]:
         refs = {}
         for r in self.gts_refs:
             refs[r["sourcePath"]] = r["id"]
-        return {"id": self.gts_id.id, "schema_id": self.type_id, "refs": refs}
+        return {"id": self.gts_id.id, "type_id": self.type_id, "refs": refs}

gts/src/gts/store.py

@@ -867,7 +867,7 @@ def gts2node(gts_id: str, seen_gts_ids: set[str]) -> str:
                     if not entity.type_id.startswith(
                         "http://json-schema.org"
                     ) and not entity.type_id.startswith("https://json-schema.org"):
-                        ret["schema_id"] = gts2node(entity.type_id, seen_gts_ids)
+                        ret["type_id"] = gts2node(entity.type_id, seen_gts_ids)
                 else:
                     ret["errors"] = ret.get("errors", []) + ["Schema not recognized"]
             else:

gts/src/gts/x_gts_ref.py

@@ -27,8 +27,12 @@ def _without_x_gts_ref(schema: Any) -> Any:
             if key != "x-gts-ref"
         }
         for keyword in ("oneOf", "anyOf", "allOf"):
-            branches = schema.get(keyword)
-            if isinstance(branches, list) and _is_x_gts_ref_only_combinator(branches):
+            branches = stripped.get(keyword)
+            if (
+                isinstance(branches, list)
+                and branches
+                and all(isinstance(branch, dict) and not branch for branch in branches)
+            ):
                 stripped.pop(keyword, None)
         return stripped
     if isinstance(schema, list):
@@ -37,10 +41,13 @@ def _without_x_gts_ref(schema: Any) -> Any:
 
 
 def _is_x_gts_ref_only_combinator(branches: list[Any]) -> bool:
-    return bool(branches) and all(
-        isinstance(_without_x_gts_ref(branch), dict) and not _without_x_gts_ref(branch)
-        for branch in branches
-    )
+    if not branches:
+        return False
+    for branch in branches:
+        stripped = _without_x_gts_ref(branch)
+        if not isinstance(stripped, dict) or stripped:
+            return False
+    return True
 
 
 def _is_structurally_valid(instance: Any, schema: Any) -> bool:

tests/test_entities.py

@@ -335,5 +335,5 @@ def test_get_graph_basic(self):
 
         graph = entity.get_graph()
         assert graph["id"] == "gts.vendor.package.namespace.type.v1~"
-        assert graph["schema_id"] == "gts.vendor.package.namespace.type.v1~"
+        assert graph["type_id"] == "gts.vendor.package.namespace.type.v1~"
         assert "refs" in graph

tests/test_store_extra.py

@@ -306,7 +306,7 @@ def test_is_minor_compatible_valid(self):
 
 
 class TestBuildSchemaGraphWithRefs:
-    def test_graph_includes_refs_and_schema_id(self):
+    def test_graph_includes_refs_and_type_id(self):
         schema = _schema_entity("gts.x.test._.foo.v1~")
         instance = GtsEntity(
             content={
@@ -321,7 +321,7 @@ def test_graph_includes_refs_and_schema_id(self):
         store.register(instance)
         graph = store.build_schema_graph(instance.gts_id.id)
         assert graph["id"] == instance.gts_id.id
-        assert "schema_id" in graph
+        assert "type_id" in graph
 
     def test_graph_skips_json_schema_org_refs(self):
         schema = _schema_entity("gts.x.test._.foo.v1~")