rbs_activesupport 1.4.1 → 1.4.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.
Files changed (8) hide show
  1. checksums.yaml +4 -4
  2. data/.vscode/settings.json +9 -1
  3. data/lib/rbs_activesupport/ast.rb +9 -2
  4. data/lib/rbs_activesupport/declaration_builder.rb +18 -3
  5. data/lib/rbs_activesupport/version.rb +1 -1
  6. data/rbs_collection.lock.yaml +21 -21
  7. data/sig/rbs_activesupport/declaration_builder.rbs +2 -0
  8. metadata +2 -2
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA256:
3
- metadata.gz: 4ae53360ab164472d4e7ec85deda07504d139bfb1ae654bdaac8589f0f9d191a
4
- data.tar.gz: 32da6fa5ac99c059b2625c82b72c6e354e1980a549bff337094cd8bc15ac0e94
3
+ metadata.gz: c3ce460ddb405b00eeeff23d9118d5f8f4fd55fb5aef03aa8b8d5ff2c1ba6cb4
4
+ data.tar.gz: df9044c57407d295daeef3781715b7345f49c87275cc9327b08814b501077dad
5
5
  SHA512:
6
- metadata.gz: 35a5f3ede5ab15f4524766710314749425225fad5ab8f6f88c1394ebd82f8df858814b6dd401ca768d7b1183db46ae9e9d3eaa2242c79b5a670152e339c5f1b6
7
- data.tar.gz: 53d1b808b66ae6e3c5ae421e61267bfc2d2ce86e3c7ad02be163c94a70d4611af0c148ed6a825460dd4f4c7bb2923bcb12871cd3fa087377dd1facd5a123a7a8
6
+ metadata.gz: b35f6bba26bb000cf6f0dd23da04d28a870d459c7005c79ba9fcf8cc22806693f3c38792f0c1db185dd3449d29c96576781529a0f3b2bdb18f65afaf21cfbbae
7
+ data.tar.gz: 87267e34c7f2971ae6d500b17a9d76b0acb7e6af93d13556901da7428cc900dd68c8159528a8e56b8b5e3e1e760e5750dd020cf6dbcc0b5b3b93809708814c98
data/.vscode/settings.json CHANGED
@@ -2,8 +2,16 @@
2
2
  "rbs-helper.signature-directory": "sig/",
3
3
  "cSpell.words": [
4
4
  "cattr",
5
+ "classmethods",
5
6
  "Cyclomatic",
6
- "mattr"
7
+ "DEFN",
8
+ "FCALL",
9
+ "mattr",
10
+ "mkpath",
11
+ "rmtree",
12
+ "tasklib",
13
+ "VCALL",
14
+ "ZLIST"
7
15
  ],
8
16
  "rbs-helper.rbs-inline-on-save": true,
9
17
  "rbs-helper.rbs-inline-options": "--opt-out --output=sig/"
data/lib/rbs_activesupport/ast.rb CHANGED
@@ -35,8 +35,13 @@ module RbsActivesupport
35
35
  when :LIT, :STR
36
36
  node.children.first
37
37
  when :HASH
38
- elem = node.children.first.children.compact.map { |e| eval_node(e) }
39
- Hash[*elem]
38
+ children = node.children.first&.children
39
+ if children
40
+ items = children.compact.map { |i| eval_node(i) }
41
+ Hash[*items]
42
+ else
43
+ {}
44
+ end
40
45
  when :ZLIST
41
46
  []
42
47
  when :LIST
@@ -53,6 +58,8 @@ module RbsActivesupport
53
58
  eval_node(node.children.first) + RBS::Namespace.new(path: [node.children.last], absolute: false)
54
59
  when :COLON3
55
60
  RBS::Namespace.new(path: node.children, absolute: true)
61
+ when :CALL, :ITER
62
+ node
56
63
  else
57
64
  p node # for debug
58
65
  raise
data/lib/rbs_activesupport/declaration_builder.rb CHANGED
@@ -7,10 +7,12 @@ module RbsActivesupport
7
7
  include AST
8
8
 
9
9
  attr_reader :method_searcher #: MethodSearcher
10
+ attr_reader :included_modules #: Array[RBS::Namespace]
10
11
 
11
12
  # @rbs method_searcher: MethodSearcher
12
13
  def initialize(method_searcher) #: void
13
14
  @method_searcher = method_searcher
15
+ @included_modules = []
14
16
  end
15
17
 
16
18
  # @rbs namespace: RBS::Namespace
@@ -84,14 +86,27 @@ module RbsActivesupport
84
86
  # @rbs namespace: RBS::Namespace
