Merge pull request #6 from bdrazhzhov/master

Using local TS node module

Author: bdrazhzhov

CHANGES.md

@@ -1,3 +1,6 @@
+## v1.4.1.3 2015-06-29 21:37:00+0300
+* Updated Typescript to v1.4.1
+* Added option `use_external_tsc` (boolean). It could be helpful if you have locally installed Typescript node.js module and want to use it.
 
 ## v1.0.1.2 2014-08-09 08:37:08+0900
 

README.md

@@ -21,9 +21,12 @@ Or install it yourself as:
 ```ruby
 require 'typescript-src'
 
+TypeScript::Src.use_external_tsc = true # if you want to use tsc from installed node.js module.
+                                        # false by default (it uses built-in tsc)
+
 p TypeScript::Src.tsc_path # => #<Pathname:/path/to/tsc>
 p TypeScript::Src.js_path  # => #<Pathname:/path/to/typescript.js>
-p TypeScript::Src.version  # => "1.0.1"
+p TypeScript::Src.version  # => "1.4.1.3"
 ```
 
 ## Contributing

lib/typescript-src.rb

@@ -5,9 +5,19 @@
 module TypeScript
   module Src
     class << self
+      attr_accessor :use_external_tsc
+
       # @return [Pathname]
       def typescript_path
-        @typescript_path ||= ::Pathname.new(File.dirname(__FILE__)).join('typescript-src/support/typescript')
+        unless @typescript_path
+          if self.use_external_tsc
+            @typescript_path = ::Pathname.new(`npm root -g`.strip! + '/typescript')
+          else
+            @typescript_path = ::Pathname.new(File.dirname(__FILE__)).join('typescript-src/support/typescript')
+          end
+        end
+
+        @typescript_path
       end
 
       # @return [Pathname]
@@ -17,7 +27,7 @@ def tsc_path
 
       # @return [Pathname]
       def js_path
-        typescript_path.join('bin/typescript.js')
+        typescript_path.join('bin/tsc.js')
       end
 
       # @return [Pathname]
@@ -47,6 +57,8 @@ def version
         package_info['version']
       end
     end
+
+    self.use_external_tsc = false
   end
 end
 

lib/typescript-src/support/typescript/.npmignore

@@ -1,12 +1,7 @@
 built
 doc
-samples
 src
 tests
