JSX and as operator

src/compiler/commandLineParser.ts

@@ -38,6 +38,16 @@ namespace ts {
  name: "inlineSources",
  type: "boolean",
  },
+ {
+ name: "jsx",
+ type: {
+ "preserve": JsxEmit.Preserve,
+ "react": JsxEmit.React
+ },
+ paramType: Diagnostics.KIND,
+ description: Diagnostics.Specify_JSX_code_generation_Colon_preserve_or_react,
+ error: Diagnostics.Argument_for_jsx_must_be_preserve_or_react
+ },
  {
  name: "listFiles",
  type: "boolean",
@@ -401,18 +411,29 @@ namespace ts {
  }
 
  function getFileNames(): string[] {
-var fileNames: string[] = [];
+let fileNames: string[] = [];
  if (hasProperty(json, "files")) {
  if (json["files"] instanceof Array) {
  fileNames = map(<string[]>json["files"], s => combinePaths(basePath, s));
  }
  }
  else {
- var exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
- var sysFiles = host.readDirectory(basePath, ".ts", exclude);
- for (var i = 0; i < sysFiles.length; i++) {
- var name = sysFiles[i];
- if (!fileExtensionIs(name, ".d.ts") || !contains(sysFiles, name.substr(0, name.length - 5) + ".ts")) {
+ let exclude = json["exclude"] instanceof Array ? map(<string[]>json["exclude"], normalizeSlashes) : undefined;
+ let sysFiles = host.readDirectory(basePath, ".ts", exclude).concat(host.readDirectory(basePath, ".tsx", exclude));
+ for (let i = 0; i < sysFiles.length; i++) {
+ let name = sysFiles[i];
+ if (fileExtensionIs(name, ".d.ts")) {
+ let baseName = name.substr(0, name.length - ".d.ts".length);
+ if (!contains(sysFiles, baseName + ".tsx") && !contains(sysFiles, baseName + ".ts")) {
+ fileNames.push(name);
+ }
+ }
+ else if (fileExtensionIs(name, ".ts")) {
+ if (!contains(sysFiles, name + "x")) {
+ fileNames.push(name)
+ }
+ }
+ else {
  fileNames.push(name);
  }
  }

src/compiler/core.ts

@@ -702,9 +702,9 @@ namespace ts {
  /**
  * List of supported extensions in order of file resolution precedence.
  */
- export const supportedExtensions = [".ts", ".d.ts"];
+ export const supportedExtensions = [".tsx", ".ts", ".d.ts"];
 
- const extensionsToRemove = [".d.ts", ".ts", ".js"];
+ const extensionsToRemove = [".d.ts", ".ts", ".js", ".tsx", ".jsx"];
  export function removeFileExtension(path: string): string {
  for (let ext of extensionsToRemove) {
  if (fileExtensionIs(path, ext)) {

src/compiler/diagnosticInformationMap.generated.ts

@@ -382,6 +382,16 @@ namespace ts {
  No_base_constructor_has_the_specified_number_of_type_arguments: { code: 2508, category: DiagnosticCategory.Error, key: "No base constructor has the specified number of type arguments." },
  Base_constructor_return_type_0_is_not_a_class_or_interface_type: { code: 2509, category: DiagnosticCategory.Error, key: "Base constructor return type '{0}' is not a class or interface type." },
  Base_constructors_must_all_have_the_same_return_type: { code: 2510, category: DiagnosticCategory.Error, key: "Base constructors must all have the same return type." },
+ JSX_element_attributes_type_0_must_be_an_object_type: { code: 2600, category: DiagnosticCategory.Error, key: "JSX element attributes type '{0}' must be an object type." },
+ The_return_type_of_a_JSX_element_constructor_must_return_an_object_type: { code: 2601, category: DiagnosticCategory.Error, key: "The return type of a JSX element constructor must return an object type." },
+ JSX_element_implicitly_has_type_any_because_the_global_type_JSX_Element_does_not_exist: { code: 2602, category: DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist." },
+ Property_0_in_type_1_is_not_assignable_to_type_2: { code: 2603, category: DiagnosticCategory.Error, key: "Property '{0}' in type '{1}' is not assignable to type '{2}'" },
+ JSX_element_type_0_does_not_have_any_construct_or_call_signatures: { code: 2604, category: DiagnosticCategory.Error, key: "JSX element type '{0}' does not have any construct or call signatures." },
+ JSX_element_type_0_is_not_a_constructor_function_for_JSX_elements: { code: 2605, category: DiagnosticCategory.Error, key: "JSX element type '{0}' is not a constructor function for JSX elements." },
+ Property_0_of_JSX_spread_attribute_is_not_assignable_to_target_property: { code: 2606, category: DiagnosticCategory.Error, key: "Property '{0}' of JSX spread attribute is not assignable to target property." },
+ JSX_element_class_does_not_support_attributes_because_it_does_not_have_a_0_property: { code: 2607, category: DiagnosticCategory.Error, key: "JSX element class does not support attributes because it does not have a '{0}' property" },
+ The_global_type_JSX_0_may_not_have_more_than_one_property: { code: 2608, category: DiagnosticCategory.Error, key: "The global type 'JSX.{0}' may not have more than one property" },
+ Cannot_emit_namespaced_JSX_elements_in_React: { code: 2650, category: DiagnosticCategory.Error, key: "Cannot emit namespaced JSX elements in React" },
  Import_declaration_0_is_using_private_name_1: { code: 4000, category: DiagnosticCategory.Error, key: "Import declaration '{0}' is using private name '{1}'." },
  Type_parameter_0_of_exported_class_has_or_is_using_private_name_1: { code: 4002, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported class has or is using private name '{1}'." },
  Type_parameter_0_of_exported_interface_has_or_is_using_private_name_1: { code: 4004, category: DiagnosticCategory.Error, key: "Type parameter '{0}' of exported interface has or is using private name '{1}'." },
@@ -523,6 +533,8 @@ namespace ts {
  Specifies_the_end_of_line_sequence_to_be_used_when_emitting_files_Colon_CRLF_dos_or_LF_unix: { code: 6060, category: DiagnosticCategory.Message, key: "Specifies the end of line sequence to be used when emitting files: 'CRLF' (dos) or 'LF' (unix)." },
  NEWLINE: { code: 6061, category: DiagnosticCategory.Message, key: "NEWLINE" },
  Argument_for_newLine_option_must_be_CRLF_or_LF: { code: 6062, category: DiagnosticCategory.Error, key: "Argument for '--newLine' option must be 'CRLF' or 'LF'." },
+ Specify_JSX_code_generation_Colon_preserve_or_react: { code: 6080, category: DiagnosticCategory.Message, key: "Specify JSX code generation: 'preserve' or 'react'" },
+ Argument_for_jsx_must_be_preserve_or_react: { code: 6081, category: DiagnosticCategory.Message, key: "Argument for '--jsx' must be 'preserve' or 'react'." },
  Option_experimentalDecorators_must_also_be_specified_when_option_emitDecoratorMetadata_is_specified: { code: 6064, category: DiagnosticCategory.Error, key: "Option 'experimentalDecorators' must also be specified when option 'emitDecoratorMetadata' is specified." },
  Enables_experimental_support_for_ES7_decorators: { code: 6065, category: DiagnosticCategory.Message, key: "Enables experimental support for ES7 decorators." },
  Enables_experimental_support_for_emitting_type_metadata_for_decorators: { code: 6066, category: DiagnosticCategory.Message, key: "Enables experimental support for emitting type metadata for decorators." },
@@ -542,6 +554,7 @@ namespace ts {
  _0_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7023, category: DiagnosticCategory.Error, key: "'{0}' implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
  Function_implicitly_has_return_type_any_because_it_does_not_have_a_return_type_annotation_and_is_referenced_directly_or_indirectly_in_one_of_its_return_expressions: { code: 7024, category: DiagnosticCategory.Error, key: "Function implicitly has return type 'any' because it does not have a return type annotation and is referenced directly or indirectly in one of its return expressions." },
  Generator_implicitly_has_type_0_because_it_does_not_yield_any_values_Consider_supplying_a_return_type: { code: 7025, category: DiagnosticCategory.Error, key: "Generator implicitly has type '{0}' because it does not yield any values. Consider supplying a return type." },
+ JSX_element_implicitly_has_type_any_because_no_interface_JSX_0_exists: { code: 7026, category: DiagnosticCategory.Error, key: "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists" },
  You_cannot_rename_this_element: { code: 8000, category: DiagnosticCategory.Error, key: "You cannot rename this element." },
  You_cannot_rename_elements_that_are_defined_in_the_standard_TypeScript_library: { code: 8001, category: DiagnosticCategory.Error, key: "You cannot rename elements that are defined in the standard TypeScript library." },
  import_can_only_be_used_in_a_ts_file: { code: 8002, category: DiagnosticCategory.Error, key: "'import ... =' can only be used in a .ts file." },
@@ -559,5 +572,12 @@ namespace ts {
  enum_declarations_can_only_be_used_in_a_ts_file: { code: 8015, category: DiagnosticCategory.Error, key: "'enum declarations' can only be used in a .ts file." },
  type_assertion_expressions_can_only_be_used_in_a_ts_file: { code: 8016, category: DiagnosticCategory.Error, key: "'type assertion expressions' can only be used in a .ts file." },
  decorators_can_only_be_used_in_a_ts_file: { code: 8017, category: DiagnosticCategory.Error, key: "'decorators' can only be used in a .ts file." },
+ Only_identifiers_Slashqualified_names_with_optional_type_arguments_are_currently_supported_in_a_class_extends_clauses: { code: 9002, category: DiagnosticCategory.Error, key: "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses." },
+ class_expressions_are_not_currently_supported: { code: 9003, category: DiagnosticCategory.Error, key: "'class' expressions are not currently supported." },
+ JSX_attributes_must_only_be_assigned_a_non_empty_expression: { code: 17000, category: DiagnosticCategory.Error, key: "JSX attributes must only be assigned a non-empty 'expression'." },
+ JSX_elements_cannot_have_multiple_attributes_with_the_same_name: { code: 17001, category: DiagnosticCategory.Error, key: "JSX elements cannot have multiple attributes with the same name." },
+ Expected_corresponding_JSX_closing_tag_for_0: { code: 17002, category: DiagnosticCategory.Error, key: "Expected corresponding JSX closing tag for '{0}'." },
+ JSX_attribute_expected: { code: 17003, category: DiagnosticCategory.Error, key: "JSX attribute expected." },
+ Cannot_use_JSX_unless_the_jsx_flag_is_provided: { code: 17004, category: DiagnosticCategory.Error, key: "Cannot use JSX unless the '--jsx' flag is provided." },
  };
 }

src/compiler/diagnosticMessages.json

@@ -638,7 +638,7 @@
  "Experimental support for decorators is a feature that is subject to change in a future release. Specify '--experimentalDecorators' to remove this warning.": {
  "category": "Error",
  "code": 1219
- },
+ },
  "Generators are only available when targeting ECMAScript 6 or higher.": {
  "category": "Error",
  "code": 1220
@@ -1519,6 +1519,47 @@
  "code": 2510
  },
 
+ "JSX element attributes type '{0}' must be an object type.": {
+ "category": "Error",
+ "code": 2600
+ },
+ "The return type of a JSX element constructor must return an object type.": {
+ "category": "Error",
+ "code": 2601
+ },
+ "JSX element implicitly has type 'any' because the global type 'JSX.Element' does not exist.": {
+ "category": "Error",
+ "code": 2602
+ },
+ "Property '{0}' in type '{1}' is not assignable to type '{2}'": {
+ "category": "Error",
+ "code": 2603
+ },
+ "JSX element type '{0}' does not have any construct or call signatures.": {
+ "category": "Error",
+ "code": 2604
+ },
+ "JSX element type '{0}' is not a constructor function for JSX elements.": {
+ "category": "Error",
+ "code": 2605
+ },
+ "Property '{0}' of JSX spread attribute is not assignable to target property.": {
+ "category": "Error",
+ "code": 2606
+ },
+ "JSX element class does not support attributes because it does not have a '{0}' property": {
+ "category": "Error",
+ "code": 2607
+ },
+ "The global type 'JSX.{0}' may not have more than one property": {
+ "category": "Error",
+ "code": 2608
+ },
+ "Cannot emit namespaced JSX elements in React": {
+ "category": "Error",
+ "code": 2650
+ },
+
  "Import declaration '{0}' is using private name '{1}'.": {
  "category": "Error",
  "code": 4000
@@ -1887,7 +1928,7 @@
  "category": "Error",
  "code": 5050
  },
-"Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.": {
+ "Option 'inlineSources' can only be used when either option '--inlineSourceMap' or option '--sourceMap' is provided.": {
  "category": "Error",
  "code": 5051
  },
@@ -2076,14 +2117,22 @@
  "category": "Message",
  "code": 6060
  },
- "NEWLINE": {
- "category": "Message",
+ "NEWLINE": {
+ "category": "Message",
  "code": 6061
  },
  "Argument for '--newLine' option must be 'CRLF' or 'LF'.": {
- "category": "Error",
+ "category": "Error",
  "code": 6062
  },
+ "Specify JSX code generation: 'preserve' or 'react'": {
+ "category": "Message",
+ "code": 6080
+ },
+ "Argument for '--jsx' must be 'preserve' or 'react'.": {
+ "category": "Message",
+ "code": 6081
+ },
  "Option 'experimentalDecorators' must also be specified when option 'emitDecoratorMetadata' is specified.": {
  "category": "Error",
  "code": 6064
@@ -2161,6 +2210,12 @@
  "category": "Error",
  "code": 7025
  },
+ "JSX element implicitly has type 'any' because no interface 'JSX.{0}' exists": {
+ "category": "Error",
+ "code": 7026
+ },
+
+
  "You cannot rename this element.": {
  "category": "Error",
  "code": 8000
@@ -2228,5 +2283,34 @@
  "'decorators' can only be used in a .ts file.": {
  "category": "Error",
  "code": 8017
+ },
+
+ "Only identifiers/qualified-names with optional type arguments are currently supported in a class 'extends' clauses.": {
+ "category": "Error",
+ "code": 9002
+ },
+ "'class' expressions are not currently supported.": {
+ "category": "Error",
+ "code": 9003
+ },
+ "JSX attributes must only be assigned a non-empty 'expression'.": {
+ "category": "Error",
+ "code": 17000
+ },
+ "JSX elements cannot have multiple attributes with the same name.": {
+ "category": "Error",
+ "code": 17001
+ },
+ "Expected corresponding JSX closing tag for '{0}'.": {
+ "category": "Error",
+ "code": 17002
+ },
+ "JSX attribute expected.": {
+ "category": "Error",
+ "code": 17003
+ },
+ "Cannot use JSX unless the '--jsx' flag is provided.": {
+ "category": "Error",
+ "code": 17004
  }
 }