json-merge 7.1.9 → 7.1.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0abd0b68d17376c3f60d55ec94aeb8b121fa36133eabd674189f69ac8c0ae2ef
-  data.tar.gz: ebb06de9915928034b4c71e7d87157c1f3b5b0762f77ef808a92bd08407b06fc
+  metadata.gz: 68bd0996bc68a9790851b876e22a6c161d544372a51a8346708519e1b01fb18c
+  data.tar.gz: 5ac83977dc521465ced04f1ccc66b8a367ccfcd6440ec2e0e6fe8185b2d99ac4
 SHA512:
-  metadata.gz: a3fadb448059c6340dae4a861a4e95e95ab5acd3a48d70ba4d7fd21c86976387aa313a864e0b08331dd46e1e94bb64c58066147ae9fc0826fc62ab2fbb5e9e16
-  data.tar.gz: 5ebf35516e8ae03b732cc145719cc0ceb0c491141769edb205476ce83e6ba5b52010d5d384b647efaee7a2c44968aeac5aa576064858ead25cefdea4af378bcf
+  metadata.gz: 4270eb2c3a5dcb13bea3cdb200695a2c4e664ec806e6a66d7dd473881726eb9f74fbe3e598dfd519049f8e1ab972a6dbd349a5fe5c1162795b57ad96ba377785
+  data.tar.gz: 05bce7e1079e1f9871fa7628aaf27716a6fdc13e1475ac443bfabc82bf3e6f63127aa0dd833975b14527b0575c9bb9b3fbe9f4920ff15eb12a0a7736fa9f2150

data/lib/json/merge/rust_host_provider.rb

@@ -0,0 +1,12 @@
+# frozen_string_literal: true
+
+require 'ast/merge'
+require_relative 'typed_core_provider'
+
+module Json
+  module Merge
+    # Compatibility name; no prototype dependency or host-owned merge logic.
+    class RustHostProvider < TypedCoreProvider
+    end
+  end
+end

data/lib/json/merge/typed_core_provider.rb

@@ -0,0 +1,20 @@
+# frozen_string_literal: true
+
+require 'ast/merge/typed_core_provider'
+
+module Json
+  module Merge
+    class TypedCoreProvider < Ast::Merge::TypedCoreProvider
+      PROVIDER_ID = 'rust.json'
+      FAMILY = 'json'
+      OPERATIONS = %i[analyze diff2 merge2 merge3].freeze
+      CORE_PROVIDER = 'kernel.json'
+      CORE_PROFILE = 'kernel.json.nested.v1'
+      PACKAGE = 'json-merge'
+
+      private
+
+      def package_version = Json::Merge::Version::VERSION
+    end
+  end
+end

data/lib/json/merge/version.rb

@@ -5,7 +5,7 @@ module Json
     # Version namespace for this gem.
     module Version
       # Current gem version.
-      VERSION = '7.1.9'
+      VERSION = '7.1.10'
     end
     # Current gem version exposed at the traditional constant location.
     VERSION = Version::VERSION # Traditional Constant Location

data/lib/json/merge.rb

@@ -39,13 +39,19 @@ module Json
     autoload :SmartMerger, 'json/merge/smart_merger'
     autoload :ObjectMatchRefiner, 'json/merge/object_match_refiner'
     autoload :Provider, 'json/merge/provider'
+    autoload :RustHostProvider, 'json/merge/rust_host_provider'
     autoload :SourceLocator, 'json/merge/source_locator'
     autoload :ThreeWayDecision, 'json/merge/three_way_decision'
 
     class << self
       def register_backend!
         BACKEND_REGISTRY.mutex.synchronize do
-          return if BACKEND_REGISTRY.registered
+          # Only treat registration as complete when a JSON grammar actually
+          # registered; a transient TSLP hot-load failure (e.g. a failed
+          # on-demand grammar download) must stay retryable on later calls
+          # instead of latching "No parser registered for json" for the
+          # lifetime of the process.
+          return if BACKEND_REGISTRY.registered && TreeHaver.registered_languages(:json).any?
 
           TreeHaver::BackendRegistry.register(TREE_SITTER_BACKEND)
 
@@ -78,6 +84,14 @@ module Json
       Ast::Merge.register_provider(merge_provider, replace: replace)
     end
 
+    def rust_host_provider
+      @rust_host_provider ||= RustHostProvider.new
+    end
+
+    def register_rust_host_provider!(replace: false)
+      Ast::Merge.register_provider(rust_host_provider, replace: replace)
+    end
+
     def available_json_backends
       json_backend_available_for_analysis?(TREE_SITTER_BACKEND.id) ? [TREE_SITTER_BACKEND] : []
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: json-merge
 version: !ruby/object:Gem::Version
-  version: 7.1.9
+  version: 7.1.10
 platform: ruby
 authors:
 - Peter H. Boling
@@ -43,28 +43,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
 - !ruby/object:Gem::Dependency
   name: tree_haver
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 7.1.9
+        version: 7.1.10
 - !ruby/object:Gem::Dependency
   name: version_gem
   requirement: !ruby/object:Gem::Requirement
@@ -91,20 +91,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.8
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3.1'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.0.34
+        version: 3.1.8
 - !ruby/object:Gem::Dependency
   name: bundler-audit
   requirement: !ruby/object:Gem::Requirement
@@ -182,7 +182,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -192,7 +192,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.3
+        version: 3.2.5
 - !ruby/object:Gem::Dependency
   name: kettle-test
   requirement: !ruby/object:Gem::Requirement
@@ -202,7 +202,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.23
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -212,7 +212,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.21
+        version: 2.0.23
 - !ruby/object:Gem::Dependency
   name: turbo_tests2
   requirement: !ruby/object:Gem::Requirement
@@ -222,7 +222,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.14
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -232,7 +232,7 @@ dependencies:
         version: '3.2'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 3.2.7
+        version: 3.2.14
 - !ruby/object:Gem::Dependency
   name: ruby-progressbar
   requirement: !ruby/object:Gem::Requirement
@@ -256,7 +256,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -266,7 +266,7 @@ dependencies:
         version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.0.8
+        version: 1.0.9
 - !ruby/object:Gem::Dependency
   name: gitmoji-regex
   requirement: !ruby/object:Gem::Requirement
@@ -276,7 +276,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -286,7 +286,7 @@ dependencies:
         version: '2.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.0.12
+        version: 2.0.15
 description: "☯️ Portable JSON and JSONC analysis, owner matching, fallback, and merge
   behavior for Structured Merge."
 email:
@@ -309,9 +309,11 @@ files:
 - lib/json/merge/node_wrapper.rb
 - lib/json/merge/object_match_refiner.rb
 - lib/json/merge/provider.rb
+- lib/json/merge/rust_host_provider.rb
 - lib/json/merge/smart_merger.rb
 - lib/json/merge/source_locator.rb
 - lib/json/merge/three_way_decision.rb
+- lib/json/merge/typed_core_provider.rb
 - lib/json/merge/version.rb
 - sig/json/merge.rbs
 homepage: https://github.com/structuredmerge/structuredmerge-ruby
@@ -320,10 +322,10 @@ licenses:
 - PolyForm-Small-Business-1.0.0
 metadata:
   homepage_uri: https://structuredmerge.org
-  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.9
-  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.9/CHANGELOG.md
+  source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.10
+  changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.10/CHANGELOG.md
   bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
-  documentation_uri: https://www.rubydoc.info/gems/json-merge/7.1.9
+  documentation_uri: https://www.rubydoc.info/gems/json-merge/7.1.10
   funding_uri: https://github.com/sponsors/pboling
   wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
   news_uri: https://www.railsbling.com/tags/json-merge
@@ -353,7 +355,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.17
+rubygems_version: 4.0.20
 specification_version: 4
 summary: "☯️ Structured Merge JSON analysis and merge for Ruby"
 test_files: []