rbs2ts 1.0.0.pre.alpha.3 → 1.0.0.pre.alpha.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb1b221a5b895071e46b77dcf36fd1df3e789b0af6f91cb78adbfef7aa633c1c
-  data.tar.gz: 1a452ee8992929e84d0cfde11006e1b9918a4dbfb5cd597506523d6491199c7f
+  metadata.gz: 19a2022b86feae5d562c59457ea77de37ef3a94f6c32b2b148f278610cf3e64d
+  data.tar.gz: 94639b023729996b58f6a7ed7f59cbfe58b7738e820ea70fb100ad9e7f079690
 SHA512:
-  metadata.gz: c6242c6655d8ab4d43267c4fb4d7a99471d27047b5b1ea04025aada0066f272b61ffa353a06bcd238a11890d3a65ff5bf32cb6471543a00d5036b734e5b84cba
-  data.tar.gz: 9a9d8d78d4eadd2cd9999063d841d878259f5bc52ccfbb0ea02b4691ef0a3133d8c8ab4cb954767925d0564e0c930697b1cd0017a4d476704a8f08515933bfd1
+  metadata.gz: 918d61866526af2f4d258fe349c5617dfc65d799086fff57fb32bfa2e6104713fed20558dd2e451ba09c860316aedb07f6637a5cdd650babfa477a61ca490f78
+  data.tar.gz: 5fd2d4d0c042f9a226f89dd8867d48464ccae74333afb5f77e437eb793f5db85ae2882c49ac600f2abd8caf7f8e948d9cefa23b28ce30b4b8cb54dc8d663321d

data/.prettierignore

@@ -0,0 +1 @@
+README.md

data/.vscode/launch.json

@@ -10,7 +10,7 @@
       "request": "launch",
       "program": "${workspaceRoot}/exe/rbs2ts",
       "useBundler": true,
-      "args": ["convert", "spec/sample_rbs/test.rbs"]
+      "args": ["convert", "spec/fixtures/test.rbs"]
     }
   ]
 }

data/README.md

@@ -1,7 +1,5 @@
 # Rbs2ts
 