85
87
  # @rbs method_call: Parser::MethodCall
86
88
  # @rbs context: RBS::Namespace?
87
- def build_include(namespace, method_call, context) #: Array[t]
89
+ def build_include(namespace, method_call, context) #: Array[t] # rubocop:disable Metrics/AbcSize
88
90
  module_paths = eval_include_args(method_call.args)
89
- module_paths.flat_map do |module_path|
91
+ module_paths.delete_if do |module_path|
92
+ unless module_path.is_a?(RBS::Namespace)
93
+ puts "ERROR: #{namespace}:#{method_call.name}: Failed to recognize an included module: #{module_path}"
94
+ true
95
+ end
96
+ end
97
+ module_paths.filter_map do |module_path|
90
98
  include = Include.new(context || namespace, module_path, { private: method_call.private? })
99
+
100
+ if include.module_name
101
+ next if included_modules.include?(include.module_name)
102
+
103
+ included_modules << include.module_name
104
+ end
105
+
91
106
  ([include] +
92
107
  build_method_calls(namespace, include.nested_includes, include.module_name) +
93
108
  build_method_calls(namespace, include.method_calls_in_included_block, include.module_name))
94
- end
109
+ end.flatten
95
110
  end
96
111
 
97
112
  # @rbs decl: t
data/lib/rbs_activesupport/version.rb CHANGED
@@ -1,5 +1,5 @@
1
1
  # frozen_string_literal: true
2
2
 
3
3
  module RbsActivesupport
4
- VERSION = "1.4.1" #: String
4
+ VERSION = "1.4.3" #: String
5
5
  end
data/rbs_collection.lock.yaml CHANGED
@@ -6,7 +6,7 @@ gems:
6
6
  source:
7
7
  type: git
8
8
  name: ruby/gem_rbs_collection
9
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
9
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
10
10
  remote: https://github.com/ruby/gem_rbs_collection.git
11
11
  repo_dir: gems
12
12
  - name: actionview
@@ -14,7 +14,7 @@ gems:
14
14
  source:
15
15
  type: git
16
16
  name: ruby/gem_rbs_collection
17
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
17
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
18
18
  remote: https://github.com/ruby/gem_rbs_collection.git
19
19
  repo_dir: gems
20
20
  - name: activesupport
@@ -22,7 +22,7 @@ gems:
22
22
  source:
23
23
  type: git
24
24
  name: ruby/gem_rbs_collection
25
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
25
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
26
26
  remote: https://github.com/ruby/gem_rbs_collection.git
27
27
  repo_dir: gems
28
28
  - name: ast
@@ -30,7 +30,7 @@ gems:
30
30
  source:
31
31
  type: git
32
32
  name: ruby/gem_rbs_collection
33
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
33
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
34
34
  remote: https://github.com/ruby/gem_rbs_collection.git
35
35
  repo_dir: gems
36
36
  - name: base64
@@ -50,7 +50,7 @@ gems:
50
50
  source:
51
51
  type: git
52
52
  name: ruby/gem_rbs_collection
53
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
53
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
54
54
  remote: https://github.com/ruby/gem_rbs_collection.git
55
55
  repo_dir: gems
56
56
  - name: connection_pool
@@ -58,7 +58,7 @@ gems:
58
58
  source:
59
59
  type: git
60
60
  name: ruby/gem_rbs_collection
61
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
61
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
62
62
  remote: https://github.com/ruby/gem_rbs_collection.git
63
63
  repo_dir: gems
64
64
  - name: date
@@ -86,7 +86,7 @@ gems:
86
86
  source:
87
87
  type: git
88
88
  name: ruby/gem_rbs_collection
89
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
89
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
90
90
  remote: https://github.com/ruby/gem_rbs_collection.git
91
91
  repo_dir: gems
92
92
  - name: io-console
@@ -118,7 +118,7 @@ gems:
118
118
  source:
119
119
  type: git
120
120
  name: ruby/gem_rbs_collection
121
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
121
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
122
122
  remote: https://github.com/ruby/gem_rbs_collection.git
123
123
  repo_dir: gems
124
124
  - name: openssl
@@ -134,7 +134,7 @@ gems:
134
134
  source:
135
135
  type: git
136
136
  name: ruby/gem_rbs_collection
137
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
137
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
138
138
  remote: https://github.com/ruby/gem_rbs_collection.git
139
139
  repo_dir: gems
140
140
  - name: parser
@@ -142,7 +142,7 @@ gems:
142
142
  source:
143
143
  type: git
144
144
  name: ruby/gem_rbs_collection
