jsi-dev 0.0.8 → 0.0.9

data/lib/schemas/json-schema.org/draft-04/schema.rb

@@ -1,25 +1,26 @@
 # frozen_string_literal: true
 
 module JSI
-  metaschema_document = ::JSON.parse(SCHEMAS_PATH.join('json-schema.org/draft-04/schema.json').read)
-  JSONSchemaDraft04 = JSI.new_metaschema_module(metaschema_document,
-    schema_implementation_modules: [JSI::Schema::Draft04],
-  )
+  metaschema_document = Util.json_parse_freeze(SCHEMAS_PATH.join('json-schema.org/draft-04/schema.json').read)
 
-  # in draft 4, boolean schemas are not described in the root, but on anyOf schemas on
-  # properties/additionalProperties and properties/additionalItems.
-  # these still describe schemas, despite not being described by the metaschema.
-  also_describe_schemas =
-    JSONSchemaDraft04.schema["properties"]["additionalProperties"]["anyOf"] +
-    JSONSchemaDraft04.schema["properties"]["additionalItems"]["anyOf"]
-  also_describe_schemas.each do |schema|
-    schema.describes_schema!([JSI::Schema::Draft04])
-  end
+  describe_schema_ptrs = Set[
+    Ptr[],
+    # in draft 4, boolean schemas are not described by the main meta-schema (which specifies type: object),
+    # but by anyOf schemas in /properties/additionalProperties and /properties/additionalItems.
+    Ptr['properties', 'additionalProperties', 'anyOf', 0],
+    Ptr['properties', 'additionalItems', 'anyOf', 0]
+  ].freeze
+
+  JSONSchemaDraft04 = JSI.new_metaschema_node(metaschema_document,
+    dialect: JSI::Schema::Draft04::DIALECT,
+    is_metaschema: proc do |node|
+      describe_schema_ptrs.include?(node.jsi_ptr)
+    end,
+  ).jsi_schema_module
 
   # the JSI schema module for `http://json-schema.org/draft-04/schema`
   module JSONSchemaDraft04
-    # @!parse extend JSI::SchemaModule::DescribesSchemaModule
-    # @!parse include JSI::Schema::Draft04
+    # @!parse extend JSI::SchemaModule::MetaSchemaModule
 
 
     Id        = properties['id']
@@ -62,83 +63,45 @@ module JSI
     SimpleType             = definitions['simpleTypes']
     StringArray           = definitions['stringArray']
 
-    module Id
-    end
-    module Xschema
-    end
-    module Title
-    end
-    module Description
-    end
-    module Default
-    end
-    module MultipleOf
-    end
-    module Maximum
-    end
-    module ExclusiveMaximum
-    end
-    module Minimum
-    end
-    module ExclusiveMinimum
-    end
-    module MaxLength
-    end
-    module MinLength
-    end
-    module Pattern
-    end
-    module AdditionalItems
-    end
-    module Items
-    end
-    module MaxItems
-    end
-    module MinItems
-    end
-    module UniqueItems
-    end
-    module MaxProperties
-    end
-    module MinProperties
-    end
-    module Required
-    end
-    module AdditionalProperties
-    end
-    module Definitions
-    end
-    module Properties
-    end
-    module PatternProperties
-    end
-    module Dependencies
-    end
-    module Enum
-    end
-    module Type
-    end
-    module Format
-    end
-    module AllOf
-    end
-    module AnyOf
-    end
-    module OneOf
-    end
-    module Not
-    end
+    module Id end
+    module Xschema end
+    module Title end
+    module Description end
+    module Default end
+    module MultipleOf end
+    module Maximum end
+    module ExclusiveMaximum end
+    module Minimum end
+    module ExclusiveMinimum end
+    module MaxLength end
+    module MinLength end
+    module Pattern end
+    module AdditionalItems end
+    module Items end
+    module MaxItems end
+    module MinItems end
+    module UniqueItems end
+    module MaxProperties end
+    module MinProperties end
+    module Required end
+    module AdditionalProperties end
+    module Definitions end
+    module Properties end
+    module PatternProperties end
+    module Dependencies end
+    module Enum end
+    module Type end
+    module Format end
+    module AllOf end
+    module AnyOf end
+    module OneOf end
+    module Not end
 
