some broken code

Author: braingram

asdf/_tests/test_schema.py

@@ -814,6 +814,11 @@ def test_self_reference_resolution(test_data_path):
     assert s["anyOf"][1] == s["anyOf"][0]
 
 
+def test_resolve_references():
+    s = schema.load_schema("http://stsci.edu/schemas/asdf/core/ndarray-1.0.0", resolve_references=True)
+    assert "$ref" not in repr(s)
+
+
 def test_schema_resolved_via_entry_points():
     """Test that entry points mappings to core schema works"""
     tag = "tag:stsci.edu:asdf/fits/fits-1.0.0"

asdf/schema.py

@@ -432,6 +432,28 @@ def _load_schema_cached(url, resolve_references):
     schema, url = loader(url)
 
     if resolve_references:
+        # resolve all "$ref" in tree
+        # this can result in recursive references so some record of looked-up schemas is required
+        # however local references can also be recursive so we need to not use walk_and_modify
+        loaded_schemas = {
+            url: schema
+        }
+
+        for node in iter_tree(schema):
+            # FIXME broken code
+            if isinstance(node, dict) and "$ref" in node:
+                # poop, we need to modify the parent here right? essentially getting rid of
+                # node but that doesn't work here as part of iter_tree
+                # what's actually going on here, why do we need _safe_resolve?
+                suburl_base, suburl_fragment = _safe_resolve(url, node["$ref"])
+                if suburl_base == url or suburl_base == schema.get("id"):
+                    # local ref
+                    return reference.resolve_fragment(schema, suburl_fragment)
+                else:
+                    # other schema... but if that schema references this one, all is lost
+                    # maybe that's already a mess?
+                    subschema = load_schema(suburl_base, True)
+                    return reference.resolve_fragment(subschema, suburl_fragment)
 
         def resolve_refs(node, json_id):
             if json_id is None:
@@ -442,11 +464,10 @@ def resolve_refs(node, json_id):
 
                 if suburl_base == url or suburl_base == schema.get("id"):
                     # This is a local ref, which we'll resolve in both cases.
-                    subschema = schema
+                    return treeutil.walk_and_modify(reference.resolve_fragment(schema, suburl_fragment), resolve_refs)
                 else:
                     subschema = load_schema(suburl_base, True)
-
-                return reference.resolve_fragment(subschema, suburl_fragment)
+                    return reference.resolve_fragment(subschema, suburl_fragment)
 
             return node