middleman-typescript 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6460e3fa419ffef139fbf4f906ab82d067117ab6
-  data.tar.gz: 279400ed48473db21016d621208ce64238590792
+  metadata.gz: 156eea0b6b9dededb79ec53dcd15aa4829c2acc3
+  data.tar.gz: 8f1ea93322438bd4cb72ac6036b20961517ebc41
 SHA512:
-  metadata.gz: af53b756b295b29c0721b99f029d5d49346ec0fad278418cadfb36f830ee0a211cba33e75d62ebcd27a3cd0bcdfb98119f93f6aad65fae7312472eaf885c6b92
-  data.tar.gz: d7c6d3970cf9f7fcda9b00550e90c89821efe8602378a2bcc90f99b9af104819f1dd25a0028671195b4681469815eec0079ca3b9397caecaa1faec07d77a8ec8
+  metadata.gz: 3ac568b6e704b6fbe78bcc53a9c5a69e74ceabf59c6594fe18fe7c36539514de4ad852fdeb97a1161920d75fbf52446dd6f4935a682b8ac3efae98b7aa386ee9
+  data.tar.gz: 24988884d16facabf3e4cf7cb7bc4df39407b3b225293bd06e5af82e921c80eea4c8d5c7bf532181ee722bdd6379175db1ca47af3c90f8574099addac348a080

data/README.md

@@ -18,8 +18,20 @@ Or install it yourself as:
 
 ## Configuration
 
-    ignore "source/typescripts/*" # *.ts ignore LiveReload
-    activate :typescript, typescript_dir: 'ts' # default: 'typescripts'
+    activate :typescript,
+             typescript_dir: 'ts',  # default: 'typescripts'
+             js_lib_dir: 'vendor',  # default: 'lib'
+             target: 'ES3',         # default: 'ES5'
+             no_implicit_any: false # default: true
+    configure :development do
+      ignore '.idea/*'              # for Intellij idea user
+      ignore 'source/typescripts/*' # *.ts ignore LiveReload
+      activate :livereload
+    end
+    
+    configure :build do
+      ignore 'typescripts/*'        # ignore copy *.ts to build dir
+    end
 
 Create typescripts directory under source directory. 
 ## Contributing

data/lib/middleman-typescript/extension.rb

@@ -5,28 +5,30 @@ module Middleman
     option :typescript_dir, 'typescripts', 'Set TypeScript dir.'
     option :target, 'ES5', 'Target version.(Default ES5)'
     option :no_implicit_any, true, 'Use --noImplicitAny option.(Default true)'
+    option :js_lib_dir, 'lib', 'Set JavaScript library dir.'
     def initialize(app, options_hash={}, &block)
       super
-      return unless app.environment == :development
 
       app.set :typescript_dir, options.typescript_dir
       compile_options = ['--target', options.target]
       compile_options << '--noImplicitAny' if options.no_implicit_any
       app.set :typescript_compile_options, compile_options
+      app.set :typescript_js_lib_dir, options.js_lib_dir
 
       app.ready do
         files.changed do |file|
           next if File.extname(file) != '.ts'
 
           file_path = "#{Dir.pwd}/#{file}"
+          # Cannot call compile_to_js method...
+          # compile_to_js(file_path)
           result = TypeScript::Node.compile_file(file_path, *app.typescript_compile_options)
           if result.success?
-            file_name = File.basename(file_path).gsub(/\.ts/, '.js')
             export_dir = source_dir + File.dirname(file_path).sub(source_dir, '').sub(app.typescript_dir, app.js_dir)
-            Dir.mkdir export_dir unless Dir.exist? export_dir
-            export_path = "#{export_dir}/#{file_name}"
+            FileUtils.mkdir_p export_dir unless Dir.exist? export_dir
 
-            File.open export_path, "w" do |f|
+            file_name = File.basename(file_path).gsub(/\.ts/, '.js')
+            File.open "#{export_dir}/#{file_name}", "w" do |f|
               f.write result.js
             end
           else
@@ -44,5 +46,68 @@ module Middleman
         end
       end
     end
+
+    def after_configuration
+      remove_javascripts_without_library
+      compile_typescripts
+    end
+
+    def after_build
+      remove_typescripts_from_build_path
+    end
+
+    private
+    def remove_javascripts_without_library
+      app.logger.info "TypeScript: Removing JavaScript files..."
+      Dir.glob("#{app.source_dir}/#{app.js_dir}/*") do |js_file_path|
+        unless js_file_path.split('/').include? app.typescript_js_lib_dir
+          unlink_recursive(js_file_path)
+        end
+      end
+    end
+
+    def compile_typescripts
+      app.logger.info "TypeScript: Compiling TypeScript files..."
+      Dir.glob("#{app.source_dir}/#{app.typescript_dir}/**/*") do |file_path|
+        next if File.directory?(file_path) || File.extname(file_path) != '.ts'
+        compile_to_js file_path
+      end
+    end
+
+    def remove_typescripts_from_build_path
+      typescript_build_path = "#{Dir.pwd}/#{app.build_dir}/#{app.typescript_dir}"
+      if Dir.exist? typescript_build_path
+        app.logger.info "TypeScript: Removing #{app.build_dir}/#{app.typescript_dir}/"
+        unlink_recursive typescript_build_path
+      end
+    end
+
+    def unlink_recursive(file_path, &block)
+      if File.directory?(file_path)
+        Dir.glob("#{file_path}/*") do |f|
+          unlink_recursive f, &block
+        end
+        Dir.rmdir(file_path)
+      else
+        File.unlink file_path
+      end
+      block.call(file_path) if block
+    end
+
+    def compile_to_js(file_path)
+      result = TypeScript::Node.compile_file(file_path, *app.typescript_compile_options)
+      if result.success?
+        file_name = File.basename(file_path).gsub(/\.ts/, '.js')
+        export_dir = app.source_dir + File.dirname(file_path).sub(app.source_dir, '').sub(app.typescript_dir, app.js_dir)
+        FileUtils.mkdir_p export_dir unless Dir.exist? export_dir
+        export_path = "#{export_dir}/#{file_name}"
+
+        File.open export_path, "w" do |f|
+          f.write result.js
+        end
+      else
+        app.logger.info "TypeScript: #{result.stderr}"
+      end
+    end
   end
 end

data/lib/middleman-typescript/version.rb

@@ -1,5 +1,5 @@
 module Middleman
   module Typescript
-    VERSION = "0.0.4"
+    VERSION = "0.1.0"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: middleman-typescript
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Toyoaki Oko