rbs2ts 1.3.0 → 1.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4743b73de60833c61821721455c9c6f23cb7e6f9616179df62af629ad9ceb99c
-  data.tar.gz: '097d7ccc401a1c0684c433b4fc11279409ff75d6bf99e2b2340953f456d40986'
+  metadata.gz: bce4c75f9675cfc5cccfac710ac9547d5c33153e76e5ef1299bc1f1808612f05
+  data.tar.gz: c550da676c3b095c07438e7085f176f8fa150d061ba10803ea9bb0805917067d
 SHA512:
-  metadata.gz: d0b28b0b98c1cb73b247f397da3b64cc0c9c2d9bebd71f54c5a377fbbb9301b5ffd2c337810be8c61e2d71eca5df613707a3b266144816e8dcce31d26c55a095
-  data.tar.gz: 5ee48310c33f8ede00253b84037ccfab31a7cbd4cc1262aa041bab223a431b991b6792875d327724f71503c84a81ba1460fe9ad05130f13802a8cdded6cf71f6
+  metadata.gz: 34aa7a35786539f22d03e58e25902fdc4a074bd76bc1b54d05dc2a52b9bb1864e27f4a2a1eea916fb6e06e62a1371b9490b40e117f119dd70bb31b250c010769
+  data.tar.gz: 76ba38c3514225a63ecd288d17891281c5b1b90a1edea1e8a655b3d91357a62eb6b8c02fa100c93e4505d5819ac8526dfd0d2fc87e9f9eec7dae65633eb15518

data/lib/rbs2ts/converter/declarations.rb

@@ -35,7 +35,7 @@ module Rbs2ts
         end
 
         def name
-          declaration.name.name.to_s.gsub(/:/, '')
+          declaration.name.name.to_s
         end
     
         private
@@ -50,7 +50,7 @@ module Rbs2ts
           }.reject(&:empty?).join("\n")
 
           <<~TS
-            export declare class #{name} {
+            export declare class #{Converter::Helper.convert_name(name)} {
             #{Helper.indent(members_ts)}
             };
           TS
@@ -82,7 +82,7 @@ module Rbs2ts
           }.reject(&:empty?).join("\n")
 
           <<~TS
-            export namespace #{name} {
+            export namespace #{Converter::Helper.convert_name(name)} {
             #{Helper.indent(members_ts)}
             };
           TS
@@ -118,7 +118,7 @@ module Rbs2ts
           }.reject(&:empty?).join("\n")
 
           <<~TS
-            export interface #{name.gsub(/_/, '')} {
+            export interface #{Converter::Helper.convert_name(name.gsub(/_/, ''))} {
             #{Helper.indent(members_ts)}
             };
           TS
@@ -137,7 +137,7 @@ module Rbs2ts
   
       class Alias < Base
         def to_ts
-          "export type #{name} = #{Converter::Types::Resolver.to_ts(declaration.type)};"
+          "export type #{Converter::Helper.convert_name(name)} = #{Converter::Types::Resolver.to_ts(declaration.type)};"
         end
       end
   

data/lib/rbs2ts/converter/helper.rb

@@ -10,6 +10,28 @@ module Rbs2ts
             .map {|t| "#{INDENT * level}#{t}" }
             .join("\n")
         end
+
+        TS_RESERVED_WORDS = %w(
+          any as boolean break case catch class const constructor continue debugger declare
+          default delete do else enum export extends false finally for from function get if
+          implements import in instanceof interface let module new null number of package
+          private protected public require return set static string super switch symbol
+          this throw true try type typeof var void while with yield
+        )
+
+        def convert_name(org_name)
+          name = org_name.to_s.gsub(/[:@]/, '')
+
+          unless name =~ /^[A-Z]/
+            name = CaseTransform.camel_lower(name)
+          end
+
+          if TS_RESERVED_WORDS.include?(name)
+            "#{name}Type"
+          else
+            name
+          end
+        end
       end
     end
   end

data/lib/rbs2ts/converter/members.rb

@@ -11,7 +11,7 @@ module Rbs2ts
         end
 
         def name
-          CaseTransform.camel_lower(member.name.to_s.gsub(/:/, ''))
+          Converter::Helper.convert_name(member.name)
         end
     
         private
@@ -21,7 +21,7 @@ module Rbs2ts
 
       class InstanceVariable < Base
         def to_ts
-          "#{name.gsub(/@/, '')}: #{Converter::Types::Resolver.to_ts(member.type)};"
+          "#{name}: #{Converter::Types::Resolver.to_ts(member.type)};"
         end
       end
 

data/lib/rbs2ts/converter/types.rb

@@ -48,7 +48,7 @@ module Rbs2ts
       class Record < ConverterBase
         def to_ts
           field_lines = type.fields.map { |name, type|
-            "#{CaseTransform.camel_lower(name.to_s)}: #{Types::Resolver.to_ts(type)};"
+            "#{Converter::Helper.convert_name(name)}: #{Types::Resolver.to_ts(type)};"
           }
 
           return '{}' if field_lines.empty?
@@ -136,7 +136,7 @@ module Rbs2ts
           when 'Bool' then
             Types::Bool.new(type).to_ts
           else
-            type.name.name.to_s.gsub(/:/, '')
+            Converter::Helper.convert_name(type.name.name)
           end
         end
       end

data/lib/rbs2ts/version.rb

@@ -1,3 +1,3 @@
 module Rbs2ts
-  VERSION = "1.3.0"
+  VERSION = "1.3.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs2ts
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.3.1
 platform: ruby
 authors:
 - mugi-uno
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-23 00:00:00.000000000 Z
+date: 2021-01-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs