json-schema-utils 0.9.9__tar.gz → 0.9.10.dev5__tar.gz

{json_schema_utils-0.9.9/json_schema_utils.egg-info → json_schema_utils-0.9.10.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_schema_utils
-Version: 0.9.9
+Version: 0.9.10.dev5
 Summary: JSON Schema Utils
 Author: Fabien Coelho, Claire Yannou-Medrala
 License-Expression: CC0-1.0

{json_schema_utils-0.9.9 → json_schema_utils-0.9.10.dev5/json_schema_utils.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: json_schema_utils
-Version: 0.9.9
+Version: 0.9.10.dev5
 Summary: JSON Schema Utils
 Author: Fabien Coelho, Claire Yannou-Medrala
 License-Expression: CC0-1.0

json_schema_utils-0.9.10.dev5/jsutils/VERSION

@@ -0,0 +1 @@
+0.9.10

{json_schema_utils-0.9.9 → json_schema_utils-0.9.10.dev5}/jsutils/convert.py

@@ -1068,10 +1068,18 @@ def schema2model(
             props = schema["properties"]
             del schema["properties"]
             for s in lof:
-                if "properties" in s:
-                    s["properties"].update(props)
-                else:
+                if "properties" not in s:
                     s["properties"] = props
+                else:
+                    eprops = s["properties"]
+                    assert isinstance(eprops, dict)
+                    for p, v in props.items():
+                        if p not in eprops:
+                            eprops[p] = v
+                        elif eprops[p] == v:
+                            pass
+                        else:
+                            eprops[p] = {"allOf": [ eprops[p], v]}
         if "additionalProperties" in schema:
             addprop = schema["additionalProperties"]
             del schema["additionalProperties"]
@@ -1314,7 +1322,7 @@ def schema2model(
             else:
                 assert False, f"$ref handling not implemented: {ref}"
         else:
-            log.info(f"$ref intermixed with other keywords at [{spath}]")
+            log.info(f"keyword $ref intermixed with other keywords at [{spath}]")
             ao = allOfLayer(schema, "$ref")
             model = schema2model(ao, lid or url, path, defs, strict, fix, False, resilient)
             return buildModel(model, {}, defs, sharp, is_root)

{json_schema_utils-0.9.9 → json_schema_utils-0.9.10.dev5}/jsutils/scripts.py

@@ -1,4 +1,5 @@
 import sys
+import os
 from typing import Any, Callable
 import copy
 import json
@@ -37,7 +38,7 @@ def jsu_version(with_backend: bool = False) -> str:
             from setuptools_git_versioning import get_version
             version = str(get_version(root=Path(__file__).parent.parent))
         except Exception as e:
-            log.warning(f"error while recompuging version: {e}")
+            log.debug(f"error while recomputing version: {e}")
             pass
     if with_backend:
         version += " (jmc backend " + json_model.jmc_version() + ")"
@@ -79,6 +80,16 @@ def rm_suffix(s, *suffixes):
             return s[:-len(suffix)]
     return s
 
+def read_schema(arg: str|None):
+    """Read JSON Schema from file name."""
+    if arg is None or arg == "-":
+        return json.load(sys.stdin)
+    for suffix in ("", ".json", ".schema.json"):
+        file = arg + suffix
+        if os.path.exists(file):
+            with open(file) as f:
+                return json.load(f)
+    raise Exception(f"no such schema: {arg}")
 
 def jsu_inline(xargs: list[str]|None = None) -> int:
     """Inline command entry point."""
@@ -105,7 +116,7 @@ def jsu_inline(xargs: list[str]|None = None) -> int:
 
     for fn in args.schemas:
         log.debug(f"considering file: {fn}")
-        schema = json.load(open(fn) if fn != "-" else sys.stdin)
+        schema = read_schema(fn)
         if isinstance(schema, bool):
             inlined = schema
         elif isinstance(schema, dict):
@@ -155,7 +166,7 @@ def jsu_simpler(xargs: list[str]|None = None) -> int:
 
     for fn in args.schemas:
         log.debug(f"considering file: {fn}")
-        schema = json.load(open(fn) if fn != "-" else sys.stdin)
+        schema = read_schema(fn)
         if args.type:
             schema = computeTypes(schema)
         if isinstance(schema, dict):
@@ -201,8 +212,7 @@ def jsu_check(xargs: list[str]|None = None) -> int:
     log.setLevel(logging.DEBUG if args.debug else logging.WARNING if args.quiet else logging.INFO)
 
     try:
-        with open(args.schema) if args.schema != "-" else sys.stdin as f:
-            jschema = json.load(f)
+        jschema = read_schema(args.schema)
     except FileNotFoundError as e:
         if args.debug:
             log.error(e, exc_info=args.debug)
@@ -380,7 +390,6 @@ def jsu_stats(xargs: list[str]|None = None) -> int:
 
     return 1 if oops else 0
 
-
 def jsu_pretty(xargs: list[str]|None = None):
 
     ap = argparse.ArgumentParser(
@@ -399,7 +408,7 @@ def jsu_pretty(xargs: list[str]|None = None):
 
     for fn in args.schemas:
         log.debug(f"considering file: {fn}")
-        schema = json.load(open(fn) if fn != "-" else sys.stdin)
+        schema = read_schema(fn)
         print(json_dumps(schema, args))
 
     return 0
@@ -466,7 +475,7 @@ def jsu_model(xargs: list[str]|None = None) -> int:
     for fn in args.schemas:
         log.debug(f"considering: {fn}")
         try:
-            schema = json.load(open(fn) if fn != "-" else sys.stdin)
+            schema = read_schema(fn)
             model = schema_to_model(
                 schema, fn,
                 use_id=args.id, strict=args.strict, fix=args.fix,
@@ -584,7 +593,7 @@ def jsu_compile(xargs: list[str]|None = None) -> int:
     model = None
 
     try:
-        schema = json.load(open(args.schema) if args.schema != "-" else sys.stdin)
+        schema = read_schema(args.schema)
         resolver = Resolver(cache=args.cache, mapping=args.map)
         model = schema_to_model(
             schema, args.schema,

{json_schema_utils-0.9.9 → json_schema_utils-0.9.10.dev5}/jsutils/simplify.py

@@ -408,6 +408,8 @@ def simplifySchema(
                 for k, v in subs.items():
                     if k in _IGNORABLE:
                         pass
+                    elif k in ("if", "then", "else", "not", "allOf", "anyOf", "oneOf", "$ref", "$dynamicRef"):
+                        compat = False
                     elif k in local and v == local[k]:
                         pass
                     elif k in local:
@@ -418,10 +420,12 @@ def simplifySchema(
                             for n in v:
                                 if n not in local["required"]:
                                     compat = False
+                        else:
+                            compat = False
                     else:
                         compat = False
                 if compat:
-                    log.info(f"removing ineffective {kw}")
+                    log.info(f"removing ineffective {kw} at {lpath}")
                     del local[kw]
 
         # if/then/else
@@ -570,6 +574,15 @@ def simplifySchema(
                                 log.info(f"removing useless {kw} keyword at {lpath}")
                                 del local[kw]
 
+                # boolean propertyNames
+                if "propertyNames" in local:
+                    pn = local["propertyNames"]
+                    if isinstance(pn, bool):
+                        log.info(f"removing useless propertyNames boolean schema at {lpath}")
+                        del local["propertyNames"]
+                        if not pn:  # empty object
+                            local["maxProperties"] = 0
+
                 # simplify propertyNames + additionalProperties to patternProperties
                 if "propertyNames" in local and "additionalProperties" in local and \
                         "properties" not in local and "patternProperties" not in local:
@@ -583,6 +596,8 @@ def simplifySchema(
                         del local["additionalProperties"]
                         assert isinstance(pn["pattern"], str)
                         local["patternProperties"] = { pn["pattern"]: ap }
+                        # NOTE: ap is merged into pp, we do not want any other props
+                        local["additionalProperties"] = False
 
         # const/enum
         if "const" in local and "enum" in local:

json_schema_utils-0.9.9/jsutils/VERSION

@@ -1 +0,0 @@
-0.9.9