Resolve before canonicalising

Author: Zac-HD

src/hypothesis_jsonschema/_canonicalise.py

@@ -551,14 +551,18 @@ def resolve_remote(self, uri: str) -> NoReturn:
         )
 
 
-def resolve_all_refs(schema: Schema, *, resolver: LocalResolver = None) -> Schema:
+def resolve_all_refs(
+    schema: Union[bool, Schema], *, resolver: LocalResolver = None
+) -> Schema:
     """
     Resolve all references in the given schema.
 
     This handles nested definitions, but not recursive definitions.
     The latter require special handling to convert to strategies and are much
     less common, so we just ignore them (and error out) for now.
     """
+    if isinstance(schema, bool):
+        return canonicalish(schema)
     if resolver is None:
         resolver = LocalResolver.from_schema(deepcopy(schema))
     if not isinstance(resolver, jsonschema.RefResolver):
@@ -573,7 +577,7 @@ def resolve_all_refs(schema: Schema, *, resolver: LocalResolver = None) -> Schem
             if s == {}:
                 return resolve_all_refs(got, resolver=resolver)
             m = merged([s, got])
-            if m is None:
+            if m is None:  # pragma: no cover
                 msg = f"$ref:{ref!r} had incompatible base schema {s!r}"
                 raise HypothesisRefResolutionError(msg)
             return resolve_all_refs(m, resolver=resolver)

src/hypothesis_jsonschema/_from_schema.py

@@ -85,6 +85,12 @@ def error_raiser() -> NoReturn:
 
 
 def __from_schema(schema: Union[bool, Schema]) -> st.SearchStrategy[JSONType]:
+    try:
+        schema = resolve_all_refs(schema)
+    except RecursionError:
+        raise HypothesisRefResolutionError(
+            f"Could not resolve recursive references in schema={schema!r}"
+        ) from None
     schema = canonicalish(schema)
     # Boolean objects are special schemata; False rejects all and True accepts all.
     if schema == FALSEY:
@@ -97,13 +103,6 @@ def __from_schema(schema: Union[bool, Schema]) -> st.SearchStrategy[JSONType]:
         if schema["$schema"] == "http://json-schema.org/draft-03/schema#":
             raise InvalidArgument("Draft-03 schemas are not supported")
 
-    try:
-        schema = resolve_all_refs(schema)
-    except RecursionError:
-        raise HypothesisRefResolutionError(
-            f"Could not resolve recursive references in schema={schema!r}"
-        ) from None
-
     # Now we handle as many validation keywords as we can...
     # Applying subschemata with boolean logic
     if "not" in schema:

tests/test_from_schema.py

@@ -110,6 +110,10 @@ def test_invalid_schemas_raise(schema):
     "Jenkins X Pipeline YAML configuration files",
     "TypeScript compiler configuration file",
     "JSON Schema for GraphQL Mesh config file",
+    "Configuration file for stylelint",
+    "Travis CI configuration file",
+    "JSON schema for ESLint configuration files",
+    # TODO: work out how to use slow marker here
 }
 
 with open(Path(__file__).parent / "corpus-schemastore-catalog.json") as f: