rbs2ts 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ebbf96bfef0f567cd8792b0e3cd41e79006c24a0a474d7706f0d6275a32c0ed8
-  data.tar.gz: b9f817043223698ccc7dde082ee2f9196e5f46dcfe3e72ae6879213b62254afc
+  metadata.gz: 81fe2e0338e3f48a7b4670627ce0a8062f4b2af6dfe019363b81d92e45b2cfe2
+  data.tar.gz: d9af2d2209b401943576f78dd81d6c79f396b9d2f2f8169b55da39c7814d4878
 SHA512:
-  metadata.gz: ebd873eb921321e9de32fe24383c132e1d5a88e02bc081e4803e22567b6cdf99b33596da30a2d6a27f840a359c581d3215db2acf09004e5ee81ef8ae7082c278
-  data.tar.gz: 4929afb32f5b21e917bda03481a363f845b7a6d4f3d829d256d187999e3b29d049aaee64324f9553ff08ccf09065aa86201f6382c0d5822ba02a1e119a8a527b
+  metadata.gz: 5290fff9e17e557d1b4cbc2d9609c74c530f8a4f7b746d57bb57104968dc13e2a99580a40c67a40f9a72cb1fe0f5113f0748d1699fcbd5003fc440a5ea301331
+  data.tar.gz: 7f3cf63285e8b6749816a34062030a2d982371a1bf40443e3c323785c75c4ee208620e513d1443ecc26b2b441c464d2c7fba107f183867a99b32679fb031ee8c

data/README.md

@@ -33,8 +33,8 @@ type StringLiteral = 'abc'
 type TrueLiteral = true
 type FalseLiteral = false
 
-type UnionType = String & Integer & Bool
-type IntersectionType = String | Integer | Bool
+type IntersectionType = String & Integer & Bool
+type UnionType = String | Integer | Bool
 
 type ArrayType = Array[String]
 
@@ -64,8 +64,29 @@ class Klass
     }?
   }
 