-    module SchemaArray
-    end
-    module PositiveInteger
-    end
-    module PositiveIntegerDefault0
-    end
-    module SimpleType
-    end
-    module StringArray
-    end
+    module SchemaArray end
+    module PositiveInteger end
+    module PositiveIntegerDefault0 end
+    module SimpleType end
+    module StringArray end
 
     AdditionalItems::Boolean = AdditionalItems.anyOf[0]
     AdditionalProperties::Boolean = AdditionalProperties.anyOf[0]
@@ -147,23 +110,11 @@ module JSI
     PositiveIntegerDefault0::Default0 = PositiveIntegerDefault0.allOf[1]
     StringItem = StringArray.items
 
-    module AdditionalItems::Boolean
-    end
-    module AdditionalProperties::Boolean
-    end
-    module Dependencies::Dependency
-    end
-    module Type::Array
-    end
-    module PositiveIntegerDefault0::Default0
-    end
-    module StringItem
-    end
-  end
-
-  JSONSchemaOrgDraft04 = JSONSchemaDraft04
-
-  # @deprecated after v0.7.0, alias of {JSONSchemaDraft04}
-  module JSONSchemaOrgDraft04
+    module AdditionalItems::Boolean end
+    module AdditionalProperties::Boolean end
+    module Dependencies::Dependency end
+    module Type::Array end
+    module PositiveIntegerDefault0::Default0 end
+    module StringItem end
   end
 end

data/lib/schemas/json-schema.org/draft-06/schema.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 module JSI
-  metaschema_document = ::JSON.parse(SCHEMAS_PATH.join('json-schema.org/draft-06/schema.json').read)
-  JSONSchemaDraft06 = JSI.new_metaschema_module(metaschema_document,
-    schema_implementation_modules: [JSI::Schema::Draft06],
-  )
+  metaschema_document = Util.json_parse_freeze(SCHEMAS_PATH.join('json-schema.org/draft-06/schema.json').read)
+  JSONSchemaDraft06 = JSI.new_metaschema_node(metaschema_document,
+    dialect: JSI::Schema::Draft06::DIALECT,
+  ).jsi_schema_module
 
   # the JSI schema module for `http://json-schema.org/draft-06/schema`
   module JSONSchemaDraft06
-    # @!parse extend JSI::SchemaModule::DescribesSchemaModule
-    # @!parse include JSI::Schema::Draft06
+    # @!parse extend JSI::SchemaModule::MetaSchemaModule
 
 
     Id      = properties['$id']
@@ -57,93 +56,50 @@ module JSI
     SimpleType                = definitions['simpleTypes']
     StringArray              = definitions['stringArray']
 
