schema2type 0.2.3 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 93dcd338891b9f159af21fd6c79db61c4b6b3fa7ee3b3aeee1b52a35ffef9380
-  data.tar.gz: 58831c346ebfc9fcd9ba867c34f8c83b2a1a9c2a57b09327bdbc504e203eb18e
+  metadata.gz: c33b8832f843a68c17296439b5da86d0b9d34cefa4953d0c99ced68186b9bdce
+  data.tar.gz: 4c6a2641588b56ddb846903e7fa37c16b8a516733d6c98f300e4cddccba68d8e
 SHA512:
-  metadata.gz: 4d26fd7d40936f4c2720b06fe325583fdd3d6c32995c1176b6edd0498c1c4a8078d6d83a873544592f0be3454becd40cbb8728104ea87a486be25e4447fb1904
-  data.tar.gz: 383af1848ec7e2169ce2d744938790e26b8eec8745ea15af526e448281fcb0041457a9f56a6e0e8d7cdd84c481566865f454d847a359ed3b3c2164c297068731
+  metadata.gz: 057bb0162fb706753ca3d15e658349bd011961f5f7feb567c3f5eec329b981f51260c63da1280bb19030310507fdd8ae4c8a03d1afdc848c3d1672acad779d72
+  data.tar.gz: 749dcdbf746789d1d65957723a269d862dab7533170fd6577a7c43a182248f577911d72debbceb43f94cecef0e4baffe010a949b92c1b96c67b253555ec8adfb

data/.ruby-version

@@ -0,0 +1 @@
+2.7.0

data/Gemfile

@@ -1,4 +1,5 @@
 source "https://rubygems.org"
+ruby '2.7.0'
 
 # Specify your gem's dependencies in schema2type.gemspec
 gemspec

data/Gemfile.lock

@@ -1,39 +1,41 @@
 PATH
   remote: .
   specs:
-    schema2type (0.2.2)
+    schema2type (0.4.0)
       activesupport
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (5.2.2)
+    activesupport (6.0.3.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
       tzinfo (~> 1.1)
-    concurrent-ruby (1.1.4)
+      zeitwerk (~> 2.2, >= 2.2.2)
+    concurrent-ruby (1.1.6)
     diff-lcs (1.3)
-    i18n (1.5.3)
+    i18n (1.8.3)
       concurrent-ruby (~> 1.0)
-    minitest (5.11.3)
-    rake (10.5.0)
-    rspec (3.8.0)
-      rspec-core (~> 3.8.0)
-      rspec-expectations (~> 3.8.0)
-      rspec-mocks (~> 3.8.0)
-    rspec-core (3.8.0)
-      rspec-support (~> 3.8.0)
-    rspec-expectations (3.8.2)
+    minitest (5.14.1)
+    rake (13.0.1)
+    rspec (3.9.0)
+      rspec-core (~> 3.9.0)
+      rspec-expectations (~> 3.9.0)
+      rspec-mocks (~> 3.9.0)
+    rspec-core (3.9.2)
+      rspec-support (~> 3.9.3)
+    rspec-expectations (3.9.2)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-mocks (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-mocks (3.9.1)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.8.0)
-    rspec-support (3.8.0)
+      rspec-support (~> 3.9.0)
+    rspec-support (3.9.3)
     thread_safe (0.3.6)
-    tzinfo (1.2.5)
+    tzinfo (1.2.7)
       thread_safe (~> 0.1)
+    zeitwerk (2.3.0)
 
 PLATFORMS
   ruby
@@ -41,9 +43,12 @@ PLATFORMS
 DEPENDENCIES
   activesupport
   bundler (~> 2.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   schema2type!
 
+RUBY VERSION
+   ruby 2.7.0p0
+
 BUNDLED WITH
-   2.0.1
+   2.1.4

data/README.md

@@ -22,12 +22,13 @@ Automatically have the following TypesScript type generated.
 ```typescript
 declare namespace schema {
   type User = {
-    name: string | null
-    age: number | null
-    sales: number | null
-    paid: boolean
-    createdAt: Date
-    updatedAt: Date
+    id: number;
+    name: string | null;
+    age: number | null;
+    sales: number | null;
+    paid: boolean;
+    createdAt: string;
+    updatedAt: string;
   }
 }
 ```
@@ -72,8 +73,8 @@ the schema2type convert as per this conversion table.
 |---|---|
 | string | string |
 | text | string |
-| json | string |
-| jsonb | string |
+| json | Record<string, any> |
+| jsonb | Record<string, any> |
 | binary | string |
 | inet | string |
 | integer | number |
@@ -81,10 +82,10 @@ the schema2type convert as per this conversion table.
 | float | number |
 | decimal | number |
 | boolean | boolean |
-| date | Date |
-| datetime | Date |
-| timestamp | Date |
-| datetime_with_timezone | Date |
+| date | string |
+| datetime | string |
+| timestamp | string |
+| datetime_with_timezone | string |
 ## License
 
 The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/lib/schema2type/cli.rb

@@ -1,10 +1,8 @@
 module Schema2type
-
   DEFAULT_SCHEMA_PATH = "./db/schema.rb".freeze
   DEFAULT_NAME_SPACE = "schema".freeze
 
   def self.execute(input_file:, out_file:, name_space:, is_snake_case:)
-
     resultHash = eval(File.read(input_file || DEFAULT_SCHEMA_PATH), CovertService.new(is_snake_case).get_binding)
 
     File.open(out_file, "w") do |f|

data/lib/schema2type/conversion_table.yml

@@ -2,15 +2,15 @@
 string: string
 inet: string
 text: string
-json: string
-jsonb: string
+json: Record<string, any>
+jsonb: Record<string, any>
 binary: string
 integer: number
 bigint: number
 float: number
 decimal: number
 boolean: boolean
-date: Date
-datetime: Date
-timestamp: Date
-datetime_with_timezone: Date
+date: string
+datetime: string
+timestamp: string
+datetime_with_timezone: string

data/lib/schema2type/covert_service.rb

@@ -16,6 +16,10 @@ module Schema2type
       @converted_types.concat converter.converted_type_lines
     end
 
+    def skip_dsl(*)
+      @converted_types
+    end
+
     def method_missing(*)
       # To exclude unnecessary methods
       # TODO: add error handling
@@ -41,5 +45,6 @@ module Schema2type
     end
 
     alias create_table convert_schema_to_type
+    alias add_foreign_key skip_dsl
   end
 end

data/lib/schema2type/schema_converter.rb

@@ -5,10 +5,6 @@ module Schema2type
   class SchemaConverter
     attr_reader :property_lines, :table_name, :is_snake_case
 
-    TYPE_STRING = 'string'.freeze
-    TYPE_NUMBER = 'number'.freeze
-    TYPE_BOOLEAN = 'boolean'.freeze
-    TYPE_DATE = 'Date'.freeze
     COLUMN_METHODS = YAML.load_file(File.expand_path(__dir__) + '/conversion_table.yml').to_a
     ID_PROPERTY_LINE_TEXT = "  id: number;".freeze
 

data/lib/schema2type/version.rb

@@ -1,3 +1,3 @@
 module Schema2type
-  VERSION = '0.2.3'
+  VERSION = '0.4.0'
 end

data/schema2type.gemspec

@@ -24,6 +24,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
   spec.add_runtime_dependency "activesupport"
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: schema2type
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.4.0
 platform: ruby
 authors:
 - ryo
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2021-03-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -77,6 +77,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
+- ".ruby-version"
 - ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -113,7 +114,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: generate TypeScript type definitions from Rails schema.rb