-  def to_s: () -> String
-  def tuple: () -> [{ s: String, f: Float }?]
+  def to_tuple: () -> [{ s: String, f: Float }?]
+  def required_positional: (String) -> void
+  def required_positional_name: (String str) -> void
+  def optional_positional: (?String) -> void
+  def optional_positional_name: (?String? str) -> void
+  def rest_positional: (*String) -> void
+  def rest_positional_name: (*String str) -> void
+  def rest_positional_with_trailing: (*String, Integer) -> void
+  def rest_positional_name_with_trailing: (*String str, Integer trailing) -> void
+  def required_keyword: (str: String) -> void
+  def optional_keyword: (?str: String?) -> void
+  def rest_keywords: (**String) -> void
+  def rest_keywords_name: (**String rest) -> void
+
+  def all_arguments: (
+    String required_positional,
+    ?Integer? optional_positional,
+    *String rest_positionals_s,
+    Integer trailing_positional_s,
+    required_keyword: String,
+    ?optional_keyword: Integer?,
+    **String rest_keywords
+  ) -> [{ s: String, f: Float }?]
 end
 ```
 
@@ -96,9 +117,9 @@ export type TrueLiteral = true;
 
 export type FalseLiteral = false;
 
-export type UnionType = string & number & boolean;
+export type IntersectionType = string & number & boolean;
 
-export type IntersectionType = string | number | boolean;
+export type UnionType = string | number | boolean;
 
 export type ArrayType = string[];
 
@@ -116,18 +137,34 @@ export type RecordType = {
   } | null | undefined;
 };
 
-export namespace Klass {
-  export type a = string;
-  export type b = number;
-  export type r = {
+export declare class Klass {
+  a: string;
+  readonly b: number;
+  c: boolean;
+  readonly r: {
     d: string;
     e: {
       f: string;
       g: string | null | undefined;
     } | null | undefined;
   };
-  export type toSReturnType = string;
-  export type tupleReturnType = [({
+  toTuple(): [({
+    s: string;
+    f: number;
+  } | null | undefined)];
+  requiredPositional(arg1: string): void;
+  requiredPositionalName(str: string): void;
+  optionalPositional(arg1?: string): void;
+  optionalPositionalName(str?: string | null | undefined): void;
+  restPositional(...arg1: string[]): void;
+  restPositionalName(...str: string[]): void;
+  restPositionalWithTrailing(arg1: string[], arg2: number): void;
+  restPositionalNameWithTrailing(str: string[], trailing: number): void;
+  requiredKeyword(arg1: { str: string }): void;
+  optionalKeyword(arg1: { str?: string | null | undefined }): void;
+  restKeywords(arg1: { [key: string]: unknown; }): void;
+  restKeywordsName(arg1: { [key: string]: unknown; }): void;
+  allArguments(requiredPositional: string, optionalPositional?: number | null | undefined, restPositionalsS?: string[], trailingPositionalS?: number, arg1?: { requiredKeyword: string, optionalKeyword?: number | null | undefined, [key: string]: unknown; }): [({
     s: string;
     f: number;
   } | null | undefined)];

data/lib/rbs2ts/converter.rb

@@ -5,3 +5,4 @@ require 'case_transform'
 
 require 'rbs2ts/converter/declarations'
 require 'rbs2ts/converter/types'
+require 'rbs2ts/converter/members'

data/lib/rbs2ts/converter/declarations.rb

@@ -57,7 +57,7 @@ module Rbs2ts
           @@nest = @@nest - 1
 
           <<~TS
-            export namespace #{name} {
+            export declare class #{name} {
             #{members_ts}
             };
           TS
@@ -66,10 +66,14 @@ module Rbs2ts
 
         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::AttrReader then
+            Converter::Members::AttrReader.new(member).to_ts
+          when ::RBS::AST::Members::AttrWriter then
+            Converter::Members::AttrWriter.new(member).to_ts
+          when ::RBS::AST::Members::AttrAccessor then
+            Converter::Members::AttrAccessor.new(member).to_ts
           when ::RBS::AST::Members::MethodDefinition
-            "export type #{CaseTransform.camel_lower(member.name)}ReturnType = #{Converter::Types::Resolver.to_ts(member.types.first.type.return_type)};"
+            Converter::Members::MethodDefinition.new(member).to_ts
           else
             ''
           end

data/lib/rbs2ts/converter/members.rb

@@ -0,0 +1,140 @@
+module Rbs2ts
+  module Converter
+    module Members
+      class Base
+        def initialize(member)
+          @member = member
+        end
+    
+        def to_ts
+          ''
+        end
+
+        def name
+          CaseTransform.camel_lower(member.name.to_s.gsub(/:/, ''))
+        end
+    
+        private
+    
+        attr_reader :member
+      end
+
+      class AttrReader < Base
+        def to_ts
+          "readonly #{name}: #{Converter::Types::Resolver.to_ts(member.type)};"
+        end
+      end
+
+      class AttrWriter < Base
+        def to_ts
+          "#{name}: #{Converter::Types::Resolver.to_ts(member.type)};"
+        end
+      end
+
+      class AttrAccessor < Base
+        def to_ts
+          "#{name}: #{Converter::Types::Resolver.to_ts(member.type)};"
+        end
+      end
+
+      class MethodDefinition < Base
+        def initialize(member)
+          super
+          @args_count = 0
+        end
+
+        def to_ts
+          "#{name}(#{args_to_ts}): #{return_type_to_ts};"
+        end
+
+        def args_to_ts
+          [
+            *required_positional_to_ts,
+            *optional_positional_to_ts,
+            *rest_positionals_to_ts,
+            *trailing_positionals_to_ts,
+            *keyword_args_to_ts
+          ].join(", ")
+        end
+
+        def arg_name(arg)
+          name = arg.name.nil? ? next_default_arg_name : arg.name.to_s
+          CaseTransform.camel_lower(name)
+        end
+
+        def next_default_arg_name
+          @args_count = @args_count + 1
+          "arg#{@args_count.to_s}"
+        end
+
+        def required_positional_to_ts
+          method_type.required_positionals.map {|arg|
+            "#{arg_name(arg)}: #{Converter::Types::Resolver.to_ts(arg.type)}"
+          }
+        end
+
+        def optional_positional_to_ts
+          method_type.optional_positionals.map {|arg|
+            "#{arg_name(arg)}?: #{Converter::Types::Resolver.to_ts(arg.type)}"
+          }
+        end
+
+        def rest_positionals_to_ts
+          arg = method_type.rest_positionals
+          
+          return [] if arg.nil?
+
+          has_rest_after_arguments ?
+            ["#{arg_name(arg)}#{optional_ts_code}: #{Converter::Types::Resolver.to_ts(arg.type)}[]"] :
+            ["...#{arg_name(arg)}#{optional_ts_code}: #{Converter::Types::Resolver.to_ts(arg.type)}[]"]
+        end
+
+        def trailing_positionals_to_ts
+          method_type.trailing_positionals.map {|arg|
+            "#{arg_name(arg)}#{optional_ts_code}: #{Converter::Types::Resolver.to_ts(arg.type)}"
+          }
+        end
+
+        def keyword_args_to_ts
+          required_keywords_ts = method_type.required_keywords.map {|key, value|
+            "#{CaseTransform.camel_lower(key.to_s)}: #{Converter::Types::Resolver.to_ts(value.type)}"
+          }
+          optional_keywords_ts = method_type.optional_keywords.map {|key, value|
+            "#{CaseTransform.camel_lower(key.to_s)}?: #{Converter::Types::Resolver.to_ts(value.type)}"
+          }
+          rest_keywords_ts = method_type.rest_keywords.nil? ? [] : ["[key: string]: unknown;"]
+
+          ts_array = [
+            *required_keywords_ts,
+            *optional_keywords_ts,
+            *rest_keywords_ts
+          ]
+
+          return [] if ts_array.empty?
+
+          ts = ts_array.join(', ')
+
+          ["#{next_default_arg_name}#{optional_ts_code}: { #{ts} }"]
+        end
+
+        def method_type
+          member.types.first.type
+        end
+
+        def return_type_to_ts
+          Converter::Types::Resolver.to_ts(method_type.return_type)
+        end
+
+        def optional_ts_code
+          method_type.optional_positionals.present? ? '?' : ''
+        end
+
+        def has_rest_after_arguments
+          method_type.trailing_positionals.present? || 
+          method_type.required_keywords.present? ||
+          method_type.optional_keywords.present?
+        end
+      end
+    end
+  end
+end

data/lib/rbs2ts/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rbs2ts
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - mugi-uno
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-01-17 00:00:00.000000000 Z
+date: 2021-01-19 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/members.rb
 - lib/rbs2ts/converter/types.rb
 - lib/rbs2ts/version.rb
 - rbs2ts.gemspec