-    module Id
-    end
-    module Xschema
-    end
-    module Ref
-    end
-    module Title
-    end
-    module Description
-    end
-    module Default
-    end
-    module Examples
-    end
-    module MultipleOf
-    end
-    module Maximum
-    end
-    module ExclusiveMaximum
-    end
-    module Minimum
-    end
-    module ExclusiveMinimum
-    end
-    module MaxLength
-    end
-    module MinLength
-    end
-    module Pattern
-    end
-    module AdditionalItems
-    end
-    module Items
-    end
-    module MaxItems
-    end
-    module MinItems
-    end
-    module UniqueItems
-    end
-    module Contains
-    end
-    module MaxProperties
-    end
-    module MinProperties
-    end
-    module Required
-    end
-    module AdditionalProperties
-    end
-    module Definitions
-    end
-    module Properties
-    end
-    module PatternProperties
-    end
-    module Dependencies
-    end
-    module PropertyNames
-    end
-    module Const
-    end
-    module Enum
-    end
-    module Type
-    end
-    module Format
-    end
-    module AllOf
-    end
-    module AnyOf
-    end
-    module OneOf
-    end
-    module Not
-    end
+    module Id end
+    module Xschema end
+    module Ref end
+    module Title end
+    module Description end
+    module Default end
+    module Examples end
+    module MultipleOf end
+    module Maximum end
+    module ExclusiveMaximum end
+    module Minimum end
+    module ExclusiveMinimum end
+    module MaxLength end
+    module MinLength end
+    module Pattern end
+    module AdditionalItems end
+    module Items end
+    module MaxItems end
+    module MinItems end
+    module UniqueItems end
+    module Contains end
+    module MaxProperties end
+    module MinProperties end
+    module Required end
+    module AdditionalProperties end
+    module Definitions end
+    module Properties end
+    module PatternProperties end
+    module Dependencies end
+    module PropertyNames end
+    module Const end
+    module Enum end
+    module Type end
+    module Format end
+    module AllOf end
+    module AnyOf end
+    module OneOf end
+    module Not end
 
-    module SchemaArray
-    end
-    module NonNegativeInteger
-    end
-    module NonNegativeIntegerDefault0
-    end
-    module SimpleType
-    end
-    module StringArray
-    end
+    module SchemaArray end
+    module NonNegativeInteger end
+    module NonNegativeIntegerDefault0 end
+    module SimpleType end
+    module StringArray end
 
     Example = Examples.items
     Dependencies::Dependency = Dependencies.additionalProperties
@@ -151,21 +107,10 @@ module JSI
     NonNegativeIntegerDefault0::Default0 = NonNegativeIntegerDefault0.allOf[1]
     StringItem = StringArray.items
 
-    module Example
-    end
-    module Dependencies::Dependency
-    end
-    module Type::Array
-    end
-    module NonNegativeIntegerDefault0::Default0
-    end
-    module StringItem
-    end
-  end
-
-  JSONSchemaOrgDraft06 = JSONSchemaDraft06
-
-  # @deprecated after v0.7.0, alias of {JSONSchemaDraft06}
-  module JSONSchemaOrgDraft06
+    module Example end
+    module Dependencies::Dependency end
+    module Type::Array end
+    module NonNegativeIntegerDefault0::Default0 end
+    module StringItem end
   end
 end

data/lib/schemas/json-schema.org/draft-07/schema.rb

@@ -1,15 +1,14 @@
 # frozen_string_literal: true
 
 module JSI
-  metaschema_document = ::JSON.parse(SCHEMAS_PATH.join('json-schema.org/draft-07/schema.json').read)
-  JSONSchemaDraft07 = JSI.new_metaschema_module(metaschema_document,
-    schema_implementation_modules: [JSI::Schema::Draft07],
-  )
+  metaschema_document = Util.json_parse_freeze(SCHEMAS_PATH.join('json-schema.org/draft-07/schema.json').read)
+  JSONSchemaDraft07 = JSI.new_metaschema_node(metaschema_document,
+    dialect: JSI::Schema::Draft07::DIALECT,
+  ).jsi_schema_module
 
   # the JSI schema module for `http://json-schema.org/draft-07/schema`
   module JSONSchemaDraft07
-    # @!parse extend JSI::SchemaModule::DescribesSchemaModule
-    # @!parse include JSI::Schema::Draft07
+    # @!parse extend JSI::SchemaModule::MetaSchemaModule
 
 
     Id     = properties['$id']
@@ -64,135 +63,72 @@ module JSI
     SimpleType                = definitions['simpleTypes']
     StringArray              = definitions['stringArray']
 
