1
1
var fs = require ( 'fs' ) ;
2
2
var xml2js = require ( 'xml2js' ) ;
3
- var _ = require ( "lodash" ) ;
4
- var path = require ( "path" ) ;
5
- var _PromiseLibrary = require ( 'es6-promise' ) ;
6
- var Promise = _PromiseLibrary . Promise ;
3
+ var _ = require ( 'lodash' ) ;
4
+ var path = require ( 'path' ) ;
5
+ var es6_promise_1 = require ( 'es6-promise' ) ;
7
6
var semver = require ( 'semver' ) ;
8
7
var csproj2ts ;
9
8
( function ( csproj2ts ) {
10
- csproj2ts . DEFAULT_TYPESCRIPT_VERSION = "1.5.3 " ;
9
+ csproj2ts . DEFAULT_TYPESCRIPT_VERSION = "1.6.2 " ;
11
10
var cboolean = function ( value ) {
12
11
return ( typeof value === 'string' ) ? ( value . toLowerCase ( ) === 'true' ) : value ;
13
12
} ;
@@ -60,7 +59,7 @@ var csproj2ts;
60
59
return result ;
61
60
} ;
62
61
csproj2ts . xml2jsReadXMLFile = function ( fileName ) {
63
- return new Promise ( function ( resolve , reject ) {
62
+ return new es6_promise_1 . Promise ( function ( resolve , reject ) {
64
63
var parser = new xml2js . Parser ( ) ;
65
64
parser . addListener ( 'end' , function ( parsedXMLFileResult ) {
66
65
resolve ( parsedXMLFileResult ) ;
@@ -79,7 +78,7 @@ var csproj2ts;
79
78
if ( ! projectInfo . MSBuildExtensionsPath32 ) {
80
79
projectInfo . MSBuildExtensionsPath32 = path . join ( csproj2ts . programFiles ( ) , "/MSBuild/" ) ;
81
80
}
82
- return new Promise ( function ( resolve , reject ) {
81
+ return new es6_promise_1 . Promise ( function ( resolve , reject ) {
83
82
csproj2ts . xml2jsReadXMLFile ( projectInfo . ProjectFileName ) . then ( function ( parsedVSProject ) {
84
83
if ( ! parsedVSProject || ! parsedVSProject . Project ) {
85
84
reject ( new Error ( "No result from parsing the project." ) ) ;
@@ -107,13 +106,16 @@ var csproj2ts;
107
106
CompileOnSaveEnabled : cboolean ( getTSSetting ( project , "CompileOnSaveEnabled" , projectActiveConfig , undefined ) ) ,
108
107
EmitBOM : cboolean ( getTSSetting ( project , "EmitBOM" , projectActiveConfig , undefined ) ) ,
109
108
EmitDecoratorMetadata : cboolean ( getTSSetting ( project , "EmitDecoratorMetadata" , projectActiveConfig , undefined ) ) ,
109
+ ExperimentalAsyncFunctions : cboolean ( getTSSetting ( project , "ExperimentalAsyncFunctions" , projectActiveConfig , undefined ) ) ,
110
110
ExperimentalDecorators : cboolean ( getTSSetting ( project , "ExperimentalDecorators" , projectActiveConfig , undefined ) ) ,
111
111
GeneratesDeclarations : cboolean ( getTSSetting ( project , "GeneratesDeclarations" , projectActiveConfig , undefined ) ) ,
112
112
InlineSourceMap : cboolean ( getTSSetting ( project , "InlineSourceMap" , projectActiveConfig , undefined ) ) ,
113
113
InlineSources : cboolean ( getTSSetting ( project , "InlineSources" , projectActiveConfig , undefined ) ) ,
114
114
IsolatedModules : cboolean ( getTSSetting ( project , "IsolatedModules" , projectActiveConfig , undefined ) ) ,
115
+ JSXEmit : getTSSetting ( project , "JSXEmit" , projectActiveConfig , undefined ) ,
115
116
MapRoot : getTSSetting ( project , "MapRoot" , projectActiveConfig , undefined ) ,
116
117
ModuleKind : getTSSetting ( project , "ModuleKind" , projectActiveConfig , undefined ) ,
118
+ ModuleResolution : getTSSetting ( project , "ModuleResolution" , projectActiveConfig , undefined ) ,
117
119
NewLine : getTSSetting ( project , "NewLine" , projectActiveConfig , undefined ) ,
118
120
NoEmitOnError : cboolean ( getTSSetting ( project , "NoEmitOnError" , projectActiveConfig , undefined ) ) ,
119
121
NoEmitHelpers : cboolean ( getTSSetting ( project , "NoEmitHelpers" , projectActiveConfig , undefined ) ) ,
@@ -129,6 +131,7 @@ var csproj2ts;
129
131
SourceMap : cboolean ( getTSSetting ( project , "SourceMap" , projectActiveConfig , undefined ) ) ,
130
132
SourceRoot : getTSSetting ( project , "SourceRoot" , projectActiveConfig , undefined ) ,
131
133
SuppressImplicitAnyIndexErrors : cboolean ( getTSSetting ( project , "SuppressImplicitAnyIndexErrors" , projectActiveConfig , undefined ) ) ,
134
+ SuppressExcessPropertyErrors : cboolean ( getTSSetting ( project , "SuppressExcessPropertyErrors" , projectActiveConfig , undefined ) ) ,
132
135
Target : getTSSetting ( project , "Target" , projectActiveConfig , undefined )
133
136
} ;
134
137
csproj2ts . getTypeScriptDefaultsFromPropsFileOrDefaults ( result )
@@ -255,7 +258,7 @@ var csproj2ts;
255
258
} ;
256
259
var minimumVisualStudioVersion = 10 ;
257
260
var findPropsFileName = function ( settings ) {
258
- return new Promise ( function ( resolve , reject ) {
261
+ return new es6_promise_1 . Promise ( function ( resolve , reject ) {
259
262
var propsFileName = csproj2ts . normalizePath ( settings . VSProjectDetails . TypeScriptDefaultPropsFilePath , settings ) ;
260
263
if ( fs . existsSync ( propsFileName ) ) {
261
264
resolve ( propsFileName ) ;
@@ -274,7 +277,7 @@ var csproj2ts;
274
277
} ) ;
275
278
} ;
276
279
csproj2ts . getTypeScriptDefaultsFromPropsFileOrDefaults = function ( settings ) {
277
- return new Promise ( function ( resolve , reject ) {
280
+ return new es6_promise_1 . Promise ( function ( resolve , reject ) {
278
281
findPropsFileName ( settings ) . then ( function ( propsFileName ) {
279
282
csproj2ts . xml2jsReadXMLFile ( propsFileName ) . then ( function ( parsedPropertiesFile ) {
280
283
if ( ! parsedPropertiesFile || ! parsedPropertiesFile . Project || ! parsedPropertiesFile . Project . PropertyGroup ) {
0 commit comments