ts_schema 0.1.10 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5093baca17f4486d16008b5e3eb15dde18d5064b902a45c0d05defe5948f0ee
-  data.tar.gz: 14d0f1352c9c716af3040814447c8aac81a3cdb66b04870fe698c5f9fa1c98f9
+  metadata.gz: 55a01d015705b45bc3b21d80c74fde717172daf0b9cc8f8856ee24bdb6ffe00d
+  data.tar.gz: 662b58cf50169869845249b218ad760d7f3e4d96b5e833ae916a77a86e8447dd
 SHA512:
-  metadata.gz: b8425b8aefc7433b1360b6fb703ae9d0664513d6f6396e347f2b4c1e7d2345daf2a5047779c576cd070187c34fe87edd0da8aba6947dee644951c01e89fe2fbf
-  data.tar.gz: 146ce2d710732da6f36cad8d4c9a9ff4d9fb95f186247c937441719951539517d8705184b8b151f42446a413b20f0b19f2dde0e79476b29d96c69aa62271aadc
+  metadata.gz: 5f7ceb576b082e209567755d34c7ce25f826ec61891e3f61662f06289838b087c2d18b61f8fdcbabe4db097f59af90332ac55b861b25242a0cc20bc809ad8e9d
+  data.tar.gz: 785331c128754a645c9570146244fc01992329ea7864dc40b3295a587f67ce07bacfff3320a6e9a673552eff4f5489c891028715d7675be5965275a5598eb43b

data/Rakefile

@@ -1,2 +1,3 @@
 require "bundler/setup"
 require "bundler/gem_tasks"
+require "ts_schema"

data/lib/tasks/ts_schema_tasks.rake

@@ -1,8 +1,9 @@
 require "rake"
+require "ts_schema"
 
 namespace :ts_schema do
   desc "Generates a schema file in the default javascripts location, or the location specified in the ts_config initializer options"
-  task :generate do
+  task generate: :environment do
     TsSchema.output_file
   end
 end
@@ -12,19 +13,11 @@ namespace :db do
     TsSchema.output_file if TsSchema.configuration.auto_generate
   end
 
-  task migrate: :environment do
-    auto_generate_and_save_file
+  task :migrate do
+    at_exit { auto_generate_and_save_file }
   end
 
-  task rollback: :environment do
-    auto_generate_and_save_file
-  end
-
-  task reset: :environment do
-    auto_generate_and_save_file
-  end
-
-  task setup: :environment do
-    auto_generate_and_save_file
+  task :setup do
+    at_exit { auto_generate_and_save_file }
   end
 end

data/lib/ts_schema/configuration.rb

@@ -37,6 +37,5 @@ module TsSchema
       end
       self
     end
-
   end
 end

data/lib/ts_schema/conversion_table.yml

@@ -2,7 +2,6 @@ string: string
 text: string
 integer: number
 enum: number
-bigint: number
 float: number
 decimal: number
 json: Record<string, any>
@@ -12,7 +11,6 @@ boolean: boolean
 date: string
 datetime: string
 timestamp: string
-datetime_with_timezone: string
 inet: string
 cidr: string
 macaddr: string

data/lib/ts_schema/railtie.rb

@@ -1,4 +1,7 @@
+require "rails"
+
 module TsSchema
   class Railtie < ::Rails::Railtie
+    load "tasks/ts_schema_tasks.rake"
   end
 end

data/lib/ts_schema/schema_generator.rb

@@ -2,13 +2,31 @@ require 'fileutils'
 
 module TsSchema
   class SchemaGenerator
-    def initialize
+    attr_accessor :config
+    attr_accessor :models
+
+    def initialize(config = nil)
+      @config = config || TsSchema::Configuration.new
+
       Rails.application.eager_load!
-      @models = ApplicationRecord.send(:subclasses)
-			unless TsSchema.configuration.additional_models.empty?
-				@models.concat(TsSchema.configuration.additional_models.map {|m| m.to_s.constantize })
-			end
-      @types = TsSchema.configuration.types.merge(TsSchema.configuration.custom_types || {})
+      # @models = ApplicationRecord.send(:subclasses)
+      @models = get_subclasses(ApplicationRecord)
+      unless @config.additional_models.empty?
+        @models.concat(@config.additional_models.map do |m| 
+          m.to_s.constantize
+        end)
+      end
+      @types = @config.types.stringify_keys.merge(@config.custom_types.stringify_keys || {})
+    end
+
+    def get_subclasses(model)
+      models = model.send(:subclasses)
+      unless nested_empty?(models)
+        models.concat(models.flat_map do |m|
+          get_subclasses(m)
+        end)
+      end
+      models
     end
 
     def generate
