jsi 0.7.0 → 0.8.1

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

@@ -2,13 +2,168 @@
 
 module JSI
   metaschema_document = ::JSON.parse(SCHEMAS_PATH.join('json-schema.org/draft-04/schema.json').read)
-  JSONSchemaOrgDraft04 = MetaschemaNode.new(metaschema_document,
+  JSONSchemaDraft04 = JSI.new_metaschema_module(metaschema_document,
     schema_implementation_modules: [JSI::Schema::Draft04],
-  ).jsi_schema_module
+  )
+
+  # 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 meta-schema.
+  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
 
   # the JSI schema module for `http://json-schema.org/draft-04/schema`
-  module JSONSchemaOrgDraft04
-    # @!parse extend JSI::DescribesSchemaModule
+  module JSONSchemaDraft04
+    # @!parse extend JSI::SchemaModule::MetaSchemaModule
     # @!parse include JSI::Schema::Draft04
+
+
+    Id        = properties['id']
+    Xschema    = properties['$schema']
+    Title       = properties['title']
+    Description  = properties['description']
+    Default       = properties['default']
+    MultipleOf     = properties['multipleOf']
+    Maximum         = properties['maximum']
+    ExclusiveMaximum = properties['exclusiveMaximum']
+    Minimum          = properties['minimum']
+    ExclusiveMinimum = properties['exclusiveMinimum']
+    MaxLength       = properties['maxLength']
+    MinLength      = properties['minLength']
+    Pattern        = properties['pattern']
+    AdditionalItems = properties['additionalItems']
+    Items          = properties['items']
+    MaxItems       = properties['maxItems']
+    MinItems        = properties['minItems']
+    UniqueItems      = properties['uniqueItems']
+    MaxProperties     = properties['maxProperties']
+    MinProperties      = properties['minProperties']
+    Required            = properties['required']
+    AdditionalProperties = properties['additionalProperties']
+    Definitions         = properties['definitions']
+    Properties         = properties['properties']
+    PatternProperties = properties['patternProperties']
+    Dependencies     = properties['dependencies']
+    Enum            = properties['enum']
+    Type           = properties['type']
+    Format        = properties['format']
+    AllOf        = properties['allOf']
+    AnyOf       = properties['anyOf']
+    OneOf      = properties['oneOf']
+    Not       = properties['not']
+
+    SchemaArray           = definitions['schemaArray']
+    PositiveInteger        = definitions['positiveInteger']
+    PositiveIntegerDefault0 = definitions['positiveIntegerDefault0']
+    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 SchemaArray
+    end
+    module PositiveInteger
+    end
+    module PositiveIntegerDefault0
+    end
+    module SimpleType
+    end
+    module StringArray
+    end
+
+    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
+
+    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
   end
 end

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

@@ -2,13 +2,170 @@
 
 module JSI
   metaschema_document = ::JSON.parse(SCHEMAS_PATH.join('json-schema.org/draft-06/schema.json').read)
-  JSONSchemaOrgDraft06 = MetaschemaNode.new(metaschema_document,
+  JSONSchemaDraft06 = JSI.new_metaschema_module(metaschema_document,
     schema_implementation_modules: [JSI::Schema::Draft06],
-  ).jsi_schema_module
+  )
 
   # the JSI schema module for `http://json-schema.org/draft-06/schema`
-  module JSONSchemaOrgDraft06
-    # @!parse extend JSI::DescribesSchemaModule
+  module JSONSchemaDraft06
+    # @!parse extend JSI::SchemaModule::MetaSchemaModule
     # @!parse include JSI::Schema::Draft06
