schema2type 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a45c45028c0a021fe9a694ee6daeae17b1fed99d62b2049a78ace7759cd85194
-  data.tar.gz: d6ed16bc7551ffa35a55bc5ec70060228621da725821717eccab9821a1bbada0
+  metadata.gz: 9c3e52c8948ce5f2642167c3fe437b480c2a8ec47e83c1cf9c25a2e555ee205b
+  data.tar.gz: 38d1d525a6227191010dd1eb280c5fa10781df2bce44ae9b86b839dc98e5174e
 SHA512:
-  metadata.gz: a8400cfa1ff3dc05f746134d3b141424860e952b963779efa21f6629b28ff8a6b38890d56e04e8e921651a54ae9903182919fe26fd894e8817c244b4a558f242
-  data.tar.gz: 83311f3ce07b9861d58ad0686b7de5b59f0f31ebeaa3ef852146a2cde6d5e325a191f3ac760230ad53db4d0997381f40b84c0e6767ac036274112d410da8b9ab
+  metadata.gz: cba2e579992d67be775d58d2b33a9aa63161689e10a1dc2ddbd3ddbf1b7709128ffa899cb9db732220f0965a3947808d35fbf7c1256e88d426dcf5e1c145a78f
+  data.tar.gz: a5c22fe47056ac52ce8cfd4d40965950a50e575d41bcc5d0d85adbdaa9701fed96cda6609cc42d2b66a5d86c69b71d23e41817873424f908def7029f06a6cab1

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    schema2type (0.1.11)
+    schema2type (0.1.12)
       activesupport
 
 GEM

data/README.md

@@ -17,7 +17,7 @@ ActiveRecord::Schema.define(version: xxxx) do
 end
 ```
 
-Automatically have the following TypesScript type generated
+Automatically have the following TypesScript type generated.
 
 ```typescript
 declare namespace schema {
@@ -53,19 +53,20 @@ Or install it yourself as:
 ## Usage
 
 ```
-bundle exec schema2type -s db/schema.rb -o schema.d.ts -n schema
+bundle exec schema2type -o schema.d.ts
 ```
 
-#### options
+### options
 
 |command | require | default | detail |
 |---|---|---|---|
-| -s | true | - | Path of your schema.rb  |
 | -o | true | - | Output file name of TypeScript |
+| -s | false | "./db/schema.rb" | Path of your schema.rb  |
 | -n | false | "schema" | Name of declare namespace |
 | --snake | false | false | Convert property name to snake_case |
 
-#### conversion table
+## conversion table
+the schema2type convert as per this conversion table.
 
 |create_table block method| converted Type|
 |---|---|

data/lib/schema2type/cli.rb

@@ -1,34 +1,38 @@
 module Schema2type
 
+  DEFAULT_SCHEMA_PATH = "./db/schema.rb"
+  DEFAULT_NAME_SPACE = "schema"
+
   def self.execute(input_file:, out_file:, name_space:, snake_case:)
-    @@convert_types = []
+    @@converted_types = []
     @@snake_case = snake_case
-    eval(File.read(input_file))
 
-    convert_type_text = @@convert_types.map { |t| "  #{t}" }.join("\n").strip
+    eval(File.read(input_file || DEFAULT_SCHEMA_PATH))
+
+    convert_type_text = @@converted_types.map { |t| "  #{t}" }.join("\n").strip
 
     File.open(out_file, "w") do |f|
-      f.puts <<-EOS
-/* eslint no-unused-vars: 0 */
-
-/**
- * auto-generated file
- * schema version: #{$schema_version}
- * This file was automatically generated by schema2type
- */
-declare namespace #{name_space ||= "schema"} {
-  #{convert_type_text}
-}
-EOS
+      f.puts <<~EOS
+        /* eslint no-unused-vars: 0 */
+
+        /**
+         * auto-generated file
+         * schema version: #{$schema_version}
+         * This file was automatically generated by schema2type
+         */
+        declare namespace #{name_space || DEFAULT_NAME_SPACE} {
+          #{convert_type_text}
+        }
+      EOS
     end
   end
 
-  def self.create_table(table_name, *arg, &block)
+  def self.convert_schema(table_name, *)
     converter = SchemaConverter.new(table_name: table_name, snake_case: @@snake_case)
-    block.call(converter)
-    converter.finalize
 
-    @@convert_types.concat(converter.out_text)
+    yield converter
+
+    @@converted_types.concat converter.result
   end
 
   def self.method_missing(*arg)
@@ -36,11 +40,15 @@ EOS
   end
 
   module ActiveRecord
-    class Schema
-      def self.define(version, &block)
+    module Schema
+      def self.define(version)
         $schema_version = version[:version]
-        block.call
+        yield
       end
     end
   end
+
+  class << self
+    alias :create_table :convert_schema
+  end
 end

data/lib/schema2type/schema_converter.rb

@@ -3,8 +3,7 @@ require 'active_support/inflector'
 
 module Schema2type
   class SchemaConverter
-    attr_accessor :out_text
-    attr_reader :table_name, :convertion_table, :snake_case
+    attr_reader :property_lines, :table_name, :convertion_table, :snake_case
 
     TYPE_STRING = 'string'.freeze
     TYPE_NUMBER = 'number'.freeze
@@ -12,17 +11,6 @@ module Schema2type
     TYPE_DATE = 'Date'.freeze
     COLUMN_METHODS = YAML.load_file(File.expand_path(__dir__) + '/conversion_table.yml').to_a
 
-    def initialize(table_name:, snake_case: false)
-      @out_text = []
-      @table_name = table_name.singularize.camelize
-      @snake_case = snake_case
-    end
-
-    def finalize
-      @out_text.unshift "type #{@table_name} = {"
-      @out_text << "}\n"
-    end
-
     def self.define_convert_methods(methods)
       methods.each do |m|
         define_method(m[0]) do |name, *options|
@@ -33,7 +21,17 @@ module Schema2type
 
     define_convert_methods COLUMN_METHODS
 
-    def method_missing(*arg)
+    def initialize(table_name:, snake_case: false)
+      @property_lines = []
+      @table_name = table_name.singularize.camelize
+      @snake_case = snake_case
+    end
+
+    def result
+      ["type #{table_name} = {", property_lines, "}\n"].flatten
+    end
+
+    def method_missing(*)
       # To exclude unnecessary methods
     end
 
@@ -41,10 +39,10 @@ module Schema2type
 
     def push_property_line(name:, type:, options:)
       is_non_nullable = options[0] && options[0].key?(:null) && !options[0][:null]
-      formatted_name = @snake_case ? name.underscore : name.camelcase(:lower)
+      formatted_name = snake_case ? name.underscore : name.camelcase(:lower)
       property_line = is_non_nullable ? "#{formatted_name}: #{type};" : "#{formatted_name}: #{type} | null;"
 
-      @out_text << "  #{property_line}"
+      property_lines << "  #{property_line}"
     end
   end
 end

data/lib/schema2type/version.rb

@@ -1,3 +1,3 @@
 module Schema2type
-  VERSION = "0.1.12"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: schema2type
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - ryo