@@ -16,10 +34,10 @@ module TsSchema
     end
 
     def output_file
-      path = TsSchema.configuration.output
+      path = @config.output
       FileUtils.mkdir_p(File.dirname(path))
 
-			content = generate
+      content = generate
       return if File.exist?(path) && File.read(path) == content
 
       File.open(path, 'w') do |f|
@@ -27,13 +45,11 @@ module TsSchema
       end
     end
 
-    private
-
     def generate_typescript
       type_template = ""
       @models.each do |model|
         columns = map_column_types(model)
-        columns.concat(map_associations(model)) if TsSchema.configuration.include_associated
+        columns.concat(map_associations(model)) if @config.include_associated
         
         type_template += <<~TYPESCRIPT
           interface #{model.model_name.param_key.camelize} {
@@ -42,7 +58,7 @@ module TsSchema
         TYPESCRIPT
       end
       type_template = <<~TPL
-        declare namespace #{TsSchema.configuration.namespace} {
+        declare namespace #{@config.namespace} {
         #{indent_wrapper(type_template)}
         }
       TPL
@@ -50,7 +66,7 @@ module TsSchema
 
     def map_column_types(model)
       model.columns.map { |i|
-        type = @types[i.type.to_s] || TsSchema.configuration.default_type
+        type = @types[i.type.to_s] || @config.default_type
 
         if(enum = model.defined_enums[i.name])
           type = enum.keys.map { |k| "'#{k}'" }.join(" | ")
@@ -80,8 +96,14 @@ module TsSchema
       end
     end
 
+    private
+
+    def nested_empty?(arr)
+      arr.is_a?(Array) && arr.flatten.empty?
+    end
+
     def column_name_cased(name)
-      case TsSchema.configuration.case.to_sym
+      case @config.case.to_sym
       when :camel
         name.camelize(:lower)
       when :pascal
@@ -92,18 +114,18 @@ module TsSchema
     end
 
     def indent_as_str
-      case TsSchema.configuration.indent.to_sym
+      case @config.indent.to_sym
       when :space || :spaces
-        "".rjust(TsSchema.configuration.spaces, " ")
+        "".rjust(@config.spaces, " ")
       else
         "\t"
       end
     end
 
     def indent_wrapper(str)
-      case TsSchema.configuration.indent.to_sym
+      case @config.indent.to_sym
       when :space || :spaces
-        str.indent(TsSchema.configuration.spaces)
+        str.indent(@config.spaces)
       else
         str.indent(1, "\t")
       end

data/lib/ts_schema/version.rb

@@ -1,3 +1,3 @@
 module TsSchema
-  VERSION = "0.1.10"
+  VERSION = "0.1.11"
 end

data/lib/ts_schema.rb

@@ -4,6 +4,7 @@ require "ts_schema/railtie"
 require "ts_schema/configuration"
 require "ts_schema/schema_generator"
 
+
 module TsSchema
   class << self
     def setup(&block)
@@ -15,11 +16,19 @@ module TsSchema
     end
 
     def generate
-      SchemaGenerator.new.generate
+      if ActiveRecord::Base.connection.migration_context.needs_migration?
+        puts "Aborting: There are pending migrations"
+      else 
+        SchemaGenerator.new(@configuration).generate
+      end
     end
 
 		def output_file
-			SchemaGenerator.new.output_file
+      if ActiveRecord::Base.connection.migration_context.needs_migration?
+        puts "Aborting: There are pending migrations"
+      else 
+        SchemaGenerator.new(@configuration).output_file
+      end
 		end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ts_schema
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.11
 platform: ruby
 authors:
 - Avram Walden
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-04 00:00:00.000000000 Z
+date: 2022-04-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -24,6 +24,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 6.0.0
+- !ruby/object:Gem::Dependency
+  name: railties
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '4'
 description: ''
 email:
 - aviemet@gmail.com