metaschema: enum schemas can have names

Author: mr-c

schema_salad/metaschema.py

@@ -1103,7 +1103,7 @@ def fromDoc(
         try:
             type = load_field(
                 _doc.get("type"),
-                typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779Loader_2,
+                typedsl_Record_nameLoader_2,
                 baseuri,
                 loadingOptions,
             )
@@ -1185,6 +1185,7 @@ def __init__(
         self,
         symbols: Any,
         type: Any,
+        name: Optional[Any] = None,
         extension_fields: Optional[Dict[str, Any]] = None,
         loadingOptions: Optional[LoadingOptions] = None,
     ) -> None:
@@ -1197,16 +1198,21 @@ def __init__(
             self.loadingOptions = loadingOptions
         else:
             self.loadingOptions = LoadingOptions()
+        self.name = name
         self.symbols = symbols
         self.type = type
 
     def __eq__(self, other: Any) -> bool:
         if isinstance(other, EnumSchema):
-            return bool(self.symbols == other.symbols and self.type == other.type)
+            return bool(
+                self.name == other.name
+                and self.symbols == other.symbols
+                and self.type == other.type
+            )
         return False
 
     def __hash__(self) -> int:
-        return hash((self.symbols, self.type))
+        return hash((self.name, self.symbols, self.type))
 
     @classmethod
     def fromDoc(
@@ -1221,6 +1227,33 @@ def fromDoc(
             _doc.lc.data = doc.lc.data
             _doc.lc.filename = doc.lc.filename
         _errors__ = []
+        if "name" in _doc:
+            try:
+                name = load_field(
+                    _doc.get("name"),
+                    uri_union_of_None_type_or_strtype_True_False_None,
+                    baseuri,
+                    loadingOptions,
+                )
+            except ValidationException as e:
+                _errors__.append(
+                    ValidationException(
+                        "the `name` field is not valid because:",
+                        SourceLine(_doc, "name", str),
+                        [e],
+                    )
+                )
+        else:
+            name = None
+
+        __original_name_is_none = name is None
+        if name is None:
+            if docRoot is not None:
+                name = docRoot
+            else:
+                name = "_:" + str(_uuid__.uuid4())
+        if not __original_name_is_none:
+            baseuri = name
         try:
             symbols = load_field(
                 _doc.get("symbols"),
@@ -1239,7 +1272,7 @@ def fromDoc(
         try:
             type = load_field(
                 _doc.get("type"),
-                typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77Loader_2,
+                typedsl_Enum_nameLoader_2,
                 baseuri,
                 loadingOptions,
             )
@@ -1262,7 +1295,7 @@ def fromDoc(
                 else:
                     _errors__.append(
                         ValidationException(
-                            "invalid field `{}`, expected one of: `symbols`, `type`".format(
+                            "invalid field `{}`, expected one of: `name`, `symbols`, `type`".format(
                                 k
                             ),
                             SourceLine(_doc, k, str),
@@ -1273,11 +1306,13 @@ def fromDoc(
         if _errors__:
             raise ValidationException("Trying 'EnumSchema'", None, _errors__)
         _constructed = cls(
+            name=name,
             symbols=symbols,
             type=type,
             extension_fields=extension_fields,
             loadingOptions=loadingOptions,
         )
+        loadingOptions.idx[name] = (_constructed, loadingOptions)
         return _constructed
 
     def save(
@@ -1291,12 +1326,15 @@ def save(
         else:
             for ef in self.extension_fields:
                 r[ef] = self.extension_fields[ef]
+        if self.name is not None:
+            u = save_relative_uri(self.name, base_url, True, None, relative_uris)
+            r["name"] = u
         if self.symbols is not None:
-            u = save_relative_uri(self.symbols, base_url, True, None, relative_uris)
+            u = save_relative_uri(self.symbols, self.name, True, None, relative_uris)
             r["symbols"] = u
         if self.type is not None:
             r["type"] = save(
-                self.type, top=False, base_url=base_url, relative_uris=relative_uris
+                self.type, top=False, base_url=self.name, relative_uris=relative_uris
             )
 
         # top refers to the directory level
@@ -1307,7 +1345,7 @@ def save(
                 r["$schemas"] = self.loadingOptions.schemas
         return r
 
-    attrs = frozenset(["symbols", "type"])
+    attrs = frozenset(["name", "symbols", "type"])
 
 
 class ArraySchema(Saveable):
@@ -1369,7 +1407,7 @@ def fromDoc(
         try:
             type = load_field(
                 _doc.get("type"),
-                typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bcLoader_2,
+                typedsl_Array_nameLoader_2,
                 baseuri,
                 loadingOptions,
             )
@@ -2405,7 +2443,7 @@ def fromDoc(
         try:
             type = load_field(
                 _doc.get("type"),
-                typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779Loader_2,
+                typedsl_Record_nameLoader_2,
                 baseuri,
                 loadingOptions,
             )
@@ -2726,9 +2764,9 @@ class SaladEnumSchema(NamedType, EnumSchema, SchemaDefinedType):
 
     def __init__(
         self,
-        name: Any,
         symbols: Any,
         type: Any,
+        name: Optional[Any] = None,
         inVocab: Optional[Any] = None,
         doc: Optional[Any] = None,
         docParent: Optional[Any] = None,
@@ -2812,7 +2850,7 @@ def fromDoc(
             try:
                 name = load_field(
                     _doc.get("name"),
-                    uri_strtype_True_False_None,
+                    uri_union_of_None_type_or_strtype_True_False_None,
                     baseuri,
                     loadingOptions,
                 )
@@ -2832,7 +2870,7 @@ def fromDoc(
             if docRoot is not None:
                 name = docRoot
             else:
-                raise ValidationException("Missing name")
+                name = "_:" + str(_uuid__.uuid4())
         if not __original_name_is_none:
             baseuri = name
         if "inVocab" in _doc:
@@ -2871,7 +2909,7 @@ def fromDoc(
         try:
             type = load_field(
                 _doc.get("type"),
-                typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77Loader_2,
+                typedsl_Enum_nameLoader_2,
                 baseuri,
                 loadingOptions,
             )
@@ -3324,7 +3362,7 @@ def fromDoc(
         try:
             type = load_field(
                 _doc.get("type"),
-                typedsl_enum_056429f0e9355680bd9b2411dc96a69c7ff2e76bLoader_2,
+                typedsl_Documentation_nameLoader_2,
                 baseuri,
                 loadingOptions,
             )
@@ -3553,31 +3591,8 @@ def save(
 idmap_fields_union_of_None_type_or_array_of_RecordFieldLoader = _IdMapLoader(
     union_of_None_type_or_array_of_RecordFieldLoader, "name", "type"
 )
-enum_d9cba076fca539106791a4f46d198c7fcfbdb779Loader = _EnumLoader(
-    ("record",), "enum_d9cba076fca539106791a4f46d198c7fcfbdb779"
-)
-typedsl_enum_d9cba076fca539106791a4f46d198c7fcfbdb779Loader_2 = _TypeDSLLoader(
-    enum_d9cba076fca539106791a4f46d198c7fcfbdb779Loader, 2
-)
-uri_array_of_strtype_True_False_None = _URILoader(array_of_strtype, True, False, None)
-enum_d961d79c225752b9fadb617367615ab176b47d77Loader = _EnumLoader(
-    ("enum",), "enum_d961d79c225752b9fadb617367615ab176b47d77"
-)
-typedsl_enum_d961d79c225752b9fadb617367615ab176b47d77Loader_2 = _TypeDSLLoader(
-    enum_d961d79c225752b9fadb617367615ab176b47d77Loader, 2
-)
-uri_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_or_array_of_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_False_True_2 = _URILoader(
-    union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_or_array_of_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype,
-    False,
-    True,
-    2,
-)
-enum_d062602be0b4b8fd33e69e29a841317b6ab665bcLoader = _EnumLoader(
-    ("array",), "enum_d062602be0b4b8fd33e69e29a841317b6ab665bc"
-)
-typedsl_enum_d062602be0b4b8fd33e69e29a841317b6ab665bcLoader_2 = _TypeDSLLoader(
-    enum_d062602be0b4b8fd33e69e29a841317b6ab665bcLoader, 2
-)
+Record_nameLoader = _EnumLoader(("record",), "Record_name")
+typedsl_Record_nameLoader_2 = _TypeDSLLoader(Record_nameLoader, 2)
 union_of_None_type_or_strtype = _UnionLoader(
     (
         None_type,
@@ -3587,6 +3602,17 @@ def save(
 uri_union_of_None_type_or_strtype_True_False_None = _URILoader(
     union_of_None_type_or_strtype, True, False, None
 )
+uri_array_of_strtype_True_False_None = _URILoader(array_of_strtype, True, False, None)
+Enum_nameLoader = _EnumLoader(("enum",), "Enum_name")
+typedsl_Enum_nameLoader_2 = _TypeDSLLoader(Enum_nameLoader, 2)
+uri_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_or_array_of_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_False_True_2 = _URILoader(
+    union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype_or_array_of_union_of_PrimitiveTypeLoader_or_RecordSchemaLoader_or_EnumSchemaLoader_or_ArraySchemaLoader_or_strtype,
+    False,
+    True,
+    2,
+)
+Array_nameLoader = _EnumLoader(("array",), "Array_name")
+typedsl_Array_nameLoader_2 = _TypeDSLLoader(Array_nameLoader, 2)
 union_of_None_type_or_booltype = _UnionLoader(
     (
         None_type,
@@ -3642,12 +3668,8 @@ def save(
 idmap_specialize_union_of_None_type_or_array_of_SpecializeDefLoader = _IdMapLoader(
     union_of_None_type_or_array_of_SpecializeDefLoader, "specializeFrom", "specializeTo"
 )
-enum_056429f0e9355680bd9b2411dc96a69c7ff2e76bLoader = _EnumLoader(
-    ("documentation",), "enum_056429f0e9355680bd9b2411dc96a69c7ff2e76b"
-)
-typedsl_enum_056429f0e9355680bd9b2411dc96a69c7ff2e76bLoader_2 = _TypeDSLLoader(
-    enum_056429f0e9355680bd9b2411dc96a69c7ff2e76bLoader, 2
-)
+Documentation_nameLoader = _EnumLoader(("documentation",), "Documentation_name")
+typedsl_Documentation_nameLoader_2 = _TypeDSLLoader(Documentation_nameLoader, 2)
 union_of_SaladRecordSchemaLoader_or_SaladEnumSchemaLoader_or_DocumentationLoader = (
     _UnionLoader(
         (

schema_salad/metaschema/metaschema.yml

@@ -369,6 +369,7 @@ $graph:
       doc: "Must be `documentation`"
       type:
         type: enum
+        name: Documentation_name
         symbols:
           - "sld:documentation"
       jsonldPredicate:

schema_salad/metaschema/metaschema_base.yml

@@ -100,6 +100,7 @@ $graph:
       doc: "Must be `record`"
       type:
         type: enum
+        name: Record_name
         symbols:
           - "sld:record"
       jsonldPredicate:
@@ -125,13 +126,17 @@ $graph:
       doc: "Must be `enum`"
       type:
         type: enum
+        name: Enum_name
         symbols:
           - "sld:enum"
       jsonldPredicate:
         _id: "sld:type"
         _type: "@vocab"
         typeDSL: true
         refScope: 2
+    name:
+      type: string?
+      jsonldPredicate: "@id"
     symbols:
       type: string[]
       jsonldPredicate:
@@ -148,6 +153,7 @@ $graph:
       doc: "Must be `array`"
       type:
         type: enum
+        name: Array_name
         symbols:
           - "sld:array"
       jsonldPredicate: