json-merge 7.0.0 → 7.1.3
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- checksums.yaml.gz.sig +0 -0
- data/LICENSE.md +13 -0
- data/README.md +600 -0
- data/lib/json/merge/comment_tracker.rb +27 -0
- data/lib/json/merge/conflict_resolver.rb +1379 -0
- data/lib/json/merge/debug_logger.rb +41 -0
- data/lib/json/merge/emitter.rb +227 -0
- data/lib/json/merge/file_analysis.rb +355 -0
- data/lib/json/merge/freeze_node.rb +62 -0
- data/lib/json/merge/merge_result.rb +156 -0
- data/lib/json/merge/node_wrapper.rb +258 -0
- data/lib/json/merge/object_match_refiner.rb +338 -0
- data/lib/json/merge/provider.rb +696 -0
- data/lib/json/merge/smart_merger.rb +276 -0
- data/lib/json/merge/source_locator.rb +68 -0
- data/lib/json/merge/three_way_decision.rb +168 -0
- data/lib/json/merge/version.rb +5 -3
- data/lib/json/merge.rb +393 -266
- data/lib/json-merge.rb +7 -1
- data/sig/json/merge.rbs +54 -0
- data.tar.gz.sig +0 -0
- metadata +264 -15
- metadata.gz.sig +0 -0
data/lib/json-merge.rb
CHANGED
data/sig/json/merge.rbs
ADDED
|
@@ -0,0 +1,54 @@
|
|
|
1
|
+
module Json
|
|
2
|
+
module Merge
|
|
3
|
+
class Provider
|
|
4
|
+
def provider_id: () -> String
|
|
5
|
+
def family: () -> String
|
|
6
|
+
def capabilities: () -> Ast::Merge::provider_capabilities
|
|
7
|
+
def analyze: (Ast::Merge::provider_request request) -> Ast::Merge::provider_result
|
|
8
|
+
def diff2: (Ast::Merge::provider_request request) -> Ast::Merge::provider_result
|
|
9
|
+
def merge2: (Ast::Merge::provider_request request) -> Ast::Merge::provider_result
|
|
10
|
+
def merge3: (Ast::Merge::provider_request request) -> Ast::Merge::provider_result
|
|
11
|
+
end
|
|
12
|
+
|
|
13
|
+
class SourceLocator
|
|
14
|
+
class Range < Data
|
|
15
|
+
attr_reader start_line: Integer
|
|
16
|
+
attr_reader end_line: Integer
|
|
17
|
+
end
|
|
18
|
+
|
|
19
|
+
def initialize: (String source, dialect: Symbol, ?backend: String | Symbol?) -> void
|
|
20
|
+
def pair_range: (String path) -> Range?
|
|
21
|
+
end
|
|
22
|
+
|
|
23
|
+
def self.merge_provider: () -> Provider
|
|
24
|
+
def self.register_provider!: (?replace: bool) -> Ast::Merge::_MergeProvider
|
|
25
|
+
|
|
26
|
+
class ThreeWayDecision
|
|
27
|
+
class State < Data
|
|
28
|
+
attr_reader present: bool
|
|
29
|
+
attr_reader value: untyped
|
|
30
|
+
|
|
31
|
+
def self.present: (untyped value) -> State
|
|
32
|
+
def self.missing: () -> State
|
|
33
|
+
def to_h: () -> Hash[Symbol, untyped]
|
|
34
|
+
end
|
|
35
|
+
|
|
36
|
+
class Result < Data
|
|
37
|
+
attr_reader state: State
|
|
38
|
+
attr_reader conflicts: Array[Hash[Symbol, untyped]]
|
|
39
|
+
attr_reader changes: Array[Hash[Symbol, untyped]]
|
|
40
|
+
|
|
41
|
+
def present?: () -> bool
|
|
42
|
+
def value: () -> untyped
|
|
43
|
+
def conflicted?: () -> bool
|
|
44
|
+
end
|
|
45
|
+
|
|
46
|
+
def call: (base: untyped, ours: untyped, theirs: untyped) -> Result
|
|
47
|
+
end
|
|
48
|
+
|
|
49
|
+
module Version
|
|
50
|
+
VERSION: String
|
|
51
|
+
end
|
|
52
|
+
VERSION: String
|
|
53
|
+
end
|
|
54
|
+
end
|
data.tar.gz.sig
CHANGED
|
Binary file
|
metadata
CHANGED
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: json-merge
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 7.
|
|
4
|
+
version: 7.1.3
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Peter H. Boling
|
|
8
|
-
bindir:
|
|
8
|
+
bindir: exe
|
|
9
9
|
cert_chain:
|
|
10
10
|
- |
|
|
11
11
|
-----BEGIN CERTIFICATE-----
|
|
@@ -43,54 +43,303 @@ dependencies:
|
|
|
43
43
|
requirements:
|
|
44
44
|
- - '='
|
|
45
45
|
- !ruby/object:Gem::Version
|
|
46
|
-
version: 7.
|
|
46
|
+
version: 7.1.3
|
|
47
47
|
type: :runtime
|
|
48
48
|
prerelease: false
|
|
49
49
|
version_requirements: !ruby/object:Gem::Requirement
|
|
50
50
|
requirements:
|
|
51
51
|
- - '='
|
|
52
52
|
- !ruby/object:Gem::Version
|
|
53
|
-
version: 7.
|
|
53
|
+
version: 7.1.3
|
|
54
54
|
- !ruby/object:Gem::Dependency
|
|
55
55
|
name: tree_haver
|
|
56
56
|
requirement: !ruby/object:Gem::Requirement
|
|
57
57
|
requirements:
|
|
58
58
|
- - '='
|
|
59
59
|
- !ruby/object:Gem::Version
|
|
60
|
-
version: 7.
|
|
60
|
+
version: 7.1.3
|
|
61
61
|
type: :runtime
|
|
62
62
|
prerelease: false
|
|
63
63
|
version_requirements: !ruby/object:Gem::Requirement
|
|
64
64
|
requirements:
|
|
65
65
|
- - '='
|
|
66
66
|
- !ruby/object:Gem::Version
|
|
67
|
-
version: 7.
|
|
68
|
-
|
|
69
|
-
|
|
67
|
+
version: 7.1.3
|
|
68
|
+
- !ruby/object:Gem::Dependency
|
|
69
|
+
name: version_gem
|
|
70
|
+
requirement: !ruby/object:Gem::Requirement
|
|
71
|
+
requirements:
|
|
72
|
+
- - "~>"
|
|
73
|
+
- !ruby/object:Gem::Version
|
|
74
|
+
version: '1.1'
|
|
75
|
+
- - ">="
|
|
76
|
+
- !ruby/object:Gem::Version
|
|
77
|
+
version: 1.1.15
|
|
78
|
+
type: :runtime
|
|
79
|
+
prerelease: false
|
|
80
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
81
|
+
requirements:
|
|
82
|
+
- - "~>"
|
|
83
|
+
- !ruby/object:Gem::Version
|
|
84
|
+
version: '1.1'
|
|
85
|
+
- - ">="
|
|
86
|
+
- !ruby/object:Gem::Version
|
|
87
|
+
version: 1.1.15
|
|
88
|
+
- !ruby/object:Gem::Dependency
|
|
89
|
+
name: kettle-dev
|
|
90
|
+
requirement: !ruby/object:Gem::Requirement
|
|
91
|
+
requirements:
|
|
92
|
+
- - "~>"
|
|
93
|
+
- !ruby/object:Gem::Version
|
|
94
|
+
version: '3.0'
|
|
95
|
+
- - ">="
|
|
96
|
+
- !ruby/object:Gem::Version
|
|
97
|
+
version: 3.0.0
|
|
98
|
+
type: :development
|
|
99
|
+
prerelease: false
|
|
100
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
101
|
+
requirements:
|
|
102
|
+
- - "~>"
|
|
103
|
+
- !ruby/object:Gem::Version
|
|
104
|
+
version: '3.0'
|
|
105
|
+
- - ">="
|
|
106
|
+
- !ruby/object:Gem::Version
|
|
107
|
+
version: 3.0.0
|
|
108
|
+
- !ruby/object:Gem::Dependency
|
|
109
|
+
name: bundler-audit
|
|
110
|
+
requirement: !ruby/object:Gem::Requirement
|
|
111
|
+
requirements:
|
|
112
|
+
- - "~>"
|
|
113
|
+
- !ruby/object:Gem::Version
|
|
114
|
+
version: 0.9.3
|
|
115
|
+
type: :development
|
|
116
|
+
prerelease: false
|
|
117
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
118
|
+
requirements:
|
|
119
|
+
- - "~>"
|
|
120
|
+
- !ruby/object:Gem::Version
|
|
121
|
+
version: 0.9.3
|
|
122
|
+
- !ruby/object:Gem::Dependency
|
|
123
|
+
name: rake
|
|
124
|
+
requirement: !ruby/object:Gem::Requirement
|
|
125
|
+
requirements:
|
|
126
|
+
- - "~>"
|
|
127
|
+
- !ruby/object:Gem::Version
|
|
128
|
+
version: '13.0'
|
|
129
|
+
type: :development
|
|
130
|
+
prerelease: false
|
|
131
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
132
|
+
requirements:
|
|
133
|
+
- - "~>"
|
|
134
|
+
- !ruby/object:Gem::Version
|
|
135
|
+
version: '13.0'
|
|
136
|
+
- !ruby/object:Gem::Dependency
|
|
137
|
+
name: require_bench
|
|
138
|
+
requirement: !ruby/object:Gem::Requirement
|
|
139
|
+
requirements:
|
|
140
|
+
- - "~>"
|
|
141
|
+
- !ruby/object:Gem::Version
|
|
142
|
+
version: '1.0'
|
|
143
|
+
- - ">="
|
|
144
|
+
- !ruby/object:Gem::Version
|
|
145
|
+
version: 1.0.4
|
|
146
|
+
type: :development
|
|
147
|
+
prerelease: false
|
|
148
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
149
|
+
requirements:
|
|
150
|
+
- - "~>"
|
|
151
|
+
- !ruby/object:Gem::Version
|
|
152
|
+
version: '1.0'
|
|
153
|
+
- - ">="
|
|
154
|
+
- !ruby/object:Gem::Version
|
|
155
|
+
version: 1.0.4
|
|
156
|
+
- !ruby/object:Gem::Dependency
|
|
157
|
+
name: anonymous_loader
|
|
158
|
+
requirement: !ruby/object:Gem::Requirement
|
|
159
|
+
requirements:
|
|
160
|
+
- - "~>"
|
|
161
|
+
- !ruby/object:Gem::Version
|
|
162
|
+
version: '0.1'
|
|
163
|
+
- - ">="
|
|
164
|
+
- !ruby/object:Gem::Version
|
|
165
|
+
version: 0.1.3
|
|
166
|
+
type: :development
|
|
167
|
+
prerelease: false
|
|
168
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
169
|
+
requirements:
|
|
170
|
+
- - "~>"
|
|
171
|
+
- !ruby/object:Gem::Version
|
|
172
|
+
version: '0.1'
|
|
173
|
+
- - ">="
|
|
174
|
+
- !ruby/object:Gem::Version
|
|
175
|
+
version: 0.1.3
|
|
176
|
+
- !ruby/object:Gem::Dependency
|
|
177
|
+
name: appraisal2
|
|
178
|
+
requirement: !ruby/object:Gem::Requirement
|
|
179
|
+
requirements:
|
|
180
|
+
- - "~>"
|
|
181
|
+
- !ruby/object:Gem::Version
|
|
182
|
+
version: '3.2'
|
|
183
|
+
- - ">="
|
|
184
|
+
- !ruby/object:Gem::Version
|
|
185
|
+
version: 3.2.2
|
|
186
|
+
type: :development
|
|
187
|
+
prerelease: false
|
|
188
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
189
|
+
requirements:
|
|
190
|
+
- - "~>"
|
|
191
|
+
- !ruby/object:Gem::Version
|
|
192
|
+
version: '3.2'
|
|
193
|
+
- - ">="
|
|
194
|
+
- !ruby/object:Gem::Version
|
|
195
|
+
version: 3.2.2
|
|
196
|
+
- !ruby/object:Gem::Dependency
|
|
197
|
+
name: kettle-test
|
|
198
|
+
requirement: !ruby/object:Gem::Requirement
|
|
199
|
+
requirements:
|
|
200
|
+
- - "~>"
|
|
201
|
+
- !ruby/object:Gem::Version
|
|
202
|
+
version: '2.0'
|
|
203
|
+
- - ">="
|
|
204
|
+
- !ruby/object:Gem::Version
|
|
205
|
+
version: 2.0.19
|
|
206
|
+
type: :development
|
|
207
|
+
prerelease: false
|
|
208
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
209
|
+
requirements:
|
|
210
|
+
- - "~>"
|
|
211
|
+
- !ruby/object:Gem::Version
|
|
212
|
+
version: '2.0'
|
|
213
|
+
- - ">="
|
|
214
|
+
- !ruby/object:Gem::Version
|
|
215
|
+
version: 2.0.19
|
|
216
|
+
- !ruby/object:Gem::Dependency
|
|
217
|
+
name: turbo_tests2
|
|
218
|
+
requirement: !ruby/object:Gem::Requirement
|
|
219
|
+
requirements:
|
|
220
|
+
- - "~>"
|
|
221
|
+
- !ruby/object:Gem::Version
|
|
222
|
+
version: '3.2'
|
|
223
|
+
- - ">="
|
|
224
|
+
- !ruby/object:Gem::Version
|
|
225
|
+
version: 3.2.5
|
|
226
|
+
type: :development
|
|
227
|
+
prerelease: false
|
|
228
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
229
|
+
requirements:
|
|
230
|
+
- - "~>"
|
|
231
|
+
- !ruby/object:Gem::Version
|
|
232
|
+
version: '3.2'
|
|
233
|
+
- - ">="
|
|
234
|
+
- !ruby/object:Gem::Version
|
|
235
|
+
version: 3.2.5
|
|
236
|
+
- !ruby/object:Gem::Dependency
|
|
237
|
+
name: ruby-progressbar
|
|
238
|
+
requirement: !ruby/object:Gem::Requirement
|
|
239
|
+
requirements:
|
|
240
|
+
- - "~>"
|
|
241
|
+
- !ruby/object:Gem::Version
|
|
242
|
+
version: '1.13'
|
|
243
|
+
type: :development
|
|
244
|
+
prerelease: false
|
|
245
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
246
|
+
requirements:
|
|
247
|
+
- - "~>"
|
|
248
|
+
- !ruby/object:Gem::Version
|
|
249
|
+
version: '1.13'
|
|
250
|
+
- !ruby/object:Gem::Dependency
|
|
251
|
+
name: stone_checksums
|
|
252
|
+
requirement: !ruby/object:Gem::Requirement
|
|
253
|
+
requirements:
|
|
254
|
+
- - "~>"
|
|
255
|
+
- !ruby/object:Gem::Version
|
|
256
|
+
version: '1.0'
|
|
257
|
+
- - ">="
|
|
258
|
+
- !ruby/object:Gem::Version
|
|
259
|
+
version: 1.0.8
|
|
260
|
+
type: :development
|
|
261
|
+
prerelease: false
|
|
262
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
263
|
+
requirements:
|
|
264
|
+
- - "~>"
|
|
265
|
+
- !ruby/object:Gem::Version
|
|
266
|
+
version: '1.0'
|
|
267
|
+
- - ">="
|
|
268
|
+
- !ruby/object:Gem::Version
|
|
269
|
+
version: 1.0.8
|
|
270
|
+
- !ruby/object:Gem::Dependency
|
|
271
|
+
name: gitmoji-regex
|
|
272
|
+
requirement: !ruby/object:Gem::Requirement
|
|
273
|
+
requirements:
|
|
274
|
+
- - "~>"
|
|
275
|
+
- !ruby/object:Gem::Version
|
|
276
|
+
version: '2.0'
|
|
277
|
+
- - ">="
|
|
278
|
+
- !ruby/object:Gem::Version
|
|
279
|
+
version: 2.0.11
|
|
280
|
+
type: :development
|
|
281
|
+
prerelease: false
|
|
282
|
+
version_requirements: !ruby/object:Gem::Requirement
|
|
283
|
+
requirements:
|
|
284
|
+
- - "~>"
|
|
285
|
+
- !ruby/object:Gem::Version
|
|
286
|
+
version: '2.0'
|
|
287
|
+
- - ">="
|
|
288
|
+
- !ruby/object:Gem::Version
|
|
289
|
+
version: 2.0.11
|
|
290
|
+
description: "☯️ Portable JSON and JSONC analysis, owner matching, fallback, and merge
|
|
291
|
+
behavior for Structured Merge."
|
|
70
292
|
email:
|
|
71
|
-
-
|
|
293
|
+
- floss@galtzo.com
|
|
72
294
|
executables: []
|
|
73
295
|
extensions: []
|
|
74
296
|
extra_rdoc_files: []
|
|
75
297
|
files:
|
|
298
|
+
- LICENSE.md
|
|
299
|
+
- README.md
|
|
76
300
|
- lib/json-merge.rb
|
|
77
301
|
- lib/json/merge.rb
|
|
302
|
+
- lib/json/merge/comment_tracker.rb
|
|
303
|
+
- lib/json/merge/conflict_resolver.rb
|
|
304
|
+
- lib/json/merge/debug_logger.rb
|
|
305
|
+
- lib/json/merge/emitter.rb
|
|
306
|
+
- lib/json/merge/file_analysis.rb
|
|
307
|
+
- lib/json/merge/freeze_node.rb
|
|
308
|
+
- lib/json/merge/merge_result.rb
|
|
309
|
+
- lib/json/merge/node_wrapper.rb
|
|
310
|
+
- lib/json/merge/object_match_refiner.rb
|
|
311
|
+
- lib/json/merge/provider.rb
|
|
312
|
+
- lib/json/merge/smart_merger.rb
|
|
313
|
+
- lib/json/merge/source_locator.rb
|
|
314
|
+
- lib/json/merge/three_way_decision.rb
|
|
78
315
|
- lib/json/merge/version.rb
|
|
316
|
+
- sig/json/merge.rbs
|
|
79
317
|
homepage: https://github.com/structuredmerge/structuredmerge-ruby
|
|
80
318
|
licenses:
|
|
81
319
|
- AGPL-3.0-only
|
|
82
320
|
- PolyForm-Small-Business-1.0.0
|
|
83
321
|
metadata:
|
|
84
322
|
homepage_uri: https://structuredmerge.org
|
|
85
|
-
source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.
|
|
86
|
-
changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.
|
|
323
|
+
source_code_uri: https://github.com/structuredmerge/structuredmerge-ruby/tree/v7.1.3
|
|
324
|
+
changelog_uri: https://github.com/structuredmerge/structuredmerge-ruby/blob/v7.1.3/CHANGELOG.md
|
|
87
325
|
bug_tracker_uri: https://github.com/structuredmerge/structuredmerge-ruby/issues
|
|
88
|
-
documentation_uri: https://www.rubydoc.info/gems/json-merge/7.
|
|
326
|
+
documentation_uri: https://www.rubydoc.info/gems/json-merge/7.1.3
|
|
89
327
|
funding_uri: https://github.com/sponsors/pboling
|
|
90
328
|
wiki_uri: https://github.com/structuredmerge/structuredmerge-ruby/wiki
|
|
329
|
+
news_uri: https://www.railsbling.com/tags/json-merge
|
|
91
330
|
discord_uri: https://discord.gg/3qme4XHNKN
|
|
331
|
+
mailing_list_uri: https://www.rubyforum.org/tag/structuredmerge
|
|
92
332
|
rubygems_mfa_required: 'true'
|
|
93
|
-
rdoc_options:
|
|
333
|
+
rdoc_options:
|
|
334
|
+
- "--title"
|
|
335
|
+
- json-merge - ☯️ Structured Merge JSON analysis and merge for Ruby
|
|
336
|
+
- "--main"
|
|
337
|
+
- README.md
|
|
338
|
+
- "--exclude"
|
|
339
|
+
- "^sig/"
|
|
340
|
+
- "--line-numbers"
|
|
341
|
+
- "--inline-source"
|
|
342
|
+
- "--quiet"
|
|
94
343
|
require_paths:
|
|
95
344
|
- lib
|
|
96
345
|
required_ruby_version: !ruby/object:Gem::Requirement
|
|
@@ -104,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
104
353
|
- !ruby/object:Gem::Version
|
|
105
354
|
version: '0'
|
|
106
355
|
requirements: []
|
|
107
|
-
rubygems_version: 4.0.
|
|
356
|
+
rubygems_version: 4.0.17
|
|
108
357
|
specification_version: 4
|
|
109
|
-
summary: Structured Merge JSON analysis and merge for Ruby
|
|
358
|
+
summary: "☯️ Structured Merge JSON analysis and merge for Ruby"
|
|
110
359
|
test_files: []
|
metadata.gz.sig
CHANGED
|
Binary file
|