145
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
145
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
146
146
  remote: https://github.com/ruby/gem_rbs_collection.git
147
147
  repo_dir: gems
148
148
  - name: pathname
@@ -162,7 +162,7 @@ gems:
162
162
  source:
163
163
  type: git
164
164
  name: ruby/gem_rbs_collection
165
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
165
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
166
166
  remote: https://github.com/ruby/gem_rbs_collection.git
167
167
  repo_dir: gems
168
168
  - name: rails-dom-testing
@@ -170,7 +170,7 @@ gems:
170
170
  source:
171
171
  type: git
172
172
  name: ruby/gem_rbs_collection
173
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
173
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
174
174
  remote: https://github.com/ruby/gem_rbs_collection.git
175
175
  repo_dir: gems
176
176
  - name: rails-html-sanitizer
@@ -178,7 +178,7 @@ gems:
178
178
  source:
179
179
  type: git
180
180
  name: ruby/gem_rbs_collection
181
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
181
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
182
182
  remote: https://github.com/ruby/gem_rbs_collection.git
183
183
  repo_dir: gems
184
184
  - name: railties
@@ -186,7 +186,7 @@ gems:
186
186
  source:
187
187
  type: git
188
188
  name: ruby/gem_rbs_collection
189
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
189
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
190
190
  remote: https://github.com/ruby/gem_rbs_collection.git
191
191
  repo_dir: gems
192
192
  - name: rainbow
@@ -194,7 +194,7 @@ gems:
194
194
  source:
195
195
  type: git
196
196
  name: ruby/gem_rbs_collection
197
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
197
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
198
198
  remote: https://github.com/ruby/gem_rbs_collection.git
199
199
  repo_dir: gems
200
200
  - name: rake
@@ -202,7 +202,7 @@ gems:
202
202
  source:
203
203
  type: git
204
204
  name: ruby/gem_rbs_collection
205
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
205
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
206
206
  remote: https://github.com/ruby/gem_rbs_collection.git
207
207
  repo_dir: gems
208
208
  - name: rbs
@@ -218,7 +218,7 @@ gems:
218
218
  source:
219
219
  type: git
220
220
  name: ruby/gem_rbs_collection
221
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
221
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
222
222
  remote: https://github.com/ruby/gem_rbs_collection.git
223
223
  repo_dir: gems
224
224
  - name: ripper
@@ -230,7 +230,7 @@ gems:
230
230
  source:
231
231
  type: git
232
232
  name: ruby/gem_rbs_collection
233
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
233
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
234
234
  remote: https://github.com/ruby/gem_rbs_collection.git
235
235
  repo_dir: gems
236
236
  - name: rubocop-ast
@@ -238,7 +238,7 @@ gems:
238
238
  source:
239
239
  type: git
240
240
  name: ruby/gem_rbs_collection
241
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
241
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
242
242
  remote: https://github.com/ruby/gem_rbs_collection.git
243
243
  repo_dir: gems
244
244
  - name: securerandom
@@ -266,7 +266,7 @@ gems:
266
266
  source:
267
267
  type: git
268
268
  name: ruby/gem_rbs_collection
269
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
269
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
270
270
  remote: https://github.com/ruby/gem_rbs_collection.git
271
271
  repo_dir: gems
272
272
  - name: time
@@ -286,7 +286,7 @@ gems:
286
286
  source:
287
287
  type: git
288
288
  name: ruby/gem_rbs_collection
289
- revision: 5fcf7d45b7c430a651c5996280d9991c781fcf14
289
+ revision: b438fcecafb7fe0faad88c2bf3b8eec17d83e4d9
290
290
  remote: https://github.com/ruby/gem_rbs_collection.git
291
291
  repo_dir: gems
292
292
  - name: uri
data/sig/rbs_activesupport/declaration_builder.rbs CHANGED
@@ -8,6 +8,8 @@ module RbsActivesupport
8
8
 
9
9
  attr_reader method_searcher: MethodSearcher
10
10
 
11
+ attr_reader included_modules: Array[RBS::Namespace]
12
+
11
13
  # @rbs method_searcher: MethodSearcher
12
14
  def initialize: (MethodSearcher method_searcher) -> void
13
15
 
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: rbs_activesupport
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.4.1
4
+ version: 1.4.3
5
5
  platform: ruby
6
6
  authors:
7
7
  - Takeshi KOMIYA
8
8
  autorequire:
9
9
  bindir: exe
10
10
  cert_chain: []
11
- date: 2024-11-21 00:00:00.000000000 Z
11
+ date: 2024-11-25 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: activesupport