+
+
+    Id      = properties['$id']
+    Xschema  = properties['$schema']
+    Ref       = properties['$ref']
+    Title      = properties['title']
+    Description = properties['description']
+    Default      = properties['default']
+    Examples      = properties['examples']
+    MultipleOf     = properties['multipleOf']
+    Maximum         = properties['maximum']
+    ExclusiveMaximum = properties['exclusiveMaximum']
+    Minimum          = properties['minimum']
+    ExclusiveMinimum = properties['exclusiveMinimum']
+    MaxLength       = properties['maxLength']
+    MinLength      = properties['minLength']
+    Pattern        = properties['pattern']
+    AdditionalItems = properties['additionalItems']
+    Items          = properties['items']
+    MaxItems      = properties['maxItems']
+    MinItems       = properties['minItems']
+    UniqueItems     = properties['uniqueItems']
+    Contains         = properties['contains']
+    MaxProperties     = properties['maxProperties']
+    MinProperties      = properties['minProperties']
+    Required            = properties['required']
+    AdditionalProperties = properties['additionalProperties']
+    Definitions         = properties['definitions']
+    Properties         = properties['properties']
+    PatternProperties = properties['patternProperties']
+    Dependencies     = properties['dependencies']
+    PropertyNames   = properties['propertyNames']
+    Const          = properties['const']
+    Enum          = properties['enum']
+    Type         = properties['type']
+    Format      = properties['format']
+    AllOf      = properties['allOf']
+    AnyOf     = properties['anyOf']
+    OneOf    = properties['oneOf']
+    Not     = properties['not']
+
+    SchemaArray              = definitions['schemaArray']
+    NonNegativeInteger        = definitions['nonNegativeInteger']
+    NonNegativeIntegerDefault0 = definitions['nonNegativeIntegerDefault0']
+    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 SchemaArray
+    end
+    module NonNegativeInteger
+    end
+    module NonNegativeIntegerDefault0
+    end
+    module SimpleType
+    end
+    module StringArray
+    end
+
+    Example = Examples.items
+    Dependencies::Dependency = Dependencies.additionalProperties
+    Type::Array = Type.anyOf[1]
+    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
   end
 end

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

@@ -2,13 +2,197 @@
 
 module JSI
   metaschema_document = ::JSON.parse(SCHEMAS_PATH.join('json-schema.org/draft-07/schema.json').read)
-  JSONSchemaOrgDraft07 = MetaschemaNode.new(metaschema_document,
+  JSONSchemaDraft07 = JSI.new_metaschema_module(metaschema_document,
     schema_implementation_modules: [JSI::Schema::Draft07],
-  ).jsi_schema_module
+  )
 
   # the JSI schema module for `http://json-schema.org/draft-07/schema`
-  module JSONSchemaOrgDraft07
-    # @!parse extend JSI::DescribesSchemaModule
+  module JSONSchemaDraft07
+    # @!parse extend JSI::SchemaModule::MetaSchemaModule
     # @!parse include JSI::Schema::Draft07
+
+
+    Id     = properties['$id']
+    Xschema = properties['$schema']
+    Ref      = properties['$ref']
+    Comment   = properties['$comment']
+    Title      = properties['title']
+    Description = properties['description']
+    Default     = properties['default']
+    ReadOnly     = properties['readOnly']
+    Examples      = properties['examples']
+    MultipleOf     = properties['multipleOf']
+    Maximum         = properties['maximum']
+    ExclusiveMaximum = properties['exclusiveMaximum']
+    Minimum          = properties['minimum']
+    ExclusiveMinimum = properties['exclusiveMinimum']
+    MaxLength       = properties['maxLength']
+    MinLength      = properties['minLength']
+    Pattern        = properties['pattern']
+    AdditionalItems = properties['additionalItems']
+    Items          = properties['items']
+    MaxItems      = properties['maxItems']
+    MinItems       = properties['minItems']
+    UniqueItems     = properties['uniqueItems']
+    Contains         = properties['contains']
+    MaxProperties     = properties['maxProperties']
+    MinProperties      = properties['minProperties']
+    Required            = properties['required']
+    AdditionalProperties = properties['additionalProperties']
+    Definitions         = properties['definitions']
+    Properties         = properties['properties']
+    PatternProperties = properties['patternProperties']
+    Dependencies     = properties['dependencies']
+    PropertyNames   = properties['propertyNames']
+    Const          = properties['const']
+    Enum          = properties['enum']
+    Type           = properties['type']
+    Format          = properties['format']
+    ContentMediaType = properties['contentMediaType']
+    ContentEncoding = properties['contentEncoding']
+    If             = properties['if']
+    Then          = properties['then']
+    Else         = properties['else']
+    AllOf       = properties['allOf']
+    AnyOf      = properties['anyOf']
+    OneOf     = properties['oneOf']
+    Not      = properties['not']
+
+    SchemaArray              = definitions['schemaArray']
+    NonNegativeInteger        = definitions['nonNegativeInteger']
+    NonNegativeIntegerDefault0 = definitions['nonNegativeIntegerDefault0']
+    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 SchemaArray
+    end
+    module NonNegativeInteger
+    end
+    module NonNegativeIntegerDefault0
+    end
+    module SimpleType
+    end
+    module StringArray
+    end
+
+    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
+
+    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
   end
 end

data/readme.rb

@@ -59,7 +59,7 @@ bill = Contact.new_jsi({
     }
   ],
   "nickname" => "big b",
-})
+}, mutable: true)
 
 print 'bill: '
 pp bill

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jsi
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.1
 platform: ruby
 authors:
 - Ethan
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-10 00:00:00.000000000 Z
+date: 2024-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.3'
+- !ruby/object:Gem::Dependency
+  name: bigdecimal
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: JSI offers an Object-Oriented representation for JSON data using JSON
   Schemas
 email:
@@ -39,9 +53,9 @@ files:
 - jsi.gemspec
 - lib/jsi.rb
 - lib/jsi/base.rb
+- lib/jsi/base/mutability.rb
 - lib/jsi/base/node.rb
 - lib/jsi/jsi_coder.rb
-- lib/jsi/metaschema.rb
 - lib/jsi/metaschema_node.rb
 - lib/jsi/metaschema_node/bootstrap_schema.rb
 - lib/jsi/ptr.rb
@@ -75,7 +89,6 @@ files:
 - lib/jsi/schema/validation/array.rb
 - lib/jsi/schema/validation/const.rb
 - lib/jsi/schema/validation/contains.rb
-- lib/jsi/schema/validation/core.rb
 - lib/jsi/schema/validation/dependencies.rb
 - lib/jsi/schema/validation/draft04.rb
 - lib/jsi/schema/validation/draft04/minmax.rb
@@ -102,6 +115,7 @@ files:
 - lib/jsi/util.rb
 - lib/jsi/util/private.rb
 - lib/jsi/util/private/attr_struct.rb
+- lib/jsi/util/private/memo_map.rb
 - lib/jsi/util/typelike.rb
 - lib/jsi/validation.rb
 - lib/jsi/validation/error.rb
@@ -133,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.10
 signing_key:
 specification_version: 4
 summary: 'JSI: JSON Schema Instantiation'

data/lib/jsi/metaschema.rb

@@ -1,6 +0,0 @@
-# frozen_string_literal: true
-
-module JSI
-  module Metaschema
-  end
-end

data/lib/jsi/schema/validation/core.rb

@@ -1,39 +0,0 @@
-# frozen_string_literal: true
-
-module JSI
-  module Schema::Validation::Core
-    # validates the given instance against this schema
-    #
-    # @private
-    # @param instance_ptr [JSI::Ptr] a pointer to the instance to validate against the schema, in the instance_document
-    # @param instance_document [#to_hash, #to_ary, Object] document containing the instance instance_ptr pointer points to
-    # @param validate_only [Boolean] whether to return a full schema validation result or a simple, validation-only result
-    # @param visited_refs [Enumerable<JSI::Schema::Ref>]
-    # @return [JSI::Validation::Result]
-    def internal_validate_instance(instance_ptr, instance_document, validate_only: false, visited_refs: [])
-      if validate_only
-        result = JSI::Validation::VALID
-      else
-        result = JSI::Validation::FullResult.new
-      end
-      result_builder = result.builder(self, instance_ptr, instance_document, validate_only, visited_refs)
-
-      catch(:jsi_validation_result) do
-        # note: true/false are not valid as schemas in draft 4; they are only values of
-        # additionalProperties / additionalItems. since their behavior is undefined, though,
-        # it's fine for them to behave the same as boolean schemas in later drafts.
-        # I don't care about draft 4 to implement a different structuring for that.
-        if schema_content == true
-          # noop
-        elsif schema_content == false
-          result_builder.validate(false, 'instance is not valid against `false` schema')
-        elsif schema_content.respond_to?(:to_hash)
-          internal_validate_keywords(result_builder)
-        else
-          result_builder.schema_error('schema is not a boolean or a JSON object')
-        end
-        result
-      end.freeze
-    end
-  end
-end