rbs2ts 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 81fe2e0338e3f48a7b4670627ce0a8062f4b2af6dfe019363b81d92e45b2cfe2
-  data.tar.gz: d9af2d2209b401943576f78dd81d6c79f396b9d2f2f8169b55da39c7814d4878
+  metadata.gz: 63451fb8675f6e0e4420d64d7655385f8b32260c0e17b0ec9f796312372140b3
+  data.tar.gz: cfa90fb4ec6d06efc412ec1f1f28a000d23c3f16cba28ad0aa5f4cea4d2bda43
 SHA512:
-  metadata.gz: 5290fff9e17e557d1b4cbc2d9609c74c530f8a4f7b746d57bb57104968dc13e2a99580a40c67a40f9a72cb1fe0f5113f0748d1699fcbd5003fc440a5ea301331
-  data.tar.gz: 7f3cf63285e8b6749816a34062030a2d982371a1bf40443e3c323785c75c4ee208620e513d1443ecc26b2b441c464d2c7fba107f183867a99b32679fb031ee8c
+  metadata.gz: e8e8b4381ee67f4ad40a5a5cafa2590efe7f698b3f98bbc9625a0f74c975c4924cfd713a4450c67ba45bb346b3f620f2445707c27e09153eefe12ce60b21873a
+  data.tar.gz: 60832356723c81313fc06afa80a88d16555b815e3c94090db05392bee17f2de7bb30d8a5682cfdd04eaacbd4deeffdb4c1f6df5932b4bb21e5bee357aefdad9e

data/README.md

@@ -1,6 +1,6 @@
 # Rbs2ts
 
-Convert RBS to TypeScript type definition.
+A RubyGem that converts Ruby RBS to TypeScript definitions.
 
 ## Installation
 
@@ -88,6 +88,14 @@ class Klass
     **String rest_keywords
   ) -> [{ s: String, f: Float }?]
 end
+
+module Module
+  def func: (String, Integer) -> { str: String, int: Integer }
+end
+
+interface _Interface
+  def func: (String, Integer) -> { str: String, int: Integer }
+end
 ```
 
 to TypeScript
@@ -169,18 +177,18 @@ export declare class Klass {
     f: number;
   } | null | undefined)];
 };
-```
-
----
 
-## ToDo
+export namespace Module {
+  export declare function func(arg1: string, arg2: number): {
+    str: string;
+    int: number;
+  };
+};
 