-    module Id
-    end
-    module Xschema
-    end
-    module Ref
-    end
-    module Comment
-    end
-    module Title
-    end
-    module Description
-    end
-    module Default
-    end
-    module ReadOnly
-    end
-    module Examples
-    end
-    module MultipleOf
-    end
-    module Maximum
-    end
-    module ExclusiveMaximum
-    end
-    module Minimum
-    end
-    module ExclusiveMinimum
-    end
-    module MaxLength
-    end
-    module MinLength
-    end
-    module Pattern
-    end
-    module AdditionalItems
-    end
-    module Items
-    end
-    module MaxItems
-    end
-    module MinItems
-    end
-    module UniqueItems
-    end
-    module Contains
-    end
-    module MaxProperties
-    end
-    module MinProperties
-    end
-    module Required
-    end
-    module AdditionalProperties
-    end
-    module Definitions
-    end
-    module Properties
-    end
-    module PatternProperties
-    end
-    module Dependencies
-    end
-    module PropertyNames
-    end
-    module Const
-    end
-    module Enum
-    end
-    module Type
-    end
-    module Format
-    end
-    module ContentMediaType
-    end
-    module ContentEncoding
-    end
-    module If
-    end
-    module Then
-    end
-    module Else
-    end
-    module AllOf
-    end
-    module AnyOf
-    end
-    module OneOf
-    end
-    module Not
-    end
+    module Id end
+    module Xschema end
+    module Ref end
+    module Comment end
+    module Title end
+    module Description end
+    module Default end
+    module ReadOnly end
+    module Examples end
+    module MultipleOf end
+    module Maximum end
+    module ExclusiveMaximum end
+    module Minimum end
+    module ExclusiveMinimum end
+    module MaxLength end
+    module MinLength end
+    module Pattern end
+    module AdditionalItems end
+    module Items end
+    module MaxItems end
+    module MinItems end
+    module UniqueItems end
+    module Contains end
+    module MaxProperties end
+    module MinProperties end
+    module Required end
+    module AdditionalProperties end
+    module Definitions end
+    module Properties end
+    module PatternProperties end
+    module Dependencies end
+    module PropertyNames end
+    module Const end
+    module Enum end
+    module Type end
+    module Format end
+    module ContentMediaType end
+    module ContentEncoding end
+    module If end
+    module Then end
+    module Else end
+    module AllOf end
+    module AnyOf end
+    module OneOf end
+    module Not end
 
-    module SchemaArray
-    end
-    module NonNegativeInteger
-    end
-    module NonNegativeIntegerDefault0
-    end
-    module SimpleType
-    end
-    module StringArray
-    end
+    module SchemaArray end
+    module NonNegativeInteger end
+    module NonNegativeIntegerDefault0 end
+    module SimpleType end
+    module StringArray end
 
     Example = Examples.items
-    PatternPropertyPattern = PatternProperties.propertyNames
+    PatternProperties::Pattern = PatternProperties.propertyNames
     Dependencies::Dependency = Dependencies.additionalProperties
     Enum::Item = Enum.items
     Type::Array = Type.anyOf[1]
     NonNegativeIntegerDefault0::Default0 = NonNegativeIntegerDefault0.allOf[1]
     StringItem = StringArray.items
 
-    module Example
-    end
-    module PatternPropertyPattern
-    end
-    module Dependencies::Dependency
-    end
-    module Enum::Item
-    end
-    module Type::Array
-    end
-    module NonNegativeIntegerDefault0::Default0
-    end
-    module StringItem
-    end
-  end
-
-  JSONSchemaOrgDraft07 = JSONSchemaDraft07
-
-  # @deprecated after v0.7.0, alias of {JSONSchemaDraft07}
-  module JSONSchemaOrgDraft07
+    module Example end
+    module PatternProperties::Pattern end
+    module Dependencies::Dependency end
+    module Enum::Item end
+    module Type::Array end
+    module NonNegativeIntegerDefault0::Default0 end
+    module StringItem end
   end
 end

data/readme.rb

