refactor class structures

Author: gfx

lib/typescript-rails.rb

@@ -1,4 +1,6 @@
+require 'typescript/rails'
 require 'typescript/rails/railtie'
 require 'typescript/rails/engine'
+require 'typescript/rails/template'
 require 'typescript/rails/template_handler'
 require 'typescript/rails/version'

lib/typescript/rails.rb

@@ -0,0 +1,5 @@
+module Typescript
+  module Rails
+    # just to define the module Typescript::Rails
+  end
+end

lib/typescript/rails/compiler.rb

@@ -0,0 +1,45 @@
+require 'typescript/rails'
+require 'typescript-node'
+
+module Typescript::Rails::Compiler
+  class << self
+    # @!scope class
+    cattr_accessor :default_options
+
+    # Replace relative paths specified in /// <reference path="..." /> with absolute paths.
+    #
+    # @param [String] ts_path Source .ts path
+    # @param [String] source. It might be pre-processed by erb.
+    # @return [String] replaces source
+    def replace_relative_references(ts_path, source)
+      ts_dir = File.dirname(File.expand_path(ts_path))
+      escaped_dir = ts_dir.gsub(/["\\]/, '\\\\\&') # "\"" => "\\\"", '\\' => '\\\\'
+
+      # Why don't we just use gsub? Because it display odd behavior with File.join on Ruby 2.0
+      # So we go the long way around.
+      output = ''
+      source.each_line do |l|
+        if l.starts_with?('///') && !(m = %r!^///\s*<reference\s+path="([^"]+)"\s*/>\s*!.match(l)).nil?
+          l = l.sub(m.captures[0], File.join(escaped_dir, m.captures[0]))
+        end
+        output = output + l + $/
+      end
+
+      output
+    end
+
+    # @param [String] ts_path
+    # @param [String] source TypeScript source code
+    # @return [String] compiled JavaScript source code
+    def compile(ts_path, source, *options)
+      s = replace_relative_references(ts_path, source)
+      ::TypeScript::Node.compile(s, *default_options, *options)
+    end
+
+  end
+
+  self.default_options = [
+      '--target', 'ES5',
+      '--noImplicitAny'
+  ]
+end

lib/typescript/rails/engine.rb

@@ -1,10 +1,6 @@
 require 'rails/engine'
 
-module Typescript
-  module Rails
-    class Engine < ::Rails::Engine
-      # For now, let's not be the default generator ...
-      # config.app_generators.javascript_engine :ts
-    end
-  end
+class Typescript::Rails::Engine < Rails::Engine
+  # For now, let's not be the default generator ...
+  # config.app_generators.javascript_engine :ts
 end

lib/typescript/rails/railtie.rb

@@ -1,15 +1,11 @@
-module Typescript
-  module Rails
-    class Railtie < ::Rails::Railtie
-      config.before_initialize do |app|
-        require 'typescript-rails'
+require 'typescript/rails'
 
-        if ::Rails::VERSION::MAJOR >= 4 || app.config.assets.enabled
-          require 'sprockets'
-          require 'sprockets/engines'
-          Sprockets.register_engine '.ts', Typescript::Rails::TypeScriptTemplate
-        end
-      end
+class Typescript::Rails::Railtie < ::Rails::Railtie
+  config.before_initialize do |app|
+    if ::Rails::VERSION::MAJOR >= 4 || app.config.assets.enabled
+      require 'typescript/rails/template'
+      require 'sprockets'
+      Sprockets.register_engine '.ts', Typescript::Rails::Template
     end
   end
-end
+end

lib/typescript/rails/template.rb

@@ -0,0 +1,32 @@
+require 'typescript/rails'
+require 'tilt/template'
+
+class Typescript::Rails::Template < ::Tilt::Template
+  self.default_mime_type = 'application/javascript'
+
+  # @!scope class
+  class_attribute :default_bare
+
+  def self.engine_initialized?
+    defined? ::Typescript::Rails::Compiler
+  end
+
+  def initialize_engine
+    require_template_library 'typescript/rails/compiler'
+  end
+
+  def prepare
+    if !options.key?(:bare) and !options.key?(:no_wrap)
+      options[:bare] = self.class.default_bare
+    end
+  end
+
+  def evaluate(scope, locals, &block)
+    @output ||= ::Typescript::Rails::Compiler.compile(file, source)
+  end
+
+  # @override
+  def allows_script?
+    false
+  end
+end

lib/typescript/rails/template_handler.rb

@@ -1,98 +1,17 @@
-require 'typescript-node'
-require 'tilt'
+require 'typescript/rails/compiler'
 
-module Typescript
-  module Rails
-
-    class TypeScriptTemplate < ::Tilt::Template
-      self.default_mime_type = 'application/javascript'
-
-      @@default_bare = false
-
-      def self.default_bare
-        @@default_bare
-      end
-
-      def self.default_bare=(value)
-        @@default_bare = value
-      end
-
-      # @deprecated
-      def self.default_no_wrap
-        @@default_bare
-      end
-
-      # @deprecated
-      def self.default_no_wrap=(value)
-        @@default_bare = value
-      end
-
-      def self.engine_initialized?
-        defined? ::TypeScript
-      end
-
-      def initialize_engine
-        require_template_library 'coffee_script'
-      end
-
-      def prepare
-        if !options.key?(:bare) and !options.key?(:no_wrap)
-          options[:bare] = self.class.default_bare
-        end
-      end
-
-      def evaluate(scope, locals, &block)
-        source = Typescript::Rails.replace_relative_references(file, data)
-        # TODO: employs source-maps
-        @output ||= TypeScript::Node.compile(source, '--target', 'ES5')
-      end
-
-      def allows_script?
-        false
-      end
+class Typescript::Rails::TemplateHandler
+  class << self
+    def erb_handler
+      @erb_handler ||= ActionView::Template.registered_template_handler(:erb)
     end
 
-    class TemplateHandler
-
-      def self.erb_handler
-        @@erb_handler ||= ActionView::Template.registered_template_handler(:erb)
-      end
-
-      def self.call(template)
-        compiled_source = erb_handler.call(template)
-        escaped_path = template.identifier.gsub(/['\\]/, '\\\\\&') # "'" => "\\'", '\\' => '\\\\'
-        <<-EOS
-        TypeScript::Node.compile(
-          Typescript::Rails.replace_relative_references(
-            '#{escaped_path}', (begin;#{compiled_source};end)
-          ),
-          '--target', 'ES5'
-        )
-        EOS
-      end
-    end
-
-    # Replace relative paths specified in /// <reference path="..." /> with absolute paths.
-    #
-    # @param [String] ts_path Source .ts path
-    # @param [String] ts source. It might be pre-processed by erb.
-    # @return [String] replaces source
-    def self.replace_relative_references(ts_path, source)
-      ts_dir = File.dirname(File.expand_path(ts_path))
-      escaped_dir = ts_dir.gsub(/["\\]/, '\\\\\&') # "\"" => "\\\"", '\\' => '\\\\'
-
-      # Why don't we just use gsub? Because it display odd behavior with File.join on Ruby 2.0
-      # So we go the long way around.
-      output = ''
-      source.each_line do |l|
-        if l.starts_with?('///') && !(m = %r!^///\s*<reference\s+path="([^"]+)"\s*/>\s*!.match(l)).nil?
-          l = l.sub(m.captures[0], File.join(escaped_dir, m.captures[0]))
-        end
-
-        output = output + l + $/
-      end
-
-      output
+    def call(template)
+      compiled_source = erb_handler.call(template)
+      path = template.identifier.gsub(/['\\]/, '\\\\\&') # "'" => "\\'", '\\' => '\\\\'
+      <<-EOS
+        ::Typescript::Rails::Compiler.compile('#{path}', (begin;#{compiled_source};end))
+      EOS
     end
   end
 end

test/assets_test.rb

@@ -9,6 +9,7 @@ def setup
     require "sprockets/railtie"
 
     @app = Class.new(Rails::Application)
+    @app.config.eager_load = false
     @app.config.active_support.deprecation = :stderr
     @app.config.assets.enabled = true
     @app.config.assets.cache_store = [ :file_store, "#{tmp_path}/cache" ]

test/support/site/ref3_2.ts

@@ -1,3 +1,3 @@
-var f1 = function() {
+var f1 = function(): void {
 
 };

test/support/site/ref3_3.ts

@@ -1,3 +1,3 @@
-var f2 = function() {
+var f2 = function(): void {
 
 };