-typings
-bin/winjs.d.ts
-bin/winrt.d.ts
-bin/*.bat
-bin/jquery.d.ts
-bin/typescriptServices.js
 Jakefile
+.travis.yml
+scripts/

lib/typescript-src/support/typescript/CONTRIBUTING.md

@@ -0,0 +1,74 @@
+## Contributing bug fixes
+TypeScript is currently accepting contributions in the form of bug fixes. A bug must have an issue tracking it in the issue tracker that has been approved ("Milestone == Community") by the TypeScript team. Your pull request should include a link to the bug that you are fixing. If you've submitted a PR for a bug, please post a comment in the bug to avoid duplication of effort.
+
+## Contributing features
+Features (things that add new or improved functionality to TypeScript) may be accepted, but will need to first be approved (marked as "Milestone == Community" by a TypeScript coordinator with the message "Approved") in the suggestion issue. Features with language design impact, or that are adequately satisfied with external tools, will not be accepted.
+
+Design changes will not be accepted at this time. If you have a design change proposal, please log a suggestion issue.
+
+## Legal
+You will need to complete a Contributor License Agreement (CLA). Briefly, this agreement testifies that you are granting us permission to use the submitted change according to the terms of the project's license, and that the work being submitted is under appropriate copyright.
+
+Please submit a Contributor License Agreement (CLA) before submitting a pull request. Download the agreement ([Microsoft Contribution License Agreement.docx](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=822190) or [Microsoft Contribution License Agreement.pdf](https://www.codeplex.com/Download?ProjectName=typescript&DownloadId=921298)), sign, scan, and email it back to <[email protected]>. Be sure to include your github user name along with the agreement. Once we have received the signed CLA, we'll review the request. Please note that we're currently only accepting pull requests of bug fixes rather than new features.
+
+## Housekeeping
+Your pull request should: 
+
+* Include a description of what your change intends to do
+* Be a child commit of a reasonably recent commit in the **master** branch 
+    * Requests need not be a single commit, but should be a linear sequence of commits (i.e. no merge commits in your PR)
+* It is desirable, but not necessary, for the tests to pass at each commit
+* Have clear commit messages 
+    * e.g. "Refactor feature", "Fix issue", "Add tests for issue"
+* Include adequate tests 
+    * At least one test should fail in the absence of your non-test code changes. If your PR does not match this criteria, please specify why
+    * Tests should include reasonable permutations of the target fix/change
+    * Include baseline changes with your change
+    * All changed code must have 100% code coverage
+* Follow the code conventions descriped in [Coding guidlines](https://github.com/Microsoft/TypeScript/wiki/Coding-guidlines)
+* To avoid line ending issues, set `autocrlf = input` and `whitespace = cr-at-eol` in your git configuration
+
+## Running the Tests
+To run all tests, invoke the runtests target using jake:
+
+`jake runtests`
+
+This run will all tests; to run only a specific subset of tests, use:
+
+`jake runtests tests=<regex>`
+
+e.g. to run all compiler baseline tests:
+
+`jake runtests tests=compiler`
+
+or to run specifc test:tests\cases\compiler\2dArrays.ts 
+
+`jake runtests tests=2dArrays`
+
+## Adding a Test
+To add a new testcase, simply place a .ts file in tests\cases\compiler containing code that exemplifies the bugfix or change you are making.
+
+These files support metadata tags in the format  // @name: value . The supported names and values are:
+
+* comments, sourcemap, noimplicitany, declaration: true or false (corresponds to the compiler command-line options of the same name)
+* target: ES3 or ES5 (same as compiler)
+* out, outDir: path (same as compiler)
+* module: local, commonjs, or amd (local corresponds to not passing any compiler --module flag)
+
+**Note** that if you have a test corresponding to a specific spec compliance item, you can place it in tests\cases\conformance in an appropriately-named subfolder. 
+**Note** that filenames here must be distinct from all other compiler testcase names, so you may have to work a bit to find a unique name if it's something common.
+
+## Managing the Baselines
+Compiler testcases generate baselines that track the emitted .js, the errors produced by the compiler, and the type of each expression in the file. Additionally, some testcases opt in to baselining the source map output.
+
+When a change in the baselines is detected, the test will fail. To inspect changes vs the expected baselines, use
+
+`jake diff`
+
+After verifying that the changes in the baselines are correct, run
+
+`jake baseline-accept`
+
+to establish the new baselines as the desired behavior. This will change the files in tests\baselines\reference, which should be included as part of your commit. It's important to carefully validate changes in the baselines.
+
+**Note** that baseline-accept should only be run after a full test run! Accepting baselines after running a subset of tests will delete baseline files for the tests that didn't run.

lib/typescript-src/support/typescript/README.md

@@ -0,0 +1,78 @@
+[![Build Status](https://travis-ci.org/Microsoft/TypeScript.svg?branch=master)](https://travis-ci.org/Microsoft/TypeScript)
+[![Issue Stats](http://issuestats.com/github/Microsoft/TypeScript/badge/pr)](http://issuestats.com/github/microsoft/typescript)
+[![Issue Stats](http://issuestats.com/github/Microsoft/TypeScript/badge/issue)](http://issuestats.com/github/microsoft/typescript)
+
+# TypeScript
+
+[TypeScript](http://www.typescriptlang.org/) is a language for application-scale JavaScript. TypeScript adds optional types, classes, and modules to JavaScript. TypeScript supports tools for large-scale JavaScript applications for any browser, for any host, on any OS. TypeScript compiles to readable, standards-based JavaScript. Try it out at the [playground](http://www.typescriptlang.org/Playground), and stay up to date via [our blog](http://blogs.msdn.com/typescript) and [twitter account](https://twitter.com/typescriptlang).
+
+
+## Contribute
+
+There are many ways to [contribute](https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md) to TypeScript.
+* [Submit bugs](https://github.com/Microsoft/TypeScript/issues) and help us verify fixes as they are checked in.
+* Review the [source code changes](https://github.com/Microsoft/TypeScript/pulls).
+* Engage with other TypeScript users and developers on [StackOverflow](http://stackoverflow.com/questions/tagged/typescript). 
+* Join the [#typescript](http://twitter.com/#!/search/realtime/%23typescript) discussion on Twitter.
+* [Contribute bug fixes](https://github.com/Microsoft/TypeScript/blob/master/CONTRIBUTING.md).
+* Read the language specification ([docx](http://go.microsoft.com/fwlink/?LinkId=267121), [pdf](http://go.microsoft.com/fwlink/?LinkId=267238)).
+
+
+## Documentation
+
+*  [Quick tutorial](http://www.typescriptlang.org/Tutorial)
+*  [Programming handbook](http://www.typescriptlang.org/Handbook)
+*  [Language specification](https://github.com/Microsoft/TypeScript/blob/master/doc/spec.md)
+*  [Homepage](http://www.typescriptlang.org/)
+
+## Building
+
+In order to build the TypeScript compiler, ensure that you have [Git](http://git-scm.com/downloads) and [Node.js](http://nodejs.org/) installed.
+
+Clone a copy of the repo:
+
+```
+git clone https://github.com/Microsoft/TypeScript.git
+```
+
+Change to the TypeScript directory:
+
+```
+cd TypeScript
+```
+
+Install Jake tools and dev dependencies:
+
+```
+npm install -g jake
+npm install
+```
+
+Use one of the following to build and test:
+
+```
+jake local            # Build the compiler into built/local 
+jake clean            # Delete the built compiler 
+jake LKG              # Replace the last known good with the built one.
+                      # Bootstrapping step to be executed when the built compiler reaches a stable state.
+jake tests            # Build the test infrastructure using the built compiler. 
+jake runtests         # Run tests using the built compiler and test infrastructure. 
+                      # You can override the host or specify a test for this command. 
+                      # Use host=<hostName> or tests=<testPath>. 
+jake runtests-browser # Runs the tests using the built run.js file. Syntax is jake runtests. Optional
+                        parameters 'host=', 'tests=[regex], reporter=[list|spec|json|<more>]'.
+jake baseline-accept  # This replaces the baseline test results with the results obtained from jake runtests. 
+jake -T               # List the above commands. 
+```
+
+
+## Usage
+
+```shell
+node built/local/tsc.js hello.ts
+```
+
+
+## Roadmap
+
+For details on our planned features and future direction please refer to our [roadmap](https://github.com/Microsoft/TypeScript/wiki/Roadmap).

lib/typescript-src/support/typescript/README.txt

@@ -19,67 +19,17 @@ limitations under the License.
 ---------------------------------------------
 Third Party Code Components
 --------------------------------------------
----- Mozilla Developer Code---------
-The following Mozilla Developer Code is under Public Domain as updated after Aug. 20, 2012, see, https://developer.mozilla.org/en-US/docs/Project:Copyrights
-1. Array filter Compatibility Method, 
-Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/filter
-Any copyright is dedicated to the Public Domain.
 
-2. Array forEach Compatibility Method, 
-Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/forEach
-Any copyright is dedicated to the Public Domain.
-
-3. Array indexOf Compatibility Method, 
-Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/indexOf
-Any copyright is dedicated to the Public Domain.
-
-4. Array map Compatibility Method, 
-Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/map
-Any copyright is dedicated to the Public Domain.
-
-5. Array Reduce Compatibility Method, 
-Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Array/Reduce
-Any copyright is dedicated to the Public Domain.
-
-6. String Trim Compatibility Method, 
-Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/String/Trim
-Any copyright is dedicated to the Public Domain.
-
-7. Date now Compatibility Method, 
-Available at https://developer.mozilla.org/en-US/docs/JavaScript/Reference/Global_Objects/Date/now
-Any copyright is dedicated to the Public Domain.
-
-------------JSON2 Script------------------------
-json2.js 2012-10-08
-Public Domain.
-NO WARRANTY EXPRESSED OR IMPLIED. USE AT YOUR OWN RISK.
-See, http://www.JSON.org/js.html
-
---------------r.js----------------------
-Copyright (c) 2010-2011 Dojo Foundation. All Rights Reserved.
-Originally License under MIT License
--------------------------------------------------------------------------
+------------------- DefinitelyTyped --------------------
+This file is based on or incorporates material from the projects listed below (collectively ?Third Party Code?). Microsoft is not the original author of the Third Party Code. The original copyright notice and the license, under which Microsoft received such Third Party Code, are set forth below. Such licenses and notices are provided for informational purposes only. Microsoft, not the third party, licenses the Third Party Code to you under the terms set forth in the EULA for the Microsoft Product. Microsoft reserves all other rights not expressly granted under this agreement, whether by implication, estoppel or otherwise. 
+DefinitelyTyped
+This project is licensed under the MIT license.
+Copyrights are respective of each contributor listed at the beginning of each definition file.
 Provided for Informational Purposes Only
-MIT License
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+ 
+MIT License 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the ""Software""), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: 
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 --------------------------------------------------------------------------------------
-
 ------------- End of ThirdPartyNotices --------------------------------------------------- */