Update the NPM version, add some minor fixes and remove demo

This is part of the effort to create an official TypeScript compiler: Urigo/angular2-meteor#89 Urigo/angular2-meteor#90 Urigo/angular2-meteor#102
barbatus · Feb 15, 2016 · 694d036 · 694d036
1 parent 57e7023
commit 694d036
Show file tree

Hide file tree

Showing 11 changed files with 6 additions and 105 deletions.
diff --git a/demo/.meteor/.finished-upgraders b/demo/.meteor/.finished-upgraders
diff --git a/demo/.meteor/.id b/demo/.meteor/.id
diff --git a/demo/.meteor/packages b/demo/.meteor/packages
diff --git a/demo/.meteor/platforms b/demo/.meteor/platforms
diff --git a/demo/.meteor/release b/demo/.meteor/release
diff --git a/demo/demo.ts b/demo/demo.ts
diff --git a/demo/packages/compiler/package.js b/demo/packages/compiler/package.js
diff --git a/demo/packages/compiler/ts_handler.js b/demo/packages/compiler/ts_handler.js
diff --git a/demo/tsconfig.json b/demo/tsconfig.json
diff --git a/package.js b/package.js
@@ -7,7 +7,7 @@ Package.describe({
 });
 
 Npm.depends({
-  'meteor-typescript': '0.5.2',
+  'meteor-typescript': '0.5.7',
   'async': '1.4.0'
 });
 

diff --git a/typescript.js b/typescript.js
@@ -6,15 +6,15 @@ TypeScript = {
   validateOptions(options) {
     if (! options) return;
 
-    meteorTS.convertOptionsOrThrow(options);
+    meteorTS.validateAndConvertOptions(options);
   },
 
   // Extra options are the same compiler options
   // but passed in the compiler constructor.
   validateExtraOptions(options) {
     if (! options) return;
 
-    meteorTS.convertOptionsOrThrow({
+    meteorTS.validateAndConvertOptions({
       compilerOptions: options
     });
   },
@@ -24,15 +24,9 @@ TypeScript = {
   getCompilerOptions(options, extraOptions) {
     let compilerOptions = options ||
       meteorTS.getDefaultOptions().compilerOptions;
-    compilerOptions = _.clone(options);
-
-    if (extraOptions) {
-      for (let option in extraOptions) {
-        if (extraOptions.hasOwnProperty(option)) {
-          compilerOptions[option] = extraOptions[option];
-        }
-      }
-    }
+    compilerOptions = _.clone(compilerOptions);
+
+    _.extend(compilerOptions, extraOptions);
 
     return compilerOptions;
   },