rbs2ts 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 63451fb8675f6e0e4420d64d7655385f8b32260c0e17b0ec9f796312372140b3
-  data.tar.gz: cfa90fb4ec6d06efc412ec1f1f28a000d23c3f16cba28ad0aa5f4cea4d2bda43
+  metadata.gz: 4743b73de60833c61821721455c9c6f23cb7e6f9616179df62af629ad9ceb99c
+  data.tar.gz: '097d7ccc401a1c0684c433b4fc11279409ff75d6bf99e2b2340953f456d40986'
 SHA512:
-  metadata.gz: e8e8b4381ee67f4ad40a5a5cafa2590efe7f698b3f98bbc9625a0f74c975c4924cfd713a4450c67ba45bb346b3f620f2445707c27e09153eefe12ce60b21873a
-  data.tar.gz: 60832356723c81313fc06afa80a88d16555b815e3c94090db05392bee17f2de7bb30d8a5682cfdd04eaacbd4deeffdb4c1f6df5932b4bb21e5bee357aefdad9e
+  metadata.gz: d0b28b0b98c1cb73b247f397da3b64cc0c9c2d9bebd71f54c5a377fbbb9301b5ffd2c337810be8c61e2d71eca5df613707a3b266144816e8dcce31d26c55a095
+  data.tar.gz: 5ee48310c33f8ede00253b84037ccfab31a7cbd4cc1262aa041bab223a431b991b6792875d327724f71503c84a81ba1460fe9ad05130f13802a8cdded6cf71f6

data/README.md

@@ -52,6 +52,7 @@ type RecordType = {
 }
 
 class Klass
+  @val: String
   attr_accessor a: String
   attr_reader b: Integer
   attr_writer c: Bool
@@ -90,7 +91,14 @@ class Klass
 end
 
 module Module
+  @val: String
+  type AliasType = String
+
   def func: (String, Integer) -> { str: String, int: Integer }
+
+  class NestedClass
+    attr_accessor a: AliasType
+  end
 end
 
 interface _Interface
@@ -146,6 +154,7 @@ export type RecordType = {
 };
 
 export declare class Klass {
+  val: string;
   a: string;
   readonly b: number;
   c: boolean;
@@ -179,10 +188,15 @@ export declare class Klass {
 };
 
 export namespace Module {
+  export declare let val: string;
+  export type AliasType = string;
   export declare function func(arg1: string, arg2: number): {
     str: string;
     int: number;
   };
+  export declare class NestedClass {
+    a: AliasType;
+  };
 };
 
 export interface Interface {

data/lib/rbs2ts/converter/declarations.rb

@@ -35,7 +35,7 @@ module Rbs2ts
         end
 
         def name
-          declaration.name.to_s.gsub(/:/, '')
+          declaration.name.name.to_s.gsub(/:/, '')
         end
     
         private
@@ -59,6 +59,8 @@ module Rbs2ts
 
         def member_to_ts(member)
           case member
+          when ::RBS::AST::Members::InstanceVariable then
+            Converter::Members::InstanceVariable.new(member).to_ts
           when ::RBS::AST::Members::AttrReader then
             Converter::Members::AttrReader.new(member).to_ts
           when ::RBS::AST::Members::AttrWriter then
@@ -89,6 +91,17 @@ module Rbs2ts
 
         def member_to_ts(member)
           case member
+          when ::RBS::AST::Declarations::Class then
+            Converter::Declarations::Class.new(member).to_ts
+          when ::RBS::AST::Declarations::Module then
+            Converter::Declarations::Module.new(member).to_ts
+          when ::RBS::AST::Declarations::Interface then
+            Converter::Declarations::Interface.new(member).to_ts
+          when ::RBS::AST::Declarations::Alias then
+            Converter::Declarations::Alias.new(member).to_ts
+          when ::RBS::AST::Members::InstanceVariable
+            ts = Converter::Members::InstanceVariable.new(member).to_ts
+            "export declare let #{ts}"
           when ::RBS::AST::Members::MethodDefinition
             ts = Converter::Members::MethodDefinition.new(member).to_ts
             "export declare function #{ts}"

data/lib/rbs2ts/converter/members.rb

@@ -19,6 +19,12 @@ module Rbs2ts
         attr_reader :member
       end
 
+      class InstanceVariable < Base
+        def to_ts
+          "#{name.gsub(/@/, '')}: #{Converter::Types::Resolver.to_ts(member.type)};"
+        end
+      end
+
       class AttrReader < Base
         def to_ts
           "readonly #{name}: #{Converter::Types::Resolver.to_ts(member.type)};"

data/lib/rbs2ts/converter/types.rb

@@ -136,7 +136,7 @@ module Rbs2ts
           when 'Bool' then
             Types::Bool.new(type).to_ts
           else
-            type.name.to_s.gsub(/:/, '')
+            type.name.name.to_s.gsub(/:/, '')
           end
         end
       end

data/lib/rbs2ts/version.rb

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

metadata

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