name metaschema sub-subschemas

notEthan · Jul 16, 2023 · c9936bc · c9936bc
1 parent e4ca66e
commit c9936bc
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 4 deletions.
diff --git a/lib/schemas/json-schema.org/draft-04/schema.rb b/lib/schemas/json-schema.org/draft-04/schema.rb
@@ -61,5 +61,12 @@ module JSONSchemaOrgDraft04
     PositiveIntegerDefault0 = definitions['positiveIntegerDefault0']
     SimpleType             = definitions['simpleTypes']
     StringArray           = definitions['stringArray']
+
+    AdditionalItems::Boolean = AdditionalItems.anyOf[0]
+    AdditionalProperties::Boolean = AdditionalProperties.anyOf[0]
+    Dependencies::Dependency = Dependencies.additionalProperties
+    Type::Array = Type.anyOf[1]
+    PositiveIntegerDefault0::Default0 = PositiveIntegerDefault0.allOf[1]
+    StringItem = StringArray.items
   end
 end
diff --git a/lib/schemas/json-schema.org/draft-06/schema.rb b/lib/schemas/json-schema.org/draft-06/schema.rb
@@ -56,5 +56,11 @@ module JSONSchemaOrgDraft06
     NonNegativeIntegerDefault0 = definitions['nonNegativeIntegerDefault0']
     SimpleType                = definitions['simpleTypes']
     StringArray              = definitions['stringArray']
+
+    Example = Examples.items
+    Dependencies::Dependency = Dependencies.additionalProperties
+    Type::Array = Type.anyOf[1]
+    NonNegativeIntegerDefault0::Default0 = NonNegativeIntegerDefault0.allOf[1]
+    StringItem = StringArray.items
   end
 end
diff --git a/lib/schemas/json-schema.org/draft-07/schema.rb b/lib/schemas/json-schema.org/draft-07/schema.rb
@@ -63,5 +63,13 @@ module JSONSchemaOrgDraft07
     NonNegativeIntegerDefault0 = definitions['nonNegativeIntegerDefault0']
     SimpleType                = definitions['simpleTypes']
     StringArray              = definitions['stringArray']
+
+    Example = Examples.items
+    PatternPropertyPattern = PatternProperties.propertyNames
+    Dependencies::Dependency = Dependencies.additionalProperties
+    Enum::Item = Enum.items
+    Type::Array = Type.anyOf[1]
+    NonNegativeIntegerDefault0::Default0 = NonNegativeIntegerDefault0.allOf[1]
+    StringItem = StringArray.items
   end
 end
diff --git a/test/schema_test.rb b/test/schema_test.rb
@@ -700,14 +700,14 @@
     end
 
     it '#inspect' do
-      assert_equal(%q(#{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "$schema" => "http://json-schema.org/draft-06/schema", "$id" => "http://jsi/schema/stringification", "type" => #[<JSI (JSI::JSONSchemaOrgDraft06::Type, JSI::JSONSchemaOrgDraft06::Type.anyOf[1])> "object", "array"], "properties" => #{<JSI (JSI::JSONSchemaOrgDraft06::Properties)> "foo" => #{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "items" => #{<JSI (JSI::JSONSchemaOrgDraft06::Items, JSI::JSONSchemaOrgDraft06) Schema> "$ref" => "#/definitions/no"}}}, "items" => #[<JSI (JSI::JSONSchemaOrgDraft06::Items, JSI::JSONSchemaOrgDraft06::SchemaArray)> #{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "dependencies" => #{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies)> "a" => #[<JSI (JSI::JSONSchemaOrgDraft06::Dependencies.additionalProperties, JSI::JSONSchemaOrgDraft06::StringArray)> "b"]}}, #{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "dependencies" => #{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies)> "a" => #{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies.additionalProperties, JSI::JSONSchemaOrgDraft06) Schema>}}}], "definitions" => #{<JSI (JSI::JSONSchemaOrgDraft06::Definitions)> "no" => #{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "enum" => #[<JSI (JSI::JSONSchemaOrgDraft06::Enum)>]}}}), schema.inspect)
+      assert_equal(%q(#{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "$schema" => "http://json-schema.org/draft-06/schema", "$id" => "http://jsi/schema/stringification", "type" => #[<JSI (JSI::JSONSchemaOrgDraft06::Type, JSI::JSONSchemaOrgDraft06::Type::Array)> "object", "array"], "properties" => #{<JSI (JSI::JSONSchemaOrgDraft06::Properties)> "foo" => #{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "items" => #{<JSI (JSI::JSONSchemaOrgDraft06::Items, JSI::JSONSchemaOrgDraft06) Schema> "$ref" => "#/definitions/no"}}}, "items" => #[<JSI (JSI::JSONSchemaOrgDraft06::Items, JSI::JSONSchemaOrgDraft06::SchemaArray)> #{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "dependencies" => #{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies)> "a" => #[<JSI (JSI::JSONSchemaOrgDraft06::Dependencies::Dependency, JSI::JSONSchemaOrgDraft06::StringArray)> "b"]}}, #{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "dependencies" => #{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies)> "a" => #{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies::Dependency, JSI::JSONSchemaOrgDraft06) Schema>}}}], "definitions" => #{<JSI (JSI::JSONSchemaOrgDraft06::Definitions)> "no" => #{<JSI (JSI::JSONSchemaOrgDraft06) Schema> "enum" => #[<JSI (JSI::JSONSchemaOrgDraft06::Enum)>]}}}), schema.inspect)
     end
     it '#pretty_print' do
       pp = <<~PP
         \#{<JSI (JSI::JSONSchemaOrgDraft06) Schema>
           "$schema" => "http://json-schema.org/draft-06/schema",
           "$id" => "http://jsi/schema/stringification",
-          "type" => #[<JSI (JSI::JSONSchemaOrgDraft06::Type, JSI::JSONSchemaOrgDraft06::Type.anyOf[1])>
+          "type" => #[<JSI (JSI::JSONSchemaOrgDraft06::Type, JSI::JSONSchemaOrgDraft06::Type::Array)>
             "object",
             "array"
           ],
@@ -721,14 +721,14 @@
           "items" => #[<JSI (JSI::JSONSchemaOrgDraft06::Items, JSI::JSONSchemaOrgDraft06::SchemaArray)>
             \#{<JSI (JSI::JSONSchemaOrgDraft06) Schema>
               "dependencies" => \#{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies)>
-                "a" => #[<JSI (JSI::JSONSchemaOrgDraft06::Dependencies.additionalProperties, JSI::JSONSchemaOrgDraft06::StringArray)>
+                "a" => #[<JSI (JSI::JSONSchemaOrgDraft06::Dependencies::Dependency, JSI::JSONSchemaOrgDraft06::StringArray)>
                   "b"
                 ]
               }
             },
             \#{<JSI (JSI::JSONSchemaOrgDraft06) Schema>
               "dependencies" => \#{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies)>
-                "a" => \#{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies.additionalProperties, JSI::JSONSchemaOrgDraft06) Schema>}
+                "a" => \#{<JSI (JSI::JSONSchemaOrgDraft06::Dependencies::Dependency, JSI::JSONSchemaOrgDraft06) Schema>}
               }
             }
           ],