-- [x] Literal type
-- [ ] Interface type
-- [x] Literal type
-- [x] Tuple Type
-- [x] Base Types
-- [x] Method Type (Argument Types and Return Types)
-- [x] Class declaration
-- [ ] Module declaration
-- [ ] Interface declaration
+export interface Interface {
+  func(arg1: string, arg2: number): {
+    str: string;
+    int: number;
+  };
+};
+```

data/lib/rbs2ts/converter.rb

@@ -3,6 +3,7 @@ end
 
 require 'case_transform'
 
+require 'rbs2ts/converter/helper'
 require 'rbs2ts/converter/declarations'
 require 'rbs2ts/converter/types'
 require 'rbs2ts/converter/members'

data/lib/rbs2ts/converter/declarations.rb

@@ -11,6 +11,10 @@ module Rbs2ts
             case d
             when ::RBS::AST::Declarations::Class then
               Converter::Declarations::Class.new(d).to_ts
+            when ::RBS::AST::Declarations::Module then
+              Converter::Declarations::Module.new(d).to_ts
+            when ::RBS::AST::Declarations::Interface then
+              Converter::Declarations::Interface.new(d).to_ts
             when ::RBS::AST::Declarations::Alias then
               Converter::Declarations::Alias.new(d).to_ts
             end
@@ -38,27 +42,16 @@ module Rbs2ts
     
         attr_reader :declaration
       end
-  
-      class Class < Base
-        INDENT = '  '
-        @@nest = 0
 
+      class Class < Base
         def to_ts
-          @@nest = @@nest + 1
-
           members_ts = declaration.members.map {|member|
-            ts = member_to_ts(member)
-            ts
-              .split("\n")
-              .map {|t| "#{INDENT * @@nest}#{t}" }
-              .join("\n")
+            member_to_ts(member)
           }.reject(&:empty?).join("\n")
 
-          @@nest = @@nest - 1
-
           <<~TS
             export declare class #{name} {
-            #{members_ts}
+            #{Helper.indent(members_ts)}
             };
           TS
           .chomp
@@ -81,9 +74,52 @@ module Rbs2ts
       end
   
       class Module < Base
+        def to_ts
+          members_ts = declaration.members.map {|member|
+            member_to_ts(member)
+          }.reject(&:empty?).join("\n")
+
+          <<~TS
+            export namespace #{name} {
+            #{Helper.indent(members_ts)}
+            };
+          TS
+          .chomp
+        end
+
+        def member_to_ts(member)
+          case member
+          when ::RBS::AST::Members::MethodDefinition
+            ts = Converter::Members::MethodDefinition.new(member).to_ts
+            "export declare function #{ts}"
+          else
+            ''
+          end
+        end
       end
   
       class Interface < Base
+        def to_ts
+          members_ts = declaration.members.map {|member|
+            member_to_ts(member)
+          }.reject(&:empty?).join("\n")
+
+          <<~TS
+            export interface #{name.gsub(/_/, '')} {
+            #{Helper.indent(members_ts)}
+            };
+          TS
+          .chomp
+        end
+
+        def member_to_ts(member)
+          case member
+          when ::RBS::AST::Members::MethodDefinition
+            Converter::Members::MethodDefinition.new(member).to_ts
+          else
+            ''
+          end
+        end
       end
   
       class Alias < Base

data/lib/rbs2ts/converter/helper.rb

@@ -0,0 +1,16 @@
+module Rbs2ts
+  module Converter
+    module Helper
+      class << self
+        INDENT = '  '
+
+        def indent(text, level = 1)
+          text
+            .split("\n")
+            .map {|t| "#{INDENT * level}#{t}" }
+            .join("\n")
+        end
+      end
+    end
+  end
+end

data/lib/rbs2ts/converter/types.rb

@@ -46,27 +46,19 @@ module Rbs2ts
       end
 
       class Record < ConverterBase
-        INDENT = '  '
-        @@nest = 0
-
         def to_ts
-          @@nest = @@nest + 1
-
-          indent = INDENT * @@nest
           field_lines = type.fields.map { |name, type|
-            "#{indent}#{CaseTransform.camel_lower(name.to_s)}: #{Types::Resolver.to_ts(type)};"
+            "#{CaseTransform.camel_lower(name.to_s)}: #{Types::Resolver.to_ts(type)};"
           }
 
-          @@nest = @@nest - 1
-
           return '{}' if field_lines.empty?
 
           field_ts = field_lines.join("\n")
 
           ts = <<~CODE
           {
-          #{field_ts}
-          #{INDENT * @@nest}}
+          #{Helper.indent(field_ts)}
+          }
           CODE
     
           ts.chomp

data/lib/rbs2ts/version.rb

@@ -1,3 +1,3 @@
 module Rbs2ts
-  VERSION = "1.1.0"
+  VERSION = "1.2.0"
 end

data/rbs2ts.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |spec|
   spec.authors       = ["mugi-uno"]
   spec.email         = ["mugi.uno@gmail.com"]
 
-  spec.summary       = "Convert rbs to typescript"
+  spec.summary       = "A RubyGem that converts Ruby RBS to TypeScript definitions."
   spec.homepage      = "https://github.com/mugi-uno/rbs2ts"
   spec.license       = "MIT"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs2ts
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - mugi-uno
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-19 00:00:00.000000000 Z
+date: 2021-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -118,6 +118,7 @@ files:
 - lib/rbs2ts/cli.rb
 - lib/rbs2ts/converter.rb
 - lib/rbs2ts/converter/declarations.rb
+- lib/rbs2ts/converter/helper.rb
 - lib/rbs2ts/converter/members.rb
 - lib/rbs2ts/converter/types.rb
 - lib/rbs2ts/version.rb
@@ -144,5 +145,5 @@ requirements: []
 rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
-summary: Convert rbs to typescript
+summary: A RubyGem that converts Ruby RBS to TypeScript definitions.
 test_files: []