-[![mugi_uno](https://circleci.com/<VCS>/<ORG_NAME>/<PROJECT_NAME>.svg?style=svg)](LINK)
-
 Convert RBS to TypeScript type definition.
 
 ## Installation
@@ -16,16 +14,136 @@ gem install rbs2ts
 rbs2ts convert type.rbs
 ```
 
+## Example
+
+from RBS
+
+```
+type TypeofInteger = Integer
+type TypeofFloat = Float
+type TypeofNumeric = Numeric
+type TypeofString = String
+type TypeofBool = Bool
+type TypeofVoid = void
+type TypeofUntyped = untyped
+type TypeofNil = nil
+
+type IntegerLiteral = 123
+type StringLiteral = 'abc'
+type TrueLiteral = true
+type FalseLiteral = false
+
+type UnionType = String & Integer & Bool
+type IntersectionType = String | Integer | Bool
+
+type ArrayType = Array[String]
+
+type TupleType = [ ]
+type TupleEmptyType = [String, Integer]
+
+type OptionalType = String?
+
+type RecordType = {
+  s: String,
+  next: {
+    i: Integer,
+    f: Float
+  }?
+}
+
+class Klass
+  attr_accessor a: String
+  attr_reader b: Integer
+  attr_writer c: Bool
+
+  attr_reader r: {
+    d: String,
+    e: {
+      f: String,
+      g: String?
+    }?
+  }
+
+  def to_s: () -> String
+  def tuple: () -> [{ s: String, f: Float }?]
+end
+```
+
+to TypeScript
+
+```typescript
+export type TypeofInteger = number;
+
+export type TypeofFloat = number;
+
+export type TypeofNumeric = number;
+
+export type TypeofString = string;
+
+export type TypeofBool = boolean;
+
+export type TypeofVoid = void;
+
+export type TypeofUntyped = any;
+
+export type TypeofNil = null;
+
+export type IntegerLiteral = 123;
+
+export type StringLiteral = "abc";
+
+export type TrueLiteral = true;
+
+export type FalseLiteral = false;
+
+export type UnionType = string & number & boolean;
+
+export type IntersectionType = string | number | boolean;
+
+export type ArrayType = string[];
+
+export type TupleType = [];
+
+export type TupleEmptyType = [string, number];
+
+export type OptionalType = string | null | undefined;
+
+export type RecordType = {
+  s: string;
+  next: {
+    i: number;
+    f: number;
+  } | null | undefined;
+};
+
+export namespace Klass {
+  export type a = string;
+  export type b = number;
+  export type r = {
+    d: string;
+    e: {
+      f: string;
+      g: string | null | undefined;
+    } | null | undefined;
+  };
+  export type toSReturnType = string;
+  export type tupleReturnType = [({
+    s: string;
+    f: number;
+  } | null | undefined)];
+};
+```
+
 ---
 
 ## ToDo
 
 - [x] Literal type
 - [ ] Interface type
-- [ ] Literal type
-- [ ] Tuple Type
-- [ ] Base Types
-- [ ] Method Type (Argument Types and Return Types)
-- [ ] Class declaration
+- [x] Literal type
+- [x] Tuple Type
+- [x] Base Types
+- [x] Method Type (Argument Types and Return Types)
+- [x] Class declaration
 - [ ] Module declaration
 - [ ] Interface declaration

data/lib/rbs2ts/converter/declarations.rb

@@ -9,6 +9,8 @@ module Rbs2ts
         def to_ts
           decls_ts = @decls.map do |d|
             case d
+            when ::RBS::AST::Declarations::Class then
+              Converter::Declarations::Class.new(d).to_ts
             when ::RBS::AST::Declarations::Alias then
               Converter::Declarations::Alias.new(d).to_ts
             end
@@ -38,6 +40,40 @@ module Rbs2ts
       end
   
       class Class < Base
+        INDENT = '  '
+        @@nest = 0
+
+        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")
+          }.reject(&:empty?).join("\n")
+
+          @@nest = @@nest - 1
+
+          <<~TS
+            export namespace #{name} {
+            #{members_ts}
+            };
+          TS
+          .chomp
+        end
+
+        def member_to_ts(member)
+          case member
+          when ::RBS::AST::Members::AttrReader, ::RBS::AST::Members::AttrAccessor then
+            "export type #{CaseTransform.camel_lower(member.name)} = #{Converter::Types::Resolver.to_ts(member.type)};"
+          when ::RBS::AST::Members::MethodDefinition
+            "export type #{CaseTransform.camel_lower(member.name)}ReturnType = #{Converter::Types::Resolver.to_ts(member.types.first.type.return_type)};"
+          else
+            ''
+          end
+        end
       end
   
       class Module < Base
@@ -48,7 +84,7 @@ module Rbs2ts
   
       class Alias < Base
         def to_ts
-          "type #{name} = #{Converter::Types::Resolver.to_ts(declaration.type)};"
+          "export type #{name} = #{Converter::Types::Resolver.to_ts(declaration.type)};"
         end
       end
   

data/lib/rbs2ts/converter/types.rb

@@ -73,6 +73,24 @@ module Rbs2ts
         end
       end
 
+      class Tuple < ConverterBase
+        def to_ts
+          tuple_types_ts = type.types.map {|t|
+            ts = Types::Resolver.to_ts(t)
+
+            if t.is_a?(::RBS::Types::Union) ||
+              t.is_a?(::RBS::Types::Intersection) ||
+              t.is_a?(::RBS::Types::Optional)
+              "(#{ts})"
+            else
+              ts
+            end
+          }.join(', ')
+
+          "[#{tuple_types_ts}]"
+        end
+      end  
+
       class Literal < ConverterBase
         def to_ts
           case type.literal
@@ -121,7 +139,7 @@ module Rbs2ts
             Types::Array.new(type).to_ts
           when 'String' then
             Types::String.new(type).to_ts
-          when 'Integer' then
+          when 'Numeric', 'Integer', 'Float' then
             Types::Integer.new(type).to_ts
           when 'Bool' then
             Types::Bool.new(type).to_ts
@@ -192,6 +210,8 @@ module Rbs2ts
             Types::Intersection
           when ::RBS::Types::Record then
             Types::Record
+          when ::RBS::Types::Tuple then
+            Types::Tuple
           else
             Types::Fallback
           end

data/lib/rbs2ts/version.rb

@@ -1,3 +1,3 @@
 module Rbs2ts
-  VERSION = "1.0.0-alpha.3"
+  VERSION = "1.0.0-alpha.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs2ts
 version: !ruby/object:Gem::Version
-  version: 1.0.0.pre.alpha.3
+  version: 1.0.0.pre.alpha.4
 platform: ruby
 authors:
 - mugi-uno
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-14 00:00:00.000000000 Z
+date: 2021-01-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rbs
@@ -104,6 +104,7 @@ extra_rdoc_files: []
 files:
 - ".circleci/config.yml"
 - ".gitignore"
+- ".prettierignore"
 - ".rspec"
 - ".travis.yml"
 - ".vscode/launch.json"