Skip to content

Commit aa57e3c

Browse files
authored
Merge pull request #315 from rapito/bug/default_module
Fix broken configuration when module_type is Nil and namespace is being used.
2 parents 76d761d + aa343ea commit aa57e3c

File tree

2 files changed

+19
-2
lines changed

2 files changed

+19
-2
lines changed

lib/js_routes.rb

+9-2
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,26 @@ def generate!(file_name = configuration.file, **opts)
4141

4242
sig { params(opts: T.untyped).returns(String) }
4343
def definitions(**opts)
44-
generate(**opts, module_type: 'DTS',)
44+
generate(**opts, module_type: default_module_type,)
4545
end
4646

4747
sig { params(file_name: FileName, opts: T.untyped).void }
4848
def definitions!(file_name = nil, **opts)
4949
file_name ||= configuration.file&.sub(%r{(\.d)?\.(j|t)s\Z}, ".d.ts")
50-
generate!(file_name, **opts, module_type: 'DTS')
50+
generate!(file_name, **opts, module_type: default_module_type)
5151
end
5252

5353
sig { params(value: T.untyped).returns(String) }
5454
def json(value)
5555
ActiveSupport::JSON.encode(value)
5656
end
57+
58+
sig { returns(T.nilable(String)) }
59+
def default_module_type
60+
'DTS' if configuration.module_type && configuration.module_type != 'NIL'
61+
end
62+
63+
5764
end
5865
module Generators
5966
end

spec/js_routes/module_types/dts_spec.rb

+10
Original file line numberDiff line numberDiff line change
@@ -122,5 +122,15 @@
122122
generated_js = JsRoutes.definitions(**options)
123123
expect(generated_js).to include('export {};')
124124
end
125+
126+
it 'does not use DTS module if module_type is not set' do
127+
previous_module_type = JsRoutes.configuration.module_type
128+
JsRoutes.configuration.module_type = nil
129+
130+
generated_js = JsRoutes.definitions(**options.merge(module_type: nil))
131+
expect(generated_js).not_to include('export {};')
132+
133+
JsRoutes.configuration.module_type = previous_module_type
134+
end
125135
end
126136
end

0 commit comments

Comments
 (0)