@@ -59,7 +59,7 @@ bill = Contact.new_jsi({
     }
   ],
   "nickname" => "big b",
-})
+}, mutable: true)
 
 print 'bill: '
 pp bill
@@ -78,11 +78,11 @@ bad = Contact.new_jsi({'phone' => [{'number' => [5, 5, 5]}]})
 print 'bad: '
 pp bad
 
-print 'bad.phone.jsi_validate: '
-pp bad.phone.jsi_validate
+print 'bad.phone[0].jsi_validate: '
+pp bad.phone[0].jsi_validate
 
 print 'bill.transform_values(&:size): '
-pp bill.transform_values(&:size)
+pp bill.transform_values(&:size) if Hash.method_defined?(:transform_values)
 
 print "bill['nickname']: "
 pp bill['nickname']

data/{resources}/schemas/2020-12_strict.json

@@ -0,0 +1,19 @@
+{
+  "$schema": "https://json-schema.org/draft/2020-12/schema",
+  "$id": "https://json-schema.org/draft/2020-12/strict",
+  "$vocabulary": {
+    "https://json-schema.org/draft/2020-12/vocab/core": true,
+    "https://json-schema.org/draft/2020-12/vocab/applicator": true,
+    "https://json-schema.org/draft/2020-12/vocab/unevaluated": true,
+    "https://json-schema.org/draft/2020-12/vocab/validation": true,
+    "https://json-schema.org/draft/2020-12/vocab/meta-data": true,
+    "https://json-schema.org/draft/2020-12/vocab/format-annotation": true,
+    "https://json-schema.org/draft/2020-12/vocab/content": true
+  },
+  "$dynamicAnchor": "meta",
+
+  "title": "Strict version of Core and Validation specifications meta-schema, disallowing all unknown keywords",
+  "$ref": "https://json-schema.org/draft/2020-12/schema",
+
+  "unevaluatedProperties": false
+}

data/{resources}/schemas/json-schema.org/draft/2020-12/meta/applicator.json

@@ -0,0 +1,48 @@
+{
+    "$schema": "https://json-schema.org/draft/2020-12/schema",
+    "$id": "https://json-schema.org/draft/2020-12/meta/applicator",
+    "$vocabulary": {
+        "https://json-schema.org/draft/2020-12/vocab/applicator": true
+    },
+    "$dynamicAnchor": "meta",
+
+    "title": "Applicator vocabulary meta-schema",
+    "type": ["object", "boolean"],
+    "properties": {
+        "prefixItems": { "$ref": "#/$defs/schemaArray" },
+        "items": { "$dynamicRef": "#meta" },
+        "contains": { "$dynamicRef": "#meta" },
+        "additionalProperties": { "$dynamicRef": "#meta" },
+        "properties": {
+            "type": "object",
+            "additionalProperties": { "$dynamicRef": "#meta" },
+            "default": {}
+        },
+        "patternProperties": {
+            "type": "object",
+            "additionalProperties": { "$dynamicRef": "#meta" },
+            "propertyNames": { "format": "regex" },
+            "default": {}
+        },
+        "dependentSchemas": {
+            "type": "object",
+            "additionalProperties": { "$dynamicRef": "#meta" },
+            "default": {}
+        },
+        "propertyNames": { "$dynamicRef": "#meta" },
+        "if": { "$dynamicRef": "#meta" },
+        "then": { "$dynamicRef": "#meta" },
+        "else": { "$dynamicRef": "#meta" },
+        "allOf": { "$ref": "#/$defs/schemaArray" },
+        "anyOf": { "$ref": "#/$defs/schemaArray" },
+        "oneOf": { "$ref": "#/$defs/schemaArray" },
+        "not": { "$dynamicRef": "#meta" }
+    },
+    "$defs": {
+        "schemaArray": {
+            "type": "array",
+            "minItems": 1,
+            "items": { "$dynamicRef": "#meta" }
+        }
+    }
+}